Call gentestcrt.sh in pkg_postinst.

Package-Manager: portage-2.0.51.16

2 files changed, 29 insertions, 15 deletions

diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 4bbd1bf89651..afea63131a60 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 12fc896a86473a04933557fb75fdc8ca ChangeLog 54477
 MD5 784b3e3150529826ac47e99ec3514f90 apache-1.3.29-r2.ebuild 7178
 MD5 f35b6a00cbfa7ddd39face3420cd4fc6 apache-1.3.31-r1.ebuild 6739
@@ -6,16 +9,16 @@ 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 7ee11979b35fe1539a4feb3d6c6b613c apache-1.3.33-r1.ebuild 8632
 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 625b80716912a469762650ef8480fde5 apache-2.0.52-r1.ebuild 12893
+MD5 0bc87f432d6353df99d4ca1192dbb607 apache-2.0.52-r2.ebuild 12298
+MD5 0cf9883613088e305a968618162f451a apache-2.0.52-r3.ebuild 11729
 MD5 b1af5f9fb89636fb427805dfe9a3621c apache-2.0.52.ebuild 12834
 MD5 a419841198cd6a94b9dcf2e07f3c15b7 metadata.xml 617
-MD5 0bc87f432d6353df99d4ca1192dbb607 apache-2.0.52-r2.ebuild 12298
-MD5 7ee11979b35fe1539a4feb3d6c6b613c apache-1.3.33-r1.ebuild 8632
-MD5 cfed33fca49802175fe800d41f6bbd19 apache-2.0.52-r3.ebuild 11624
-MD5 625b80716912a469762650ef8480fde5 apache-2.0.52-r1.ebuild 12893
 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,20 +43,20 @@ 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 79fe350dca5b488a1b0f396caeb43248 files/digest-apache-1.3.33-r1 286
 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 c600aeef0fc691794b759685d39de6d5 files/digest-apache-2.0.52-r3 150
 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 79fe350dca5b488a1b0f396caeb43248 files/digest-apache-1.3.33-r1 286
-MD5 c600aeef0fc691794b759685d39de6d5 files/digest-apache-2.0.52-r3 150
 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
@@ -92,3 +95,10 @@ 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.2.6 (GNU/Linux)
+
+iD8DBQFCGl7qjUHll2nfF60RAmfpAKCjKZ2jGNZJ6scbPAIuH1tZIDgxIACeMXOM
+k9U5kuciedZTsRF9xuOxMGo=
+=2/up
+-----END PGP SIGNATURE-----
diff --git a/net-www/apache/apache-2.0.52-r3.ebuild b/net-www/apache/apache-2.0.52-r3.ebuild
index 5dfe9bb4e94b..c428f573074d 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.13 2005/02/20 22:34:47 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52-r3.ebuild,v 1.14 2005/02/21 22:21:09 beu Exp $
 
 inherit eutils gnuconfig
 
@@ -260,20 +260,24 @@ src_install () {
 		fperms 755 ${i}
 	done
 
+	# We'll be needing /etc/apache2/ssl if USE=ssl
+	useq ssl && keepdir /etc/apache2/ssl
+
+}
+
+pkg_postinst() {
+
 	# Automatically generate test ceritificates if ssl USE flag is beeing set
 	if useq ssl; then
-		keepdir /etc/apache2/ssl
-		cd /etc/apache2/ssl
+		cd ${ROOT}/etc/apache2/ssl
 		einfo
 		einfo "Generating self-signed test certificate in /etc/apache2/ssl..."
-		yes "" 2>/dev/null | ${D}/usr/sbin/gentestcrt.sh >/dev/null 2>&1
+		yes "" 2>/dev/null | \
+			${ROOT}/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \
+			die "gentestcrt.sh failed"
 		einfo
 	fi
 
-}
-
-pkg_postinst() {
-
 	# Check for dual/upgrade install
 	if has_version '=net-www/apache-1*' || ! use apache2 ; then
 		ewarn