diff options
Diffstat (limited to 'net-www')
| -rw-r--r-- | net-www/apache/ChangeLog | 27 | ||||
| -rw-r--r-- | net-www/apache/Manifest | 58 | ||||
| -rw-r--r-- | net-www/apache/apache-2.0.49-r3.ebuild | 415 | ||||
| -rw-r--r-- | net-www/apache/apache-2.0.49-r4.ebuild | 416 | ||||
| -rw-r--r-- | net-www/apache/apache-2.0.50-r1.ebuild | 408 | ||||
| -rw-r--r-- | net-www/apache/apache-2.0.50-r2.ebuild | 404 | ||||
| -rw-r--r-- | net-www/apache/apache-2.0.50-r3.ebuild | 404 | ||||
| -rw-r--r-- | net-www/apache/apache-2.0.50.ebuild | 406 | ||||
| -rw-r--r-- | net-www/apache/files/digest-apache-2.0.49-r3 | 2 | ||||
| -rw-r--r-- | net-www/apache/files/digest-apache-2.0.49-r4 | 2 | ||||
| -rw-r--r-- | net-www/apache/files/digest-apache-2.0.50 | 2 | ||||
| -rw-r--r-- | net-www/apache/files/digest-apache-2.0.50-r1 | 2 | ||||
| -rw-r--r-- | net-www/apache/files/digest-apache-2.0.50-r2 | 2 | ||||
| -rw-r--r-- | net-www/apache/files/digest-apache-2.0.50-r3 | 2 |
14 files changed, 49 insertions, 2501 deletions
diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog index d90b9144c01d..3bcb04ba6e3d 100644 --- a/net-www/apache/ChangeLog +++ b/net-www/apache/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for net-www/apache # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.260 2004/09/16 20:13:10 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.261 2004/09/16 21:20:16 stuart Exp $ 16 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> apache-2.0.51.ebuild: Marked stable on amd64. @@ -14,6 +14,31 @@ 16 Sep 2004; <SeJo@gentoo.org> apache-2.0.51.ebuild: stable ppc bug: 62626 + 16 Sep 2004; Stuart Herbert <stuart@gentoo.org> -apache-2.0.49-r3.ebuild, + -apache-2.0.49-r4.ebuild, -apache-2.0.50-r1.ebuild, + -apache-2.0.50-r2.ebuild, -apache-2.0.50-r3.ebuild, -apache-2.0.50.ebuild: + Obsolete version; removed by eversionrm tool + + 16 Sep 2004; Stuart Herbert <stuart@gentoo.org> -apache-2.0.49-r3.ebuild, + -apache-2.0.49-r4.ebuild, -apache-2.0.50-r1.ebuild, + -apache-2.0.50-r2.ebuild, -apache-2.0.50.ebuild: + Obsolete version; removed by eversionrm tool + + 16 Sep 2004; Stuart Herbert <stuart@gentoo.org> -apache-2.0.49-r3.ebuild, + -apache-2.0.49-r4.ebuild, -apache-2.0.50-r1.ebuild, -apache-2.0.50.ebuild: + Obsolete version; removed by eversionrm tool + + 16 Sep 2004; Stuart Herbert <stuart@gentoo.org> -apache-2.0.49-r3.ebuild, + -apache-2.0.49-r4.ebuild, -apache-2.0.50.ebuild: + Obsolete version; removed by eversionrm tool + + 16 Sep 2004; Stuart Herbert <stuart@gentoo.org> -apache-2.0.49-r3.ebuild, + -apache-2.0.49-r4.ebuild: + Obsolete version; removed by eversionrm tool + + 16 Sep 2004; Stuart Herbert <stuart@gentoo.org> -apache-2.0.49-r3.ebuild: + Obsolete version; removed by eversionrm tool + *apache-2.0.51 (15 Sep 2004) 15 Sep 2004; Stuart Herbert <stuart@gentoo.org> +apache-2.0.51.ebuild: diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest index e1b3ec91482a..7e70a1e8f838 100644 --- a/net-www/apache/Manifest +++ b/net-www/apache/Manifest @@ -1,19 +1,15 @@ -MD5 54b733b5069fe100213134b6a3354bed ChangeLog 44619 -MD5 97c0a73aabeb06a5514c1d990ab20a95 apache-1.3.31-r2.ebuild 6868 -MD5 161ce6f38ba72d6afdbb91694e26dd02 apache-2.0.49-r4.ebuild 13194 -MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501 +MD5 54aed11a20ca32a9f9672e643405112a ChangeLog 45752 MD5 e4dc4b093f2d9b8edd137e09ecbb2adf apache-1.3.29-r2.ebuild 7177 -MD5 6fb2420645fe7cd13366395eaf0bd49e apache-1.3.31.ebuild 6700 -MD5 ee4caeaa8cfa62f3b157beb2a72ffc0c apache-2.0.50.ebuild 12925 -MD5 6af26a0397f20ac96f22f7e6bf00cf43 apache-1.3.31-r3.ebuild 6873 MD5 aea442864fc743b7745412fb0114be8c apache-1.3.31-r1.ebuild 6743 -MD5 d03f3e404733ec04f68874c780e1ef35 apache-2.0.49-r3.ebuild 13142 -MD5 dadf90672a91db8c5efed19200e91df4 apache-2.0.50-r1.ebuild 12969 -MD5 bf1a1339575fc24aac1cf7896bdf2ac3 apache-2.0.50-r2.ebuild 12829 -MD5 3ca1168cc39a3ed2c00b62c20567e936 apache-2.0.50-r3.ebuild 12827 +MD5 97c0a73aabeb06a5514c1d990ab20a95 apache-1.3.31-r2.ebuild 6868 +MD5 6af26a0397f20ac96f22f7e6bf00cf43 apache-1.3.31-r3.ebuild 6873 +MD5 6fb2420645fe7cd13366395eaf0bd49e apache-1.3.31.ebuild 6700 +MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501 MD5 8b6030d44477d1d9d356931b1dde11b3 apache-2.0.51.ebuild 12826 +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 +MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588 MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729 MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706 MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905 @@ -26,26 +22,18 @@ MD5 042973893566b6b09b4dd9755d8f0881 files/apacheaddmod 5979 MD5 ba87ae612a52d75f0109a2aba6cd605b files/apachedelmod 3187 MD5 647bdf060613bdf1fdb840ed5ae51b72 files/apachelogserverstatus 4765 MD5 8b5e7c3c7da4ebb58471f917a693e047 files/apachesplitlogfile 5068 -MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781 -MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r2 139 -MD5 0551c76a9171a3af1d0ad6aa2ef4572c files/digest-apache-2.0.50 137 -MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865 -MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342 -MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59 -MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149 -MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588 MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211 MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139 -MD5 3cdca22cf2008b615f80090f309da93d files/digest-apache-2.0.49-r4 142 +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 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 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139 -MD5 b7aa6e39d33d167baf460dd30a14c977 files/digest-apache-2.0.49-r3 142 MD5 64670c349a80e98fc61da8e32b44a913 files/httpd-2.0.49-ssl_engine_kernel.patch 66330 -MD5 0551c76a9171a3af1d0ad6aa2ef4572c files/digest-apache-2.0.50-r1 137 -MD5 21e40169b639a3657b6f57f5f30d2125 files/digest-apache-2.0.50-r2 140 -MD5 7ae2e5c301034e290835c28428295418 files/digest-apache-2.0.50-r3 140 +MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342 +MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59 +MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149 MD5 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137 MD5 869ec17a0417518aa1d9d9566a958fb5 files/2.0.40/40_mod_ssl.conf 3185 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.40/41_mod_ssl.default-vhost.conf 8053 @@ -84,26 +72,19 @@ MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.49/dynamic-vhosts.conf 840 MD5 8a234c8eb9cc840fe2d3cfbcdfedc315 files/2.0.49/gentestcrt.sh 8807 MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.49/vhosts.conf 1695 MD5 b69bf7c3126e471a2abff013e716367f files/2.0.49/virtual-homepages.conf 780 +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 9c606730ea7cc37417109915b2fbe522 files/conf/VirtualHomePages.conf 909 MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115 MD5 c70dc2c9a5e56660f3f120fcb822fadc files/conf/commonapache.conf 22216 -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 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 fc31be76ad482038fa9019ea59067473 files/patches/2.0.49-r1/00_ssl_engine.patch 1364 -MD5 59deb12158a55cc2259cd79c245eb00d files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671 -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 64670c349a80e98fc61da8e32b44a913 files/patches/2.0.49-r1/01_ssl_engine_kernel.patch 66330 -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 @@ -113,5 +94,12 @@ MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r2/00_gentoo_apachectl 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 fc31be76ad482038fa9019ea59067473 files/patches/2.0.49-r1/00_ssl_engine.patch 1364 +MD5 59deb12158a55cc2259cd79c245eb00d files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671 +MD5 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048 +MD5 64670c349a80e98fc61da8e32b44a913 files/patches/2.0.49-r1/01_ssl_engine_kernel.patch 66330 +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 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319 MD5 a6fbf43cb7c6827f046f7b1df65932c2 files/patches/2.0.50-r1/00_ssl_engine.patch 414 MD5 5d45e2b46965e7c6866b259df4efe4b2 files/patches/2.0.50-r1/Readme.PATCHES 357 diff --git a/net-www/apache/apache-2.0.49-r3.ebuild b/net-www/apache/apache-2.0.49-r3.ebuild deleted file mode 100644 index 9b269cbe567b..000000000000 --- a/net-www/apache/apache-2.0.49-r3.ebuild +++ /dev/null @@ -1,415 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.49-r3.ebuild,v 1.21 2004/09/06 20:28:28 ciaranm Exp $ - -inherit flag-o-matic eutils fixheadtails gnuconfig - -PATCH_LEVEL="${PV}-r3" -S="${WORKDIR}/httpd-${PV}" -DESCRIPTION="Apache Web Server, Version 2.0.x" -HOMEPAGE="http://www.apache.org/" -SRC_URI="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz - mirror://gentoo/apache-patches-${PATCH_LEVEL}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ppc64" -IUSE="berkdb gdbm ldap threads ipv6 doc static ssl" - -#Standard location for Gentoo Linux -DATADIR="/var/www/localhost" - -DEPEND="dev-util/yacc - dev-lang/perl - sys-libs/zlib - dev-libs/expat - dev-libs/openssl - >=sys-apps/sed-4 - berkdb? ( sys-libs/db ) - gdbm? ( sys-libs/gdbm ) - !mips? ( ldap? ( =net-nds/openldap-2* ) ) - selinux? ( sec-policy/selinux-apache )" - -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 - epatch ${WORKDIR}/00_gentoo_base.patch || die - epatch ${WORKDIR}/01_gentoo_cvs_sync.patch || die - epatch ${WORKDIR}/03_redhat_xfsz.patch || die - epatch ${WORKDIR}/01_gentoo_cgi.patch || die - epatch ${WORKDIR}/04_ssl_makefile.patch || die - epatch ${WORKDIR}/01_ssl_engine_kernel.patch || die - - if use ipv6; then - epatch ${WORKDIR}/01_gentoo_ipv6.patch || die - fi - - if use ldap; then - epatch ${WORKDIR}/01_apache_ldap_fixes.patch || die - fi - - if use ssl; then - epatch ${WORKDIR}/01_ssl_verify_client.patch || die - fi - - 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=1 WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed" - gnuconfig_update -} - -src_compile() { - set_filter_flags - apache_setup_vars - - 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" - epause 5 - 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 - - makeopts="${makeopts} -j1" - 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 ;-) - exeinto /usr/sbin - for i in apache2logserverstatus apache2splitlogfile - do - doexe ${FILESDIR}/2.0.49/$i - done - exeinto /usr/lib/ssl/apache2-mod_ssl - doexe ${FILESDIR}/2.0.49/gentestcrt.sh - - #some more scripts - exeinto /usr/sbin - 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 - doexe 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 - - #modules.d config file snippets - insinto /etc/apache2/conf/modules.d - for i in 40_mod_ssl.conf 41_mod_ssl.default-vhost.conf 45_mod_dav.conf - do - doins ${FILESDIR}/2.0.49/$i - done - use !mips && use ldap && doins ${FILESDIR}/2.0.49/46_mod_ldap.conf - - #drop in a convenient link to the manual - if use doc; then - MANUAL_VERSION="2.0.49-r3" - insinto /etc/apache2/conf/modules.d - doins ${FILESDIR}/00_apache_manual.conf - dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual - sed -i -e "s:2.0.49:${MANUAL_VERSION}:" ${D}/etc/apache2/conf/modules.d/00_apache_manual.conf - fi - - #SLOT=2!!! - cd ${D} - # do non-man pages - 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 - - #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/run ${D}/var/log - - #config files - insinto /etc/conf.d; newins ${FILESDIR}/2.0.49/apache2.confd apache2 - exeinto /etc/init.d; newexe ${FILESDIR}/2.0.49/apache2.initd apache2 - insinto /etc/apache2; doins ${FILESDIR}/2.0.49/apache2-builtin-mods - insinto /etc/apache2/conf - doins ${FILESDIR}/2.0.49/commonapache2.conf - doins ${FILESDIR}/2.0.49/apache2.conf - insinto /etc/apache2/conf/vhosts - doins ${FILESDIR}/2.0.49/virtual-homepages.conf - doins ${FILESDIR}/2.0.49/dynamic-vhosts.conf - doins ${FILESDIR}/2.0.49/vhosts.conf - - # Added by Jason Wever <weeve@gentoo.org> - # 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 - - #empty dirs... - install -d -m0755 -o apache -g apache ${ROOT}/var/lib/dav - install -d -m0755 -o root -g root ${ROOT}/var/log/apache2 - install -d -m0755 -o root -g root ${ROOT}/var/cache/apache2 - - if use ssl; then - # install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl - install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl - 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.49-r4.ebuild b/net-www/apache/apache-2.0.49-r4.ebuild deleted file mode 100644 index bbcd404f4231..000000000000 --- a/net-www/apache/apache-2.0.49-r4.ebuild +++ /dev/null @@ -1,416 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.49-r4.ebuild,v 1.15 2004/09/06 20:28:28 ciaranm Exp $ - -inherit flag-o-matic eutils fixheadtails gnuconfig - -PATCH_LEVEL="${PV}-r4" -S="${WORKDIR}/httpd-${PV}" -DESCRIPTION="Apache Web Server, Version 2.0.x" -HOMEPAGE="http://www.apache.org/" -SRC_URI="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz - mirror://gentoo/apache-patches-${PATCH_LEVEL}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ~s390 ~ppc64" -IUSE="berkdb gdbm ldap threads ipv6 doc static ssl" - -#Standard location for Gentoo Linux -DATADIR="/var/www/localhost" - -DEPEND="dev-util/yacc - dev-lang/perl - sys-libs/zlib - dev-libs/expat - dev-libs/openssl - >=sys-apps/sed-4 - berkdb? ( sys-libs/db ) - gdbm? ( sys-libs/gdbm ) - !mips? ( ldap? ( =net-nds/openldap-2* ) ) - selinux? ( sec-policy/selinux-apache )" - -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 - epatch ${WORKDIR}/00_gentoo_apache_dos.patch || die - epatch ${WORKDIR}/00_gentoo_base.patch || die - epatch ${WORKDIR}/01_gentoo_cvs_sync.patch || die - epatch ${WORKDIR}/03_redhat_xfsz.patch || die - epatch ${WORKDIR}/01_gentoo_cgi.patch || die - epatch ${WORKDIR}/04_ssl_makefile.patch || die - epatch ${WORKDIR}/01_ssl_engine_kernel.patch || die - - if use ipv6; then - epatch ${WORKDIR}/01_gentoo_ipv6.patch || die - fi - - if use ldap; then - epatch ${WORKDIR}/01_apache_ldap_fixes.patch || die - fi - - if use ssl; then - epatch ${WORKDIR}/01_ssl_verify_client.patch || die - fi - - 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=1 WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed" - gnuconfig_update -} - -src_compile() { - set_filter_flags - apache_setup_vars - - 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" - epause 5 - 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 - - makeopts="${makeopts} -j1" - 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 ;-) - exeinto /usr/sbin - for i in apache2logserverstatus apache2splitlogfile - do - doexe ${FILESDIR}/2.0.49/$i - done - exeinto /usr/lib/ssl/apache2-mod_ssl - doexe ${FILESDIR}/2.0.49/gentestcrt.sh - - #some more scripts - exeinto /usr/sbin - 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 - doexe 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 - - #modules.d config file snippets - insinto /etc/apache2/conf/modules.d - for i in 40_mod_ssl.conf 41_mod_ssl.default-vhost.conf 45_mod_dav.conf - do - doins ${FILESDIR}/2.0.49/$i - done - use !mips && use ldap && doins ${FILESDIR}/2.0.49/46_mod_ldap.conf - - #drop in a convenient link to the manual - if use doc; then - MANUAL_VERSION="${PVR}" - insinto /etc/apache2/conf/modules.d - doins ${FILESDIR}/00_apache_manual.conf - dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual - sed -i -e "s:2.0.49:${MANUAL_VERSION}:" ${D}/etc/apache2/conf/modules.d/00_apache_manual.conf - fi - - #SLOT=2!!! - cd ${D} - # do non-man pages - 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 - - #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/run ${D}/var/log - - #config files - insinto /etc/conf.d; newins ${FILESDIR}/2.0.49/apache2.confd apache2 - exeinto /etc/init.d; newexe ${FILESDIR}/2.0.49/apache2.initd apache2 - insinto /etc/apache2; doins ${FILESDIR}/2.0.49/apache2-builtin-mods - insinto /etc/apache2/conf - doins ${FILESDIR}/2.0.49/commonapache2.conf - doins ${FILESDIR}/2.0.49/apache2.conf - insinto /etc/apache2/conf/vhosts - doins ${FILESDIR}/2.0.49/virtual-homepages.conf - doins ${FILESDIR}/2.0.49/dynamic-vhosts.conf - doins ${FILESDIR}/2.0.49/vhosts.conf - - # Added by Jason Wever <weeve@gentoo.org> - # 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 - - #empty dirs... - install -d -m0755 -o apache -g apache ${ROOT}/var/lib/dav - install -d -m0755 -o root -g root ${ROOT}/var/log/apache2 - install -d -m0755 -o root -g root ${ROOT}/var/cache/apache2 - - if use ssl; then - # install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl - install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl - 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.50-r1.ebuild b/net-www/apache/apache-2.0.50-r1.ebuild deleted file mode 100644 index 31e3bc6eee2d..000000000000 --- a/net-www/apache/apache-2.0.50-r1.ebuild +++ /dev/null @@ -1,408 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.50-r1.ebuild,v 1.7 2004/09/09 04:48:42 kumba 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="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz - http://dev.gentoo.org/~zul/apache/apache-patches-${PV}.tar.bz2 - mirror://gentoo/apache-patches-${PV}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc64 sparc x86" -IUSE="berkdb gdbm ldap threads ipv6 doc static ssl" - -#Standard location for Gentoo Linux -DATADIR="/var/www/localhost" - -DEPEND="dev-util/yacc - dev-lang/perl - sys-libs/zlib - dev-libs/expat - dev-libs/openssl - >=sys-apps/sed-4 - berkdb? ( sys-libs/db ) - gdbm? ( sys-libs/gdbm ) - !mips? ( ldap? ( =net-nds/openldap-2* ) ) - selinux? ( sec-policy/selinux-apache )" - -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 - epatch ${WORKDIR}/00_gentoo_base.patch || die - epatch ${WORKDIR}/03_redhat_xfsz.patch || die - epatch ${WORKDIR}/04_ssl_makefile.patch || die - - epatch ${FILESDIR}/patches/${PVR}/*.patch || die - - if use ipv6; then - epatch ${WORKDIR}/01_gentoo_ipv6.patch || die - fi - - 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=1 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 ;-) - exeinto /usr/sbin - for i in apache2logserverstatus apache2splitlogfile - do - doexe ${FILESDIR}/2.0.49/$i - done - exeinto /usr/lib/ssl/apache2-mod_ssl - doexe ${FILESDIR}/2.0.49/gentestcrt.sh - - #some more scripts - exeinto /usr/sbin - 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 - doexe 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 - - #modules.d config file snippets - insinto /etc/apache2/conf/modules.d - for i in 40_mod_ssl.conf 41_mod_ssl.default-vhost.conf 45_mod_dav.conf - do - doins ${FILESDIR}/2.0.49/$i - done - use !mips && use ldap && doins ${FILESDIR}/2.0.49/46_mod_ldap.conf - - #drop in a convenient link to the manual - if use doc; then - MANUAL_VERSION="2.0.50" - insinto /etc/apache2/conf/modules.d - doins ${FILESDIR}/00_apache_manual.conf - dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual - sed -i -e "s:2.0.49:${MANUAL_VERSION}:" ${D}/etc/apache2/conf/modules.d/00_apache_manual.conf - 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 - - #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/run ${D}/var/log - - #config files - insinto /etc/conf.d; newins ${FILESDIR}/2.0.49/apache2.confd apache2 - exeinto /etc/init.d; newexe ${FILESDIR}/2.0.49/apache2.initd apache2 - insinto /etc/apache2; doins ${FILESDIR}/2.0.49/apache2-builtin-mods - insinto /etc/apache2/conf - doins ${FILESDIR}/2.0.49/commonapache2.conf - doins ${FILESDIR}/2.0.49/apache2.conf - insinto /etc/apache2/conf/vhosts - doins ${FILESDIR}/2.0.49/virtual-homepages.conf - doins ${FILESDIR}/2.0.49/dynamic-vhosts.conf - doins ${FILESDIR}/2.0.49/vhosts.conf - - # Added by Jason Wever <weeve@gentoo.org> - # 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 - - #empty dirs... - install -d -m0755 -o apache -g apache ${ROOT}/var/lib/dav - install -d -m0755 -o root -g root ${ROOT}/var/log/apache2 - install -d -m0755 -o apache -g apache ${ROOT}/var/cache/apache2 - - if use ssl; then - # install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl - install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl - 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.50-r2.ebuild b/net-www/apache/apache-2.0.50-r2.ebuild deleted file mode 100644 index f7144f330f49..000000000000 --- a/net-www/apache/apache-2.0.50-r2.ebuild +++ /dev/null @@ -1,404 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.50-r2.ebuild,v 1.5 2004/09/13 23:05:02 kugelfang 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="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz - http://dev.gentoo.org/~stuart/apache/apache-patches-${PVR}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc ~x86" -IUSE="berkdb gdbm ldap threads ipv6 doc static ssl" - -#Standard location for Gentoo Linux -DATADIR="/var/www/localhost" - -DEPEND="dev-util/yacc - dev-lang/perl - sys-libs/zlib - dev-libs/expat - dev-libs/openssl - >=sys-apps/sed-4 - berkdb? ( sys-libs/db ) - gdbm? ( sys-libs/gdbm ) - !mips? ( ldap? ( =net-nds/openldap-2* ) ) - selinux? ( sec-policy/selinux-apache )" - -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 - - # which muppet decided that epatch would default to applying compressed - # patches? - - EPATCH_SUFFIX="patch" - epatch ${WORKDIR}/apache-patches-${PVR} || 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=1 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 ;-) - exeinto /usr/sbin - for i in apache2logserverstatus apache2splitlogfile - do - doexe ${FILESDIR}/2.0.49/$i - done - exeinto /usr/lib/ssl/apache2-mod_ssl - doexe ${FILESDIR}/2.0.49/gentestcrt.sh - - #some more scripts - exeinto /usr/sbin - 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 - doexe 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 - - #modules.d config file snippets - insinto /etc/apache2/conf/modules.d - for i in 40_mod_ssl.conf 41_mod_ssl.default-vhost.conf 45_mod_dav.conf - do - doins ${FILESDIR}/2.0.49/$i - done - use !mips && use ldap && doins ${FILESDIR}/2.0.49/46_mod_ldap.conf - - #drop in a convenient link to the manual - if use doc; then - MANUAL_VERSION="2.0.50" - insinto /etc/apache2/conf/modules.d - doins ${FILESDIR}/00_apache_manual.conf - dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual - sed -i -e "s:2.0.49:${MANUAL_VERSION}:" ${D}/etc/apache2/conf/modules.d/00_apache_manual.conf - 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 - - #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/run ${D}/var/log - - #config files - insinto /etc/conf.d; newins ${FILESDIR}/2.0.49/apache2.confd apache2 - exeinto /etc/init.d; newexe ${FILESDIR}/2.0.49/apache2.initd apache2 - insinto /etc/apache2; doins ${FILESDIR}/2.0.49/apache2-builtin-mods - insinto /etc/apache2/conf - doins ${FILESDIR}/2.0.49/commonapache2.conf - doins ${FILESDIR}/2.0.49/apache2.conf - insinto /etc/apache2/conf/vhosts - doins ${FILESDIR}/2.0.49/virtual-homepages.conf - doins ${FILESDIR}/2.0.49/dynamic-vhosts.conf - doins ${FILESDIR}/2.0.49/vhosts.conf - - # Added by Jason Wever <weeve@gentoo.org> - # 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 - - #empty dirs... - install -d -m0755 -o apache -g apache ${ROOT}/var/lib/dav - install -d -m0755 -o root -g root ${ROOT}/var/log/apache2 - install -d -m0755 -o apache -g apache ${ROOT}/var/cache/apache2 - - if use ssl; then - # install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl - install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl - 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.50-r3.ebuild b/net-www/apache/apache-2.0.50-r3.ebuild deleted file mode 100644 index b368a20adc6b..000000000000 --- a/net-www/apache/apache-2.0.50-r3.ebuild +++ /dev/null @@ -1,404 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.50-r3.ebuild,v 1.5 2004/09/15 14:02:24 kugelfang 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="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz - http://dev.gentoo.org/~stuart/apache/apache-patches-${PVR}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc ~x86" -IUSE="berkdb gdbm ldap threads ipv6 doc static ssl" - -#Standard location for Gentoo Linux -DATADIR="/var/www/localhost" - -DEPEND="dev-util/yacc - dev-lang/perl - sys-libs/zlib - dev-libs/expat - dev-libs/openssl - >=sys-apps/sed-4 - berkdb? ( sys-libs/db ) - gdbm? ( sys-libs/gdbm ) - !mips? ( ldap? ( =net-nds/openldap-2* ) ) - selinux? ( sec-policy/selinux-apache )" - -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 - - # which muppet decided that epatch would default to applying compressed - # patches? - - EPATCH_SUFFIX="patch" - epatch ${WORKDIR}/apache-patches-${PVR} || 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=1 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 ;-) - exeinto /usr/sbin - for i in apache2logserverstatus apache2splitlogfile - do - doexe ${FILESDIR}/2.0.49/$i - done - exeinto /usr/lib/ssl/apache2-mod_ssl - doexe ${FILESDIR}/2.0.49/gentestcrt.sh - - #some more scripts - exeinto /usr/sbin - 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 - doexe 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 - - #modules.d config file snippets - insinto /etc/apache2/conf/modules.d - for i in 40_mod_ssl.conf 41_mod_ssl.default-vhost.conf 45_mod_dav.conf - do - doins ${FILESDIR}/2.0.49/$i - done - use !mips && use ldap && doins ${FILESDIR}/2.0.49/46_mod_ldap.conf - - #drop in a convenient link to the manual - if use doc; then - MANUAL_VERSION="2.0.50" - insinto /etc/apache2/conf/modules.d - doins ${FILESDIR}/00_apache_manual.conf - dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual - sed -i -e "s:2.0.49:${MANUAL_VERSION}:" ${D}/etc/apache2/conf/modules.d/00_apache_manual.conf - 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 - - #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/run ${D}/var/log - - #config files - insinto /etc/conf.d; newins ${FILESDIR}/2.0.49/apache2.confd apache2 - exeinto /etc/init.d; newexe ${FILESDIR}/2.0.49/apache2.initd apache2 - insinto /etc/apache2; doins ${FILESDIR}/2.0.49/apache2-builtin-mods - insinto /etc/apache2/conf - doins ${FILESDIR}/2.0.49/commonapache2.conf - doins ${FILESDIR}/2.0.49/apache2.conf - insinto /etc/apache2/conf/vhosts - doins ${FILESDIR}/2.0.49/virtual-homepages.conf - doins ${FILESDIR}/2.0.49/dynamic-vhosts.conf - doins ${FILESDIR}/2.0.49/vhosts.conf - - # Added by Jason Wever <weeve@gentoo.org> - # 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 - - #empty dirs... - install -d -m0755 -o apache -g apache ${ROOT}/var/lib/dav - install -d -m0755 -o root -g root ${ROOT}/var/log/apache2 - install -d -m0755 -o apache -g apache ${ROOT}/var/cache/apache2 - - if use ssl; then - # install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl - install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl - 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.50.ebuild b/net-www/apache/apache-2.0.50.ebuild deleted file mode 100644 index 19b6b1e1e11f..000000000000 --- a/net-www/apache/apache-2.0.50.ebuild +++ /dev/null @@ -1,406 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.50.ebuild,v 1.11 2004/09/06 20:28:28 ciaranm 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="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz - http://dev.gentoo.org/~zul/apache/apache-patches-${PV}.tar.bz2 - mirror://gentoo/apache-patches-${PV}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="x86 ppc sparc mips alpha arm hppa ~amd64 ia64 ~s390 ~ppc64" -IUSE="berkdb gdbm ldap threads ipv6 doc static ssl" - -#Standard location for Gentoo Linux -DATADIR="/var/www/localhost" - -DEPEND="dev-util/yacc - dev-lang/perl - sys-libs/zlib - dev-libs/expat - dev-libs/openssl - >=sys-apps/sed-4 - berkdb? ( sys-libs/db ) - gdbm? ( sys-libs/gdbm ) - !mips? ( ldap? ( =net-nds/openldap-2* ) ) - selinux? ( sec-policy/selinux-apache )" - -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 - epatch ${WORKDIR}/00_gentoo_base.patch || die - epatch ${WORKDIR}/03_redhat_xfsz.patch || die - epatch ${WORKDIR}/04_ssl_makefile.patch || die - - if use ipv6; then - epatch ${WORKDIR}/01_gentoo_ipv6.patch || die - fi - - 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=1 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" - epause 5 - 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 ;-) - exeinto /usr/sbin - for i in apache2logserverstatus apache2splitlogfile - do - doexe ${FILESDIR}/2.0.49/$i - done - exeinto /usr/lib/ssl/apache2-mod_ssl - doexe ${FILESDIR}/2.0.49/gentestcrt.sh - - #some more scripts - exeinto /usr/sbin - 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 - doexe 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 - - #modules.d config file snippets - insinto /etc/apache2/conf/modules.d - for i in 40_mod_ssl.conf 41_mod_ssl.default-vhost.conf 45_mod_dav.conf - do - doins ${FILESDIR}/2.0.49/$i - done - use !mips && use ldap && doins ${FILESDIR}/2.0.49/46_mod_ldap.conf - - #drop in a convenient link to the manual - if use doc; then - MANUAL_VERSION="2.0.50" - insinto /etc/apache2/conf/modules.d - doins ${FILESDIR}/00_apache_manual.conf - dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual - sed -i -e "s:2.0.49:${MANUAL_VERSION}:" ${D}/etc/apache2/conf/modules.d/00_apache_manual.conf - 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 - - #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/run ${D}/var/log - - #config files - insinto /etc/conf.d; newins ${FILESDIR}/2.0.49/apache2.confd apache2 - exeinto /etc/init.d; newexe ${FILESDIR}/2.0.49/apache2.initd apache2 - insinto /etc/apache2; doins ${FILESDIR}/2.0.49/apache2-builtin-mods - insinto /etc/apache2/conf - doins ${FILESDIR}/2.0.49/commonapache2.conf - doins ${FILESDIR}/2.0.49/apache2.conf - insinto /etc/apache2/conf/vhosts - doins ${FILESDIR}/2.0.49/virtual-homepages.conf - doins ${FILESDIR}/2.0.49/dynamic-vhosts.conf - doins ${FILESDIR}/2.0.49/vhosts.conf - - # Added by Jason Wever <weeve@gentoo.org> - # 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 - - #empty dirs... - install -d -m0755 -o apache -g apache ${ROOT}/var/lib/dav - install -d -m0755 -o root -g root ${ROOT}/var/log/apache2 - install -d -m0755 -o apache -g apache ${ROOT}/var/cache/apache2 - - if use ssl; then - # install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl - install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl - 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/files/digest-apache-2.0.49-r3 b/net-www/apache/files/digest-apache-2.0.49-r3 deleted file mode 100644 index 831c9f68eb55..000000000000 --- a/net-www/apache/files/digest-apache-2.0.49-r3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 275d3d37eed1b070f333d3618f7d1954 httpd-2.0.49.tar.gz 5919279 -MD5 4b4f2bf51795fc3337371d301b810fab apache-patches-2.0.49-r3.tar.bz2 182905 diff --git a/net-www/apache/files/digest-apache-2.0.49-r4 b/net-www/apache/files/digest-apache-2.0.49-r4 deleted file mode 100644 index e4b412e7bf66..000000000000 --- a/net-www/apache/files/digest-apache-2.0.49-r4 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 275d3d37eed1b070f333d3618f7d1954 httpd-2.0.49.tar.gz 5919279 -MD5 bec701a225486c13575b5ac17dccf455 apache-patches-2.0.49-r4.tar.bz2 183402 diff --git a/net-www/apache/files/digest-apache-2.0.50 b/net-www/apache/files/digest-apache-2.0.50 deleted file mode 100644 index d1b9408303a6..000000000000 --- a/net-www/apache/files/digest-apache-2.0.50 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 8b251767212aebf41a13128bb70c0b41 httpd-2.0.50.tar.gz 6338536 -MD5 a23b66c33ea361ead38ad883958bac01 apache-patches-2.0.50.tar.bz2 7986 diff --git a/net-www/apache/files/digest-apache-2.0.50-r1 b/net-www/apache/files/digest-apache-2.0.50-r1 deleted file mode 100644 index d1b9408303a6..000000000000 --- a/net-www/apache/files/digest-apache-2.0.50-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 8b251767212aebf41a13128bb70c0b41 httpd-2.0.50.tar.gz 6338536 -MD5 a23b66c33ea361ead38ad883958bac01 apache-patches-2.0.50.tar.bz2 7986 diff --git a/net-www/apache/files/digest-apache-2.0.50-r2 b/net-www/apache/files/digest-apache-2.0.50-r2 deleted file mode 100644 index b781ae9e4ad4..000000000000 --- a/net-www/apache/files/digest-apache-2.0.50-r2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 8b251767212aebf41a13128bb70c0b41 httpd-2.0.50.tar.gz 6338536 -MD5 ab80c5d3573d601c72d90e233d02bfa6 apache-patches-2.0.50-r2.tar.bz2 8420 diff --git a/net-www/apache/files/digest-apache-2.0.50-r3 b/net-www/apache/files/digest-apache-2.0.50-r3 deleted file mode 100644 index 972e548179e4..000000000000 --- a/net-www/apache/files/digest-apache-2.0.50-r3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 8b251767212aebf41a13128bb70c0b41 httpd-2.0.50.tar.gz 6338536 -MD5 1d6946056bc3778bb2a9870c7280d947 apache-patches-2.0.50-r3.tar.bz2 8752 |