From 46ccc88ca5024428a45c39320f92ca4ef928239a Mon Sep 17 00:00:00 2001
From: sturm <sturm@openbsd.org>
Date: Sun, 22 Jun 2003 10:09:57 +0000
Subject: [PATCH] new user/group naming schema

bump PKGNAME for bitlbee

Han Boetes <han@mijncomputer.nl> ok
---
 .../OpenBSD-SpamAssassin-mini-howto.html      |  4 +--
 net/bitlbee/Makefile                          |  3 +-
 net/bitlbee/files/user-guide.html             |  2 +-
 net/bitlbee/pkg/DEINSTALL                     |  6 ++--
 net/bitlbee/pkg/INSTALL                       | 30 +++++++++++++++----
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/mail/p5-Mail-SpamAssassin/files/OpenBSD-SpamAssassin-mini-howto.html b/mail/p5-Mail-SpamAssassin/files/OpenBSD-SpamAssassin-mini-howto.html
index df7f0d08403..5a26101b149 100644
--- a/mail/p5-Mail-SpamAssassin/files/OpenBSD-SpamAssassin-mini-howto.html
+++ b/mail/p5-Mail-SpamAssassin/files/OpenBSD-SpamAssassin-mini-howto.html
@@ -7,10 +7,10 @@ making use of the spamc/spamd combination.
 
 <p>First let's add a user for the spamd.
 
-<pre><b># useradd -s /usr/bin/false -b /nonexistent spamdaemon</b></pre>
+<pre><b># useradd -s /usr/bin/false -b /nonexistent -u 506 _spamdaemon</b></pre>
 
 <p>Add this line to <b><code>/etc/rc.local</b></code>:
-<pre><b># /usr/local/bin/spamd -u spamdaemon -d -L -p 4321 -x</b></pre>
+<pre><b># /usr/local/bin/spamd -u _spamdaemon -d -L -p 4321 -x</b></pre>
 <br> Use that same line to start spamd now.
 
 <p>The final step: put this at the top of your <b><code>.procmailrc</b></code>.
diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile
index beeddeeeb29..7a0f0dde004 100644
--- a/net/bitlbee/Makefile
+++ b/net/bitlbee/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/04/16 18:51:08 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2003/06/22 10:09:57 sturm Exp $
 COMMENT=		"IRC-proxy to connect to icq, aol, msn and jabber"
 
 DISTNAME=		bitlbee-0.73
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		net
 
 HOMEPAGE=		http://www.lintux.cx/bitlbee.html
diff --git a/net/bitlbee/files/user-guide.html b/net/bitlbee/files/user-guide.html
index 5bf0b13ccc2..98f642e27e2 100644
--- a/net/bitlbee/files/user-guide.html
+++ b/net/bitlbee/files/user-guide.html
@@ -181,7 +181,7 @@ nobody).</p>
 <tr>
 <td>
 <pre class="PROGRAMLISTING">
-127.0.0.1:6667    stream  tcp     nowait bitlbee /usr/local/sbin/bitlbee bitlbee
+127.0.0.1:6667    stream  tcp     nowait _bitlbee /usr/local/sbin/bitlbee bitlbee
 </pre>
 </td>
 </tr>
diff --git a/net/bitlbee/pkg/DEINSTALL b/net/bitlbee/pkg/DEINSTALL
index e07d9a1e0da..69779909c04 100644
--- a/net/bitlbee/pkg/DEINSTALL
+++ b/net/bitlbee/pkg/DEINSTALL
@@ -1,13 +1,13 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2003/04/16 18:51:08 wilfried Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/06/22 10:09:57 sturm Exp $
 #
 # Bitlbee de-installation
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 DB_DIR=${DB_DIR}
-BITLBEEUSER=bitlbee
-BITLBEEGROUP=bitlbee
+BITLBEEUSER=_bitlbee
+BITLBEEGROUP=_bitlbee
 
 cat <<EOF
 +---------------
diff --git a/net/bitlbee/pkg/INSTALL b/net/bitlbee/pkg/INSTALL
index 1c8c1a9a86a..dd37bc14719 100644
--- a/net/bitlbee/pkg/INSTALL
+++ b/net/bitlbee/pkg/INSTALL
@@ -1,13 +1,14 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.1.1.1 2003/04/16 18:51:08 wilfried Exp $
+# $OpenBSD: INSTALL,v 1.2 2003/06/22 10:09:57 sturm Exp $
 #
 # Pre/post-installation setup of Bitlbee
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 DB_DIR=${DB_DIR}
-BITLBEEUSER=bitlbee
-BITLBEEGROUP=bitlbee
+BITLBEEUSER=_bitlbee
+BITLBEEGROUP=_bitlbee
+ID=509
 
 do_notice_existingdir() {
 echo <<EOF
@@ -32,14 +33,14 @@ do_usergroup_install() {
     echo "===> Using $BITLBEEGROUP group for Bitlbee"
   else
     echo "===> Creating $BITLBEEGROUP group for Bitlbee"
-    groupadd $BITLBEEGROUP
+    groupadd -g $ID $BITLBEEGROUP
   fi
   userinfo -e $BITLBEEUSER
   if [ $? -eq 0 ]; then
     echo "===> Using $BITLBEEUSER user for Bitlbee"
   else
     echo "===> Creating $BITLBEEUSER user for Bitlbee"
-    useradd -g $BITLBEEGROUP -d /nonexistent -L daemon -c 'Bitlbee Account' -s /sbin/nologin $BITLBEEUSER
+    useradd -g $BITLBEEGROUP -d /nonexistent -L daemon -c 'Bitlbee Account' -s /sbin/nologin -u $ID $BITLBEEUSER
   fi
 }
 
@@ -52,7 +53,7 @@ cat <<EOF
 
 To enable bitlbee you have to add a line like:
 
-    127.0.0.1:6667    stream  tcp     nowait bitlbee /usr/local/libexec/bitlbee bitlbee
+    127.0.0.1:6667    stream  tcp     nowait _bitlbee /usr/local/libexec/bitlbee bitlbee
 
 to your /etc/inetd.conf and restart inetd with
 
@@ -62,6 +63,22 @@ to your /etc/inetd.conf and restart inetd with
 EOF
 }
 
+do_warning() {
+cat <<EOF
++---------------
+| WARNING!
+|
+| This port has changed the user/group it uses from bitlbee to ${BITLBEEUSER}.
+| If you installed this port before, ensure all permissions are set correctly
+| with:
+|
+|   # ls -ld ${DB_DIR}
+|   # chown -R ${BITLBEEUSER}:${BITLBEEGROUP} ${DB_DIR}
+|
+| And don't forget to remove the old user/group.
++---------------
+EOF
+}
 # Verify/process the command
 #
 case $2 in
@@ -76,6 +93,7 @@ case $2 in
 	  do_database_install
 	fi
 	  do_manual_notice
+	do_warning
 	;;
     *)
 	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2