summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/apache2/Makefile3
-rw-r--r--www/apache2/Makefile.common4
-rw-r--r--www/apache2/PLIST57
-rw-r--r--www/apache2/distinfo10
-rw-r--r--www/apache2/patches/patch-aa28
-rw-r--r--www/apache2/patches/patch-as26
-rw-r--r--www/apache2/patches/patch-at19
7 files changed, 71 insertions, 76 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 6f429b6faef..178fdb26b63 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.65 2005/02/07 08:37:22 martin Exp $
+# $NetBSD: Makefile,v 1.66 2005/02/09 14:57:52 tron Exp $
.include "Makefile.common"
PKGNAME= apache-${APACHE_VERSION}
-PKGREVISION= 9
CATEGORIES= www
HOMEPAGE= http://httpd.apache.org/
diff --git a/www/apache2/Makefile.common b/www/apache2/Makefile.common
index 839a709dde1..cd8f1251294 100644
--- a/www/apache2/Makefile.common
+++ b/www/apache2/Makefile.common
@@ -1,8 +1,8 @@
DISTNAME= httpd-${APACHE_VERSION}
# When updating this version be sure to update the checksum and remove
# any PKGREVISION for devel/apr also.
-APACHE_VERSION= 2.0.52
-APR_VERSION= 0.9.5
+APACHE_VERSION= 2.0.53
+APR_VERSION= 0.9.6
MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
${MASTER_SITE_APACHE:=httpd/old/} \
http://www.NetBSD.org/images/logos/
diff --git a/www/apache2/PLIST b/www/apache2/PLIST
index b37f717e7f8..913d61cf23f 100644
--- a/www/apache2/PLIST
+++ b/www/apache2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2004/11/24 07:39:50 jlam Exp $
+@comment $NetBSD: PLIST,v 1.27 2005/02/09 14:57:52 tron Exp $
include/httpd/ap_compat.h
include/httpd/ap_config.h
include/httpd/ap_config_auto.h
@@ -374,17 +374,21 @@ share/httpd/icons/README
share/httpd/manual/LICENSE
share/httpd/manual/bind.html
share/httpd/manual/bind.html.en
+share/httpd/manual/bind.html.es
share/httpd/manual/bind.html.ja.euc-jp
share/httpd/manual/bind.html.ko.euc-kr
share/httpd/manual/bind.xml
+share/httpd/manual/bind.xml.es
share/httpd/manual/bind.xml.ja
share/httpd/manual/bind.xml.ko
share/httpd/manual/bind.xml.meta
share/httpd/manual/configuring.html
+share/httpd/manual/configuring.html.de
share/httpd/manual/configuring.html.en
share/httpd/manual/configuring.html.ja.euc-jp
share/httpd/manual/configuring.html.ko.euc-kr
share/httpd/manual/configuring.xml
+share/httpd/manual/configuring.xml.de
share/httpd/manual/configuring.xml.ja
share/httpd/manual/configuring.xml.ko
share/httpd/manual/configuring.xml.meta
@@ -398,9 +402,11 @@ share/httpd/manual/content-negotiation.xml.ko
share/httpd/manual/content-negotiation.xml.meta
share/httpd/manual/custom-error.html
share/httpd/manual/custom-error.html.en
+share/httpd/manual/custom-error.html.es
share/httpd/manual/custom-error.html.ja.euc-jp
share/httpd/manual/custom-error.html.ko.euc-kr
share/httpd/manual/custom-error.xml
+share/httpd/manual/custom-error.xml.es
share/httpd/manual/custom-error.xml.ja
share/httpd/manual/custom-error.xml.ko
share/httpd/manual/custom-error.xml.meta
@@ -505,10 +511,12 @@ share/httpd/manual/filter.xml.ko
share/httpd/manual/filter.xml.meta
share/httpd/manual/filter.xml.ru
share/httpd/manual/glossary.html
+share/httpd/manual/glossary.html.de
share/httpd/manual/glossary.html.en
share/httpd/manual/glossary.html.es
share/httpd/manual/glossary.html.ko.euc-kr
share/httpd/manual/glossary.xml
+share/httpd/manual/glossary.xml.de
share/httpd/manual/glossary.xml.es
share/httpd/manual/glossary.xml.ko
share/httpd/manual/glossary.xml.meta
@@ -588,6 +596,12 @@ share/httpd/manual/images/mod_rewrite_fig2.gif
share/httpd/manual/images/mod_rewrite_fig2.png
share/httpd/manual/images/pixel.gif
share/httpd/manual/images/right.gif
+share/httpd/manual/images/ssl_intro_fig1.gif
+share/httpd/manual/images/ssl_intro_fig1.png
+share/httpd/manual/images/ssl_intro_fig2.gif
+share/httpd/manual/images/ssl_intro_fig2.png
+share/httpd/manual/images/ssl_intro_fig3.gif
+share/httpd/manual/images/ssl_intro_fig3.png
share/httpd/manual/images/sub.gif
share/httpd/manual/images/up.gif
share/httpd/manual/index.html
@@ -638,9 +652,11 @@ share/httpd/manual/license.xml
share/httpd/manual/license.xml.meta
share/httpd/manual/logs.html
share/httpd/manual/logs.html.en
+share/httpd/manual/logs.html.es
share/httpd/manual/logs.html.ja.euc-jp
share/httpd/manual/logs.html.ko.euc-kr
share/httpd/manual/logs.xml
+share/httpd/manual/logs.xml.es
share/httpd/manual/logs.xml.ja
share/httpd/manual/logs.xml.ko
share/httpd/manual/logs.xml.meta
@@ -896,6 +912,10 @@ share/httpd/manual/mod/mod_disk_cache.html.ko.euc-kr
share/httpd/manual/mod/mod_disk_cache.xml
share/httpd/manual/mod/mod_disk_cache.xml.ko
share/httpd/manual/mod/mod_disk_cache.xml.meta
+share/httpd/manual/mod/mod_dumpio.html
+share/httpd/manual/mod/mod_dumpio.html.en
+share/httpd/manual/mod/mod_dumpio.xml
+share/httpd/manual/mod/mod_dumpio.xml.meta
share/httpd/manual/mod/mod_echo.html
share/httpd/manual/mod/mod_echo.html.en
share/httpd/manual/mod/mod_echo.html.ja.euc-jp
@@ -940,7 +960,9 @@ share/httpd/manual/mod/mod_file_cache.xml.ko
share/httpd/manual/mod/mod_file_cache.xml.meta
share/httpd/manual/mod/mod_headers.html
share/httpd/manual/mod/mod_headers.html.en
+share/httpd/manual/mod/mod_headers.html.ko.euc-kr
share/httpd/manual/mod/mod_headers.xml
+share/httpd/manual/mod/mod_headers.xml.ko
share/httpd/manual/mod/mod_headers.xml.meta
share/httpd/manual/mod/mod_imap.html
share/httpd/manual/mod/mod_imap.html.en
@@ -957,8 +979,10 @@ share/httpd/manual/mod/mod_include.xml.meta
share/httpd/manual/mod/mod_info.html
share/httpd/manual/mod/mod_info.html.en
share/httpd/manual/mod/mod_info.html.ja.euc-jp
+share/httpd/manual/mod/mod_info.html.ko.euc-kr
share/httpd/manual/mod/mod_info.xml
share/httpd/manual/mod/mod_info.xml.ja
+share/httpd/manual/mod/mod_info.xml.ko
share/httpd/manual/mod/mod_info.xml.meta
share/httpd/manual/mod/mod_isapi.html
share/httpd/manual/mod/mod_isapi.html.en
@@ -1115,9 +1139,11 @@ share/httpd/manual/mod/module-dict.xml.meta
share/httpd/manual/mod/mpm_common.html
share/httpd/manual/mod/mpm_common.html.de
share/httpd/manual/mod/mpm_common.html.en
+share/httpd/manual/mod/mpm_common.html.es
share/httpd/manual/mod/mpm_common.html.ja.euc-jp
share/httpd/manual/mod/mpm_common.xml
share/httpd/manual/mod/mpm_common.xml.de
+share/httpd/manual/mod/mpm_common.xml.es
share/httpd/manual/mod/mpm_common.xml.ja
share/httpd/manual/mod/mpm_common.xml.meta
share/httpd/manual/mod/mpm_netware.html
@@ -1325,6 +1351,26 @@ share/httpd/manual/programs/suexec.html.ko.euc-kr
share/httpd/manual/programs/suexec.xml
share/httpd/manual/programs/suexec.xml.ko
share/httpd/manual/programs/suexec.xml.meta
+share/httpd/manual/rewrite/index.html
+share/httpd/manual/rewrite/index.html.en
+share/httpd/manual/rewrite/index.xml
+share/httpd/manual/rewrite/index.xml.meta
+share/httpd/manual/rewrite/rewrite_guide.html
+share/httpd/manual/rewrite/rewrite_guide.html.en
+share/httpd/manual/rewrite/rewrite_guide.xml
+share/httpd/manual/rewrite/rewrite_guide.xml.meta
+share/httpd/manual/rewrite/rewrite_guide_advanced.html
+share/httpd/manual/rewrite/rewrite_guide_advanced.html.en
+share/httpd/manual/rewrite/rewrite_guide_advanced.xml
+share/httpd/manual/rewrite/rewrite_guide_advanced.xml.meta
+share/httpd/manual/rewrite/rewrite_intro.html
+share/httpd/manual/rewrite/rewrite_intro.html.en
+share/httpd/manual/rewrite/rewrite_intro.xml
+share/httpd/manual/rewrite/rewrite_intro.xml.meta
+share/httpd/manual/rewrite/rewrite_tech.html
+share/httpd/manual/rewrite/rewrite_tech.html.en
+share/httpd/manual/rewrite/rewrite_tech.xml
+share/httpd/manual/rewrite/rewrite_tech.xml.meta
share/httpd/manual/sections.html
share/httpd/manual/sections.html.en
share/httpd/manual/sections.html.ja.euc-jp
@@ -1335,9 +1381,11 @@ share/httpd/manual/sections.xml.ko
share/httpd/manual/sections.xml.meta
share/httpd/manual/server-wide.html
share/httpd/manual/server-wide.html.en
+share/httpd/manual/server-wide.html.es
share/httpd/manual/server-wide.html.ja.euc-jp
share/httpd/manual/server-wide.html.ko.euc-kr
share/httpd/manual/server-wide.xml
+share/httpd/manual/server-wide.xml.es
share/httpd/manual/server-wide.xml.ja
share/httpd/manual/server-wide.xml.ko
share/httpd/manual/server-wide.xml.meta
@@ -1377,12 +1425,6 @@ share/httpd/manual/ssl/ssl_intro.html.ja.euc-jp
share/httpd/manual/ssl/ssl_intro.xml
share/httpd/manual/ssl/ssl_intro.xml.ja
share/httpd/manual/ssl/ssl_intro.xml.meta
-share/httpd/manual/ssl/ssl_intro_fig1.gif
-share/httpd/manual/ssl/ssl_intro_fig1.png
-share/httpd/manual/ssl/ssl_intro_fig2.gif
-share/httpd/manual/ssl/ssl_intro_fig2.png
-share/httpd/manual/ssl/ssl_intro_fig3.gif
-share/httpd/manual/ssl/ssl_intro_fig3.png
share/httpd/manual/stopping.html
share/httpd/manual/stopping.html.de
share/httpd/manual/stopping.html.en
@@ -1558,6 +1600,7 @@ share/httpd/manual/vhosts/name-based.xml.meta
@dirrm share/httpd/manual/misc
@dirrm share/httpd/manual/platform
@dirrm share/httpd/manual/programs
+@dirrm share/httpd/manual/rewrite
@dirrm share/httpd/manual/style/css
@dirrm share/httpd/manual/style/lang
@dirrm share/httpd/manual/style/latex
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 52f96b96dce..9436be0844a 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.35 2005/01/03 06:59:31 minskim Exp $
+$NetBSD: distinfo,v 1.36 2005/02/09 14:57:52 tron Exp $
-SHA1 (httpd-2.0.52.tar.gz) = 2a22fde052adc7d7258f999cd7dd8a7592ff36e7
-Size (httpd-2.0.52.tar.gz) = 6918995 bytes
-SHA1 (patch-aa) = 8ff497da17144d191e633d59274bf2f7e0e7c08c
+SHA1 (httpd-2.0.53.tar.gz) = e58a84887f1cd727d0091b185c0bd3e641f75df9
+Size (httpd-2.0.53.tar.gz) = 6946727 bytes
+SHA1 (patch-aa) = bff1ef591f5361e7169ff9005dcf86437b9dac23
SHA1 (patch-ab) = 37e7faca9217122c24fbb7e5b8cd8e8f027ead5a
SHA1 (patch-ac) = f48d6622406b89a00ee3ba14fdcff356c5ef59e8
SHA1 (patch-ad) = 27fa3655d6ba4840296e79fa6fd96cd9de79a33a
@@ -12,5 +12,3 @@ SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
SHA1 (patch-al) = 29cc52616c50b7ec998339cca386112a8f1611cc
SHA1 (patch-am) = ff60a7b69ad949363ebec194141e9b95cb796426
SHA1 (patch-ar) = c6769617cd9111f6d233d68883c71988a36fbbce
-SHA1 (patch-as) = c6fb574d5d96024e641816569f059bca4368fcec
-SHA1 (patch-at) = dd9a3eb14b3e20876eca6eff968e82326a53b7d9
diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa
index fe3d4c22985..3d370f171b6 100644
--- a/www/apache2/patches/patch-aa
+++ b/www/apache2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2004/11/26 23:07:59 jlam Exp $
+$NetBSD: patch-aa,v 1.14 2005/02/09 14:57:52 tron Exp $
---- Makefile.in.orig 2004-08-26 09:01:18.000000000 -0400
-+++ Makefile.in
-@@ -4,7 +4,7 @@ CLEAN_SUBDIRS = test
+--- Makefile.in.orig 2004-11-24 19:31:09.000000000 +0000
++++ Makefile.in 2005-02-09 13:55:40.000000000 +0000
+@@ -4,7 +4,7 @@
PROGRAM_NAME = $(progname)
PROGRAM_SOURCES = modules.c
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.13 2004/11/26 23:07:59 jlam Exp $
PROGRAM_DEPENDENCIES = \
$(BUILTIN_LIBS) \
$(MPM_LIB) \
-@@ -14,7 +14,7 @@ PROGRAM_DEPENDENCIES = \
+@@ -14,7 +14,7 @@
PROGRAMS = $(PROGRAM_NAME)
TARGETS = $(PROGRAMS) $(shared_build) $(other_targets)
PHONY_TARGETS = $(srcdir)/buildmark.c
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.13 2004/11/26 23:07:59 jlam Exp $
install-other install-cgi install-include install-suexec install-man \
install-build
-@@ -71,6 +71,7 @@ install-conf:
+@@ -71,6 +71,7 @@
< $$i; \
fi \
) > $(DESTDIR)$(sysconfdir)/$$i; \
@@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.13 2004/11/26 23:07:59 jlam Exp $
chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
file=`echo $$i|sed s/-std//`; \
if [ "$$file" = "httpd.conf" ]; then \
-@@ -79,13 +80,16 @@ install-conf:
+@@ -79,13 +80,16 @@
if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
fi; \
@@ -45,7 +45,7 @@ $NetBSD: patch-aa,v 1.13 2004/11/26 23:07:59 jlam Exp $
fi
install-build:
-@@ -93,8 +97,6 @@ install-build:
+@@ -93,8 +97,6 @@
@test -d $(DESTDIR)$(installbuilddir) || $(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir)
@cp $(top_srcdir)/build/*.mk $(DESTDIR)$(installbuilddir); \
cp build/*.mk $(DESTDIR)$(installbuilddir); \
@@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.13 2004/11/26 23:07:59 jlam Exp $
cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir); \
cp $(top_builddir)/config.nice $(DESTDIR)$(installbuilddir);
-@@ -108,7 +110,7 @@ dox::
+@@ -108,7 +110,7 @@
doxygen $(top_srcdir)/docs/doxygen.conf
install-htdocs:
@@ -63,7 +63,7 @@ $NetBSD: patch-aa,v 1.13 2004/11/26 23:07:59 jlam Exp $
echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
else \
echo Installing HTML documents ; \
-@@ -118,7 +120,7 @@ install-htdocs:
+@@ -118,7 +120,7 @@
fi
install-error:
@@ -72,7 +72,7 @@ $NetBSD: patch-aa,v 1.13 2004/11/26 23:07:59 jlam Exp $
echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
else \
echo Installing error documents ; \
-@@ -128,7 +130,7 @@ install-error:
+@@ -128,7 +130,7 @@
fi
install-icons:
@@ -81,7 +81,7 @@ $NetBSD: patch-aa,v 1.13 2004/11/26 23:07:59 jlam Exp $
echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
else \
echo Installing icons ; \
-@@ -138,7 +140,7 @@ install-icons:
+@@ -138,7 +140,7 @@
fi
install-cgi:
@@ -90,12 +90,12 @@ $NetBSD: patch-aa,v 1.13 2004/11/26 23:07:59 jlam Exp $
echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
else \
echo Installing CGIs ; \
-@@ -191,8 +193,6 @@ install-man:
+@@ -191,8 +193,6 @@
@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
- @(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
-- @(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null ) || true
+- @(cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null ) || true
install-suexec:
@if test -f $(builddir)/support/suexec; then \
diff --git a/www/apache2/patches/patch-as b/www/apache2/patches/patch-as
deleted file mode 100644
index 53066380121..00000000000
--- a/www/apache2/patches/patch-as
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-as,v 1.5 2004/12/18 08:42:12 adrianp Exp $
-
---- modules/ssl/ssl_engine_kernel.c.orig 2004-12-18 07:10:37.000000000 +0000
-+++ modules/ssl/ssl_engine_kernel.c 2004-12-18 07:13:50.000000000 +0000
-@@ -719,6 +719,21 @@
- X509_free(peercert);
- }
- }
-+
-+ /*
-+ * Also check that SSLCipherSuite has been enforced as expected.
-+ */
-+ if (cipher_list) {
-+ cipher = SSL_get_current_cipher(ssl);
-+ if (sk_SSL_CIPHER_find(cipher_list, cipher) < 0) {
-+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-+ "SSL cipher suite not renegotiated: "
-+ "access to %s denied using cipher %s",
-+ r->filename,
-+ SSL_CIPHER_get_name(cipher));
-+ return HTTP_FORBIDDEN;
-+ }
-+ }
- }
-
- /*
diff --git a/www/apache2/patches/patch-at b/www/apache2/patches/patch-at
deleted file mode 100644
index 60b9cf6179a..00000000000
--- a/www/apache2/patches/patch-at
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-at,v 1.1 2004/12/18 08:42:12 adrianp Exp $
-
---- modules/ssl/ssl_engine_init.c.orig 2004-12-18 07:15:01.000000000 +0000
-+++ modules/ssl/ssl_engine_init.c 2004-12-18 07:15:59.000000000 +0000
-@@ -439,6 +439,14 @@
- * Configure additional context ingredients
- */
- SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE);
-+
-+#ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
-+ /*
-+ * Disallow a session from being resumed during a renegotiation,
-+ * so that an acceptable cipher suite can be negotiated.
-+ */
-+ SSL_CTX_set_options(ctx, SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
-+#endif
- }
-
- static void ssl_init_ctx_session_cache(server_rec *s,
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-22 02:54:16 +0000