Here's an Apache HTTPD update to 2.2.22, merged from a diff I had
and one from Rodolfo Gouveia.
Rodolfo was only able to test on 5.1 and I don't use this at all,
so test reports from anyone who actually uses it and runs -current
would be welcome.
Staying with 2.2.x for now is intentional.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile 28 Apr 2012 09:54:44 -0000 1.30
+++ Makefile 5 Jul 2012 23:15:03 -0000
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.30 2012/04/28 09:54:44 stsp Exp $
+# $OpenBSD: Makefile,v 1.29 2012/02/17 08:33:03 ajacoutot Exp $
COMMENT= apache HTTP server
-V= 2.2.20
+V= 2.2.22
PKGNAME= apache-httpd-${V}
DISTNAME= httpd-${V}
-REVISION= 1
CATEGORIES= www net
@@ -78,8 +77,8 @@ FAKE_FLAGS+= rel_user=_apache2 rel_grou
A2SBIN= apachectl apxs dbmmanage htdigest htpasswd \
logresolve rotatelogs suexec
-A2MAN1= dbmmanage htdigest htpasswd
-A2MAN8= apachectl apxs httpd logresolve rotatelogs suexec
+A2MAN1= apxs dbmmanage htdigest htpasswd logresolve
+A2MAN8= apachectl httpd rotatelogs suexec
pre-configure:
@perl -pi -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/config.layout
@@ -96,7 +95,7 @@ post-install:
.for i in ${A2MAN1}
mv ${PREFIX}/man/man1/${i}.1 ${PREFIX}/man/man1/${i}2.1
.endfor
-
+
.for i in ${A2MAN8}
mv ${PREFIX}/man/man8/${i}.8 ${PREFIX}/man/man8/${i}2.8
.endfor
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/apache-httpd/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 1 Sep 2011 13:40:09 -0000 1.11
+++ distinfo 5 Jul 2012 23:15:03 -0000
@@ -1,5 +1,5 @@
-MD5 (httpd-2.2.20.tar.gz) = RQSTRGTF7lEBjbr6bZmBDQ==
-RMD160 (httpd-2.2.20.tar.gz) = +65r9C4KENDX8YpOlxtH1Ie8li8=
-SHA1 (httpd-2.2.20.tar.gz) = XmcGNuFyhreuWt5bf14h5oZVnlo=
-SHA256 (httpd-2.2.20.tar.gz) = CrtZaJZkrk210e4atBQHFbh/iJ6B3itNlYHCNVlOKGg=
-SIZE (httpd-2.2.20.tar.gz) = 6834233
+MD5 (httpd-2.2.22.tar.gz) = 13+lryPflqivaOqBFPps4Q==
+RMD160 (httpd-2.2.22.tar.gz) = onqh+11ZiIV/5iP1pYj5JINbyTI=
+SHA1 (httpd-2.2.22.tar.gz) = vzu/2pZ6yQA0jml/Jv6GslaV7+k=
+SHA256 (httpd-2.2.22.tar.gz) = dMH//+/hpQIzmwBK1kiPvYWOtCWgWWjNZ8BWldvA/nw=
+SIZE (httpd-2.2.22.tar.gz) = 7200529
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-configure,v
retrieving revision 1.8
diff -u -p -r1.8 patch-configure
--- patches/patch-configure 1 Sep 2011 13:40:09 -0000 1.8
+++ patches/patch-configure 5 Jul 2012 23:15:03 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.8 2011/09/01 13:40:09 giovanni Exp $
---- configure.orig Tue Aug 30 02:13:20 2011
-+++ configure Wed Aug 31 11:53:52 2011
-@@ -3121,7 +3121,7 @@ do
+--- configure.orig Wed Jan 25 22:26:34 2012
++++ configure Tue Feb 21 23:16:50 2012
+@@ -3102,7 +3102,7 @@ do
ap_last="${ap_cur}"
ap_cur=`eval "echo ${ap_cur}"`
done
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.8 2011/09/
APACHE_VAR_SUBST="$APACHE_VAR_SUBST exp_sysconfdir"
-@@ -4112,7 +4112,7 @@ SHLIBPATH_VAR=`$apr_config --shlib-path-var`
+@@ -4082,7 +4082,7 @@ SHLIBPATH_VAR=`$apr_config --shlib-path-var`
APR_BINDIR=`$apr_config --bindir`
APR_INCLUDEDIR=`$apr_config --includedir`
APR_VERSION=`$apr_config --version`
@@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.8 2011/09/
echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
-@@ -4430,7 +4430,7 @@ fi
+@@ -4389,7 +4389,7 @@ fi
APU_BINDIR=`$apu_config --bindir`
APU_INCLUDEDIR=`$apu_config --includedir`
APU_VERSION=`$apu_config --version`
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 5 Jul 2012 23:15:03 -0000
@@ -0,0 +1,209 @@
+$OpenBSD$
+--- docs/man/apxs.1.orig Tue Jan 10 23:32:02 2012
++++ docs/man/apxs.1 Tue Feb 21 23:13:07 2012
+@@ -19,64 +19,64 @@
+ .el .ne 3
+ .IP "\\$1" \\$2
+ ..
+-.TH "APXS" 1 "2012-01-10" "Apache HTTP Server" "apxs"
++.TH "APXS2" 1 "2012-01-10" "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 httpd2 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
+
+- $ httpd -l
++ $ httpd2 -l
+
+ .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
++ [activating module `foo' in /path/to/apache/etc/httpd2\&.conf]
++ $ 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"
+
+@@ -148,13 +148,13 @@ This option passes \fIlinker-flags\fR as additional fl
+ This indicates the installation operation and installs one or more
dynamically shared objects into the server's \fImodules\fR directory\&.
+ .TP
+ -a
+-This activates the module by automatically adding a corresponding LoadModule
line to Apache's httpd\&.conf configuration file, or by enabling it if it
already exists\&.
++This activates the module by automatically adding a corresponding LoadModule
line to Apache's httpd2\&.conf configuration file, or by enabling it if it
already exists\&.
+ .TP
+ -A
+ Same as option -a but the created LoadModule directive is prefixed with a
hash sign (#), \fIi\&.e\&.\fR, the module is just prepared for later activation
but initially disabled\&.
+ .TP
+ -e
+-This indicates the editing operation, which can be used with the -a and -A
options similarly to the -i operation to edit Apache's httpd\&.conf
configuration file without attempting to install the module\&.
++This indicates the editing operation, which can be used with the -a and -A
options similarly to the -i operation to edit Apache's httpd2\&.conf
configuration file without attempting to install the module\&.
+
+ .SH "EXAMPLES"
+
+@@ -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,16 +171,16 @@ 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 httpd2\&.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
+ \&.\&.\&.
+ chmod 755 /path/to/apache/modules/mod_foo\&.so
+- [activating module `foo' in /path/to/apache/conf/httpd\&.conf]
++ [activating module `foo' in /path/to/apache/conf/httpd2\&.conf]
+ $ _
+
+ .fi
+@@ -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
++ [activating module `foo' in /path/to/apache/conf/httpd2\&.conf]
++ 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 25 Mar 2007 17:40:55 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,209 +0,0 @@
-$OpenBSD: patch-docs_man_apxs_8,v 1.2 2007/03/25 17:40:55 deanna Exp $
---- docs/man/apxs.8.orig Sat Nov 20 15:16:24 2004
-+++ docs/man/apxs.8 Sun Mar 25 13:21:03 2007
-@@ -19,64 +19,64 @@
- .el .ne 3
- .IP "\\$1" \\$2
- ..
--.TH "APXS" 8 "2004-10-01" "Apache HTTP Server" "apxs"
-+.TH "APXS2" 8 "2004-10-01" "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 httpd2 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
-
-- $ httpd -l
-+ $ httpd2 -l
-
- .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
-+ [activating module `foo' in /path/to/apache/etc/httpd2\&.conf]
-+ $ 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"
-
-@@ -148,13 +148,13 @@ This option passes \fIlinker-flags\fR as additional fl
- This indicates the installation operation and installs one or more
dynamically shared objects into the server's \fImodules\fR directory\&.
- .TP
- -a
--This activates the module by automatically adding a corresponding LoadModule
line to Apache's httpd\&.conf configuration file, or by enabling it if it
already exists\&.
-+This activates the module by automatically adding a corresponding LoadModule
line to Apache's httpd2\&.conf configuration file, or by enabling it if it
already exists\&.
- .TP
- -A
- Same as option -a but the created LoadModule directive is prefixed with a
hash sign (#), \fIi\&.e\&.\fR, the module is just prepared for later activation
but initially disabled\&.
- .TP
- -e
--This indicates the editing operation, which can be used with the -a and -A
options similarly to the -i operation to edit Apache's httpd\&.conf
configuration file without attempting to install the module\&.
-+This indicates the editing operation, which can be used with the -a and -A
options similarly to the -i operation to edit Apache's httpd2\&.conf
configuration file without attempting to install the module\&.
-
- .SH "EXAMPLES"
-
-@@ -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,16 +171,16 @@ 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 httpd2\&.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
- \&.\&.\&.
- chmod 755 /path/to/apache/modules/mod_foo\&.so
-- [activating module `foo' in /path/to/apache/conf/httpd\&.conf]
-+ [activating module `foo' in /path/to/apache/conf/httpd2\&.conf]
- $ _
-
- .fi
-@@ -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
-+ [activating module `foo' in /path/to/apache/conf/httpd2\&.conf]
-+ 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_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 5 Jul 2012 23:15:03 -0000
@@ -0,0 +1,36 @@
+$OpenBSD$
+--- docs/man/logresolve.1.orig Tue Jan 10 23:32:02 2012
++++ docs/man/logresolve.1 Tue Feb 21 23:13:49 2012
+@@ -19,21 +19,21 @@
+ .el .ne 3
+ .IP "\\$1" \\$2
+ ..
+-.TH "LOGRESOLVE" 1 "2012-01-10" "Apache HTTP Server" "logresolve"
++.TH "LOGRESOLVE2" 1 "2012-01-10" "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 25 Mar 2007 17:40:55 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-$OpenBSD: patch-docs_man_logresolve_8,v 1.2 2007/03/25 17:40:55 deanna Exp $
---- docs/man/logresolve.8.orig Wed Jun 29 18:19:59 2005
-+++ docs/man/logresolve.8 Sun Mar 25 13:21:04 2007
-@@ -19,21 +19,21 @@
- .el .ne 3
- .IP "\\$1" \\$2
- ..
--.TH "LOGRESOLVE" 8 "2005-06-29" "Apache HTTP Server" "logresolve"
-+.TH "LOGRESOLVE2" 8 "2005-06-29" "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: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/apache-httpd/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST
--- pkg/PLIST 1 Sep 2011 13:40:09 -0000 1.19
+++ pkg/PLIST 5 Jul 2012 23:15:03 -0000
@@ -112,16 +112,17 @@ lib/apache2/mod_userdir.so
lib/apache2/mod_usertrack.so
lib/apache2/mod_version.so
lib/apache2/mod_vhost_alias.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/man8/ab.8
+@man man/man1/httxt2dbm.1
+@man man/man1/logresolve2.1
@man man/man8/apachectl2.8
-@man man/man8/apxs2.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
@@ -350,6 +351,7 @@ share/doc/apache2/license.html
share/doc/apache2/license.html.en
share/doc/apache2/logs.html
share/doc/apache2/logs.html.en
+share/doc/apache2/logs.html.fr
share/doc/apache2/logs.html.ja.utf8
share/doc/apache2/logs.html.ko.euc-kr
share/doc/apache2/logs.html.tr.utf8
@@ -626,11 +628,14 @@ share/doc/apache2/mod/mod_proxy_connect.
share/doc/apache2/mod/mod_proxy_connect.html.ja.utf8
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_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_reqtimeout.html
share/doc/apache2/mod/mod_reqtimeout.html.en
share/doc/apache2/mod/mod_rewrite.html
@@ -741,6 +746,7 @@ 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
@@ -810,6 +816,7 @@ share/doc/apache2/programs/httxt2dbm.htm
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.ko.euc-kr
share/doc/apache2/programs/index.html.ru.koi8-r
share/doc/apache2/programs/index.html.tr.utf8
@@ -934,6 +941,7 @@ 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.ja.utf8
