diff options
Diffstat (limited to 'net-www/apache')
| -rw-r--r-- | net-www/apache/ChangeLog | 7 | ||||
| -rw-r--r-- | net-www/apache/Manifest | 124 | ||||
| -rw-r--r-- | net-www/apache/apache-2.0.53.ebuild | 396 | ||||
| -rw-r--r-- | net-www/apache/files/digest-apache-2.0.53 | 2 |
4 files changed, 467 insertions, 62 deletions
diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog index b360888dfc94..896dab318c62 100644 --- a/net-www/apache/ChangeLog +++ b/net-www/apache/ChangeLog @@ -1,6 +1,11 @@ # 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.325 2005/02/27 18:15:08 vericgar Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.326 2005/03/04 00:19:37 beu Exp $ + +*apache-2.0.53 (04 Mar 2005) + + 04 Mar 2005; Elfyn McBratney <beu@gentoo.org> +apache-2.0.53.ebuild: + Version bump, closes bug #81267 27 Feb 2005; Michael Stewart <vericgar@gentoo.org> apache-2.0.52-r3.ebuild: Remove mips, s390, arm due to apr and apr-util dependency. Bug 77455 diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest index 1bd7616dbe1a..7945c56e3d6d 100644 --- a/net-www/apache/Manifest +++ b/net-www/apache/Manifest @@ -1,94 +1,96 @@ -MD5 e44bb18c5850e095ae59cc5157fcf4bd ChangeLog 55162 -MD5 784b3e3150529826ac47e99ec3514f90 apache-1.3.29-r2.ebuild 7178 -MD5 d039a8316ffde50c2331f0d446623147 apache-1.3.31.ebuild 6693 MD5 9a5242011f95057c3afabf1cc3973f11 apache-1.3.31-r2.ebuild 6864 -MD5 451d45c9613e9ed7ee770085a8e28ef8 apache-2.0.51.ebuild 12831 -MD5 f35b6a00cbfa7ddd39face3420cd4fc6 apache-1.3.31-r1.ebuild 6739 -MD5 511fffcacde823eaf727f0984568106b apache-2.0.50.ebuild 12905 -MD5 85c356965e12f6c785c887ddf6844714 apache-1.3.31-r3.ebuild 6872 MD5 a419841198cd6a94b9dcf2e07f3c15b7 metadata.xml 617 +MD5 c38ac1102b1c9e8c2d535c736c8bd3d4 apache-2.0.52-r1.ebuild 13150 MD5 6f88208cb336bbe5da0a50b08b1e6390 apache-2.0.51-r1.ebuild 12840 +MD5 eb48942e994fd2dd20b1f41a036bc21a apache-2.0.52-r3.ebuild 11813 +MD5 85c356965e12f6c785c887ddf6844714 apache-1.3.31-r3.ebuild 6872 +MD5 a6568a1f276ed27458ab61fb5897bca2 apache-1.3.33.ebuild 6851 +MD5 784b3e3150529826ac47e99ec3514f90 apache-1.3.29-r2.ebuild 7178 +MD5 d039a8316ffde50c2331f0d446623147 apache-1.3.31.ebuild 6693 +MD5 e44bb18c5850e095ae59cc5157fcf4bd ChangeLog 55162 +MD5 d4e1bc977e9b7f8c2d516a590f5acadf apache-2.0.53.ebuild 11813 +MD5 7ee11979b35fe1539a4feb3d6c6b613c apache-1.3.33-r1.ebuild 8632 +MD5 cd6aff6c1515610209f5e62e56ea47f8 apache-1.3.32.ebuild 6616 +MD5 451d45c9613e9ed7ee770085a8e28ef8 apache-2.0.51.ebuild 12831 MD5 b1af5f9fb89636fb427805dfe9a3621c apache-2.0.52.ebuild 12834 +MD5 511fffcacde823eaf727f0984568106b apache-2.0.50.ebuild 12905 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 c38ac1102b1c9e8c2d535c736c8bd3d4 apache-2.0.52-r1.ebuild 13150 +MD5 f35b6a00cbfa7ddd39face3420cd4fc6 apache-1.3.31-r1.ebuild 6739 MD5 0bc87f432d6353df99d4ca1192dbb607 apache-2.0.52-r2.ebuild 12298 -MD5 7ee11979b35fe1539a4feb3d6c6b613c apache-1.3.33-r1.ebuild 8632 -MD5 eb48942e994fd2dd20b1f41a036bc21a apache-2.0.52-r3.ebuild 11813 -MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328 -MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006 MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788 -MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588 -MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211 -MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905 -MD5 a76e0df0ecc6920d9f4f139e31288155 files/apache-builtin-mods 2467 -MD5 1ca7ef45f474a29f599364f2022b4e0f files/apache.confd 994 -MD5 2b4457530debe71160f56ae68ea4c9c8 files/apache.rc6 1078 -MD5 042973893566b6b09b4dd9755d8f0881 files/apacheaddmod 5979 +MD5 79fe350dca5b488a1b0f396caeb43248 files/digest-apache-1.3.33-r1 286 +MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316 MD5 ba87ae612a52d75f0109a2aba6cd605b files/apachedelmod 3187 -MD5 647bdf060613bdf1fdb840ed5ae51b72 files/apachelogserverstatus 4765 +MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865 +MD5 cb82ab66045d6f309af686c0206fc3c0 files/digest-apache-2.0.50 201 MD5 8b5e7c3c7da4ebb58471f917a693e047 files/apachesplitlogfile 5068 -MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139 +MD5 da8dfe2134d7e30dc95e77e0c5f472e1 files/digest-apache-1.3.32 212 MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319 MD5 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137 -MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139 +MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r2 139 +MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328 MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781 +MD5 0eb9067bb4f2c2495069deaa9d7fce1b files/digest-apache-2.0.51-r1 140 +MD5 baf37cd1bc61f76ac73edd301f52decb files/digest-apache-2.0.52 201 +MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706 +MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729 +MD5 c600aeef0fc691794b759685d39de6d5 files/digest-apache-2.0.52-r3 150 +MD5 a76e0df0ecc6920d9f4f139e31288155 files/apache-builtin-mods 2467 +MD5 2b4457530debe71160f56ae68ea4c9c8 files/apache.rc6 1078 +MD5 1ca7ef45f474a29f599364f2022b4e0f files/apache.confd 994 +MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149 +MD5 d44cd7c0521a1fbc26bff3dcc5024185 files/digest-apache-2.0.53 147 +MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905 +MD5 647bdf060613bdf1fdb840ed5ae51b72 files/apachelogserverstatus 4765 +MD5 042973893566b6b09b4dd9755d8f0881 files/apacheaddmod 5979 +MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588 MD5 44fc8ddc9a05a056d8a08e6d843c997c files/digest-apache-2.0.52-r1 204 -MD5 cb82ab66045d6f309af686c0206fc3c0 files/digest-apache-2.0.50 201 -MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r2 139 -MD5 8cc0834ac7a8afa694ddb3f9f9be2cc8 files/digest-apache-1.3.31-r3 139 +MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006 MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342 -MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59 -MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149 +MD5 189cfb35b6320ae3ab57a32dbadd18f2 files/digest-apache-1.3.33 212 MD5 8de91cfef98483656aa4ab47f2c2ce8e files/apache2 331 -MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706 -MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316 -MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729 -MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865 -MD5 0eb9067bb4f2c2495069deaa9d7fce1b files/digest-apache-2.0.51-r1 140 -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 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139 +MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139 +MD5 8cc0834ac7a8afa694ddb3f9f9be2cc8 files/digest-apache-1.3.31-r3 139 +MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59 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 54c0546fa2b1985686cf22c9efa2c7dc files/common/apr-config.layout 434 -MD5 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437 -MD5 5a7b58d54689d6e9d8f8214b5150d18f files/common/config.layout 741 -MD5 162afe15726e298774bc36b586ae070a files/conf/DynamicVhosts.conf 965 -MD5 139f5b0d5e2bf3525464a336ed2e1f83 files/conf/Vhosts.conf 1910 +MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211 MD5 9c606730ea7cc37417109915b2fbe522 files/conf/VirtualHomePages.conf 909 -MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115 +MD5 162afe15726e298774bc36b586ae070a files/conf/DynamicVhosts.conf 965 MD5 c70dc2c9a5e56660f3f120fcb822fadc files/conf/commonapache.conf 22216 +MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115 +MD5 139f5b0d5e2bf3525464a336ed2e1f83 files/conf/Vhosts.conf 1910 +MD5 8a234c8eb9cc840fe2d3cfbcdfedc315 files/2.0.49/gentestcrt.sh 8807 +MD5 228b5a816ea5534287be3c5e1d6ec7cd files/2.0.49/apache2.confd 1944 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 -MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902 MD5 1c4d9999353237c8b3835b7d73ba7a15 files/2.0.49/apache2-builtin-mods 2215 -MD5 228b5a816ea5534287be3c5e1d6ec7cd files/2.0.49/apache2.confd 1944 +MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583 MD5 20f6868829149f669a7afd1e03245692 files/2.0.49/apache2.initd 2494 MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652 +MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053 MD5 8570b1055b64f29120e21be94bbdd73d files/2.0.49/apache2splitlogfile 4875 -MD5 8a234c8eb9cc840fe2d3cfbcdfedc315 files/2.0.49/gentestcrt.sh 8807 +MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902 +MD5 5a7b58d54689d6e9d8f8214b5150d18f files/common/config.layout 741 +MD5 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437 +MD5 54c0546fa2b1985686cf22c9efa2c7dc files/common/apr-config.layout 434 +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 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048 +MD5 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507 +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 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31/00_gentoo_base.patch 27799 MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31/00_gentoo_db4_detect.patch 1304 -MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31/00_gentoo_suexec_pam.patch 2149 MD5 28272b16a4f701f29eb73d932fd81101 files/patches/1.3.31/Readme.PATCHES 747 -MD5 59deb12158a55cc2259cd79c245eb00d files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671 -MD5 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507 -MD5 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048 -MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r1/04_ssl_makefile.patch 619 -MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319 -MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r1/00_gentoo_apachectl.patch 32836 -MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31-r1/00_gentoo_base.patch 27799 -MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r1/00_gentoo_db4_detect.patch 1304 -MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r1/00_gentoo_suexec_pam.patch 2149 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 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r2/00_gentoo_apachectl.patch 32836 MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31-r2/00_gentoo_base.patch 27799 MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r2/00_gentoo_db4_detect.patch 1304 -MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r2/00_gentoo_suexec_pam.patch 2149 MD5 5d45e2b46965e7c6866b259df4efe4b2 files/patches/2.0.50-r1/Readme.PATCHES 357 +MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319 +MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r1/00_gentoo_suexec_pam.patch 2149 +MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r1/00_gentoo_apachectl.patch 32836 +MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31-r1/00_gentoo_base.patch 27799 +MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r1/00_gentoo_db4_detect.patch 1304 diff --git a/net-www/apache/apache-2.0.53.ebuild b/net-www/apache/apache-2.0.53.ebuild new file mode 100644 index 000000000000..9effe76941eb --- /dev/null +++ b/net-www/apache/apache-2.0.53.ebuild @@ -0,0 +1,396 @@ +# 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.53.ebuild,v 1.1 2005/03/04 00:19:49 beu Exp $ + +inherit eutils gnuconfig + +# latest gentoo apache files +GENTOO_PATCHNAME="gentoo-apache-${PVR}" +GENTOO_PATCHSTAMP="20050303" +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 + mirror://gentoo/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="apache2 debug doc ldap mpm-leader mpm-metux 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 )" +DEPEND="${RDEPEND} + >=sys-devel/autoconf-2.59-r4" + +S="${WORKDIR}/httpd-${PV}" + +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 + + # metux & 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 metuxmpm 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/apache2 + doins ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods + doins ${GENTOO_PATCHDIR}/conf/httpd.conf + + keepdir /etc/apache2/vhosts.d + keepdir /etc/apache2/modules.d + + # 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.52-r3' && 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 +} + +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-metux && mpms="${mpms} metuxmpm" + useq mpm-peruser && mpms="${mpms} peruser" + useq mpm-threadpool && mpms="${mpms} threadpool" + useq mpm-leader && mpms="${mpms} leader" + + if useq mpm-metux || useq mpm-peruser; then + ewarn "Metux/Peruser are considered more or less insecure" + ewarn "and beta staged. Use at your own risk!" + fi + + 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.53 b/net-www/apache/files/digest-apache-2.0.53 new file mode 100644 index 000000000000..522ae9c39609 --- /dev/null +++ b/net-www/apache/files/digest-apache-2.0.53 @@ -0,0 +1,2 @@ +MD5 94f3a793fb1665365724943206cce23f httpd-2.0.53.tar.bz2 5079345 +MD5 198b0e9c7860133445c21a60d688dfc7 gentoo-apache-2.0.53-20050303.tar.bz2 50241 |