Fixes #58526 (incorrect use of enewuser)

3 files changed, 16 insertions, 12 deletions

diff --git a/net-p2p/gift/Manifest b/net-p2p/gift/Manifest
index 8a877d8ed7a0..7591bc167616 100644
--- a/net-p2p/gift/Manifest
+++ b/net-p2p/gift/Manifest
@@ -1,10 +1,10 @@
-MD5 3408d5257ab210c257a3176267b33453 gift-0.11.6.ebuild 1339
-MD5 5eb5cc99c57c6fc03a4e54557269aecb gift-0.11.7_pre20040627.ebuild 2113
-MD5 d2d3c7cf0d2ec6da65e0f1b76d1c5f40 gift-0.11.6-r1.ebuild 1904
 MD5 167cad0b38268cf2a890a29a059691e6 ChangeLog 2527
+MD5 3408d5257ab210c257a3176267b33453 gift-0.11.6.ebuild 1339
 MD5 875f23093b78af2d864a7a7ba464f126 metadata.xml 223
+MD5 40bcbec53e6a0bb7e674be273f0a9cf9 gift-0.11.6-r1.ebuild 1921
+MD5 29c2e6461208278433fa6dde8515c48d gift-0.11.7_pre20040627.ebuild 2139
 MD5 64b21cffd79f35db281d077303eb810b files/digest-gift-0.11.6 64
 MD5 64b21cffd79f35db281d077303eb810b files/digest-gift-0.11.6-r1 64
+MD5 e53b1d5024a6b4a9c59097929889cd0e files/digest-gift-0.11.7_pre20040627 76
 MD5 bc6445cb39701ab31230338ff7be3949 files/gift.confd 641
 MD5 093c8d14357ed7d8225fd861ecd2bf97 files/gift.initd 667
-MD5 e53b1d5024a6b4a9c59097929889cd0e files/digest-gift-0.11.7_pre20040627 76
diff --git a/net-p2p/gift/gift-0.11.6-r1.ebuild b/net-p2p/gift/gift-0.11.6-r1.ebuild
index 847b851d4522..ba720c2616d9 100644
--- a/net-p2p/gift/gift-0.11.6-r1.ebuild
+++ b/net-p2p/gift/gift-0.11.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/gift-0.11.6-r1.ebuild,v 1.1 2004/06/26 17:53:01 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/gift-0.11.6-r1.ebuild,v 1.2 2004/07/27 13:02:50 kang Exp $
 
 inherit eutils
 
@@ -22,6 +22,11 @@ DEPEND="${RDEPEND}
 
 GIFTUSER="p2p"
 
+src_preinst() {
+	# Add the user
+	enewuser ${GIFTUSER} -1 /bin/bash /home/p2p users
+}
+
 src_install() {
 	einstall \
 		giftconfdir=${D}/etc/giFT \
@@ -34,9 +39,6 @@ src_install() {
 	insinto /etc/conf.d; newins ${FILESDIR}/gift.confd gift
 	exeinto /etc/init.d; newexe ${FILESDIR}/gift.initd gift
 
-	# add user
-	enewuser ${GIFTUSER} -1 /bin/bash /home/p2p users
-
 	touch ${D}/usr/share/giFT/giftd.log
 	chown ${GIFTUSER}:root ${D}/usr/share/giFT/giftd.log
 }
diff --git a/net-p2p/gift/gift-0.11.7_pre20040627.ebuild b/net-p2p/gift/gift-0.11.7_pre20040627.ebuild
index b0803eeb2c7f..0743f1135df7 100644
--- a/net-p2p/gift/gift-0.11.7_pre20040627.ebuild
+++ b/net-p2p/gift/gift-0.11.7_pre20040627.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/gift-0.11.7_pre20040627.ebuild,v 1.3 2004/07/07 19:32:01 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift/gift-0.11.7_pre20040627.ebuild,v 1.4 2004/07/27 13:02:50 kang Exp $
 
 inherit eutils libtool
 
@@ -32,6 +32,11 @@ src_unpack() {
 	./autogen.sh || die
 }
 
+src_preinst() {
+	# Add a new user
+	enewuser ${GIFTUSER} -1 /bin/bash /home/p2p users
+}
+
 src_install() {
 	einstall \
 		giftconfdir=${D}/etc/giFT \
@@ -44,9 +49,6 @@ src_install() {
 	insinto /etc/conf.d; newins ${FILESDIR}/gift.confd gift
 	exeinto /etc/init.d; newexe ${FILESDIR}/gift.initd gift
 
-	# add user
-	enewuser ${GIFTUSER} -1 /bin/bash /home/p2p users
-
 	touch ${D}/usr/share/giFT/giftd.log
 	chown ${GIFTUSER}:root ${D}/usr/share/giFT/giftd.log
 }