From: Benedikt Boehm Date: Mon, 5 Jun 2006 20:11:41 +0000 (+0000) Subject: fix #112919 and #106455 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=03cf8b862fabc873febb3d0b4b6eac33b1cea49a;p=gentoo.git fix #112919 and #106455 Package-Manager: portage-2.1_rc3-r1 --- diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog index ae0ae1cd2bb2..6e151a38698c 100644 --- a/net-www/apache/ChangeLog +++ b/net-www/apache/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-www/apache # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.476 2006/06/05 03:25:08 vericgar Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.477 2006/06/05 20:11:41 hollow Exp $ + +*apache-1.3.34-r13 (05 Jun 2006) + + 05 Jun 2006; Benedikt Böhm +apache-1.3.34-r13.ebuild: + fix #112919 and #106455 05 Jun 2006; Michael Stewart -files/apache-2.0.48-export.diff, -files/apache-2.0.48-gentoo.diff, diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest index 8251bff0fc0d..7b1ed0e1f5ad 100644 --- a/net-www/apache/Manifest +++ b/net-www/apache/Manifest @@ -1,7 +1,11 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST apache_1.3.34.tar.gz 2468056 RMD160 e39dfc57b7f9164aa76641de3fa74f0314c9ec9e SHA1 df082b73f1220555dc416c0c5afa746e30a9e0de SHA256 ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4 DIST gentoo-apache-1.3.34-r10-20051213.tar.bz2 27570 RMD160 a45c59edcd7f5744f52ebced3ffb7f6b67e21a23 SHA1 9934fc84f3879e26347ed3f3fa7ff56dfd26f1c8 SHA256 111d9cdfac6782bc8720acc6b20d2a1de9c310f0d2f18228f29bf3824c74635f DIST gentoo-apache-1.3.34-r11-20060131.tar.bz2 27897 RMD160 bbb33be5ac758f71041fc6a1b0eb79f24a235ea3 SHA1 50c51fd4429df080c74b1c87faea6e3396cd01c1 SHA256 aad479c67c8ffe59312d107094f86d4cf76fe2e046cb98d297d8e526fc85f9a7 DIST gentoo-apache-1.3.34-r12-20060401.tar.bz2 27547 RMD160 c1a60cc89b387ac1c2ba926c0c369eeef5d5f2c0 SHA1 c00816e114438fa6db8768ddcbe352b3bcf09550 SHA256 e1925eb955db1cc2bd2cd0fb0552ad3a4aebda0bc476eb904e87eb5dcfa6fb1d +DIST gentoo-apache-1.3.34-r13-20060605.tar.bz2 27627 RMD160 2b95dc6413f93d6aeb10abd44c8913109724c2f5 SHA1 3a6f1aab269ae6422d30233d215abe86421043bd SHA256 8503ba7aff01cd593d7e74e4c1a0552b96b18ad0c4167bab80400acbb6a776ac DIST gentoo-apache-2.0.54-r31-20050918-02.tar.bz2 52990 RMD160 bc85ac9de56e017c035d798d9aa45cabab265006 SHA1 7ec8eb508404f572ad581446b12cf189c9e1c38c SHA256 23f2431f6285a24959a99ab9d55d52cef349e828bcb0e7bea026bbae14695ce5 DIST gentoo-apache-2.0.55-r1-20060115.tar.bz2 51735 RMD160 18902966bdce2cbe67ba15b6eb66e311657a8d6d SHA1 2d0a84e20b575177dde67e0c644b82de5db60f33 SHA256 712fb5e292e87bdad0de984085837b5bb974ab57447e5e28356d0041cbb404e3 DIST gentoo-apache-2.0.58-20060515.tar.bz2 51174 RMD160 e029caa8107e37b66999935d6c1e9ed2e95351f0 SHA1 c88f42534f7419517905679f028be8b5754af962 SHA256 3d11702d3fd6b5c143b1c238e9b4a0d4bed2b3c4b9834efa6a3436cca492c0e5 @@ -25,6 +29,10 @@ EBUILD apache-1.3.34-r12.ebuild 8844 RMD160 8b22296eec5d6811f3186154bbf26b859ada MD5 b9c187613db1ea91370b7aa585866af7 apache-1.3.34-r12.ebuild 8844 RMD160 8b22296eec5d6811f3186154bbf26b859ada3d7d apache-1.3.34-r12.ebuild 8844 SHA256 c106f9475905b4ea0e2aa2eb200868abcc2ab7e14cd664fdbe1b20524faddfd8 apache-1.3.34-r12.ebuild 8844 +EBUILD apache-1.3.34-r13.ebuild 8842 RMD160 5d56b452702f910178ca46467318304e5ec796f2 SHA1 f74e1d0644992249388b76b79c1311655b28eee1 SHA256 1cb5345ba2dcbd57deb4b68031e9301caa5cb0de50246df908c9c0082b512949 +MD5 ac4c4312402034e26024fb6f663745c3 apache-1.3.34-r13.ebuild 8842 +RMD160 5d56b452702f910178ca46467318304e5ec796f2 apache-1.3.34-r13.ebuild 8842 +SHA256 1cb5345ba2dcbd57deb4b68031e9301caa5cb0de50246df908c9c0082b512949 apache-1.3.34-r13.ebuild 8842 EBUILD apache-2.0.54-r31.ebuild 13494 RMD160 3eb61fe5172c443dd8b93cae361093538b5456f8 SHA1 78c2ca7d2869a4aaf5552d7c4ed3cb44905f2666 SHA256 d62d8649fe123d6d1482f38afa3d209375a4308ab6786af8ca09e2524a57f2ab MD5 492e69c553ca035e8290c3bad08f4b0c apache-2.0.54-r31.ebuild 13494 RMD160 3eb61fe5172c443dd8b93cae361093538b5456f8 apache-2.0.54-r31.ebuild 13494 @@ -45,10 +53,10 @@ EBUILD apache-2.2.0-r2.ebuild 14337 RMD160 2723b8d0c2b34f2b24a3c5a00aa05ec16cc57 MD5 88a88fc6a2281b1e46a14b6e3654a62c apache-2.2.0-r2.ebuild 14337 RMD160 2723b8d0c2b34f2b24a3c5a00aa05ec16cc57b29 apache-2.2.0-r2.ebuild 14337 SHA256 a311d5651a5dca414476f4f3777e0c09ead77ec7c6428246aaa60e1e9b77427f apache-2.2.0-r2.ebuild 14337 -MISC ChangeLog 81418 RMD160 e8564f0c010db6a9a97cbd9dc2ba298609d46f90 SHA1 12535e4e5f84e181df262f3b02e35773f96388c8 SHA256 b55c279d1c6ea5c6989abb6a3fdcf8bbe010cb6a3ccd038c0b99d09d46909c11 -MD5 601201e20a3a10f8c3b8492a12886e2e ChangeLog 81418 -RMD160 e8564f0c010db6a9a97cbd9dc2ba298609d46f90 ChangeLog 81418 -SHA256 b55c279d1c6ea5c6989abb6a3fdcf8bbe010cb6a3ccd038c0b99d09d46909c11 ChangeLog 81418 +MISC ChangeLog 81554 RMD160 ef2adc8fa3f850d0767c1701a85c6a18dc0b0928 SHA1 4c044def794263712cad7e50297cf984b4c1dcfd SHA256 28c8c9a05a9218b0bc31ae55641de91cae67fbfa0bbff7ba3a77b7c75179e1f4 +MD5 e231eb3e25e041c3ba7f9373df28b245 ChangeLog 81554 +RMD160 ef2adc8fa3f850d0767c1701a85c6a18dc0b0928 ChangeLog 81554 +SHA256 28c8c9a05a9218b0bc31ae55641de91cae67fbfa0bbff7ba3a77b7c75179e1f4 ChangeLog 81554 MISC metadata.xml 566 RMD160 8aad2cbb313fa91b77c6f4891f8d3483d1460adc SHA1 cfaab8d65125c65cb5c66c37dd200f7b3586baf9 SHA256 9826f38d29b803e954faa6fafffc4d6f197bfcb0e14cc76af891c41081d948e2 MD5 27c9cb37c510e08bb69df277229a03ea metadata.xml 566 RMD160 8aad2cbb313fa91b77c6f4891f8d3483d1460adc metadata.xml 566 @@ -62,6 +70,9 @@ SHA256 f572c9c3b245a86f11d6bb98b88a7280bdcfd168b372195fccbd3aa697712b5a files/di MD5 177b1596bf43e80c0779680035bd59c3 files/digest-apache-1.3.34-r12 1045 RMD160 211e36e3a7297d683adc01eb14ead1738abb40af files/digest-apache-1.3.34-r12 1045 SHA256 ca3a32f4201931f08ee7b828a4591fa23c33c1f2aca16f7d906c173923494a02 files/digest-apache-1.3.34-r12 1045 +MD5 1d44cb3645c1287c1d3e05b6724a1fc9 files/digest-apache-1.3.34-r13 1045 +RMD160 f56519efe5fa19a9359c02cc718990879b5ab28b files/digest-apache-1.3.34-r13 1045 +SHA256 c2c9ea156e7dbfa996f8c68bb249ea87d1cfae71753ac8f97eb54b30bc0261f2 files/digest-apache-1.3.34-r13 1045 MD5 bb39b04d1adab58fa4d554e919191659 files/digest-apache-2.0.54-r31 554 RMD160 80612af5fbe4358cb4ee84c58adf8ccfd3264d71 files/digest-apache-2.0.54-r31 554 SHA256 234f37bb3950cd615502c2a230a2bcdebe631c6a44c4e6b9ad5cd20ab82b1997 files/digest-apache-2.0.54-r31 554 @@ -77,3 +88,10 @@ SHA256 33e99840918bb5d10d5d4ecf2368b3246cd91a640e0c9a094256e4025ca0425b files/di MD5 b7db57ee172c09170afffd74a77d3dbc files/digest-apache-2.2.0-r2 536 RMD160 0bc246f9c4f2c1707c3f393ea1fa3baa2d140287 files/digest-apache-2.2.0-r2 536 SHA256 da35bf941e330235aa37b4fffe5d32cb6c006f12f754ac7ee7955e171f51b6e3 files/digest-apache-2.2.0-r2 536 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.3 (GNU/Linux) + +iD8DBQFEhJAJmPFBzbX68WERAl7YAJ94RnUHzZyr43vMcjuFJ/ToMaIuGACgj2CJ +BOlOvk0sb9MLBnWKuAhI6kY= +=+bBF +-----END PGP SIGNATURE----- diff --git a/net-www/apache/apache-1.3.34-r13.ebuild b/net-www/apache/apache-1.3.34-r13.ebuild new file mode 100644 index 000000000000..beaab4ffea1d --- /dev/null +++ b/net-www/apache/apache-1.3.34-r13.ebuild @@ -0,0 +1,309 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.34-r13.ebuild,v 1.1 2006/06/05 20:11:41 hollow Exp $ + +inherit eutils fixheadtails multilib + +# latest gentoo apache files +GENTOO_PATCHNAME="gentoo-apache-${PVR}" +GENTOO_PATCHSTAMP="20060605" +GENTOO_DEVSPACE="hollow" +GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}" + +# The mod_ssl archive is only for providing the EAPI patch in here. +# You should install the net-www/mod_ssl package for the actual DSO. +mod_ssl_ver=2.8.25 +lingerd_ver=0.94 + +DESCRIPTION="The Apache Web Server" +HOMEPAGE="http://httpd.apache.org" +SRC_URI="mirror://apache/httpd/apache_${PV}.tar.gz + ssl? ( ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}-${PV}.tar.gz ) + lingerd? ( http://images.iagora.com/media/software/lingerd/lingerd-${lingerd_ver}.tar.gz ) + http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="1" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="doc ssl pam lingerd no-suexec static-modules selinux" + +DEPEND="dev-lang/perl + || ( sys-libs/gdbm ~sys-libs/db-1.85 ) + sys-libs/db + >=dev-libs/mm-1.1.3 + >=dev-libs/expat-1.95.2 + net-www/gentoo-webroot-default + app-misc/mime-types + selinux? ( sec-policy/selinux-apache ) + lingerd? ( =net-www/lingerd-${lingerd_ver} )" + +# so leave it out until it's available +PDEPEND="ssl? ( =net-www/mod_ssl-${mod_ssl_ver}-r10 )" + +S=${WORKDIR}/${PN}_${PV} + +src_unpack() { + unpack ${A} || die + cd ${S} || die + + # Use correct multilib libdir in gentoo patches + sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \ + ${GENTOO_PATCHDIR}/{conf/httpd.conf,init/*,patches/config.layout} \ + || die "sed failed" + + # patch codes: + # 00-29 patches to work with gentoo + # 30-89 USE-flag patches + # 90-99 security patches + EPATCH_SUFFIX="patch" + epatch ${GENTOO_PATCHDIR}/patches/[0-2]* + epatch ${GENTOO_PATCHDIR}/patches/9* + + # setup the filesystem layout config + cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout + sed -i -e 's:version:${PF}:g' config.layout + + if useq pam; then + epatch ${GENTOO_PATCHDIR}/patches/31_all_gentoo_suexec_pam.patch || die "pam patch failed" + fi + + # fix obsolete 'head -1' and 'tail -1' calls + ht_fix_file src/Configure src/helpers/getuid.sh src/helpers/buildinfo.sh src/helpers/fmn.sh + + # setup mod_ssl eapi + if useq ssl; then + local myssl + myssl=${WORKDIR}/mod_ssl-${mod_ssl_ver}-${PV} + cp ${myssl}/pkg.eapi/*.h src/include + cp ${myssl}/pkg.eapi/*.c src/ap + epatch ${myssl}/pkg.eapi/eapi.patch || die "failed to setup mod_ssl eapi" + fi + + # set a reasonable MM_CORE_PATH location.. + sed -i -e 's:logs/mm:/var/cache/apache-mm/mm:' src/include/httpd.h + + if useq lingerd; then + local mylingerd=${WORKDIR}/lingerd-${lingerd_ver} + cp ${mylingerd}/apache-1.3/ap_lingerd.c ${mylingerd}/li_config.h src/main + cd src + if useq ssl; then + epatch ${mylingerd}/apache-1.3/aplinger-ssl.diff + else + epatch ${mylingerd}/apache-1.3/aplinger.diff + fi + cd .. + fi +} + +src_compile() { + local myconf + + setup_apache_vars + + select_modules_config || die "determining modules" + + if ! useq no-suexec; then + myconf="${myconf} + --enable-suexec + --suexec-uidmin=1000 \ + --suexec-gidmin=100 \ + --suexec-caller=apache \ + --suexec-userdir=public_html \ + --suexec-docroot=/var/www \ + --suexec-safepath="/usr/local/bin:/usr/bin:/bin" \ + --suexec-logfile=/var/log/apache/suexec_log" + fi + + if useq ssl; then + myconf="${myconf} --enable-rule=EAPI" + fi + + OPTIM="${MY_CFLAGS} -DHARD_SERVER_LIMIT=${HARD_SERVER_LIMIT:=512} \ + -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \ + LIBS="-ldb -lgdbm -lgdbm_compat -lpthread" \ + EAPI_MM=SYSTEM \ + ./configure \ + --with-layout=Gentoo \ + --target=apache \ + --server-uid=apache \ + --server-gid=apache \ + --with-perl=/usr/bin/perl \ + --enable-rule=SHARED_CHAIN \ + ${MY_BUILTINS} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log" + + emake || die "problem compiling apache" + + # build ssl version of apache bench (ab-ssl) + if useq ssl; then + cd src/support + rm -f ab ab.o + make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl -I/usr/include/openssl -L/usr/$(get_libdir)" || die + mv ab ab-ssl + rm -f ab.o + make ab || die + fi +} + +pkg_preinst() { + # setup apache user and group + enewgroup apache 81 + enewuser apache 81 -1 /var/www apache +} + +src_install() { + # general install + make install-quiet root=${D} || die + dodoc ABOUT_APACHE Announcement INSTALL LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt + + # protect the suexec binary + if ! useq no-suexec; then + fowners root:apache /usr/sbin/suexec + fperms 4710 /usr/sbin/suexec + fi + + # apxs needs this to pickup the right lib for install + dosym /usr/$(get_libdir) /usr/$(get_libdir)/apache/lib + dosym /var/log/apache /usr/$(get_libdir)/apache/logs + dosym /etc/apache /usr/$(get_libdir)/apache/conf + + # nice support scripts + exeinto /usr/sbin + for i in apachelogserverstatus apachesplitlogfile; do + doexe ${GENTOO_PATCHDIR}/scripts/${i} + done + + # some more scripts + for i in split-logfile logresolve.pl log_server_status; do + doexe ${S}/src/support/${i} + done + + # the ssl version of apache bench + if useq ssl; then + doexe src/support/ab-ssl + fi + + # drop in a convenient link to the manual + if useq doc; then + insinto /etc/apache/modules.d + doins ${GENTOO_PATCHDIR}/conf/modules.d/00_apache_manual.conf + sed -i -e "s:1.3.32:${PVR}:" ${D}/etc/apache/modules.d/00_apache_manual.conf + else + rm -rf ${D}/usr/share/doc/${PF}/manual + fi + + # tidy up + cd ${D} + dodoc etc/apache/*.default + rm -f etc/apache/*.default + rm -f etc/apache/*.conf + rm -f etc/apache/mime.types + + # we DEPEND on net-www/gentoo-webroot-default for sharing this by now + rm -rf var/www/localhost + + # config files + insinto /etc/conf.d + newins ${GENTOO_PATCHDIR}/init/apache.confd apache + + exeinto /etc/init.d + newexe ${GENTOO_PATCHDIR}/init/apache.initd apache + + insinto /etc/apache + doins ${GENTOO_PATCHDIR}/conf/apache-builtin-mods + doins ${GENTOO_PATCHDIR}/conf/httpd.conf + + insinto /etc/apache/vhosts.d + doins ${GENTOO_PATCHDIR}/conf/vhosts.d/00_default_vhost.conf + + keepdir /etc/apache/vhosts.d + keepdir /etc/apache/modules.d + + # Added by Jason Wever + # A little sedfu to fix bug #7172 for sparc64s + if [ ${ARCH} = "sparc" ]; then + sed -i -e '15a\AcceptMutex fcntl' ${D}/etc/apache/httpd.conf + fi + + if useq lingerd; then + sed -i 's:\(need net.*\):\1 lingerd:g' ${D}/etc/init.d/apache + fi + + if useq pam; then + insinto /etc/pam.d + newins ${GENTOO_PATCHDIR}/patches/suexec.pam suexec + fi + + # empty dirs + for i in /var/log/apache /var/cache/apache /var/cache/apache-mm; do + keepdir ${i} + fowners apache:apache ${i} + fperms 755 ${i} + done +} + +pkg_postinst() { + # setup apache user and group + enewgroup apache 81 + enewuser apache 81 -1 /var/www apache + + if has_version '