GLSA update. Basically a revision bump with the files dir moved to
authorNicholas Jones <carpaski@gentoo.org>
Sun, 6 Oct 2002 09:37:34 +0000 (09:37 +0000)
committerNicholas Jones <carpaski@gentoo.org>
Sun, 6 Oct 2002 09:37:34 +0000 (09:37 +0000)
distfiles-local/mirrors.

net-www/apache/ChangeLog
net-www/apache/apache-1.3.27.ebuild [new file with mode: 0644]
net-www/apache/files/digest-apache-1.3.27 [new file with mode: 0644]

index d48364a2bfe9dd236df214248272881d5fa2f664..92eb6ad019a3c47e5d17ec6e069396bca5c399ba 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/apache
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.26 2002/10/02 13:01:43 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.27 2002/10/06 09:37:34 carpaski Exp $
+
+*apache-1.3.27 (06 Oct 2002)
+
+  06 Oct 2002; Nicholas Jones <carpaski@gentoo.org> :
+  GLSA update. Version Bump with files dir moved to gentoo mirrors.
 
 *apache-2.0.40-r1 (04 Sept 2002)
 
diff --git a/net-www/apache/apache-1.3.27.ebuild b/net-www/apache/apache-1.3.27.ebuild
new file mode 100644 (file)
index 0000000..d8339f3
--- /dev/null
@@ -0,0 +1,277 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.27.ebuild,v 1.1 2002/10/06 09:37:34 carpaski Exp $
+
+mod_ssl_ver=2.8.11-${PV}
+HARD_SERVER_LIMIT=512
+
+S=${WORKDIR}/${PN}_${PV}
+DESCRIPTION="The Apache Web Server"
+HOMEPAGE="http://www.apache.org http://www.modssl.org"
+KEYWORDS="x86 ppc sparc sparc64"
+SRC_URI="http://httpd.apache.org/dist/httpd/apache_${PV}.tar.gz
+       mirror://gentoo/${P}-patches.tbz2
+       ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}.tar.gz"
+# 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.
+
+RDEPEND="virtual/glibc
+       =sys-libs/db-1*
+       =sys-libs/db-3*
+       >=dev-libs/mm-1.1.3
+       >=sys-libs/gdbm-1.8
+       >=dev-libs/expat-1.95.2"
+DEPEND="${RDEPEND} sys-devel/perl"
+LICENSE="Apache-1.1"
+SLOT="1"
+
+src_unpack() {
+       local myssl
+       unpack ${A} ; cd ${S}
+
+       # some nice patches..
+       patch -p1 < ${WORKDIR}/${PV}/mdk/apache_1.3.11-apxs.patch || die m1
+       patch -p1 < ${WORKDIR}/${PV}/mdk/apache_1.3.22-srvroot.patch || die m2
+       patch -p1 < ${WORKDIR}/${PV}/mdk/apache-1.3.14-mkstemp.patch || die m3
+       patch -p0 < ${WORKDIR}/${PV}/mdk/apache-1.3.20.manpage.patch || die m4
+       patch -p1 < ${WORKDIR}/${PV}/deb/apxs_wrong_prefix || die d1
+       patch -p1 < ${WORKDIR}/${PV}/deb/custom_response_segfaults || die d2
+       patch -p1 < ${WORKDIR}/${PV}/deb/mime_type_fix || die d3
+       patch -p1 < ${WORKDIR}/${PV}/deb/regex_must_conform_to_posix_for_LFS_to_work || die d4
+       patch -p1 < ${WORKDIR}/${PV}/deb/suexec_combined || die d5
+       patch -p1 < ${WORKDIR}/${PV}/deb/suexec_of_death || die d6
+       patch -p1 < ${WORKDIR}/${PV}/deb/usr_bin_perl_owns_you || die d7
+
+       # yet another perl path fix..
+       cp htdocs/manual/search/manual-index.cgi \
+               htdocs/manual/search/manual-index.cgi.orig
+       sed -e "s:/usr/local/bin/perl5:/usr/bin/perl:" \
+               htdocs/manual/search/manual-index.cgi.orig \
+               > htdocs/manual/search/manual-index.cgi
+       rm -f htdocs/manual/search/manual-index.cgi.orig
+
+       # setup eapi...
+       myssl=${S}/../mod_ssl-${mod_ssl_ver}
+       cp ${myssl}/pkg.eapi/*.h src/include
+       cp ${myssl}/pkg.eapi/*.c src/ap
+       patch -p0 < ${myssl}/pkg.eapi/eapi.patch || die eapi
+
+       # set a reasonable MM_CORE_PATH location..
+       mv src/include/httpd.h src/include/httpd.h.orig
+       sed -e 's:logs/mm:/var/cache/apache-mm/mm:' \
+               src/include/httpd.h.orig > src/include/httpd.h
+
+       # fix this silly script so it finds a db lib..
+       mv src/helpers/find-dbm-lib src/helpers/find-dbm-lib.orig
+       cp ${FILESDIR}/find-dbm-lib src/helpers
+}
+
+src_compile() {
+       local myconf mycflags
+       mycflags="${CFLAGS}"
+       unset CFLAGS ; unset CXXFLAGS
+
+       # Allow users to move the default data directory by setting the
+       # home directory of the 'apache' user elsewhere.
+       DATA_DIR=`grep ^apache: /etc/passwd | cut -d: -f6`
+
+       if [ -z "$DATA_DIR" ]; then
+               DATA_DIR="/home/httpd"
+               eerror "DATA_DIR is null! Using default."
+               eerror "Create the apache user and set the homedir to your desired location."
+       fi
+
+       einfo "Using $DATA_DIR as apache's default data directory."
+
+       select_modules_config || \
+       die "couldn't find apache-builtin-mods config file"
+
+       #-DBUFFERED_LOGS
+       OPTIM="${mycflags} -DHARD_SERVER_LIMIT=${HARD_SERVER_LIMIT} \
+               -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
+       LIBS="-lgdbm -lpthread" \
+       EAPI_MM=SYSTEM \
+       ./configure \
+               --prefix=/usr \
+               --exec-prefix=/usr \
+               --bindir=/usr/bin \
+               --sbindir=/usr/sbin \
+               --libexecdir=/usr/lib/apache \
+               --mandir=/usr/share/man \
+               --sysconfdir=/etc/apache/conf \
+               --datadir=${DATA_DIR} \
+               --iconsdir=${DATA_DIR}/icons \
+               --htdocsdir=${DATA_DIR}/htdocs \
+               --manualdir=/usr/share/doc/${PF}/manual \
+               --cgidir=${DATA_DIR}/cgi-bin \
+               --includedir=/usr/include/apache \
+               --localstatedir=/var \
+               --runtimedir=/var/run \
+               --logfiledir=/var/log/apache \
+               --proxycachedir=/var/cache/apache \
+               --serverroot=/etc/apache \
+               \
+               --target=apache \
+               --server-uid=apache \
+               --server-gid=apache \
+               --enable-rule=EAPI \
+               --enable-rule=SHARED_CHAIN \
+               --with-perl=/usr/bin/perl \
+               \
+               ${MY_BUILTINS} \
+               \
+               --enable-suexec \
+               --suexec-uidmin=1000 \
+               --suexec-gidmin=100 \
+               --suexec-caller=apache \
+               --suexec-userdir=public_html \
+               --suexec-docroot=/home \
+               --suexec-safepath="/bin:/usr/bin" \
+               --suexec-logfile=/var/log/apache/suexec_log \
+               \
+               ${myconf} || die "bad ./configure"
+
+       emake || die "compile problem"
+}
+
+src_install() {
+       # Allow users to move the default data directory by setting the
+       # home directory of the 'apache' user elsewhere.
+       DATA_DIR=`grep ^apache: /etc/passwd | cut -d: -f6`
+
+       if [ -z "$DATA_DIR" ]; then
+               eerror "DATA_DIR is null! Using defaults."
+               eerror "You probably want to check /etc/passwd"
+               DATA_DIR="/home/httpd"
+       fi
+
+       GID=`grep ^apache: /etc/group |cut -d: -f3`
+       if [ -z "${GID}" ]; then
+               einfo "Using default GID of 81 for Apache"
+               GID=81
+       fi
+
+       local myfile
+       make install-quiet root=${D} || die
+       dodoc ABOUT_APACHE Announcement INSTALL* LICENSE* README* WARNING*
+
+       fowners root.${GID} /usr/sbin/suexec
+       fperms 4710 /usr/sbin/suexec
+       #fowners apache.apache ${DATA_DIR}
+       #fowners apache.apache ${DATA_DIR}/htdocs
+
+       # nice support scripts..    # apachefixconf
+       for myfile in apacheaddmod apachedelmod \
+               apachelogserverstatus apachesplitlogfile
+       do
+               exeinto /usr/sbin
+               doexe ${FILESDIR}/$myfile
+       done
+
+       # setup links in /etc/apache..
+       cd ${D}/etc/apache
+       ln -sf ../../usr/lib/apache modules
+       # apxs needs this to pickup the right lib for install..
+       ln -sf ../../usr/lib lib
+       ln -sf ../../var/log/apache logs
+       ln -sf ../../usr/lib/apache-extramodules extramodules
+
+       # drop in a convenient link to the manual
+       dosym /usr/share/doc/${PF}/manual ${DATA_DIR}/htdocs/manual
+
+       # deprecated config files, empty dirs..
+       rm -f ${D}/etc/apache/conf/access.conf*
+       rm -f ${D}/etc/apache/conf/srm.conf*
+
+       # We can't delete this if users specify /var/httpd for datadir
+       #       rm -rf ${D}/var
+
+       # now the config files..
+       insinto /etc/apache/conf
+       doins ${FILESDIR}/conf/commonapache.conf
+       doins ${FILESDIR}/conf/apache.conf
+                       
+       insinto /etc/apache/conf/vhosts
+       doins ${FILESDIR}/conf/VirtualHomePages.conf
+       doins ${FILESDIR}/conf/DynamicVhosts.conf
+       doins ${FILESDIR}/conf/Vhosts.conf
+
+       exeinto /etc/init.d ; newexe ${FILESDIR}/apache.rc6 apache
+       insinto /etc/conf.d ; newins ${FILESDIR}/apache.confd apache
+       insinto /etc/apache ; doins ${FILESDIR}/apache-builtin-mods
+
+       if [ "$DATA_DIR" != "/home/httpd" ]; then
+               einfo "Updating data_dir path."
+               echo grep -lr /home/httpd ${D}
+               grep -lr /home/httpd ${D}
+               sleep 30s
+               for FILE in `grep -lr /home/httpd ${D}`; do
+                       echo "Running sed on: ${FILE}"
+                       cp ${FILE} ${FILE}.orig
+                       echo sed "s:/home/httpd:$DATA_DIR:g"
+                       sed "s:/home/httpd:$DATA_DIR:g" < ${FILE}.orig > ${FILE}
+                       rm ${FILE}.orig
+               done
+       fi
+       dodir /var/cache/apache
+       touch ${D}/var/cache/apache/.keep
+
+       dodir /var/cache/apache-mm
+       touch ${D}/var/cache/apache-mm/.keep
+
+       dodir /usr/lib/apache-extramodules
+       touch ${D}/usr/lib/apache-extramodules/.keep
+
+       dodir /etc/apache/conf/addon-modules
+       touch ${D}/etc/apache/conf/addon-modules/.keep
+
+       dodir /var/log/apache
+       touch ${D}/var/log/apache/.keep
+
+}
+
+pkg_postinst() {
+       # these are in baselayout now; it will not hurt to leave them here though
+       # moved to pkg_postinst by jnelson, moved to pkg_preinst by lostlogic
+       if ! groupmod apache; then
+               groupadd -g 81 apache || die "problem adding group apache"
+       fi
+
+       # usermod returns 2 on user-exists-but-no-flags-given
+       usermod apache &>/dev/null
+       if [ $? != 2 ]; then
+               useradd -u 81 -g apache -s /bin/false -d /home/httpd -c "apache" apache
+               assert "problem adding user apache"
+       fi
+}
+
+parse_modules_config() {
+       local filename=$1
+       local name=""
+       local dso=""
+       local disable=""
+       [ -f ${filename} ] || return 1
+       einfo ">>> using ${filename} for builtins..."
+       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-module=$name"
+                       name="" ; disable=""
+               elif [ $i == "static" ] ; 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
+}
+
+select_modules_config() {
+       parse_modules_config /etc/apache/apache-builtin-mods || \
+       parse_modules_config ${FILESDIR}/apache-builtin-mods || \
+       return 1
+}
diff --git a/net-www/apache/files/digest-apache-1.3.27 b/net-www/apache/files/digest-apache-1.3.27
new file mode 100644 (file)
index 0000000..2e9abcb
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 65b89365a65dcad71d4402b4862beeaa apache_1.3.27.tar.gz 2306052
+MD5 8953999406ff1397ee2501aacff040fb apache-1.3.27-patches.tbz2 7437
+MD5 f84bd971aa8db28f31ad6bab2e7acc2c mod_ssl-2.8.11-1.3.27.tar.gz 753416