summaryrefslogtreecommitdiff
path: root/www/apache2
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache2')
-rw-r--r--www/apache2/Makefile6
-rw-r--r--www/apache2/PLIST135
-rw-r--r--www/apache2/distinfo14
-rw-r--r--www/apache2/patches/patch-aa19
-rw-r--r--www/apache2/patches/patch-ah12
-rw-r--r--www/apache2/patches/patch-ai21
-rw-r--r--www/apache2/patches/patch-ak105
7 files changed, 48 insertions, 264 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 9bf9bf0fee0..9e7d04f6ebb 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2002/04/16 20:07:09 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/06/01 13:18:01 itojun Exp $
-DISTNAME= httpd-2.0.35
-PKGNAME= apache-2.0.35
+DISTNAME= httpd-2.0.36
+PKGNAME= apache-2.0.36
CATEGORIES= www
MASTER_SITES= http://httpd.apache.org/dist/httpd/ \
http://httpd.apache.org/dist/httpd/old/ \
diff --git a/www/apache2/PLIST b/www/apache2/PLIST
index 0962d328773..7663cf6ac7e 100644
--- a/www/apache2/PLIST
+++ b/www/apache2/PLIST
@@ -1,61 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2002/04/13 21:35:50 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/06/01 13:18:01 itojun Exp $
bin/apr-config
bin/apu-config
etc/rc.d/apache
-include/apr.h
-include/apr_allocator.h
-include/apr_anylock.h
-include/apr_atomic.h
-include/apr_base64.h
-include/apr_buckets.h
-include/apr_compat.h
-include/apr_date.h
-include/apr_dbm.h
-include/apr_dso.h
-include/apr_errno.h
-include/apr_file_info.h
-include/apr_file_io.h
-include/apr_fnmatch.h
-include/apr_general.h
-include/apr_getopt.h
-include/apr_global_mutex.h
-include/apr_hash.h
-include/apr_hooks.h
-include/apr_inherit.h
-include/apr_ldap.h
-include/apr_lib.h
-include/apr_lock.h
-include/apr_md4.h
-include/apr_md5.h
-include/apr_mmap.h
-include/apr_network_io.h
-include/apr_optional.h
-include/apr_optional_hooks.h
-include/apr_pools.h
-include/apr_portable.h
-include/apr_proc_mutex.h
-include/apr_ring.h
-include/apr_rmm.h
-include/apr_sdbm.h
-include/apr_sha1.h
-include/apr_shm.h
-include/apr_signal.h
-include/apr_strings.h
-include/apr_tables.h
-include/apr_thread_cond.h
-include/apr_thread_mutex.h
-include/apr_thread_proc.h
-include/apr_thread_rwlock.h
-include/apr_time.h
-include/apr_uri.h
-include/apr_user.h
-include/apr_uuid.h
-include/apr_version.h
-include/apr_want.h
-include/apr_xlate.h
-include/apr_xml.h
-include/apu.h
-include/apu_compat.h
include/httpd/ap_compat.h
include/httpd/ap_config.h
include/httpd/ap_config_auto.h
@@ -86,7 +32,6 @@ include/httpd/apr_hooks.h
include/httpd/apr_inherit.h
include/httpd/apr_ldap.h
include/httpd/apr_lib.h
-include/httpd/apr_lock.h
include/httpd/apr_md4.h
include/httpd/apr_md5.h
include/httpd/apr_mmap.h
@@ -171,18 +116,6 @@ lib/libaprutil.la
lib/libaprutil.so
lib/libaprutil.so.0
lib/libaprutil.so.0.0
-libexec/cgi-bin/printenv
-libexec/cgi-bin/test-cgi
-man/man1/dbmmanage.1
-man/man1/htdigest.1
-man/man1/htpasswd.1
-man/man8/ab.8
-man/man8/apachectl.8
-man/man8/apxs.8
-man/man8/httpd.8
-man/man8/logresolve.8
-man/man8/rotatelogs.8
-man/man8/suexec.8
sbin/ab
sbin/apachectl
sbin/apxs
@@ -195,7 +128,6 @@ sbin/htpasswd
sbin/httpd
sbin/logresolve
sbin/rotatelogs
-${SUEXEC_COMMENT}sbin/suexec
share/examples/httpd/highperformance-std.conf
share/examples/httpd/httpd-std.conf
share/examples/httpd/magic
@@ -702,65 +634,22 @@ share/httpd/manual/sections.html
share/httpd/manual/server-wide.html.en
share/httpd/manual/server-wide.html.ja.jis
share/httpd/manual/sitemap.html
-share/httpd/manual/ssl/Makefile
share/httpd/manual/ssl/footer.html
share/httpd/manual/ssl/header.html
share/httpd/manual/ssl/index.html
-share/httpd/manual/ssl/mod_ssl_sb.gif
-share/httpd/manual/ssl/openssl_ics.gif
-share/httpd/manual/ssl/ssl_compat.gfont000.gif
share/httpd/manual/ssl/ssl_compat.html
-share/httpd/manual/ssl/ssl_compat.wml
-share/httpd/manual/ssl/ssl_cover.wml
share/httpd/manual/ssl/ssl_cover_logo.jpg
share/httpd/manual/ssl/ssl_cover_title.jpg
-share/httpd/manual/ssl/ssl_faq.gfont000.gif
share/httpd/manual/ssl/ssl_faq.html
-share/httpd/manual/ssl/ssl_faq.wml
share/httpd/manual/ssl/ssl_glossary.html
-share/httpd/manual/ssl/ssl_glossary.wml
-share/httpd/manual/ssl/ssl_howto.gfont000.gif
share/httpd/manual/ssl/ssl_howto.html
-share/httpd/manual/ssl/ssl_howto.wml
-share/httpd/manual/ssl/ssl_intro.gfont000.gif
share/httpd/manual/ssl/ssl_intro.html
-share/httpd/manual/ssl/ssl_intro.wml
share/httpd/manual/ssl/ssl_intro_fig1.gif
share/httpd/manual/ssl/ssl_intro_fig2.gif
share/httpd/manual/ssl/ssl_intro_fig3.gif
-share/httpd/manual/ssl/ssl_overview.gfont000.gif
-share/httpd/manual/ssl/ssl_overview.html
-share/httpd/manual/ssl/ssl_overview.wml
share/httpd/manual/ssl/ssl_overview_fig1.gif
-share/httpd/manual/ssl/ssl_reference.gfont000.gif
-share/httpd/manual/ssl/ssl_reference.html
-share/httpd/manual/ssl/ssl_reference.wml
-share/httpd/manual/ssl/ssl_template.head-chapter.gif
-share/httpd/manual/ssl/ssl_template.head-num-1.gif
-share/httpd/manual/ssl/ssl_template.head-num-2.gif
-share/httpd/manual/ssl/ssl_template.head-num-3.gif
-share/httpd/manual/ssl/ssl_template.head-num-4.gif
-share/httpd/manual/ssl/ssl_template.head-num-5.gif
-share/httpd/manual/ssl/ssl_template.head-num-6.gif
-share/httpd/manual/ssl/ssl_template.head-num-7.gif
share/httpd/manual/ssl/ssl_template.imgdot-1x1-000000.gif
share/httpd/manual/ssl/ssl_template.imgdot-1x1-transp.gif
-share/httpd/manual/ssl/ssl_template.inc
-share/httpd/manual/ssl/ssl_template.navbut-next-n.gif
-share/httpd/manual/ssl/ssl_template.navbut-next-s.gif
-share/httpd/manual/ssl/ssl_template.navbut-prev-n.gif
-share/httpd/manual/ssl/ssl_template.navbut-prev-s.gif
-share/httpd/manual/ssl/ssl_template.title-abstract.gif
-share/httpd/manual/ssl/ssl_template.title-compat.gif
-share/httpd/manual/ssl/ssl_template.title-faq.gif
-share/httpd/manual/ssl/ssl_template.title-gloss.gif
-share/httpd/manual/ssl/ssl_template.title-howto.gif
-share/httpd/manual/ssl/ssl_template.title-intro.gif
-share/httpd/manual/ssl/ssl_template.title-over.gif
-share/httpd/manual/ssl/ssl_template.title-preface.gif
-share/httpd/manual/ssl/ssl_template.title-ref.gif
-share/httpd/manual/ssl/ssl_template.title-toc.gif
-share/httpd/manual/ssl/ssl_template.title-tutor.gif
share/httpd/manual/stopping.html
share/httpd/manual/style/build.sh
share/httpd/manual/style/build.xml
@@ -783,18 +672,18 @@ share/httpd/manual/vhosts/index.html
share/httpd/manual/vhosts/ip-based.html
share/httpd/manual/vhosts/mass.html
share/httpd/manual/vhosts/name-based.html
-@dirrm share/httpd/manual/vhosts
-@dirrm share/httpd/manual/style
-@dirrm share/httpd/manual/ssl
-@dirrm share/httpd/manual/search
-@dirrm share/httpd/manual/programs
-@dirrm share/httpd/manual/platform
-@dirrm share/httpd/manual/mod
-@dirrm share/httpd/manual/misc
-@dirrm share/httpd/manual/images
-@dirrm share/httpd/manual/howto
-@dirrm share/httpd/manual/faq
@dirrm share/httpd/manual/developer
+@dirrm share/httpd/manual/faq
+@dirrm share/httpd/manual/howto
+@dirrm share/httpd/manual/images
+@dirrm share/httpd/manual/misc
+@dirrm share/httpd/manual/mod
+@dirrm share/httpd/manual/platform
+@dirrm share/httpd/manual/programs
+@dirrm share/httpd/manual/search
+@dirrm share/httpd/manual/ssl
+@dirrm share/httpd/manual/style
+@dirrm share/httpd/manual/vhosts
@dirrm share/httpd/manual
@dirrm share/httpd/icons/small
@dirrm share/httpd/icons
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index d00b9755bda..a1c07a8a75d 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.5 2002/04/13 21:35:51 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/06/01 13:18:01 itojun Exp $
-SHA1 (httpd-2.0.35.tar.gz) = 242c44445270f9f2a674ec5c6ad646aa449fc76a
-Size (httpd-2.0.35.tar.gz) = 4124937 bytes
-SHA1 (patch-aa) = 8c29506b6bcf12eb0ee939e789b6d499dc38ca6d
+SHA1 (httpd-2.0.36.tar.gz) = 7080a7ab9cb1289b4b0f934e81439f9d21076784
+Size (httpd-2.0.36.tar.gz) = 4558484 bytes
+SHA1 (patch-aa) = ac42d212a1a9a103952ddc28e7c427a64f1a84d6
SHA1 (patch-ad) = 139c2eed9b0b74323cb7ad88324ca968defff6d6
SHA1 (patch-ag) = d3fe2a5f066353c64649c3efa76855ffd3d75111
-SHA1 (patch-ah) = d2192ec1e6f658440f2e6a14cfa57a8d9807243b
-SHA1 (patch-ai) = 54207ba83f626834ab12a2f8aab2faa6eef50169
-SHA1 (patch-ak) = ee60c5d0d0a57f880a23bbe5cb2b7ecb2998960c
+SHA1 (patch-ah) = 437152bd67b4045370f8f11c21f9f8d7a9c29d60
+SHA1 (patch-ai) = d04ed1f2999be97e1e764e9e4f0decbff202d76b
+SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
SHA1 (patch-al) = 0dcba1455b4fa3fc40fbd488813608b7e2350309
SHA1 (patch-am) = ff60a7b69ad949363ebec194141e9b95cb796426
diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa
index 1177c738451..0051876d2db 100644
--- a/www/apache2/patches/patch-aa
+++ b/www/apache2/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2002/04/13 21:35:52 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2002/06/01 13:18:02 itojun Exp $
---- Makefile.in.orig Fri Apr 5 14:36:06 2002
+--- Makefile.in.orig Mon Apr 29 01:41:25 2002
+++ Makefile.in
@@ -16,7 +16,7 @@
PROGRAMS = $(PROGRAM_NAME)
@@ -11,23 +11,14 @@ $NetBSD: patch-aa,v 1.3 2002/04/13 21:35:52 jlam Exp $
install-other install-cgi install-include install-suexec install-man \
install-build
-@@ -37,7 +37,7 @@
- done; \
- for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
- cd $$j ; \
-- for i in *-std* ssl.conf; do \
-+ for i in *-std.conf ssl.conf; do \
- [ -f $$i ] || continue; \
- ( \
- n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
-@@ -71,6 +71,7 @@
+@@ -70,6 +70,7 @@
+ < $$i; \
fi \
) > $(sysconfdir)/$$i; \
- chmod 0644 $(sysconfdir)/$$i; \
+ if false; then \
+ chmod 0644 $(sysconfdir)/$$i; \
file=`echo $$i|sed s/-std//`; \
if [ "$$file" = "httpd.conf" ]; then \
- file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
@@ -78,12 +79,15 @@
if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
diff --git a/www/apache2/patches/patch-ah b/www/apache2/patches/patch-ah
index 825862f69a5..e1fa3fb1f3e 100644
--- a/www/apache2/patches/patch-ah
+++ b/www/apache2/patches/patch-ah
@@ -1,13 +1,9 @@
-$NetBSD: patch-ah,v 1.3 2002/04/13 21:35:53 jlam Exp $
+$NetBSD: patch-ah,v 1.4 2002/06/01 13:18:02 itojun Exp $
---- support/apachectl.in.orig Thu Apr 4 04:15:44 2002
+--- support/apachectl.in.orig Mon Apr 15 02:41:25 2002
+++ support/apachectl.in
-@@ -29,11 +29,11 @@
- PIDFILE=@exp_runtimedir@/@progname@.pid
- #
- # the path to your httpd binary, including options if necessary
--HTTPD='@exp_bindir@/@progname@'
-+HTTPD='@exp_sbindir@/@progname@'
+@@ -32,8 +32,8 @@
+ HTTPD='@exp_sbindir@/@progname@'
#
# pick up any necessary environment variables
-if test -f @exp_bindir@/envvars; then
diff --git a/www/apache2/patches/patch-ai b/www/apache2/patches/patch-ai
index d4193dd2d08..c19c2826387 100644
--- a/www/apache2/patches/patch-ai
+++ b/www/apache2/patches/patch-ai
@@ -1,12 +1,12 @@
-$NetBSD: patch-ai,v 1.3 2002/04/13 21:35:53 jlam Exp $
+$NetBSD: patch-ai,v 1.4 2002/06/01 13:18:02 itojun Exp $
---- support/apxs.in.orig Wed Mar 13 15:48:05 2002
+--- support/apxs.in.orig Mon Apr 29 20:09:02 2002
+++ support/apxs.in
@@ -63,10 +63,11 @@
my $prefix = "@prefix@";
my $CFG_PREFIX = $prefix;
-+my $installbuilddir = "@exp_installbuilddir@"
++my $installbuilddir = "@exp_installbuilddir@";
# read the configuration variables once
my %config_vars = ();
@@ -15,7 +15,16 @@ $NetBSD: patch-ai,v 1.3 2002/04/13 21:35:53 jlam Exp $
my $exec_prefix = get_vars("exec_prefix");
my $CFG_TARGET = get_vars("progname");
-@@ -415,7 +416,7 @@
+@@ -223,7 +224,7 @@
+ my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
+ $httpd = eval qq("$httpd");
+ $httpd = eval qq("$httpd");
+-my $envvars = get_vars("bindir") . "/envvars";
++my $envvars = get_vars("sbindir") . "/envvars";
+ $envvars = eval qq("$envvars");
+ $envvars = eval qq("$envvars");
+
+@@ -418,7 +419,7 @@
$la =~ s|\.c$|.la|;
my $o = $s;
$o =~ s|\.c$|.o|;
@@ -24,7 +33,7 @@ $NetBSD: patch-ai,v 1.3 2002/04/13 21:35:53 jlam Exp $
unshift(@objs, $lo);
}
-@@ -440,7 +441,7 @@
+@@ -443,7 +444,7 @@
$opt .= " -l$opt_l";
}
@@ -33,7 +42,7 @@ $NetBSD: patch-ai,v 1.3 2002/04/13 21:35:53 jlam Exp $
# execute the commands
&execute_cmds(@cmds);
-@@ -471,8 +472,8 @@
+@@ -474,8 +475,8 @@
$t =~ s|^.+/([^/]+)$|$1|;
$t =~ s|\.la$|\.so|;
if ($opt_i) {
diff --git a/www/apache2/patches/patch-ak b/www/apache2/patches/patch-ak
index 87918ebb951..b41d3aba122 100644
--- a/www/apache2/patches/patch-ak
+++ b/www/apache2/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.1 2002/04/13 21:35:54 jlam Exp $
+$NetBSD: patch-ak,v 1.2 2002/06/01 13:18:02 itojun Exp $
---- docs/conf/httpd-std.conf.in.orig Thu Apr 4 04:15:43 2002
+--- docs/conf/httpd-std.conf.in.orig Wed Apr 24 16:24:35 2002
+++ docs/conf/httpd-std.conf.in
@@ -24,9 +24,9 @@
# Configuration and logfile names: If the filenames you specify for many
@@ -32,104 +32,3 @@ $NetBSD: patch-ak,v 1.1 2002/04/13 21:35:54 jlam Exp $
</IfModule>
</IfModule>
-@@ -78,7 +78,7 @@
- # identification number when it starts.
- #
- <IfModule !mpm_netware.c>
--PidFile @rel_logfiledir@/httpd.pid
-+PidFile @rel_runtimedir@/httpd.pid
- </IfModule>
-
- #
-@@ -290,7 +290,7 @@
- # documents. By default, all requests are taken from this directory, but
- # symbolic links and aliases may be used to point to other locations.
- #
--DocumentRoot "@@ServerRoot@@/@rel_htdocsdir@"
-+DocumentRoot "@exp_htdocsdir@"
-
- #
- # Each directory to which Apache has access can be configured with respect
-@@ -315,7 +315,7 @@
- #
- # This should be changed to whatever you set DocumentRoot to.
- #
--<Directory "@@ServerRoot@@/@rel_htdocsdir@">
-+<Directory "@exp_htdocsdir@">
-
- #
- # Possible values for the Options directive are "None", "All",
-@@ -499,9 +499,9 @@
- # We include the /icons/ alias for FancyIndexed directory listings. If you
- # do not use FancyIndexing, you may comment this out.
- #
--Alias /icons/ "@@ServerRoot@@/@rel_iconsdir@/"
-+Alias /icons/ "@exp_iconsdir@/"
-
--<Directory "@@ServerRoot@@/@rel_iconsdir@">
-+<Directory "@exp_iconsdir@">
- Options Indexes MultiViews
- AllowOverride None
- Order allow,deny
-@@ -513,9 +513,9 @@
- # the manual, even if you choose to move your DocumentRoot. You may comment
- # this out if you do not care for the documentation.
- #
--Alias /manual "@@ServerRoot@@/@rel_manualdir@"
-+Alias /manual "@exp_manualdir@"
-
--<Directory "@@ServerRoot@@/@rel_manualdir@">
-+<Directory "@exp_manualdir@">
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
- Order allow,deny
-@@ -530,7 +530,7 @@
- # The same rules about trailing "/" apply to ScriptAlias directives as to
- # Alias.
- #
--ScriptAlias /cgi-bin/ "@@ServerRoot@@/@rel_cgidir@/"
-+ScriptAlias /cgi-bin/ "@exp_cgidir@/"
-
- <IfModule mod_cgid.c>
- #
-@@ -541,10 +541,10 @@
- </IfModule>
-
- #
--# "@@ServerRoot@@/@rel_cgidir@" should be changed to whatever your ScriptAliased
-+# "@exp_cgidir@" should be changed to whatever your ScriptAliased
- # CGI directory exists, if you have that configured.
- #
--<Directory "@@ServerRoot@@/@rel_cgidir@">
-+<Directory "@exp_cgidir@">
- AllowOverride None
- Options None
- Order allow,deny
-@@ -854,15 +854,15 @@
- # Alias /error/include/ "/your/include/path/"
- #
- # which allows you to create your own set of files by starting with the
--# @@ServerRoot@@/@rel_errordir@/include/ files and
-+# @exp_errordir@/include/ files and
- # copying them to /your/include/path/, even on a per-VirtualHost basis.
- #
-
- <IfModule mod_negotiation.c>
- <IfModule mod_include.c>
-- Alias /error/ "@@ServerRoot@@/@rel_errordir@/"
-+ Alias /error/ "@exp_errordir@/"
-
-- <Directory "@@ServerRoot@@/@rel_errordir@">
-+ <Directory "@exp_errordir@">
- AllowOverride None
- Options IncludesNoExec
- AddOutputFilter Includes html
-@@ -960,7 +960,7 @@
- # To enable the cache as well, edit and uncomment the following lines:
- # (no cacheing without CacheRoot)
- #
--#CacheRoot "@@ServerRoot@@/@rel_proxycachedir@"
-+#CacheRoot "@exp_proxycachedir@"
- #CacheSize 5
- #CacheGcInterval 4
- #CacheMaxExpire 24
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-25 01:19:44 +0000