Using enewuser enewgroup now. Fixes bug #43117.

5 files changed, 10 insertions, 165 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 9f1fa43d647c..2b133468776b 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.34 2004/02/27 00:39:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.35 2004/02/28 09:32:43 eradicator Exp $
+
+  28 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  freenet-0.5.2.1-r7.ebuild, freenet-0.5.2.1-r8.ebuild:
+  Using enewuser enewgroup now.  Fixes bug #43117.
 
 *freenet-0.5.2.1-r8 (26 Feb 2004)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index dd6f37dd8a6c..140b5dcb7558 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,9 +1,7 @@
-MD5 892f77279d2739d01e1ac67dd9d945c7 freenet-0.5.2.1-r8.ebuild 4633
-MD5 830296700ca3e0757345f801a5f47aff freenet-0.5.2.1-r7.ebuild 4542
-MD5 791660694268b5246043cbef09e66d7a ChangeLog 6899
+MD5 f50522cff1ce7cb616746a5484591b50 freenet-0.5.2.1-r8.ebuild 4361
+MD5 28e72303e0a19873f58099a4c3c0f879 ChangeLog 7064
 MD5 875f23093b78af2d864a7a7ba464f126 metadata.xml 223
 MD5 15c0d70946cdbbb23f48e9c13823a26b files/rc.freenet5 2215
 MD5 4ae956431fc61a4f535d971c2e908478 files/start-freenet.sh 330
 MD5 169efe0f216ade927538fab48315ecc7 files/conf.freenet 323
-MD5 3a391b52e5e7740c7bdafcba7a9ee4d3 files/digest-freenet-0.5.2.1-r7 68
 MD5 3a391b52e5e7740c7bdafcba7a9ee4d3 files/digest-freenet-0.5.2.1-r8 68
diff --git a/net-p2p/freenet/files/digest-freenet-0.5.2.1-r7 b/net-p2p/freenet/files/digest-freenet-0.5.2.1-r7
deleted file mode 100644
index a9b4651be0e9..000000000000
--- a/net-p2p/freenet/files/digest-freenet-0.5.2.1-r7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59270ee48d889e0be9cae584b67d2743 freenet-0.5.2.1.tar.gz 2118774
diff --git a/net-p2p/freenet/freenet-0.5.2.1-r7.ebuild b/net-p2p/freenet/freenet-0.5.2.1-r7.ebuild
deleted file mode 100644
index 0aadaeb7b68b..000000000000
--- a/net-p2p/freenet/freenet-0.5.2.1-r7.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.5.2.1-r7.ebuild,v 1.2 2004/01/31 12:33:04 mholzer Exp $
-
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="large-scale peer-to-peer network that creates a massive virtual information store open to anyone"
-SRC_URI="mirror://sourceforge/freenet/${P}.tar.gz"
-RESTRICT="nomirror"
-HOMEPAGE="http://freenetproject.org/"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-LICENSE="GPL-2"
-
-DEPEND="virtual/jre
-	>=sys-apps/sed-4
-	app-admin/sudo"
-
-src_install() {
-	exeinto /usr/bin
-	doexe ${FILESDIR}/start-freenet.sh
-
-	dodoc README
-
-	dodir /var/freenet/stats /var/freenet/store
-	keepdir /var/freenet/stats /var/freenet/store
-
-	insinto /usr/lib/freenet
-	doins freenet.jar freenet-ext.jar
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.freenet freenet
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/rc.freenet5 freenet
-}
-
-pkg_preinst() {
-	if ! groupmod freenet > /dev/null 2>&1; then
-		groupadd freenet 2> /dev/null || \
-		die "Failed to create freenet group"
-	fi
-	if ! usermod freenet > /dev/null 2>&1; then
-		useradd -g freenet -s /bin/bash -d /var/empty \
-			-c "freenet" freenet 2> /dev/null || \
-			die "Failed to create freenet user"
-	else
-		usermod -s /bin/bash freenet
-	fi
-}
-
-pkg_postinst() {
-	if [ -f /etc/freenet.conf ];then
-		chmod 664 /etc/freenet.conf
-		chown root:freenet /etc/freenet.conf
-	fi
-	chown -R freenet:freenet /var/freenet
-	einfo "Congratulations on merging freenet, please run"
-	einfo "# ebuild ${EBUILD} config"
-	einfo "to update freenet to the latest jars and seednodes."
-	einfo "This step is also necessary to configure freenet for"
-	einfo "first use.  You may also run this step again at any time"
-	einfo "to get any updates available to freenet"
-	ewarn "Anyone who merged a freenet prior to 0.5.2.1-r3 will"
-	ewarn "need to change their logFile setting to /var/freenet/freenet.log"
-	ewarn "in order for freenet to continue to function"
-}
-
-pkg_postrm() {
-	if [ -z has_version ]; then
-		einfo "Please remove /var/freenet manually if you are't going to"
-		einfo "continue to use Freenet on this machine!"
-	fi
-}
-
-pkg_config() {
-	YN="X"
-	while [ "${YN}" != "y" -a "${YN}" != "Y" -a "${YN}" != "n" -a "${YN}" != "N" -a "${YN}" != "" ]; do
-		einfo "Would you like to update freenet files now? [Y/n]"
-		read YN
-	done
-	if [ -z "$(echo ${YN}|sed -e s/y//i)" ];then
-		einfo "Press U within 2 seconds to try an unstable snapshot"
-		read -n 1 -t 2 YN
-		if [ "${YN}" == "U" ] || [ "${YN}" == "u" ]; then
-			wget http://freenetproject.org/snapshots/freenet-unstable-latest.jar -O /usr/lib/freenet/freenet.jar
-		else
-			wget http://freenetproject.org/snapshots/freenet-latest.jar -O /usr/lib/freenet/freenet.jar
-		fi
-		wget http://freenetproject.org/snapshots/seednodes.ref -O /var/freenet/seednodes.ref
-		touch -d "1/1/1970" /var/freenet/seednodes.ref
-		chown freenet:freenet /var/freenet/seednodes.ref
-	fi
-
-	if [ -f /etc/freenet.conf ]; then
-		einfo "Press C within 2 seconds to force reconfiguration of freenet"
-		read -n 1 -t 2 YN
-	fi
-	if [ ! -f /etc/freenet.conf ] || [ "${YN}" == C ] || [ "${YN}" == "c" ]; then
-		einfo "Preparing to configure freenet..."
-		if [ -f /etc/freenet.conf ]; then
-			cp /etc/freenet.conf .
-		else
-			# Pre-determine IP address
-			IP="$(hostname -i)"
-			declare -i DEFLP
-			if [ "${RANDOM}" ]; then
-				DEFLP=${RANDOM}%30000+2000
-			else
-				echo "no random in shell, enter a FNP port number + <ENTER>"
-				read DEFLP
-			fi
-
-			cat << EOF > freenet.conf
-ipAddress=${IP}
-listenPort=${DEFLP}
-seedFile=/var/freenet/seednodes.ref
-logFile=/var/freenet/freenet.log
-storeFile=/var/freenet/store
-diagnosticsPath=/var/freenet/stats
-routingDir=/var/freenet
-nodeFile=/var/freenet/node
-EOF
-		fi
-
-		CLASSPATH="/usr/lib/freenet/freenet.jar:/usr/lib/freenet/freenet-ext.jar:${CLASSPATH}"
-		$(java-config --java) freenet.node.Main --config
-		mv freenet.conf /etc
-		sed -i -e "s/^%\(ipAddress\)/\1/" \
-		       -e "s/^%\(listenPort\)/\1/" \
-		       -e "s/^%\(seedFile\)/\1/" \
-		       -e "s/^%\(logFile\)/\1/" \
-		       -e "s/^%\(storeFile\)/\1/" \
-		       -e "s/^%\(diagnosticsPath\)/\1/" \
-		       -e "s/^%\(routingDir\)/\1/" \
-		       -e "s/^%\(nodeFile\)/\1/" /etc/freenet.conf
-		chmod 664 /etc/freenet.conf
-		chown root:freenet /etc/freenet.conf
-	fi
-	einfo "Congratulations, freenet is configured and up to date"
-	einfo "use '/etc/init.d/freenet start' to start it"
-	einfo "You can always re-update/reconfigure  your freenet with:"
-	einfo "# ebuild ${EBUILD} config"
-}
diff --git a/net-p2p/freenet/freenet-0.5.2.1-r8.ebuild b/net-p2p/freenet/freenet-0.5.2.1-r8.ebuild
index 33e218755130..dc683b61e4bc 100644
--- a/net-p2p/freenet/freenet-0.5.2.1-r8.ebuild
+++ b/net-p2p/freenet/freenet-0.5.2.1-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.5.2.1-r8.ebuild,v 1.1 2004/02/27 00:40:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.5.2.1-r8.ebuild,v 1.2 2004/02/28 09:32:43 eradicator Exp $
 
 IUSE=""
 
@@ -39,17 +39,8 @@ src_install() {
 }
 
 pkg_preinst() {
-	if ! groupmod freenet > /dev/null 2>&1; then
-		groupadd freenet 2> /dev/null || \
-		die "Failed to create freenet group"
-	fi
-	if ! usermod freenet > /dev/null 2>&1; then
-		useradd -g freenet -s /bin/bash -d /var/empty \
-			-c "freenet" freenet 2> /dev/null || \
-			die "Failed to create freenet user"
-	else
-		usermod -s /bin/bash freenet
-	fi
+	enewgroup freenet
+	enewuser freenet -1 /bin/bash /var/freenet freenet
 }
 
 pkg_postinst() {