diff options
Diffstat (limited to 'www/apache')
| -rw-r--r-- | www/apache/Makefile | 8 | ||||
| -rw-r--r-- | www/apache/PLIST | 9 | ||||
| -rw-r--r-- | www/apache/PLIST.shared | 4 | ||||
| -rw-r--r-- | www/apache/distinfo | 16 | ||||
| -rw-r--r-- | www/apache/patches/patch-aa | 10 | ||||
| -rw-r--r-- | www/apache/patches/patch-af | 6 | ||||
| -rw-r--r-- | www/apache/patches/patch-ag | 6 |
7 files changed, 32 insertions, 27 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 09f7982fd76..4d02dee3293 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.87 2002/01/01 06:12:05 jlam Exp $ +# $NetBSD: Makefile,v 1.88 2002/02/01 16:04:39 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.22 -PKGNAME= apache-1.3.22 +DISTNAME= apache_1.3.23 +PKGNAME= apache-1.3.23 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.5-1.3.22 +MODSSL_DISTNAME= mod_ssl-2.8.6-1.3.23 MODSSL_SRC= ${WRKDIR}/${MODSSL_DISTNAME} MAINTAINER= jlam@netbsd.org diff --git a/www/apache/PLIST b/www/apache/PLIST index 67aa781c058..d6f7a36759d 100644 --- a/www/apache/PLIST +++ b/www/apache/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:06 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/01 16:04:39 jlam Exp $ +bin/checkgid bin/dbmmanage bin/htdigest bin/htpasswd @@ -132,6 +133,7 @@ share/httpd/htdocs/manual/handler.html.en share/httpd/htdocs/manual/handler.html.html share/httpd/htdocs/manual/handler.html.ja.jis share/httpd/htdocs/manual/header.html +share/httpd/htdocs/manual/howto/auth.html share/httpd/htdocs/manual/howto/cgi.html.en share/httpd/htdocs/manual/howto/cgi.html.html share/httpd/htdocs/manual/howto/cgi.html.ja.jis @@ -230,7 +232,9 @@ share/httpd/htdocs/manual/mod/mod_cgi.html share/httpd/htdocs/manual/mod/mod_cookies.html 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_dir.html.en +share/httpd/htdocs/manual/mod/mod_dir.html.html +share/httpd/htdocs/manual/mod/mod_dir.html.ja.jis share/httpd/htdocs/manual/mod/mod_dld.html share/httpd/htdocs/manual/mod/mod_env.html.en share/httpd/htdocs/manual/mod/mod_env.html.html @@ -303,6 +307,7 @@ share/httpd/htdocs/manual/server-wide.html.en share/httpd/htdocs/manual/server-wide.html.fr share/httpd/htdocs/manual/server-wide.html.html share/httpd/htdocs/manual/server-wide.html.ja.jis +share/httpd/htdocs/manual/sitemap.html share/httpd/htdocs/manual/sourcereorg.html share/httpd/htdocs/manual/stopping.html.en share/httpd/htdocs/manual/stopping.html.fr diff --git a/www/apache/PLIST.shared b/www/apache/PLIST.shared index 02141523b8c..a754f90f790 100644 --- a/www/apache/PLIST.shared +++ b/www/apache/PLIST.shared @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST.shared,v 1.1 2001/11/01 02:22:54 zuntum Exp $ +@comment $NetBSD: PLIST.shared,v 1.2 2002/02/01 16:04:39 jlam Exp $ +lib/httpd/httpd.exp lib/httpd/mod_define.so lib/httpd/mod_proxy.so -lib/httpd/httpd.exp @dirrm lib/httpd diff --git a/www/apache/distinfo b/www/apache/distinfo index fcb378db647..877967c11ee 100644 --- a/www/apache/distinfo +++ b/www/apache/distinfo @@ -1,18 +1,18 @@ -$NetBSD: distinfo,v 1.11 2002/01/01 06:12:05 jlam Exp $ +$NetBSD: distinfo,v 1.12 2002/02/01 16:04:39 jlam Exp $ -SHA1 (apache_1.3.22.tar.gz) = 5b93c1f8c8cfb703e6082ffa2cd99ea017e1e05e -Size (apache_1.3.22.tar.gz) = 2177983 bytes +SHA1 (apache_1.3.23.tar.gz) = 20aa246303be1948f240cd7c5c3cf50d97d06868 +Size (apache_1.3.23.tar.gz) = 2210130 bytes SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658 Size (sitedrivenby.gif) = 8519 bytes -SHA1 (mod_ssl-2.8.5-1.3.22.tar.gz) = 432be249fbaa3a87391b50af7b138c5496fac209 -Size (mod_ssl-2.8.5-1.3.22.tar.gz) = 751863 bytes -SHA1 (patch-aa) = 201845cdb27542899dad8d24e91c02983e25f96e +SHA1 (mod_ssl-2.8.6-1.3.23.tar.gz) = 74b2e35c69780b8de00a06ed7b7d0d1acf904d3b +Size (mod_ssl-2.8.6-1.3.23.tar.gz) = 752025 bytes +SHA1 (patch-aa) = 9ebfc626364271a60a4db4b1b0c28c92060a9f35 SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6 SHA1 (patch-ac) = 12347c7a306d3e898b032c2b4b3b01670b62d4fd SHA1 (patch-ad) = 79e9b2adb23e412195f0382b30b56496af735297 SHA1 (patch-ae) = 037e24a3019025f031172af0102f043ddf2f0556 -SHA1 (patch-af) = ce65ab33ca9996f58cc9c212c565ef4af00bf066 -SHA1 (patch-ag) = 5586719f7fa7b5d670d2735e487943c046533ea6 +SHA1 (patch-af) = 4b4450ceede5c803023eef41c63a2058e7577821 +SHA1 (patch-ag) = f1cc9b833afd87b42aac99431d696f3780762bab SHA1 (patch-ah) = 553f8f2bf4bf7278adb46ff8749be154f10e39d3 SHA1 (patch-ai) = 46d9a97fbc248a2bea97943b9f3b2f9f693f3695 SHA1 (patch-aj) = 1cdd2f010d381ec9c13f59b31caab7d1f6f63100 diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa index b4f0e31706c..77a85fc98e9 100644 --- a/www/apache/patches/patch-aa +++ b/www/apache/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.17 2002/01/01 06:12:06 jlam Exp $ +$NetBSD: patch-aa,v 1.18 2002/02/01 16:04:39 jlam Exp $ ---- Makefile.tmpl.orig Tue Jan 1 00:38:59 2002 +--- Makefile.tmpl.orig Fri Feb 1 10:05:43 2002 +++ Makefile.tmpl @@ -324,11 +324,6 @@ $(MKDIR) $(root)$(mandir)/man1 @@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.17 2002/01/01 06:12:06 jlam Exp $ done; \ fi @echo "<=== [programs]" -@@ -531,7 +498,7 @@ +@@ -533,7 +500,7 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -58,7 +58,7 @@ $NetBSD: patch-aa,v 1.17 2002/01/01 06:12:06 jlam Exp $ echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ else \ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ -@@ -553,9 +520,10 @@ +@@ -555,9 +522,10 @@ for script in printenv test-cgi; do \ cat $(TOP)/cgi-bin/$${script} |\ sed -e 's;^#!/.*perl;#!$(PERL);' \ @@ -71,7 +71,7 @@ $NetBSD: patch-aa,v 1.17 2002/01/01 06:12:06 jlam Exp $ done; \ fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ -@@ -569,7 +537,7 @@ +@@ -571,7 +539,7 @@ # and initial config files while preserving existing ones. install-config: @echo "===> [config: Installing Apache configuration files]" diff --git a/www/apache/patches/patch-af b/www/apache/patches/patch-af index 0858d63590d..ba7ddfcf3fa 100644 --- a/www/apache/patches/patch-af +++ b/www/apache/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.8 2001/10/17 19:17:00 jlam Exp $ +$NetBSD: patch-af,v 1.9 2002/02/01 16:04:39 jlam Exp $ ---- src/modules/standard/mod_so.c.orig Wed Oct 17 11:47:02 2001 +--- src/modules/standard/mod_so.c.orig Fri Feb 1 10:05:43 2002 +++ src/modules/standard/mod_so.c -@@ -321,7 +321,15 @@ +@@ -324,7 +324,15 @@ return err; } diff --git a/www/apache/patches/patch-ag b/www/apache/patches/patch-ag index e6a915c575c..b8683610031 100644 --- a/www/apache/patches/patch-ag +++ b/www/apache/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.6 2001/02/27 20:04:23 jdolecek Exp $ +$NetBSD: patch-ag,v 1.7 2002/02/01 16:04:39 jlam Exp $ ---- src/os/unix/os.c.orig Sat Jan 15 11:01:09 2000 +--- src/os/unix/os.c.orig Mon Nov 12 12:36:38 2001 +++ src/os/unix/os.c -@@ -129,7 +129,12 @@ +@@ -132,7 +132,12 @@ #elif defined(HAVE_DYLD) NSUnLinkModule(handle,FALSE); |