On Tue, Apr 21, 2015 at 08:57:28PM +0100, Stuart Henderson wrote:
> On 2015/04/21 21:34, Stefan Sperling wrote:
> > On Sun, Apr 19, 2015 at 08:34:47PM +0100, Stuart Henderson wrote:
> > > On 2015/04/19 19:59, Stefan Sperling wrote:
> > > > On Wed, Apr 15, 2015 at 04:53:59PM +0200, Stefan Sperling wrote:
> > > > > - Renaming the binaries made sense when Apache 1 was in the base
> > > > > system.
> > > > > Nowadays it's unnecessary. People would usually start Apache 2 via
> > > > > the
> > > > > rc script which be smart about launching the correct 'httpd'
> > > > > binary.
> > > >
> > > > I went ahead and included the above change: Stop renaming the binaries
> > > > and man pages. This creates a small overlap with the base system (httpd,
> > > > htpasswd) but I hope that's fine since the files live in /usr/local.
> > >
> > > Much though I would love to get rid of the nightmare manpage patches,
> > > the issue here is that it will conflict with www/apache-httpd-openbsd,
> > > and until we can get rid of apache-httpd-openbsd they both need to be
> > > freely installable during a bulk build so that dependent ports (modules)
> > > can be built.
> >
> > How about... we just remove apache-httpd-openbsd?
>
> That is a medium-term goal, but there's a bit of work to do first.
I've also received off-list objections to removing apache-httpd-openbsd.
Here's a new diff which updates apache-httpd to 2.4 without conflicting
with apache-httpd-openbsd.
So far, I've tested packaging of all dependent ports except for lang/php/
Works except for the following ap2- modules which stop building:
ap2-mod_fastcgi
ap2-mod_fcgid
Haven't investigated why yet. Perhaps these just need a version upgrade?
Further help / testing is welcome.
Note for claudio: The --enable-nonportable-atomics option is passed on
to APR configure so it has no effect here and I've removed it.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile 16 Feb 2015 22:57:13 -0000 1.56
+++ Makefile 11 May 2015 17:04:24 -0000
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.56 2015/02/16 22:57:13 naddy Exp $
+# $OpenBSD: Makefile,v 1.54 2014/11/04 21:46:55 sthen Exp $
COMMENT= apache HTTP server
-V= 2.2.29
-REVISION= 3
+V= 2.4.12
PKGNAME= apache-httpd-${V}
DISTNAME= httpd-${V}
@@ -15,11 +14,15 @@ HOMEPAGE= http://httpd.apache.org/
PERMIT_PACKAGE_CDROM= Yes
SHARED_ONLY= Yes
+USE_GROFF = Yes
NO_TEST= Yes
-WANTLIB += c crypto m ssl expat apr-1 db>=4 z pcre pthread aprutil-1>=2
+WANTLIB += c crypto m ssl expat apr-1 db>=4 z lzma pcre pthread aprutil-1>=2 \
+ xml2
-LIB_DEPENDS= devel/pcre
+LIB_DEPENDS= archivers/xz \
+ devel/pcre \
+ textproc/libxml
FLAVORS= ldap
FLAVOR?=
@@ -50,12 +53,13 @@ CONFIGURE_ARGS+= --enable-layout=OpenBSD
--with-apr=${LOCALBASE}/bin/apr-1-config \
--with-apr-util=${LOCALBASE}/bin/apu-1-config \
--enable-ssl --with-ssl=/usr \
- --with-mpm=prefork \
+ --enable-mpms-shared=all \
+ --with-mpm=worker \
--with-program-name=httpd2 \
--enable-modules=all \
--enable-cache \
--enable-disk-cache \
- --enable-proxy \
+ --enable-proxy=shared \
--enable-mods-shared=all \
--enable-suexec \
--with-suexec-caller=_apache2 \
@@ -71,10 +75,10 @@ FAKE_FLAGS+= rel_user=_apache2 rel_grou
datadir=${PREFIX}/share/examples/apache2 \
sysconfdir=${PREFIX}/share/examples/apache2/conf
-A2SBIN= apachectl apxs dbmmanage htdigest htpasswd \
- logresolve rotatelogs suexec
-A2MAN1= dbmmanage htdigest htpasswd
-A2MAN8= apachectl apxs httpd logresolve rotatelogs
suexec
+A2BIN= apxs logresolve dbmmanage htdigest htpasswd
+A2SBIN= apachectl rotatelogs suexec
+A2MAN1= dbmmanage apxs htdigest htpasswd logresolve
+A2MAN8= apachectl httpd rotatelogs suexec
pre-configure:
@perl -pi -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/config.layout
@@ -85,6 +89,7 @@ pre-configure:
post-install:
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share
chown -R ${MANOWN}:${MANGRP} ${PREFIX}/man
+ chown -R ${BINOWN}:${BINGRP} ${PREFIX}/bin
chown -R ${BINOWN}:${BINGRP} ${PREFIX}/sbin
chown -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib
@@ -95,6 +100,11 @@ post-install:
.for i in ${A2MAN8}
mv ${PREFIX}/man/man8/${i}.8 ${PREFIX}/man/man8/${i}2.8
.endfor
+
+.for i in ${A2BIN}
+ mv ${PREFIX}/bin/${i} ${PREFIX}/bin/${i}2
+.endfor
+ mv ${PREFIX}/bin/apxs2 ${PREFIX}/sbin # other ports expect it in sbin/
.for i in ${A2SBIN}
mv ${PREFIX}/sbin/${i} ${PREFIX}/sbin/${i}2
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/apache-httpd/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 9 Sep 2014 10:08:23 -0000 1.17
+++ distinfo 8 May 2015 10:39:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (httpd-2.2.29.tar.gz) = zsKHiIS3WLDRWaE4WyZnoq4MohsLx7zIqaQbXPpUUv8=
-SIZE (httpd-2.2.29.tar.gz) = 7537230
+SHA256 (httpd-2.4.12.tar.gz) = 7h5pAUhf6rc4Q3Hb3ZHED8sbXj91WDuw04e5DYxBdsg=
+SIZE (httpd-2.4.12.tar.gz) = 6853506
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile_in
--- patches/patch-Makefile_in 2 Sep 2008 22:05:23 -0000 1.5
+++ patches/patch-Makefile_in 8 May 2015 10:39:32 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.5 2008/09/02 22:05:23 bernd Exp $
---- Makefile.in.orig Thu Jul 24 12:22:37 2008
-+++ Makefile.in Thu Jul 24 12:24:01 2008
-@@ -48,6 +48,8 @@ install-conf:
+--- Makefile.in.orig Mon Dec 17 12:50:41 2012
++++ Makefile.in Sat Jan 10 14:31:17 2015
+@@ -49,6 +49,8 @@ install-conf:
sed -e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
-e 's#@@SSLPort@@#$(SSLPORT)#g' \
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2008/0
-e '/@@LoadModule@@/d' \
< $$i; \
else \
-@@ -55,6 +57,8 @@ install-conf:
+@@ -56,6 +58,8 @@ install-conf:
-e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
-e 's#@@SSLPort@@#$(SSLPORT)#g' \
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2008/0
-e 'p' \
< $$i; \
for j in $(DSO_MODULES) "^EOL^"; do \
-@@ -67,6 +71,8 @@ install-conf:
+@@ -76,6 +80,8 @@ install-conf:
-e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
-e 's#@@SSLPort@@#$(SSLPORT)#g' \
Index: patches/patch-config_layout
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-config_layout,v
retrieving revision 1.5
diff -u -p -r1.5 patch-config_layout
--- patches/patch-config_layout 9 Jan 2007 10:47:37 -0000 1.5
+++ patches/patch-config_layout 8 May 2015 10:39:32 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-config_layout,v 1.5 2007/01/09 10:47:37 dlg Exp $
---- config.layout.orig Tue Jan 9 06:59:42 2007
-+++ config.layout Tue Jan 9 07:00:28 2007
-@@ -252,26 +252,26 @@
+--- config.layout.orig Tue Apr 17 16:01:41 2012
++++ config.layout Sat Jan 10 14:31:17 2015
+@@ -228,26 +228,26 @@
# OpenBSD Layout
<Layout OpenBSD>
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-configure,v
retrieving revision 1.10
diff -u -p -r1.10 patch-configure
--- patches/patch-configure 18 Oct 2012 08:12:17 -0000 1.10
+++ patches/patch-configure 8 May 2015 10:39:32 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.10 2012/10/18 08:12:17 giovanni Exp $
---- configure.orig Tue Aug 21 20:39:21 2012
-+++ configure Thu Sep 20 09:59:57 2012
-@@ -3113,7 +3113,7 @@ do
+--- configure.orig Tue Jul 15 19:15:03 2014
++++ configure Sat Jan 10 14:33:24 2015
+@@ -3397,7 +3397,7 @@ do
ap_last="${ap_cur}"
ap_cur=`eval "echo ${ap_cur}"`
done
@@ -10,21 +10,12 @@ $OpenBSD: patch-configure,v 1.10 2012/10
APACHE_VAR_SUBST="$APACHE_VAR_SUBST exp_sysconfdir"
-@@ -4093,7 +4093,7 @@ SHLIBPATH_VAR=`$apr_config --shlib-path-var`
- APR_BINDIR=`$apr_config --bindir`
- APR_INCLUDEDIR=`$apr_config --includedir`
+@@ -4603,7 +4603,7 @@ APR_INCLUDEDIR=`$apr_config --includedir`
+ APR_INCLUDES=`$apr_config --includes`
APR_VERSION=`$apr_config --version`
--APR_CONFIG="$APR_BINDIR/apr-`echo ${APR_VERSION} | sed 's,\..*,,'`-config"
+ apr_major_version=`echo ${APR_VERSION} | sed 's,\..*,,'`
+-APR_CONFIG="$APR_BINDIR/apr-${apr_major_version}-config"
+APR_CONFIG="$apr_config"
- echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
-
-@@ -4400,7 +4400,7 @@ fi
- APU_BINDIR=`$apu_config --bindir`
- APU_INCLUDEDIR=`$apu_config --includedir`
- APU_VERSION=`$apu_config --version`
--APU_CONFIG="$APU_BINDIR/apu-`echo ${APU_VERSION} | sed 's,\..*,,'`-config"
-+APU_CONFIG="$apu_config"
-
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
+ { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+ $as_echo "$as_me: " >&6;}
Index: patches/patch-docs_conf_httpd_conf_in
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-docs_conf_httpd_conf_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-docs_conf_httpd_conf_in
--- patches/patch-docs_conf_httpd_conf_in 18 Oct 2012 08:12:17 -0000
1.3
+++ patches/patch-docs_conf_httpd_conf_in 8 May 2015 10:39:32 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-docs_conf_httpd_conf_in,v 1.3 2012/10/18 08:12:17 giovanni Exp
$
---- docs/conf/httpd.conf.in.orig Mon Feb 6 17:54:24 2012
-+++ docs/conf/httpd.conf.in Thu Sep 20 09:59:57 2012
-@@ -64,8 +64,8 @@ Listen @@Port@@
+--- docs/conf/httpd.conf.in.orig Thu Nov 8 04:05:38 2012
++++ docs/conf/httpd.conf.in Sat Jan 10 15:10:12 2015
+@@ -74,8 +74,8 @@ Listen @@Port@@
# It is usually good practice to create a dedicated user and group for
# running httpd, as with most system services.
#
@@ -11,4 +11,4 @@ $OpenBSD: patch-docs_conf_httpd_conf_in,
+Group @@Group@@
</IfModule>
- </IfModule>
+
Index: patches/patch-docs_man_apachectl_8
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-docs_man_apachectl_8,v
retrieving revision 1.2
diff -u -p -r1.2 patch-docs_man_apachectl_8
--- patches/patch-docs_man_apachectl_8 25 Mar 2007 17:40:55 -0000 1.2
+++ patches/patch-docs_man_apachectl_8 8 May 2015 10:39:32 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-docs_man_apachectl_8,v 1.2 2007/03/25 17:40:55 deanna Exp $
---- docs/man/apachectl.8.orig Tue Sep 20 10:54:17 2005
-+++ docs/man/apachectl.8 Sun Mar 25 13:21:03 2007
+--- docs/man/apachectl.8.orig Fri Aug 26 18:14:46 2005
++++ docs/man/apachectl.8 Sat Jan 10 15:13:37 2015
@@ -19,56 +19,56 @@
.el .ne 3
.IP "\\$1" \\$2
..
--.TH "APACHECTL" 8 "2005-09-20" "Apache HTTP Server" "apachectl"
-+.TH "APACHECTL2" 8 "2005-09-20" "Apache HTTP Server" "apachectl2"
+-.TH "APACHECTL" 8 "2005-08-26" "Apache HTTP Server" "apachectl"
++.TH "APACHECTL2" 8 "2005-08-26" "Apache HTTP Server" "apachectl2"
.SH NAME
-apachectl \- Apache HTTP Server Control Interface
@@ -20,7 +20,7 @@ $OpenBSD: patch-docs_man_apachectl_8,v 1
.PP
-\fBapachectl\fR [ \fIhttpd-argument\fR ]
-+\fBapachectl2\fR [ \fIhttpd2-argument\fR ]
++\fBapachectl2\fR [ \fIhttpd-argument\fR ]
.PP
-When acting in SysV init mode, apachectl takes simple, one-word commands,
defined below\&.
Index: patches/patch-docs_man_apxs_1
===================================================================
RCS file: patches/patch-docs_man_apxs_1
diff -N patches/patch-docs_man_apxs_1
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-docs_man_apxs_1 8 May 2015 10:39:32 -0000
@@ -0,0 +1,192 @@
+$OpenBSD$
+--- docs/man/apxs.1.orig Thu Jun 20 14:31:24 2013
++++ docs/man/apxs.1 Sat Jan 10 15:28:14 2015
+@@ -19,36 +19,36 @@
+ .el .ne 3
+ .IP "\\$1" \\$2
+ ..
+-.TH "APXS" 1 "2013-06-20" "Apache HTTP Server" "apxs"
++.TH "APXS2" 1 "2013-06-20" "Apache HTTP Server" "apxs2"
+
+ .SH NAME
+-apxs \- APache eXtenSion tool
++apxs2 \- APache eXtenSion tool
+
+ .SH "SYNOPSIS"
+
+ .PP
+-\fBapxs\fR -\fBg\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] -\fBn\fR \fImodname\fR
++\fBapxs2\fR -\fBg\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] -\fBn\fR
\fImodname\fR
+
+ .PP
+-\fBapxs\fR -\fBq\fR [ -\fBv\fR ] [ -\fBS\fR \fIname\fR=\fIvalue\fR ]
\fIquery\fR \&.\&.\&.
++\fBapxs2\fR -\fBq\fR [ -\fBv\fR ] [ -\fBS\fR \fIname\fR=\fIvalue\fR ]
\fIquery\fR \&.\&.\&.
+
+ .PP
+-\fBapxs\fR -\fBc\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] [ -\fBo\fR
\fIdsofile\fR ] [ -\fBI\fR \fIincdir\fR ] [ -\fBD\fR \fIname\fR=\fIvalue\fR ] [
-\fBL\fR \fIlibdir\fR ] [ -\fBl\fR \fIlibname\fR ] [
-\fBWc,\fR\fIcompiler-flags\fR ] [ -\fBWl,\fR\fIlinker-flags\fR ] \fIfiles\fR
\&.\&.\&.
++\fBapxs2\fR -\fBc\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] [ -\fBo\fR
\fIdsofile\fR ] [ -\fBI\fR \fIincdir\fR ] [ -\fBD\fR \fIname\fR=\fIvalue\fR ] [
-\fBL\fR \fIlibdir\fR ] [ -\fBl\fR \fIlibname\fR ] [
-\fBWc,\fR\fIcompiler-flags\fR ] [ -\fBWl,\fR\fIlinker-flags\fR ] \fIfiles\fR
\&.\&.\&.
+
+ .PP
+-\fBapxs\fR -\fBi\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] [ -\fBn\fR
\fImodname\fR ] [ -\fBa\fR ] [ -\fBA\fR ] \fIdso-file\fR \&.\&.\&.
++\fBapxs2\fR -\fBi\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] [ -\fBn\fR
\fImodname\fR ] [ -\fBa\fR ] [ -\fBA\fR ] \fIdso-file\fR \&.\&.\&.
+
+ .PP
+-\fBapxs\fR -\fBe\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] [ -\fBn\fR
\fImodname\fR ] [ -\fBa\fR ] [ -\fBA\fR ] \fIdso-file\fR \&.\&.\&.
++\fBapxs2\fR -\fBe\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] [ -\fBn\fR
\fImodname\fR ] [ -\fBa\fR ] [ -\fBA\fR ] \fIdso-file\fR \&.\&.\&.
+
+
+ .SH "SUMMARY"
+
+ .PP
+-apxs is a tool for building and installing extension modules for the Apache
HyperText Transfer Protocol (HTTP) server\&. This is achieved by building a
dynamic shared object (DSO) from one or more source or object \fIfiles\fR which
then can be loaded into the Apache server under runtime via the LoadModule
directive from mod_so\&.
++apxs2 is a tool for building and installing extension modules for the Apache
HyperText Transfer Protocol (HTTP) server\&. This is achieved by building a
dynamic shared object (DSO) from one or more source or object \fIfiles\fR which
then can be loaded into the Apache server under runtime via the LoadModule
directive from mod_so\&.
+
+ .PP
+-So to use this extension mechanism your platform has to support the DSO
feature and your Apache httpd binary has to be built with the mod_so module\&.
The apxs tool automatically complains if this is not the case\&. You can check
this yourself by manually running the command
++So to use this extension mechanism your platform has to support the DSO
feature and your Apache httpd binary has to be built with the mod_so module\&.
The apxs2 tool automatically complains if this is not the case\&. You can check
this yourself by manually running the command
+
+ .nf
+
+@@ -57,26 +57,26 @@ So to use this extension mechanism your platform has t
+ .fi
+
+ .PP
+-The module mod_so should be part of the displayed list\&. If these
requirements are fulfilled you can easily extend your Apache server's
functionality by installing your own modules with the DSO mechanism by the help
of this apxs tool:
++The module mod_so should be part of the displayed list\&. If these
requirements are fulfilled you can easily extend your Apache server's
functionality by installing your own modules with the DSO mechanism by the help
of this apxs2 tool:
+
+ .nf
+
+- $ apxs -i -a -c mod_foo\&.c
++ $ apxs2 -i -a -c mod_foo\&.c
+ gcc -fpic -DSHARED_MODULE -I/path/to/apache/include -c mod_foo\&.c
+ ld -Bshareable -o mod_foo\&.so mod_foo\&.o
+ cp mod_foo\&.so /path/to/apache/modules/mod_foo\&.so
+ chmod 755 /path/to/apache/modules/mod_foo\&.so
+ [activating module `foo' in /path/to/apache/etc/httpd\&.conf]
+- $ apachectl restart
+- /path/to/apache/sbin/apachectl restart: httpd not running, trying to
start
++ $ apachectl2 restart
++ /path/to/apache/sbin/apachectl2 restart: httpd2 not running, trying to
start
+ [Tue Mar 31 11:27:55 1998] [debug] mod_so\&.c(303): loaded module
foo_module
+- /path/to/apache/sbin/apachectl restart: httpd started
++ /path/to/apache/sbin/apachectl2 restart: httpd2 started
+ $ _
+
+ .fi
+
+ .PP
+-The arguments \fIfiles\fR can be any C source file (\&.c), a object file
(\&.o) or even a library archive (\&.a)\&. The apxs tool automatically
recognizes these extensions and automatically used the C source files for
compilation while just using the object and archive files for the linking
phase\&. But when using such pre-compiled objects make sure they are compiled
for position independent code (PIC) to be able to use them for a dynamically
loaded shared object\&. For instance with GCC you always just have to use
-fpic\&. For other C compilers consult its manual page or at watch for the
flags apxs uses to compile the object files\&.
++The arguments \fIfiles\fR can be any C source file (\&.c), a object file
(\&.o) or even a library archive (\&.a)\&. The apxs2 tool automatically
recognizes these extensions and automatically used the C source files for
compilation while just using the object and archive files for the linking
phase\&. But when using such pre-compiled objects make sure they are compiled
for position independent code (PIC) to be able to use them for a dynamically
loaded shared object\&. For instance with GCC you always just have to use
-fpic\&. For other C compilers consult its manual page or at watch for the
flags apxs2 uses to compile the object files\&.
+
+ .PP
+ For more details about DSO support in Apache read the documentation of mod_so
or perhaps even read the src/modules/standard/mod_so\&.c source file\&.
+@@ -89,28 +89,28 @@ For more details about DSO support in Apache read the
+
+ .TP
+ -n \fImodname\fR
+-This explicitly sets the module name for the -i (install) and -g (template
generation) option\&. Use this to explicitly specify the module name\&. For
option -g this is required, for option -i the apxs tool tries to determine the
name from the source or (as a fallback) at least by guessing it from the
filename\&.
++This explicitly sets the module name for the -i (install) and -g (template
generation) option\&. Use this to explicitly specify the module name\&. For
option -g this is required, for option -i the apxs2 tool tries to determine the
name from the source or (as a fallback) at least by guessing it from the
filename\&.
+
+ .SS "Query Options"
+
+
+ .TP
+ -q
+-Performs a query for variables and environment settings used to build
httpd\&. When invoked without \fIquery\fR parameters, it prints all known
variables and their values\&. The optional -v parameter formats the list
output\&. .PP Use this to manually determine settings used to build the httpd
that will load your module\&. For instance use INC=-I`apxs -q INCLUDEDIR` .PP
inside your own Makefiles if you need manual access to Apache's C header
files\&.
++Performs a query for variables and environment settings used to build
httpd\&. When invoked without \fIquery\fR parameters, it prints all known
variables and their values\&. The optional -v parameter formats the list
output\&. .PP Use this to manually determine settings used to build the httpd
that will load your module\&. For instance use INC=-I`apxs2 -q INCLUDEDIR` .PP
inside your own Makefiles if you need manual access to Apache's C header
files\&.
+
+ .SS "Configuration Options"
+
+
+ .TP
+ -S \fIname\fR=\fIvalue\fR
+-This option changes the apxs settings described above\&.
++This option changes the apxs2 settings described above\&.
+
+ .SS "Template Generation Options"
+
+
+ .TP
+ -g
+-This generates a subdirectory \fIname\fR (see option -n) and there two files:
A sample module source file named mod_\fIname\fR\&.c which can be used as a
template for creating your own modules or as a quick start for playing with the
apxs mechanism\&. And a corresponding Makefile for even easier build and
installing of this module\&.
++This generates a subdirectory \fIname\fR (see option -n) and there two files:
A sample module source file named mod_\fIname\fR\&.c which can be used as a
template for creating your own modules or as a quick start for playing with the
apxs2 mechanism\&. And a corresponding Makefile for even easier build and
installing of this module\&.
+
+ .SS "DSO Compilation Options"
+
+@@ -141,7 +141,7 @@ This option passes \fIcompiler-flags\fR as additional
+ This option passes \fIlinker-flags\fR as additional flags to the libtool
--mode=link command\&. Use this to add local linker-specific options\&.
+ .TP
+ -p
+-This option causes apxs to link against the apr/apr-util libraries\&. This is
useful when compiling helper programs that use the apr/apr-util libraries\&.
++This option causes apxs2 to link against the apr/apr-util libraries\&. This
is useful when compiling helper programs that use the apr/apr-util libraries\&.
+
+ .SS "DSO Installation and Configuration Options"
+
+@@ -166,7 +166,7 @@ Assume you have an Apache module named mod_foo\&.c ava
+
+ .nf
+
+- $ apxs -c mod_foo\&.c
++ $ apxs2 -c mod_foo\&.c
+ /path/to/libtool --mode=compile gcc \&.\&.\&. -c mod_foo\&.c
+ /path/to/libtool --mode=link gcc \&.\&.\&. -o mod_foo\&.la mod_foo\&.slo
+ $ _
+@@ -174,11 +174,11 @@ Assume you have an Apache module named mod_foo\&.c ava
+ .fi
+
+ .PP
+-Then you have to update the Apache configuration by making sure a LoadModule
directive is present to load this shared object\&. To simplify this step apxs
provides an automatic way to install the shared object in its "modules"
directory and updating the httpd\&.conf file accordingly\&. This can be
achieved by running:
++Then you have to update the Apache configuration by making sure a LoadModule
directive is present to load this shared object\&. To simplify this step apxs2
provides an automatic way to install the shared object in its "modules"
directory and updating the httpd\&.conf file accordingly\&. This can be
achieved by running:
+
+ .nf
+
+- $ apxs -i -a mod_foo\&.la
++ $ apxs2 -i -a mod_foo\&.la
+ /path/to/instdso\&.sh mod_foo\&.la /path/to/apache/modules
+ /path/to/libtool --mode=install cp mod_foo\&.la /path/to/apache/modules
+ \&.\&.\&.
+@@ -202,16 +202,16 @@ is added to the configuration file if still not presen
+
+ .nf
+
+- $ apxs -i -A mod_foo\&.c
++ $ apxs2 -i -A mod_foo\&.c
+
+ .fi
+
+ .PP
+-For a quick test of the apxs mechanism you can create a sample Apache module
template plus a corresponding Makefile via:
++For a quick test of the apxs2 mechanism you can create a sample Apache module
template plus a corresponding Makefile via:
+
+ .nf
+
+- $ apxs -g -n foo
++ $ apxs2 -g -n foo
+ Creating [DIR] foo
+ Creating [FILE] foo/Makefile
+ Creating [FILE] foo/modules\&.mk
+@@ -228,19 +228,19 @@ Then you can immediately compile this sample module in
+
+ $ cd foo
+ $ make all reload
+- apxs -c mod_foo\&.c
++ apxs2 -c mod_foo\&.c
+ /path/to/libtool --mode=compile gcc \&.\&.\&. -c mod_foo\&.c
+ /path/to/libtool --mode=link gcc \&.\&.\&. -o mod_foo\&.la mod_foo\&.slo
+- apxs -i -a -n "foo" mod_foo\&.la
++ apxs2 -i -a -n "foo" mod_foo\&.la
+ /path/to/instdso\&.sh mod_foo\&.la /path/to/apache/modules
+ /path/to/libtool --mode=install cp mod_foo\&.la /path/to/apache/modules
+ \&.\&.\&.
+ chmod 755 /path/to/apache/modules/mod_foo\&.so
+ [activating module `foo' in /path/to/apache/conf/httpd\&.conf]
+- apachectl restart
+- /path/to/apache/sbin/apachectl restart: httpd not running, trying to
start
++ apachectl2 restart
++ /path/to/apache/sbin/apachectl2 restart: httpd2 not running, trying to
start
+ [Tue Mar 31 11:27:55 1998] [debug] mod_so\&.c(303): loaded module
foo_module
+- /path/to/apache/sbin/apachectl restart: httpd started
++ /path/to/apache/sbin/apachectl2 restart: httpd2 started
+ $ _
+
+ .fi
Index: patches/patch-docs_man_apxs_8
===================================================================
RCS file: patches/patch-docs_man_apxs_8
diff -N patches/patch-docs_man_apxs_8
--- patches/patch-docs_man_apxs_8 18 Oct 2012 08:12:17 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,183 +0,0 @@
-$OpenBSD: patch-docs_man_apxs_8,v 1.4 2012/10/18 08:12:17 giovanni Exp $
---- docs/man/apxs.8.orig Thu Sep 20 10:02:17 2012
-+++ docs/man/apxs.8 Thu Sep 20 10:04:53 2012
-@@ -19,36 +19,36 @@
- .el .ne 3
- .IP "\\$1" \\$2
- ..
--.TH "APXS" 8 "2012-03-21" "Apache HTTP Server" "apxs"
-+.TH "APXS2" 8 "2012-03-21" "Apache HTTP Server" "apxs2"
-
- .SH NAME
--apxs \- APache eXtenSion tool
-+apxs2 \- APache eXtenSion tool
-
- .SH "SYNOPSIS"
-
- .PP
--\fBapxs\fR -\fBg\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] -\fBn\fR \fImodname\fR
-+\fBapxs2\fR -\fBg\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] -\fBn\fR
\fImodname\fR
-
- .PP
--\fBapxs\fR -\fBq\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] \fIquery\fR \&.\&.\&.
-+\fBapxs2\fR -\fBq\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] \fIquery\fR \&.\&.\&.
-
- .PP
--\fBapxs\fR -\fBc\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] [ -\fBo\fR
\fIdsofile\fR ] [ -\fBI\fR \fIincdir\fR ] [ -\fBD\fR \fIname\fR=\fIvalue\fR ] [
-\fBL\fR \fIlibdir\fR ] [ -\fBl\fR \fIlibname\fR ] [
-\fBWc,\fR\fIcompiler-flags\fR ] [ -\fBWl,\fR\fIlinker-flags\fR ] \fIfiles\fR
\&.\&.\&.
-+\fBapxs2\fR -\fBc\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] [ -\fBo\fR
\fIdsofile\fR ] [ -\fBI\fR \fIincdir\fR ] [ -\fBD\fR \fIname\fR=\fIvalue\fR ] [
-\fBL\fR \fIlibdir\fR ] [ -\fBl\fR \fIlibname\fR ] [
-\fBWc,\fR\fIcompiler-flags\fR ] [ -\fBWl,\fR\fIlinker-flags\fR ] \fIfiles\fR
\&.\&.\&.
-
- .PP
--\fBapxs\fR -\fBi\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] [ -\fBn\fR
\fImodname\fR ] [ -\fBa\fR ] [ -\fBA\fR ] \fIdso-file\fR \&.\&.\&.
-+\fBapxs2\fR -\fBi\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] [ -\fBn\fR
\fImodname\fR ] [ -\fBa\fR ] [ -\fBA\fR ] \fIdso-file\fR \&.\&.\&.
-
- .PP
--\fBapxs\fR -\fBe\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] [ -\fBn\fR
\fImodname\fR ] [ -\fBa\fR ] [ -\fBA\fR ] \fIdso-file\fR \&.\&.\&.
-+\fBapxs2\fR -\fBe\fR [ -\fBS\fR \fIname\fR=\fIvalue\fR ] [ -\fBn\fR
\fImodname\fR ] [ -\fBa\fR ] [ -\fBA\fR ] \fIdso-file\fR \&.\&.\&.
-
-
- .SH "SUMMARY"
-
- .PP
--apxs is a tool for building and installing extension modules for the Apache
HyperText Transfer Protocol (HTTP) server\&. This is achieved by building a
dynamic shared object (DSO) from one or more source or object \fIfiles\fR which
then can be loaded into the Apache server under runtime via the LoadModule
directive from mod_so\&.
-+apxs2 is a tool for building and installing extension modules for the Apache
HyperText Transfer Protocol (HTTP) server\&. This is achieved by building a
dynamic shared object (DSO) from one or more source or object \fIfiles\fR which
then can be loaded into the Apache server under runtime via the LoadModule
directive from mod_so\&.
-
- .PP
--So to use this extension mechanism your platform has to support the DSO
feature and your Apache httpd binary has to be built with the mod_so module\&.
The apxs tool automatically complains if this is not the case\&. You can check
this yourself by manually running the command
-+So to use this extension mechanism your platform has to support the DSO
feature and your Apache httpd binary has to be built with the mod_so module\&.
The apxs2 tool automatically complains if this is not the case\&. You can check
this yourself by manually running the command
-
- .nf
-
-@@ -57,26 +57,26 @@ So to use this extension mechanism your platform has t
- .fi
-
- .PP
--The module mod_so should be part of the displayed list\&. If these
requirements are fulfilled you can easily extend your Apache server's
functionality by installing your own modules with the DSO mechanism by the help
of this apxs tool:
-+The module mod_so should be part of the displayed list\&. If these
requirements are fulfilled you can easily extend your Apache server's
functionality by installing your own modules with the DSO mechanism by the help
of this apxs2 tool:
-
- .nf
-
-- $ apxs -i -a -c mod_foo\&.c
-+ $ apxs2 -i -a -c mod_foo\&.c
- gcc -fpic -DSHARED_MODULE -I/path/to/apache/include -c mod_foo\&.c
- ld -Bshareable -o mod_foo\&.so mod_foo\&.o
- cp mod_foo\&.so /path/to/apache/modules/mod_foo\&.so
- chmod 755 /path/to/apache/modules/mod_foo\&.so
- [activating module `foo' in /path/to/apache/etc/httpd\&.conf]
-- $ apachectl restart
-- /path/to/apache/sbin/apachectl restart: httpd not running, trying to
start
-+ $ apachectl2 restart
-+ /path/to/apache/sbin/apachectl2 restart: httpd2 not running, trying to
start
- [Tue Mar 31 11:27:55 1998] [debug] mod_so\&.c(303): loaded module
foo_module
-- /path/to/apache/sbin/apachectl restart: httpd started
-+ /path/to/apache/sbin/apachectl2 restart: httpd2 started
- $ _
-
- .fi
-
- .PP
--The arguments \fIfiles\fR can be any C source file (\&.c), a object file
(\&.o) or even a library archive (\&.a)\&. The apxs tool automatically
recognizes these extensions and automatically used the C source files for
compilation while just using the object and archive files for the linking
phase\&. But when using such pre-compiled objects make sure they are compiled
for position independent code (PIC) to be able to use them for a dynamically
loaded shared object\&. For instance with GCC you always just have to use
-fpic\&. For other C compilers consult its manual page or at watch for the
flags apxs uses to compile the object files\&.
-+The arguments \fIfiles\fR can be any C source file (\&.c), a object file
(\&.o) or even a library archive (\&.a)\&. The apxs2 tool automatically
recognizes these extensions and automatically used the C source files for
compilation while just using the object and archive files for the linking
phase\&. But when using such pre-compiled objects make sure they are compiled
for position independent code (PIC) to be able to use them for a dynamically
loaded shared object\&. For instance with GCC you always just have to use
-fpic\&. For other C compilers consult its manual page or at watch for the
flags apxs2 uses to compile the object files\&.
-
- .PP
- For more details about DSO support in Apache read the documentation of mod_so
or perhaps even read the src/modules/standard/mod_so\&.c source file\&.
-@@ -89,28 +89,28 @@ For more details about DSO support in Apache read the
-
- .TP
- -n \fImodname\fR
--This explicitly sets the module name for the -i (install) and -g (template
generation) option\&. Use this to explicitly specify the module name\&. For
option -g this is required, for option -i the apxs tool tries to determine the
name from the source or (as a fallback) at least by guessing it from the
filename\&.
-+This explicitly sets the module name for the -i (install) and -g (template
generation) option\&. Use this to explicitly specify the module name\&. For
option -g this is required, for option -i the apxs2 tool tries to determine the
name from the source or (as a fallback) at least by guessing it from the
filename\&.
-
- .SS "Query Options"
-
-
- .TP
- -q
--Performs a query for apxs's knowledge about certain settings\&. The
\fIquery\fR parameters can be one or more of the following strings: CC, CFLAGS,
CFLAGS_SHLIB, INCLUDEDIR, LD_SHLIB, LDFLAGS_SHLIB, LIBEXECDIR, LIBS_SHLIB,
SBINDIR, SYSCONFDIR, TARGET\&. .PP Use this for manually determining
settings\&. For instance use INC=-I`apxs -q INCLUDEDIR` .PP inside your own
Makefiles if you need manual access to Apache's C header files\&.
-+Performs a query for apxs2's knowledge about certain settings\&. The
\fIquery\fR parameters can be one or more of the following strings: CC, CFLAGS,
CFLAGS_SHLIB, INCLUDEDIR, LD_SHLIB, LDFLAGS_SHLIB, LIBEXECDIR, LIBS_SHLIB,
SBINDIR, SYSCONFDIR, TARGET\&. .PP Use this for manually determining
settings\&. For instance use INC=-I`apxs2 -q INCLUDEDIR` .PP inside your own
Makefiles if you need manual access to Apache's C header files\&.
-
- .SS "Configuration Options"
-
-
- .TP
- -S \fIname\fR=\fIvalue\fR
--This option changes the apxs settings described above\&.
-+This option changes the apxs2 settings described above\&.
-
- .SS "Template Generation Options"
-
-
- .TP
- -g
--This generates a subdirectory \fIname\fR (see option -n) and there two files:
A sample module source file named mod_\fIname\fR\&.c which can be used as a
template for creating your own modules or as a quick start for playing with the
apxs mechanism\&. And a corresponding Makefile for even easier build and
installing of this module\&.
-+This generates a subdirectory \fIname\fR (see option -n) and there two files:
A sample module source file named mod_\fIname\fR\&.c which can be used as a
template for creating your own modules or as a quick start for playing with the
apxs2 mechanism\&. And a corresponding Makefile for even easier build and
installing of this module\&.
-
- .SS "DSO Compilation Options"
-
-@@ -163,7 +163,7 @@ Assume you have an Apache module named mod_foo\&.c ava
-
- .nf
-
-- $ apxs -c mod_foo\&.c
-+ $ apxs2 -c mod_foo\&.c
- /path/to/libtool --mode=compile gcc \&.\&.\&. -c mod_foo\&.c
- /path/to/libtool --mode=link gcc \&.\&.\&. -o mod_foo\&.la mod_foo\&.slo
- $ _
-@@ -171,11 +171,11 @@ Assume you have an Apache module named mod_foo\&.c ava
- .fi
-
- .PP
--Then you have to update the Apache configuration by making sure a LoadModule
directive is present to load this shared object\&. To simplify this step apxs
provides an automatic way to install the shared object in its "modules"
directory and updating the httpd\&.conf file accordingly\&. This can be
achieved by running:
-+Then you have to update the Apache configuration by making sure a LoadModule
directive is present to load this shared object\&. To simplify this step apxs2
provides an automatic way to install the shared object in its "modules"
directory and updating the httpd\&.conf file accordingly\&. This can be
achieved by running:
-
- .nf
-
-- $ apxs -i -a mod_foo\&.la
-+ $ apxs2 -i -a mod_foo\&.la
- /path/to/instdso\&.sh mod_foo\&.la /path/to/apache/modules
- /path/to/libtool --mode=install cp mod_foo\&.la /path/to/apache/modules
- \&.\&.\&.
-@@ -199,16 +199,16 @@ is added to the configuration file if still not presen
-
- .nf
-
-- $ apxs -i -A mod_foo\&.c
-+ $ apxs2 -i -A mod_foo\&.c
-
- .fi
-
- .PP
--For a quick test of the apxs mechanism you can create a sample Apache module
template plus a corresponding Makefile via:
-+For a quick test of the apxs2 mechanism you can create a sample Apache module
template plus a corresponding Makefile via:
-
- .nf
-
-- $ apxs -g -n foo
-+ $ apxs2 -g -n foo
- Creating [DIR] foo
- Creating [FILE] foo/Makefile
- Creating [FILE] foo/modules\&.mk
-@@ -225,19 +225,19 @@ Then you can immediately compile this sample module in
-
- $ cd foo
- $ make all reload
-- apxs -c mod_foo\&.c
-+ apxs2 -c mod_foo\&.c
- /path/to/libtool --mode=compile gcc \&.\&.\&. -c mod_foo\&.c
- /path/to/libtool --mode=link gcc \&.\&.\&. -o mod_foo\&.la mod_foo\&.slo
-- apxs -i -a -n "foo" mod_foo\&.la
-+ apxs2 -i -a -n "foo" mod_foo\&.la
- /path/to/instdso\&.sh mod_foo\&.la /path/to/apache/modules
- /path/to/libtool --mode=install cp mod_foo\&.la /path/to/apache/modules
- \&.\&.\&.
- chmod 755 /path/to/apache/modules/mod_foo\&.so
- [activating module `foo' in /path/to/apache/conf/httpd\&.conf]
-- apachectl restart
-- /path/to/apache/sbin/apachectl restart: httpd not running, trying to
start
-+ apachectl2 restart
-+ /path/to/apache/sbin/apachectl2 restart: httpd2 not running, trying to
start
- [Tue Mar 31 11:27:55 1998] [debug] mod_so\&.c(303): loaded module
foo_module
-- /path/to/apache/sbin/apachectl restart: httpd started
-+ /path/to/apache/sbin/apachectl2 restart: httpd2 started
- $ _
-
- .fi
Index: patches/patch-docs_man_dbmmanage_1
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-docs_man_dbmmanage_1,v
retrieving revision 1.1
diff -u -p -r1.1 patch-docs_man_dbmmanage_1
--- patches/patch-docs_man_dbmmanage_1 16 Jan 2007 01:12:26 -0000 1.1
+++ patches/patch-docs_man_dbmmanage_1 8 May 2015 10:39:32 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-docs_man_dbmmanage_1,v 1.1 2007/01/16 01:12:26 deanna Exp $
---- docs/man/dbmmanage.1.orig Sun Jan 14 19:01:44 2007
-+++ docs/man/dbmmanage.1 Sun Jan 14 19:14:21 2007
-@@ -19,30 +19,30 @@
+--- docs/man/dbmmanage.1.orig Wed Dec 12 17:32:22 2012
++++ docs/man/dbmmanage.1 Sat Jan 10 15:17:12 2015
+@@ -19,27 +19,27 @@
.el .ne 3
.IP "\\$1" \\$2
..
--.TH "DBMMANAGE" 1 "2004-12-10" "Apache HTTP Server" "dbmmanage"
-+.TH "DBMMANAGE2" 1 "2004-12-10" "Apache HTTP Server" "dbmmanage2"
+-.TH "DBMMANAGE" 1 "2012-12-12" "Apache HTTP Server" "dbmmanage"
++.TH "DBMMANAGE2" 1 "2012-12-12" "Apache HTTP Server" "dbmmanage2"
.SH NAME
-dbmmanage \- Manage user authentication files in DBM format
@@ -31,15 +31,11 @@ $OpenBSD: patch-docs_man_dbmmanage_1,v 1
.PP
-dbmmanage is used to create and update the DBM format files used to store
usernames and password for basic authentication of HTTP users via
mod_authn_dbm\&. Resources available from the Apache HTTP server can be
restricted to just the users listed in the files created by dbmmanage\&. This
program can only be used when the usernames are stored in a DBM file\&. To use
a flat-file database see htpasswd\&.
-+dbmmanage2 is used to create and update the DBM format files used to store
usernames and password for basic authentication of HTTP users via
mod_authn_dbm\&. Resources available from the Apache HTTP server can be
restricted to just the users listed in the files created by dbmmanage2\&. This
program can only be used when the usernames are stored in a DBM file\&. To use
a flat-file database see htpasswd2\&.
++dbmmanage2 is used to create and update the DBM format files used to store
usernames and password for basic authentication of HTTP users via
mod_authn_dbm\&. Resources available from the Apache HTTP server can be
restricted to just the users listed in the files created by dbmmanage2\&. This
program can only be used when the usernames are stored in a DBM file\&. To use
a flat-file database see htpasswd\&.
.PP
--This manual page only lists the command line arguments\&. For details of the
directives necessary to configure user authentication in httpd see the httpd
manual, which is part of the Apache distribution or can be found at
http://httpd\&.apache\&.org/\&;.
-+This manual page only lists the command line arguments\&. For details of the
directives necessary to configure user authentication in httpd2 see the httpd2
manual, which is part of the Apache distribution or can be found at
http://httpd\&.apache\&.org/\&;.
-
-
- .SH "OPTIONS"
-@@ -85,33 +85,33 @@ plaintext (\fInot recommended\fR)
+ Another tool to maintain a DBM password database is htdbm\&.
+@@ -88,33 +88,33 @@ plaintext (\fInot recommended\fR)
.TP
add
Index: patches/patch-docs_man_htdbm_1
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-docs_man_htdbm_1,v
retrieving revision 1.3
diff -u -p -r1.3 patch-docs_man_htdbm_1
--- patches/patch-docs_man_htdbm_1 30 Aug 2009 18:06:07 -0000 1.3
+++ patches/patch-docs_man_htdbm_1 8 May 2015 10:39:32 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-docs_man_htdbm_1,v 1.3 2009/08/30 18:06:07 fkr Exp $
---- docs/man/htdbm.1.orig Thu Feb 12 15:09:23 2009
-+++ docs/man/htdbm.1 Mon Aug 24 21:12:10 2009
+--- docs/man/htdbm.1.orig Wed Dec 12 17:32:22 2012
++++ docs/man/htdbm.1 Sat Jan 10 15:18:22 2015
@@ -54,7 +54,7 @@ htdbm \- Manipulate DBM password databases
.SH "SUMMARY"
@@ -10,19 +10,19 @@ $OpenBSD: patch-docs_man_htdbm_1,v 1.3 2
.SH "OPTIONS"
-@@ -74,13 +74,13 @@ Display the results on standard output rather than upd
- Use MD5 encryption for passwords\&. On Windows, Netware and TPF, this is the
default\&.
+@@ -83,13 +83,13 @@ Use bcrypt encryption for passwords\&. This is current
+ This flag is only allowed in combination with -B (bcrypt encryption)\&. It
sets the computing time used for the bcrypt algorithm (higher is more secure
but slower, default: 5, valid: 4 to 31)\&.
.TP
-d
--Use crypt() encryption for passwords\&. The default on all platforms but
Windows, Netware and TPF\&. Though possibly supported by htdbm on all
platforms, it is not supported by the httpd server on Windows, Netware and
TPF\&.
-+Use crypt() encryption for passwords\&. The default on all platforms but
Windows, Netware and TPF\&. Though possibly supported by htdbm on all
platforms, it is not supported by the httpd2 server on Windows, Netware and
TPF\&.
+-Use crypt() encryption for passwords\&. The default on all platforms but
Windows and Netware\&. Though possibly supported by htdbm on all platforms, it
is not supported by the httpd server on Windows and Netware\&. This algorithm
is \fBinsecure\fR by today's standards\&.
++Use crypt() encryption for passwords\&. The default on all platforms but
Windows and Netware\&. Though possibly supported by htdbm on all platforms, it
is not supported by the httpd2 server on Windows and Netware\&. This algorithm
is \fBinsecure\fR by today's standards\&.
.TP
-s
- Use SHA encryption for passwords\&. Facilitates migration from/to Netscape
servers using the LDAP Directory Interchange Format (ldif)\&.
+ Use SHA encryption for passwords\&. Facilitates migration from/to Netscape
servers using the LDAP Directory Interchange Format (ldif)\&. This algorithm is
\fBinsecure\fR by today's standards\&.
.TP
-p
--Use plaintext passwords\&. Though htdbm will support creation on all
platforms, the httpd daemon will only accept plain text passwords on Windows,
Netware and TPF\&.
-+Use plaintext passwords\&. Though htdbm will support creation on all
platforms, the httpd2 daemon will only accept plain text passwords on Windows,
Netware and TPF\&.
+-Use plaintext passwords\&. Though htdbm will support creation on all
platforms, the httpd daemon will only accept plain text passwords on Windows
and Netware\&.
++Use plaintext passwords\&. Though htdbm will support creation on all
platforms, the httpd2 daemon will only accept plain text passwords on Windows
and Netware\&.
.TP
-l
Print each of the usernames and comments from the database on stdout\&.
Index: patches/patch-docs_man_htpasswd_1
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-docs_man_htpasswd_1,v
retrieving revision 1.5
diff -u -p -r1.5 patch-docs_man_htpasswd_1
--- patches/patch-docs_man_htpasswd_1 25 Nov 2013 17:00:47 -0000 1.5
+++ patches/patch-docs_man_htpasswd_1 8 May 2015 10:39:32 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-docs_man_htpasswd_1,v 1.5 2013/11/25 17:00:47 stsp Exp $
---- docs/man/htpasswd.1.orig Sat Jul 6 23:58:04 2013
-+++ docs/man/htpasswd.1 Mon Nov 18 17:18:53 2013
+--- docs/man/htpasswd.1.orig Tue Jun 24 07:53:21 2014
++++ docs/man/htpasswd.1 Sat Jan 10 15:20:47 2015
@@ -19,36 +19,36 @@
.el .ne 3
.IP "\\$1" \\$2
..
--.TH "HTPASSWD" 1 "2013-07-06" "Apache HTTP Server" "htpasswd"
-+.TH "HTPASSWD2" 1 "2013-07-06" "Apache HTTP Server" "htpasswd2"
+-.TH "HTPASSWD" 1 "2014-06-24" "Apache HTTP Server" "htpasswd"
++.TH "HTPASSWD2" 1 "2014-06-24" "Apache HTTP Server" "htpasswd2"
.SH NAME
-htpasswd \- Manage user files for basic authentication
@@ -15,20 +15,20 @@ $OpenBSD: patch-docs_man_htpasswd_1,v 1.
.SH "SYNOPSIS"
.PP
--\fBhtpasswd\fR [ -\fBc\fR ] [ -\fBm\fR ] [ -\fBD\fR ] \fIpasswdfile\fR
\fIusername\fR
-+\fBhtpasswd2\fR [ -\fBc\fR ] [ -\fBm\fR ] [ -\fBD\fR ] \fIpasswdfile\fR
\fIusername\fR
+-\fBhtpasswd\fR [ -\fBc\fR ] [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR |
-\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ]
\fIpasswdfile\fR \fIusername\fR
++\fBhtpasswd2\fR [ -\fBc\fR ] [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR |
-\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ]
\fIpasswdfile\fR \fIusername\fR
.PP
--\fBhtpasswd\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR |
-\fBs\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR \fIpassword\fR
-+\fBhtpasswd2\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR |
-\fBs\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR \fIpassword\fR
+-\fBhtpasswd\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR |
-\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ]
\fIpasswdfile\fR \fIusername\fR \fIpassword\fR
++\fBhtpasswd2\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR |
-\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ]
\fIpasswdfile\fR \fIusername\fR \fIpassword\fR
.PP
--\fBhtpasswd\fR -\fBn\fR [ -\fBm\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ]
\fIusername\fR
-+\fBhtpasswd2\fR -\fBn\fR [ -\fBm\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ]
\fIusername\fR
+-\fBhtpasswd\fR -\fBn\fR [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR |
-\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR
++\fBhtpasswd2\fR -\fBn\fR [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR |
-\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR
.PP
--\fBhtpasswd\fR -\fBnb\fR [ -\fBm\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ]
\fIusername\fR \fIpassword\fR
-+\fBhtpasswd2\fR -\fBnb\fR [ -\fBm\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ]
\fIusername\fR \fIpassword\fR
+-\fBhtpasswd\fR -\fBnb\fR [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR |
-\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR \fIpassword\fR
++\fBhtpasswd2\fR -\fBnb\fR [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR |
-\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR \fIpassword\fR
.SH "SUMMARY"
@@ -38,25 +38,33 @@ $OpenBSD: patch-docs_man_htpasswd_1,v 1.
+htpasswd2 is used to create and update the flat-files used to store usernames
and password for basic authentication of HTTP users\&. If htpasswd2 cannot
access a file, such as not being able to write to the output file or not being
able to read the file in order to update it, it returns an error status and
makes no changes\&.
.PP
--Resources available from the Apache HTTP server can be restricted to just the
users listed in the files created by htpasswd\&. This program can only manage
usernames and passwords stored in a flat-file\&. It can encrypt and display
password information for use in other types of data stores, though\&. To use a
DBM database see dbmmanage\&.
-+Resources available from the Apache HTTP server can be restricted to just the
users listed in the files created by htpasswd2\&. This program can only manage
usernames and passwords stored in a flat-file\&. It can encrypt and display
password information for use in other types of data stores, though\&. To use a
DBM database see dbmmanage\&.
+-Resources available from the Apache HTTP server can be restricted to just the
users listed in the files created by htpasswd\&. This program can only manage
usernames and passwords stored in a flat-file\&. It can encrypt and display
password information for use in other types of data stores, though\&. To use a
DBM database see dbmmanage or htdbm\&.
++Resources available from the Apache HTTP server can be restricted to just the
users listed in the files created by htpasswd2\&. This program can only manage
usernames and passwords stored in a flat-file\&. It can encrypt and display
password information for use in other types of data stores, though\&. To use a
DBM database see dbmmanage or htdbm\&.
.PP
--htpasswd encrypts passwords using either a version of MD5 modified for
Apache, or the system's crypt() routine\&. Files managed by htpasswd may
contain both types of passwords; some user records may have MD5-encrypted
passwords while others in the same file may have passwords encrypted with
crypt()\&.
-+htpasswd2 encrypts passwords using either a version of MD5 modified for
Apache, or the system's crypt() routine\&. Files managed by htpasswd2 may
contain both types of passwords; some user records may have MD5-encrypted
passwords while others in the same file may have passwords encrypted with
crypt()\&.
+-htpasswd encrypts passwords using either bcrypt, a version of MD5 modified
for Apache, SHA1, or the system's crypt() routine\&. Files managed by htpasswd
may contain a mixture of different encoding types of passwords; some user
records may have bcrypt or MD5-encrypted passwords while others in the same
file may have passwords encrypted with crypt()\&.
++htpasswd2 encrypts passwords using either bcrypt, a version of MD5 modified
for Apache, SHA1, or the system's crypt() routine\&. Files managed by htpasswd2
may contain a mixture of different encoding types of passwords; some user
records may have bcrypt or MD5-encrypted passwords while others in the same
file may have passwords encrypted with crypt()\&.
.PP
This manual page only lists the command line arguments\&. For details of the
directives necessary to configure user authentication in httpd see the Apache
manual, which is part of the Apache distribution or can be found at
http://httpd\&.apache\&.org/\&;.
-@@ -77,7 +77,7 @@ Use crypt() encryption for passwords\&. This is not su
- Use SHA encryption for passwords\&. Facilitates migration from/to Netscape
servers using the LDAP Directory Interchange Format (ldif)\&.
+@@ -86,13 +86,13 @@ Use crypt() encryption for passwords\&. This is not su
+ Use SHA encryption for passwords\&. Facilitates migration from/to Netscape
servers using the LDAP Directory Interchange Format (ldif)\&. This algorithm is
\fBinsecure\fR by today's standards\&.
.TP
-p
--Use plaintext passwords\&. Though htpasswd will support creation on all
platforms, the httpd daemon will only accept plain text passwords on Windows,
Netware and TPF\&.
-+Use plaintext passwords\&. Though htpasswd2 will support creation on all
platforms, the httpd daemon will only accept plain text passwords on Windows,
Netware and TPF\&.
+-Use plaintext passwords\&. Though htpasswd will support creation on all
platforms, the httpd daemon will only accept plain text passwords on Windows
and Netware\&.
++Use plaintext passwords\&. Though htpasswd2 will support creation on all
platforms, the httpd daemon will only accept plain text passwords on Windows
and Netware\&.
.TP
-D
- Delete user\&. If the username exists in the specified htpasswd file, it will
be deleted\&.
-@@ -94,31 +94,31 @@ The plaintext password to be encrypted and stored in t
+-Delete user\&. If the username exists in the specified htpasswd file, it will
be deleted\&.
++Delete user\&. If the username exists in the specified htpasswd2 file, it
will be deleted\&.
+ .TP
+ -v
+-Verify password\&. Verify that the given password matches the password of the
user stored in the specified htpasswd file\&. Available in 2\&.4\&.5 and
later\&.
++Verify password\&. Verify that the given password matches the password of the
user stored in the specified htpasswd2 file\&. Available in 2\&.4\&.5 and
later\&.
+ .TP
+ \fIpasswdfile\fR
+ Name of the file to contain the user name and password\&. If -c is given,
this file is created if it does not already exist, or rewritten and truncated
if it does exist\&.
+@@ -106,31 +106,31 @@ The plaintext password to be encrypted and stored in t
.SH "EXIT STATUS"
.PP
@@ -79,7 +87,7 @@ $OpenBSD: patch-docs_man_htpasswd_1,v 1.
.nf
- htpasswd -c /home/doe/public_html/\&.htpasswd jane
-+ htpasswd2 -c /home/doe/public_html/\&.htpasswd jane
++ htpasswd2 -c /home/doe/public_html/\&.htpasswd2 jane
.fi
@@ -94,7 +102,7 @@ $OpenBSD: patch-docs_man_htpasswd_1,v 1.
.fi
-@@ -128,7 +128,7 @@ Encrypts the password from the command line (Pwd4Steve
+@@ -140,7 +140,7 @@ Encrypts the password from the command line (Pwd4Steve
.SH "SECURITY CONSIDERATIONS"
.PP
@@ -103,12 +111,12 @@ $OpenBSD: patch-docs_man_htpasswd_1,v 1.
.PP
This program is not safe as a setuid executable\&. Do \fInot\fR make it
setuid\&.
-@@ -145,10 +145,10 @@ The SHA encryption format does not use salting: for a
+@@ -160,10 +160,10 @@ The SHA and crypt() formats are insecure by today's st
.SH "RESTRICTIONS"
.PP
--On the Windows and MPE platforms, passwords encrypted with htpasswd are
limited to no more than 255 characters in length\&. Longer passwords will be
truncated to 255 characters\&.
-+On the Windows and MPE platforms, passwords encrypted with htpasswd2 are
limited to no more than 255 characters in length\&. Longer passwords will be
truncated to 255 characters\&.
+-On the Windows platform, passwords encrypted with htpasswd are limited to no
more than 255 characters in length\&. Longer passwords will be truncated to 255
characters\&.
++On the Windows platform, passwords encrypted with htpasswd2 are limited to no
more than 255 characters in length\&. Longer passwords will be truncated to 255
characters\&.
.PP
-The MD5 algorithm used by htpasswd is specific to the Apache software;
passwords encrypted using it will not be usable with other Web servers\&.
Index: patches/patch-docs_man_httpd_8
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-docs_man_httpd_8,v
retrieving revision 1.5
diff -u -p -r1.5 patch-docs_man_httpd_8
--- patches/patch-docs_man_httpd_8 18 Oct 2012 08:12:17 -0000 1.5
+++ patches/patch-docs_man_httpd_8 8 May 2015 10:39:32 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-docs_man_httpd_8,v 1.5 2012/10/18 08:12:17 giovanni Exp $
---- docs/man/httpd.8.orig Fri Feb 10 22:47:55 2012
-+++ docs/man/httpd.8 Wed Oct 10 16:31:01 2012
+--- docs/man/httpd.8.orig Fri Feb 10 22:21:56 2012
++++ docs/man/httpd.8 Sat Jan 10 15:13:53 2015
@@ -19,30 +19,30 @@
.el .ne 3
.IP "\\$1" \\$2
@@ -51,7 +51,7 @@ $OpenBSD: patch-docs_man_httpd_8,v 1.5 2
.TP
-C \fIdirective\fR
Process the configuration \fIdirective\fR before reading config files\&.
-@@ -98,13 +98,13 @@ Skip document root check at startup/restart\&.
+@@ -95,13 +95,13 @@ Skip document root check at startup/restart\&.
Run syntax tests for configuration files only\&. The program immediately
exits after these syntax parsing tests with either a return code of 0 (Syntax
OK) or return code not equal to 0 (Syntax Error)\&. If -D \fIDUMP\fR_\fIVHOSTS
\fRis also set, details of the virtual host configuration will be printed\&. If
-D \fIDUMP\fR_\fIMODULES \fR is set, all loaded modules will be printed\&.
.TP
-v
@@ -68,7 +68,7 @@ $OpenBSD: patch-docs_man_httpd_8,v 1.5 2
.PP
The following arguments are available only on the Windows platform:
-@@ -112,10 +112,10 @@ The following arguments are available only on the Wind
+@@ -109,10 +109,10 @@ The following arguments are available only on the Wind
.TP
-k install|config|uninstall
Index: patches/patch-docs_man_logresolve_1
===================================================================
RCS file: patches/patch-docs_man_logresolve_1
diff -N patches/patch-docs_man_logresolve_1
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-docs_man_logresolve_1 8 May 2015 10:39:32 -0000
@@ -0,0 +1,36 @@
+$OpenBSD$
+--- docs/man/logresolve.1.orig Mon Jan 9 18:03:50 2012
++++ docs/man/logresolve.1 Sat Jan 10 15:28:14 2015
+@@ -19,21 +19,21 @@
+ .el .ne 3
+ .IP "\\$1" \\$2
+ ..
+-.TH "LOGRESOLVE" 1 "2012-01-09" "Apache HTTP Server" "logresolve"
++.TH "LOGRESOLVE2" 1 "2012-01-09" "Apache HTTP Server" "logresolve2"
+
+ .SH NAME
+-logresolve \- Resolve IP-addresses to hostnames in Apache log files
++logresolve2 \- Resolve IP-addresses to hostnames in Apache log files
+
+ .SH "SYNOPSIS"
+
+ .PP
+-\fBlogresolve\fR [ -\fBs\fR \fIfilename\fR ] [ -\fBc\fR ] < \fIaccess_log\fR
> \fIaccess_log\&.new\fR
++\fBlogresolve2\fR [ -\fBs\fR \fIfilename\fR ] [ -\fBc\fR ] < \fIaccess_log\fR
> \fIaccess_log\&.new\fR
+
+
+ .SH "SUMMARY"
+
+ .PP
+-logresolve is a post-processing program to resolve IP-addresses in Apache's
access logfiles\&. To minimize impact on your nameserver, logresolve has its
very own internal hash-table cache\&. This means that each IP number will only
be looked up the first time it is found in the log file\&.
++logresolve2 is a post-processing program to resolve IP-addresses in Apache's
access logfiles\&. To minimize impact on your nameserver, logresolve2 has its
very own internal hash-table cache\&. This means that each IP number will only
be looked up the first time it is found in the log file\&.
+
+ .PP
+ Takes an Apache log file on standard input\&. The IP addresses must be the
first thing on each line and must be separated from the remainder of the line
by a space\&.
+@@ -47,5 +47,5 @@ Takes an Apache log file on standard input\&. The IP a
+ Specifies a filename to record statistics\&.
+ .TP
+ -c
+-This causes logresolve to apply some DNS checks: after finding the hostname
from the IP address, it looks up the IP addresses for the hostname and checks
that one of these matches the original address\&.
++This causes logresolve2 to apply some DNS checks: after finding the hostname
from the IP address, it looks up the IP addresses for the hostname and checks
that one of these matches the original address\&.
+
Index: patches/patch-docs_man_logresolve_8
===================================================================
RCS file: patches/patch-docs_man_logresolve_8
diff -N patches/patch-docs_man_logresolve_8
--- patches/patch-docs_man_logresolve_8 18 Oct 2012 08:12:17 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-$OpenBSD: patch-docs_man_logresolve_8,v 1.4 2012/10/18 08:12:17 giovanni Exp $
---- docs/man/logresolve.8.orig Fri Oct 12 16:18:04 2012
-+++ docs/man/logresolve.8 Fri Oct 12 16:18:53 2012
-@@ -19,21 +19,21 @@
- .el .ne 3
- .IP "\\$1" \\$2
- ..
--.TH "LOGRESOLVE" 8 "2012-03-21" "Apache HTTP Server" "logresolve"
-+.TH "LOGRESOLVE2" 8 "2012-03-21" "Apache HTTP Server" "logresolve2"
-
- .SH NAME
--logresolve \- Resolve IP-addresses to hostnames in Apache log files
-+logresolve2 \- Resolve IP-addresses to hostnames in Apache log files
-
- .SH "SYNOPSIS"
-
- .PP
--\fBlogresolve\fR [ -\fBs\fR \fIfilename\fR ] [ -\fBc\fR ] < \fIaccess_log\fR
> \fIaccess_log\&.new\fR
-+\fBlogresolve2\fR [ -\fBs\fR \fIfilename\fR ] [ -\fBc\fR ] < \fIaccess_log\fR
> \fIaccess_log\&.new\fR
-
-
- .SH "SUMMARY"
-
- .PP
--logresolve is a post-processing program to resolve IP-addresses in Apache's
access logfiles\&. To minimize impact on your nameserver, logresolve has its
very own internal hash-table cache\&. This means that each IP number will only
be looked up the first time it is found in the log file\&.
-+logresolve2 is a post-processing program to resolve IP-addresses in Apache's
access logfiles\&. To minimize impact on your nameserver, logresolve2 has its
very own internal hash-table cache\&. This means that each IP number will only
be looked up the first time it is found in the log file\&.
-
- .PP
- Takes an Apache log file on standard input\&. The IP addresses must be the
first thing on each line and must be separated from the remainder of the line
by a space\&.
-@@ -47,5 +47,5 @@ Takes an Apache log file on standard input\&. The IP a
- Specifies a filename to record statistics\&.
- .TP
- -c
--This causes logresolve to apply some DNS checks: after finding the hostname
from the IP address, it looks up the IP addresses for the hostname and checks
that one of these matches the original address\&.
-+This causes logresolve2 to apply some DNS checks: after finding the hostname
from the IP address, it looks up the IP addresses for the hostname and checks
that one of these matches the original address\&.
-
Index: patches/patch-docs_man_rotatelogs_8
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-docs_man_rotatelogs_8,v
retrieving revision 1.5
diff -u -p -r1.5 patch-docs_man_rotatelogs_8
--- patches/patch-docs_man_rotatelogs_8 1 Sep 2011 13:40:09 -0000 1.5
+++ patches/patch-docs_man_rotatelogs_8 8 May 2015 10:39:32 -0000
@@ -1,21 +1,22 @@
$OpenBSD: patch-docs_man_rotatelogs_8,v 1.5 2011/09/01 13:40:09 giovanni Exp $
---- docs/man/rotatelogs.8.orig Fri Feb 4 16:20:03 2011
-+++ docs/man/rotatelogs.8 Wed Aug 31 11:58:24 2011
-@@ -19,7 +19,7 @@
+--- docs/man/rotatelogs.8.orig Thu Jan 1 16:30:56 2015
++++ docs/man/rotatelogs.8 Wed Apr 15 00:12:00 2015
+@@ -19,21 +19,21 @@
.el .ne 3
.IP "\\$1" \\$2
..
--.TH "ROTATELOGS" 8 "2010-11-06" "Apache HTTP Server" "rotatelogs"
-+.TH "ROTATELOGS2" 8 "2010-11-06" "Apache HTTP Server" "rotatelogs"
+-.TH "ROTATELOGS" 8 "2015-01-01" "Apache HTTP Server" "rotatelogs"
++.TH "ROTATELOGS2" 8 "2015-01-01" "Apache HTTP Server" "rotatelogs2"
.SH NAME
- rotatelogs \- Piped logging program to rotate Apache logs
-@@ -27,13 +27,13 @@ rotatelogs \- Piped logging program to rotate Apache l
+-rotatelogs \- Piped logging program to rotate Apache logs
++rotatelogs2 \- Piped logging program to rotate Apache logs
+
.SH "SYNOPSIS"
.PP
--\fBrotatelogs\fR [ -\fBl\fR ] [ -\fBf\fR ] \fIlogfile\fR
\fIrotationtime\fR|\fIfilesize\fRM [ \fIoffset\fR ]
-+\fBrotatelogs2\fR [ -\fBl\fR ] [ -\fBf\fR ] \fIlogfile\fR
\fIrotationtime\fR|\fIfilesize\fRM [ \fIoffset\fR ]
+-\fBrotatelogs\fR [ -\fBl\fR ] [ -\fBL\fR \fIlinkname\fR ] [ -\fBp\fR
\fIprogram\fR ] [ -\fBf\fR ] [ -\fBt\fR ] [ -\fBv\fR ] [ -\fBe\fR ] [ -\fBc\fR
] [ -\fBn\fR \fInumber-of-files\fR ] \fIlogfile\fR
\fIrotationtime\fR|\fIfilesize\fR(B|K|M|G) [ \fIoffset\fR ]
++\fBrotatelogs2\fR [ -\fBl\fR ] [ -\fBL\fR \fIlinkname\fR ] [ -\fBp\fR
\fIprogram\fR ] [ -\fBf\fR ] [ -\fBt\fR ] [ -\fBv\fR ] [ -\fBe\fR ] [ -\fBc\fR
] [ -\fBn\fR \fInumber-of-files\fR ] \fIlogfile\fR
\fIrotationtime\fR|\fIfilesize\fR(B|K|M|G) [ \fIoffset\fR ]
.SH "SUMMARY"
@@ -26,48 +27,61 @@ $OpenBSD: patch-docs_man_rotatelogs_8,v
.SH "OPTIONS"
-@@ -44,7 +44,7 @@ rotatelogs is a simple program for use in conjunction
- Causes the use of local time rather than GMT as the base for the interval or
for strftime(3) formatting with size-based rotation\&. Note that using -l in an
environment which changes the GMT offset (such as for BST or DST) can lead to
unpredictable results!
+@@ -47,10 +47,10 @@ Causes the use of local time rather than GMT as the ba
+ Causes a hard link to be made from the current logfile to the specified link
name\&. This can be used to watch the log continuously across rotations using a
command like tail -F linkname\&.
+ .TP
+ -p \fIprogram\fR
+-If given, rotatelogs will execute the specified program every time a new log
file is opened\&. The filename of the newly opened file is passed as the first
argument to the program\&. If executing after a rotation, the old log file is
passed as the second argument\&. rotatelogs does not wait for the specified
program to terminate before continuing to operate, and will not log any error
code returned on termination\&. The spawned program uses the same stdin,
stdout, and stderr as rotatelogs itself, and also inherits the environment\&.
++If given, rotatelogs2 will execute the specified program every time a new log
file is opened\&. The filename of the newly opened file is passed as the first
argument to the program\&. If executing after a rotation, the old log file is
passed as the second argument\&. rotatelogs2 does not wait for the specified
program to terminate before continuing to operate, and will not log any error
code returned on termination\&. The spawned program uses the same stdin,
stdout, and stderr as rotatelogs2 itself, and also inherits the environment\&.
.TP
-f
--Causes the logfile to be opened immediately, as soon as rotatelogs starts,
instead of waiting for the first logfile entry to be read (for non-busy sites,
there may be a substantial delay between when the server is started and when
the first request is handled, meaning that the associated logfile does not
"exist" until then, which causes problems from some automated logging tools)\&.
\fIAvailable in version 2\&.2\&.9 and later\&.\fR
-+Causes the logfile to be opened immediately, as soon as rotatelogs2 starts,
instead of waiting for the first logfile entry to be read (for non-busy sites,
there may be a substantial delay between when the server is started and when
the first request is handled, meaning that the associated logfile does not
"exist" until then, which causes problems from some automated logging tools)\&.
\fIAvailable in version 2\&.2\&.9 and later\&.\fR
+-Causes the logfile to be opened immediately, as soon as rotatelogs starts,
instead of waiting for the first logfile entry to be read (for non-busy sites,
there may be a substantial delay between when the server is started and when
the first request is handled, meaning that the associated logfile does not
"exist" until then, which causes problems from some automated logging tools)
++Causes the logfile to be opened immediately, as soon as rotatelogs2 starts,
instead of waiting for the first logfile entry to be read (for non-busy sites,
there may be a substantial delay between when the server is started and when
the first request is handled, meaning that the associated logfile does not
"exist" until then, which causes problems from some automated logging tools)
.TP
- \fIlogfile\fR
- .PP The path plus basename of the logfile\&. If \fIlogfile\fR includes any
'%' characters, it is treated as a format string for strftime(3)\&. Otherwise,
the suffix \fI\&.nnnnnnnnnn\fR is automatically added and is the time in
seconds\&. Both formats compute the start time from the beginning of the
current period\&. For example, if a rotation time of 86400 is specified, the
hour, minute, and second fields created from the strftime(3) format will all be
zero, referring to the beginning of the current 24-hour period (midnight)\&.
.PP When using strftime(3) filename formatting, be sure the log file format has
enough granularity to produce a different file name each time the logs are
rotated\&. Otherwise rotation will overwrite the same file instead of starting
a new one\&. For example, if \fIlogfile\fR was /var/logs/errorlog\&.%Y-%m-%d
with log rotation at 5 megabytes, but 5 megabytes was reached twice in the same
day, the same log file name would be produced and log rotation!
would keep writing to the same file\&.
-@@ -62,7 +62,7 @@ The number of minutes offset from UTC\&. If omitted, z
+ -t
+ Causes the logfile to be truncated instead of rotated\&. This is useful when
a log is processed in real time by a command like tail, and there is no need
for archived data\&. No suffix will be added to the filename, however format
strings containing '%' characters will be respected\&.
+@@ -83,7 +83,7 @@ The number of minutes offset from UTC\&. If omitted, z
+
+ .nf
+
+- CustomLog "|bin/rotatelogs /var/log/logfile 86400" common
++ CustomLog "|bin/rotatelogs2 /var/log/logfile 86400" common
+
+ .fi
+
+@@ -92,7 +92,7 @@ This creates the files /var/log/logfile\&.nnnn where n
.nf
-- CustomLog "|bin/rotatelogs /var/logs/logfile 86400" common
-+ CustomLog "|bin/rotatelogs2 /var/logs/logfile 86400" common
+- CustomLog "|bin/rotatelogs -l /var/log/logfile\&.%Y\&.%m\&.%d 86400"
common
++ CustomLog "|bin/rotatelogs2 -l /var/log/logfile\&.%Y\&.%m\&.%d 86400"
common
.fi
-@@ -71,7 +71,7 @@ This creates the files /var/logs/logfile\&.nnnn where
+@@ -101,7 +101,7 @@ This creates the files /var/log/logfile\&.yyyy\&.mm\&.
.nf
-- CustomLog "|bin/rotatelogs -l /var/logs/logfile\&.%Y\&.%m\&.%d 86400"
common
-+ CustomLog "|bin/rotatelogs2 -l /var/logs/logfile\&.%Y\&.%m\&.%d 86400"
common
+- CustomLog "|bin/rotatelogs /var/log/logfile 5M" common
++ CustomLog "|bin/rotatelogs2 /var/log/logfile 5M" common
.fi
-@@ -80,7 +80,7 @@ This creates the files /var/logs/logfile\&.yyyy\&.mm\&
+@@ -110,7 +110,7 @@ This configuration will rotate the logfile whenever it
.nf
-- CustomLog "|bin/rotatelogs /var/logs/logfile 5M" common
-+ CustomLog "|bin/rotatelogs2 /var/logs/logfile 5M" common
+- ErrorLog "|bin/rotatelogs /var/log/errorlog\&.%Y-%m-%d-%H_%M_%S 5M"
++ ErrorLog "|bin/rotatelogs2 /var/log/errorlog\&.%Y-%m-%d-%H_%M_%S 5M"
.fi
-@@ -89,7 +89,7 @@ This configuration will rotate the logfile whenever it
+@@ -119,7 +119,7 @@ This configuration will rotate the error logfile whene
.nf
-- ErrorLog "|bin/rotatelogs /var/logs/errorlog\&.%Y-%m-%d-%H_%M_%S 5M"
-+ ErrorLog "|bin/rotatelogs2 /var/logs/errorlog\&.%Y-%m-%d-%H_%M_%S 5M"
+- CustomLog "|bin/rotatelogs -t /var/log/logfile 86400" common
++ CustomLog "|bin/rotatelogs2 -t /var/log/logfile 86400" common
.fi
Index: patches/patch-docs_man_suexec_8
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-docs_man_suexec_8,v
retrieving revision 1.3
diff -u -p -r1.3 patch-docs_man_suexec_8
--- patches/patch-docs_man_suexec_8 9 Apr 2014 22:11:32 -0000 1.3
+++ patches/patch-docs_man_suexec_8 8 May 2015 10:39:32 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-docs_man_suexec_8,v 1.3 2014/04/09 22:11:32 stsp Exp $
---- docs/man/suexec.8.orig Wed Jan 29 14:47:43 2014
-+++ docs/man/suexec.8 Tue Apr 8 22:43:09 2014
+--- docs/man/suexec.8.orig Mon Jul 1 11:02:13 2013
++++ docs/man/suexec.8 Sat Jan 10 15:22:49 2015
@@ -19,24 +19,24 @@
.el .ne 3
.IP "\\$1" \\$2
..
--.TH "SUEXEC" 8 "2014-01-20" "Apache HTTP Server" "suexec"
-+.TH "SUEXEC" 8 "2014-01-20" "Apache HTTP Server" "suexec2"
+-.TH "SUEXEC" 8 "2013-07-01" "Apache HTTP Server" "suexec"
++.TH "SUEXEC2" 8 "2013-07-01" "Apache HTTP Server" "suexec2"
.SH NAME
-suexec \- Switch user before executing external programs
@@ -26,8 +26,8 @@ $OpenBSD: patch-docs_man_suexec_8,v 1.3
+suexec2 is used by the Apache HTTP Server to switch to another user before
executing CGI programs\&. In order to achieve this, it must run as root\&.
Since the HTTP daemon normally doesn't run as root, the suexec2 executable
needs the setuid bit set and must be owned by root\&. It should never be
writable for any other person than root\&.
.PP
--For further information about the concepts and the security model of suexec
please refer to the suexec documentation
(http://httpd\&.apache\&.org/docs/2\&.2/suexec\&.html)\&.
-+For further information about the concepts and the security model of suexec2
please refer to the suexec2 documentation
(http://httpd\&.apache\&.org/docs/2\&.2/suexec2\&.html)\&.
+-For further information about the concepts and the security model of suexec
please refer to the suexec documentation
(http://httpd\&.apache\&.org/docs/2\&.4/suexec\&.html)\&.
++For further information about the concepts and the security model of suexec2
please refer to the suexec2 documentation
(http://httpd\&.apache\&.org/docs/2\&.4/suexec\&.html)\&.
.SH "OPTIONS"
Index: patches/patch-modules_ssl_ssl_engine_init_c
===================================================================
RCS file:
/cvs/ports/www/apache-httpd/patches/patch-modules_ssl_ssl_engine_init_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-modules_ssl_ssl_engine_init_c
--- patches/patch-modules_ssl_ssl_engine_init_c 6 Feb 2015 15:19:01 -0000
1.3
+++ patches/patch-modules_ssl_ssl_engine_init_c 8 May 2015 10:39:32 -0000
@@ -1,11 +1,8 @@
-$OpenBSD: patch-modules_ssl_ssl_engine_init_c,v 1.3 2015/02/06 15:19:01 sthen
Exp $
-
-OpenBSD's libcrypto no longer supports ENGINE_CTRL_CHIL_SET_FORKCHECK
-
---- modules/ssl/ssl_engine_init.c.orig Wed Jul 16 07:04:38 2014
-+++ modules/ssl/ssl_engine_init.c Thu Oct 2 18:07:38 2014
-@@ -406,9 +406,11 @@ void ssl_init_Engine(server_rec *s, apr_pool_t *p)
- ssl_die();
+$OpenBSD$
+--- modules/ssl/ssl_engine_init.c.orig Sat Jan 10 14:52:23 2015
++++ modules/ssl/ssl_engine_init.c Sat Jan 10 14:55:23 2015
+@@ -353,9 +353,11 @@ apr_status_t ssl_init_Engine(server_rec *s, apr_pool_t
+ return ssl_die(s);
}
+#ifdef ENGINE_CTRL_CHIL_SET_FORKCHECK
@@ -15,4 +12,4 @@ OpenBSD's libcrypto no longer supports E
+#endif
if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(01889)
Index: patches/patch-modules_ssl_ssl_engine_rand_c
===================================================================
RCS file: patches/patch-modules_ssl_ssl_engine_rand_c
diff -N patches/patch-modules_ssl_ssl_engine_rand_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-modules_ssl_ssl_engine_rand_c 11 May 2015 16:43:05 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+http://svn.apache.org/r1674542
+--- modules/ssl/ssl_engine_rand.c.orig Mon Dec 5 01:08:01 2011
++++ modules/ssl/ssl_engine_rand.c Wed Apr 15 21:25:38 2015
+@@ -81,6 +81,7 @@ int ssl_rand_seed(server_rec *s, apr_pool_t *p, ssl_rs
+ nDone += ssl_rand_feedfp(p, fp, pRandSeed->nBytes);
+ ssl_util_ppclose(s, p, fp);
+ }
++#ifdef HAVE_RAND_EGD
+ else if (pRandSeed->nSrc == SSL_RSSRC_EGD) {
+ /*
+ * seed in contents provided by the external
+@@ -90,6 +91,7 @@ int ssl_rand_seed(server_rec *s, apr_pool_t *p, ssl_rs
+ continue;
+ nDone += n;
+ }
++#endif
+ else if (pRandSeed->nSrc == SSL_RSSRC_BUILTIN) {
+ struct {
+ time_t t;
Index: patches/patch-modules_ssl_ssl_engine_vars_c
===================================================================
RCS file: patches/patch-modules_ssl_ssl_engine_vars_c
diff -N patches/patch-modules_ssl_ssl_engine_vars_c
--- patches/patch-modules_ssl_ssl_engine_vars_c 12 Jul 2014 14:11:32 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-modules_ssl_ssl_engine_vars_c,v 1.1 2014/07/12 14:11:32 pascal
Exp $
---- modules/ssl/ssl_engine_vars.c.orig Sat Jul 12 15:29:38 2014
-+++ modules/ssl/ssl_engine_vars.c Sat Jul 12 15:27:49 2014
-@@ -832,7 +832,7 @@ static char *ssl_var_lookup_ssl_compress_meth(SSL *ssl
- {
- char *result = "NULL";
- #ifdef OPENSSL_VERSION_NUMBER
--#if (OPENSSL_VERSION_NUMBER >= 0x00908000)
-+#if (OPENSSL_VERSION_NUMBER >= 0x00908000) && !defined(OPENSSL_NO_COMP)
- SSL_SESSION *pSession = SSL_get_session(ssl);
-
- if (pSession) {
Index: patches/patch-modules_ssl_ssl_toolkit_compat_h
===================================================================
RCS file: patches/patch-modules_ssl_ssl_toolkit_compat_h
diff -N patches/patch-modules_ssl_ssl_toolkit_compat_h
--- patches/patch-modules_ssl_ssl_toolkit_compat_h 27 Apr 2014 19:15:43
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-modules_ssl_ssl_toolkit_compat_h,v 1.1 2014/04/27 19:15:43
stsp Exp $
---- modules/ssl/ssl_toolkit_compat.h.orig Sun Apr 27 20:43:17 2014
-+++ modules/ssl/ssl_toolkit_compat.h Sun Apr 27 20:46:16 2014
-@@ -143,8 +143,6 @@ typedef int (modssl_read_bio_cb_fn)(char*,int,int,void
- #define X509_reference_inc(cert) \
- CRYPTO_add(&((cert)->references), +1, CRYPTO_LOCK_X509)
-
--#define HAVE_SSL_RAND_EGD /* since 9.5.1 */
--
- #define HAVE_SSL_X509V3_EXT_d2i
-
- #if (OPENSSL_VERSION_NUMBER >= 0x009080a0) && defined(OPENSSL_FIPS)
Index: patches/patch-server_mpm_common_c
===================================================================
RCS file: patches/patch-server_mpm_common_c
diff -N patches/patch-server_mpm_common_c
--- patches/patch-server_mpm_common_c 15 Jul 2013 07:40:18 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,52 +0,0 @@
-$OpenBSD: patch-server_mpm_common_c,v 1.6 2013/07/15 07:40:18 sthen Exp $
---- server/mpm_common.c.orig Sat Feb 16 22:51:16 2013
-+++ server/mpm_common.c Mon Jul 15 08:40:33 2013
-@@ -994,18 +994,18 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
- *exit_status = 1;
- return 1;
- }
-- status = "httpd (no pid file) not running";
-+ status = "httpd2 (no pid file) not running";
- }
- else {
- if (kill(otherpid, 0) == 0) {
- running = 1;
- status = apr_psprintf(pconf,
-- "httpd (pid %" APR_PID_T_FMT ") already "
-+ "httpd2 (pid %" APR_PID_T_FMT ") already "
- "running", otherpid);
- }
- else {
- status = apr_psprintf(pconf,
-- "httpd (pid %" APR_PID_T_FMT "?) not
running",
-+ "httpd2 (pid %" APR_PID_T_FMT "?) not
running",
- otherpid);
- }
- }
-@@ -1029,7 +1029,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
-
- if (!strcmp(dash_k_arg, "restart")) {
- if (!running) {
-- printf("httpd not running, trying to start\n");
-+ printf("httpd2 not running, trying to start\n");
- }
- else {
- *exit_status = send_signal(otherpid, SIGHUP);
-@@ -1039,7 +1039,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
-
- if (!strcmp(dash_k_arg, "graceful")) {
- if (!running) {
-- printf("httpd not running, trying to start\n");
-+ printf("httpd2 not running, trying to start\n");
- }
- else {
- *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL);
-@@ -1056,7 +1056,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
- *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL_STOP);
- }
- #else
-- printf("httpd MPM \"" MPM_NAME "\" does not support graceful-stop\n");
-+ printf("httpd2 MPM \"" MPM_NAME "\" does not support
graceful-stop\n");
- #endif
- return 1;
- }
Index: patches/patch-server_mpm_unix_c
===================================================================
RCS file: patches/patch-server_mpm_unix_c
diff -N patches/patch-server_mpm_unix_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-server_mpm_unix_c 8 May 2015 10:39:32 -0000
@@ -0,0 +1,43 @@
+$OpenBSD$
+--- server/mpm_unix.c.orig Thu Feb 20 20:38:49 2014
++++ server/mpm_unix.c Sat Jan 10 15:00:07 2015
+@@ -784,18 +784,18 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
+ *exit_status = 1;
+ return 1;
+ }
+- status = "httpd (no pid file) not running";
++ status = "httpd2 (no pid file) not running";
+ }
+ else {
+ if (kill(otherpid, 0) == 0) {
+ running = 1;
+ status = apr_psprintf(pconf,
+- "httpd (pid %" APR_PID_T_FMT ") already "
++ "httpd2 (pid %" APR_PID_T_FMT ") already "
+ "running", otherpid);
+ }
+ else {
+ status = apr_psprintf(pconf,
+- "httpd (pid %" APR_PID_T_FMT "?) not
running",
++ "httpd2 (pid %" APR_PID_T_FMT "?) not
running",
+ otherpid);
+ }
+ }
+@@ -819,7 +819,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
+
+ if (!strcmp(dash_k_arg, "restart")) {
+ if (!running) {
+- printf("httpd not running, trying to start\n");
++ printf("httpd2 not running, trying to start\n");
+ }
+ else {
+ *exit_status = send_signal(otherpid, SIGHUP);
+@@ -829,7 +829,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
+
+ if (!strcmp(dash_k_arg, "graceful")) {
+ if (!running) {
+- printf("httpd not running, trying to start\n");
++ printf("httpd2 not running, trying to start\n");
+ }
+ else {
+ *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL);
Index: patches/patch-support_apachectl_in
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-support_apachectl_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-support_apachectl_in
--- patches/patch-support_apachectl_in 16 Jul 2014 14:41:20 -0000 1.3
+++ patches/patch-support_apachectl_in 8 May 2015 10:39:32 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-support_apachectl_in,v 1.3 2014/07/16 14:41:20 sthen Exp $
---- support/apachectl.in.orig Wed Jul 12 04:38:44 2006
-+++ support/apachectl.in Wed Jul 16 15:25:38 2014
-@@ -51,7 +51,7 @@ fi
+--- support/apachectl.in.orig Wed Feb 1 04:47:28 2012
++++ support/apachectl.in Sat Jan 10 15:05:02 2015
+@@ -52,7 +52,7 @@ fi
# a command that outputs a formatted text version of the HTML at the
# url given on the command line. Designed for lynx, however other
# programs may work.
@@ -10,7 +10,7 @@ $OpenBSD: patch-support_apachectl_in,v 1
#
# the URL to your server's mod_status status page. If you do not
# have one, then status and fullstatus will not work.
-@@ -65,6 +65,10 @@ ULIMIT_MAX_FILES="@APACHECTL_ULIMIT@"
+@@ -66,6 +66,10 @@ ULIMIT_MAX_FILES="@APACHECTL_ULIMIT@"
# -------------------- --------------------
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
@@ -21,7 +21,7 @@ $OpenBSD: patch-support_apachectl_in,v 1
# Set the maximum number of file descriptors allowed per child process.
if [ "x$ULIMIT_MAX_FILES" != "x" ] ; then
$ULIMIT_MAX_FILES
-@@ -82,8 +86,8 @@ start|stop|restart|graceful|graceful-stop)
+@@ -83,8 +87,8 @@ start|stop|restart|graceful|graceful-stop)
;;
startssl|sslstart|start-SSL)
echo The startssl option is no longer supported.
Index: patches/patch-support_apxs_in
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-support_apxs_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-support_apxs_in
--- patches/patch-support_apxs_in 1 Sep 2011 13:40:09 -0000 1.2
+++ patches/patch-support_apxs_in 8 May 2015 10:39:32 -0000
@@ -1,20 +1,18 @@
$OpenBSD: patch-support_apxs_in,v 1.2 2011/09/01 13:40:09 giovanni Exp $
---- support/apxs.in.orig Mon May 10 22:02:56 2010
-+++ support/apxs.in Wed Aug 31 11:53:53 2011
-@@ -647,13 +647,13 @@ __DATA__
+--- support/apxs.in.orig Thu Dec 26 19:01:53 2013
++++ support/apxs.in Sat Jan 10 15:07:15 2015
+@@ -671,12 +671,12 @@ __DATA__
##
builddir=.
-top_srcdir=%PREFIX%
-top_builddir=%PREFIX%
-+top_srcdir=%%PREFIX%%/share/apache2
-+top_builddir=%%PREFIX%%/share/apache2
++top_srcdir=%PREFIX%/share/apache2
++top_builddir=%PREFIX%/share/apache2
include %INSTALLBUILDDIR%/special.mk
# the used tools
--APXS=apxs
-APACHECTL=apachectl
-+APXS=apxs2
+APACHECTL=apachectl2
# additional defines, includes and libraries
Index: patches/patch-support_rotatelogs_c
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-support_rotatelogs_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-support_rotatelogs_c
--- patches/patch-support_rotatelogs_c 2 Sep 2008 22:05:23 -0000 1.4
+++ patches/patch-support_rotatelogs_c 8 May 2015 10:39:32 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-support_rotatelogs_c,v 1.4 2008/09/02 22:05:23 bernd Exp $
---- support/rotatelogs.c.orig Fri May 9 15:43:24 2008
-+++ support/rotatelogs.c Thu Jul 24 12:22:15 2008
-@@ -86,7 +86,7 @@ static void usage(const char *argv0, const char *reaso
+--- support/rotatelogs.c.orig Thu Apr 17 11:00:36 2014
++++ support/rotatelogs.c Sat Jan 10 15:07:45 2015
+@@ -123,7 +123,7 @@ static void usage(const char *argv0, const char *reaso
"or \n\nTransferLog \"|%s /some/where 5M\"\n\n", argv0);
#endif
fprintf(stderr,
-- "to httpd.conf. The generated name will be /some/where.nnnn "
-+ "to httpd2.conf. The generated name will be /some/where.nnnn "
- "where nnnn is the\nsystem time at which the log nominally "
- "starts (N.B. if using a rotation time,\nthe time will always "
- "be a multiple of the rotation time, so you can synchronize\n"
+- "to httpd.conf. By default, the generated name will be\n"
++ "to httpd2.conf. By default, the generated name will be\n"
+ "<logfile>.nnnn where nnnn is the system time at which the log\n"
+ "nominally starts (N.B. if using a rotation time, the time will\n"
+ "always be a multiple of the rotation time, so you can
synchronize\n"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/apache-httpd/pkg/PLIST,v
retrieving revision 1.25
diff -u -p -r1.25 PLIST
--- pkg/PLIST 17 Sep 2014 10:11:08 -0000 1.25
+++ pkg/PLIST 11 May 2015 16:57:23 -0000
@@ -1,11 +1,20 @@
@comment $OpenBSD: PLIST,v 1.25 2014/09/17 10:11:08 sthen Exp $
@newgroup _apache2:576
@newuser _apache2:576:576:daemon:Apache HTTP Server:/var/empty:/sbin/nologin
+@bin bin/ab
+bin/dbmmanage2
+@bin bin/htdbm
+@bin bin/htdigest2
+@bin bin/htpasswd2
+@bin bin/httxt2dbm
+@bin bin/logresolve2
include/apache2/
include/apache2/ap_compat.h
include/apache2/ap_config.h
include/apache2/ap_config_auto.h
include/apache2/ap_config_layout.h
+include/apache2/ap_expr.h
+include/apache2/ap_hooks.h
include/apache2/ap_listen.h
include/apache2/ap_mmn.h
include/apache2/ap_mpm.h
@@ -13,6 +22,11 @@ include/apache2/ap_provider.h
include/apache2/ap_regex.h
include/apache2/ap_regkey.h
include/apache2/ap_release.h
+include/apache2/ap_slotmem.h
+include/apache2/ap_socache.h
+include/apache2/apache_noprobes.h
+include/apache2/cache_common.h
+include/apache2/heartbeat.h
include/apache2/http_config.h
include/apache2/http_connection.h
include/apache2/http_core.h
@@ -23,6 +37,7 @@ include/apache2/http_request.h
include/apache2/http_vhost.h
include/apache2/httpd.h
include/apache2/mod_auth.h
+include/apache2/mod_cache.h
include/apache2/mod_cgi.h
include/apache2/mod_core.h
include/apache2/mod_dav.h
@@ -30,115 +45,160 @@ include/apache2/mod_dbd.h
include/apache2/mod_include.h
include/apache2/mod_log_config.h
include/apache2/mod_proxy.h
+include/apache2/mod_request.h
include/apache2/mod_rewrite.h
+include/apache2/mod_session.h
+include/apache2/mod_so.h
include/apache2/mod_ssl.h
include/apache2/mod_status.h
-include/apache2/mpm.h
+include/apache2/mod_unixd.h
+include/apache2/mod_watchdog.h
+include/apache2/mod_xml2enc.h
include/apache2/mpm_common.h
-include/apache2/mpm_default.h
include/apache2/os.h
include/apache2/scoreboard.h
include/apache2/unixd.h
include/apache2/util_cfgtree.h
include/apache2/util_charset.h
+include/apache2/util_cookies.h
include/apache2/util_ebcdic.h
+include/apache2/util_fcgi.h
include/apache2/util_filter.h
include/apache2/util_ldap.h
include/apache2/util_md5.h
+include/apache2/util_mutex.h
include/apache2/util_script.h
include/apache2/util_time.h
+include/apache2/util_varbuf.h
include/apache2/util_xml.h
lib/apache2/
lib/apache2/httpd.exp
+lib/apache2/mod_access_compat.so
lib/apache2/mod_actions.so
lib/apache2/mod_alias.so
+lib/apache2/mod_allowmethods.so
lib/apache2/mod_asis.so
lib/apache2/mod_auth_basic.so
lib/apache2/mod_auth_digest.so
+lib/apache2/mod_auth_form.so
lib/apache2/mod_authn_anon.so
+lib/apache2/mod_authn_core.so
lib/apache2/mod_authn_dbd.so
lib/apache2/mod_authn_dbm.so
-lib/apache2/mod_authn_default.so
lib/apache2/mod_authn_file.so
+lib/apache2/mod_authn_socache.so
+lib/apache2/mod_authz_core.so
+lib/apache2/mod_authz_dbd.so
lib/apache2/mod_authz_dbm.so
-lib/apache2/mod_authz_default.so
lib/apache2/mod_authz_groupfile.so
lib/apache2/mod_authz_host.so
lib/apache2/mod_authz_owner.so
lib/apache2/mod_authz_user.so
lib/apache2/mod_autoindex.so
+lib/apache2/mod_buffer.so
lib/apache2/mod_cache.so
-lib/apache2/mod_cern_meta.so
-lib/apache2/mod_cgi.so
+lib/apache2/mod_cache_disk.so
+lib/apache2/mod_cache_socache.so
+@comment lib/apache2/mod_cgid.so
+lib/apache2/mod_charset_lite.so
+lib/apache2/mod_data.so
lib/apache2/mod_dav.so
lib/apache2/mod_dav_fs.so
+lib/apache2/mod_dav_lock.so
lib/apache2/mod_dbd.so
lib/apache2/mod_deflate.so
+lib/apache2/mod_dialup.so
lib/apache2/mod_dir.so
-lib/apache2/mod_disk_cache.so
lib/apache2/mod_dumpio.so
+lib/apache2/mod_echo.so
lib/apache2/mod_env.so
lib/apache2/mod_expires.so
lib/apache2/mod_ext_filter.so
+lib/apache2/mod_file_cache.so
lib/apache2/mod_filter.so
lib/apache2/mod_headers.so
-lib/apache2/mod_ident.so
-lib/apache2/mod_imagemap.so
+lib/apache2/mod_heartbeat.so
+lib/apache2/mod_heartmonitor.so
lib/apache2/mod_include.so
lib/apache2/mod_info.so
+lib/apache2/mod_lbmethod_bybusyness.so
+lib/apache2/mod_lbmethod_byrequests.so
+lib/apache2/mod_lbmethod_bytraffic.so
+lib/apache2/mod_lbmethod_heartbeat.so
lib/apache2/mod_log_config.so
+lib/apache2/mod_log_debug.so
lib/apache2/mod_log_forensic.so
lib/apache2/mod_logio.so
+lib/apache2/mod_macro.so
lib/apache2/mod_mime.so
lib/apache2/mod_mime_magic.so
+lib/apache2/mod_mpm_event.so
+lib/apache2/mod_mpm_prefork.so
+lib/apache2/mod_mpm_worker.so
lib/apache2/mod_negotiation.so
lib/apache2/mod_proxy.so
lib/apache2/mod_proxy_ajp.so
lib/apache2/mod_proxy_balancer.so
lib/apache2/mod_proxy_connect.so
+lib/apache2/mod_proxy_express.so
+lib/apache2/mod_proxy_fcgi.so
+lib/apache2/mod_proxy_fdpass.so
lib/apache2/mod_proxy_ftp.so
+lib/apache2/mod_proxy_html.so
lib/apache2/mod_proxy_http.so
lib/apache2/mod_proxy_scgi.so
+lib/apache2/mod_proxy_wstunnel.so
+lib/apache2/mod_ratelimit.so
+lib/apache2/mod_reflector.so
+lib/apache2/mod_remoteip.so
lib/apache2/mod_reqtimeout.so
+lib/apache2/mod_request.so
lib/apache2/mod_rewrite.so
+lib/apache2/mod_sed.so
+lib/apache2/mod_session.so
+lib/apache2/mod_session_cookie.so
+lib/apache2/mod_session_dbd.so
lib/apache2/mod_setenvif.so
+lib/apache2/mod_slotmem_plain.so
+lib/apache2/mod_slotmem_shm.so
+lib/apache2/mod_socache_dbm.so
+lib/apache2/mod_socache_memcache.so
+lib/apache2/mod_socache_shmcb.so
lib/apache2/mod_speling.so
lib/apache2/mod_ssl.so
lib/apache2/mod_status.so
lib/apache2/mod_substitute.so
lib/apache2/mod_suexec.so
lib/apache2/mod_unique_id.so
+lib/apache2/mod_unixd.so
lib/apache2/mod_userdir.so
lib/apache2/mod_usertrack.so
lib/apache2/mod_version.so
lib/apache2/mod_vhost_alias.so
+lib/apache2/mod_watchdog.so
+lib/apache2/mod_xml2enc.so
+@man man/man1/ab.1
+@man man/man1/apxs2.1
@man man/man1/dbmmanage2.1
@man man/man1/htdbm.1
@man man/man1/htdigest2.1
@man man/man1/htpasswd2.1
@man man/man1/httxt2dbm.1
-@man man/man8/ab.8
+@man man/man1/logresolve2.1
@man man/man8/apachectl2.8
-@man man/man8/apxs2.8
+@man man/man8/fcgistarter.8
@man man/man8/htcacheclean.8
@man man/man8/httpd2.8
-@man man/man8/logresolve2.8
@man man/man8/rotatelogs2.8
@man man/man8/suexec2.8
-@bin sbin/ab
sbin/apachectl2
sbin/apxs2
@bin sbin/checkgid
-sbin/dbmmanage2
sbin/envvars
sbin/envvars-std
+@bin sbin/fcgistarter
@bin sbin/htcacheclean
-@bin sbin/htdbm
-@bin sbin/htdigest2
-@bin sbin/htpasswd2
@bin sbin/httpd2
-@bin sbin/httxt2dbm
-@bin sbin/logresolve2
@bin sbin/rotatelogs2
@mode 555
@bin sbin/suexec2
@@ -155,6 +215,7 @@ share/apache2/build/program.mk
share/apache2/build/rules.mk
share/apache2/build/special.mk
share/doc/apache2/
+@comment share/doc/apache2/BUILDING
share/doc/apache2/LICENSE
share/doc/apache2/bind.html
share/doc/apache2/bind.html.de
@@ -184,6 +245,7 @@ share/doc/apache2/convenience.map
share/doc/apache2/custom-error.html
share/doc/apache2/custom-error.html.en
share/doc/apache2/custom-error.html.es
+share/doc/apache2/custom-error.html.fr
share/doc/apache2/custom-error.html.ja.utf8
share/doc/apache2/custom-error.html.ko.euc-kr
share/doc/apache2/custom-error.html.tr.utf8
@@ -202,31 +264,44 @@ share/doc/apache2/developer/hooks.html.e
share/doc/apache2/developer/index.html
share/doc/apache2/developer/index.html.en
share/doc/apache2/developer/index.html.zh-cn.utf8
+share/doc/apache2/developer/modguide.html
+share/doc/apache2/developer/modguide.html.en
share/doc/apache2/developer/modules.html
share/doc/apache2/developer/modules.html.en
share/doc/apache2/developer/modules.html.ja.utf8
+share/doc/apache2/developer/new_api_2_4.html
+share/doc/apache2/developer/new_api_2_4.html.en
+share/doc/apache2/developer/output-filters.html
+share/doc/apache2/developer/output-filters.html.en
share/doc/apache2/developer/request.html
share/doc/apache2/developer/request.html.en
share/doc/apache2/developer/thread_safety.html
share/doc/apache2/developer/thread_safety.html.en
share/doc/apache2/dns-caveats.html
share/doc/apache2/dns-caveats.html.en
+share/doc/apache2/dns-caveats.html.fr
share/doc/apache2/dns-caveats.html.ja.utf8
share/doc/apache2/dns-caveats.html.ko.euc-kr
share/doc/apache2/dns-caveats.html.tr.utf8
share/doc/apache2/dso.html
share/doc/apache2/dso.html.en
+share/doc/apache2/dso.html.fr
share/doc/apache2/dso.html.ja.utf8
share/doc/apache2/dso.html.ko.euc-kr
share/doc/apache2/dso.html.tr.utf8
share/doc/apache2/env.html
share/doc/apache2/env.html.en
+share/doc/apache2/env.html.fr
share/doc/apache2/env.html.ja.utf8
share/doc/apache2/env.html.ko.euc-kr
share/doc/apache2/env.html.tr.utf8
+share/doc/apache2/expr.html
+share/doc/apache2/expr.html.en
+share/doc/apache2/expr.html.fr
share/doc/apache2/faq/
share/doc/apache2/faq/index.html
share/doc/apache2/faq/index.html.en
+share/doc/apache2/faq/index.html.fr
share/doc/apache2/faq/index.html.tr.utf8
share/doc/apache2/faq/index.html.zh-cn.utf8
share/doc/apache2/filter.html
@@ -236,6 +311,9 @@ share/doc/apache2/filter.html.fr
share/doc/apache2/filter.html.ja.utf8
share/doc/apache2/filter.html.ko.euc-kr
share/doc/apache2/filter.html.tr.utf8
+share/doc/apache2/getting-started.html
+share/doc/apache2/getting-started.html.en
+share/doc/apache2/getting-started.html.fr
share/doc/apache2/glossary.html
share/doc/apache2/glossary.html.de
share/doc/apache2/glossary.html.en
@@ -250,12 +328,12 @@ share/doc/apache2/handler.html.es
share/doc/apache2/handler.html.fr
share/doc/apache2/handler.html.ja.utf8
share/doc/apache2/handler.html.ko.euc-kr
-share/doc/apache2/handler.html.ru.koi8-r
share/doc/apache2/handler.html.tr.utf8
share/doc/apache2/handler.html.zh-cn.utf8
share/doc/apache2/howto/
share/doc/apache2/howto/access.html
share/doc/apache2/howto/access.html.en
+share/doc/apache2/howto/access.html.fr
share/doc/apache2/howto/auth.html
share/doc/apache2/howto/auth.html.en
share/doc/apache2/howto/auth.html.fr
@@ -264,6 +342,7 @@ share/doc/apache2/howto/auth.html.ko.euc
share/doc/apache2/howto/auth.html.tr.utf8
share/doc/apache2/howto/cgi.html
share/doc/apache2/howto/cgi.html.en
+share/doc/apache2/howto/cgi.html.fr
share/doc/apache2/howto/cgi.html.ja.utf8
share/doc/apache2/howto/cgi.html.ko.euc-kr
share/doc/apache2/howto/htaccess.html
@@ -274,20 +353,26 @@ share/doc/apache2/howto/htaccess.html.ko
share/doc/apache2/howto/htaccess.html.pt-br
share/doc/apache2/howto/index.html
share/doc/apache2/howto/index.html.en
+share/doc/apache2/howto/index.html.fr
share/doc/apache2/howto/index.html.ja.utf8
share/doc/apache2/howto/index.html.ko.euc-kr
share/doc/apache2/howto/index.html.zh-cn.utf8
share/doc/apache2/howto/public_html.html
share/doc/apache2/howto/public_html.html.en
+share/doc/apache2/howto/public_html.html.fr
share/doc/apache2/howto/public_html.html.ja.utf8
share/doc/apache2/howto/public_html.html.ko.euc-kr
share/doc/apache2/howto/public_html.html.tr.utf8
share/doc/apache2/howto/ssi.html
share/doc/apache2/howto/ssi.html.en
+share/doc/apache2/howto/ssi.html.fr
share/doc/apache2/howto/ssi.html.ja.utf8
share/doc/apache2/howto/ssi.html.ko.euc-kr
share/doc/apache2/images/
share/doc/apache2/images/apache_header.gif
+share/doc/apache2/images/build_a_mod_2.png
+share/doc/apache2/images/build_a_mod_3.png
+share/doc/apache2/images/build_a_mod_4.png
share/doc/apache2/images/caching_fig1.gif
share/doc/apache2/images/caching_fig1.png
share/doc/apache2/images/caching_fig1.tr.png
@@ -312,6 +397,7 @@ share/doc/apache2/images/mod_rewrite_fig
share/doc/apache2/images/mod_rewrite_fig2.png
share/doc/apache2/images/pixel.gif
share/doc/apache2/images/rewrite_backreferences.png
+share/doc/apache2/images/rewrite_process_uri.png
share/doc/apache2/images/rewrite_rule_flow.png
share/doc/apache2/images/right.gif
share/doc/apache2/images/ssl_intro_fig1.gif
@@ -325,6 +411,7 @@ share/doc/apache2/images/syntax_rewritec
share/doc/apache2/images/syntax_rewriterule.png
share/doc/apache2/images/up.gif
share/doc/apache2/index.html
+share/doc/apache2/index.html.da
share/doc/apache2/index.html.de
share/doc/apache2/index.html.en
share/doc/apache2/index.html.es
@@ -349,7 +436,6 @@ share/doc/apache2/invoking.html.es
share/doc/apache2/invoking.html.fr
share/doc/apache2/invoking.html.ja.utf8
share/doc/apache2/invoking.html.ko.euc-kr
-share/doc/apache2/invoking.html.ru.koi8-r
share/doc/apache2/invoking.html.tr.utf8
share/doc/apache2/license.html
share/doc/apache2/license.html.en
@@ -362,39 +448,38 @@ share/doc/apache2/logs.html.tr.utf8
share/doc/apache2/misc/
share/doc/apache2/misc/index.html
share/doc/apache2/misc/index.html.en
+share/doc/apache2/misc/index.html.fr
share/doc/apache2/misc/index.html.ko.euc-kr
share/doc/apache2/misc/index.html.tr.utf8
share/doc/apache2/misc/index.html.zh-cn.utf8
share/doc/apache2/misc/password_encryptions.html
share/doc/apache2/misc/password_encryptions.html.en
+share/doc/apache2/misc/password_encryptions.html.fr
share/doc/apache2/misc/perf-tuning.html
share/doc/apache2/misc/perf-tuning.html.en
+share/doc/apache2/misc/perf-tuning.html.fr
share/doc/apache2/misc/perf-tuning.html.ko.euc-kr
share/doc/apache2/misc/perf-tuning.html.tr.utf8
share/doc/apache2/misc/relevant_standards.html
share/doc/apache2/misc/relevant_standards.html.en
+share/doc/apache2/misc/relevant_standards.html.fr
share/doc/apache2/misc/relevant_standards.html.ko.euc-kr
-share/doc/apache2/misc/rewriteguide.html
-share/doc/apache2/misc/rewriteguide.html.en
-share/doc/apache2/misc/rewriteguide.html.ko.euc-kr
share/doc/apache2/misc/security_tips.html
share/doc/apache2/misc/security_tips.html.en
+share/doc/apache2/misc/security_tips.html.fr
share/doc/apache2/misc/security_tips.html.ko.euc-kr
share/doc/apache2/misc/security_tips.html.tr.utf8
share/doc/apache2/mod/
-share/doc/apache2/mod/beos.html
-share/doc/apache2/mod/beos.html.de
-share/doc/apache2/mod/beos.html.en
-share/doc/apache2/mod/beos.html.es
-share/doc/apache2/mod/beos.html.ko.euc-kr
share/doc/apache2/mod/core.html
share/doc/apache2/mod/core.html.de
share/doc/apache2/mod/core.html.en
+share/doc/apache2/mod/core.html.es
share/doc/apache2/mod/core.html.fr
share/doc/apache2/mod/core.html.ja.utf8
share/doc/apache2/mod/core.html.tr.utf8
share/doc/apache2/mod/directive-dict.html
share/doc/apache2/mod/directive-dict.html.en
+share/doc/apache2/mod/directive-dict.html.fr
share/doc/apache2/mod/directive-dict.html.ja.utf8
share/doc/apache2/mod/directive-dict.html.ko.euc-kr
share/doc/apache2/mod/directive-dict.html.tr.utf8
@@ -402,33 +487,45 @@ share/doc/apache2/mod/directives.html
share/doc/apache2/mod/directives.html.de
share/doc/apache2/mod/directives.html.en
share/doc/apache2/mod/directives.html.es
+share/doc/apache2/mod/directives.html.fr
share/doc/apache2/mod/directives.html.ja.utf8
share/doc/apache2/mod/directives.html.ko.euc-kr
-share/doc/apache2/mod/directives.html.ru.koi8-r
share/doc/apache2/mod/directives.html.tr.utf8
share/doc/apache2/mod/directives.html.zh-cn.utf8
share/doc/apache2/mod/event.html
share/doc/apache2/mod/event.html.en
+share/doc/apache2/mod/event.html.fr
share/doc/apache2/mod/index.html
share/doc/apache2/mod/index.html.de
share/doc/apache2/mod/index.html.en
share/doc/apache2/mod/index.html.es
+share/doc/apache2/mod/index.html.fr
share/doc/apache2/mod/index.html.ja.utf8
share/doc/apache2/mod/index.html.ko.euc-kr
share/doc/apache2/mod/index.html.tr.utf8
share/doc/apache2/mod/index.html.zh-cn.utf8
+share/doc/apache2/mod/mod_access_compat.html
+share/doc/apache2/mod/mod_access_compat.html.en
+share/doc/apache2/mod/mod_access_compat.html.fr
+share/doc/apache2/mod/mod_access_compat.html.ja.utf8
share/doc/apache2/mod/mod_actions.html
share/doc/apache2/mod/mod_actions.html.de
share/doc/apache2/mod/mod_actions.html.en
+share/doc/apache2/mod/mod_actions.html.fr
share/doc/apache2/mod/mod_actions.html.ja.utf8
share/doc/apache2/mod/mod_actions.html.ko.euc-kr
share/doc/apache2/mod/mod_alias.html
share/doc/apache2/mod/mod_alias.html.en
+share/doc/apache2/mod/mod_alias.html.fr
share/doc/apache2/mod/mod_alias.html.ja.utf8
share/doc/apache2/mod/mod_alias.html.ko.euc-kr
share/doc/apache2/mod/mod_alias.html.tr.utf8
+share/doc/apache2/mod/mod_allowmethods.html
+share/doc/apache2/mod/mod_allowmethods.html.en
+share/doc/apache2/mod/mod_allowmethods.html.fr
share/doc/apache2/mod/mod_asis.html
share/doc/apache2/mod/mod_asis.html.en
+share/doc/apache2/mod/mod_asis.html.fr
share/doc/apache2/mod/mod_asis.html.ja.utf8
share/doc/apache2/mod/mod_asis.html.ko.euc-kr
share/doc/apache2/mod/mod_auth_basic.html
@@ -440,53 +537,64 @@ share/doc/apache2/mod/mod_auth_digest.ht
share/doc/apache2/mod/mod_auth_digest.html.en
share/doc/apache2/mod/mod_auth_digest.html.fr
share/doc/apache2/mod/mod_auth_digest.html.ko.euc-kr
-share/doc/apache2/mod/mod_authn_alias.html
-share/doc/apache2/mod/mod_authn_alias.html.en
-share/doc/apache2/mod/mod_authn_alias.html.fr
+share/doc/apache2/mod/mod_auth_form.html
+share/doc/apache2/mod/mod_auth_form.html.en
+share/doc/apache2/mod/mod_auth_form.html.fr
share/doc/apache2/mod/mod_authn_anon.html
share/doc/apache2/mod/mod_authn_anon.html.en
+share/doc/apache2/mod/mod_authn_anon.html.fr
share/doc/apache2/mod/mod_authn_anon.html.ja.utf8
share/doc/apache2/mod/mod_authn_anon.html.ko.euc-kr
+share/doc/apache2/mod/mod_authn_core.html
+share/doc/apache2/mod/mod_authn_core.html.en
+share/doc/apache2/mod/mod_authn_core.html.fr
share/doc/apache2/mod/mod_authn_dbd.html
share/doc/apache2/mod/mod_authn_dbd.html.en
+share/doc/apache2/mod/mod_authn_dbd.html.fr
share/doc/apache2/mod/mod_authn_dbm.html
share/doc/apache2/mod/mod_authn_dbm.html.en
+share/doc/apache2/mod/mod_authn_dbm.html.fr
share/doc/apache2/mod/mod_authn_dbm.html.ja.utf8
share/doc/apache2/mod/mod_authn_dbm.html.ko.euc-kr
-share/doc/apache2/mod/mod_authn_default.html
-share/doc/apache2/mod/mod_authn_default.html.en
-share/doc/apache2/mod/mod_authn_default.html.ja.utf8
-share/doc/apache2/mod/mod_authn_default.html.ko.euc-kr
share/doc/apache2/mod/mod_authn_file.html
share/doc/apache2/mod/mod_authn_file.html.en
share/doc/apache2/mod/mod_authn_file.html.fr
share/doc/apache2/mod/mod_authn_file.html.ja.utf8
share/doc/apache2/mod/mod_authn_file.html.ko.euc-kr
+share/doc/apache2/mod/mod_authn_socache.html
+share/doc/apache2/mod/mod_authn_socache.html.en
+share/doc/apache2/mod/mod_authn_socache.html.fr
+share/doc/apache2/mod/mod_authnz_fcgi.html
+share/doc/apache2/mod/mod_authnz_fcgi.html.en
share/doc/apache2/mod/mod_authnz_ldap.html
share/doc/apache2/mod/mod_authnz_ldap.html.en
share/doc/apache2/mod/mod_authnz_ldap.html.fr
+share/doc/apache2/mod/mod_authz_core.html
+share/doc/apache2/mod/mod_authz_core.html.en
+share/doc/apache2/mod/mod_authz_core.html.fr
+share/doc/apache2/mod/mod_authz_dbd.html
+share/doc/apache2/mod/mod_authz_dbd.html.en
+share/doc/apache2/mod/mod_authz_dbd.html.fr
share/doc/apache2/mod/mod_authz_dbm.html
share/doc/apache2/mod/mod_authz_dbm.html.en
+share/doc/apache2/mod/mod_authz_dbm.html.fr
share/doc/apache2/mod/mod_authz_dbm.html.ko.euc-kr
-share/doc/apache2/mod/mod_authz_default.html
-share/doc/apache2/mod/mod_authz_default.html.en
-share/doc/apache2/mod/mod_authz_default.html.ja.utf8
-share/doc/apache2/mod/mod_authz_default.html.ko.euc-kr
share/doc/apache2/mod/mod_authz_groupfile.html
share/doc/apache2/mod/mod_authz_groupfile.html.en
+share/doc/apache2/mod/mod_authz_groupfile.html.fr
share/doc/apache2/mod/mod_authz_groupfile.html.ja.utf8
share/doc/apache2/mod/mod_authz_groupfile.html.ko.euc-kr
share/doc/apache2/mod/mod_authz_host.html
share/doc/apache2/mod/mod_authz_host.html.en
share/doc/apache2/mod/mod_authz_host.html.fr
-share/doc/apache2/mod/mod_authz_host.html.ja.utf8
-share/doc/apache2/mod/mod_authz_host.html.ko.euc-kr
share/doc/apache2/mod/mod_authz_owner.html
share/doc/apache2/mod/mod_authz_owner.html.en
+share/doc/apache2/mod/mod_authz_owner.html.fr
share/doc/apache2/mod/mod_authz_owner.html.ja.utf8
share/doc/apache2/mod/mod_authz_owner.html.ko.euc-kr
share/doc/apache2/mod/mod_authz_user.html
share/doc/apache2/mod/mod_authz_user.html.en
+share/doc/apache2/mod/mod_authz_user.html.fr
share/doc/apache2/mod/mod_authz_user.html.ja.utf8
share/doc/apache2/mod/mod_authz_user.html.ko.euc-kr
share/doc/apache2/mod/mod_autoindex.html
@@ -495,180 +603,321 @@ share/doc/apache2/mod/mod_autoindex.html
share/doc/apache2/mod/mod_autoindex.html.ja.utf8
share/doc/apache2/mod/mod_autoindex.html.ko.euc-kr
share/doc/apache2/mod/mod_autoindex.html.tr.utf8
+share/doc/apache2/mod/mod_buffer.html
+share/doc/apache2/mod/mod_buffer.html.en
+share/doc/apache2/mod/mod_buffer.html.fr
share/doc/apache2/mod/mod_cache.html
share/doc/apache2/mod/mod_cache.html.en
+share/doc/apache2/mod/mod_cache.html.fr
share/doc/apache2/mod/mod_cache.html.ja.utf8
share/doc/apache2/mod/mod_cache.html.ko.euc-kr
+share/doc/apache2/mod/mod_cache_disk.html
+share/doc/apache2/mod/mod_cache_disk.html.en
+share/doc/apache2/mod/mod_cache_disk.html.fr
+share/doc/apache2/mod/mod_cache_disk.html.ja.utf8
+share/doc/apache2/mod/mod_cache_disk.html.ko.euc-kr
+share/doc/apache2/mod/mod_cache_socache.html
+share/doc/apache2/mod/mod_cache_socache.html.en
+share/doc/apache2/mod/mod_cache_socache.html.fr
share/doc/apache2/mod/mod_cern_meta.html
share/doc/apache2/mod/mod_cern_meta.html.en
+share/doc/apache2/mod/mod_cern_meta.html.fr
share/doc/apache2/mod/mod_cern_meta.html.ko.euc-kr
share/doc/apache2/mod/mod_cgi.html
share/doc/apache2/mod/mod_cgi.html.en
+share/doc/apache2/mod/mod_cgi.html.fr
share/doc/apache2/mod/mod_cgi.html.ja.utf8
share/doc/apache2/mod/mod_cgi.html.ko.euc-kr
share/doc/apache2/mod/mod_cgid.html
share/doc/apache2/mod/mod_cgid.html.en
+share/doc/apache2/mod/mod_cgid.html.fr
share/doc/apache2/mod/mod_cgid.html.ja.utf8
share/doc/apache2/mod/mod_cgid.html.ko.euc-kr
share/doc/apache2/mod/mod_charset_lite.html
share/doc/apache2/mod/mod_charset_lite.html.en
+share/doc/apache2/mod/mod_charset_lite.html.fr
share/doc/apache2/mod/mod_charset_lite.html.ko.euc-kr
+share/doc/apache2/mod/mod_data.html
+share/doc/apache2/mod/mod_data.html.en
+share/doc/apache2/mod/mod_data.html.fr
share/doc/apache2/mod/mod_dav.html
share/doc/apache2/mod/mod_dav.html.en
+share/doc/apache2/mod/mod_dav.html.fr
share/doc/apache2/mod/mod_dav.html.ja.utf8
share/doc/apache2/mod/mod_dav.html.ko.euc-kr
share/doc/apache2/mod/mod_dav_fs.html
share/doc/apache2/mod/mod_dav_fs.html.en
+share/doc/apache2/mod/mod_dav_fs.html.fr
share/doc/apache2/mod/mod_dav_fs.html.ja.utf8
share/doc/apache2/mod/mod_dav_fs.html.ko.euc-kr
share/doc/apache2/mod/mod_dav_lock.html
share/doc/apache2/mod/mod_dav_lock.html.en
+share/doc/apache2/mod/mod_dav_lock.html.fr
share/doc/apache2/mod/mod_dav_lock.html.ja.utf8
share/doc/apache2/mod/mod_dbd.html
share/doc/apache2/mod/mod_dbd.html.en
+share/doc/apache2/mod/mod_dbd.html.fr
share/doc/apache2/mod/mod_deflate.html
share/doc/apache2/mod/mod_deflate.html.en
+share/doc/apache2/mod/mod_deflate.html.fr
share/doc/apache2/mod/mod_deflate.html.ja.utf8
share/doc/apache2/mod/mod_deflate.html.ko.euc-kr
+share/doc/apache2/mod/mod_dialup.html
+share/doc/apache2/mod/mod_dialup.html.en
+share/doc/apache2/mod/mod_dialup.html.fr
share/doc/apache2/mod/mod_dir.html
share/doc/apache2/mod/mod_dir.html.en
+share/doc/apache2/mod/mod_dir.html.fr
share/doc/apache2/mod/mod_dir.html.ja.utf8
share/doc/apache2/mod/mod_dir.html.ko.euc-kr
share/doc/apache2/mod/mod_dir.html.tr.utf8
-share/doc/apache2/mod/mod_disk_cache.html
-share/doc/apache2/mod/mod_disk_cache.html.en
-share/doc/apache2/mod/mod_disk_cache.html.ja.utf8
-share/doc/apache2/mod/mod_disk_cache.html.ko.euc-kr
share/doc/apache2/mod/mod_dumpio.html
share/doc/apache2/mod/mod_dumpio.html.en
+share/doc/apache2/mod/mod_dumpio.html.fr
share/doc/apache2/mod/mod_dumpio.html.ja.utf8
share/doc/apache2/mod/mod_echo.html
share/doc/apache2/mod/mod_echo.html.en
+share/doc/apache2/mod/mod_echo.html.fr
share/doc/apache2/mod/mod_echo.html.ja.utf8
share/doc/apache2/mod/mod_echo.html.ko.euc-kr
share/doc/apache2/mod/mod_env.html
share/doc/apache2/mod/mod_env.html.en
+share/doc/apache2/mod/mod_env.html.fr
share/doc/apache2/mod/mod_env.html.ja.utf8
share/doc/apache2/mod/mod_env.html.ko.euc-kr
share/doc/apache2/mod/mod_env.html.tr.utf8
-share/doc/apache2/mod/mod_example.html
-share/doc/apache2/mod/mod_example.html.en
-share/doc/apache2/mod/mod_example.html.ko.euc-kr
+share/doc/apache2/mod/mod_example_hooks.html
+share/doc/apache2/mod/mod_example_hooks.html.en
+share/doc/apache2/mod/mod_example_hooks.html.fr
+share/doc/apache2/mod/mod_example_hooks.html.ko.euc-kr
share/doc/apache2/mod/mod_expires.html
share/doc/apache2/mod/mod_expires.html.en
+share/doc/apache2/mod/mod_expires.html.fr
share/doc/apache2/mod/mod_expires.html.ja.utf8
share/doc/apache2/mod/mod_expires.html.ko.euc-kr
share/doc/apache2/mod/mod_ext_filter.html
share/doc/apache2/mod/mod_ext_filter.html.en
+share/doc/apache2/mod/mod_ext_filter.html.fr
share/doc/apache2/mod/mod_ext_filter.html.ja.utf8
share/doc/apache2/mod/mod_ext_filter.html.ko.euc-kr
share/doc/apache2/mod/mod_file_cache.html
share/doc/apache2/mod/mod_file_cache.html.en
+share/doc/apache2/mod/mod_file_cache.html.fr
share/doc/apache2/mod/mod_file_cache.html.ko.euc-kr
share/doc/apache2/mod/mod_filter.html
share/doc/apache2/mod/mod_filter.html.en
+share/doc/apache2/mod/mod_filter.html.fr
share/doc/apache2/mod/mod_headers.html
share/doc/apache2/mod/mod_headers.html.en
+share/doc/apache2/mod/mod_headers.html.fr
share/doc/apache2/mod/mod_headers.html.ja.utf8
share/doc/apache2/mod/mod_headers.html.ko.euc-kr
+share/doc/apache2/mod/mod_heartbeat.html
+share/doc/apache2/mod/mod_heartbeat.html.en
+share/doc/apache2/mod/mod_heartbeat.html.fr
+share/doc/apache2/mod/mod_heartmonitor.html
+share/doc/apache2/mod/mod_heartmonitor.html.en
+share/doc/apache2/mod/mod_heartmonitor.html.fr
share/doc/apache2/mod/mod_ident.html
share/doc/apache2/mod/mod_ident.html.en
+share/doc/apache2/mod/mod_ident.html.fr
share/doc/apache2/mod/mod_ident.html.ja.utf8
share/doc/apache2/mod/mod_ident.html.ko.euc-kr
share/doc/apache2/mod/mod_imagemap.html
share/doc/apache2/mod/mod_imagemap.html.en
+share/doc/apache2/mod/mod_imagemap.html.fr
share/doc/apache2/mod/mod_imagemap.html.ko.euc-kr
share/doc/apache2/mod/mod_include.html
share/doc/apache2/mod/mod_include.html.en
+share/doc/apache2/mod/mod_include.html.fr
share/doc/apache2/mod/mod_include.html.ja.utf8
share/doc/apache2/mod/mod_info.html
share/doc/apache2/mod/mod_info.html.en
+share/doc/apache2/mod/mod_info.html.fr
share/doc/apache2/mod/mod_info.html.ja.utf8
share/doc/apache2/mod/mod_info.html.ko.euc-kr
share/doc/apache2/mod/mod_isapi.html
share/doc/apache2/mod/mod_isapi.html.en
+share/doc/apache2/mod/mod_isapi.html.fr
share/doc/apache2/mod/mod_isapi.html.ko.euc-kr
+share/doc/apache2/mod/mod_lbmethod_bybusyness.html
+share/doc/apache2/mod/mod_lbmethod_bybusyness.html.en
+share/doc/apache2/mod/mod_lbmethod_bybusyness.html.fr
+share/doc/apache2/mod/mod_lbmethod_byrequests.html
+share/doc/apache2/mod/mod_lbmethod_byrequests.html.en
+share/doc/apache2/mod/mod_lbmethod_byrequests.html.fr
+share/doc/apache2/mod/mod_lbmethod_bytraffic.html
+share/doc/apache2/mod/mod_lbmethod_bytraffic.html.en
+share/doc/apache2/mod/mod_lbmethod_bytraffic.html.fr
+share/doc/apache2/mod/mod_lbmethod_heartbeat.html
+share/doc/apache2/mod/mod_lbmethod_heartbeat.html.en
+share/doc/apache2/mod/mod_lbmethod_heartbeat.html.fr
share/doc/apache2/mod/mod_ldap.html
share/doc/apache2/mod/mod_ldap.html.en
+share/doc/apache2/mod/mod_ldap.html.fr
share/doc/apache2/mod/mod_log_config.html
share/doc/apache2/mod/mod_log_config.html.en
+share/doc/apache2/mod/mod_log_config.html.fr
share/doc/apache2/mod/mod_log_config.html.ja.utf8
share/doc/apache2/mod/mod_log_config.html.ko.euc-kr
share/doc/apache2/mod/mod_log_config.html.tr.utf8
+share/doc/apache2/mod/mod_log_debug.html
+share/doc/apache2/mod/mod_log_debug.html.en
+share/doc/apache2/mod/mod_log_debug.html.fr
share/doc/apache2/mod/mod_log_forensic.html
share/doc/apache2/mod/mod_log_forensic.html.en
+share/doc/apache2/mod/mod_log_forensic.html.fr
share/doc/apache2/mod/mod_log_forensic.html.ja.utf8
share/doc/apache2/mod/mod_log_forensic.html.tr.utf8
share/doc/apache2/mod/mod_logio.html
share/doc/apache2/mod/mod_logio.html.en
+share/doc/apache2/mod/mod_logio.html.fr
share/doc/apache2/mod/mod_logio.html.ja.utf8
share/doc/apache2/mod/mod_logio.html.ko.euc-kr
share/doc/apache2/mod/mod_logio.html.tr.utf8
-share/doc/apache2/mod/mod_mem_cache.html
-share/doc/apache2/mod/mod_mem_cache.html.en
-share/doc/apache2/mod/mod_mem_cache.html.ja.utf8
-share/doc/apache2/mod/mod_mem_cache.html.ko.euc-kr
+share/doc/apache2/mod/mod_lua.html
+share/doc/apache2/mod/mod_lua.html.en
+share/doc/apache2/mod/mod_lua.html.fr
+share/doc/apache2/mod/mod_macro.html
+share/doc/apache2/mod/mod_macro.html.en
+share/doc/apache2/mod/mod_macro.html.fr
share/doc/apache2/mod/mod_mime.html
share/doc/apache2/mod/mod_mime.html.en
+share/doc/apache2/mod/mod_mime.html.fr
share/doc/apache2/mod/mod_mime.html.ja.utf8
share/doc/apache2/mod/mod_mime_magic.html
share/doc/apache2/mod/mod_mime_magic.html.en
+share/doc/apache2/mod/mod_mime_magic.html.fr
share/doc/apache2/mod/mod_negotiation.html
share/doc/apache2/mod/mod_negotiation.html.en
+share/doc/apache2/mod/mod_negotiation.html.fr
share/doc/apache2/mod/mod_negotiation.html.ja.utf8
share/doc/apache2/mod/mod_nw_ssl.html
share/doc/apache2/mod/mod_nw_ssl.html.en
+share/doc/apache2/mod/mod_nw_ssl.html.fr
+share/doc/apache2/mod/mod_privileges.html
+share/doc/apache2/mod/mod_privileges.html.en
+share/doc/apache2/mod/mod_privileges.html.fr
share/doc/apache2/mod/mod_proxy.html
share/doc/apache2/mod/mod_proxy.html.en
share/doc/apache2/mod/mod_proxy.html.fr
share/doc/apache2/mod/mod_proxy.html.ja.utf8
share/doc/apache2/mod/mod_proxy_ajp.html
share/doc/apache2/mod/mod_proxy_ajp.html.en
+share/doc/apache2/mod/mod_proxy_ajp.html.fr
share/doc/apache2/mod/mod_proxy_ajp.html.ja.utf8
share/doc/apache2/mod/mod_proxy_balancer.html
share/doc/apache2/mod/mod_proxy_balancer.html.en
+share/doc/apache2/mod/mod_proxy_balancer.html.fr
share/doc/apache2/mod/mod_proxy_balancer.html.ja.utf8
share/doc/apache2/mod/mod_proxy_connect.html
share/doc/apache2/mod/mod_proxy_connect.html.en
+share/doc/apache2/mod/mod_proxy_connect.html.fr
share/doc/apache2/mod/mod_proxy_connect.html.ja.utf8
+share/doc/apache2/mod/mod_proxy_express.html
+share/doc/apache2/mod/mod_proxy_express.html.en
+share/doc/apache2/mod/mod_proxy_express.html.fr
+share/doc/apache2/mod/mod_proxy_fcgi.html
+share/doc/apache2/mod/mod_proxy_fcgi.html.en
+share/doc/apache2/mod/mod_proxy_fcgi.html.fr
+share/doc/apache2/mod/mod_proxy_fdpass.html
+share/doc/apache2/mod/mod_proxy_fdpass.html.en
+share/doc/apache2/mod/mod_proxy_fdpass.html.fr
share/doc/apache2/mod/mod_proxy_ftp.html
share/doc/apache2/mod/mod_proxy_ftp.html.en
-share/doc/apache2/mod/mod_proxy_ftp.html.ja.utf8
+share/doc/apache2/mod/mod_proxy_ftp.html.fr
+share/doc/apache2/mod/mod_proxy_html.html
+share/doc/apache2/mod/mod_proxy_html.html.en
+share/doc/apache2/mod/mod_proxy_html.html.fr
share/doc/apache2/mod/mod_proxy_http.html
share/doc/apache2/mod/mod_proxy_http.html.en
share/doc/apache2/mod/mod_proxy_http.html.fr
-share/doc/apache2/mod/mod_proxy_http.html.ja.utf8
share/doc/apache2/mod/mod_proxy_scgi.html
share/doc/apache2/mod/mod_proxy_scgi.html.en
-share/doc/apache2/mod/mod_proxy_scgi.html.ja.utf8
+share/doc/apache2/mod/mod_proxy_scgi.html.fr
+share/doc/apache2/mod/mod_proxy_wstunnel.html
+share/doc/apache2/mod/mod_proxy_wstunnel.html.en
+share/doc/apache2/mod/mod_ratelimit.html
+share/doc/apache2/mod/mod_ratelimit.html.en
+share/doc/apache2/mod/mod_ratelimit.html.fr
+share/doc/apache2/mod/mod_reflector.html
+share/doc/apache2/mod/mod_reflector.html.en
+share/doc/apache2/mod/mod_reflector.html.fr
+share/doc/apache2/mod/mod_remoteip.html
+share/doc/apache2/mod/mod_remoteip.html.en
+share/doc/apache2/mod/mod_remoteip.html.fr
share/doc/apache2/mod/mod_reqtimeout.html
share/doc/apache2/mod/mod_reqtimeout.html.en
+share/doc/apache2/mod/mod_reqtimeout.html.fr
+share/doc/apache2/mod/mod_request.html
+share/doc/apache2/mod/mod_request.html.en
+share/doc/apache2/mod/mod_request.html.fr
+share/doc/apache2/mod/mod_request.html.tr.utf8
share/doc/apache2/mod/mod_rewrite.html
share/doc/apache2/mod/mod_rewrite.html.en
share/doc/apache2/mod/mod_rewrite.html.fr
+share/doc/apache2/mod/mod_sed.html
+share/doc/apache2/mod/mod_sed.html.en
+share/doc/apache2/mod/mod_sed.html.fr
+share/doc/apache2/mod/mod_session.html
+share/doc/apache2/mod/mod_session.html.en
+share/doc/apache2/mod/mod_session.html.fr
+share/doc/apache2/mod/mod_session_cookie.html
+share/doc/apache2/mod/mod_session_cookie.html.en
+share/doc/apache2/mod/mod_session_cookie.html.fr
+share/doc/apache2/mod/mod_session_crypto.html
+share/doc/apache2/mod/mod_session_crypto.html.en
+share/doc/apache2/mod/mod_session_crypto.html.fr
+share/doc/apache2/mod/mod_session_dbd.html
+share/doc/apache2/mod/mod_session_dbd.html.en
+share/doc/apache2/mod/mod_session_dbd.html.fr
share/doc/apache2/mod/mod_setenvif.html
share/doc/apache2/mod/mod_setenvif.html.en
+share/doc/apache2/mod/mod_setenvif.html.fr
share/doc/apache2/mod/mod_setenvif.html.ja.utf8
share/doc/apache2/mod/mod_setenvif.html.ko.euc-kr
share/doc/apache2/mod/mod_setenvif.html.tr.utf8
+share/doc/apache2/mod/mod_slotmem_plain.html
+share/doc/apache2/mod/mod_slotmem_plain.html.en
+share/doc/apache2/mod/mod_slotmem_plain.html.fr
+share/doc/apache2/mod/mod_slotmem_shm.html
+share/doc/apache2/mod/mod_slotmem_shm.html.en
+share/doc/apache2/mod/mod_slotmem_shm.html.fr
share/doc/apache2/mod/mod_so.html
share/doc/apache2/mod/mod_so.html.en
+share/doc/apache2/mod/mod_so.html.fr
share/doc/apache2/mod/mod_so.html.ja.utf8
share/doc/apache2/mod/mod_so.html.ko.euc-kr
share/doc/apache2/mod/mod_so.html.tr.utf8
+share/doc/apache2/mod/mod_socache_dbm.html
+share/doc/apache2/mod/mod_socache_dbm.html.en
+share/doc/apache2/mod/mod_socache_dbm.html.fr
+share/doc/apache2/mod/mod_socache_dc.html
+share/doc/apache2/mod/mod_socache_dc.html.en
+share/doc/apache2/mod/mod_socache_dc.html.fr
+share/doc/apache2/mod/mod_socache_memcache.html
+share/doc/apache2/mod/mod_socache_memcache.html.en
+share/doc/apache2/mod/mod_socache_memcache.html.fr
+share/doc/apache2/mod/mod_socache_shmcb.html
+share/doc/apache2/mod/mod_socache_shmcb.html.en
+share/doc/apache2/mod/mod_socache_shmcb.html.fr
share/doc/apache2/mod/mod_speling.html
share/doc/apache2/mod/mod_speling.html.en
+share/doc/apache2/mod/mod_speling.html.fr
share/doc/apache2/mod/mod_speling.html.ja.utf8
share/doc/apache2/mod/mod_speling.html.ko.euc-kr
share/doc/apache2/mod/mod_ssl.html
share/doc/apache2/mod/mod_ssl.html.en
+share/doc/apache2/mod/mod_ssl.html.fr
share/doc/apache2/mod/mod_status.html
share/doc/apache2/mod/mod_status.html.en
+share/doc/apache2/mod/mod_status.html.fr
share/doc/apache2/mod/mod_status.html.ja.utf8
share/doc/apache2/mod/mod_status.html.ko.euc-kr
share/doc/apache2/mod/mod_status.html.tr.utf8
share/doc/apache2/mod/mod_substitute.html
share/doc/apache2/mod/mod_substitute.html.en
+share/doc/apache2/mod/mod_substitute.html.fr
share/doc/apache2/mod/mod_suexec.html
share/doc/apache2/mod/mod_suexec.html.en
share/doc/apache2/mod/mod_suexec.html.fr
@@ -677,57 +926,77 @@ share/doc/apache2/mod/mod_suexec.html.ko
share/doc/apache2/mod/mod_suexec.html.tr.utf8
share/doc/apache2/mod/mod_unique_id.html
share/doc/apache2/mod/mod_unique_id.html.en
+share/doc/apache2/mod/mod_unique_id.html.fr
share/doc/apache2/mod/mod_unique_id.html.ja.utf8
share/doc/apache2/mod/mod_unique_id.html.ko.euc-kr
+share/doc/apache2/mod/mod_unixd.html
+share/doc/apache2/mod/mod_unixd.html.en
+share/doc/apache2/mod/mod_unixd.html.fr
+share/doc/apache2/mod/mod_unixd.html.tr.utf8
share/doc/apache2/mod/mod_userdir.html
share/doc/apache2/mod/mod_userdir.html.en
+share/doc/apache2/mod/mod_userdir.html.fr
share/doc/apache2/mod/mod_userdir.html.ja.utf8
share/doc/apache2/mod/mod_userdir.html.ko.euc-kr
share/doc/apache2/mod/mod_userdir.html.tr.utf8
share/doc/apache2/mod/mod_usertrack.html
share/doc/apache2/mod/mod_usertrack.html.en
+share/doc/apache2/mod/mod_usertrack.html.fr
share/doc/apache2/mod/mod_version.html
share/doc/apache2/mod/mod_version.html.en
share/doc/apache2/mod/mod_version.html.ja.utf8
share/doc/apache2/mod/mod_version.html.ko.euc-kr
share/doc/apache2/mod/mod_vhost_alias.html
share/doc/apache2/mod/mod_vhost_alias.html.en
+share/doc/apache2/mod/mod_vhost_alias.html.fr
share/doc/apache2/mod/mod_vhost_alias.html.tr.utf8
+share/doc/apache2/mod/mod_watchdog.html
+share/doc/apache2/mod/mod_watchdog.html.en
+share/doc/apache2/mod/mod_xml2enc.html
+share/doc/apache2/mod/mod_xml2enc.html.en
+share/doc/apache2/mod/mod_xml2enc.html.fr
share/doc/apache2/mod/module-dict.html
share/doc/apache2/mod/module-dict.html.en
+share/doc/apache2/mod/module-dict.html.fr
share/doc/apache2/mod/module-dict.html.ja.utf8
share/doc/apache2/mod/module-dict.html.ko.euc-kr
share/doc/apache2/mod/module-dict.html.tr.utf8
share/doc/apache2/mod/mpm_common.html
share/doc/apache2/mod/mpm_common.html.de
share/doc/apache2/mod/mpm_common.html.en
+share/doc/apache2/mod/mpm_common.html.fr
share/doc/apache2/mod/mpm_common.html.ja.utf8
share/doc/apache2/mod/mpm_common.html.tr.utf8
share/doc/apache2/mod/mpm_netware.html
share/doc/apache2/mod/mpm_netware.html.en
+share/doc/apache2/mod/mpm_netware.html.fr
share/doc/apache2/mod/mpm_winnt.html
share/doc/apache2/mod/mpm_winnt.html.de
share/doc/apache2/mod/mpm_winnt.html.en
+share/doc/apache2/mod/mpm_winnt.html.fr
share/doc/apache2/mod/mpm_winnt.html.ja.utf8
share/doc/apache2/mod/mpmt_os2.html
share/doc/apache2/mod/mpmt_os2.html.en
+share/doc/apache2/mod/mpmt_os2.html.fr
share/doc/apache2/mod/prefork.html
share/doc/apache2/mod/prefork.html.de
share/doc/apache2/mod/prefork.html.en
+share/doc/apache2/mod/prefork.html.fr
share/doc/apache2/mod/prefork.html.ja.utf8
share/doc/apache2/mod/prefork.html.tr.utf8
share/doc/apache2/mod/quickreference.html
share/doc/apache2/mod/quickreference.html.de
share/doc/apache2/mod/quickreference.html.en
share/doc/apache2/mod/quickreference.html.es
+share/doc/apache2/mod/quickreference.html.fr
share/doc/apache2/mod/quickreference.html.ja.utf8
share/doc/apache2/mod/quickreference.html.ko.euc-kr
-share/doc/apache2/mod/quickreference.html.ru.koi8-r
share/doc/apache2/mod/quickreference.html.tr.utf8
share/doc/apache2/mod/quickreference.html.zh-cn.utf8
share/doc/apache2/mod/worker.html
share/doc/apache2/mod/worker.html.de
share/doc/apache2/mod/worker.html.en
+share/doc/apache2/mod/worker.html.fr
share/doc/apache2/mod/worker.html.ja.utf8
share/doc/apache2/mod/worker.html.tr.utf8
share/doc/apache2/mpm.html
@@ -751,93 +1020,124 @@ share/doc/apache2/new_features_2_0.html.
share/doc/apache2/new_features_2_2.html
share/doc/apache2/new_features_2_2.html.en
share/doc/apache2/new_features_2_2.html.fr
-share/doc/apache2/new_features_2_2.html.ja.utf8
share/doc/apache2/new_features_2_2.html.ko.euc-kr
share/doc/apache2/new_features_2_2.html.pt-br
share/doc/apache2/new_features_2_2.html.tr.utf8
+share/doc/apache2/new_features_2_4.html
+share/doc/apache2/new_features_2_4.html.en
+share/doc/apache2/new_features_2_4.html.fr
+share/doc/apache2/new_features_2_4.html.tr.utf8
share/doc/apache2/platform/
share/doc/apache2/platform/ebcdic.html
share/doc/apache2/platform/ebcdic.html.en
share/doc/apache2/platform/ebcdic.html.ko.euc-kr
share/doc/apache2/platform/index.html
share/doc/apache2/platform/index.html.en
+share/doc/apache2/platform/index.html.fr
share/doc/apache2/platform/index.html.ko.euc-kr
share/doc/apache2/platform/index.html.zh-cn.utf8
share/doc/apache2/platform/netware.html
share/doc/apache2/platform/netware.html.en
+share/doc/apache2/platform/netware.html.fr
share/doc/apache2/platform/netware.html.ko.euc-kr
share/doc/apache2/platform/perf-hp.html
share/doc/apache2/platform/perf-hp.html.en
+share/doc/apache2/platform/perf-hp.html.fr
share/doc/apache2/platform/perf-hp.html.ko.euc-kr
+share/doc/apache2/platform/rpm.html
+share/doc/apache2/platform/rpm.html.en
share/doc/apache2/platform/win_compiling.html
share/doc/apache2/platform/win_compiling.html.en
+share/doc/apache2/platform/win_compiling.html.fr
share/doc/apache2/platform/win_compiling.html.ko.euc-kr
share/doc/apache2/platform/windows.html
share/doc/apache2/platform/windows.html.en
+share/doc/apache2/platform/windows.html.fr
share/doc/apache2/platform/windows.html.ko.euc-kr
share/doc/apache2/programs/
share/doc/apache2/programs/ab.html
share/doc/apache2/programs/ab.html.en
+share/doc/apache2/programs/ab.html.fr
share/doc/apache2/programs/ab.html.ko.euc-kr
share/doc/apache2/programs/ab.html.tr.utf8
share/doc/apache2/programs/apachectl.html
share/doc/apache2/programs/apachectl.html.en
+share/doc/apache2/programs/apachectl.html.fr
share/doc/apache2/programs/apachectl.html.ko.euc-kr
share/doc/apache2/programs/apachectl.html.tr.utf8
share/doc/apache2/programs/apxs.html
share/doc/apache2/programs/apxs.html.en
+share/doc/apache2/programs/apxs.html.fr
share/doc/apache2/programs/apxs.html.ko.euc-kr
share/doc/apache2/programs/apxs.html.tr.utf8
share/doc/apache2/programs/configure.html
share/doc/apache2/programs/configure.html.en
+share/doc/apache2/programs/configure.html.fr
share/doc/apache2/programs/configure.html.ko.euc-kr
share/doc/apache2/programs/configure.html.tr.utf8
share/doc/apache2/programs/dbmmanage.html
share/doc/apache2/programs/dbmmanage.html.en
+share/doc/apache2/programs/dbmmanage.html.fr
share/doc/apache2/programs/dbmmanage.html.ko.euc-kr
share/doc/apache2/programs/dbmmanage.html.tr.utf8
+share/doc/apache2/programs/fcgistarter.html
+share/doc/apache2/programs/fcgistarter.html.en
+share/doc/apache2/programs/fcgistarter.html.fr
+share/doc/apache2/programs/fcgistarter.html.tr.utf8
share/doc/apache2/programs/htcacheclean.html
share/doc/apache2/programs/htcacheclean.html.en
+share/doc/apache2/programs/htcacheclean.html.fr
share/doc/apache2/programs/htcacheclean.html.ko.euc-kr
share/doc/apache2/programs/htcacheclean.html.tr.utf8
share/doc/apache2/programs/htdbm.html
share/doc/apache2/programs/htdbm.html.en
+share/doc/apache2/programs/htdbm.html.fr
share/doc/apache2/programs/htdbm.html.tr.utf8
share/doc/apache2/programs/htdigest.html
share/doc/apache2/programs/htdigest.html.en
+share/doc/apache2/programs/htdigest.html.fr
share/doc/apache2/programs/htdigest.html.ko.euc-kr
share/doc/apache2/programs/htdigest.html.tr.utf8
share/doc/apache2/programs/htpasswd.html
share/doc/apache2/programs/htpasswd.html.en
+share/doc/apache2/programs/htpasswd.html.fr
share/doc/apache2/programs/htpasswd.html.ko.euc-kr
share/doc/apache2/programs/htpasswd.html.tr.utf8
share/doc/apache2/programs/httpd.html
share/doc/apache2/programs/httpd.html.en
+share/doc/apache2/programs/httpd.html.fr
share/doc/apache2/programs/httpd.html.ko.euc-kr
share/doc/apache2/programs/httpd.html.tr.utf8
share/doc/apache2/programs/httxt2dbm.html
share/doc/apache2/programs/httxt2dbm.html.en
+share/doc/apache2/programs/httxt2dbm.html.fr
share/doc/apache2/programs/httxt2dbm.html.tr.utf8
share/doc/apache2/programs/index.html
share/doc/apache2/programs/index.html.en
share/doc/apache2/programs/index.html.es
-share/doc/apache2/programs/index.html.ja.utf8
+share/doc/apache2/programs/index.html.fr
share/doc/apache2/programs/index.html.ko.euc-kr
-share/doc/apache2/programs/index.html.ru.koi8-r
share/doc/apache2/programs/index.html.tr.utf8
share/doc/apache2/programs/index.html.zh-cn.utf8
+share/doc/apache2/programs/log_server_status.html
+share/doc/apache2/programs/log_server_status.html.en
share/doc/apache2/programs/logresolve.html
share/doc/apache2/programs/logresolve.html.en
+share/doc/apache2/programs/logresolve.html.fr
share/doc/apache2/programs/logresolve.html.ko.euc-kr
share/doc/apache2/programs/logresolve.html.tr.utf8
share/doc/apache2/programs/other.html
share/doc/apache2/programs/other.html.en
+share/doc/apache2/programs/other.html.fr
share/doc/apache2/programs/other.html.ko.euc-kr
share/doc/apache2/programs/other.html.tr.utf8
share/doc/apache2/programs/rotatelogs.html
share/doc/apache2/programs/rotatelogs.html.en
+share/doc/apache2/programs/rotatelogs.html.fr
share/doc/apache2/programs/rotatelogs.html.ko.euc-kr
share/doc/apache2/programs/rotatelogs.html.tr.utf8
+share/doc/apache2/programs/split-logfile.html
+share/doc/apache2/programs/split-logfile.html.en
share/doc/apache2/programs/suexec.html
share/doc/apache2/programs/suexec.html.en
share/doc/apache2/programs/suexec.html.ko.euc-kr
@@ -845,15 +1145,19 @@ share/doc/apache2/programs/suexec.html.t
share/doc/apache2/rewrite/
share/doc/apache2/rewrite/access.html
share/doc/apache2/rewrite/access.html.en
+share/doc/apache2/rewrite/access.html.fr
share/doc/apache2/rewrite/advanced.html
share/doc/apache2/rewrite/advanced.html.en
+share/doc/apache2/rewrite/advanced.html.fr
share/doc/apache2/rewrite/avoid.html
share/doc/apache2/rewrite/avoid.html.en
+share/doc/apache2/rewrite/avoid.html.fr
share/doc/apache2/rewrite/flags.html
share/doc/apache2/rewrite/flags.html.en
share/doc/apache2/rewrite/flags.html.fr
share/doc/apache2/rewrite/htaccess.html
share/doc/apache2/rewrite/htaccess.html.en
+share/doc/apache2/rewrite/htaccess.html.fr
share/doc/apache2/rewrite/index.html
share/doc/apache2/rewrite/index.html.en
share/doc/apache2/rewrite/index.html.fr
@@ -864,15 +1168,19 @@ share/doc/apache2/rewrite/intro.html.en
share/doc/apache2/rewrite/intro.html.fr
share/doc/apache2/rewrite/proxy.html
share/doc/apache2/rewrite/proxy.html.en
+share/doc/apache2/rewrite/proxy.html.fr
share/doc/apache2/rewrite/remapping.html
share/doc/apache2/rewrite/remapping.html.en
+share/doc/apache2/rewrite/remapping.html.fr
share/doc/apache2/rewrite/rewritemap.html
share/doc/apache2/rewrite/rewritemap.html.en
+share/doc/apache2/rewrite/rewritemap.html.fr
share/doc/apache2/rewrite/tech.html
share/doc/apache2/rewrite/tech.html.en
share/doc/apache2/rewrite/tech.html.fr
share/doc/apache2/rewrite/vhosts.html
share/doc/apache2/rewrite/vhosts.html.en
+share/doc/apache2/rewrite/vhosts.html.fr
share/doc/apache2/sections.html
share/doc/apache2/sections.html.en
share/doc/apache2/sections.html.fr
@@ -881,6 +1189,7 @@ share/doc/apache2/sections.html.ko.euc-k
share/doc/apache2/sections.html.tr.utf8
share/doc/apache2/server-wide.html
share/doc/apache2/server-wide.html.en
+share/doc/apache2/server-wide.html.fr
share/doc/apache2/server-wide.html.ja.utf8
share/doc/apache2/server-wide.html.ko.euc-kr
share/doc/apache2/server-wide.html.tr.utf8
@@ -888,24 +1197,33 @@ share/doc/apache2/sitemap.html
share/doc/apache2/sitemap.html.de
share/doc/apache2/sitemap.html.en
share/doc/apache2/sitemap.html.es
+share/doc/apache2/sitemap.html.fr
share/doc/apache2/sitemap.html.ja.utf8
share/doc/apache2/sitemap.html.ko.euc-kr
share/doc/apache2/sitemap.html.tr.utf8
share/doc/apache2/sitemap.html.zh-cn.utf8
+share/doc/apache2/socache.html
+share/doc/apache2/socache.html.en
+share/doc/apache2/socache.html.fr
share/doc/apache2/ssl/
share/doc/apache2/ssl/index.html
share/doc/apache2/ssl/index.html.en
+share/doc/apache2/ssl/index.html.fr
share/doc/apache2/ssl/index.html.ja.utf8
share/doc/apache2/ssl/index.html.tr.utf8
share/doc/apache2/ssl/index.html.zh-cn.utf8
share/doc/apache2/ssl/ssl_compat.html
share/doc/apache2/ssl/ssl_compat.html.en
+share/doc/apache2/ssl/ssl_compat.html.fr
share/doc/apache2/ssl/ssl_faq.html
share/doc/apache2/ssl/ssl_faq.html.en
+share/doc/apache2/ssl/ssl_faq.html.fr
share/doc/apache2/ssl/ssl_howto.html
share/doc/apache2/ssl/ssl_howto.html.en
+share/doc/apache2/ssl/ssl_howto.html.fr
share/doc/apache2/ssl/ssl_intro.html
share/doc/apache2/ssl/ssl_intro.html.en
+share/doc/apache2/ssl/ssl_intro.html.fr
share/doc/apache2/ssl/ssl_intro.html.ja.utf8
share/doc/apache2/stopping.html
share/doc/apache2/stopping.html.de
@@ -948,12 +1266,11 @@ share/doc/apache2/suexec.html.ja.utf8
share/doc/apache2/suexec.html.ko.euc-kr
share/doc/apache2/suexec.html.tr.utf8
share/doc/apache2/upgrading.html
-share/doc/apache2/upgrading.html.de
share/doc/apache2/upgrading.html.en
share/doc/apache2/upgrading.html.fr
-share/doc/apache2/upgrading.html.ja.utf8
share/doc/apache2/urlmapping.html
share/doc/apache2/urlmapping.html.en
+share/doc/apache2/urlmapping.html.fr
share/doc/apache2/urlmapping.html.ja.utf8
share/doc/apache2/urlmapping.html.ko.euc-kr
share/doc/apache2/urlmapping.html.tr.utf8
@@ -981,7 +1298,6 @@ share/doc/apache2/vhosts/index.html.en
share/doc/apache2/vhosts/index.html.fr
share/doc/apache2/vhosts/index.html.ja.utf8
share/doc/apache2/vhosts/index.html.ko.euc-kr
-share/doc/apache2/vhosts/index.html.ru.koi8-r
share/doc/apache2/vhosts/index.html.tr.utf8
share/doc/apache2/vhosts/index.html.zh-cn.utf8
share/doc/apache2/vhosts/ip-based.html
@@ -992,6 +1308,7 @@ share/doc/apache2/vhosts/ip-based.html.k
share/doc/apache2/vhosts/ip-based.html.tr.utf8
share/doc/apache2/vhosts/mass.html
share/doc/apache2/vhosts/mass.html.en
+share/doc/apache2/vhosts/mass.html.fr
share/doc/apache2/vhosts/mass.html.ko.euc-kr
share/doc/apache2/vhosts/mass.html.tr.utf8
share/doc/apache2/vhosts/name-based.html
@@ -1007,6 +1324,8 @@ share/examples/apache2/cgi-bin/
@sample /var/apache2/cgi-bin/
share/examples/apache2/cgi-bin/printenv
@sample /var/apache2/cgi-bin/printenv
+share/examples/apache2/cgi-bin/printenv.vbs
+share/examples/apache2/cgi-bin/printenv.wsf
share/examples/apache2/cgi-bin/test-cgi
@sample /var/apache2/cgi-bin/test-cgi
share/examples/apache2/conf/
@@ -1035,6 +1354,7 @@ share/examples/apache2/conf/extra/httpd-
@sample ${CONFDIR}/extra/httpd-userdir.conf
share/examples/apache2/conf/extra/httpd-vhosts.conf
@sample ${CONFDIR}/extra/httpd-vhosts.conf
+share/examples/apache2/conf/extra/proxy-html.conf
share/examples/apache2/conf/httpd2.conf
@sample ${CONFDIR}/httpd2.conf
share/examples/apache2/conf/magic
@@ -1054,6 +1374,7 @@ share/examples/apache2/conf/original/ext
share/examples/apache2/conf/original/extra/httpd-ssl.conf
share/examples/apache2/conf/original/extra/httpd-userdir.conf
share/examples/apache2/conf/original/extra/httpd-vhosts.conf
+share/examples/apache2/conf/original/extra/proxy-html.conf
share/examples/apache2/conf/original/httpd.conf
share/examples/apache2/error/
@sample /var/apache2/error/
@@ -1129,12 +1450,11 @@ share/examples/apache2/icons/apache_pb.g
@sample /var/apache2/icons/apache_pb.gif
share/examples/apache2/icons/apache_pb.png
@sample /var/apache2/icons/apache_pb.png
+share/examples/apache2/icons/apache_pb.svg
share/examples/apache2/icons/apache_pb2.gif
@sample /var/apache2/icons/apache_pb2.gif
share/examples/apache2/icons/apache_pb2.png
@sample /var/apache2/icons/apache_pb2.png
-share/examples/apache2/icons/apache_pb2_ani.gif
-@sample /var/apache2/icons/apache_pb2_ani.gif
share/examples/apache2/icons/back.gif
@sample /var/apache2/icons/back.gif
share/examples/apache2/icons/back.png
@@ -1291,6 +1611,23 @@ share/examples/apache2/icons/movie.gif
@sample /var/apache2/icons/movie.gif
share/examples/apache2/icons/movie.png
@sample /var/apache2/icons/movie.png
+share/examples/apache2/icons/odf6odb.png
+share/examples/apache2/icons/odf6odc.png
+share/examples/apache2/icons/odf6odf.png
+share/examples/apache2/icons/odf6odg.png
+share/examples/apache2/icons/odf6odi.png
+share/examples/apache2/icons/odf6odm.png
+share/examples/apache2/icons/odf6odp.png
+share/examples/apache2/icons/odf6ods.png
+share/examples/apache2/icons/odf6odt.png
+share/examples/apache2/icons/odf6otc.png
+share/examples/apache2/icons/odf6otf.png
+share/examples/apache2/icons/odf6otg.png
+share/examples/apache2/icons/odf6oth.png
+share/examples/apache2/icons/odf6oti.png
+share/examples/apache2/icons/odf6otp.png
+share/examples/apache2/icons/odf6ots.png
+share/examples/apache2/icons/odf6ott.png
share/examples/apache2/icons/p.gif
@sample /var/apache2/icons/p.gif
share/examples/apache2/icons/p.png
@@ -1409,18 +1746,14 @@ share/examples/apache2/icons/small/conti
@sample /var/apache2/icons/small/continued.gif
share/examples/apache2/icons/small/continued.png
@sample /var/apache2/icons/small/continued.png
-share/examples/apache2/icons/small/dir.gif
-@sample /var/apache2/icons/small/dir.gif
-share/examples/apache2/icons/small/dir.png
-@sample /var/apache2/icons/small/dir.png
-share/examples/apache2/icons/small/dir2.gif
-@sample /var/apache2/icons/small/dir2.gif
-share/examples/apache2/icons/small/dir2.png
-@sample /var/apache2/icons/small/dir2.png
share/examples/apache2/icons/small/doc.gif
@sample /var/apache2/icons/small/doc.gif
share/examples/apache2/icons/small/doc.png
@sample /var/apache2/icons/small/doc.png
+share/examples/apache2/icons/small/folder.gif
+share/examples/apache2/icons/small/folder.png
+share/examples/apache2/icons/small/folder2.gif
+share/examples/apache2/icons/small/folder2.png
share/examples/apache2/icons/small/forward.gif
@sample /var/apache2/icons/small/forward.gif
share/examples/apache2/icons/small/forward.png
@@ -1513,6 +1846,7 @@ share/examples/apache2/icons/sphere2.gif
@sample /var/apache2/icons/sphere2.gif
share/examples/apache2/icons/sphere2.png
@sample /var/apache2/icons/sphere2.png
+share/examples/apache2/icons/svg.png
share/examples/apache2/icons/tar.gif
@sample /var/apache2/icons/tar.gif
share/examples/apache2/icons/tar.png
@@ -1553,6 +1887,7 @@ share/examples/apache2/icons/world2.gif
@sample /var/apache2/icons/world2.gif
share/examples/apache2/icons/world2.png
@sample /var/apache2/icons/world2.png
+share/examples/apache2/icons/xml.png
share/examples/apache2/logs/
@sample /var/apache2/logs/
%%ldap%%
