Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Mar 2006 06:22:06 GMT
From:      Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/94588: [PATCH] security/dazuko: update to 2.2.0
Message-ID:  <200603170622.k2H6M6Z0012841@www.freebsd.org>
Resent-Message-ID: <200603170630.k2H6ULiU041970@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         94588
>Category:       ports
>Synopsis:       [PATCH] security/dazuko: update to 2.2.0
>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:   Fri Mar 17 06:30:21 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Jose Alonso Cardenas Marquez
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
BSDPeru (http://www.bsd.org.pe)
>Environment:
FreeBSD HellFire.BSD.org.pe 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #0: Wed Mar  8 13:14:43 PET
>Description:
- Update to 2.2.0

Added file(s):
- files/pkg-message.in

Removed file(s):
- pkg-plist
>How-To-Repeat:

>Fix:
--- 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 01:05:44 2006
@@ -5,7 +5,7 @@
 # $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/
 
@@ -13,18 +13,33 @@
 COMMENT=	A common interface for 3rd party file access control
 
 HAS_CONFIGURE=	yes
+SUB_FILES=	pkg-message
+
+OPTIONS=	EXAMPLEC	"Install example programs written in C"	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 00:29:32 2006
@@ -1,8 +1,15 @@
 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
+	
+	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 ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603170622.k2H6M6Z0012841>