Overhaul of the jitterbug package.

No longer modify /etc/aliases and httpd.conf (fixes PR 10126).
Also, jitterbug does not depend on apache any longer.

8 files changed, 59 insertions, 62 deletions

diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile
index 2750fa79a38..373268920f3 100644
--- a/misc/jitterbug/Makefile
+++ b/misc/jitterbug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/08/22 15:04:19 wennmach Exp $
+# $NetBSD: Makefile,v 1.12 2000/09/12 17:23:01 wennmach Exp $
 
 DISTNAME=	jitterbug-1.6.2
 WRKSRC=		${WRKDIR}/${PKGNAME}/source
@@ -8,8 +8,6 @@ MASTER_SITES=	ftp://jitterbug.samba.org/pub/jitterbug/
 MAINTAINER=	wennmach@netbsd.org
 HOMEPAGE=	http://jitterbug.samba.org/
 
-DEPENDS+=	apache-1.3.*:../../www/apache
-
 .if exists(/usr/sbin/user)
 ADDUSER=		/usr/sbin/useradd
 ADDGROUP=		/usr/sbin/groupadd
@@ -88,8 +86,10 @@ pre-extract:
 	@${ECHO} "JB_GROUPID    -- jitterbug group id (default=${JB_GROUPID})"
 	@${ECHO} "JB_FQHOSTNAME -- fully qualified host name"
 	@${ECHO} "JB_LOCALMAIL  -- local mail alias for \$$JB_PACKAGE category."
+	@${ECHO}
 	@${ECHO} "jitterbug will send and receive e-mail for \$$JB_PACKAGE"
-	@${ECHO} "as '\$$JB_LOCALMAIL'@${JB_FQHOSTNAME}"
+	@${ECHO} "  as '\$$JB_LOCALMAIL'@${JB_FQHOSTNAME}"
+	@${ECHO} "  (default='${JB_LOCALMAIL}@${JB_FQHOSTNAME}')"
 	@${ECHO}
 .endif
 .if ${JB_FQHOSTNAME} == ${JB_HOSTNAME}
@@ -124,7 +124,7 @@ post-patch:
 
 pre-install:
 .if !defined(JB_USER)
-	@${ECHO} "Arrrgggghhh. JB_USER not defined. Send-pr!"
+	@${ECHO} "Arrrgggghhh. JB_USER not defined. Please send-pr!"
 	@${FALSE}
 .endif
 	@${SED}                                                               \
@@ -132,12 +132,9 @@ pre-install:
 		-e 's|@JB_USERID@|${JB_USERID}|g'                             \
 		-e 's|@JB_GROUP@|${JB_GROUP}|g'                               \
 		-e 's|@JB_GROUPID@|${JB_GROUPID}|g'                           \
-		-e 's|@JB_LOCALMAIL@|${JB_LOCALMAIL}|g'                       \
-		-e 's|@JB_PACKAGE@|${JB_PACKAGE}|g'                           \
 		-e 's|@PREFIX@|${PREFIX}|g'                                   \
 		-e 's|@ADDUSER@|${ADDUSER}|g'				      \
 		-e 's|@ADDGROUP@|${ADDGROUP}|g'				      \
-		-e 's|@FILESDIR@|${FILESDIR}|g'                               \
 			<${PKGDIR}/REQ                                        \
 			>${REQ_FILE}
 	@${SED}                                                               \
@@ -162,6 +159,7 @@ pre-install:
 		-e 's|@JB_USER@|${JB_USER}|g'                                 \
 		-e 's|@JB_PACKAGE@|${JB_PACKAGE}|g'                           \
 		-e 's|@PREFIX@|${PREFIX}|g'                                   \
+		-e 's|@JB_LOCALMAIL@|${JB_LOCALMAIL}|g'                       \
 			<${PKGDIR}/MESSAGE                                    \
 			>${MESSAGE_FILE}
 	@${SED}                                                               \
@@ -171,6 +169,12 @@ pre-install:
 		-e 's|@PREFIX@|${PREFIX}|g'                                   \
 			<${PKGDIR}/DEINSTALL                                  \
 			>${DEINSTALL_FILE}
+	@${SED}								      \
+		-e 's|@JB_PACKAGE@|${JB_PACKAGE}|g'			      \
+		-e 's|@JB_USER@|${JB_USER}|g'				      \
+		-e 's|@PREFIX@|${PREFIX}|g'				      \
+			< ${FILESDIR}/httpd.conf			      \
+			> ${WRKDIR}/httpd.conf
 	${SH} ${REQ_FILE} ${PKGNAME} INSTALL
 
 do-install:
@@ -206,6 +210,7 @@ do-install:
 	[ -f ${PREFIX}/${JB_DATADIR}/users ] ||                               \
 		${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644             \
 		${CONFIGDIR}/users ${PREFIX}/${JB_DATADIR}
+	-${MKDIR} ${PREFIX}/${CGIBINDIR}
 	${INSTALL} -c -o root -g nobody -m 4710                               \
 		${WRKSRC}/jitterbug ${PREFIX}/${CGIBINDIR}/${JB_PACKAGE}
 	${LN} -f ${PREFIX}/${CGIBINDIR}/${JB_PACKAGE} ${PREFIX}/${CGIBINDIR}/${JB_PACKAGE}.private
@@ -251,5 +256,8 @@ do-install:
 		${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644             \
 		${PREFIX}/${JB_CONFIGDIR}/jitterbug.config                    \
 		${PREFIX}/etc/jitterbug/${JB_PACKAGE}.private
+	${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644        	      \
+		${WRKDIR}/httpd.conf			                      \
+		${PREFIX}/etc/jitterbug/httpd.conf.add
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/jitterbug/files/httpd.conf b/misc/jitterbug/files/httpd.conf
index d296f7878f2..5e15fc5fc21 100644
--- a/misc/jitterbug/files/httpd.conf
+++ b/misc/jitterbug/files/httpd.conf
@@ -1,11 +1,11 @@
 
-# jitterbug config for package %JB_PACKAGE%
-ScriptAlias /%JB_PACKAGE% "%PREFIX%/libexec/cgi-bin/%JB_PACKAGE%"
-<Location /cgi-bin/%JB_PACKAGE%.private>
+# jitterbug config for package @JB_PACKAGE@
+ScriptAlias /@JB_PACKAGE@ "@PREFIX@/libexec/cgi-bin/@JB_PACKAGE@"
+<Location /cgi-bin/@JB_PACKAGE@.private>
 AuthType Basic
-AuthName %JB_USER%
-AuthUserFile %PREFIX%/%JB_USER%/etc/jitterbug.auth
+AuthName @JB_USER@
+AuthUserFile @PREFIX@/@JB_USER@/etc/jitterbug.auth
 <Limit GET POST>
-require user %JB_USER%
+require user @JB_USER@
 </Limit>
 </Location>
diff --git a/misc/jitterbug/files/patch-sum b/misc/jitterbug/files/patch-sum
index b35507f33e4..c251e7d5027 100644
--- a/misc/jitterbug/files/patch-sum
+++ b/misc/jitterbug/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/10/05 12:37:18 wennmach Exp $
+$NetBSD: patch-sum,v 1.2 2000/09/12 17:23:02 wennmach Exp $
 
-MD5 (patch-aa) = cd823bf0c5ca0f8603ed4cff0dd877aa
+MD5 (patch-aa) = cef06657c54a50407cffb14e6100160a
diff --git a/misc/jitterbug/patches/patch-aa b/misc/jitterbug/patches/patch-aa
index 91c657121a4..095e575e636 100644
--- a/misc/jitterbug/patches/patch-aa
+++ b/misc/jitterbug/patches/patch-aa
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/10/05 12:37:19 wennmach Exp $
+$NetBSD: patch-aa,v 1.2 2000/09/12 17:23:02 wennmach Exp $
+
+Adopt the location of the config directory to the layout of the
+packages system.
 
 --- jconfig.h.orig	Sat Oct  2 14:15:32 1999
 +++ jconfig.h	Sat Oct  2 14:17:29 1999
diff --git a/misc/jitterbug/pkg/DEINSTALL b/misc/jitterbug/pkg/DEINSTALL
index 081b24d5468..737a7105c84 100644
--- a/misc/jitterbug/pkg/DEINSTALL
+++ b/misc/jitterbug/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1 1999/10/11 13:39:33 wennmach Exp $
+# $NetBSD: DEINSTALL,v 1.2 2000/09/12 17:23:02 wennmach Exp $
 
 JB_USER=@JB_USER@
 JB_GROUP=@JB_GROUP@
@@ -18,10 +18,9 @@ fi
 echo "If you are removing jitterbug permanently, you may wish to"
 echo "  - remove user ${JB_USER}"
 echo "  - remove group ${JB_GROUP}"
-echo "  - rm -rf ${PREFIX}/${JB_USER}"
-echo "  - rm -rf ${PREFIX}/etc/jitterbug"
-echo "  - remove entries in ${PREFIX}/etc/httpd/httpd.conf"
-echo "  - remove mail alias for ${JB_PACKAGE}-bugs in /etc/aliases"
-echo "           and run newaliases"
+echo "  - remove entries in your httpd.conf (usually ${PREFIX}/etc/httpd/httpd.conf)"
+echo "  - remove mail alias for ${JB_PACKAGE}-bugs in your mail aliases"
+echo "           (typically /etc/aliases or /etc/mail/aliases)"
+echo "           and run \`newaliases' (if you use sendmail)"
 
 exit 0
diff --git a/misc/jitterbug/pkg/MESSAGE b/misc/jitterbug/pkg/MESSAGE
index 17d42293a75..aea5a2557fa 100644
--- a/misc/jitterbug/pkg/MESSAGE
+++ b/misc/jitterbug/pkg/MESSAGE
@@ -15,5 +15,15 @@ o Customize (if necessary)
 
 o Customize the html documents in the project's bug tracking directory:
   @PREFIX@/@JB_USER@/@JB_PACKAGE@/bug_tracking
+
+o Add an alias for @JB_USER@ to your mail aliases:
+  The details on how to do this depend on which MTA you use. For standard
+  sendmail, add the following lines to your aliases files
+  (/etc/aliases or /etc/mail/aliases):
+  @JB_LOCALMAIL@: "|@PREFIX@/@JB_USER@/bin/new_message"
+
+o Append @PREFIX@/etc/jitterbug/httpd.conf.add to your httpd.conf
+  (typically @PREFIX@/etc/httpd/httpd.conf) and restart your httpd.
+
 ===============================================================================
 
diff --git a/misc/jitterbug/pkg/PLIST b/misc/jitterbug/pkg/PLIST
index 53dcdced96d..e80329cede8 100644
--- a/misc/jitterbug/pkg/PLIST
+++ b/misc/jitterbug/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/08/30 14:48:36 wennmach Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/09/12 17:23:02 wennmach Exp $
 @JB_USER@/config/footer.html
 @exec if [ ! -d %D/@JB_DATADIR@ ]; then /bin/mkdir -p %D/@JB_DATADIR@; fi
 @exec if [ ! -f %D/@JB_DATADIR@/footer.html ]; then /bin/cp -p %D/%F %D/@JB_DATADIR@/footer.html; fi
@@ -18,26 +18,32 @@
 etc/jitterbug/@JB_PACKAGE@
 @exec if [ ! -f %D/etc/jitterbug/@JB_PACKAGE@.private ]; then /bin/cp -p %D/%F %D/etc/jitterbug/@JB_PACKAGE@.private; fi
 etc/jitterbug/@JB_PACKAGE@.private
+etc/jitterbug/httpd.conf.add
+@dirrm etc/jitterbug
 @exec if [ ! -d %D/@JB_USER@/etc ]; then /bin/mkdir -p %D/@JB_USER@/etc; fi
 @exec [ -f %D/@JB_USER@/etc/jitterbug.auth ] || /bin/echo "@JB_USER@:*************" > %D/@JB_USER@/etc/jitterbug.auth
 @JB_USER@/bin/new_message
 @JB_USER@/bin/jitterbug
+@dirrm @JB_USER@/bin
 @JB_USER@/doc/POSTINSTALL
 @JB_USER@/doc/NEWPACKAGE
 @JB_USER@/doc/CONFIG.txt
 @JB_USER@/doc/INSTALL
 @JB_USER@/doc/JitterBug.txt
+@dirrm @JB_USER@/doc
 @JB_USER@/@JB_PACKAGE@/bug_tracking/footer.html
 @JB_USER@/@JB_PACKAGE@/bug_tracking/guest.prefs
 @JB_USER@/@JB_PACKAGE@/bug_tracking/guestintro.html
 @JB_USER@/@JB_PACKAGE@/bug_tracking/intro.html
 @JB_USER@/@JB_PACKAGE@/bug_tracking/reportform.html
 @JB_USER@/@JB_PACKAGE@/bug_tracking/users
-@JB_USER@/etc/jitterbug.auth 
+@dirrm @JB_USER@/@JB_PACKAGE@/bug_tracking
+@dirrm @JB_USER@/@JB_PACKAGE@
+@JB_USER@/etc/jitterbug.auth
 @exec /usr/sbin/chown -R @JB_USER@ %D/@JB_USER@
 @exec /usr/bin/chgrp -R @JB_GROUP@ %D/@JB_USER@
-@dirrm @JB_USER@/bin
-@dirrm @JB_USER@/doc
 @dirrm @JB_USER@/config
+@dirrm @JB_USER@/etc
+@dirrm @JB_USER@
 @CGIBINDIR@/@JB_PACKAGE@
 @CGIBINDIR@/@JB_PACKAGE@.private
diff --git a/misc/jitterbug/pkg/REQ b/misc/jitterbug/pkg/REQ
index 0c7c25a0ac1..607dcb3a2b8 100644
--- a/misc/jitterbug/pkg/REQ
+++ b/misc/jitterbug/pkg/REQ
@@ -1,17 +1,14 @@
 #!/bin/sh
 #
-# $NetBSD: REQ,v 1.3 2000/08/18 16:22:40 wiz Exp $
+# $NetBSD: REQ,v 1.4 2000/09/12 17:23:02 wennmach Exp $
 
 JB_USER=@JB_USER@
 JB_USERID=@JB_USERID@
 JB_GROUP=@JB_GROUP@
 JB_GROUPID=@JB_GROUPID@
-JB_LOCALMAIL=@JB_LOCALMAIL@
-JB_PACKAGE=@JB_PACKAGE@
 PREFIX=@PREFIX@
 ADDUSER=@ADDUSER@
 ADDGROUP=@ADDGROUP@
-FILESDIR=@FILESDIR@
 
 PKG=$1
 STAGE=$2
@@ -23,8 +20,6 @@ fi
 
 # Add group first 
 #
-# NB: Ahem, this will not work with NIS, kerberos or hesiod.
-# Will have to rework this, e.g. using finger (wennmach)
 
 if grep "^${JB_GROUP}:" /etc/group 2>&1 >/dev/null
 then
@@ -45,39 +40,15 @@ fi
 if finger ${JB_USER} 2>&1 | grep >/dev/null "no such user"
 then
 	echo "Creating '$JB_USER' user ..."
-	${ADDUSER} -d ${PREFIX} -u ${JB_USERID} -g ${JB_GROUP} ${JB_USER}
+	${ADDUSER} -c "Jitterbug Administrator"				\
+		   -b ${PREFIX}						\
+		   -u ${JB_USERID}					\
+		   -g ${JB_GROUP}					\
+			 ${JB_USER}
 	echo Done.
 else
 	echo "User '$JB_USER' already exists, proceeding."
 fi
 
-if grep "^${JB_LOCALMAIL}:" /etc/aliases 2>&1 >/dev/null
-then
-	echo "'${JB_LOCALMAIL}' alias already exists, proceeding."
-else
-	echo "Adding alias ${JB_LOCALMAIL} to /etc/aliases ..."
-	echo "" >> /etc/aliases
-	echo "# entry for jitterbug" >> /etc/aliases
-	echo "${JB_LOCALMAIL}: \"|${PREFIX}/${JB_USER}/bin/new_message\"" >> /etc/aliases
-	echo "Running newaliases ..."
-	newaliases
-fi
 
-if grep "^# jitterbug config for package ${JB_PACKAGE}" ${PREFIX}/etc/httpd/httpd.conf 2>&1 >/dev/null
-then
-	echo "config lines for ${JB_PACKAGE} already in ${PREFIX}/etc/httpd/httpd.conf, proceeding."
-else
-	echo "Adding config lines for ${JB_PACKAGE} to ${PREFIX}/etc/httpd/httpd.conf ..."
-	sed \
-		-e 's|%JB_PACKAGE%|@JB_PACKAGE@|g' \
-		-e 's|%JB_USER%|@JB_USER@|g' \
-		-e 's|%PREFIX%|@PREFIX@|g' \
-			<  ${FILESDIR}/httpd.conf \
-			>> ${PREFIX}/etc/httpd/httpd.conf
-	if [ -e /var/run/httpd.pid ]; then
-		echo -n "Restarting httpd ..."
-		kill -USR1 `cat /var/run/httpd.pid` 2>&1 >/dev/null || echo -n " failed."
-		echo " "
-	fi
-fi
 exit 0