- Update to 2.2.0 Added file(s): - files/pkg-message.in Removed file(s): - pkg-plist
State Changed From-To: open->feedback Awaiting maintainers feedback
--- Makefile.orig Fri Mar 17 04:59:59 2006 +++ Makefile Fri Mar 17 05:00:10 2006 @@ -9,7 +9,7 @@ CATEGORIES= security MASTER_SITES= http://dazuko.org/files/ -MAINTAINER= rob@debank.tv +MAINTAINER= acardenas@bsd.org.pe COMMENT= A common interface for 3rd party file access control HAS_CONFIGURE= yes Greetings ACM Grupo de Usuarios *BSD Peru - BSDPeru http://www.bsd.org.pe
Please commit these patches (including maintainer shift). thx! Rob Evers -- "Intellectual Property" is nowhere near as valuable as "Intellect"
State Changed From-To: feedback->open Current maintainer approved.
Responsible Changed From-To: freebsd-ports-bugs->ehaupt Take.
State Changed From-To: open->feedback The port does not clean up properly. === Checking filesystem state list of extra files and directories in / (not present before this port was installed but present after it was deinstalled) 4035551 4 -rw------- 1 root wheel 32 Mar 17 16:41 boot/modules/linker.hints ================================================================ build ended at Fri Mar 17 16:41:12 CET 2006
On Fri, 17 Mar 2006 17:11:47 +0100 (CET) Emanuel Haupt <ehaupt@FreeBSD.org> wrote: > Synopsis: [PATCH] security/dazuko: update to 2.2.0 > > State-Changed-From-To: open->feedback > State-Changed-By: ehaupt > State-Changed-When: Fri Mar 17 17:10:57 CET 2006 > State-Changed-Why: > The port does not clean up properly. > > === Checking filesystem state > list of extra files and directories in / (not present before this port was installed but present after it was deinstalled) > 4035551 4 -rw------- 1 root wheel 32 Mar 17 16:41 boot/modules/linker.hints > ================================================================ > build ended at Fri Mar 17 16:41:12 CET 2006 > > > http://www.freebsd.org/cgi/query-pr.cgi?pr=94588 > Apply this patch --- pkg-deinstall.orig Fri Mar 17 15:20:17 2006 +++ pkg-deinstall Fri Mar 17 15:16:38 2006 @@ -7,6 +7,10 @@ rm /boot/modules/${MODULENAME}.ko + if [ -f /boot/modules/linker.hints ]; then + rm /boot/modules/linker.hints + fi + cat /boot/loader.conf | grep ${MODULENAME} > /dev/null 2>&1; RESULT=$? if [ ${RESULT} -eq 0 ]; then sed -i '' -e "/^${MODULENAME}_load.*/d" /boot/loader.conf Greetings ACM -- Grupo de Usuarios *BSD Peru - BSDPeru http://www.bsd.org.pe
State Changed From-To: feedback->open Feedback received.
That fails on the absolute path definition: ===> Registering installation for dazuko-2.2.0 ===> Building package for dazuko-2.2.0 Creating package /tmp/packages/All/dazuko-2.2.0.tgz Registering depends:. Creating gzip'd tar ball in '/tmp/packages/All/dazuko-2.2.0.tgz' Deleting dazuko-2.2.0 rm: /boot/modules/dazuko.ko: No such file or directory cat: /boot/loader.conf: No such file or directory ================================================================ === Checking filesystem state list of extra files and directories in / (not present before this port was installed but present after it was deinstalled) 2853600 116 -r-xr-xr-x 1 root wheel 59280 Mar 20 15:50 modules/dazuko.ko ================================================================ build ended at Mon Mar 20 15:50:34 CET 2006 Could you maybe submit a new patch that consolidates all the previous patches (maintainer change, pkg-deinstall, update, ...). -- GnuPG key id: 0x55E67774 Download: http://pgp.mit.edu:11371 Key fingerprint: 17B3 FD8F BA68 4AB4 10FD A9D1 AD52 6588 55E6 7774
State Changed From-To: open->feedback Ask for maintainer feedback.
On Mon, 20 Mar 2006 15:57:27 +0100 Emanuel Haupt <ehaupt@FreeBSD.org> wrote: > > Could you maybe submit a new patch that consolidates all the previous > patches (maintainer change, pkg-deinstall, update, ...). > > -- --- dazuko-2.2.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/security/dazuko/Makefile /usr/ports/security/dazuko-new/Makefile --- /usr/ports/security/dazuko/Makefile Sat Sep 10 13:37:39 2005 +++ /usr/ports/security/dazuko-new/Makefile Fri Mar 17 05:00:10 2006 @@ -5,26 +5,41 @@ # $FreeBSD: ports/security/dazuko/Makefile,v 1.3 2005/09/10 18:37:39 pav Exp $ PORTNAME= dazuko -PORTVERSION= 2.1.0 +PORTVERSION= 2.2.0 CATEGORIES= security MASTER_SITES= http://dazuko.org/files/ -MAINTAINER= rob@debank.tv +MAINTAINER= acardenas@bsd.org.pe COMMENT= A common interface for 3rd party file access control HAS_CONFIGURE= yes +SUB_FILES= pkg-message + +OPTIONS= EXAMPLEC "Install C example programs" off .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 600000 -IGNORE= "Only supports FreeBSD 4.X and 5.X" +.if defined(WITH_EXAMPLEC) +EXAMPLEC_FLAG= true +PLIST_FILES= share/examples/${PORTNAME}/example share/examples/${PORTNAME}/example_mt +PLIST_DIRS= share/examples/${PORTNAME} .endif +post-configure: + ${REINPLACE_CMD} -e 's|^NOMAN|NO_MAN|g' ${WRKSRC}/library/Makefile + do-install: - ${MKDIR} ${PREFIX}/modules/ - ${INSTALL_DATA} ${WRKSRC}/dazuko.ko ${PREFIX}/modules/dazuko.ko +.if defined(EXAMPLEC_FLAG) + @cd ${WRKSRC}/example_c && \ + ${MAKE} + @${MKDIR} ${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/example_c/example ${WRKSRC}/example_c/example_mt ${EXAMPLESDIR} +.endif + + @${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC} -DMODULES_WITH_WORLD install post-install: - ${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/security/dazuko/distinfo /usr/ports/security/dazuko-new/distinfo --- /usr/ports/security/dazuko/distinfo Wed Jan 25 17:58:39 2006 +++ /usr/ports/security/dazuko-new/distinfo Thu Mar 16 19:47:06 2006 @@ -1,3 +1,3 @@ -MD5 (dazuko-2.1.0.tar.gz) = f7e5ea23a0b3a1539bd0c0b96df426f0 -SHA256 (dazuko-2.1.0.tar.gz) = 95a672346e85062b06e855efeaed38cf161f8fce8ee9081958fd7acb1fb7f517 -SIZE (dazuko-2.1.0.tar.gz) = 159456 +MD5 (dazuko-2.2.0.tar.gz) = bbe7651888d9904fb6c82fdb02331d82 +SHA256 (dazuko-2.2.0.tar.gz) = 7bf51cefb36a1c572ed16bd4c184087a3903afb88fa8faee8bba22b8c4de29df +SIZE (dazuko-2.2.0.tar.gz) = 162903 diff -ruN --exclude=CVS /usr/ports/security/dazuko/files/pkg-message.in /usr/ports/security/dazuko-new/files/pkg-message.in --- /usr/ports/security/dazuko/files/pkg-message.in Wed Dec 31 19:00:00 1969 +++ /usr/ports/security/dazuko-new/files/pkg-message.in Fri Mar 17 01:14:22 2006 @@ -0,0 +1,16 @@ +######################################################################################### + +1) Create device /dev/dazuko + + * FreeBSD 4.x + + # mknod /dev/dazuko c 33 0 + + * FreeBSD >= 5.x + + It's not neccesary on modern FreeBSD systems + +2) If you selected WITH_EXAMPLEC, you can test module using example and example_mt files + from %%PREFIX%%/share/examples/dazuko directory. + +######################################################################################### diff -ruN --exclude=CVS /usr/ports/security/dazuko/pkg-deinstall /usr/ports/security/dazuko-new/pkg-deinstall --- /usr/ports/security/dazuko/pkg-deinstall Fri Jun 25 06:10:58 2004 +++ /usr/ports/security/dazuko-new/pkg-deinstall Fri Mar 17 15:16:38 2006 @@ -1,8 +1,19 @@ if [ ! "$2" = "POST-DEINSTALL" ]; then - exit 0 -fi + MODULENAME=dazuko + kldstat -n ${MODULENAME} > /dev/null 2>&1; RESULT=$? + if [ ${RESULT} -eq 0 ]; then + kldunload -f -n ${MODULENAME} + fi -echo "" -echo "If you want to completely remove this package" -echo "remove /dev/dazuko" -echo "" + rm /boot/modules/${MODULENAME}.ko + + if [ -f /boot/modules/linker.hints ]; then + rm /boot/modules/linker.hints + fi + + cat /boot/loader.conf | grep ${MODULENAME} > /dev/null 2>&1; RESULT=$? + if [ ${RESULT} -eq 0 ]; then + sed -i '' -e "/^${MODULENAME}_load.*/d" /boot/loader.conf + fi +fi +exit 0 diff -ruN --exclude=CVS /usr/ports/security/dazuko/pkg-install /usr/ports/security/dazuko-new/pkg-install --- /usr/ports/security/dazuko/pkg-install Fri Jun 25 06:10:58 2004 +++ /usr/ports/security/dazuko-new/pkg-install Fri Mar 17 00:17:54 2006 @@ -1,11 +1,32 @@ #!/bin/sh if [ "$2" = "POST-INSTALL" ]; then - if ! [ -c /dev/dazuko ]; then - mknod /dev/dazuko c 33 0 + +MODULENAME=dazuko + +echo -n "Do you want load ${MODULENAME}.ko? [ y/n ]: " +read LOADMOD +echo + + if [ x"${LOADMOD}" = x"y" ]; then + kldstat -n ${MODULENAME} > /dev/null 2>&1; RESULT=$? + if [ ${RESULT} -eq 0 ]; then + kldunload -f -n ${MODULENAME} + fi + kldload ${MODULENAME} fi - echo "" - echo "To load the module do kldload $1/modules/dazuko.ko" - echo "" + +echo -n "Do you want load ${MODULENAME}.ko on boot time? [ y/n ]: " +read BOOTMOD +echo + + if [ x"${BOOTMOD}" = x"y" ]; then + cat /boot/loader.conf | grep ${MODULENAME} > /dev/null 2>&1; RESULT=$? + if [ ${RESULT} -eq 0 ]; then + sed -i '' -e 's/^${MODULENAME}_load.*/${MODULENAME}_load="YES"/g' /boot/loader.conf + else + echo "${MODULENAME}_load=\"YES\"" >> /boot/loader.conf + fi + fi fi exit 0 diff -ruN --exclude=CVS /usr/ports/security/dazuko/pkg-plist /usr/ports/security/dazuko-new/pkg-plist --- /usr/ports/security/dazuko/pkg-plist Wed Jan 25 17:58:39 2006 +++ /usr/ports/security/dazuko-new/pkg-plist Wed Dec 31 19:00:00 1969 @@ -1,2 +0,0 @@ -modules/dazuko.ko -@dirrmtry modules --- dazuko-2.2.0.patch ends here --- I tested security/dazuka port, using tinderbox and portstools without problems Greetings ACM -- Grupo de Usuarios *BSD Peru - BSDPeru http://www.bsd.org.pe
Not so on 4.x, please see: http://critical.ch/people/dazuko/i386-4-dazuko-2.2.0.log
On Mon, 20 Mar 2006 21:30:36 +0100 Emanuel Haupt <ehaupt@FreeBSD.org> wrote: > Not so on 4.x, please see: > http://critical.ch/people/dazuko/i386-4-dazuko-2.2.0.log > This patch could finally to solve the problem ;) (I wait) --- dazuko-2.2.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/security/dazuko/Makefile /usr/ports/security/dazuko-new/Makefile --- /usr/ports/security/dazuko/Makefile Sat Sep 10 13:37:39 2005 +++ /usr/ports/security/dazuko-new/Makefile Fri Mar 17 05:00:10 2006 @@ -5,26 +5,41 @@ # $FreeBSD: ports/security/dazuko/Makefile,v 1.3 2005/09/10 18:37:39 pav Exp $ PORTNAME= dazuko -PORTVERSION= 2.1.0 +PORTVERSION= 2.2.0 CATEGORIES= security MASTER_SITES= http://dazuko.org/files/ -MAINTAINER= rob@debank.tv +MAINTAINER= acardenas@bsd.org.pe COMMENT= A common interface for 3rd party file access control HAS_CONFIGURE= yes +SUB_FILES= pkg-message + +OPTIONS= EXAMPLEC "Install C example programs" off .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 600000 -IGNORE= "Only supports FreeBSD 4.X and 5.X" +.if defined(WITH_EXAMPLEC) +EXAMPLEC_FLAG= true +PLIST_FILES= share/examples/${PORTNAME}/example share/examples/${PORTNAME}/example_mt +PLIST_DIRS= share/examples/${PORTNAME} .endif +post-configure: + ${REINPLACE_CMD} -e 's|^NOMAN|NO_MAN|g' ${WRKSRC}/library/Makefile + do-install: - ${MKDIR} ${PREFIX}/modules/ - ${INSTALL_DATA} ${WRKSRC}/dazuko.ko ${PREFIX}/modules/dazuko.ko +.if defined(EXAMPLEC_FLAG) + @cd ${WRKSRC}/example_c && \ + ${MAKE} + @${MKDIR} ${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/example_c/example ${WRKSRC}/example_c/example_mt ${EXAMPLESDIR} +.endif + + @${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC} -DMODULES_WITH_WORLD install post-install: - ${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/security/dazuko/distinfo /usr/ports/security/dazuko-new/distinfo --- /usr/ports/security/dazuko/distinfo Wed Jan 25 17:58:39 2006 +++ /usr/ports/security/dazuko-new/distinfo Thu Mar 16 19:47:06 2006 @@ -1,3 +1,3 @@ -MD5 (dazuko-2.1.0.tar.gz) = f7e5ea23a0b3a1539bd0c0b96df426f0 -SHA256 (dazuko-2.1.0.tar.gz) = 95a672346e85062b06e855efeaed38cf161f8fce8ee9081958fd7acb1fb7f517 -SIZE (dazuko-2.1.0.tar.gz) = 159456 +MD5 (dazuko-2.2.0.tar.gz) = bbe7651888d9904fb6c82fdb02331d82 +SHA256 (dazuko-2.2.0.tar.gz) = 7bf51cefb36a1c572ed16bd4c184087a3903afb88fa8faee8bba22b8c4de29df +SIZE (dazuko-2.2.0.tar.gz) = 162903 diff -ruN --exclude=CVS /usr/ports/security/dazuko/files/pkg-message.in /usr/ports/security/dazuko-new/files/pkg-message.in --- /usr/ports/security/dazuko/files/pkg-message.in Wed Dec 31 19:00:00 1969 +++ /usr/ports/security/dazuko-new/files/pkg-message.in Fri Mar 17 01:14:22 2006 @@ -0,0 +1,16 @@ +######################################################################################### + +1) Create device /dev/dazuko + + * FreeBSD 4.x + + # mknod /dev/dazuko c 33 0 + + * FreeBSD >= 5.x + + It's not neccesary on modern FreeBSD systems + +2) If you selected WITH_EXAMPLEC, you can test module using example and example_mt files + from %%PREFIX%%/share/examples/dazuko directory. + +######################################################################################### diff -ruN --exclude=CVS /usr/ports/security/dazuko/pkg-deinstall /usr/ports/security/dazuko-new/pkg-deinstall --- /usr/ports/security/dazuko/pkg-deinstall Fri Jun 25 06:10:58 2004 +++ /usr/ports/security/dazuko-new/pkg-deinstall Tue Mar 21 03:13:15 2006 @@ -1,8 +1,27 @@ if [ ! "$2" = "POST-DEINSTALL" ]; then - exit 0 -fi + MODULENAME=dazuko + FREEBSDVER=`uname -r | cut -f 1 -d .` + + kldstat -n ${MODULENAME} > /dev/null 2>&1; RESULT=$? + if [ ${RESULT} -eq 0 ]; then + kldunload -f -n ${MODULENAME} + fi -echo "" -echo "If you want to completely remove this package" -echo "remove /dev/dazuko" -echo "" + if [ "${FREEBSDVER}" = "4" ]; then + rm /modules/${MODULENAME}.ko + else + rm /boot/modules/${MODULENAME}.ko + fi + + if [ -f /boot/modules/linker.hints ]; then + rm /boot/modules/linker.hints + fi + + if [ -f /boot/loader.conf ]; then + cat /boot/loader.conf | grep ${MODULENAME} > /dev/null 2>&1; RESULT=$? + if [ ${RESULT} -eq 0 ]; then + sed -i '' -e "/^${MODULENAME}_load.*/d" /boot/loader.conf + fi + fi +fi +exit 0 diff -ruN --exclude=CVS /usr/ports/security/dazuko/pkg-install /usr/ports/security/dazuko-new/pkg-install --- /usr/ports/security/dazuko/pkg-install Fri Jun 25 06:10:58 2004 +++ /usr/ports/security/dazuko-new/pkg-install Fri Mar 17 00:17:54 2006 @@ -1,11 +1,32 @@ #!/bin/sh if [ "$2" = "POST-INSTALL" ]; then - if ! [ -c /dev/dazuko ]; then - mknod /dev/dazuko c 33 0 + +MODULENAME=dazuko + +echo -n "Do you want load ${MODULENAME}.ko? [ y/n ]: " +read LOADMOD +echo + + if [ x"${LOADMOD}" = x"y" ]; then + kldstat -n ${MODULENAME} > /dev/null 2>&1; RESULT=$? + if [ ${RESULT} -eq 0 ]; then + kldunload -f -n ${MODULENAME} + fi + kldload ${MODULENAME} fi - echo "" - echo "To load the module do kldload $1/modules/dazuko.ko" - echo "" + +echo -n "Do you want load ${MODULENAME}.ko on boot time? [ y/n ]: " +read BOOTMOD +echo + + if [ x"${BOOTMOD}" = x"y" ]; then + cat /boot/loader.conf | grep ${MODULENAME} > /dev/null 2>&1; RESULT=$? + if [ ${RESULT} -eq 0 ]; then + sed -i '' -e 's/^${MODULENAME}_load.*/${MODULENAME}_load="YES"/g' /boot/loader.conf + else + echo "${MODULENAME}_load=\"YES\"" >> /boot/loader.conf + fi + fi fi exit 0 diff -ruN --exclude=CVS /usr/ports/security/dazuko/pkg-plist /usr/ports/security/dazuko-new/pkg-plist --- /usr/ports/security/dazuko/pkg-plist Wed Jan 25 17:58:39 2006 +++ /usr/ports/security/dazuko-new/pkg-plist Wed Dec 31 19:00:00 1969 @@ -1,2 +0,0 @@ -modules/dazuko.ko -@dirrmtry modules --- dazuko-2.2.0.patch ends here --- Greetings ACM -- Grupo de Usuarios *BSD Peru - BSDPeru http://www.bsd.org.pe
State Changed From-To: open->closed Committed, thanks!