diff options
25 files changed, 36 insertions, 1158 deletions
diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog index 57a4b5fb7bd4..830bf48d636f 100644 --- a/net-www/apache/ChangeLog +++ b/net-www/apache/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-www/apache # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.534 2007/06/05 23:34:59 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.535 2007/06/13 14:20:19 chtekk Exp $ + + 13 Jun 2007; Luca Longinotti <chtekk@gentoo.org> + -apache-1.3.34-r14.ebuild, -apache-1.3.37.ebuild: + Remove Apache1. 05 Jun 2007; Markus Ullmann <jokey@gentoo.org> -apache-2.2.4-r5.ebuild +apache-2.2.4-r6.ebuild: diff --git a/net-www/apache/apache-1.3.34-r14.ebuild b/net-www/apache/apache-1.3.34-r14.ebuild deleted file mode 100644 index ae92f2b80641..000000000000 --- a/net-www/apache/apache-1.3.34-r14.ebuild +++ /dev/null @@ -1,306 +0,0 @@ -# Copyright 1999-2007 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-r14.ebuild,v 1.7 2007/04/21 21:28:48 phreak Exp $ - -inherit eutils fixheadtails multilib - -# latest gentoo apache files -GENTOO_PATCHNAME="gentoo-apache-${PVR}" -GENTOO_PATCHSTAMP="20060726" -GENTOO_DEVSPACE="vericgar" -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 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} - -pkg_setup() { - # setup apache user and group - enewgroup apache 81 - enewuser apache 81 -1 /var/www apache -} - -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" - -# no more USE=no-suexec because of bug 148082 -# see the 2.2 ebuilds for how this can be done cleanly with a working system -# "out of the box" -# 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} ${EXTRA_ECONF} || 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 -} - -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 - newconfd ${GENTOO_PATCHDIR}/init/apache.confd apache - newinitd ${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 <weeve@gentoo.org> - # 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() { - - if has_version '<net-www/apache-1.3.33-r10' ; then - einfo "Configuration locations have changed, you will need to migrate" - einfo "your configuration from /etc/apache/conf/apache.conf and" - einfo "/etc/apache/conf/commonapache.conf to /etc/apache/httpd.conf." - einfo - einfo "Apache now checks for the old configuration and refuses to start" - einfo "if it exists. You must remove the old configuration first" - einfo - einfo "For more information, see" - einfo " http://www.gentoo.org/doc/en/apache-upgrading.xml" - einfo - fi - - einfo "If you want modules to be installed for this version of apache" - einfo "then please ensure that apache2 is not in your USE flags. To remove" - einfo "the USE-flag, add '-apache2' to USE in /etc/make.conf." - -} - -setup_apache_vars() { - MY_CFLAGS="${CFLAGS}" - unset CFLAGS - unset CXXFLAGS - - # standard location for Gentoo Linux - DATADIR="${DATADIR:-/var/www/localhost}" - einfo "DATADIR is set to: ${DATADIR}" -} - -parse_modules_config() { - local name="" - local disable="" - [ -f ${1} ] || return 1 - - for i in `cat $1 | sed "s/^#.*//"` ; do - if [ $i == "-" ]; then - disable="true" - elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ]; then - name=`echo $i | sed "s/mod_//"` - elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ); then - MY_BUILTINS="${MY_BUILTINS} --disable-module=$name" - name="" ; disable="" - elif [ $i == "static" ] || useq static-modules; then - MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --disable-shared=$name" - name="" ; disable="" - elif [ $i == "shared" ]; then - MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --enable-shared=$name" - name="" ; disable="" - fi - done - - einfo "${1} options:\n${MY_BUILTINS}" -} - -select_modules_config() { - parse_modules_config /etc/apache/apache-builtin-mods || \ - parse_modules_config ${GENTOO_PATCHDIR}/conf/apache-builtin-mods || \ - return 1 -} - -# vim:ts=4 diff --git a/net-www/apache/apache-1.3.37.ebuild b/net-www/apache/apache-1.3.37.ebuild deleted file mode 100644 index 95dc397cea6d..000000000000 --- a/net-www/apache/apache-1.3.37.ebuild +++ /dev/null @@ -1,312 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.37.ebuild,v 1.6 2007/04/21 21:28:48 phreak Exp $ - -inherit eutils fixheadtails multilib - -# latest gentoo apache files -GENTOO_PATCHNAME="gentoo-apache-${PVR}" -GENTOO_PATCHSTAMP="20060729" -GENTOO_DEVSPACE="vericgar" -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.28 -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 static-modules selinux" - -DEPEND="dev-lang/perl - sys-libs/gdbm - 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} )" - -S=${WORKDIR}/${PN}_${PV} - -pkg_setup() { - # setup apache user and group - enewgroup apache 81 - enewuser apache 81 -1 /var/www apache -} - -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]* - - # security patches are version based - # 99_all_${PV}_Name.patch - if $(ls ${GENTOO_PATCHDIR}/patches/9?_*_${PV}_* &>/dev/null); then - epatch ${GENTOO_PATCHDIR}/patches/9?_*_${PV}_* || \ - die "Patching for version ${PV} failed" - fi - - # 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" - -# no more USE=no-suexec because of bug 148082 -# see the 2.2 ebuilds for how this can be done cleanly with a working system -# "out of the box" -# 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} ${EXTRA_ECONF} || 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 -} - -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 - doconfd ${GENTOO_PATCHDIR}/init/apache.confd apache - doinitd ${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 <weeve@gentoo.org> - # 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() { - - if has_version '<net-www/apache-1.3.33-r10' ; then - einfo "Configuration locations have changed, you will need to migrate" - einfo "your configuration from /etc/apache/conf/apache.conf and" - einfo "/etc/apache/conf/commonapache.conf to /etc/apache/httpd.conf." - einfo - einfo "Apache now checks for the old configuration and refuses to start" - einfo "if it exists. You must remove the old configuration first" - einfo - einfo "For more information, see" - einfo " http://www.gentoo.org/doc/en/apache-upgrading.xml" - einfo - fi - - einfo "If you want modules to be installed for this version of apache" - einfo "then please ensure that apache2 is not in your USE flags. To remove" - einfo "the USE-flag, add '-apache2' to USE in /etc/make.conf." - -} - -setup_apache_vars() { - MY_CFLAGS="${CFLAGS}" - unset CFLAGS - unset CXXFLAGS - - # standard location for Gentoo Linux - DATADIR="${DATADIR:-/var/www/localhost}" - einfo "DATADIR is set to: ${DATADIR}" -} - -parse_modules_config() { - local name="" - local disable="" - [ -f ${1} ] || return 1 - - for i in `cat $1 | sed "s/^#.*//"` ; do - if [ $i == "-" ]; then - disable="true" - elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ]; then - name=`echo $i | sed "s/mod_//"` - elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ); then - MY_BUILTINS="${MY_BUILTINS} --disable-module=$name" - name="" ; disable="" - elif [ $i == "static" ] || useq static-modules; then - MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --disable-shared=$name" - name="" ; disable="" - elif [ $i == "shared" ]; then - MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --enable-shared=$name" - name="" ; disable="" - fi - done - - einfo "${1} options:\n${MY_BUILTINS}" -} - -select_modules_config() { - parse_modules_config /etc/apache/apache-builtin-mods || \ - parse_modules_config ${GENTOO_PATCHDIR}/conf/apache-builtin-mods || \ - return 1 -} - -# vim:ts=4 diff --git a/net-www/apache/files/digest-apache-1.3.34-r14 b/net-www/apache/files/digest-apache-1.3.34-r14 deleted file mode 100644 index e0706667948a..000000000000 --- a/net-www/apache/files/digest-apache-1.3.34-r14 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 9978cc552b423f0015c1052d23ab619e apache_1.3.34.tar.gz 2468056 -RMD160 e39dfc57b7f9164aa76641de3fa74f0314c9ec9e apache_1.3.34.tar.gz 2468056 -SHA256 ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4 apache_1.3.34.tar.gz 2468056 -MD5 3d78704e3f95fe59bf0e0ac1060444fd gentoo-apache-1.3.34-r14-20060726.tar.bz2 28001 -RMD160 955a0ba00287db8859ce03ba6ccfdc2cfaa3bd12 gentoo-apache-1.3.34-r14-20060726.tar.bz2 28001 -SHA256 808e88b32d9ee7181d1cb789f24da21ccd059c8789eff9989bd92826fe826149 gentoo-apache-1.3.34-r14-20060726.tar.bz2 28001 -MD5 6401015bafad4f44fdf8a9a1795d9258 lingerd-0.94.tar.gz 33938 -RMD160 2d7363b763a68c0c7acdadc23779929f4d02153f lingerd-0.94.tar.gz 33938 -SHA256 632030f9c1b9e8f817ee19bad74988f3dce7f6ec617677ad5a522e8d491382a0 lingerd-0.94.tar.gz 33938 -MD5 1ef2a6cb47573444779b2fd10502514b mod_ssl-2.8.25-1.3.34.tar.gz 820352 -RMD160 90a3913d30c7f4d194907463125c90101005837a mod_ssl-2.8.25-1.3.34.tar.gz 820352 -SHA256 832b240157666efdbdfc1a2fd593ee4eebbc9441ec48ece8276660092b974d07 mod_ssl-2.8.25-1.3.34.tar.gz 820352 diff --git a/net-www/apache/files/digest-apache-1.3.37 b/net-www/apache/files/digest-apache-1.3.37 deleted file mode 100644 index 0558f91b506a..000000000000 --- a/net-www/apache/files/digest-apache-1.3.37 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 b278f0969a9ccadeb781316e79e3520f apache_1.3.37.tar.gz 2665370 -RMD160 de84adf2fd0a745c32072ca5dc5e1374cfcf04f7 apache_1.3.37.tar.gz 2665370 -SHA256 9f27889bfbf418b987a892160e52fd217d66391df2870f3ecac877ef565c4bfc apache_1.3.37.tar.gz 2665370 -MD5 7f991bd4d1ce19222a54b6e241ce04a2 gentoo-apache-1.3.37-20060729.tar.bz2 27992 -RMD160 fdb8c3690c8daad501339545b2e348d533d1be09 gentoo-apache-1.3.37-20060729.tar.bz2 27992 -SHA256 00d759d184bec0c2aafbfaba2b748247ceae54bc04570d47979dc237b028ef2b gentoo-apache-1.3.37-20060729.tar.bz2 27992 -MD5 6401015bafad4f44fdf8a9a1795d9258 lingerd-0.94.tar.gz 33938 -RMD160 2d7363b763a68c0c7acdadc23779929f4d02153f lingerd-0.94.tar.gz 33938 -SHA256 632030f9c1b9e8f817ee19bad74988f3dce7f6ec617677ad5a522e8d491382a0 lingerd-0.94.tar.gz 33938 -MD5 5e9486a86fcd4efef395f58fd795aaea mod_ssl-2.8.28-1.3.37.tar.gz 820417 -RMD160 6b12c0a52fe0fbb7b91221d1cb37f93fbe59bb11 mod_ssl-2.8.28-1.3.37.tar.gz 820417 -SHA256 76437105b5b5593a7dbd8ee45af417233897dcaf910cbc337a68b0db24e35489 mod_ssl-2.8.28-1.3.37.tar.gz 820417 diff --git a/net-www/mod_auth_external/ChangeLog b/net-www/mod_auth_external/ChangeLog index 0558096da5c2..727b6dc22a2a 100644 --- a/net-www/mod_auth_external/ChangeLog +++ b/net-www/mod_auth_external/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-www/mod_auth_external # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_external/ChangeLog,v 1.22 2007/01/13 20:09:01 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_external/ChangeLog,v 1.23 2007/06/13 14:15:32 chtekk Exp $ + + 13 Jun 2007; Luca Longinotti <chtekk@gentoo.org> + -mod_auth_external-2.1.19.ebuild: + Remove Apache1. 13 Jan 2007; Luca Longinotti <chtekk@gentoo.org> files/10_mod_auth_external.conf, diff --git a/net-www/mod_auth_external/files/digest-mod_auth_external-2.1.19 b/net-www/mod_auth_external/files/digest-mod_auth_external-2.1.19 deleted file mode 100644 index c7bbebdbaa48..000000000000 --- a/net-www/mod_auth_external/files/digest-mod_auth_external-2.1.19 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 3964bfa66cee9565479992f01a323f15 mod_auth_external-2.1.19.tar.gz 51390 -RMD160 f4012119f3e3eca73b07c1f90292338e6256e31a mod_auth_external-2.1.19.tar.gz 51390 -SHA256 9ad88330dce3b60f89d95106df5f6a58ff0a6414669e509789824e6706ddb636 mod_auth_external-2.1.19.tar.gz 51390 diff --git a/net-www/mod_auth_external/mod_auth_external-2.1.19.ebuild b/net-www/mod_auth_external/mod_auth_external-2.1.19.ebuild deleted file mode 100644 index 2ade998e59cf..000000000000 --- a/net-www/mod_auth_external/mod_auth_external-2.1.19.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_external/mod_auth_external-2.1.19.ebuild,v 1.3 2007/01/13 20:09:01 chtekk Exp $ - -inherit eutils apache-module - -DESCRIPTION="Apache External Authentication Module" -HOMEPAGE="http://www.unixpapa.com/mod_auth_external.html" -SRC_URI="http://www.unixpapa.com/software/${P}.tar.gz" - -DEPEND="" -LICENSE="Apache-1.1" -KEYWORDS="~x86" -IUSE="" -SLOT="1" - -DOCFILES="AUTHENTICATORS CHANGES INSTALL INSTALL.HARDCODE README TODO" - -APACHE1_MOD_CONF="10_${PN}" -APACHE1_MOD_DEFINE="AUTH_EXTERNAL" - -need_apache1 diff --git a/net-www/mod_auth_pgsql/ChangeLog b/net-www/mod_auth_pgsql/ChangeLog index 3f837ebf27a9..03de809e5abf 100644 --- a/net-www/mod_auth_pgsql/ChangeLog +++ b/net-www/mod_auth_pgsql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-www/mod_auth_pgsql # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pgsql/ChangeLog,v 1.33 2007/01/14 17:45:07 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pgsql/ChangeLog,v 1.34 2007/06/13 14:13:51 chtekk Exp $ + + 13 Jun 2007; Luca Longinotti <chtekk@gentoo.org> + -mod_auth_pgsql-0.9.12-r1.ebuild: + Remove Apache1. 14 Jan 2007; Luca Longinotti <chtekk@gentoo.org> -files/80_mod_auth_pgsql_ap1.conf, mod_auth_pgsql-0.9.12-r1.ebuild: diff --git a/net-www/mod_auth_pgsql/files/digest-mod_auth_pgsql-0.9.12-r1 b/net-www/mod_auth_pgsql/files/digest-mod_auth_pgsql-0.9.12-r1 deleted file mode 100644 index 892b91ebbc02..000000000000 --- a/net-www/mod_auth_pgsql/files/digest-mod_auth_pgsql-0.9.12-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7be403b7487c13cdb023cc526ee2e13a mod_auth_pgsql-0.9.12.tar.gz 30527 -RMD160 c3e3455c7dbd0bc8dbb12104065dae666969820d mod_auth_pgsql-0.9.12.tar.gz 30527 -SHA256 f6876bfdb788395307d1e1f27a7b6ab5e0318e64393df352102e78bb043c1e44 mod_auth_pgsql-0.9.12.tar.gz 30527 diff --git a/net-www/mod_auth_pgsql/mod_auth_pgsql-0.9.12-r1.ebuild b/net-www/mod_auth_pgsql/mod_auth_pgsql-0.9.12-r1.ebuild deleted file mode 100644 index 67e0dcfe7aeb..000000000000 --- a/net-www/mod_auth_pgsql/mod_auth_pgsql-0.9.12-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pgsql/mod_auth_pgsql-0.9.12-r1.ebuild,v 1.6 2007/01/14 17:45:07 chtekk Exp $ - -inherit apache-module multilib - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="This module allows user authentication (and can log authentication requests) against information stored in a PostgreSQL database." -HOMEPAGE="http://www.giuseppetanzilli.it/mod_auth_pgsql/" -SRC_URI="http://www.giuseppetanzilli.it/mod_auth_pgsql/dist/${P}.tar.gz" -LICENSE="freedist" -SLOT="1" -IUSE="" - -DEPEND="dev-db/libpq" -RDEPEND="${DEPEND}" - -APACHE1_MOD_CONF="80_mod_auth_pgsql" -APACHE1_MOD_DEFINE="AUTH_PGSQL" - -DOCFILES="INSTALL README mod_auth_pgsql.html" - -need_apache1 - -src_compile() { - econf \ - --with-apxs=${APXS1} \ - --with-pgsql-include=/usr/include/postgresql \ - --with-pgsql-lib=/usr/$(get_libdir)/postgresql \ - || die "econf failed" - ${APXS1} \ - -I/usr/include/postgresql \ - -L/usr/$(get_libdir)/postgresql -lpq \ - -o mod_auth_pgsql.so -c mod_auth_pgsql.c auth_pgsql_shared_stub.c \ - || die "apxs make failed" -} - -src_install() { - apache-module_src_install - fperms 600 "${APACHE1_MODULES_CONFDIR}"/$(basename ${APACHE1_MOD_CONF}).conf -} diff --git a/net-www/mod_layout/ChangeLog b/net-www/mod_layout/ChangeLog index 6bab3f7fd72e..a5033b9e4124 100644 --- a/net-www/mod_layout/ChangeLog +++ b/net-www/mod_layout/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-www/mod_layout # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_layout/ChangeLog,v 1.17 2007/01/14 17:43:02 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_layout/ChangeLog,v 1.18 2007/06/13 14:12:05 chtekk Exp $ + + 13 Jun 2007; Luca Longinotti <chtekk@gentoo.org> + -mod_layout-3.2.1-r1.ebuild: + Remove Apache1. 14 Jan 2007; Luca Longinotti <chtekk@gentoo.org> -files/15_mod_layout_ap1.conf, mod_layout-3.2.1-r1.ebuild: diff --git a/net-www/mod_layout/files/digest-mod_layout-3.2.1-r1 b/net-www/mod_layout/files/digest-mod_layout-3.2.1-r1 deleted file mode 100644 index a661bb3d653b..000000000000 --- a/net-www/mod_layout/files/digest-mod_layout-3.2.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 fdad44ac360f65b2ca75f08fe53af4ad mod_layout-3.2.1.tar.gz 33459 -RMD160 6bbce3c9b769bd824952f5f18d3d8df0674b83e8 mod_layout-3.2.1.tar.gz 33459 -SHA256 9a788027ecd0e55541e524905fe61a6d8c25d81f0ffaf589b8590603e4bcfde3 mod_layout-3.2.1.tar.gz 33459 diff --git a/net-www/mod_layout/mod_layout-3.2.1-r1.ebuild b/net-www/mod_layout/mod_layout-3.2.1-r1.ebuild deleted file mode 100644 index cca136a29cde..000000000000 --- a/net-www/mod_layout/mod_layout-3.2.1-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_layout/mod_layout-3.2.1-r1.ebuild,v 1.7 2007/01/14 17:43:02 chtekk Exp $ - -inherit apache-module - -KEYWORDS="~amd64 x86" - -DESCRIPTION="An Apache1 module for adding custom headers and/or footers." -HOMEPAGE="http://software.tangent.org/" -SRC_URI="http://download.tangent.org/${P}.tar.gz" -LICENSE="as-is" -SLOT="1" -IUSE="" - -DEPEND="" -RDEPEND="" - -# Test target in Makefile isn't sane -RESTRICT="test" - -APXS1_ARGS="-c ${PN}.c utility.c origin.c layout.c" - -APACHE1_MOD_CONF="15_mod_layout" -APACHE1_MOD_DEFINE="LAYOUT" - -DOCFILES="README" - -need_apache1 diff --git a/net-www/mod_limitipconn/ChangeLog b/net-www/mod_limitipconn/ChangeLog index aedb1e8d45a7..ad8ac3a2e158 100644 --- a/net-www/mod_limitipconn/ChangeLog +++ b/net-www/mod_limitipconn/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-www/mod_limitipconn # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_limitipconn/ChangeLog,v 1.15 2007/01/14 17:17:44 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_limitipconn/ChangeLog,v 1.16 2007/06/13 14:10:25 chtekk Exp $ + + 13 Jun 2007; Luca Longinotti <chtekk@gentoo.org> + -files/mod_limitipconn-0.04-local_ip.patch, + -files/mod_limitipconn-0.04-vhost.patch, -mod_limitipconn-0.04.ebuild: + Remove Apache1. 14 Jan 2007; Luca Longinotti <chtekk@gentoo.org> mod_limitipconn-0.04.ebuild, mod_limitipconn-0.22-r1.ebuild: diff --git a/net-www/mod_limitipconn/files/digest-mod_limitipconn-0.04 b/net-www/mod_limitipconn/files/digest-mod_limitipconn-0.04 deleted file mode 100644 index e50ac859e9f9..000000000000 --- a/net-www/mod_limitipconn/files/digest-mod_limitipconn-0.04 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 009dac6ccae20806916ec7aa61a42a1f mod_limitipconn-0.04.tar.gz 6267 -RMD160 90bb7bc1a98258fbbf262a88b6fea1db0b45303b mod_limitipconn-0.04.tar.gz 6267 -SHA256 ad131bbd5af50bb37450d3bafddffeb81b4a2e8456c2bddb3ba300beca530a94 mod_limitipconn-0.04.tar.gz 6267 diff --git a/net-www/mod_limitipconn/files/mod_limitipconn-0.04-local_ip.patch b/net-www/mod_limitipconn/files/mod_limitipconn-0.04-local_ip.patch deleted file mode 100644 index e7aaea7f9865..000000000000 --- a/net-www/mod_limitipconn/files/mod_limitipconn-0.04-local_ip.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- mod_limitipconn.c.org Wed Apr 30 14:57:33 2003 -+++ mod_limitipconn.c Wed Apr 30 15:10:31 2003 -@@ -44,6 +44,8 @@ - checking */ - array_header *excl_limit; /* array of MIME types to limit check; all - other types are exempt */ -+ array_header *local_ip; /* array of local ip exempt from limit -+ checking */ - } limitipconn_dir_config; - - static void *limitipconn_create_dir_config(pool *p, char *path) -@@ -55,6 +57,7 @@ - cfg->limit = 0; - cfg->no_limit = ap_make_array(p, 0, sizeof(char *)); - cfg->excl_limit = ap_make_array(p, 0, sizeof(char *)); -+ cfg->local_ip = ap_make_array(p, 0, sizeof(char *)); - - return (void *) cfg; - } -@@ -68,6 +71,7 @@ - /* convert Apache arrays to normal C arrays */ - char **nolim = (char **) cfg->no_limit->elts; - char **exlim = (char **) cfg->excl_limit->elts; -+ char **localip = (char **) cfg->local_ip->elts; - - const char *address; - -@@ -109,6 +113,15 @@ - return OK; - } - -+ /* Cycle through the local ip list; if the ip is local, -+ * return OK */ -+ for (i = 0; i < cfg->local_ip->nelts; i++) { -+ if ((ap_strcasecmp_match(address, localip[i]) == 0) -+ || (strncmp(localip[i], address, strlen(localip[i])) == 0)) { -+ return OK; -+ } -+ } -+ - /* Cycle through the exempt list; if our content_type is exempt, - * return OK */ - for (i = 0; i < cfg->no_limit->nelts; i++) { -@@ -219,6 +232,16 @@ - return NULL; - } - -+/* Parse the LocalIP directive */ -+static const char *local_ip_config_cmd(cmd_parms *parms, void *mconfig, -+ const char *arg) -+{ -+ limitipconn_dir_config *cfg = (limitipconn_dir_config *) mconfig; -+ -+ *(char **) ap_push_array(cfg->local_ip) = ap_pstrdup(parms->pool, arg); -+ return NULL; -+} -+ - /* Array describing structure of configuration directives */ - static command_rec limitipconn_cmds[] = { - {"MaxConnPerIP", limit_config_cmd, NULL, OR_LIMIT, TAKE1, -@@ -227,6 +250,8 @@ - "MIME types for which limit checking is disabled"}, - {"OnlyIPLimit", excl_limit_config_cmd, NULL, OR_LIMIT, ITERATE, - "restrict limit checking to these MIME types only"}, -+ {"LocalIP", local_ip_config_cmd, NULL, OR_LIMIT, ITERATE, -+ "no checking on local IP"}, - {NULL}, - }; - diff --git a/net-www/mod_limitipconn/files/mod_limitipconn-0.04-vhost.patch b/net-www/mod_limitipconn/files/mod_limitipconn-0.04-vhost.patch deleted file mode 100644 index 60ac75775413..000000000000 --- a/net-www/mod_limitipconn/files/mod_limitipconn-0.04-vhost.patch +++ /dev/null @@ -1,248 +0,0 @@ ---- mod_limitipconn.c-localip 2005-02-09 16:29:55.525726056 +0100 -+++ mod_limitipconn.c 2005-02-09 16:31:44.319186936 +0100 -@@ -1,5 +1,6 @@ - /* - * Copyright (C) 2000-2002 David Jao <djao@dominia.org> -+ * "MaxConnPerUid", "MaxConnPerVhost" and "MaxLA*" portions by Maxim Chirkov <mc@tyumen.ru> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation -@@ -40,6 +41,13 @@ - - typedef struct { - unsigned int limit; /* max number of connections per IP */ -+ -+ unsigned int limit_uid; /* max number of connections per user */ -+ unsigned int limit_vhost; /* max number of connections per virtual host */ -+ double limit_la1; /* maximum value of Load Average for 1 min. */ -+ double limit_la5; /* maximum value of Load Average for 5 min. */ -+ double limit_la15; /* maximum value of Load Average for 15 min. */ -+ - array_header *no_limit; /* array of MIME types exempt from limit - checking */ - array_header *excl_limit; /* array of MIME types to limit check; all -@@ -55,6 +63,11 @@ - - /* default configuration: no limit, and both arrays are empty */ - cfg->limit = 0; -+ cfg->limit_uid = 0; -+ cfg->limit_vhost = 0; -+ cfg->limit_la1 = 0.0; -+ cfg->limit_la5 = 0.0; -+ cfg->limit_la15 = 0.0; - cfg->no_limit = ap_make_array(p, 0, sizeof(char *)); - cfg->excl_limit = ap_make_array(p, 0, sizeof(char *)); - cfg->local_ip = ap_make_array(p, 0, sizeof(char *)); -@@ -75,12 +88,25 @@ - - const char *address; - -+ /* load average */ -+ double current_la[3]; -+ - /* loop index variable */ - int i; - - /* running count of number of connections from this address */ - int ip_count = 0; - -+ /* count of runnung requests for current uid and virtual host*/ -+ int uid_req_count = 0; -+ int vhost_req_count = 0; -+ -+ /* uid of current virtual host */ -+ uid_t current_uid = 0; -+ -+ /* current virtual host id */ -+ char *current_vhost = NULL; -+ - /* Content-type of the current request */ - const char *content_type; - -@@ -108,8 +134,44 @@ - #endif - address = r->connection->remote_ip; - -+#ifdef DEBUG -+ ap_log_error(APLOG_MARK, APLOG_ERR, r->server, "DEBUG: %s handler for requiest uri(%s) args(%s) host(%s) uid(%d)",r->handler, r->uri, r->args, r->server->server_hostname, r->server->server_uid); -+#endif -+ -+ /* Check Load Average overflow */ -+ if (cfg->limit_la1 != 0 || cfg->limit_la5 != 0 || cfg->limit_la15 != 0){ -+ -+ /* Blocking only cgi or php scripts if LA limit exceeded */ -+ /* Handlers: cgi-script perl-script application/x-httpd-php application/x-httpd-cgi */ -+ /* Check for cgi and php in r->uri too simple then r->handler */ -+ if ((r->args != NULL) -+ || (ap_strcasestr(r->uri, "cgi") != NULL) -+ || (ap_strcasestr(r->uri, "php") != NULL)){ -+ -+ if( getloadavg(current_la, 3) != -1 ){ -+ -+ if ((current_la[0] >= cfg->limit_la1) -+ && (current_la[1] >= cfg->limit_la5) -+ && (current_la[2] >= cfg->limit_la15)){ -+ -+ ap_log_error(APLOG_MARK, APLOG_ERR, r->server, "Load Average limit exceeded (%.2f, %.2f, %.2f)", -+ current_la[0], current_la[1], current_la[2]); -+ ap_log_reason("System exceeded LA limit.", r->uri, r); -+ -+ return HTTP_SERVICE_UNAVAILABLE; -+ } -+ } -+ } -+ } -+ -+ /* Get uid of current virual host for future use */ -+ if (r->server->is_virtual){ -+ current_uid = r->server->server_uid; -+ current_vhost = r->server->server_hostname; -+ } -+ - /* A limit value of 0 by convention means no limit. */ -- if (cfg->limit == 0) { -+ if (cfg->limit == 0 && cfg->limit_uid == 0 && cfg->limit_vhost == 0) { - return OK; - } - -@@ -168,6 +230,19 @@ - ) { - ip_count++; - } -+ if ((score_record.vhostrec != NULL) && -+ (score_record.vhostrec->is_virtual)){ -+ -+ if (score_record.vhostrec->server_uid == current_uid){ -+ /* Same user */ -+ uid_req_count++; -+ } -+ if ((cfg->limit_vhost != 0) -+ && (strcmp(score_record.vhostrec->server_hostname, current_vhost) == 0)){ -+ /* Same host name */ -+ vhost_req_count++; -+ } -+ } - break; - case - SERVER_DEAD: -@@ -191,6 +266,14 @@ - ap_table_setn(r->subprocess_env, "LIMITIP", "1"); - /* return 503 */ - return HTTP_SERVICE_UNAVAILABLE; -+ } else if ((uid_req_count > cfg->limit_uid) && (cfg->limit_uid)){ -+ ap_log_error(APLOG_MARK, APLOG_ERR, r->server, "Rejecting vhost=%s, uid=%u", r->server->server_hostname, r->server->server_uid); -+ ap_log_reason("Client exceeded request per user limit.", r->uri, r); -+ return HTTP_SERVICE_UNAVAILABLE; -+ } else if ((vhost_req_count > cfg->limit_vhost) && (cfg->limit_vhost)){ -+ ap_log_error(APLOG_MARK, APLOG_ERR, r->server, "Rejecting vhost=%s, uid=%u", r->server->server_hostname, r->server->server_uid); -+ ap_log_reason("Client exceeded request per vhost limit.", r->uri, r); -+ return HTTP_SERVICE_UNAVAILABLE; - } else { - return OK; - } -@@ -242,6 +325,88 @@ - return NULL; - } - -+/* Parse the MaxConnPerVhost directive */ -+static const char *limit_vhost_config_cmd(cmd_parms *parms, void *mconfig, -+ const char *arg) -+{ -+ limitipconn_dir_config *cfg = (limitipconn_dir_config *) mconfig; -+ -+ unsigned long int limit = strtol(arg, (char **) NULL, 10); -+ -+ if (limit == LONG_MAX) { -+ return "Integer overflow or invalid number"; -+ } -+ -+ cfg->limit_vhost = limit; -+ return NULL; -+} -+ -+/* Parse the MaxConnPerUid directive */ -+static const char *limit_uid_config_cmd(cmd_parms *parms, void *mconfig, -+ const char *arg) -+{ -+ limitipconn_dir_config *cfg = (limitipconn_dir_config *) mconfig; -+ -+ unsigned long int limit = strtol(arg, (char **) NULL, 10); -+ -+ if (limit == LONG_MAX) { -+ return "Integer overflow or invalid number"; -+ } -+ -+ cfg->limit_uid = limit; -+ return NULL; -+} -+ -+/* Parse the MaxLA1 directive */ -+static const char *limit_la1_config_cmd(cmd_parms *parms, void *mconfig, -+ const char *arg) -+{ -+ limitipconn_dir_config *cfg = (limitipconn_dir_config *) mconfig; -+ -+ double limit = strtod(arg, (char **) NULL); -+ -+ if (limit < 0.0) { -+ return "Invalid LA1 value"; -+ } -+ -+ cfg->limit_la1 = limit; -+ return NULL; -+} -+ -+/* Parse the MaxLA5 directive */ -+static const char *limit_la5_config_cmd(cmd_parms *parms, void *mconfig, -+ const char *arg) -+{ -+ limitipconn_dir_config *cfg = (limitipconn_dir_config *) mconfig; -+ -+ double limit = strtod(arg, (char **) NULL); -+ -+ if (limit < 0.0) { -+ return "Invalid LA5 value"; -+ } -+ -+ cfg->limit_la5 = limit; -+ return NULL; -+} -+ -+ -+/* Parse the MaxLA15 directive */ -+static const char *limit_la15_config_cmd(cmd_parms *parms, void *mconfig, -+ const char *arg) -+{ -+ limitipconn_dir_config *cfg = (limitipconn_dir_config *) mconfig; -+ -+ double limit = strtod(arg, (char **) NULL); -+ -+ if (limit < 0.0) { -+ return "Invalid LA15 value"; -+ } -+ -+ cfg->limit_la15 = limit; -+ return NULL; -+} -+ -+ - /* Array describing structure of configuration directives */ - static command_rec limitipconn_cmds[] = { - {"MaxConnPerIP", limit_config_cmd, NULL, OR_LIMIT, TAKE1, -@@ -252,6 +417,16 @@ - "restrict limit checking to these MIME types only"}, - {"LocalIP", local_ip_config_cmd, NULL, OR_LIMIT, ITERATE, - "no checking on local IP"}, -+ {"MaxConnPerUid", limit_uid_config_cmd, NULL, OR_LIMIT, TAKE1, -+ "maximum simultaneous connections per user"}, -+ {"MaxConnPerVhost", limit_vhost_config_cmd, NULL, OR_LIMIT, TAKE1, -+ "maximum simultaneous connections per virtual host"}, -+ {"MaxLA1", limit_la1_config_cmd, NULL, OR_LIMIT, TAKE1, -+ "maximum Load Overage value for the past 1 minute"}, -+ {"MaxLA5", limit_la5_config_cmd, NULL, OR_LIMIT, TAKE1, -+ "maximum Load Overage value for the past 5 minutes"}, -+ {"MaxLA15", limit_la15_config_cmd, NULL, OR_LIMIT, TAKE1, -+ "maximum Load Overage value for the past 15 minutes"}, - {NULL}, - }; - diff --git a/net-www/mod_limitipconn/mod_limitipconn-0.04.ebuild b/net-www/mod_limitipconn/mod_limitipconn-0.04.ebuild deleted file mode 100644 index dd5d9fae8f93..000000000000 --- a/net-www/mod_limitipconn/mod_limitipconn-0.04.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_limitipconn/mod_limitipconn-0.04.ebuild,v 1.5 2007/01/14 17:17:44 chtekk Exp $ - -inherit eutils apache-module - -KEYWORDS="amd64 ~ppc ~x86" - -DESCRIPTION="Allows administrators to limit the number of simultaneous downloads permitted." -HOMEPAGE="http://dominia.org/djao/limitipconn.html" -SRC_URI="http://dominia.org/djao/limit/${P}.tar.gz" -LICENSE="as-is" -SLOT="1" -IUSE="" - -DEPEND="" -RDEPEND="" - -APACHE1_MOD_CONF="27_${PN}" -APACHE1_MOD_DEFINE="LIMITIPCONN INFO" - -DOCFILES="ChangeLog README" - -need_apache1 - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-local_ip.patch" - epatch "${FILESDIR}/${P}-vhost.patch" -} diff --git a/net-www/mod_loopback/ChangeLog b/net-www/mod_loopback/ChangeLog index 655e9fdd6b07..8b452509557e 100644 --- a/net-www/mod_loopback/ChangeLog +++ b/net-www/mod_loopback/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-www/mod_loopback # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_loopback/ChangeLog,v 1.21 2007/01/14 17:37:25 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_loopback/ChangeLog,v 1.22 2007/06/13 14:08:07 chtekk Exp $ + + 13 Jun 2007; Luca Longinotti <chtekk@gentoo.org> + -mod_loopback-1.04-r1.ebuild: + Remove Apache1. 14 Jan 2007; Luca Longinotti <chtekk@gentoo.org> -files/1.04-r1/28_mod_loopback.conf, -files/2.01-r1/28_mod_loopback.conf, diff --git a/net-www/mod_loopback/files/digest-mod_loopback-1.04-r1 b/net-www/mod_loopback/files/digest-mod_loopback-1.04-r1 deleted file mode 100644 index 5a4559106eb8..000000000000 --- a/net-www/mod_loopback/files/digest-mod_loopback-1.04-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5b564f74730f312f1afb406613fc7b5e mod_loopback104.tgz 13100 -RMD160 ff57fcf0f192b59d3eb601603dd6ddde137caabd mod_loopback104.tgz 13100 -SHA256 1750d3567e75dd274f98c496ee68c0cf9e9ab59b754335db4b2b027e84116e2e mod_loopback104.tgz 13100 diff --git a/net-www/mod_loopback/mod_loopback-1.04-r1.ebuild b/net-www/mod_loopback/mod_loopback-1.04-r1.ebuild deleted file mode 100644 index 9ba2dc8b9bce..000000000000 --- a/net-www/mod_loopback/mod_loopback-1.04-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_loopback/mod_loopback-1.04-r1.ebuild,v 1.4 2007/01/14 17:37:25 chtekk Exp $ - -inherit apache-module - -KEYWORDS="x86" - -DESCRIPTION="A web client debugging tool for Apache1." -HOMEPAGE="http://www.snert.com/Software/mod_loopback/index.shtml" -SRC_URI="http://www.snert.com/Software/download/${PN}104.tgz" -LICENSE="BSD" -SLOT="1" -IUSE="" - -S="${WORKDIR}/${PN}-1.4" - -APACHE1_MOD_CONF="28_mod_loopback" -APACHE1_MOD_DEFINE="LOOPBACK" - -DOCFILES="CHANGES.txt LICENSE.txt" - -need_apache1 diff --git a/net-www/mod_roaming/ChangeLog b/net-www/mod_roaming/ChangeLog index 3ab014dc7468..bd9384d7a452 100644 --- a/net-www/mod_roaming/ChangeLog +++ b/net-www/mod_roaming/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-www/mod_roaming # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_roaming/ChangeLog,v 1.13 2007/01/14 19:04:42 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_roaming/ChangeLog,v 1.14 2007/06/13 14:06:35 chtekk Exp $ + + 13 Jun 2007; Luca Longinotti <chtekk@gentoo.org> + -mod_roaming-1.0.2.ebuild: + Remove Apache1. 14 Jan 2007; Luca Longinotti <chtekk@gentoo.org> mod_roaming-1.0.2.ebuild, mod_roaming-2.0.0-r1.ebuild: diff --git a/net-www/mod_roaming/files/digest-mod_roaming-1.0.2 b/net-www/mod_roaming/files/digest-mod_roaming-1.0.2 deleted file mode 100644 index a1e49fefce46..000000000000 --- a/net-www/mod_roaming/files/digest-mod_roaming-1.0.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 226c0ce2daf276072079590b5560f022 mod_roaming-1.0.2.tar.gz 9742 -RMD160 c4d27b082c7ccac5b352e35b88ad72bbd12d5810 mod_roaming-1.0.2.tar.gz 9742 -SHA256 acb473962f6091887fa2fd5265b4440ca1a95d38093d01d2a59deabfaac90dce mod_roaming-1.0.2.tar.gz 9742 diff --git a/net-www/mod_roaming/mod_roaming-1.0.2.ebuild b/net-www/mod_roaming/mod_roaming-1.0.2.ebuild deleted file mode 100644 index 76c9d56e0455..000000000000 --- a/net-www/mod_roaming/mod_roaming-1.0.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_roaming/mod_roaming-1.0.2.ebuild,v 1.5 2007/01/14 19:04:42 chtekk Exp $ - -inherit apache-module - -KEYWORDS="x86" - -DESCRIPTION="Apache1 module enabling Netscape Communicator roaming profiles." -HOMEPAGE="http://www.klomp.org/mod_roaming/" -SRC_URI="http://www.klomp.org/${PN}/${P}.tar.gz" -LICENSE="BSD" -SLOT="0" -IUSE="" - -APACHE1_MOD_CONF="18_mod_roaming" -APACHE1_MOD_DEFINE="ROAMING" - -DOCFILES="CHANGES INSTALL LICENSE README" - -need_apache1 - -pkg_postinst() { - install -d -m 0755 -o apache -g apache "${ROOT}"/var/lib/${PN} - apache1_pkg_postinst -} |