head 1.27;
access;
symbols
pkgsrc-2014Q1:1.26.0.54
pkgsrc-2014Q1-base:1.26
pkgsrc-2013Q4:1.26.0.52
pkgsrc-2013Q4-base:1.26
pkgsrc-2013Q3:1.26.0.50
pkgsrc-2013Q3-base:1.26
pkgsrc-2013Q2:1.26.0.48
pkgsrc-2013Q2-base:1.26
pkgsrc-2013Q1:1.26.0.46
pkgsrc-2013Q1-base:1.26
pkgsrc-2012Q4:1.26.0.44
pkgsrc-2012Q4-base:1.26
pkgsrc-2012Q3:1.26.0.42
pkgsrc-2012Q3-base:1.26
pkgsrc-2012Q2:1.26.0.40
pkgsrc-2012Q2-base:1.26
pkgsrc-2012Q1:1.26.0.38
pkgsrc-2012Q1-base:1.26
pkgsrc-2011Q4:1.26.0.36
pkgsrc-2011Q4-base:1.26
pkgsrc-2011Q3:1.26.0.34
pkgsrc-2011Q3-base:1.26
pkgsrc-2011Q2:1.26.0.32
pkgsrc-2011Q2-base:1.26
pkgsrc-2011Q1:1.26.0.30
pkgsrc-2011Q1-base:1.26
pkgsrc-2010Q4:1.26.0.28
pkgsrc-2010Q4-base:1.26
pkgsrc-2010Q3:1.26.0.26
pkgsrc-2010Q3-base:1.26
pkgsrc-2010Q2:1.26.0.24
pkgsrc-2010Q2-base:1.26
pkgsrc-2010Q1:1.26.0.22
pkgsrc-2010Q1-base:1.26
pkgsrc-2009Q4:1.26.0.20
pkgsrc-2009Q4-base:1.26
pkgsrc-2009Q3:1.26.0.18
pkgsrc-2009Q3-base:1.26
pkgsrc-2009Q2:1.26.0.16
pkgsrc-2009Q2-base:1.26
pkgsrc-2009Q1:1.26.0.14
pkgsrc-2009Q1-base:1.26
pkgsrc-2008Q4:1.26.0.12
pkgsrc-2008Q4-base:1.26
pkgsrc-2008Q3:1.26.0.10
pkgsrc-2008Q3-base:1.26
cube-native-xorg:1.26.0.8
cube-native-xorg-base:1.26
pkgsrc-2008Q2:1.26.0.6
pkgsrc-2008Q2-base:1.26
cwrapper:1.26.0.4
pkgsrc-2008Q1:1.26.0.2
pkgsrc-2008Q1-base:1.26
pkgsrc-2007Q4:1.25.0.16
pkgsrc-2007Q4-base:1.25
pkgsrc-2007Q3:1.25.0.14
pkgsrc-2007Q3-base:1.25
pkgsrc-2007Q2:1.25.0.12
pkgsrc-2007Q2-base:1.25
pkgsrc-2007Q1:1.25.0.10
pkgsrc-2007Q1-base:1.25
pkgsrc-2006Q4:1.25.0.8
pkgsrc-2006Q4-base:1.25
pkgsrc-2006Q3:1.25.0.6
pkgsrc-2006Q3-base:1.25
pkgsrc-2006Q2:1.25.0.4
pkgsrc-2006Q2-base:1.25
pkgsrc-2006Q1:1.25.0.2
pkgsrc-2006Q1-base:1.25
pkgsrc-2005Q4:1.24.0.10
pkgsrc-2005Q4-base:1.24
pkgsrc-2005Q3:1.24.0.8
pkgsrc-2005Q3-base:1.24
pkgsrc-2005Q2:1.24.0.6
pkgsrc-2005Q2-base:1.24
pkgsrc-2005Q1:1.24.0.4
pkgsrc-2005Q1-base:1.24
pkgsrc-2004Q4:1.24.0.2
pkgsrc-2004Q4-base:1.24
pkgsrc-2004Q3:1.23.0.4
pkgsrc-2004Q3-base:1.23
pkgsrc-2004Q2:1.23.0.2
pkgsrc-2004Q2-base:1.23
pkgsrc-2004Q1:1.22.0.2
pkgsrc-2004Q1-base:1.22
pkgsrc-2003Q4:1.21.0.4
pkgsrc-2003Q4-base:1.21
netbsd-1-6-1:1.21.0.2
netbsd-1-6-1-base:1.21
netbsd-1-6:1.19.0.6
netbsd-1-6-RELEASE-base:1.19
pkgviews:1.19.0.2
pkgviews-base:1.19
buildlink2:1.18.0.2
buildlink2-base:1.19
netbsd-1-5-PATCH003:1.18
netbsd-1-5-PATCH001:1.14
netbsd-1-5-RELEASE:1.12
netbsd-1-4-PATCH003:1.12
netbsd-1-4-PATCH002:1.11
comdex-fall-1999:1.10
netbsd-1-4-PATCH001:1.10
netbsd-1-4-RELEASE:1.8
netbsd-1-3-PATCH003:1.4
netbsd-1-3-PATCH002:1.1;
locks; strict;
comment @# @;
1.27
date 2014.06.10.15.22.18; author joerg; state dead;
branches;
next 1.26;
commitid djgMkPoOrhNxnZDx;
1.26
date 2008.02.23.05.16.34; author obache; state Exp;
branches;
next 1.25;
1.25
date 2006.02.21.22.44.17; author wiz; state Exp;
branches;
next 1.24;
1.24
date 2004.10.29.13.48.31; author abs; state Exp;
branches;
next 1.23;
1.23
date 2004.05.13.21.21.27; author abs; state Exp;
branches
1.23.4.1;
next 1.22;
1.22
date 2004.02.28.22.15.30; author snj; state Exp;
branches
1.22.2.1;
next 1.21;
1.21
date 2003.01.20.22.58.26; author jschauma; state Exp;
branches;
next 1.20;
1.20
date 2002.08.25.18.40.19; author jlam; state Exp;
branches;
next 1.19;
1.19
date 2002.06.20.17.12.37; author taca; state Exp;
branches;
next 1.18;
1.18
date 2002.02.01.16.04.39; author jlam; state Exp;
branches
1.18.2.1;
next 1.17;
1.17
date 2002.01.01.06.12.06; author jlam; state Exp;
branches;
next 1.16;
1.16
date 2001.11.15.05.32.57; author jlam; state Exp;
branches;
next 1.15;
1.15
date 2001.10.17.19.17.00; author jlam; state Exp;
branches;
next 1.14;
1.14
date 2001.02.02.16.39.57; author jlam; state Exp;
branches;
next 1.13;
1.13
date 2001.01.14.05.58.01; author jlam; state Exp;
branches;
next 1.12;
1.12
date 2000.09.12.14.17.32; author jlam; state Exp;
branches;
next 1.11;
1.11
date 99.11.21.22.09.28; author tron; state Exp;
branches;
next 1.10;
1.10
date 99.05.07.13.46.43; author tv; state Exp;
branches;
next 1.9;
1.9
date 99.05.02.21.13.08; author tv; state Exp;
branches;
next 1.8;
1.8
date 99.04.30.17.05.20; author tv; state Exp;
branches;
next 1.7;
1.7
date 98.12.04.17.23.20; author tv; state Exp;
branches;
next 1.6;
1.6
date 98.12.03.17.23.52; author tv; state Exp;
branches;
next 1.5;
1.5
date 98.10.03.22.00.23; author tv; state dead;
branches;
next 1.4;
1.4
date 98.08.07.11.14.22; author agc; state Exp;
branches;
next 1.3;
1.3
date 98.07.21.22.39.56; author cjs; state Exp;
branches;
next 1.2;
1.2
date 98.06.04.19.38.36; author tv; state dead;
branches;
next 1.1;
1.1
date 98.03.05.08.02.22; author cjs; state Exp;
branches;
next ;
1.23.4.1
date 2004.12.01.00.25.56; author salo; state Exp;
branches;
next ;
1.22.2.1
date 2004.05.26.10.55.01; author grant; state Exp;
branches;
next 1.22.2.2;
1.22.2.2
date 2004.05.31.22.26.04; author grant; state Exp;
branches;
next ;
1.18.2.1
date 2002.06.23.19.03.27; author jlam; state Exp;
branches;
next ;
desc
@@
1.27
log
@Retire Apache 1.3 and 2.0.
@
text
@$NetBSD: patch-aa,v 1.26 2008/02/23 05:16:34 obache Exp $
--- Makefile.tmpl.orig 2008-02-23 04:22:56.000000000 +0000
+++ Makefile.tmpl
@@@@ -57,6 +57,8 @@@@ INSTALL_DATA = $(INSTALL) $(IFLAGS_DA
PERL = @@PERL@@
TAR = @@TAR@@
TAROPT = @@TAROPT@@
+BINOWN = @@BINOWN@@
+BINGRP = @@BINGRP@@
# installation name of Apache webserver
TARGET = @@TARGET@@
@@@@ -281,11 +283,6 @@@@ install-mktree:
$(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
- $(MKDIR) $(root)$(sysconfdir)/ssl.crt
- $(MKDIR) $(root)$(sysconfdir)/ssl.crl
- $(MKDIR) $(root)$(sysconfdir)/ssl.csr
- $(MKDIR) $(root)$(sysconfdir)/ssl.key
- $(MKDIR) $(root)$(sysconfdir)/ssl.prm
$(MKDIR) $(root)$(htdocsdir)
$(MKDIR) $(root)$(manualdir)
$(MKDIR) $(root)$(iconsdir)
@@@@ -297,9 +294,9 @@@@ install-mktree:
$(MKDIR) $(root)$(proxycachedir)
-@@if [ "x`$(AUX)/getuid.sh`" = "x0" ]; then \
echo "chown $(conf_user) $(root)$(proxycachedir)"; \
- chown $(conf_user) $(root)$(proxycachedir); \
+ ${CHOWN} $(conf_user) $(root)$(proxycachedir); \
echo "chgrp $(conf_group) $(root)$(proxycachedir)"; \
- chgrp "$(conf_group)" $(root)$(proxycachedir); \
+ ${CHGRP} "$(conf_group)" $(root)$(proxycachedir); \
fi
@@echo "<=== [mktree]"
@@@@ -344,34 +341,6 @@@@ install-programs:
file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
- name=`$(TOP)/$(AUX)/fmn.sh $(TOP)/$(SRC)/$${mod}`; \
- if [ ".$$name" = .ssl_module ]; then \
- echo "" >>$(SRC)/.apaci.install.conf; \
- fi; \
- echo dummy | awk '{ printf("LoadModule %-18s %s\n", modname, modpath); }' \
- modname="$${name}" modpath="$(libexecdir_relative)$${file}" >>$(SRC)/.apaci.install.conf; \
- if [ ".$$name" = .ssl_module ]; then \
- echo "" >>$(SRC)/.apaci.install.conf; \
- fi; \
- done; \
- echo "" >>$(SRC)/.apaci.install.conf; \
- echo "# Reconstruction of the complete module list from all available modules" >>$(SRC)/.apaci.install.conf; \
- echo "# (static and shared ones) to achieve correct module execution order." >>$(SRC)/.apaci.install.conf; \
- echo "# [WHENEVER YOU CHANGE THE LOADMODULE SECTION ABOVE UPDATE THIS, TOO]" >>$(SRC)/.apaci.install.conf; \
- echo "ClearModuleList" >>$(SRC)/.apaci.install.conf; \
- for mod in `egrep "^[ ]*(Add|Shared)Module" $(SRC)/Configuration.apaci |\
- sed -e 's:[ ]*SharedModule::' \
- -e 's:[ ]*AddModule::' \
- -e 's:modules/[^/]*/::' \
- -e 's:[ ]lib: mod_:' \
- -e 's:\.[soam]*$$:.c:'`; do \
- if [ ".$$mod" = .mod_ssl.c ]; then \
- echo "" >>$(SRC)/.apaci.install.conf; \
- fi; \
- echo "AddModule $$mod" >>$(SRC)/.apaci.install.conf; \
- if [ ".$$mod" = .mod_ssl.c ]; then \
- echo "" >>$(SRC)/.apaci.install.conf; \
- fi; \
done; \
fi
@@echo "<=== [programs]"
@@@@ -421,9 +390,9 @@@@ install-support:
echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec"; \
$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec; \
echo "chown root $(root)$(sbindir)/suexec"; \
- chown root $(root)$(sbindir)/suexec; \
+ ${CHOWN} root $(root)$(sbindir)/suexec; \
echo "chmod 4711 $(root)$(sbindir)/suexec"; \
- chmod 4711 $(root)$(sbindir)/suexec; \
+ ${CHMOD} 4711 $(root)$(sbindir)/suexec; \
echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8"; \
$(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8; \
fi
@@@@ -465,9 +434,9 @@@@ install-binsupport:
echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec"; \
$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec; \
echo "chown root $(root)$(sbindir)/suexec"; \
- chown root $(root)$(sbindir)/suexec; \
+ ${CHOWN} root $(root)$(sbindir)/suexec; \
echo "chmod 4711 $(root)$(sbindir)/suexec"; \
- chmod 4711 $(root)$(sbindir)/suexec; \
+ ${CHMOD} 4711 $(root)$(sbindir)/suexec; \
echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8"; \
$(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8; \
fi
@@@@ -490,21 +459,25 @@@@ install-include:
# icons and distributed CGI scripts.
install-data:
@@echo "===> [data: Installing initial data files]"
- -@@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
+ -@@if false; then \
echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
else \
echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\
(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
- find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
- find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
+ ${FIND} $(root)$(htdocsdir)/ -type d -exec ${CHMOD} a+rx {} \; ; \
+ ${FIND} $(root)$(htdocsdir)/ -type f -print | ${XARGS} ${CHMOD} a+r ; \
+ ${FIND} $(root)$(htdocsdir)/ -print | \
+ ${XARGS} ${CHOWN} ${BINOWN}:${BINGRP} ; \
fi
-@@if [ -d $(TOP)/htdocs/manual ]; then \
echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
- find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
- find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
+ ${FIND} $(root)$(manualdir)/ -type d -exec ${CHMOD} a+rx {} \; ; \
+ ${FIND} $(root)$(manualdir)/ -type f -print | ${XARGS} ${CHMOD} a+r ; \
+ ${FIND} $(root)$(manualdir)/ -print | \
+ ${XARGS} ${CHOWN} ${BINOWN}:${BINGRP} ; \
fi
-@@if [ -f $(root)$(cgidir)/printenv ]; then \
echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
@@@@ -512,23 +485,25 @@@@ install-data:
for script in printenv test-cgi; do \
cat $(TOP)/cgi-bin/$${script} |\
sed -e 's;^#!/.*perl;#!$(PERL);' \
+ -e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \
> $(TOP)/$(SRC)/.apaci.install.tmp; \
- echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
+ echo "$(INSTALL_SCRIPT) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
+ $(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
done; \
fi
@@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
- find $(root)$(iconsdir)/ -type d -exec chmod a+rx {} \; ;\
- find $(root)$(iconsdir)/ -type f -exec chmod a+r {} \;
+ ${FIND} $(root)$(iconsdir)/ -type d -exec ${CHMOD} a+rx {} \; ;\
+ ${FIND} $(root)$(iconsdir)/ -type f -exec ${CHMOD} a+r {} \; ;\
+ ${CHOWN} -R ${BINOWN}:${BINGRP} $(root)$(iconsdir)/.
@@echo "<=== [data]"
# create the initial configuration by providing default files
# and initial config files while preserving existing ones.
install-config:
@@echo "===> [config: Installing Apache configuration files]"
- -@@for conf in httpd.conf access.conf srm.conf; do \
+ -@@for conf in httpd.conf; do \
if [ .$$conf = .httpd.conf ]; then \
target_conf="$(TARGET).conf"; \
else \
@@@@ -584,22 +559,10 @@@@ install-config:
> $(TOP)/$(SRC)/.apaci.install.tmp && \
echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \
$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \
- if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \
- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \
- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \
- else \
- echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${target_conf}]"; \
- fi; \
done
-@@for conf in mime.types magic; do \
echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
- if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
- $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
- else \
- echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${conf}]"; \
- fi; \
done
-@@if [ ".$(ssl)" = .1 ]; then \
echo "chmod 755 $(root)$(sysconfdir)/ssl.crt"; \
@
1.26
log
@Update apache to 1.3.41.
Changes with Apache 1.3.41
*) SECURITY: CVE-2007-6388 (cve.mitre.org)
mod_status: Ensure refresh parameter is numeric to prevent
a possible XSS attack caused by redirecting to other URLs.
Reported by SecurityReason. [Mark Cox]
Changes with Apache 1.3.40 (not released)
*) SECURITY: CVE-2007-5000 (cve.mitre.org)
mod_imap: Fix cross-site scripting issue. Reported by JPCERT.
[Joe Orton]
*) SECURITY: CVE-2007-3847 (cve.mitre.org)
mod_proxy: Prevent reading past the end of a buffer when parsing
date-related headers. PR 41144.
With Apache 1.3, the denial of service vulnerability applies only
to the Windows and NetWare platforms.
[Jeff Trawick]
*) More efficient implementation of the CVE-2007-3304 PID table
patch. This fixes issues with excessive memory usage by the
parent process if long-running and with a high number of child
process forks during that timeframe. Also fixes bogus "Bad pid"
errors. [Jim Jagielski, Jeff Trawick]
Changes with Apache 1.3.39
*) SECURITY: CVE-2006-5752 (cve.mitre.org)
mod_status: Fix a possible XSS attack against a site with a public
server-status page and ExtendedStatus enabled, for browsers which
perform charset "detection". Reported by Stefan Esser. [Joe Orton]
*) SECURITY: CVE-2007-3304 (cve.mitre.org)
Ensure that the parent process cannot be forced to kill non-child
processes by checking scoreboard PID data with parent process
privately stored PID data. [Jim Jagielski]
*) mime.types: Many updates to sync with IANA registry and common
unregistered types that the owners refuse to register. Admins
are encouraged to update their installed mime.types file.
pr: 35550, 37798, 39317, 31483 [Roy T. Fielding]
There was no Apache 1.3.38
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.25 2006/02/21 22:44:17 wiz Exp $
@
1.25
log
@Fix config file handling; fix CHECK_PLIST build. Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.24 2004/10/29 13:48:31 abs Exp $
d3 1
a3 1
--- Makefile.tmpl.orig 2006-02-21 12:27:34.000000000 +0000
d5 1
a5 1
@@@@ -56,6 +56,8 @@@@ INSTALL_DATA = $(INSTALL) $(IFLAGS_DA
d14 1
a14 1
@@@@ -280,11 +282,6 @@@@ install-mktree:
d26 1
a26 1
@@@@ -296,9 +293,9 @@@@ install-mktree:
d38 1
a38 1
@@@@ -343,34 +340,6 @@@@ install-programs:
d73 1
a73 1
@@@@ -420,9 +389,9 @@@@ install-support:
d85 1
a85 1
@@@@ -464,9 +433,9 @@@@ install-binsupport:
d97 1
a97 1
@@@@ -489,21 +458,25 @@@@ install-include:
d128 1
a128 1
@@@@ -511,23 +484,25 @@@@ install-data:
d159 1
a159 1
@@@@ -583,22 +558,10 @@@@ install-config:
@
1.24
log
@Update apache to 1.3.33
The main security vulnerabilities addressed in 1.3.33 are:
* CAN-2004-0940 (cve.mitre.org)
Fix potential buffer overflow with escaped characters in SSI tag string.
* CAN-2004-0492 (cve.mitre.org)
Reject responses from a remote server if sent an invalid
(negative) Content-Length.
New features
* Win32: Improve error reporting after a failed attempt to
spawn a piped log process or rewrite map process.
* Added new compile-time flag: UCN_OFF_HONOR_PHYSICAL_PORT. It
controls how UseCanonicalName Off determines the port value if
the client doesn't provide one in the Host header. If defined
during compilation, UseCanonicalName Off will use the physical
port number to generate the canonical name. If not defined, it
tries the current Port value followed by the default port for
the current scheme.
The following bugs were found in Apache 1.3.31 (or earlier) and
have been fixed in Apache 1.3.33:
* mod_rewrite: Fix query string handling for proxied URLs. PR 14518.
* mod_rewrite: Fix 0 bytes write into random memory position. PR 31036.
* mod_digest: Fix nonce string calculation since 1.3.31 which
would force re-authentication for every connection if
AuthDigestRealmSeed was not configured. PR 30920.
* Fix trivial bug in mod_log_forensic that caused the child to
seg fault when certain invalid requests were fired at it with
forensic logging is enabled. PR 29313.
* No longer breaks mod_dav, frontpage and others. Repair a
patch in 1.3.31 which prevented discarding the request body
for requests that will be keptalive but are not currently
keptalive. PR 29237.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.23 2004/05/13 21:21:27 abs Exp $
d3 1
a3 1
--- Makefile.tmpl.orig 2004-10-29 14:44:35.000000000 +0100
d159 23
@
1.23
log
@Regenerate patch-aa to obtain correct offsets so this works with Linux 'patch'.
No functional change (other than building again on Linux)
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- Makefile.tmpl.orig 2004-05-13 22:18:11.000000000 +0100
@
1.23.4.1
log
@Pullup ticket 141 - requested by David Brownlee
security fix for apache
Module Name: pkgsrc
Committed By: tron
Date: Mon Oct 25 08:44:16 UTC 2004
Modified Files:
pkgsrc/www/apache: Makefile PLIST distinfo
Removed Files:
pkgsrc/www/apache/patches: patch-ap
Log Message:
Update "apache" package to version 1.3.32. Changes since version 1.3.31:
- mod_rewrite: Fix query string handling for proxied URLs. PR 14518.
[michael teitler ,
Jan Kratochvil ]
- mod_rewrite: Fix 0 bytes write into random memory position.
PR 31036. [André Malo]
- mod_digest: Fix nonce string calculation since 1.3.31 which
would force re-authentication for every connection if
AuthDigestRealmSeed was not configured. PR 30920. [Joe Orton]
- Trigger an error when a LoadModule directive attempts to
load a module which is built-in. This is a common error when
switching from a DSO build to a static build.
[Jeff Trawick, Geoffrey Young]
- Fix trivial bug in mod_log_forensic that caused the child
to seg fault when certain invalid requests were fired at it with
forensic logging is enabled. PR 29313.
[Will Slater ]
- Fix memory leak in the cache handling of mod_rewrite. PR 27862.
[chunyan sheng , André Malo]
- mod_rewrite no longer confuses the RewriteMap caches if
different maps defined in different virtual hosts use the
same map name. PR 26462. [André Malo]
- mod_setenvif: Remove "support" for Remote_User variable which
never worked at all. PR 25725. [André Malo]
- mod_usertrack: Escape the cookie name before pasting into the
regexp. [André Malo]
- Win32: Improve error reporting after a failed attempt to spawn a
piped log process or rewrite map process. [Jeff Trawick]
- SECURITY: CAN-2004-0492 (cve.mitre.org)
Reject responses from a remote server if sent an invalid (negative)
Content-Length. [Mark Cox]
- Fix a bunch of cases where the return code of the regex compiler
was not checked properly. This affects mod_usertrack and
core. PR 28218. [André Malo]
- No longer breaks mod_dav, frontpage and others. Repair a patch
in 1.3.31 which prevented discarding the request body for requests
that will be keptalive but are not currently keptalive. PR 29237.
[Jim Jagielski, Rasmus Lerdorf]
- COMPATIBILITY: Added new compile-time flag: UCN_OFF_HONOR_PHYSICAL_PORT.
It controls how UseCanonicalName Off determines the port value if
the client doesn't provide one in the Host header. If defined during
compilation, UseCanonicalName Off will use the physical port number to
generate the canonical name. If not defined, it tries the current Port
value followed by the default port for the current scheme.
[Jim Jagielski]
---
Module Name: pkgsrc
Committed By: abs
Date: Fri Oct 29 13:48:31 UTC 2004
Modified Files:
pkgsrc/www/apache: Makefile distinfo
pkgsrc/www/apache/patches: patch-aa patch-ab patch-ac patch-ad
patch-ae patch-af patch-ag patch-ah patch-ai patch-aj
patch-ak patch-am patch-ao
Removed Files:
pkgsrc/www/apache/patches: patch-al
Log Message:
Update apache to 1.3.33
The main security vulnerabilities addressed in 1.3.33 are:
* CAN-2004-0940 (cve.mitre.org)
Fix potential buffer overflow with escaped characters in SSI
tag string.
* CAN-2004-0492 (cve.mitre.org)
Reject responses from a remote server if sent an invalid
(negative) Content-Length.
New features
* Win32: Improve error reporting after a failed attempt to
spawn a piped log process or rewrite map process.
* Added new compile-time flag: UCN_OFF_HONOR_PHYSICAL_PORT. It
controls how UseCanonicalName Off determines the port value if
the client doesn't provide one in the Host header. If defined
during compilation, UseCanonicalName Off will use the physical
port number to generate the canonical name. If not defined, it
tries the current Port value followed by the default port for
the current scheme.
The following bugs were found in Apache 1.3.31 (or earlier) and
have been fixed in Apache 1.3.33:
* mod_rewrite: Fix query string handling for proxied URLs.
PR 14518.
* mod_rewrite: Fix 0 bytes write into random memory position.
PR 31036.
* mod_digest: Fix nonce string calculation since 1.3.31 which
would force re-authentication for every connection if
AuthDigestRealmSeed was not configured. PR 30920.
* Fix trivial bug in mod_log_forensic that caused the child to
seg fault when certain invalid requests were fired at it with
forensic logging is enabled. PR 29313.
* No longer breaks mod_dav, frontpage and others. Repair a
patch in 1.3.31 which prevented discarding the request body
for requests that will be keptalive but are not currently
keptalive. PR 29237.
---
Module Name: pkgsrc
Committed By: salo
Date: Mon Nov 15 19:13:41 UTC 2004
Modified Files:
pkgsrc/www/apache/patches: patch-ai
Log Message:
Revert rev 1.9, do not expand @@INSTALL@@, it's done in post-patch.
(hi abs!)
---
Module Name: pkgsrc
Committed By: tron
Date: Tue Nov 16 08:23:45 UTC 2004
Modified Files:
pkgsrc/www/apache: distinfo
Log Message:
Regen after "patch-ai" was changed. (hi salo!)
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.24 2004/10/29 13:48:31 abs Exp $
d3 1
a3 1
--- Makefile.tmpl.orig 2004-10-29 14:44:35.000000000 +0100
@
1.22
log
@Use ${CHGRP} instead of chgrp. From Georg Schwarz in PR pkg/24594.
@
text
@d3 3
a5 3
--- Makefile.tmpl.orig 2004-02-28 14:06:16.000000000 -0800
+++ Makefile.tmpl 2004-02-28 14:06:16.000000000 -0800
@@@@ -100,6 +100,8 @@@@
d14 1
a14 1
@@@@ -324,11 +326,6 @@@@
d26 1
a26 1
@@@@ -340,9 +337,9 @@@@
d38 1
a38 1
@@@@ -387,34 +384,6 @@@@
d73 1
a73 1
@@@@ -464,9 +433,9 @@@@
d85 1
a85 1
@@@@ -508,9 +477,9 @@@@
d97 1
a97 1
@@@@ -533,21 +502,25 @@@@
d128 1
a128 1
@@@@ -555,23 +528,25 @@@@
@
1.22.2.1
log
@Pull up revision 1.23 (requested by taca in ticket #31):
Regenerate patch-aa to obtain correct offsets so this works with
Linux 'patch'.
@
text
@d3 3
a5 3
--- Makefile.tmpl.orig Fri May 14 16:36:50 2004
+++ Makefile.tmpl
@@@@ -56,6 +56,8 @@@@ INSTALL_DATA = $(INSTALL) $(IFLAGS_DA
d14 1
a14 1
@@@@ -280,11 +282,6 @@@@ install-mktree:
d26 1
a26 1
@@@@ -296,9 +293,9 @@@@ install-mktree:
d38 1
a38 1
@@@@ -343,34 +340,6 @@@@ install-programs:
d73 1
a73 1
@@@@ -420,9 +389,9 @@@@ install-support:
d85 1
a85 1
@@@@ -464,9 +433,9 @@@@ install-binsupport:
d97 1
a97 1
@@@@ -489,21 +458,25 @@@@ install-include:
d128 1
a128 1
@@@@ -511,23 +484,25 @@@@ install-data:
@
1.22.2.2
log
@fix patch botch-up so this matches the checksum. noted by pooka.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.23 2004/05/13 21:21:27 abs Exp $
d3 1
a3 1
--- Makefile.tmpl.orig 2004-05-13 22:18:11.000000000 +0100
@
1.21
log
@Make this use ${CHOWN}, ${CHMOD}, ${XARGS} and ${FIND}, rather than the
hard-coded commands, which may not be in the PATH depending on the operating
system. This partly addresses PR pkg/19804.
@
text
@d1 1
a1 1
$NetBSD: $
d3 2
a4 2
--- Makefile.tmpl.orig Mon Jan 20 17:12:39 2003
+++ Makefile.tmpl Mon Jan 20 17:15:27 2003
d26 1
a26 1
@@@@ -340,7 +337,7 @@@@
d33 2
a34 1
chgrp "$(conf_group)" $(root)$(proxycachedir); \
d36 2
@
1.20
log
@Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk. This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.18.2.1 2002/06/23 19:03:27 jlam Exp $
d3 2
a4 2
--- Makefile.tmpl.orig Fri Jun 21 02:02:43 2002
+++ Makefile.tmpl
d26 9
d70 25
a94 1
@@@@ -533,7 +502,7 @@@@
d103 1
a103 1
@@@@ -541,6 +510,8 @@@@
d105 6
a110 4
find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
+ find $(root)$(htdocsdir)/ -print | \
+ xargs chown ${BINOWN}:${BINGRP} ; \
d114 1
a114 1
@@@@ -548,6 +519,8 @@@@
d116 6
a121 4
find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
+ find $(root)$(manualdir)/ -print | \
+ xargs chown ${BINOWN}:${BINGRP} ; \
d140 1
a140 1
find $(root)$(iconsdir)/ -type d -exec chmod a+rx {} \; ;\
d142 3
a144 2
+ find $(root)$(iconsdir)/ -type f -exec chmod a+r {} \; ;\
+ chown -R ${BINOWN}:${BINGRP} $(root)$(iconsdir)/.
@
1.19
log
@- Add share/httpd/htdocs/index.html.lb.utf8 to PLIST.
- Prevent chown whole files under ${PREFIX}/share/httpd.
@
text
@d1 1
a1 1
$NetBSD$
@
1.18
log
@Update apache to 1.3.23 with the EAPI patch from mod_ssl-2.8.6-1.3.23.
The main new features in 1.3.23 (compared to 1.3.22) are:
* HTTP/1.1 support for mod_proxy.
* Other mod_proxy improvements.
* The new 'FileETag' directive to allow one to build the
format of the ETag via runtime directives.
* Addition of a 'filter callback' function to enable modules to
intercept the output byte stream for dynamic page caching.
The following bugs were found in Apache 1.3.22 and have been fixed in
Apache 1.3.23:
* Fix incorrect "Content-Length" header in the 416 response.
* Revert mod_negotation's handling of path_info and query_args
to the 1.3.20 behavior (PRs: 8628, 8582, 8538).
* Prevent an Apache module from being loaded or added twice due
to duplicate LoadModule or AddModule directives.
@
text
@d3 1
a3 1
--- Makefile.tmpl.orig Fri Feb 1 10:05:43 2002
d5 10
a14 1
@@@@ -324,11 +324,6 @@@@
d26 1
a26 1
@@@@ -387,34 +382,6 @@@@
d61 1
a61 1
@@@@ -533,7 +500,7 @@@@
d70 19
a88 1
@@@@ -555,9 +522,10 @@@@
d101 9
a109 1
@@@@ -571,7 +539,7 @@@@
@
1.18.2.1
log
@Merge from pkgsrc-current to buildlink2 branch.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.19 2002/06/20 17:12:37 taca Exp $
d3 1
a3 1
--- Makefile.tmpl.orig Fri Jun 21 02:02:43 2002
d5 1
a5 10
@@@@ -100,6 +100,8 @@@@
PERL = @@PERL@@
TAR = @@TAR@@
TAROPT = @@TAROPT@@
+BINOWN = @@BINOWN@@
+BINGRP = @@BINGRP@@
# installation name of Apache webserver
TARGET = @@TARGET@@
@@@@ -324,11 +326,6 @@@@
d17 1
a17 1
@@@@ -387,34 +384,6 @@@@
d52 1
a52 1
@@@@ -533,7 +502,7 @@@@
d61 1
a61 19
@@@@ -541,6 +510,8 @@@@
(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
+ find $(root)$(htdocsdir)/ -print | \
+ xargs chown ${BINOWN}:${BINGRP} ; \
fi
-@@if [ -d $(TOP)/htdocs/manual ]; then \
echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
@@@@ -548,6 +519,8 @@@@
(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
+ find $(root)$(manualdir)/ -print | \
+ xargs chown ${BINOWN}:${BINGRP} ; \
fi
-@@if [ -f $(root)$(cgidir)/printenv ]; then \
echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
@@@@ -555,23 +528,25 @@@@
d74 1
a74 9
(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
find $(root)$(iconsdir)/ -type d -exec chmod a+rx {} \; ;\
- find $(root)$(iconsdir)/ -type f -exec chmod a+r {} \;
+ find $(root)$(iconsdir)/ -type f -exec chmod a+r {} \; ;\
+ chown -R ${BINOWN}:${BINGRP} $(root)$(iconsdir)/.
@@echo "<=== [data]"
# create the initial configuration by providing default files
@
1.17
log
@Fix installation so that existing config files are preserved when building
from source instead of installing from a binary package (problem noted in
private email by George Coulouris . Also move the
ownership of SSL-related config directories to the www/ap-ssl package.
@
text
@d3 1
a3 1
--- Makefile.tmpl.orig Tue Jan 1 00:38:59 2002
d52 1
a52 1
@@@@ -531,7 +498,7 @@@@
d61 1
a61 1
@@@@ -553,9 +520,10 @@@@
d74 1
a74 1
@@@@ -569,7 +537,7 @@@@
@
1.16
log
@Fix installation when an old config file exists.
@
text
@d3 1
a3 1
--- Makefile.tmpl.orig Thu Nov 15 00:06:33 2001
d5 13
a17 1
@@@@ -387,34 +387,6 @@@@
d52 1
a52 1
@@@@ -531,7 +503,7 @@@@
d61 1
a61 8
@@@@ -547,15 +519,16 @@@@
find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
fi
- -@@if [ -f $(root)$(cgidir)/printenv ]; then \
+ -@@if false; then \
echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
else \
d74 1
a74 1
@@@@ -569,7 +542,7 @@@@
a82 63
@@@@ -622,7 +595,7 @@@@
> $(TOP)/$(SRC)/.apaci.install.tmp && \
echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \
$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \
- if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \
+ if true; then \
echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \
$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \
else \
@@@@ -632,7 +605,7 @@@@
-@@for conf in mime.types magic; do \
echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
- if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
+ if true; then \
echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
else \
@@@@ -650,7 +623,7 @@@@
chmod 700 $(root)$(sysconfdir)/ssl.key; \
echo "chmod 755 $(root)$(sysconfdir)/ssl.prm"; \
chmod 755 $(root)$(sysconfdir)/ssl.prm; \
- if [ ! -f "$(root)$(sysconfdir)/ssl.crt/README.CRT" ]; then \
+ if true; then \
echo "$(INSTALL_DATA) $(TOP)/conf/ssl.crt/README.CRT $(root)$(sysconfdir)/ssl.crt/README.CRT"; \
$(INSTALL) $(TOP)/conf/ssl.crt/README.CRT $(root)$(sysconfdir)/ssl.crt/README.CRT; \
echo "$(INSTALL_DATA) $(TOP)/conf/ssl.crt/Makefile $(root)$(sysconfdir)/ssl.crt/Makefile"; \
@@@@ -677,7 +650,7 @@@@
echo "Updating hash symlinks in $(root)$(sysconfdir)/ssl.crt/:"; \
SSL_PROGRAM="`grep '^SSL_PROGRAM=' $(TOP)/$(SRC)/Makefile.config | sed -e 's:^.*=::'`"; \
(cd $(root)$(sysconfdir)/ssl.crt/ && $(MAKE) $(MFLAGS) SSL_PROGRAM=$$SSL_PROGRAM); \
- if [ ! -f "$(root)$(sysconfdir)/ssl.csr/README.CSR" ]; then \
+ if true; then \
echo "$(INSTALL_DATA) $(TOP)/conf/ssl.csr/README.CSR $(root)$(sysconfdir)/ssl.csr/README.CSR"; \
$(INSTALL) $(TOP)/conf/ssl.csr/README.CSR $(root)$(sysconfdir)/ssl.csr/README.CSR; \
echo "$(INSTALL_DATA) -m 400 $(TOP)/conf/ssl.csr/server.csr $(root)$(sysconfdir)/ssl.csr/server.csr"; \
@@@@ -685,7 +658,7 @@@@
else \
echo "[PRESERVING EXISTING CSR FILES: $(root)$(sysconfdir)/ssl.csr/*]"; \
fi; \
- if [ ! -f "$(root)$(sysconfdir)/ssl.crl/README.CRL" ]; then \
+ if true; then \
echo "$(INSTALL_DATA) $(TOP)/conf/ssl.crl/README.CRL $(root)$(sysconfdir)/ssl.crl/README.CRL"; \
$(INSTALL) $(TOP)/conf/ssl.crl/README.CRL $(root)$(sysconfdir)/ssl.crl/README.CRL; \
echo "$(INSTALL_DATA) $(TOP)/conf/ssl.crl/Makefile $(root)$(sysconfdir)/ssl.crl/Makefile"; \
@@@@ -693,7 +666,7 @@@@
else \
echo "[PRESERVING EXISTING CRL FILES: $(root)$(sysconfdir)/ssl.crl/*]"; \
fi; \
- if [ ! -f "$(root)$(sysconfdir)/ssl.key/README.KEY" ]; then \
+ if true; then \
echo "$(INSTALL_DATA) $(TOP)/conf/ssl.key/README.KEY $(root)$(sysconfdir)/ssl.key/README.KEY"; \
$(INSTALL) $(TOP)/conf/ssl.key/README.KEY $(root)$(sysconfdir)/ssl.key/README.KEY; \
echo "$(INSTALL_DATA) -m 400 $(TOP)/conf/ssl.key/snakeoil-ca-rsa.key $(root)$(sysconfdir)/ssl.key/snakeoil-ca-rsa.key"; \
@@@@ -713,7 +686,7 @@@@
else \
echo "[PRESERVING EXISTING KEY FILES: $(root)$(sysconfdir)/ssl.key/*]"; \
fi; \
- if [ ! -f "$(root)$(sysconfdir)/ssl.prm/README.PRM" ]; then \
+ if true; then \
echo "$(INSTALL_DATA) $(TOP)/conf/ssl.prm/README.PRM $(root)$(sysconfdir)/ssl.prm/README.PRM"; \
$(INSTALL) $(TOP)/conf/ssl.prm/README.PRM $(root)$(sysconfdir)/ssl.prm/README.PRM; \
echo "$(INSTALL_DATA) -m 400 $(TOP)/conf/ssl.prm/snakeoil-ca-dsa.prm $(root)$(sysconfdir)/ssl.prm/snakeoil-ca-dsa.prm"; \
@
1.15
log
@Update apache to 1.3.22. Relevant changes from version 1.3.20 include
using the pkgsrc expat library instead of the builtin one (this is to
avoid conflicts between expat libraries when an expat XML parser is loaded
by either mod_perl or mod_php), and:
Security vulnerabilities
* A vulnerability was found in the split-logfile support program. A
request with a specially crafted Host: header could allow any file
with a .log extension on the system to be written to.
* A vulnerability was found when Multiviews are used to negotiate
the directory index. In some configurations, requesting a URI with
a QUERY_STRING of M=D could return a directory listing rather than
the expected index page.
General bug fixes and improvements
* Bug fixes
* The supplied icons are now also distributed in PNG format
* New directives have been added to the mod_usertrack module, The
first, CookieDomain, can be used to customise the Domain
attribute.
* A new directive, AcceptMutex, allows run-time configuration of the
mutex type used for accept serialization.
* mod_auth has been enhanced to allow access to a document to be
controlled based on the owner of the file being served.
* A new directive, AcceptFilter, has been added to control BSD
accept filters at run-time. The functionality can postpone the
requirement for a child process to handle a new connection until
an HTTP request has arrived, therefore increasing the number of
connections that a given number of child processes can handle
@
text
@d3 1
a3 1
--- Makefile.tmpl.orig Wed Oct 17 11:47:02 2001
d40 9
d78 63
@
1.14
log
@Update apache to 1.3.17. Important changes from version 1.3.14 include:
-) Remove patch to avoid dlclose()ing on NetBSD. The mod_perl vs. perl CGI
mis-interaction seems to be gone and I wasn't able to reproduce it on my
system.
*) Fix the declaration of the module structure in mod_example.
*) Fix the handling of variable expansion look-ahead in mod_rewrite,
i.e. syntax like %{LA-U:REMOTE_USER}, and also fix the parsing of
more complicated nested RewriteMap lookups.
*) mod_status now respects ?refresh=n of 1 or greater. If the given
refresh value is not a number, ?refresh is set to 1 second.
*) Accomodate an out-of-space condition in the piped logs and the
rotatelogs.c code, and no longer churn log processes for this condition.
*) Make cgi-bin work as a regular directory when using mod_vhost_alias
with no VirtualScriptAlias directives.
*) Move the check of the Expect request header field after the hook
for ap_post_read_request, since that is the only opportunity for
modules to handle Expect extensions.
*) Eliminate caching problems of mod_autoindex results, so the last
modified date of the directory is returned as the Last-Modified
and ETag HTTP header tags are sent if IndexOptions TrackModified
directive/option is used.
*) Correct an issue with Alias and ScriptAlias directives that
file path arguments were not normalized in canonical form.
This correction makes no attempt to normalize regular expression
forms of Alias or ScriptAlias.
*) Add a new LogFormat directive, %c, that will log connection
status at the end of the response.
*) Update the mime.types file to the registered media types as of 2000-10-19.
*) Restore functionality broken by the mod_rewrite security fix:
rewrite map lookup keys and default values are now expanded
so that the lookup can depend on the requested URI etc.
@
text
@d3 1
a3 1
--- Makefile.tmpl.orig Fri Feb 2 00:42:14 2001
d5 1
a5 1
@@@@ -385,34 +385,6 @@@@
d40 3
a42 3
@@@@ -538,15 +510,16 @@@@
find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
d46 1
a46 1
echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
d51 1
a51 1
+ -e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \
d60 1
a60 1
@@@@ -560,7 +533,7 @@@@
@
1.13
log
@Install cgi-bin scripts with executable bit set.
@
text
@d3 3
a5 3
--- Makefile.tmpl.orig Sun Jan 14 00:43:01 2001
+++ Makefile.tmpl Sun Jan 14 00:48:35 2001
@@@@ -382,34 +382,6 @@@@
d40 1
a40 1
@@@@ -535,15 +507,16 @@@@
d60 1
a60 1
@@@@ -557,7 +530,7 @@@@
@
1.12
log
@Update build to work with mod_ssl-2.6.6-1.3.12 to keep in sync with ap-ssl.
EAPI didn't change so no need to change Apache's version number.
Also standardize package builds to have Apache listen on ports 80/443
regardless of UID of user that builds the package, and make MAINTAINER
point to me.
@
text
@d3 2
a4 2
--- Makefile.tmpl.orig Thu Sep 7 01:19:50 2000
+++ Makefile.tmpl
d40 1
a40 1
@@@@ -535,12 +507,13 @@@@
d53 7
a59 2
echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
@
1.11
log
@Update Apache package to version 1.3.9 (SSL Module 2.4.8) using patches
suppled by SUNAGAWA Keiki in PR pkg/8819. This version mostly fixes
bugs discovered since version 1.3.6.
@
text
@d3 3
a5 3
--- Makefile.tmpl.orig Mon Sep 27 18:03:16 1999
+++ Makefile.tmpl Mon Sep 27 18:03:18 1999
@@@@ -371,34 +371,6 @@@@
d40 1
a40 1
@@@@ -524,12 +496,13 @@@@
d55 1
a55 1
@@@@ -546,7 +519,7 @@@@
@
1.10
log
@Do this the right way; it wasn't installing the shared modules after the
last fix.
@
text
@d3 3
a5 12
--- Makefile.tmpl.orig Fri May 7 09:49:05 1999
+++ Makefile.tmpl Fri May 7 09:52:16 1999
@@@@ -114,7 +114,7 @@@@
datadir = @@datadir@@
iconsdir = $(datadir)/icons
htdocsdir = $(datadir)/htdocs
-cgidir = $(datadir)/cgi-bin
+cgidir = $(prefix)/libexec/cgi-bin
includedir = @@includedir@@
localstatedir = @@localstatedir@@
runtimedir = @@runtimedir@@
@@@@ -344,34 +344,6 @@@@
d40 1
a40 1
@@@@ -453,12 +425,13 @@@@
d55 1
a55 1
@@@@ -475,7 +448,7 @@@@
@
1.9
log
@The "Module list reconstruction" section inserted into httpd.conf-dist
is extremely confusing to new users, and isn't necessary for proper
Apache operation. Make Makefile.tmpl skip the code which does this.
@
text
@d3 2
a4 2
--- Makefile.tmpl.orig Sun May 2 17:09:00 1999
+++ Makefile.tmpl Sun May 2 17:12:32 1999
d14 33
a46 1
@@@@ -338,7 +338,7 @@@@
d48 2
a49 8
$(INSTALL_DATA) $(TOP)/$(SRC)/support/httpd.8 $(root)$(mandir)/man8/$(TARGET).8
-@@$(RM) $(SRC)/.apaci.install.conf; touch $(SRC)/.apaci.install.conf
- -@@if [ ".`grep '^[ ]*SharedModule' $(TOP)/$(SRC)/Configuration.apaci`" != . ]; then \
+ -@@if false; then \
for mod in `egrep '^[ ]*SharedModule' $(TOP)/$(SRC)/Configuration.apaci |\
sed -e 's/^[ ]*SharedModule[ ]*//'`; do \
file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
@@@@ -453,12 +453,13 @@@@
d64 1
a64 1
@@@@ -475,7 +476,7 @@@@
@
1.8
log
@Update Apache to 1.3.6, mod_ssl to 2.2.8, and mod_perl to 1.19. mod_ssl
now makes use of OpenSSL.
@
text
@d3 2
a4 2
--- Makefile.tmpl.orig Mon Apr 26 16:03:46 1999
+++ Makefile.tmpl Mon Apr 26 16:29:40 1999
d14 9
@
1.7
log
@Bump version to `1.3.3.2' - add `timefmt' argument to
ap_include_extern_func's (needed for a couple upcoming XSSI-extending
modules). Also fix apxs to use `install' and fix the cgi-bin
`preservation' while we're here.
@
text
@d3 14
a16 22
--- Makefile.tmpl.orig Fri Dec 4 11:41:42 1998
+++ Makefile.tmpl Fri Dec 4 11:47:53 1998
@@@@ -275,7 +275,7 @@@@
$(MKDIR) $(root)$(sysconfdir)/ssl.key
$(MKDIR) $(root)$(datadir)/htdocs
$(MKDIR) $(root)$(datadir)/icons
- $(MKDIR) $(root)$(datadir)/cgi-bin
+ $(MKDIR) $(root)$(prefix)/libexec/cgi-bin
$(MKDIR) $(root)$(includedir)
$(MKDIR) $(root)$(runtimedir)
$(MKDIR) $(root)$(logfiledir)
@@@@ -352,6 +352,7 @@@@
@@echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/apachectl"; \
sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/httpd.pid;' \
-e 's;HTTPD=.*;HTTPD=$(sbindir)/httpd;' \
+ -e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \
< $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \
$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/apachectl
$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.1 $(root)$(mandir)/man1/apachectl.1
@@@@ -413,17 +414,13 @@@@
find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \
find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
d18 4
a21 3
- -@@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
- else \
d25 13
a37 20
> $(TOP)/$(SRC)/.apaci.install.tmp; \
- echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin/$${script}"; \
- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \
- done; \
- fi
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(prefix)/libexec/cgi-bin/$${script}"; \
+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(prefix)/libexec/cgi-bin/$${script}; \
+ done;
@@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
(cd $(TOP)/icons/ && $(TAR) cf - *) |\
(cd $(root)$(datadir)/icons/ && $(TAR) xf -); \
@@@@ -450,7 +447,7 @@@@
-e 's;@@@@ServerRoot@@@@/conf/ssl.key;$(sysconfdir)/ssl.key;' \
-e 's;@@@@ServerRoot@@@@/htdocs;$(datadir)/htdocs;' \
-e 's;@@@@ServerRoot@@@@/icons;$(datadir)/icons;' \
- -e 's;@@@@ServerRoot@@@@/cgi-bin;$(datadir)/cgi-bin;' \
+ -e 's;@@@@ServerRoot@@@@/cgi-bin;$(prefix)/libexec/cgi-bin;' \
-e 's;@@@@ServerRoot@@@@/proxy;$(proxycachedir);' \
-e 's;@@@@ServerRoot@@@@;$(prefix);' \
-e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
@
1.6
log
@Update Apache and mod_ssl using new build layout (see post to tech-pkg for
details). No security fixes in Apache 1.3.3, so immediate upgrade from
1.3.2 is not necessary.
@
text
@d3 2
a4 2
--- Makefile.tmpl.orig Thu Dec 3 07:42:35 1998
+++ Makefile.tmpl Thu Dec 3 08:22:10 1998
d22 1
a22 1
@@@@ -413,15 +414,15 @@@@
d28 1
a28 3
+ -@@if [ -f $(root)$(prefix)/libexec/cgi-bin/printenv ]; then \
+ echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(prefix)/libexec/cgi-bin/]"; \
else \
d35 2
d39 1
a39 2
done; \
fi
d41 3
a43 1
@@@@ -450,7 +451,7 @@@@
@
1.5
log
@Update Apaches to 1.3.2.
apache-modssl: update mod_ssl to 2.0.12, and rename pkg to
"apache-1.3.2-modssl-2.0.12" such that mod_ssl version changes are noted.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.4 1998/08/07 11:14:22 agc Exp $
d3 48
a50 14
*** Makefile.tmpl~ Tue May 12 04:52:11 1998
--- Makefile.tmpl Tue Jul 21 14:50:58 1998
***************
*** 324,329 ****
--- 324,332 ----
@@osdir=`grep '^OSDIR=' $(TOP)/$(SRC)/Makefile.config | sed -e 's:^OSDIR=.*/os:os:'`; \
echo "$(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(includedir)/"; \
$(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(root)$(includedir)/
+ # The above umask won't work if the original files were extracted with umask 077.
+ echo 'chmod 444 $(root)$(includedir)/*'
+ chmod 444 $(root)$(includedir)/*
@@echo "<=== [include]"
# create an initial document root containing the Apache manual,
@
1.4
log
@Add NetBSD RCS Ids.
@
text
@d1 1
a1 1
$NetBSD$
@
1.3
log
@Set the permissions of http/include/* directly, to fix a bug where if
the distribution is extrated with umask 077 (so that src/include/* are
not world readable) they never get those permissions turned on when
installed.
@
text
@d1 2
@
1.2
log
@Update to 1.3b7 and rework the Makefile:
- Now uses APACI, Apache's GNU-autoconf-style (but not GNU autoconf)
configuration system to configure, build, and install
- Enables build and install of all `support' tools
- Enables use of shared modules, and compiles mod_include dynamically
- Installs the Apache user manual by default.
@
text
@d1 14
a14 80
--- Configuration.orig Wed Nov 19 16:49:57 1997
+++ Configuration Wed Feb 18 15:55:51 1998
@@@@ -43,11 +43,11 @@@@
#
EXTRA_CFLAGS=
EXTRA_LDFLAGS=
-EXTRA_LIBS=
+EXTRA_LIBS= -lcrypt
EXTRA_INCLUDES=
#CC=
-#OPTIM=-O2
+OPTIM=-O2
#RANLIB=
################################################################
@@@@ -181,12 +181,12 @@@@
## STATUS=yes (see the Rules section near the start of this file) to allow
## full status information. Check conf/access.conf on how to enable this.
-# AddModule modules/standard/mod_status.o
+AddModule modules/standard/mod_status.o
## The Info module displays configuration information for the server and
## all included modules. It's very useful for debugging.
-# AddModule modules/standard/mod_info.o
+AddModule modules/standard/mod_info.o
## mod_include translates server-side include (SSI) statements in text files.
## mod_autoindex handles requests for directories which have no index file
@@@@ -230,7 +230,7 @@@@
## NOTE: You do not want this module UNLESS you are running a proxy;
## it is not needed for normal (origin server) operation.
-# AddModule modules/proxy/libproxy.a
+AddModule modules/proxy/libproxy.a
## The Alias module provides simple URL translation and redirection.
@@@@ -240,7 +240,7 @@@@
## URI-to-filename mapping using a regular expression based
## rule-controlled rewriting engine.
-# AddModule modules/standard/mod_rewrite.o
+AddModule modules/standard/mod_rewrite.o
##
## Access control and authentication modules.
@@@@ -264,7 +264,7 @@@@
## "digest" implements HTTP Digest Authentication rather than the less
## secure Basic Auth used by the other modules.
-# AddModule modules/standard/mod_digest.o
+AddModule modules/standard/mod_digest.o
## Optional response header manipulation modules.
##
@@@@ -276,12 +276,12 @@@@
## The expires module can apply Expires: headers to resources,
## as a function of access time or modification time.
-# AddModule modules/standard/mod_expires.o
+AddModule modules/standard/mod_expires.o
## The headers module can set arbitrary HTTP response headers,
## as configured in server, vhost, access.conf or .htaccess configs
-# AddModule modules/standard/mod_headers.o
+AddModule modules/standard/mod_headers.o
## Miscellaneous modules
##
@@@@ -313,3 +313,6 @@@@
## systems, hence it is not included by default.
# AddModule modules/standard/mod_unique_id.o
+
+## PHP3
+#AddModule modules/extra/mod_php3.o
@
1.1
log
@Initial version of apache web server package: 1.3b3.
@
text
@@