From 99d44cc8950b9dc3fe27cfd1d7e424af186a63eb Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 9 Jun 2001 06:36:42 +0000 Subject: Update apache to 1.3.20. Relevant changes from version 1.3.19 include: NetBSD Packages Collection (pkgsrc) changes: * Modify French page in same way as the English page. Translation provided by Remi Zara in private e-mail. * Use EAPI patches from mod_ssl-2.8.4-1.3.20. * Unify repeated SED replacement info for config.layout, apache.sh, DEINSTALL, and INSTALL into one location, FILES_SUBST. * Modify patch to apxs to use 0:0 instead of root:wheel, as some non-NetBSD systems don't have a wheel group. The general bug fixes: * Eliminate a potential segfault if an invalid floating point value is passed to the ap_snprintf() function, on platforms supporting isnan() and isinf(). * Fix a possible segfault at startup in the detection of a default ServerName or IP string when no ServerName was specified. * Fixed mod_proxy to retain empty headers, as allowed by RFC2068. * Properly resolve the location of ndbm on Linux and some glibc2 builds, where ndbm.h is in the nonstandard db1/ subdir. The main new features include: * Enhanced rotatelogs to allow a UTC offset to be specified, and the format logfile names with human-readable date/time stamps. * Added the NOESCAPE (NS) flag to RewriteRule, to disable *all* normal URI escaping. Note incautious use can give unexpected results or introduce security risks. * Added the '\' character to RewriteRule to allow escaping of special characters. Allows embedding of both the '$' and '%' characters in the results, so 'foo\$1' translates to 'foo$1' rather than 'foo\'. * Added the -V flag to suexec, to display the compile-time settings with which it was built. (Only valid for root or the HTTPD_USER username.) * Introduced EBCDIC conversion configuration options, controlling the conversion based on MIME type or file suffix. --- www/apache/Makefile | 62 ++++++++++++++++++++++----------------------- www/apache/distinfo | 15 ++++++----- www/apache/patches/patch-ac | 50 ++++++++++++++++++------------------ www/apache/patches/patch-ai | 24 +++++++++--------- www/apache/patches/patch-aj | 36 ++++++++++++++++++++++++++ www/apache/pkg/PLIST | 32 ++++++++++++++++++----- 6 files changed, 137 insertions(+), 82 deletions(-) create mode 100644 www/apache/patches/patch-aj (limited to 'www/apache') diff --git a/www/apache/Makefile b/www/apache/Makefile index 80fb0ae5a1a..79891603292 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.72 2001/05/18 06:01:35 jlam Exp $ +# $NetBSD: Makefile,v 1.73 2001/06/09 06:36:42 jlam Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). -DISTNAME= apache_1.3.19 -PKGNAME= apache-1.3.19nb2 +DISTNAME= apache_1.3.20 +PKGNAME= apache-1.3.20 CATEGORIES= www MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ http://www.apache.de/dist/httpd/ \ @@ -15,7 +15,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MASTER_SITES+= http://www.modssl.org/source/ \ ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/source/ DISTFILES+= ${MODSSL_DISTNAME}${EXTRACT_SUFX} -MODSSL_DISTNAME= mod_ssl-2.8.3-1.3.19 +MODSSL_DISTNAME= mod_ssl-2.8.4-1.3.20 MODSSL_SRC= ${WRKDIR}/${MODSSL_DISTNAME} MAINTAINER= jlam@netbsd.org @@ -53,6 +53,10 @@ PLIST_SRC= ${PKGDIR}/PLIST.suexec BUILD_DEFS+= APACHE_USER APACHE_SUEXEC_DOCROOT .endif +# Note that there is NO static compile module hook here. This is intentional. +# Under Apache 1.3, modules can be compiled to link dynamically to the server +# using the "apxs" program. See apxs(8). + .if !defined(NOPIC) CONFIGURE_ARGS+= --enable-module=so # requires dlopen() CONFIGURE_ARGS+= --enable-shared=proxy @@ -87,9 +91,19 @@ BUILD_DEFS+= APACHE_SUEXEC DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL -# Note that there is NO static compile module hook here. This is intentional. -# Under Apache 1.3, modules can be compiled to link dynamically to the server -# using the "apxs" program. See apxs(8). +# Given foo=${bar}, replace @foo@ with ${bar}. +# +FILES_SUBST= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} +FILES_SUBST+= CAT=${CAT:Q} +FILES_SUBST+= CHMOD=${CHMOD:Q} +FILES_SUBST+= CHOWN=${CHOWN:Q} +FILES_SUBST+= CP=${CP:Q} +FILES_SUBST+= MKDIR=${MKDIR:Q} +FILES_SUBST+= PREFIX=${PREFIX} +FILES_SUBST+= RM=${RM:Q} +FILES_SUBST+= RMDIR=${RMDIR:Q} +FILES_SUBST+= TRUE=${TRUE:Q} +FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/-e s!@/} post-extract: ${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include @@ -106,44 +120,30 @@ pre-patch: ${MODSSL_SRC}/pkg.sslmod/sslmod.patch \ ${MODSSL_SRC}/pkg.sslsup/sslsup.patch \ | ${PATCH} ${PATCH_ARGS} - cd ${WRKSRC} && ${TAIL} +154 \ + cd ${WRKSRC} && ${TAIL} +160 \ ${MODSSL_SRC}/pkg.ssldoc/ssldoc.patch \ | ${PATCH} ${PATCH_ARGS} - ${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \; + ${FIND} ${WRKSRC} -name '*.orig' -print0 | ${XARGS} -0 ${RM} -f pre-configure: - ${SED} -e "s|@PREFIX@|${PREFIX}|g" \ - -e "s|@APACHE_SYSCONFDIR@|${APACHE_SYSCONFDIR}|g" \ + ${SED} ${FILES_SUBST_SED} \ ${FILESDIR}/config.layout > ${WRKDIR}/config.layout pre-install: - ${FIND} ${WRKSRC}/htdocs -name '*.orig' -exec ${RM} -f {} \; - ${SED} -e "s|@PREFIX@|${PREFIX}|g" \ - -e "s|@APACHE_SYSCONFDIR@|${APACHE_SYSCONFDIR}|g" \ - ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh - ${SED} -e "s|@CAT@|${CAT}|g" \ - -e "s|@RM@|${RM}|g" \ - -e "s|@RMDIR@|${RMDIR}|g" \ - -e "s|@TRUE@|${TRUE}|g" \ - -e "s|@APACHE_SYSCONFDIR@|${APACHE_SYSCONFDIR}|g" \ - ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} -e "s|@CAT@|${CAT}|g" \ - -e "s|@CHMOD@|${CHMOD}|g" \ - -e "s|@CHOWN@|${CHOWN}|g" \ - -e "s|@CP@|${CP}|g" \ - -e "s|@MKDIR@|${MKDIR}|g" \ - -e "s|@APACHE_SYSCONFDIR@|${APACHE_SYSCONFDIR}|g" \ - ${PKGDIR}/INSTALL > ${INSTALL_FILE} + ${FIND} ${WRKSRC}/htdocs -name '*.orig' -print0 | ${XARGS} -0 ${RM} -f + ${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh + ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} + ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} post-install: .if !defined(NOPIC) cd ${PREFIX}/lib/httpd; ${MV} libproxy.so mod_proxy.so .endif ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/httpd - for i in httpd.conf magic mime.types; do \ - ${INSTALL_DATA} ${APACHE_SYSCONFDIR}/$$i.default \ + for file in httpd.conf magic mime.types; do \ + ${INSTALL_DATA} ${APACHE_SYSCONFDIR}/$${file}.default \ ${PREFIX}/share/examples/httpd; \ - ${RM} -f ${APACHE_SYSCONFDIR}/$$i.default; \ + ${RM} -f ${APACHE_SYSCONFDIR}/$${file}.default; \ done ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache diff --git a/www/apache/distinfo b/www/apache/distinfo index 5edff8188c0..0b16268eca7 100644 --- a/www/apache/distinfo +++ b/www/apache/distinfo @@ -1,17 +1,18 @@ -$NetBSD: distinfo,v 1.4 2001/05/14 14:02:02 jlam Exp $ +$NetBSD: distinfo,v 1.5 2001/06/09 06:36:42 jlam Exp $ -SHA1 (apache_1.3.19.tar.gz) = 2cc8d431ef9eb1037f876394fef4aecb83948501 -Size (apache_1.3.19.tar.gz) = 1928677 bytes +SHA1 (apache_1.3.20.tar.gz) = c791b6513b253035c04e76f4e1882ad847134a12 +Size (apache_1.3.20.tar.gz) = 1973138 bytes SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658 Size (sitedrivenby.gif) = 8519 bytes -SHA1 (mod_ssl-2.8.3-1.3.19.tar.gz) = 073259fbd02bffc9fd64a26014f3ca4720aaef24 -Size (mod_ssl-2.8.3-1.3.19.tar.gz) = 750777 bytes +SHA1 (mod_ssl-2.8.4-1.3.20.tar.gz) = 11114eedd0bc77309ce732b250ccbfbe32060616 +Size (mod_ssl-2.8.4-1.3.20.tar.gz) = 751936 bytes SHA1 (patch-aa) = aed136dfee27b1fe98892d669d218c1070782b5e SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6 -SHA1 (patch-ac) = 4c18bb80f3fbe8d44c941e403ff10fd92b820785 +SHA1 (patch-ac) = 12347c7a306d3e898b032c2b4b3b01670b62d4fd SHA1 (patch-ad) = 79e9b2adb23e412195f0382b30b56496af735297 SHA1 (patch-ae) = 29e1da736d6948d550039cc4ddd1e7743e7e0feb SHA1 (patch-af) = 3396cbc389cdaad64573e8d99d1a2613a1e5915e SHA1 (patch-ag) = 5586719f7fa7b5d670d2735e487943c046533ea6 SHA1 (patch-ah) = 553f8f2bf4bf7278adb46ff8749be154f10e39d3 -SHA1 (patch-ai) = 6bf9f59849803e2594ef9eaff161b377c6d1071a +SHA1 (patch-ai) = a5e66d9e64aa2fe59dc2a2186ae169bcb8e5e071 +SHA1 (patch-aj) = 9070bd6b504701432302ef89a84b9270e646f833 diff --git a/www/apache/patches/patch-ac b/www/apache/patches/patch-ac index b3619f07c12..70ec8d23429 100644 --- a/www/apache/patches/patch-ac +++ b/www/apache/patches/patch-ac @@ -1,35 +1,35 @@ -$NetBSD: patch-ac,v 1.6 2001/02/03 20:53:10 jlam Exp $ +$NetBSD: patch-ac,v 1.7 2001/06/09 06:36:43 jlam Exp $ ---- htdocs/index.html.en.orig Fri Jan 19 14:39:47 2001 -+++ htdocs/index.html.en -@@ -33,12 +33,26 @@ -
+--- htdocs/index.html.en.orig Thu May 3 20:00:38 2001 ++++ htdocs/index.html.en Sat Jun 9 01:44:14 2001 +@@ -27,12 +27,26 @@ -

The Apache documentation has been included with --this distribution.

-+this distribution. If the mod_ssl SSL extension has +
+

The Apache documentation has been included +-with this distribution.

++with this distribution. If the mod_ssl SSL extension has +been installed, then please carefully read the -+SSL documentation.

++SSL documentation.

--

You are free to use the image below on an Apache-powered web server. --Thanks for using Apache!

+-

You are free to use the image below on an Apache-powered web +-server. Thanks for using Apache!

+

Information on the NetBSD multi-platform operating system can be found at -+The NetBSD Project homepage

++The NetBSD Project homepage

--
+-
+

Please feel free to use the images below on an Apache/NetBSD-powered web +server. Thanks for using -+Apache on -+NetBSD!

++Apache on ++NetBSD!

+ -+
-+ -+ Powered by Apache -+ -+ -+ Site driven by NetBSD -+ -+
++
++ ++ Powered by Apache ++ ++ ++ Site driven by NetBSD ++ ++
+ + - - diff --git a/www/apache/patches/patch-ai b/www/apache/patches/patch-ai index 1789c5a0751..c4a2f26909e 100644 --- a/www/apache/patches/patch-ai +++ b/www/apache/patches/patch-ai @@ -1,14 +1,14 @@ -$NetBSD: patch-ai,v 1.4 2001/02/02 16:39:58 jlam Exp $ +$NetBSD: patch-ai,v 1.5 2001/06/09 06:36:43 jlam Exp $ ---- src/support/apxs.pl.orig Fri Feb 2 00:42:14 2001 -+++ src/support/apxs.pl -@@ -427,8 +427,7 @@ - my $t = $f; - $t =~ s|^.+/([^/]+)$|$1|; - if ($opt_i) { -- push(@cmds, "cp $f $CFG_LIBEXECDIR/$t"); -- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); -+ push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t"); +--- src/support/apxs.pl.orig Sat Jun 9 01:06:57 2001 ++++ src/support/apxs.pl Sat Jun 9 01:11:28 2001 +@@ -459,8 +459,7 @@ + if ($^O ne "MSWin32") { + $t =~ s|^.+/([^/]+)$|$1|; + if ($opt_i) { +- push(@cmds, "cp $f $CFG_LIBEXECDIR/$t"); +- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); ++ push(@cmds, "install -c -m 555 -o 0 -g 0 $f $CFG_LIBEXECDIR/$t"); + } } - - # determine module symbolname and filename + else { diff --git a/www/apache/patches/patch-aj b/www/apache/patches/patch-aj new file mode 100644 index 00000000000..81470ce5d35 --- /dev/null +++ b/www/apache/patches/patch-aj @@ -0,0 +1,36 @@ +$NetBSD: patch-aj,v 1.6 2001/06/09 06:36:44 jlam Exp $ + +--- htdocs/index.html.fr.orig Tue May 1 06:31:10 2001 ++++ htdocs/index.html.fr Sat Jun 9 01:48:28 2001 +@@ -36,12 +36,27 @@ +
+ +

La documentation Apache est incluse dans cette +-distribution.

++distribution. Si l'extension SSL mod_ssl a \xe9t\xe9 ++install\xe9e, lisez alors attentivement la ++documentation SSL.

+ +-

Le webmaster de ce site peut librement utiliser l'image ci-dessous sur un +-site web utilisant le logiciel Apache. Merci d'avoir choisi Apache !

++

Des informations sur le syst\xe8me d'exploitation multi-plateforme NetBSD ++peuvent être trouv\xe9es sur ++la homepage du projet NetBSD.

+ +-
++

Le webmaster de ce site peut librement utiliser les images ci-dessous sur un ++site web utilisant les logiciels Apache et NetBSD. Merci d'avoir choisi ++Apache sur ++NetBSD !

++ ++
++ ++ Powered by Apache ++ ++ ++ Site driven by NetBSD ++ ++
+ + + diff --git a/www/apache/pkg/PLIST b/www/apache/pkg/PLIST index 0cb3212c49a..d75b44bdd6e 100644 --- a/www/apache/pkg/PLIST +++ b/www/apache/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2001/05/02 22:22:43 jlam Exp $ +@comment $NetBSD: PLIST,v 1.22 2001/06/09 06:36:44 jlam Exp $ bin/dbmmanage bin/htdigest bin/htpasswd @@ -10,6 +10,7 @@ include/httpd/ap_config.h include/httpd/ap_config_auto.h include/httpd/ap_ctx.h include/httpd/ap_ctype.h +include/httpd/ap_ebcdic.h include/httpd/ap_hook.h include/httpd/ap_include_extern.h include/httpd/ap_md5.h @@ -100,11 +101,12 @@ share/httpd/htdocs/index.html.ru.ucs2 share/httpd/htdocs/index.html.ru.ucs4 share/httpd/htdocs/index.html.ru.utf8 share/httpd/htdocs/index.html.se -share/httpd/htdocs/index.html.tw.Big5 +share/httpd/htdocs/index.html.zh.Big5 share/httpd/htdocs/manual/LICENSE share/httpd/htdocs/manual/bind.html share/httpd/htdocs/manual/cgi_path.html share/httpd/htdocs/manual/configuring.html.en +share/httpd/htdocs/manual/configuring.html.fr share/httpd/htdocs/manual/configuring.html.html share/httpd/htdocs/manual/configuring.html.ja.jis share/httpd/htdocs/manual/content-negotiation.html @@ -144,11 +146,13 @@ share/httpd/htdocs/manual/index.html.html share/httpd/htdocs/manual/index.html.ja.jis share/httpd/htdocs/manual/install-tpf.html share/httpd/htdocs/manual/install.html.en +share/httpd/htdocs/manual/install.html.es share/httpd/htdocs/manual/install.html.fr share/httpd/htdocs/manual/install.html.html share/httpd/htdocs/manual/install.html.ja.jis share/httpd/htdocs/manual/invoking.html share/httpd/htdocs/manual/invoking.html.fr +share/httpd/htdocs/manual/invoking.html.html share/httpd/htdocs/manual/keepalive.html share/httpd/htdocs/manual/location.html share/httpd/htdocs/manual/man-template.html @@ -184,7 +188,9 @@ share/httpd/htdocs/manual/mod/directives.html share/httpd/htdocs/manual/mod/footer.html share/httpd/htdocs/manual/mod/header.html share/httpd/htdocs/manual/mod/index-bytype.html +share/httpd/htdocs/manual/mod/index-bytype.html.fr share/httpd/htdocs/manual/mod/index.html +share/httpd/htdocs/manual/mod/index.html.fr share/httpd/htdocs/manual/mod/mod_access.html share/httpd/htdocs/manual/mod/mod_actions.html share/httpd/htdocs/manual/mod/mod_alias.html @@ -203,7 +209,9 @@ share/httpd/htdocs/manual/mod/mod_define.html share/httpd/htdocs/manual/mod/mod_digest.html share/httpd/htdocs/manual/mod/mod_dir.html share/httpd/htdocs/manual/mod/mod_dld.html -share/httpd/htdocs/manual/mod/mod_env.html +share/httpd/htdocs/manual/mod/mod_env.html.en +share/httpd/htdocs/manual/mod/mod_env.html.html +share/httpd/htdocs/manual/mod/mod_env.html.ja.jis share/httpd/htdocs/manual/mod/mod_example.html share/httpd/htdocs/manual/mod/mod_expires.html share/httpd/htdocs/manual/mod/mod_headers.html @@ -215,7 +223,9 @@ share/httpd/htdocs/manual/mod/mod_log_agent.html share/httpd/htdocs/manual/mod/mod_log_common.html share/httpd/htdocs/manual/mod/mod_log_config.html share/httpd/htdocs/manual/mod/mod_log_referer.html -share/httpd/htdocs/manual/mod/mod_mime.html +share/httpd/htdocs/manual/mod/mod_mime.html.en +share/httpd/htdocs/manual/mod/mod_mime.html.html +share/httpd/htdocs/manual/mod/mod_mime.html.ja.jis share/httpd/htdocs/manual/mod/mod_mime_magic.html share/httpd/htdocs/manual/mod/mod_mmap_static.html share/httpd/htdocs/manual/mod/mod_negotiation.html.en @@ -223,7 +233,9 @@ share/httpd/htdocs/manual/mod/mod_negotiation.html.html share/httpd/htdocs/manual/mod/mod_negotiation.html.ja.jis share/httpd/htdocs/manual/mod/mod_proxy.html share/httpd/htdocs/manual/mod/mod_rewrite.html -share/httpd/htdocs/manual/mod/mod_setenvif.html +share/httpd/htdocs/manual/mod/mod_setenvif.html.en +share/httpd/htdocs/manual/mod/mod_setenvif.html.html +share/httpd/htdocs/manual/mod/mod_setenvif.html.ja.jis share/httpd/htdocs/manual/mod/mod_so.html share/httpd/htdocs/manual/mod/mod_speling.html share/httpd/htdocs/manual/mod/mod_status.html @@ -254,7 +266,9 @@ share/httpd/htdocs/manual/programs/header.html share/httpd/htdocs/manual/programs/htdigest.html share/httpd/htdocs/manual/programs/htpasswd.html share/httpd/htdocs/manual/programs/httpd.html -share/httpd/htdocs/manual/programs/index.html +share/httpd/htdocs/manual/programs/index.html.en +share/httpd/htdocs/manual/programs/index.html.html +share/httpd/htdocs/manual/programs/index.html.ja.jis share/httpd/htdocs/manual/programs/logresolve.html share/httpd/htdocs/manual/programs/other.html share/httpd/htdocs/manual/programs/rotatelogs.html @@ -268,7 +282,11 @@ share/httpd/htdocs/manual/server-wide.html.html share/httpd/htdocs/manual/server-wide.html.ja.jis share/httpd/htdocs/manual/sourcereorg.html share/httpd/htdocs/manual/stopping.html -share/httpd/htdocs/manual/suexec.html +share/httpd/htdocs/manual/stopping.html.fr +share/httpd/htdocs/manual/stopping.html.html +share/httpd/htdocs/manual/suexec.html.en +share/httpd/htdocs/manual/suexec.html.html +share/httpd/htdocs/manual/suexec.html.ja.jis share/httpd/htdocs/manual/suexec_1_2.html share/httpd/htdocs/manual/unixware.html share/httpd/htdocs/manual/upgrading_to_1_3.html -- cgit v1.2.3