Date: Tue, 17 Mar 2009 12:30:49 GMT From: Alex Povolotsky <tarkhil@over.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/132727: improvement for security/cvm port Message-ID: <200903171230.n2HCUnkS025633@www.freebsd.org> Resent-Message-ID: <200903171240.n2HCe6t4065249@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 132727
>Category: ports
>Synopsis: improvement for security/cvm port
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 17 12:40:06 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Alex Povolotsky
>Release: 6.3-RELEASE
>Organization:
>Environment:
FreeBSD abonents.alloincognito.ru 6.3-RELEASE FreeBSD 6.3-RELEASE #0: Wed Jan 16 04:45:45 UTC 2008 root@dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP i386
>Description:
security/cvm port does not allow easy compilation with vpopmail.
Supplied patch allows it.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -Nrc cvm.orig/Makefile cvm/Makefile
*** cvm.orig/Makefile Wed Mar 11 20:02:50 2009
--- cvm/Makefile Tue Mar 17 15:22:45 2009
***************
*** 27,32 ****
--- 27,44 ----
DOCS= NEWS README TODO *.html
+ OPTIONS= VCHKPW "Compile cvm-vchkpw" off
+
+ .include <bsd.port.pre.mk>
+ ALL_TARGET=all
+ .if defined(WITH_VCHKPW)
+ BUILD_DEPENDS+= ${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
+ ALL_TARGET+= cvm-vchkpw
+ PLIST_SUB= VCHKPW=""
+ .else
+ PLIST_SUB= VCHKPW="@comment "
+ .endif
+
post-patch:
@${REINPLACE_CMD} -e 's|libtool|${LIBTOOL}|g' ${WRKSRC}/Makefile
***************
*** 46,49 ****
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
.endif
! .include <bsd.port.mk>
--- 58,61 ----
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
.endif
! .include <bsd.port.post.mk>
diff -Nrc cvm.orig/files/Makefile.patch~ cvm/files/Makefile.patch~
*** cvm.orig/files/Makefile.patch~ Thu Jan 1 03:00:00 1970
--- cvm/files/Makefile.patch~ Tue Mar 17 14:51:42 2009
***************
*** 0 ****
--- 1,25 ----
+ *** Makefile.orig Tue Mar 17 14:46:39 2009
+ --- Makefile Tue Mar 17 14:36:29 2009
+ ***************
+ *** 155,164 ****
+ ./compile cvm-v1testclient.c
+
+ cvm-vchkpw: cvm-vchkpw.o ltload libcvm-module.la crypt.lib shadow.lib s.lib socket.lib
+ ! ./ltload cvm-vchkpw libcvm-module.la -L/usr/local/vpopmail/lib -L/var/vpopmail/lib -L/usr/local/lib/mysql -lbg -lvpopmail -lmysqlclient `cat crypt.lib` `cat shadow.lib` `cat s.lib` `cat socket.lib`
+
+ cvm-vchkpw.o: compile cvm-vchkpw.c module.h credentials.h errors.h facts.h
+ ! ./compile cvm-vchkpw.c
+
+ cvm-vmailmgr: cvm-vmailmgr.o ltload vmautoconvert.o vmlookup.o getpwnam.o libcvm-module.la libcvm-qmail.la socket.lib crypt.lib
+ ./ltload cvm-vmailmgr vmautoconvert.o vmlookup.o getpwnam.o libcvm-module.la libcvm-qmail.la -lbg `cat socket.lib` `cat crypt.lib`
+ --- 155,164 ----
+ ./compile cvm-v1testclient.c
+
+ cvm-vchkpw: cvm-vchkpw.o ltload libcvm-module.la crypt.lib shadow.lib s.lib socket.lib
+ ! ./ltload cvm-vchkpw libcvm-module.la `cat /usr/local/vpopmail/etc/lib_deps` -lbg `cat crypt.lib` `cat shadow.lib` `cat s.lib` `cat socket.lib`
+
+ cvm-vchkpw.o: compile cvm-vchkpw.c module.h credentials.h errors.h facts.h
+ ! ./compile cvm-vchkpw.c `cat /usr/local/vpopmail/etc/inc_deps`
+
+ cvm-vmailmgr: cvm-vmailmgr.o ltload vmautoconvert.o vmlookup.o getpwnam.o libcvm-module.la libcvm-qmail.la socket.lib crypt.lib
+ ./ltload cvm-vmailmgr vmautoconvert.o vmlookup.o getpwnam.o libcvm-module.la libcvm-qmail.la -lbg `cat socket.lib` `cat crypt.lib`
diff -Nrc cvm.orig/files/patch-Makefile cvm/files/patch-Makefile
*** cvm.orig/files/patch-Makefile Thu Jan 1 03:00:00 1970
--- cvm/files/patch-Makefile Tue Mar 17 14:55:46 2009
***************
*** 0 ****
--- 1,15 ----
+ --- ./Makefile.orig 2009-03-17 14:53:54.000000000 +0300
+ +++ ./Makefile 2009-03-17 14:55:41.000000000 +0300
+ @@ -155,10 +155,10 @@
+ ./compile cvm-v1testclient.c
+
+ cvm-vchkpw: cvm-vchkpw.o ltload libcvm-module.la crypt.lib shadow.lib s.lib socket.lib
+ - ./ltload cvm-vchkpw libcvm-module.la -L/usr/local/vpopmail/lib -L/var/vpopmail/lib -L/usr/local/lib/mysql -lbg -lvpopmail -lmysqlclient `cat crypt.lib` `cat shadow.lib` `cat s.lib` `cat socket.lib`
+ + ./ltload cvm-vchkpw libcvm-module.la `cat /usr/local/vpopmail/etc/lib_deps` -lbg `cat crypt.lib` `cat shadow.lib` `cat s.lib` `cat socket.lib`
+
+ cvm-vchkpw.o: compile cvm-vchkpw.c module.h credentials.h errors.h facts.h
+ - ./compile cvm-vchkpw.c
+ + ./compile cvm-vchkpw.c `cat /usr/local/vpopmail/etc/inc_deps`
+
+ cvm-vmailmgr: cvm-vmailmgr.o ltload vmautoconvert.o vmlookup.o getpwnam.o libcvm-module.la libcvm-qmail.la socket.lib crypt.lib
+ ./ltload cvm-vmailmgr vmautoconvert.o vmlookup.o getpwnam.o libcvm-module.la libcvm-qmail.la -lbg `cat socket.lib` `cat crypt.lib`
diff -Nrc cvm.orig/pkg-plist cvm/pkg-plist
*** cvm.orig/pkg-plist Wed Mar 11 20:02:50 2009
--- cvm/pkg-plist Tue Mar 17 15:19:06 2009
***************
*** 11,16 ****
--- 11,17 ----
bin/cvm-vmailmgr
bin/cvm-vmailmgr-local
bin/cvm-vmailmgr-udp
+ %%VCHKPW%%bin/cvm-vchkpw
include/cvm-sasl.h
include/cvm/client.h
include/cvm/credentials.h
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903171230.n2HCUnkS025633>