Added enewgroup/enewuser for apache

(Portage version: 2.0.51-r15)

5 files changed, 35 insertions, 33 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 75eda09eecf0..5b07a16b4f07 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.316 2005/02/01 16:56:36 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.317 2005/02/05 09:03:20 trapni Exp $
+
+  05 Feb 2005; Christian Parpart <trapni@gentoo.org>
+  apache-1.3.33-r1.ebuild, apache-2.0.52-r3.ebuild:
+  Added enewgroup/enewuser for apache
 
   01 Feb 2005; Christian Parpart <trapni@gentoo.org> :
   dropping php useflag and DEPEND
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 554268d14e75..046b232207ec 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,24 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a27067df622df740c195c50215b1c133 ChangeLog 53747
 MD5 784b3e3150529826ac47e99ec3514f90 apache-1.3.29-r2.ebuild 7178
 MD5 f35b6a00cbfa7ddd39face3420cd4fc6 apache-1.3.31-r1.ebuild 6739
 MD5 9a5242011f95057c3afabf1cc3973f11 apache-1.3.31-r2.ebuild 6864
 MD5 85c356965e12f6c785c887ddf6844714 apache-1.3.31-r3.ebuild 6872
 MD5 d039a8316ffde50c2331f0d446623147 apache-1.3.31.ebuild 6693
-MD5 eb0434ac86c30471d86c92872015e42d apache-1.3.32-r1.ebuild 6607
-MD5 cd6aff6c1515610209f5e62e56ea47f8 apache-1.3.32.ebuild 6616
-MD5 d7b8bbd17b6cf6693bf89168e9442828 apache-1.3.33-r1.ebuild 8249
-MD5 a6568a1f276ed27458ab61fb5897bca2 apache-1.3.33.ebuild 6851
 MD5 511fffcacde823eaf727f0984568106b apache-2.0.50.ebuild 12905
 MD5 6f88208cb336bbe5da0a50b08b1e6390 apache-2.0.51-r1.ebuild 12840
 MD5 451d45c9613e9ed7ee770085a8e28ef8 apache-2.0.51.ebuild 12831
+MD5 a419841198cd6a94b9dcf2e07f3c15b7 metadata.xml 617
+MD5 b1af5f9fb89636fb427805dfe9a3621c apache-2.0.52.ebuild 12834
+MD5 eb0434ac86c30471d86c92872015e42d apache-1.3.32-r1.ebuild 6607
+MD5 cd6aff6c1515610209f5e62e56ea47f8 apache-1.3.32.ebuild 6616
+MD5 a6568a1f276ed27458ab61fb5897bca2 apache-1.3.33.ebuild 6851
 MD5 625b80716912a469762650ef8480fde5 apache-2.0.52-r1.ebuild 12893
 MD5 0bc87f432d6353df99d4ca1192dbb607 apache-2.0.52-r2.ebuild 12298
-MD5 3335d40ade0de6751732876448ecd549 apache-2.0.52-r3.ebuild 11373
-MD5 b1af5f9fb89636fb427805dfe9a3621c apache-2.0.52.ebuild 12834
-MD5 a419841198cd6a94b9dcf2e07f3c15b7 metadata.xml 617
+MD5 e1824120d463997e6670dca8933d9e18 apache-1.3.33-r1.ebuild 8337
+MD5 9840ffebdae91b7cb899ed693d80f30e apache-2.0.52-r3.ebuild 11461
 MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
 MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
@@ -40,23 +37,23 @@ MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139
 MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139
 MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r2 139
 MD5 8cc0834ac7a8afa694ddb3f9f9be2cc8 files/digest-apache-1.3.31-r3 139
-MD5 da8dfe2134d7e30dc95e77e0c5f472e1 files/digest-apache-1.3.32 212
-MD5 c560ade7dafffbfdd05ec6deb125280b files/digest-apache-1.3.32-r1 215
-MD5 189cfb35b6320ae3ab57a32dbadd18f2 files/digest-apache-1.3.33 212
-MD5 49e323942ff66f374276312413e46252 files/digest-apache-1.3.33-r1 277
 MD5 cb82ab66045d6f309af686c0206fc3c0 files/digest-apache-2.0.50 201
 MD5 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137
 MD5 0eb9067bb4f2c2495069deaa9d7fce1b files/digest-apache-2.0.51-r1 140
-MD5 baf37cd1bc61f76ac73edd301f52decb files/digest-apache-2.0.52 201
-MD5 44fc8ddc9a05a056d8a08e6d843c997c files/digest-apache-2.0.52-r1 204
-MD5 710e7291039a6cba132568e32daede8a files/digest-apache-2.0.52-r2 213
-MD5 ddc3ea91e8c426b2bd031ae47d1c03fc files/digest-apache-2.0.52-r3 141
 MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
 MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
 MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
 MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
 MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
+MD5 710e7291039a6cba132568e32daede8a files/digest-apache-2.0.52-r2 213
+MD5 baf37cd1bc61f76ac73edd301f52decb files/digest-apache-2.0.52 201
+MD5 da8dfe2134d7e30dc95e77e0c5f472e1 files/digest-apache-1.3.32 212
+MD5 c560ade7dafffbfdd05ec6deb125280b files/digest-apache-1.3.32-r1 215
+MD5 189cfb35b6320ae3ab57a32dbadd18f2 files/digest-apache-1.3.33 212
+MD5 44fc8ddc9a05a056d8a08e6d843c997c files/digest-apache-2.0.52-r1 204
+MD5 49e323942ff66f374276312413e46252 files/digest-apache-1.3.33-r1 277
+MD5 51321d0fff3b47607cde3a4cd84a6db0 files/digest-apache-2.0.52-r3 141
 MD5 3d94c56af17136b6c408f076c32e0362 files/2.0.49/40_mod_ssl.conf 3213
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
@@ -95,10 +92,3 @@ MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r1/04_ssl_makefile.pat
 MD5 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507
 MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
 MD5 5d45e2b46965e7c6866b259df4efe4b2 files/patches/2.0.50-r1/Readme.PATCHES 357
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCA375mPFBzbX68WERAtX3AJ9JoG1j8MYjCdcK8RYoACQvlUGqEQCaA6fE
-/sAucU+GuhfP1hr0vLZfkIs=
-=hheT
------END PGP SIGNATURE-----
diff --git a/net-www/apache/apache-1.3.33-r1.ebuild b/net-www/apache/apache-1.3.33-r1.ebuild
index 9aa647e53aa0..60a98ffb12c5 100644
--- a/net-www/apache/apache-1.3.33-r1.ebuild
+++ b/net-www/apache/apache-1.3.33-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.33-r1.ebuild,v 1.4 2005/01/22 05:25:16 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.33-r1.ebuild,v 1.5 2005/02/05 09:03:20 trapni Exp $
 
 inherit eutils fixheadtails
 
@@ -134,13 +134,17 @@ src_compile() {
 }
 
 src_install() {
+	# setup apache user and group
+	enewgroup apache 81
+	enewuser apache 81 /bin/false /var/www apache
+
+	# general install
 	make install-quiet root=${D} || die
 	dodoc ABOUT_APACHE Announcement INSTALL LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
 
 	# protect the suexec binary
 	if ! useq no-suexec; then
-		local gid=`id -g apache`
-		fowners root:${gid:-81} /usr/sbin/suexec
+		fowners root:apache /usr/sbin/suexec
 		fperms 4710 /usr/sbin/suexec
 	fi
 
diff --git a/net-www/apache/apache-2.0.52-r3.ebuild b/net-www/apache/apache-2.0.52-r3.ebuild
index 49d25ea40c8c..06acdbe9d139 100644
--- a/net-www/apache/apache-2.0.52-r3.ebuild
+++ b/net-www/apache/apache-2.0.52-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52-r3.ebuild,v 1.5 2005/02/04 13:55:18 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52-r3.ebuild,v 1.6 2005/02/05 09:03:20 trapni Exp $
 
 inherit eutils gnuconfig
 
@@ -139,13 +139,17 @@ src_compile() {
 }
 
 src_install () {
+	# setup apache user and group
+	enewgroup apache 81
+	enewuser apache 81 /bin/false /var/www apache
+
+	# general install
 	make DESTDIR=${D} install || die
 	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
 
 	# protect the suexec binary
 	if ! useq no-suexec; then
-		local gid=`id -g apache`
-		fowners root:${gid:-81} /usr/sbin/suexec
+		fowners root:apache /usr/sbin/suexec
 		fperms 4710 /usr/sbin/suexec
 	fi
 
diff --git a/net-www/apache/files/digest-apache-2.0.52-r3 b/net-www/apache/files/digest-apache-2.0.52-r3
index 1c49cd906ac9..d3005cb3b293 100644
--- a/net-www/apache/files/digest-apache-2.0.52-r3
+++ b/net-www/apache/files/digest-apache-2.0.52-r3
@@ -1,2 +1,2 @@
 MD5 0e1b47c53921a1fc8fb006effdb3bf1c httpd-2.0.52.tar.bz2 5187776
-MD5 7ceffb4deb58c97702bf74ca2b4afc1a gentoo-apache-2.0.52-r3.tar.bz2 62145
+MD5 d27735779b2850546b90eedccbd23bff gentoo-apache-2.0.52-r3.tar.bz2 95686