ports/105329: MAINTAINER UPDATE: change default user of mail/milter-bogom

[Victor Balada Diaz]

>Number:         105329
>Category:       ports
>Synopsis:       MAINTAINER UPDATE: change default user of mail/milter-bogom
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 09 10:30:23 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Victor Balada Diaz
>Release:        FreeBSD 5.3-RELEASE-p29 i386
>Organization:
>Environment:
not applicable


	
>Description:
	Mr. Andrey Chernov suggested that would be a good idea to use the user mailnull
	for the port instead of having one user for each milter. And I agree with him.

	At the same time Mr. Hirohisa Yamaguchi sent me a (sightly modified)
	version of the submitted patch to fix that.

	A note should be added to UPDATING file noting that milter-bogom port now
	uses mailnull as default user and bogomilter user could be deleted.

	Also bogomilter user should be deleted from /usr/ports/UIDs.
	
>How-To-Repeat:
	
>Fix:

	

--- milter.patch begins here ---
diff -ruN ports/mail/milter-bogom/CVS/Entries ports.new/mail/milter-bogom/CVS/Entries
--- ports/mail/milter-bogom/CVS/Entries	Thu Nov  9 10:59:49 2006
+++ ports.new/mail/milter-bogom/CVS/Entries	Thu Nov  9 10:58:37 2006
@@ -4,4 +4,4 @@
 /pkg-descr/1.1/Tue Feb 15 21:25:44 2005//
 /pkg-install/1.2/Tue Jun 28 23:43:11 2005//
 /pkg-req/1.1/Tue Feb 15 21:25:44 2005//
-D
+D/files////
diff -ruN ports/mail/milter-bogom/CVS/Entries.Log ports.new/mail/milter-bogom/CVS/Entries.Log
--- ports/mail/milter-bogom/CVS/Entries.Log	Thu Nov  9 10:59:49 2006
+++ ports.new/mail/milter-bogom/CVS/Entries.Log	Thu Jan  1 01:00:00 1970
@@ -1 +0,0 @@
-A D/files////
diff -ruN ports/mail/milter-bogom/Makefile ports.new/mail/milter-bogom/Makefile
--- ports/mail/milter-bogom/Makefile	Wed Nov  8 04:22:39 2006
+++ ports.new/mail/milter-bogom/Makefile	Thu Nov  9 10:49:31 2006
@@ -5,13 +5,13 @@
 # $FreeBSD: ports/mail/milter-bogom/Makefile,v 1.9 2006/11/08 03:22:39 ache Exp $
 #
 
-PORTNAME=	milter-bogom
+PORTNAME=	bogom
 PORTVERSION=	1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.usebox.net/jjm/bogom/ \
 		http://blackshell.usebox.net/bogom/
-DISTNAME=	bogom-${PORTVERSION}
+PKGNAMEPREFIX=	milter-
 
 MAINTAINER=	victor at bsdes.net
 COMMENT=	Simple sendmail milter to interface bogofilter
@@ -51,7 +51,6 @@
 .endif
 
 post-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -ruN ports/mail/milter-bogom/files/milter-bogom.sh.in ports.new/mail/milter-bogom/files/milter-bogom.sh.in
--- ports/mail/milter-bogom/files/milter-bogom.sh.in	Wed Nov  8 04:01:06 2006
+++ ports.new/mail/milter-bogom/files/milter-bogom.sh.in	Thu Nov  9 10:51:08 2006
@@ -17,7 +17,7 @@
 
 milterbogom_enable=${milterbogom_enable-"NO"}
 milterbogom_socket=${milterbogom_socket-"unix:/var/run/bogom/milter.sock"}
-milterbogom_user=${milterbogom_user-"bogomilter"}
+milterbogom_user=${milterbogom_user-"mailnull"}
 milterbogom_pid=${milterbogom_pid-"/var/run/bogom/bogom.pid"}
 milterbogom_flags=${milterbogom_flags-"-u ${milterbogom_user} \
 -s ${milterbogom_socket} -p ${milterbogom_pid}"}
@@ -26,11 +26,10 @@
 
 bogom_precmd()
 {
-    if [ -d `dirname ${milterbogom_pid}` ]
+    if [ ! -d `dirname ${milterbogom_pid}` ]
     then
-	return;
+    	mkdir -p `dirname ${milterbogom_pid}`
     fi
-    mkdir -p `dirname ${milterbogom_pid}`
     chown ${milterbogom_user} `dirname ${milterbogom_pid}`
 }
 
diff -ruN ports/mail/milter-bogom/pkg-deinstall ports.new/mail/milter-bogom/pkg-deinstall
--- ports/mail/milter-bogom/pkg-deinstall	Wed May 25 10:12:34 2005
+++ ports.new/mail/milter-bogom/pkg-deinstall	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "POST-DEINSTALL" ] 
-then
-	echo "***************************************************************"
-	echo "* The bogomilter user will not be removed by this port        *"
-	echo "* if you are not upgrading and will not use this port anymore *"
-	echo "* delete the bogomilter user using:                           *"
-	echo "* pw userdel bogomilter                                       *"
-	echo "***************************************************************"
-fi
diff -ruN ports/mail/milter-bogom/pkg-install ports.new/mail/milter-bogom/pkg-install
--- ports/mail/milter-bogom/pkg-install	Wed Jun 29 01:43:11 2005
+++ ports.new/mail/milter-bogom/pkg-install	Thu Jan  1 01:00:00 1970
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-INSTALL" ]
-then
-	exit 0;
-fi
-
-# check if bogomilter user exists
-pw user show bogomilter > /dev/null 2>&1
-
-if [ $? != 0 ]
-then
-	echo "===>  Adding user bogomilter"
-	pw useradd bogomilter -u 174 -c "milter-bogom" -s /sbin/nologin \
-	-d /nonexistent
-else
-	echo "===>  Using existing user bogomilter" 
-fi
--- milter.patch ends here ---


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