From c03b83ce73dbddbe62ef280354caa08990c23e51 Mon Sep 17 00:00:00 2001 From: Bryan Østergaard Date: Thu, 12 May 2005 18:47:51 +0000 Subject: Fixed ebuilds, bug 92348 and bug 91737. Package-Manager: portage-2.0.51.21-r1 --- net-www/apache/ChangeLog | 9 +- net-www/apache/Manifest | 174 ++++++----- net-www/apache/apache-2.0.54-r4.ebuild | 401 +++++++++++++++++++++++++ net-www/apache/apache-2.0.54-r5.ebuild | 423 +++++++++++++++++++++++++++ net-www/apache/files/digest-apache-2.0.54-r4 | 3 + net-www/apache/files/digest-apache-2.0.54-r5 | 2 + 6 files changed, 931 insertions(+), 81 deletions(-) create mode 100644 net-www/apache/apache-2.0.54-r4.ebuild create mode 100644 net-www/apache/apache-2.0.54-r5.ebuild create mode 100644 net-www/apache/files/digest-apache-2.0.54-r4 create mode 100644 net-www/apache/files/digest-apache-2.0.54-r5 (limited to 'net-www') diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog index 22edcc0b0aed..0753d8e4b814 100644 --- a/net-www/apache/ChangeLog +++ b/net-www/apache/ChangeLog @@ -1,6 +1,13 @@ # 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.358 2005/05/12 14:02:41 pylon Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.359 2005/05/12 18:47:50 kloeri Exp $ + +*apache-2.0.54-r5 (12 May 2005) +*apache-2.0.54-r4 (12 May 2005) + + 12 May 2005; Bryan Østergaard + +apache-2.0.54-r4.ebuild, +apache-2.0.54-r5.ebuild: + Fixed ebuilds, bug 92348 and bug 91737. 12 May 2005; Lars Weiler apache-2.0.54-r2.ebuild: Stable on ppc; bug #91737. diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest index 1c7ac8a95f9d..d77423d3d4e1 100644 --- a/net-www/apache/Manifest +++ b/net-www/apache/Manifest @@ -1,114 +1,128 @@ -MD5 87370fee7054a7c4cfa0efb3a320c34b apache-2.0.50.ebuild 12902 -MD5 4972651d68219ad15fc821feda90d440 apache-1.3.31.ebuild 6760 -MD5 26aeecc4289a4d8982052af3d229704a apache-1.3.31-r2.ebuild 6931 -MD5 83b0135a7c76f7689bf2ffebe147af5f apache-2.0.51-r1.ebuild 12854 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 aec84d69c7d6b35797d6c626ec2eb397 apache-2.0.54-r2.ebuild 12282 +MD5 927a5fe94ee166c4c9b7317fbac27f4d apache-2.0.52-r1.ebuild 13198 +MD5 b34b4d92bab51e4eab58fd5021beb7c2 apache-2.0.54.ebuild 12084 +MD5 06454d058ced6c9c8e5955ed1fb8efd7 ChangeLog 61419 +MD5 a04435ee78d579ba5aa3856b4b32d57c apache-1.3.33-r4.ebuild 8649 MD5 36b862baf4b3928e4da389714afb1155 apache-1.3.29-r2.ebuild 7227 +MD5 45a906f18282d41c58650ac4aedbbda2 apache-2.0.54-r4.ebuild 12388 MD5 37f5ed6f2423381241b029e6685bcdd2 metadata.xml 493 +MD5 cb36b7b2771f9ae84590f3f8cf8791d4 apache-2.0.53.ebuild 11997 +MD5 28d2832713864257d005780be669f927 apache-2.0.52-r2.ebuild 12308 +MD5 4972651d68219ad15fc821feda90d440 apache-1.3.31.ebuild 6760 +MD5 0c9c973aea3a51fb819b54156c4d03d9 apache-2.0.53-r1.ebuild 12289 +MD5 83b0135a7c76f7689bf2ffebe147af5f apache-2.0.51-r1.ebuild 12854 MD5 d2794a4d623366ae015307911b5f5a1f apache-1.3.31-r1.ebuild 6806 -MD5 a6d90fd917c7b3efc682913f072f9332 ChangeLog 61203 -MD5 ad0e486b5b081bb326450bf883f7363b apache-1.3.31-r3.ebuild 6939 -MD5 57a7be187470abfa52773b81151a38a6 apache-2.0.52.ebuild 12877 +MD5 5a8c76df38a1569a641933ce49383e6f apache-2.0.54-r3.ebuild 12377 +MD5 defa6b47125809551de21814b2ccf0e6 apache-1.3.33.ebuild 6917 +MD5 ede664799f982639467a3e577f2a396c apache-2.0.54-r1.ebuild 12377 +MD5 285014a349ee001e94990c183198d0a1 apache-2.0.54-r5.ebuild 12482 MD5 534bbe01d74bdb592e4570db0cd45807 apache-1.3.32-r1.ebuild 6675 +MD5 39155e41c5083bd0206e54c44445141f apache-2.0.52-r4.ebuild 12415 MD5 b46e4e143cdd5a3b8771324939cc8d0a apache-1.3.32.ebuild 6683 -MD5 bb680257cf230b7619d9ec6e65a07c51 apache-2.0.51.ebuild 12842 -MD5 defa6b47125809551de21814b2ccf0e6 apache-1.3.33.ebuild 6917 -MD5 927a5fe94ee166c4c9b7317fbac27f4d apache-2.0.52-r1.ebuild 13198 -MD5 28d2832713864257d005780be669f927 apache-2.0.52-r2.ebuild 12308 -MD5 9ef3cdc19c9f3d025461cb26a226f82e apache-1.3.33-r1.ebuild 6942 +MD5 57a7be187470abfa52773b81151a38a6 apache-2.0.52.ebuild 12877 MD5 72330bf48275b7927a665c70fb384c60 apache-2.0.52-r3.ebuild 12132 -MD5 cb36b7b2771f9ae84590f3f8cf8791d4 apache-2.0.53.ebuild 11997 -MD5 e35fab2418ca9c57c8344e69345c161c apache-1.3.33-r2.ebuild 8649 -MD5 b34b4d92bab51e4eab58fd5021beb7c2 apache-2.0.54.ebuild 12084 +MD5 9ef3cdc19c9f3d025461cb26a226f82e apache-1.3.33-r1.ebuild 6942 MD5 0252b007f568475317ce9abc92521c0d apache-1.3.33-r3.ebuild 6939 -MD5 a04435ee78d579ba5aa3856b4b32d57c apache-1.3.33-r4.ebuild 8649 -MD5 39155e41c5083bd0206e54c44445141f apache-2.0.52-r4.ebuild 12415 -MD5 0c9c973aea3a51fb819b54156c4d03d9 apache-2.0.53-r1.ebuild 12289 -MD5 ede664799f982639467a3e577f2a396c apache-2.0.54-r1.ebuild 12377 -MD5 aec84d69c7d6b35797d6c626ec2eb397 apache-2.0.54-r2.ebuild 12282 -MD5 5a8c76df38a1569a641933ce49383e6f apache-2.0.54-r3.ebuild 12377 -MD5 2b4457530debe71160f56ae68ea4c9c8 files/apache.rc6 1078 -MD5 ba87ae612a52d75f0109a2aba6cd605b files/apachedelmod 3187 -MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149 +MD5 bb680257cf230b7619d9ec6e65a07c51 apache-2.0.51.ebuild 12842 +MD5 87370fee7054a7c4cfa0efb3a320c34b apache-2.0.50.ebuild 12902 +MD5 26aeecc4289a4d8982052af3d229704a apache-1.3.31-r2.ebuild 6931 +MD5 e35fab2418ca9c57c8344e69345c161c apache-1.3.33-r2.ebuild 8649 +MD5 ad0e486b5b081bb326450bf883f7363b apache-1.3.31-r3.ebuild 6939 +MD5 d44cd7c0521a1fbc26bff3dcc5024185 files/digest-apache-2.0.53 147 MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316 -MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006 -MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139 -MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319 -MD5 8de91cfef98483656aa4ab47f2c2ce8e files/apache2 331 -MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342 -MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788 MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729 -MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865 -MD5 1ca7ef45f474a29f599364f2022b4e0f files/apache.confd 994 -MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211 +MD5 2b4457530debe71160f56ae68ea4c9c8 files/apache.rc6 1078 +MD5 647bdf060613bdf1fdb840ed5ae51b72 files/apachelogserverstatus 4765 MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706 -MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588 -MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328 -MD5 042973893566b6b09b4dd9755d8f0881 files/apacheaddmod 5979 +MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211 +MD5 6d1c7c0109b042545cde7f41e365abcc files/digest-apache-2.0.54-r2 214 +MD5 a76e0df0ecc6920d9f4f139e31288155 files/apache-builtin-mods 2467 MD5 cb82ab66045d6f309af686c0206fc3c0 files/digest-apache-2.0.50 201 -MD5 647bdf060613bdf1fdb840ed5ae51b72 files/apachelogserverstatus 4765 -MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r2 139 -MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59 -MD5 710e7291039a6cba132568e32daede8a files/digest-apache-2.0.52-r2 213 +MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788 +MD5 c560ade7dafffbfdd05ec6deb125280b files/digest-apache-1.3.32-r1 215 MD5 0eb9067bb4f2c2495069deaa9d7fce1b files/digest-apache-2.0.51-r1 140 -MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781 -MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905 +MD5 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137 MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139 -MD5 a76e0df0ecc6920d9f4f139e31288155 files/apache-builtin-mods 2467 MD5 8b5e7c3c7da4ebb58471f917a693e047 files/apachesplitlogfile 5068 +MD5 816bec3536b523d99cd6b295058de05a files/digest-apache-2.0.53-r1 150 +MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328 +MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r2 139 +MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342 +MD5 710e7291039a6cba132568e32daede8a files/digest-apache-2.0.52-r2 213 +MD5 1ca7ef45f474a29f599364f2022b4e0f files/apache.confd 994 +MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588 +MD5 bb9ffec6d5f5d409b6705a2d8c19bc6a files/digest-apache-1.3.33-r3 212 +MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006 MD5 8cc0834ac7a8afa694ddb3f9f9be2cc8 files/digest-apache-1.3.31-r3 139 -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 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137 MD5 189cfb35b6320ae3ab57a32dbadd18f2 files/digest-apache-1.3.33 212 -MD5 44fc8ddc9a05a056d8a08e6d843c997c files/digest-apache-2.0.52-r1 204 -MD5 bb9ffec6d5f5d409b6705a2d8c19bc6a files/digest-apache-1.3.33-r1 212 -MD5 c600aeef0fc691794b759685d39de6d5 files/digest-apache-2.0.52-r3 150 -MD5 d44cd7c0521a1fbc26bff3dcc5024185 files/digest-apache-2.0.53 147 -MD5 7534b79d78a91297c44cc69ac4545cc8 files/digest-apache-1.3.33-r2 286 +MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319 +MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781 +MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905 +MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139 +MD5 ba87ae612a52d75f0109a2aba6cd605b files/apachedelmod 3187 +MD5 eb617e7b694211053e30d542e84b3b76 files/digest-apache-2.0.54-r3 150 +MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149 MD5 3f04d72040cefd0e36164b9336d93bed files/digest-apache-2.0.54 147 -MD5 bb9ffec6d5f5d409b6705a2d8c19bc6a files/digest-apache-1.3.33-r3 212 MD5 ed50404f07dbf0f82bd84de866aa90c3 files/digest-apache-1.3.33-r4 286 -MD5 fb2a88acf153bcf432fda27a8efecd25 files/digest-apache-2.0.52-r4 150 -MD5 816bec3536b523d99cd6b295058de05a files/digest-apache-2.0.53-r1 150 +MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59 MD5 0f8432388d7a76db46d14868bb5eb88b files/digest-apache-2.0.54-r1 150 -MD5 6d1c7c0109b042545cde7f41e365abcc files/digest-apache-2.0.54-r2 214 -MD5 eb617e7b694211053e30d542e84b3b76 files/digest-apache-2.0.54-r3 150 -MD5 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437 -MD5 5a7b58d54689d6e9d8f8214b5150d18f files/common/config.layout 741 -MD5 54c0546fa2b1985686cf22c9efa2c7dc files/common/apr-config.layout 434 -MD5 9c606730ea7cc37417109915b2fbe522 files/conf/VirtualHomePages.conf 909 -MD5 139f5b0d5e2bf3525464a336ed2e1f83 files/conf/Vhosts.conf 1910 -MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115 -MD5 c70dc2c9a5e56660f3f120fcb822fadc files/conf/commonapache.conf 22216 -MD5 162afe15726e298774bc36b586ae070a files/conf/DynamicVhosts.conf 965 -MD5 20f6868829149f669a7afd1e03245692 files/2.0.49/apache2.initd 2494 -MD5 228b5a816ea5534287be3c5e1d6ec7cd files/2.0.49/apache2.confd 1944 -MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053 +MD5 fb2a88acf153bcf432fda27a8efecd25 files/digest-apache-2.0.52-r4 150 +MD5 8de91cfef98483656aa4ab47f2c2ce8e files/apache2 331 +MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865 +MD5 4fd20a441a6d2f4d5f423e455000e81f files/digest-apache-2.0.54-r4 214 +MD5 44fc8ddc9a05a056d8a08e6d843c997c files/digest-apache-2.0.52-r1 204 +MD5 b2f770f970814a1f3476ab9071453d1d files/digest-apache-2.0.54-r5 150 +MD5 baf37cd1bc61f76ac73edd301f52decb files/digest-apache-2.0.52 201 +MD5 c600aeef0fc691794b759685d39de6d5 files/digest-apache-2.0.52-r3 150 +MD5 bb9ffec6d5f5d409b6705a2d8c19bc6a files/digest-apache-1.3.33-r1 212 +MD5 7534b79d78a91297c44cc69ac4545cc8 files/digest-apache-1.3.33-r2 286 +MD5 042973893566b6b09b4dd9755d8f0881 files/apacheaddmod 5979 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902 -MD5 1c4d9999353237c8b3835b7d73ba7a15 files/2.0.49/apache2-builtin-mods 2215 -MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583 -MD5 8a234c8eb9cc840fe2d3cfbcdfedc315 files/2.0.49/gentestcrt.sh 8807 MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652 +MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053 +MD5 228b5a816ea5534287be3c5e1d6ec7cd files/2.0.49/apache2.confd 1944 +MD5 8a234c8eb9cc840fe2d3cfbcdfedc315 files/2.0.49/gentestcrt.sh 8807 MD5 3d94c56af17136b6c408f076c32e0362 files/2.0.49/40_mod_ssl.conf 3213 +MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583 MD5 8570b1055b64f29120e21be94bbdd73d files/2.0.49/apache2splitlogfile 4875 -MD5 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048 +MD5 1c4d9999353237c8b3835b7d73ba7a15 files/2.0.49/apache2-builtin-mods 2215 +MD5 20f6868829149f669a7afd1e03245692 files/2.0.49/apache2.initd 2494 +MD5 54c0546fa2b1985686cf22c9efa2c7dc files/common/apr-config.layout 434 +MD5 5a7b58d54689d6e9d8f8214b5150d18f files/common/config.layout 741 +MD5 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437 +MD5 162afe15726e298774bc36b586ae070a files/conf/DynamicVhosts.conf 965 +MD5 9c606730ea7cc37417109915b2fbe522 files/conf/VirtualHomePages.conf 909 +MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115 +MD5 c70dc2c9a5e56660f3f120fcb822fadc files/conf/commonapache.conf 22216 +MD5 139f5b0d5e2bf3525464a336ed2e1f83 files/conf/Vhosts.conf 1910 +MD5 59deb12158a55cc2259cd79c245eb00d files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671 MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r1/04_ssl_makefile.patch 619 MD5 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507 -MD5 59deb12158a55cc2259cd79c245eb00d files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671 -MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319 +MD5 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048 +MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r1/00_gentoo_db4_detect.patch 1304 MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31-r1/00_gentoo_base.patch 27799 MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r1/00_gentoo_suexec_pam.patch 2149 -MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r1/00_gentoo_db4_detect.patch 1304 MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r1/00_gentoo_apachectl.patch 32836 -MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31/00_gentoo_base.patch 27799 -MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31/00_gentoo_suexec_pam.patch 2149 -MD5 28272b16a4f701f29eb73d932fd81101 files/patches/1.3.31/Readme.PATCHES 747 -MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31/00_gentoo_db4_detect.patch 1304 -MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31/00_gentoo_apachectl.patch 32836 +MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r2/00_gentoo_db4_detect.patch 1304 MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31-r2/00_gentoo_base.patch 27799 MD5 c42fc79a9d08f38a8d8938883451f6b6 files/patches/1.3.31-r2/00_apache_proxy_security_fix.patch 790 MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r2/00_gentoo_suexec_pam.patch 2149 -MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r2/00_gentoo_db4_detect.patch 1304 MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r2/00_gentoo_apachectl.patch 32836 +MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319 +MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31/00_gentoo_db4_detect.patch 1304 +MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31/00_gentoo_base.patch 27799 +MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31/00_gentoo_suexec_pam.patch 2149 +MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31/00_gentoo_apachectl.patch 32836 +MD5 28272b16a4f701f29eb73d932fd81101 files/patches/1.3.31/Readme.PATCHES 747 MD5 5d45e2b46965e7c6866b259df4efe4b2 files/patches/2.0.50-r1/Readme.PATCHES 357 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.1 (GNU/Linux) + +iD8DBQFCg8EVKf2g/qXtneoRApHPAKC1bdU0Da6844YRB3ZV7mQhPjN8VwCfVGvf +Z6wSSsXlCgXi0qoGQE10jWk= +=MLdK +-----END PGP SIGNATURE----- diff --git a/net-www/apache/apache-2.0.54-r4.ebuild b/net-www/apache/apache-2.0.54-r4.ebuild new file mode 100644 index 000000000000..fed5ac4bf91e --- /dev/null +++ b/net-www/apache/apache-2.0.54-r4.ebuild @@ -0,0 +1,401 @@ +# 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.54-r4.ebuild,v 1.1 2005/05/12 18:47:51 kloeri Exp $ + +inherit flag-o-matic eutils fixheadtails gnuconfig + +PATCH_LEVEL="${PV}" +S="${WORKDIR}/httpd-${PV}" +DESCRIPTION="Apache Web Server, Version 2.0.x" +HOMEPAGE="http://www.apache.org/" +SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.gz + http://dev.gentoo.org/~beu/dist/apache-patches/apache-patches-${PVR}.tar.bz2 + http://dev.gentoo.org/~beu/dist/apache-patches/apache-conf-${PVR}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="berkdb gdbm ldap threads ipv6 doc static ssl" + +#Standard location for Gentoo Linux +DATADIR="/var/www/localhost" + +# Location for the two additional tarballs +APACHE_PATCHDIR=${WORKDIR}/apache-patches-${PVR} +APACHE_CONFDIR=${WORKDIR}/apache-conf-${PVR} + +DEPEND="dev-util/yacc + dev-lang/perl + sys-libs/zlib + dev-libs/expat + dev-libs/openssl + >=sys-devel/autoconf-2.59-r4 + berkdb? ( sys-libs/db ) + gdbm? ( sys-libs/gdbm ) + !mips? ( ldap? ( =net-nds/openldap-2* ) ) + selinux? ( sec-policy/selinux-apache ) + !dev-libs/apr + !dev-libs/apr-util" + +apache_setup_vars() { + # Sets the USERDIR to default. + USERDIR="public_html" + einfo "DATADIR is set to: ${DATADIR}" + einfo "USERDIR is set to: $USERDIR" +} + +set_filter_flags() { + CFLAGS="${CFLAGS/ / }" + has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE +} + +src_unpack() { + set_filter_flags + + unpack ${A} || die + cd ${S} || die + + # apply the patches from the patch tarball + EPATCH_SUFFIX="patch" + epatch ${APACHE_PATCHDIR} || die + + if use berkdb; then + einfo "Enabling berkdb." + if has_version '=sys-libs/db-4*'; then + einfo "Enabling db4" + myconf="${myconf} --with-dbm=db4 --with-berkely-db=/usr" + elif has_version '=sys-libs/db-3*'; then + einfo "Enabling db3" + myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr" + elif has_version '=sys-libs/db-2'; then + einfo "Enabling db2" + myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr" + fi + else + echo "Disabling berkdb" + fi + + #avoid utf-8 charset problems + export LC_CTYPE=C + + ht_fix_file srclib/apr/build/buildcheck.sh + + #give it the stamp + sed -i -e 's:(" PLATFORM "):(Gentoo/Linux):g' server/core.c + + #fix perl with perl! + find . -type f | xargs perl -pi -e \ + "s|/usr/local/bin/perl|/usr/bin/perl|g; \ + s|/usr/local/bin/perl5|/usr/bin/perl|g; \ + s|/path/to/bin/perl|/usr/bin/perl|g;" + #dont want this cruft in /usr/bin + sed -i -e 's:@exp_bindir@:@exp_installbuilddir:g' support/apachectl.in + + #setup the filesystem layout config + cat ${FILESDIR}/common/config.layout >> config.layout + sed -i -e 's:version:${PF}:g' config.layout + + cat ${FILESDIR}/common/apr-config.layout >> srclib/apr/config.layout + cat ${FILESDIR}/common/apr-util-config.layout >> srclib/apr-util/config.layout + + sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr/config.layout + sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr-util/config.layout + + WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed" +} + +src_compile() { + set_filter_flags + apache_setup_vars + + # Detect mips and uclibc systems properly + gnuconfig_update + + local myconf + if use ldap; then + if use mips; then + eerror "Sorry, LDAP support isn't available yet for MIPS" + eerror "Test out OpenLDAP and report it via BugZilla!" + eerror "Continuing in 5 seconds" + sleep 5s + else + einfo "Enabling LDAP" + if use static; then + myconf="--with-ldap --enable-auth-ldap=static --enable-ldap=static" + else + myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared" + fi + fi + fi + + if use ipv6; then + einfo "Enabling ipv6" + myconf="${myconf} --enable-vp4" + else + myconf="${myconf} --disable-ipv6" + fi + + if use threads; then + einfo "Enabling threads support" + myconf="${myconf} --with-mpm=worker" + else + myconf="${myconf} --with-mpm=${MPM:=prefork}" + fi + + select_modules_config || die "determining modules" + + # Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003 + # We pre-load the cache with the correct answer! This avoids + # it violating the sandbox. This may have to be changed for + # non-Linux systems or if sem_open changes on Linux. This + # hack is built around documentation in /usr/include/semaphore.h + # and the glibc (pthread) source + echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache + + # Workaround for bug #32444 - robbat2@gentoo.org, 28 Nov 2003 + # Apache2 tries to build SCTP support even when all the parts of it aren't there + # So for the moment we tell it to ignore SCTP support + echo 'ac_cv_sctp=${ac_cv_sctp=no}' >> ${S}/config.cache + echo 'ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}' >> ${S}/config.cache + echo 'ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}' >> ${S}/config.cache + + SSL_BASE="SYSTEM" \ + WANT_AUTOCONF_2_5=1 WANT_AUTOCONF=2.5 + ./configure \ + --with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \ + --with-suexec-logfile=/var/log/apache2/suexec_log \ + --with-suexec-bin=/usr/sbin/suexec2 \ + --with-suexec-userdir=${USERDIR} \ + --with-suexec-caller=apache \ + --with-suexec-docroot=/var/www \ + --with-suexec-uidmin=1000 \ + --with-suexec-gidmin=100 \ + --with-suexec-umask=077 \ + --enable-suexec=shared \ + \ + ${MY_BUILTINS} \ + \ + --cache-file=${S}/config.cache \ + --with-perl=/usr/bin/perl \ + --with-expat=/usr \ + --with-ssl=/usr \ + --with-z=/usr \ + --with-port=80 \ + --enable-layout=Gentoo \ + --with-program-name=apache2 \ + --with-devrandom=/dev/urandom \ + --host=${CHOST} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout." + #--with-mpm={worker|prefork|perchild|leader|threadpool} + + # we don't want to try and recompile the ssl_expr_parse.c file, because + # the lex source is broken + touch modules/ssl/ssl_expr_scan.c + + emake || die "problem compiling Apache2 :(" + + #build ssl version of apache bench (ab-ssl) + cd support; rm -f ab .libs/ab ab.lo ab.o + make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl \ + -I/usr/include/openssl -L/usr/lib" || die + mv ab ab-ssl; mv .libs/ab .libs/ab-ssl; rm -f ab.lo ab.o + make ab || die +} + +src_install () { + set_filter_flags + + local i + make DESTDIR=${D} install || die + dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT \ + LICENSE README* ${FILESDIR}/robots.txt + + #bogus values pointing at /var/tmp/portage + sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=:g' ${D}/usr/bin/apr-config + sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config + sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=:g' ${D}/usr/bin/apu-config + + #protect the suexec binary + local gid=`id -g apache` + [ -z "${gid}" ] && gid=81 + fowners root:${gid} /usr/sbin/suexec + fperms 4710 /usr/sbin/suexec + + #apxs needs this to pickup the right lib for install + dosym /usr/lib /usr/lib/apache2/lib + dosym /var/log/apache2 /usr/lib/apache2/logs + dosym /usr/lib/apache2-extramodules /usr/lib/apache2/extramodules + dosym /etc/apache2/conf /usr/lib/apache2/conf + + cd ${S} + #Credits to advx.org people for these scripts. Heck, thanks for + #the nice layout and everything else ;-) + for i in apache2logserverstatus apache2splitlogfile + do + dosbin ${APACHE_CONFDIR}/usr/sbin/$i + done + exeinto /usr/lib/ssl/apache2-mod_ssl + doexe ${APACHE_CONFDIR}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh + + #some more scripts + for i in split-logfile list_hooks.pl logresolve.pl log_server_status + do + dosbin ${S}/support/$i + done + #the ssl version of apache bench + dosbin support/.libs/ab-ssl + + #move some mods to extramodules + dodir /usr/lib/apache2-extramodules + for i in mod_ssl.so mod_ldap.so mod_auth_ldap.so + do + [ -x ${D}/usr/lib/apache2/modules/$i ] && \ + mv ${D}/usr/lib/apache2/modules/$i ${D}/usr/lib/apache2-extramodules + done + + #tidy up + mv ${D}/usr/sbin/envvars* ${D}/usr/lib/apache2/build + dodoc ${D}/etc/apache2/conf/*-std.conf + rm -f ${D}/etc/apache2/conf/*.conf + rm -rf ${D}/var/log ${D}/var/run + + # install our default config files + cd ${D} + ( cd ${APACHE_CONFDIR} && tar -cpvf - * ) | tar -xpvf - + find etc/apache2 -type f -exec chmod 644 {} \; + find etc/apache2 -type f -exec chown apache:apache {} \; + + #drop in a convenient link to the manual + if use doc; then + dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual + else + rm -rf ${D}/usr/share/doc/${PF}/manual + fi + + #SLOT=2!!! + cd ${D} + mv -v usr/sbin/apachectl usr/sbin/apache2ctl + mv -v usr/sbin/htdigest usr/sbin/htdigest2 + mv -v usr/sbin/htpasswd usr/sbin/htpasswd2 + mv -v usr/sbin/logresolve usr/sbin/logresolve2 + mv -v usr/sbin/apxs usr/sbin/apxs2 + mv -v usr/sbin/ab usr/sbin/ab2 + mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl + mv -v usr/sbin/suexec usr/sbin/suexec2 + mv -v usr/sbin/rotatelogs usr/sbin/rotatelogs2 + mv -v usr/sbin/dbmmanage usr/sbin/dbmmanage2 + mv -v usr/sbin/checkgid usr/sbin/checkgid2 + mv -v usr/sbin/split-logfile usr/sbin/split-logfile2 + mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl + mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl + + # do the man pages + mv -v usr/share/man/man1/htdigest.1 usr/share/man/man1/htdigest2.1 + mv -v usr/share/man/man1/htpasswd.1 usr/share/man/man1/htpasswd2.1 + mv -v usr/share/man/man1/dbmmanage.1 usr/share/man/man1/dbmmanage2.1 + mv -v usr/share/man/man8/ab.8 usr/share/man/man8/ab2.8 + mv -v usr/share/man/man8/apxs.8 usr/share/man/man8/apxs2.8 + mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8 + mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8 + mv -v usr/share/man/man8/logresolve.8 usr/share/man/man8/logresolve2.8 + mv -v usr/share/man/man8/rotatelogs.8 usr/share/man/man8/rotatelogs2.8 + mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8 + + # Fix for dav and SSL dirs + keepdir /var/lib/dav + fowners apache:apache /var/lib/dav + fperms 755 /var/lib/dav + + keepdir /var/log/apache2 + fowners apache:apache /var/log/apache2 + fperms 755 /var/log/apache2 + + keepdir /var/cache/apache2 + fowners apache:apache /var/cache/apache2 + fperms 755 /var/cache/apache2 + + keepdir /etc/apache2/conf/ssl + + # fix bug 92348 + fperms 755 /usr/sbin/apache2logserverstatus + fperms 755 /usr/sbin/apache2splitlogfile + + # Added by Jason Wever + # A little sedfu to fix bug #7172 for sparc64s + if [ ${ARCH} = "sparc" ] + then + sed -i -e '13a\AcceptMutex fcntl' \ + ${D}/etc/apache2/conf/apache2.conf + fi +} + +parse_modules_config() { + set_filter_flags + + local filename=$1 + local name="" + local dso="" + local disable="" + [ -f ${filename} ] || return 1 + for i in `cat $filename | sed "s/^#.*//"` ; do + if [ $i == "-" ] ; then + disable="true" + elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ] ; then + name=`echo $i | sed "s/mod_//"` + elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ) ; then + MY_BUILTINS="${MY_BUILTINS} --disable-$name" + name="" ; disable="" + elif [ $i == "static" ] ; then + MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes" + name="" ; disable="" + elif [ $i == "shared" ] ; then + MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared" + name="" ; disable="" + fi + done + einfo "${filename} options:\n${MY_BUILTINS}" +} + +select_modules_config() { + parse_modules_config /etc/apache2/apache2-builtin-mods || \ + parse_modules_config ${FILESDIR}/2.0.49/apache2-builtin-mods || \ + return 1 +} + +pkg_postinst() { + set_filter_flags + + if use ssl; then + cd ${ROOT}/etc/apache2/conf/ssl + einfo + einfo "Generating self-signed test certificate in /etc/apache2/conf/ssl..." + yes "" 2>/dev/null | ${ROOT}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh >/dev/null 2>&1 + einfo + fi + + if has_version '=net-www/apache-1*' ; then + ewarn + ewarn "Please add the 'apache2' flag to your USE variable and (re)install" + ewarn "any additional DSO modules you may wish to use with Apache-2.x." + ewarn "Addon modules are configured in /etc/apache2/conf/modules.d/" + ewarn + fi + + # Check to see if this is an upgrade + if [ -d /home/httpd ]; + then + einfo + einfo "Please remember to update your config files in /etc/apache2" + einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot" + einfo "has changed to /usr/lib/apache2!" + einfo + fi + + local list="" + for i in lib logs modules extramodules; do + local d="/etc/apache2/${i}" + [ -s "${d}" ] && list="${list} ${d}" + done + if [ -n "${list}" ]; then + einfo "You should delete these old symlinks: ${list}" + fi +} diff --git a/net-www/apache/apache-2.0.54-r5.ebuild b/net-www/apache/apache-2.0.54-r5.ebuild new file mode 100644 index 000000000000..9fe6907291db --- /dev/null +++ b/net-www/apache/apache-2.0.54-r5.ebuild @@ -0,0 +1,423 @@ +# 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.54-r5.ebuild,v 1.1 2005/05/12 18:47:51 kloeri Exp $ + +inherit eutils gnuconfig + +# latest gentoo apache files +GENTOO_PATCHNAME="gentoo-apache-${PVR}" +GENTOO_PATCHSTAMP="20050512" +GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}" + +DESCRIPTION="The Apache Web Server, Version 2.0.x" +HOMEPAGE="http://httpd.apache.org/" +SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2 + http://dev.gentoo.org/~beu/dist/apache-patches/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads" + +RDEPEND="dev-lang/perl + ~dev-libs/apr-0.9.6 + ~dev-libs/apr-util-0.9.6 + dev-libs/expat + net-www/gentoo-webroot-default + app-misc/mime-types + sys-libs/zlib + ssl? ( dev-libs/openssl ) + selinux? ( sec-policy/selinux-apache ) + !mips? ( ldap? ( =net-nds/openldap-2* ) )" +DEPEND="${RDEPEND} + >=sys-devel/autoconf-2.59-r4" + +S="${WORKDIR}/httpd-${PV}" + +big_fat_warnings() { + if use mpm-peruser; then + ewarn " -BIG- -FAT- -WARNING-" + ewarn "" + ewarn "The peruser (USE=mpm-peruser) MPM is considered highly experimental" + ewarn "and are not (yet) supported, nor are they recommended for production" + ewarn "use. You have been warned!" + ewarn + ewarn "Continuing in 5 seconds.." + sleep 5 + fi + + ewarn "" + ewarn "LFS support has been removed due to incompatibilites with other packages." + ewarn "You _will_ have to re-emerge any Apache modules you have installed, or" + ewarn "they will likely misbehave/segfault." + ewarn "" +} + +pkg_setup() { + big_fat_warnings +} + +src_unpack() { + unpack ${A} || die + cd ${S} || die + + EPATCH_SUFFIX="patch" + epatch ${GENTOO_PATCHDIR}/patches/[0-2]* || die "internal ebuild error" + + # avoid utf-8 charset problems + export LC_CTYPE=C + + # setup the filesystem layout config + cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout + sed -i -e 's:version:${PF}:g' config.layout + + # peruser need to build conf + WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed" +} + +src_compile() { + setup_apache_vars + + # Detect mips and uclibc systems properly + gnuconfig_update + + local modtype + if useq static-modules; then + modtype="static" + else + modtype="shared" + fi + + select_modules_config || die "determining modules" + + local myconf + useq ldap && myconf="${myconf} --enable-auth-ldap=${modtype} --enable-ldap=${modtype}" + useq ssl && myconf="${myconf} --with-ssl=/usr --enable-ssl=${modtype}" + + # Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003 + # We pre-load the cache with the correct answer! This avoids + # it violating the sandbox. This may have to be changed for + # non-Linux systems or if sem_open changes on Linux. This + # hack is built around documentation in /usr/include/semaphore.h + # and the glibc (pthread) source + echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache + + if useq no-suexec; then + myconf="${myconf} --disable-suexec" + else + myconf="${myconf} + --with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \ + --with-suexec-logfile=/var/log/apache2/suexec_log \ + --with-suexec-bin=/usr/sbin/suexec2 \ + --with-suexec-userdir=${USERDIR} \ + --with-suexec-caller=apache \ + --with-suexec-docroot=/var/www \ + --with-suexec-uidmin=1000 \ + --with-suexec-gidmin=100 \ + --with-suexec-umask=077 \ + --enable-suexec=shared" + fi + + # common confopts + myconf="${myconf} \ + --with-apr=/usr \ + --with-apr-util=/usr \ + --cache-file=${S}/config.cache \ + --with-perl=/usr/bin/perl \ + --with-expat=/usr \ + --with-z=/usr \ + --with-port=80 \ + --enable-layout=Gentoo \ + --with-program-name=apache2 \ + --with-devrandom=/dev/urandom \ + --host=${CHOST} ${MY_BUILTINS}" + + # debugging support + if useq debug ; then + myconf="${myconf} --enable-maintainer-mode" + fi + + select_mpms + + # now we build each mpm + for mpm in ${mpms}; do + # clean up + cd server; make clean; cd .. + + ./configure --with-mpm=${mpm} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log" + + # we don't want to try and recompile the ssl_expr_parse.c file, because + # the lex source is broken + touch modules/ssl/ssl_expr_scan.c + + # as decided on IRC-AGENDA-10.2004, we use httpd.conf as standard config file name + sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h + + emake || die "problem compiling apache2" + + mv apache2 apache2.${mpm} + done + + # build ssl version of apache bench (ab-ssl) + if useq ssl; then + cd support + rm -f ab .libs/ab ab.lo ab.o + make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl -I/usr/include/openssl -L/usr/lib" || die + mv ab ab-ssl + rm -f ab.lo ab.o + make ab || die + fi +} + +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 + fowners root:apache /usr/sbin/suexec + fperms 4710 /usr/sbin/suexec + fi + + # apxs needs this to pickup the right lib for install + dosym /usr/lib /usr/lib/apache2/lib + dosym /var/log/apache2 /usr/lib/apache2/logs + dosym /etc/apache2 /usr/lib/apache2/conf + + # Credits to advx.org people for these scripts. Heck, thanks for + # the nice layout and everything else ;-) + exeinto /usr/sbin + for i in apache2logserverstatus apache2splitlogfile; do + doexe ${GENTOO_PATCHDIR}/scripts/${i} + done + # gentestcrt.sh only if USE=ssl + useq ssl && doexe ${GENTOO_PATCHDIR}/scripts/gentestcrt.sh + + # some more scripts + for i in split-logfile list_hooks.pl logresolve.pl log_server_status; do + doexe ${S}/support/${i} + done + + # the ssl version of apache bench + useq ssl && doexe support/ab-ssl + + # install mpm bins + for mpm in ${mpms}; do + doexe ${S}/apache2.${mpm} + done + + # symlink the default mpm + for i in prefork worker peruser threadpool leader; do + if [ -x ${D}/usr/sbin/apache2.${i} ]; then + dosym /usr/sbin/apache2.${i} /usr/sbin/apache2 + break + fi + done + + # modules.d config file snippets + insinto /etc/apache2/modules.d + doins ${GENTOO_PATCHDIR}/conf/modules.d/45_mod_dav.conf + useq ldap && doins ${GENTOO_PATCHDIR}/conf/modules.d/46_mod_ldap.conf + if useq ssl; then + doins ${GENTOO_PATCHDIR}/conf/modules.d/40_mod_ssl.conf + doins ${GENTOO_PATCHDIR}/conf/modules.d/41_mod_ssl.default-vhost.conf + fi + + # drop in a convenient link to the manual + if useq doc; then + insinto /etc/apache2/modules.d + doins ${GENTOO_PATCHDIR}/conf/modules.d/00_apache_manual.conf + sed -i -e "s:2.0.49:${PVR}:" ${D}/etc/apache2/modules.d/00_apache_manual.conf + else + rm -rf ${D}/usr/share/doc/${PF}/manual + fi + + # SLOT=2 + cd ${D} + for i in htdigest htpasswd logresolve apxs ab rotatelogs dbmmanage checkgid split-logfile; do + mv -v usr/sbin/${i} usr/sbin/${i}2 + done + mv -v usr/sbin/apachectl usr/sbin/apache2ctl + mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl + mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl + useq ssl && mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl + useq no-suexec || mv -v usr/sbin/suexec usr/sbin/suexec2 + + # do the man pages + for i in htdigest.1 htpasswd.1 dbmmanage.1; do + mv -v usr/share/man/man1/${i} usr/share/man/man1/${i/./2.} + done + for i in ab.8 apxs.8 logresolve.8 rotatelogs.8; do + mv -v usr/share/man/man8/${i} usr/share/man/man8/${i/./2.} + done + useq no-suexec || mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8 + mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8 + mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8 + + # tidy up + mv usr/sbin/envvars* usr/lib/apache2/build + dodoc etc/apache2/*-std.conf + rm -f etc/apache2/*.conf + rm -rf var/run var/log + + # we DEPEND on net-www/gentoo-webroot-default for sharing this by now + rm -rf var/www/localhost + + # config files + insinto /etc/conf.d + newins ${GENTOO_PATCHDIR}/init/apache2.confd apache2 + + exeinto /etc/init.d + newexe ${GENTOO_PATCHDIR}/init/apache2.initd apache2 + + insinto /etc/logrotate.d + newins ${GENTOO_PATCHDIR}/scripts/apache2-logrotate apache2 + + insinto /etc/apache2 + doins ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods + doins ${GENTOO_PATCHDIR}/conf/httpd.conf + + keepdir /etc/apache2/vhosts.d + keepdir /etc/apache2/modules.d + + fix bug 92348 + perms 755 /usr/sbin/apache2logserverstatus + perms 755 /usr/sbin/apache2splitlogfile + + # empty dirs + for i in /var/lib/dav /var/log/apache2 /var/cache/apache2; do + keepdir ${i} + fowners apache:apache ${i} + 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 + cd ${ROOT}/etc/apache2/ssl + einfo + einfo "Generating self-signed test certificate in /etc/apache2/ssl..." + yes "" 2>/dev/null | \ + ${ROOT}/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \ + die "gentestcrt.sh failed" + einfo + fi + + # Check for dual/upgrade install + if has_version '=net-www/apache-1*' || ! use apache2 ; then + ewarn + ewarn "Please add the 'apache2' flag to your USE variable and (re)install" + ewarn "any additional DSO modules you may wish to use with Apache-2.x." + ewarn "Addon modules are configured in /etc/apache2/modules.d/" + ewarn + fi + + # Check to see if this is an upgrade + if [ -d /home/httpd ]; then + einfo + einfo "Please remember to update your config files in /etc/apache2" + einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot" + einfo "has changed to /usr/lib/apache2!" + einfo + fi + + # Check for obsolete symlinks + local list="" + for i in lib logs modules extramodules; do + local d="/etc/apache2/${i}" + [ -s "${d}" ] && list="${list} ${d}" + done + [ -n "${list}" ] && einfo "You should delete these old symlinks: ${list}" + + if has_version '=net-www/apache-2.0.0' ; then + einfo "Configuration locations have changed, you will need to migrate" + einfo "your configuration from /etc/apache2/conf/apache2.conf and" + einfo "/etc/apache2/conf/commonapache2.conf to /etc/apache2/httpd.conf." + einfo + einfo "Apache now checks for the old configuration and refuses to start" + einfo "if it exists. You must remove the old configuration first" + einfo + einfo "You should also at this time rebuild all your modules" + einfo + einfo "For more information, see" + einfo " http://dev.gentoo.org/~vericgar/doc/apache-package-refresh.html" + einfo + fi + + big_fat_warnings +} + +setup_apache_vars() { + # actually we do not provide a very dynamic way of those vars + # however, you may predefine them in shell before emerging + # to override the official default locations + + # standard location for Gentoo Linux + DATADIR="${DATADIR:-/var/www/localhost}" + USERDIR="${USERDIR:-public_html}" + + einfo "DATADIR is set to: ${DATADIR}" + einfo "USERDIR is set to: ${USERDIR}" +} + +select_mpms() { + useq mpm-prefork && mpms="${mpms} prefork" + useq mpm-worker && mpms="${mpms} worker" + useq mpm-peruser && mpms="${mpms} peruser" + useq mpm-threadpool && mpms="${mpms} threadpool" + useq mpm-leader && mpms="${mpms} leader" + + if [ "x${mpms}" = "x" ]; then + if useq threads; then + einfo "Threads specified without a mpm-specification, using mpm-worker." + mpms="worker" + else + einfo "No MPM style was specified, defaulting to mpm-prefork." + mpms="prefork" + fi + fi +} + +parse_modules_config() { + local name="" + local disable="" + [ -f ${1} ] || return 1 + + for i in `cat $1 | sed "s/^#.*//"`; do + if [ $i == "-" ]; then + disable="true" + elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ]; then + name=`echo $i | sed "s/mod_//"` + elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ); then + MY_BUILTINS="${MY_BUILTINS} --disable-$name" + name="" ; disable="" + elif [ $i == "static" ] || useq static-modules; then + MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes" + name="" ; disable="" + elif [ $i == "shared" ]; then + MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared" + name="" ; disable="" + fi + done + + einfo "${1} options:\n${MY_BUILTINS}" +} + +select_modules_config() { + parse_modules_config /etc/apache2/apache2-builtin-mods || \ + parse_modules_config ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods || \ + return 1 +} + +# vim:ts=4 diff --git a/net-www/apache/files/digest-apache-2.0.54-r4 b/net-www/apache/files/digest-apache-2.0.54-r4 new file mode 100644 index 000000000000..3ab4f28bac4c --- /dev/null +++ b/net-www/apache/files/digest-apache-2.0.54-r4 @@ -0,0 +1,3 @@ +MD5 4ae8a38c6b5db9046616ce10a0d551a2 httpd-2.0.54.tar.bz2 5566979 +MD5 0758195094a4ecb321e84a2d1fa82a4c apache-patches-2.0.54-r4.tar.bz2 7913 +MD5 80ed79f02474fb1ed350576d56af0714 apache-conf-2.0.54-r4.tar.bz2 25020 diff --git a/net-www/apache/files/digest-apache-2.0.54-r5 b/net-www/apache/files/digest-apache-2.0.54-r5 new file mode 100644 index 000000000000..a669641c0faa --- /dev/null +++ b/net-www/apache/files/digest-apache-2.0.54-r5 @@ -0,0 +1,2 @@ +MD5 4ae8a38c6b5db9046616ce10a0d551a2 httpd-2.0.54.tar.bz2 5566979 +MD5 c5bad9aa4a3c786d4b4c9a66c8b4729a gentoo-apache-2.0.54-r5-20050512.tar.bz2 50370 -- cgit v1.2.3-65-gdbad