From 7a02980d7edb5b42b4d07d3bfa88d9c1d5eb9735 Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Wed, 31 Jan 2007 18:23:14 +0000 Subject: Remove old version. (Portage version: 2.1.2-r5) --- net-www/apache/ChangeLog | 5 +- net-www/apache/apache-2.2.3-r2.ebuild | 469 ---------------------------- net-www/apache/files/digest-apache-2.2.3-r2 | 6 - 3 files changed, 4 insertions(+), 476 deletions(-) delete mode 100644 net-www/apache/apache-2.2.3-r2.ebuild delete mode 100644 net-www/apache/files/digest-apache-2.2.3-r2 (limited to 'net-www') diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog index 487240d56261..e19f446ca71e 100644 --- a/net-www/apache/ChangeLog +++ b/net-www/apache/ChangeLog @@ -1,6 +1,9 @@ # 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.511 2007/01/28 20:00:32 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.512 2007/01/31 18:23:14 chtekk Exp $ + + 31 Jan 2007; Luca Longinotti -apache-2.2.3-r2.ebuild: + Remove old 2.2 version. 28 Jan 2007; Luca Longinotti apache-2.0.58-r2.ebuild, apache-2.0.59-r2.ebuild, apache-2.2.3-r2.ebuild, apache-2.2.4.ebuild: diff --git a/net-www/apache/apache-2.2.3-r2.ebuild b/net-www/apache/apache-2.2.3-r2.ebuild deleted file mode 100644 index fdd93af4a91b..000000000000 --- a/net-www/apache/apache-2.2.3-r2.ebuild +++ /dev/null @@ -1,469 +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-2.2.3-r2.ebuild,v 1.4 2007/01/28 20:00:33 chtekk Exp $ - -inherit eutils flag-o-matic gnuconfig multilib autotools - -# latest gentoo apache files -GENTOO_PATCHNAME="gentoo-apache-${PV}-r1" -GENTOO_PATCHSTAMP="20061126" -GENTOO_DEVSPACE="vericgar" -GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}" - -DESCRIPTION="The Apache Web Server." -HOMEPAGE="http://httpd.apache.org/" -SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2 - http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2" - -# some helper scripts are apache-1.1, thus both are here -LICENSE="Apache-2.0 Apache-1.1" - -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="debug doc ldap mpm-event mpm-peruser mpm-prefork mpm-worker no-suexec selinux ssl static-modules threads" - -DEPEND="app-misc/mime-types - dev-lang/perl - =dev-libs/apr-1* - =dev-libs/apr-util-1* - dev-libs/expat - dev-libs/libpcre - sys-libs/zlib - ldap? ( =net-nds/openldap-2* ) - selinux? ( sec-policy/selinux-apache ) - ssl? ( dev-libs/openssl )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/httpd-${PV}" - -pkg_setup() { - if use ldap && ! built_with_use 'dev-libs/apr-util' ldap ; then - eerror "dev-libs/apr-util is missing LDAP support. For apache to have" - eerror "ldap support, apr-util must be built with the ldap USE-flag" - eerror "enabled." - die "ldap USE-flag enabled while not supported in apr-util" - fi - - # select our MPM - MPM_LIST="event peruser prefork worker" - for x in ${MPM_LIST} ; do - if use mpm-${x} ; then - if [[ "x${mpm}" == "x" ]] ; then - mpm=${x} - einfo "Selected MPM: ${mpm}" - else - eerror "You have selected more then one mpm USE-flag." - eerror "Only one MPM is supported." - die "more then one mpm was specified" - fi - fi - done - - if [[ "x${mpm}" == "x" ]] ; then - if use threads ; then - mpm=worker - einfo "Selected default threaded MPM: ${mpm}"; - else - mpm=prefork - einfo "Selected default MPM: ${mpm}"; - fi - fi - - # setup apache user and group - enewgroup apache 81 - enewuser apache 81 -1 /var/www apache -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # 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,scripts/Makefile.suexec,scripts/suexec2-config} \ - || die "libdir sed failed" - - #### Patch Organization - # 00-19 Gentoo specific (00_all_some-title.patch) - # 20-39 Additional MPMs (20_all_${MPM}_some-title.patch) - # 40-59 USE-flag based (40_all_${USE}_some-title.patch) - # 60-79 Version specific (60_all_${PV}_some-title.patch) - # 80-99 Security patches (80_all_${PV}_cve-####-####.patch) - - EPATCH_SUFFIX="patch" - epatch "${GENTOO_PATCHDIR}"/patches/[0-1]* - if $(ls "${GENTOO_PATCHDIR}"/patches/[2-3]?_*_${mpm}_* &>/dev/null) ; then - epatch "${GENTOO_PATCHDIR}"/patches/[2-3]?_*_${mpm}_* - fi - for uf in ${IUSE} ; do - if use ${uf} && $(ls "${GENTOO_PATCHDIR}"/patches/[4-5]?_*_${uf}_* &>/dev/null) ; then - epatch "${GENTOO_PATCHDIR}"/patches/[4-5]?_*_${uf}_* - fi - done - if $(ls "${GENTOO_PATCHDIR}"/patches/[6-9]?_*_${PV}_* &>/dev/null) ; then - epatch "${GENTOO_PATCHDIR}"/patches/[6-9]?_*_${PV}_* - fi - - # avoid utf-8 charset problems - export LC_CTYPE=C - - # setup the filesystem layout config - cat "${GENTOO_PATCHDIR}"/patches/config.layout >> config.layout - sed -i -e "s:version:${PF}:g" config.layout - - # patched-in MPMs need the build environment rebuilt - sed -i -e '/sinclude/d' configure.in - AT_GNUCONF_UPDATE=yes AT_M4DIR=build eautoreconf -} - -src_compile() { - local modtype - if use static-modules ; then - modtype="static" - else - modtype="shared" - fi - - select_modules_config || die "determining modules failed" - - local myconf="" - use ldap \ - && mods="${mods} ldap authnz_ldap" \ - && myconf="${myconf} --enable-authnz-ldap=${modtype}" \ - && myconf="${myconf} --enable-ldap=${modtype}" - use ssl \ - && mods="${mods} ssl" \ - && myconf="${myconf} --with-ssl=/usr --enable-ssl=${modtype}" - - # Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003 - # We pre-load the cache with the correct answer! This avoids - # it violating the sandbox. This may have to be changed for - # non-Linux systems or if sem_open changes on Linux. This - # hack is built around documentation in /usr/include/semaphore.h - # and the glibc (pthread) source. - echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> "${S}/config.cache" - - if use no-suexec ; then - myconf="${myconf} --disable-suexec" - else - mods="${mods} suexec" - myconf="${myconf} $(${GENTOO_PATCHDIR}/scripts/suexec2-config --config)" - myconf="${myconf} \ - --with-suexec-bin=/usr/sbin/suexec2 \ - --enable-suexec=${modtype}" - fi - - # common confopts - myconf="--cache-file='${S}/config.cache' \ - --with-mpm=${mpm} \ - --with-perl=/usr/bin/perl \ - --with-expat=/usr \ - --with-z=/usr \ - --with-apr=/usr \ - --with-apr-util=/usr \ - --with-pcre=/usr \ - --with-port=80 \ - --enable-layout=Gentoo \ - --with-program-name=apache2 \ - ${myconf} \ - ${MY_BUILTINS}" - - # debugging support - if use debug ; then - myconf="${myconf} --enable-maintainer-mode" - fi - - econf ${myconf} || die "econf failed: please submit a bug report to bugs.gentoo.org, including your config.layout and config.log" - - sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h - - emake || die "emake failed" -} - -src_install () { - #### DEFAULT SETUP & INSTALL - - # general install - einfo "Beginning install phase" - emake DESTDIR="${D}" install || die "emake install failed" - - #### CLEAN-UP - rm -Rf "${D}"/etc - rm -f "${D}"/usr/sbin/envvars* - rm -f "${D}"/usr/sbin/apachectl - - #### CONFIGURATION - einfo "Setting up configuration" - insinto /etc/apache2 - - # restore the magic file - doins docs/conf/magic - - # This is a mapping of module names to the -D options in APACHE2_OPTS - # Used for creating optional LoadModule lines - mod_defines="info:INFO status:INFO - ldap:LDAP authnz_ldap:AUTH_LDAP - proxy:PROXY proxy_connect:PROXY proxy_http:PROXY - proxy_ajp:PROXY proxy_balancer:PROXY - ssl:SSL - suexec:SUEXEC - userdir:USERDIR" - - # create our LoadModule lines - if ! use static-modules ; then - load_module="" - moddir="${D}/usr/$(get_libdir)/apache2/modules" - for m in ${mods} ; do - endid="no" - - if [[ -e "${moddir}/mod_${m}.so" ]] ; then - for def in ${mod_defines} ; do - if [[ "${m}" == "${def%:*}" ]] ; then - load_module="${load_module}\n" - endid="yes" - fi - done - load_module="${load_module}\nLoadModule ${m}_module modules/mod_${m}.so" - if [[ "${endid}" == "yes" ]] ; then - load_module="${load_module}\n" - fi - fi - done - fi - sed -i -e "s:%%LOAD_MODULE%%:${load_module}:" \ - "${GENTOO_PATCHDIR}"/conf/httpd.conf || die "sed failed" - - # install our configuration - doins -r "${GENTOO_PATCHDIR}"/conf/* - - insinto /etc/logrotate.d - newins "${GENTOO_PATCHDIR}"/scripts/apache2-logrotate apache2 - - # generate a sane default APACHE2_OPTS - APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D LANGUAGE" - use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL" - use ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST" - use no-suexec || APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC" - - sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \ - "${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed" - - mv -f "${D}"/etc/apache2/apache2-builtin-mods "${D}"/etc/apache2/apache2-builtin-mods-2.2 - - newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2 - newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2 - - # link apache2ctl to the init script - dosym /etc/init.d/apache2 /usr/sbin/apache2ctl - - #### HELPER SCRIPTS - einfo "Installing helper scripts" - exeinto /usr/sbin - for i in apache2logserverstatus apache2splitlogfile suexec2-config ; do - doexe "${GENTOO_PATCHDIR}"/scripts/${i} - done - use ssl && doexe "${GENTOO_PATCHDIR}"/scripts/gentestcrt.sh - - for i in logresolve.pl split-logfile log_server_status ; do - doexe support/${i} - done - - # needed for suexec2-config - insinto /usr/$(get_libdir)/apache2/build - doins "${GENTOO_PATCHDIR}"/scripts/Makefile.suexec - doins support/suexec.c - - #### SLOTTING - einfo "Applying SLOT=2" - cd "${D}" - - # sbin binaries - slotmv="apxs htpasswd htdigest rotatelogs logresolve log_server_status - ab checkgid dbmmanage split-logfile suexec" - for i in ${slotmv} ; do - mv -f usr/sbin/${i} usr/sbin/${i}2 - done - mv -f usr/sbin/logresolve.pl usr/sbin/logresolve2.pl - - # man.1 - for i in dbmmanage htdigest htpasswd ; do - mv -f usr/share/man/man1/${i}.1 usr/share/man/man1/${i}2.1 - done - - # man.8 - for i in ab apxs logresolve rotatelogs suexec ; do - mv -f usr/share/man/man8/${i}.8 usr/share/man/man8/${i}2.8 - done - - mv -f usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8 - - # we don't use apachectl anymore, it's symlinked to the init script now - rm -f usr/share/man/man8/apachectl.8 - - #### DOCS - # basic info - einfo "Installing docs" - cd "${S}" - dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING - - # drop in a convenient link to the manual - if use doc ; then - sed -i -e "s:VERSION:${PVR}:" "${D}/etc/apache2/modules.d/00_apache_manual.conf" - else - einfo "USE=-docs :: Removing Manual" - rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf" - rm -Rf "${D}/usr/share/doc/${PF}/manual" - fi - - # the default webroot gets stored in /usr/share/doc - einfo "Installing default webroot to /usr/share/doc/${PF}" - mv -f "${D}/var/www/localhost" "${D}/usr/share/doc/${PF}/webroot" - - - #### PERMISSONS - einfo "Applying permissions" - - # protect the suexec binary - if ! use no-suexec ; then - fowners 0:apache /usr/sbin/suexec2 - fperms 4710 /usr/sbin/suexec2 - fi - - keepdir /etc/apache2/vhosts.d - keepdir /etc/apache2/modules.d - - # empty dirs - for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do - keepdir ${i} - fowners apache:apache ${i} - fperms 0755 ${i} - done - - # We'll be needing /etc/apache2/ssl if USE=ssl - use ssl && keepdir /etc/apache2/ssl - - fperms 0755 /usr/sbin/apache2logserverstatus - fperms 0755 /usr/sbin/apache2splitlogfile -} - -pkg_postinst() { - # Automatically generate test certificates if ssl USE flag is being set - if use ssl && [[ ! -e "${ROOT}/etc/apache2/ssl/server.crt" ]] ; then - cd "${ROOT}"/etc/apache2/ssl - einfo - einfo "Generating self-signed test certificate in ${ROOT}/etc/apache2/ssl ..." - yes "" 2>/dev/null | \ - "${ROOT}"/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \ - die "gentestcrt.sh failed" - einfo - fi - - # we do this here because the default webroot is a copy of the files - # that exist elsewhere and we don't want them managed/removed by portage - # when apache is upgraded. - - if [[ -e "${ROOT}/var/www/localhost" ]] ; then - einfo "The default webroot has not been installed into" - einfo "${ROOT}/var/www/localhost because the directory already exists" - einfo "and we do not want to overwrite any files you have put there." - einfo - einfo "If you would like to install the latest webroot, please run" - einfo "emerge --config =${PF}" - else - einfo "Installing default webroot to ${ROOT}/var/www/localhost" - mkdir -p "${ROOT}"/var/www/localhost - cp -R "${ROOT}"/usr/share/doc/${PF}/webroot/* "${ROOT}"/var/www/localhost - chown -R apache:0 "${ROOT}"/var/www/localhost - fi - - # Check for dual/upgrade install - # The hasq is a hack so we don't throw QA warnings for not putting - # apache2 in IUSE - the only use of the flag is this warning - if has_version '=net-www/apache-1*' || ! hasq apache2 ${USE} ; 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 ${ROOT}/etc/apache2/modules.d" - ewarn - fi - - if has_version '