Apache HTTPD users, please test.
This includes some security fixes that were in 2.4.34 (the apache-httpd
port doesn't have a maintainer so these are often not picked up very
quickly ..)
Since we no longer have Apache 1.x there's no point renaming most of the
installed files any more, only the ones that conflict with base (httpd and
htpasswd), which avoids some tiresome hand merges that are needed in the
manpages for most updates. Courtesy symlinks added for now so that the
'xxx2' variants still work.
Works for me on an amd64 svn server. I haven't yet tested building
modules against this but will do so.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile 29 Mar 2018 19:30:53 -0000 1.89
+++ Makefile 30 Sep 2018 14:53:12 -0000
@@ -3,7 +3,7 @@
COMMENT-main= apache HTTP server
COMMENT-common= /var/www files for Apache HTTPd
-V= 2.4.33
+V= 2.4.35
DISTNAME= httpd-${V}
PKGNAME= apache-httpd-${V}
@@ -93,11 +93,6 @@ LIB_DEPENDS-main+= apr-util-*-ldap:devel
LIB_DEPENDS-main+= apr-util-*-!ldap:devel/apr-util
.endif
-A2BIN= apxs logresolve dbmmanage htdigest htpasswd
-A2SBIN= apachectl rotatelogs suexec
-A2MAN1= dbmmanage apxs htdigest htpasswd logresolve
-A2MAN8= apachectl httpd rotatelogs suexec
-
pre-configure:
sed -i 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/config.layout
sed -i 's,%%CONFDIR%%,${CONFDIR},' ${WRKSRC}/config.layout \
@@ -116,25 +111,18 @@ post-install:
${INSTALL_DATA_DIR} ${WRKINST}${PREFIX-common}/cgi-bin
mv ${PREFIX}/share/examples/apache2/cgi-bin/{printenv,test-cgi} \
${WRKINST}${PREFIX-common}/cgi-bin/
- mv ${PREFIX}/share/examples/apache2/icons \
- ${WRKINST}${PREFIX-common}/
+ mv ${PREFIX}/share/examples/apache2/icons ${WRKINST}${PREFIX-common}/
-.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
-
-.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
-.endfor
+ # avoid conflicts with httpd in base
+ mv ${PREFIX}/man/man1/htpasswd.1 ${PREFIX}/man/man1/htpasswd2.1
+ mv ${PREFIX}/man/man8/httpd.8 ${PREFIX}/man/man8/httpd2.8
+ mv ${PREFIX}/bin/htpasswd ${PREFIX}/bin/htpasswd2
+
+ mv ${PREFIX}/bin/apxs ${PREFIX}/sbin # other ports expect it in sbin/
+
+ # courtesy symlinks
+ for i in logresolve dbmmanage htdigest; do ln -s $${i} ${PREFIX}/bin/$${i}2; done
+ for i in apachectl apxs rotatelogs suexec; do ln -s $${i} ${PREFIX}/sbin/$${i}2; done
.if ${FLAVOR:Mldap}
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ap2-mod_auth_ldap
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/apache-httpd/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo 29 Mar 2018 19:30:53 -0000 1.28
+++ distinfo 30 Sep 2018 14:53:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (httpd-2.4.33.tar.gz) = zTRjbK8DyaiX3fySj8hmyWXyPZCblhKIBWOnrQ0afls=
-SIZE (httpd-2.4.33.tar.gz) = 9076901
+SHA256 (httpd-2.4.35.tar.gz) = McLILJzTR0nLtg0EYZ2ao/sIFKsiJGrViNJCbd6Qxyw=
+SIZE (httpd-2.4.35.tar.gz) = 9167147
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-configure,v
retrieving revision 1.16
diff -u -p -r1.16 patch-configure
--- patches/patch-configure 29 Mar 2018 19:30:53 -0000 1.16
+++ patches/patch-configure 30 Sep 2018 14:53:12 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-configure,v 1.16 2018/03
Index: configure
--- configure.orig
+++ configure
-@@ -3445,7 +3445,7 @@ do
+@@ -3451,7 +3451,7 @@ do
ap_last="${ap_cur}"
ap_cur=`eval "echo ${ap_cur}"`
done
@@ -11,7 +11,7 @@ Index: configure
APACHE_VAR_SUBST="$APACHE_VAR_SUBST exp_sysconfdir"
-@@ -4651,7 +4651,7 @@ APR_INCLUDEDIR=`$apr_config --includedir`
+@@ -4657,7 +4657,7 @@ APR_INCLUDEDIR=`$apr_config --includedir`
APR_INCLUDES=`$apr_config --includes`
APR_VERSION=`$apr_config --version`
apr_major_version=`echo ${APR_VERSION} | sed 's,\..*,,'`
Index: patches/patch-docs_man_apachectl_8
===================================================================
RCS file: patches/patch-docs_man_apachectl_8
diff -N patches/patch-docs_man_apachectl_8
--- patches/patch-docs_man_apachectl_8 15 May 2015 08:08:04 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,98 +0,0 @@
-$OpenBSD: patch-docs_man_apachectl_8,v 1.3 2015/05/15 08:08:04 stsp Exp $
---- 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-08-26" "Apache HTTP Server" "apachectl"
-+.TH "APACHECTL2" 8 "2005-08-26" "Apache HTTP Server" "apachectl2"
-
- .SH NAME
--apachectl \- Apache HTTP Server Control Interface
-+apachectl2 \- Apache HTTP Server Control Interface
-
- .SH "SYNOPSIS"
-
- .PP
--When acting in pass-through mode, apachectl can take all the arguments available for the httpd binary\&.
-+When acting in pass-through mode, apachectl2 can take all the arguments available for the httpd2 binary\&.
-
- .PP
--\fBapachectl\fR [ \fIhttpd-argument\fR ]
-+\fBapachectl2\fR [ \fIhttpd-argument\fR ]
-
- .PP
--When acting in SysV init mode, apachectl takes simple, one-word commands, defined below\&.
-+When acting in SysV init mode, apachectl2 takes simple, one-word commands, defined below\&.
-
- .PP
--\fBapachectl\fR \fIcommand\fR
-+\fBapachectl2\fR \fIcommand\fR
-
-
- .SH "SUMMARY"
-
- .PP
--apachectl is a front end to the Apache HyperText Transfer Protocol (HTTP) server\&. It is designed to help the administrator control the functioning of the Apache httpd daemon\&.
-+apachectl2 is a front end to the Apache HyperText Transfer Protocol (HTTP) server\&. It is designed to help the administrator control the functioning of the Apache httpd2 daemon\&.
-
- .PP
--The apachectl script can operate in two modes\&. First, it can act as a simple front-end to the httpd command that simply sets any necessary environment variables and then invokes httpd, passing through any command line arguments\&. Second, apachectl can act as a SysV init script, taking simple one-word arguments like start, restart, and stop, and translating them into appropriate signals to httpd\&.
-+The apachectl2 script can operate in two modes\&. First, it can act as a simple front-end to the httpd2 command that simply sets any necessary environment variables and then invokes httpd2, passing through any command line arguments\&. Second, apachectl2 can act as a SysV init script, taking simple one-word arguments like start, restart, and stop, and translating them into appropriate signals to httpd2\&.
-
- .PP
--If your Apache installation uses non-standard paths, you will need to edit the apachectl script to set the appropriate paths to the httpd binary\&. You can also specify any necessary httpd command line arguments\&. See the comments in the script for details\&.
-+If your Apache installation uses non-standard paths, you will need to edit the apachectl2 script to set the appropriate paths to the httpd2 binary\&. You can also specify any necessary httpd2 command line arguments\&. See the comments in the script for details\&.
-
- .PP
--The apachectl script returns a 0 exit value on success, and >0 if an error occurs\&. For more details, view the comments in the script\&.
-+The apachectl2 script returns a 0 exit value on success, and >0 if an error occurs\&. For more details, view the comments in the script\&.
-
-
- .SH "OPTIONS"
-
- .PP
--Only the SysV init-style options are defined here\&. Other arguments are defined on the httpd manual page\&.
-+Only the SysV init-style options are defined here\&. Other arguments are defined on the httpd2 manual page\&.
-
-
- .TP
- start
--Start the Apache httpd daemon\&. Gives an error if it is already running\&. This is equivalent to apachectl -k start\&.
-+Start the Apache httpd2 daemon\&. Gives an error if it is already running\&. This is equivalent to apachectl2 -k start\&.
- .TP
- stop
--Stops the Apache httpd daemon\&. This is equivalent to apachectl -k stop\&.
-+Stops the Apache httpd2 daemon\&. This is equivalent to apachectl2 -k stop\&.
- .TP
- restart
--Restarts the Apache httpd daemon\&. If the daemon is not running, it is started\&. This command automatically checks the configuration files as in configtest before initiating the restart to make sure the daemon doesn't die\&. This is equivalent to apachectl -k restart\&.
-+Restarts the Apache httpd2 daemon\&. If the daemon is not running, it is started\&. This command automatically checks the configuration files as in configtest before initiating the restart to make sure the daemon doesn't die\&. This is equivalent to apachectl2 -k restart\&.
- .TP
- fullstatus
- Displays a full status report from mod_status\&. For this to work, you need to have mod_status enabled on your server and a text-based browser such as lynx available on your system\&. The URL used to access the status report can be set by editing the STATUSURL variable in the script\&.
-@@ -77,13 +77,13 @@ status
- Displays a brief status report\&. Similar to the fullstatus option, except that the list of requests currently being served is omitted\&.
- .TP
- graceful
--Gracefully restarts the Apache httpd daemon\&. If the daemon is not running, it is started\&. This differs from a normal restart in that currently open connections are not aborted\&. A side effect is that old log files will not be closed immediately\&. This means that if used in a log rotation script, a substantial delay may be necessary to ensure that the old log files are closed before processing them\&. This command automatically checks the configuration files as in configtest before initiating the restart to make sure Apache doesn't die\&. This is equivalent to apachectl -k graceful\&.
-+Gracefully restarts the Apache httpd2 daemon\&. If the daemon is not running, it is started\&. This differs from a normal restart in that currently open connections are not aborted\&. A side effect is that old log files will not be closed immediately\&. This means that if used in a log rotation script, a substantial delay may be necessary to ensure that the old log files are closed before processing them\&. This command automatically checks the configuration files as in configtest before initiating the restart to make sure Apache doesn't die\&. This is equivalent to apachectl2 -k graceful\&.
- .TP
- graceful-stop
--Gracefully stops the Apache httpd daemon\&. This differs from a normal stop in that currently open connections are not aborted\&. A side effect is that old log files will not be closed immediately\&. This is equivalent to apachectl -k graceful-stop\&.
-+Gracefully stops the Apache httpd2 daemon\&. This differs from a normal stop in that currently open connections are not aborted\&. A side effect is that old log files will not be closed immediately\&. This is equivalent to apachectl2 -k graceful-stop\&.
- .TP
- configtest
--Run a configuration file syntax test\&. It parses the configuration files and either reports Syntax Ok or detailed information about the particular syntax error\&. This is equivalent to apachectl -t\&.
-+Run a configuration file syntax test\&. It parses the configuration files and either reports Syntax Ok or detailed information about the particular syntax error\&. This is equivalent to apachectl2 -t\&.
-
- .PP
- The following option was available in earlier versions but has been removed\&.
-@@ -91,5 +91,5 @@ The following option was available in earlier versions
-
- .TP
- startssl
--To start httpd with SSL support, you should edit your configuration file to include the relevant directives and then use the normal apachectl start\&.
-+To start httpd2 with SSL support, you should edit your configuration file to include the relevant directives and then use the normal apachectl2 start\&.
-
Index: patches/patch-docs_man_apxs_1
===================================================================
RCS file: patches/patch-docs_man_apxs_1
diff -N patches/patch-docs_man_apxs_1
--- patches/patch-docs_man_apxs_1 15 May 2015 08:08:04 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,192 +0,0 @@
-$OpenBSD: patch-docs_man_apxs_1,v 1.3 2015/05/15 08:08:04 stsp Exp $
---- 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_dbmmanage_1
===================================================================
RCS file: patches/patch-docs_man_dbmmanage_1
diff -N patches/patch-docs_man_dbmmanage_1
--- patches/patch-docs_man_dbmmanage_1 15 May 2015 08:08:04 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,79 +0,0 @@
-$OpenBSD: patch-docs_man_dbmmanage_1,v 1.2 2015/05/15 08:08:04 stsp Exp $
---- 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 "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
-+dbmmanage2 \- Manage user authentication files in DBM format
-
- .SH "SYNOPSIS"
-
- .PP
--\fBdbmmanage\fR [ \fIencoding\fR ] \fIfilename\fR add|adduser|check|delete|update \fIusername\fR [ \fIencpasswd\fR [ \fIgroup\fR[,\fIgroup\fR\&.\&.\&.] [ \fIcomment\fR ] ] ]
-+\fBdbmmanage2\fR [ \fIencoding\fR ] \fIfilename\fR add|adduser|check|delete|update \fIusername\fR [ \fIencpasswd\fR [ \fIgroup\fR[,\fIgroup\fR\&.\&.\&.] [ \fIcomment\fR ] ] ]
-
- .PP
--\fBdbmmanage\fR \fIfilename\fR view [ \fIusername\fR ]
-+\fBdbmmanage2\fR \fIfilename\fR view [ \fIusername\fR ]
-
- .PP
--\fBdbmmanage\fR \fIfilename\fR import
-+\fBdbmmanage2\fR \fIfilename\fR import
-
-
- .SH "SUMMARY"
-
- .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 htpasswd\&.
-
- .PP
- Another tool to maintain a DBM password database is htdbm\&.
-@@ -88,33 +88,33 @@ plaintext (\fInot recommended\fR)
-
- .TP
- add
--Adds an entry for \fIusername\fR to \fIfilename\fR using the encrypted password \fIencpasswd\fR\&. dbmmanage passwords\&.dat add rbowen foKntnEF3KSXA
-+Adds an entry for \fIusername\fR to \fIfilename\fR using the encrypted password \fIencpasswd\fR\&. dbmmanage2 passwords\&.dat add rbowen foKntnEF3KSXA
- .TP
- adduser
--Asks for a password and then adds an entry for \fIusername\fR to \fIfilename\fR\&. dbmmanage passwords\&.dat adduser krietz
-+Asks for a password and then adds an entry for \fIusername\fR to \fIfilename\fR\&. dbmmanage2 passwords\&.dat adduser krietz
- .TP
- check
--Asks for a password and then checks if \fIusername\fR is in \fIfilename\fR and if it's password matches the specified one\&. dbmmanage passwords\&.dat check rbowen
-+Asks for a password and then checks if \fIusername\fR is in \fIfilename\fR and if it's password matches the specified one\&. dbmmanage2 passwords\&.dat check rbowen
- .TP
- delete
--Deletes the \fIusername\fR entry from \fIfilename\fR\&. dbmmanage passwords\&.dat delete rbowen
-+Deletes the \fIusername\fR entry from \fIfilename\fR\&. dbmmanage2 passwords\&.dat delete rbowen
- .TP
- import
- Reads \fIusername\fR:\fIpassword\fR entries (one per line) from STDIN and adds them to \fIfilename\fR\&. The passwords already have to be crypted\&.
- .TP
- update
--Same as the adduser command, except that it makes sure \fIusername\fR already exists in \fIfilename\fR\&. dbmmanage passwords\&.dat update rbowen
-+Same as the adduser command, except that it makes sure \fIusername\fR already exists in \fIfilename\fR\&. dbmmanage2 passwords\&.dat update rbowen
- .TP
- view
--Just displays the contents of the DBM file\&. If you specify a \fIusername\fR, it displays the particular record only\&. dbmmanage passwords\&.dat view
-+Just displays the contents of the DBM file\&. If you specify a \fIusername\fR, it displays the particular record only\&. dbmmanage2 passwords\&.dat view
-
- .SH "BUGS"
-
- .PP
--One should be aware that there are a number of different DBM file formats in existence, and with all likelihood, libraries for more than one format may exist on your system\&. The three primary examples are SDBM, NDBM, the GNU project's GDBM, and Berkeley DB 2\&. Unfortunately, all these libraries use different file formats, and you must make sure that the file format used by \fIfilename\fR is the same format that dbmmanage expects to see\&. dbmmanage currently has no way of determining what type of DBM file it is looking at\&. If used against the wrong format, will simply return nothing, or may create a different DBM file with a different name, or at worst, it may corrupt the DBM file if you were attempting to write to it\&.
-+One should be aware that there are a number of different DBM file formats in existence, and with all likelihood, libraries for more than one format may exist on your system\&. The three primary examples are SDBM, NDBM, the GNU project's GDBM, and Berkeley DB 2\&. Unfortunately, all these libraries use different file formats, and you must make sure that the file format used by \fIfilename\fR is the same format that dbmmanage2 expects to see\&. dbmmanage2 currently has no way of determining what type of DBM file it is looking at\&. If used against the wrong format, will simply return nothing, or may create a different DBM file with a different name, or at worst, it may corrupt the DBM file if you were attempting to write to it\&.
-
- .PP
--dbmmanage has a list of DBM format preferences, defined by the @AnyDBM::ISA array near the beginning of the program\&. Since we prefer the Berkeley DB 2 file format, the order in which dbmmanage will look for system libraries is Berkeley DB 2, then NDBM, then GDBM and then SDBM\&. The first library found will be the library dbmmanage will attempt to use for all DBM file transactions\&. This ordering is slightly different than the standard @AnyDBM::ISA ordering in Perl, as well as the ordering used by the simple dbmopen() call in Perl, so if you use any other utilities to manage your DBM files, they must also follow this preference ordering\&. Similar care must be taken if using programs in other languages, like C, to access these files\&.
-+dbmmanage2 has a list of DBM format preferences, defined by the @AnyDBM::ISA array near the beginning of the program\&. Since we prefer the Berkeley DB 2 file format, the order in which dbmmanage2 will look for system libraries is Berkeley DB 2, then NDBM, then GDBM and then SDBM\&. The first library found will be the library dbmmanage2 will attempt to use for all DBM file transactions\&. This ordering is slightly different than the standard @AnyDBM::ISA ordering in Perl, as well as the ordering used by the simple dbmopen() call in Perl, so if you use any other utilities to manage your DBM files, they must also follow this preference ordering\&. Similar care must be taken if using programs in other languages, like C, to access these files\&.
-
- .PP
- One can usually use the file program supplied with most Unix systems to see what format a DBM file is in\&.
Index: patches/patch-docs_man_htdbm_1
===================================================================
RCS file: patches/patch-docs_man_htdbm_1
diff -N patches/patch-docs_man_htdbm_1
--- patches/patch-docs_man_htdbm_1 15 May 2015 08:08:04 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-docs_man_htdbm_1,v 1.4 2015/05/15 08:08:04 stsp Exp $
---- 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"
-
- .PP
--htdbm is used to manipulate the DBM format files used to store usernames and password for basic authentication of HTTP users via mod_authn_dbm\&. See the dbmmanage documentation for more information about these DBM files\&.
-+htdbm is used to manipulate the DBM format files used to store usernames and password for basic authentication of HTTP users via mod_authn_dbm\&. See the dbmmanage2 documentation for more information about these DBM files\&.
-
-
- .SH "OPTIONS"
-@@ -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 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)\&. 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 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_htdigest_1
===================================================================
RCS file: patches/patch-docs_man_htdigest_1
diff -N patches/patch-docs_man_htdigest_1
--- patches/patch-docs_man_htdigest_1 18 Oct 2012 08:12:17 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-docs_man_htdigest_1,v 1.3 2012/10/18 08:12:17 giovanni Exp $
---- docs/man/htdigest.1.orig Thu Jul 19 12:27:33 2012
-+++ docs/man/htdigest.1 Wed Oct 10 16:29:23 2012
-@@ -19,21 +19,21 @@
- .el .ne 3
- .IP "\\$1" \\$2
- ..
--.TH "HTDIGEST" 1 "2012-07-19" "Apache HTTP Server" "htdigest"
-+.TH "HTDIGEST2" 1 "2012-07-19" "Apache HTTP Server" "htdigest2"
-
- .SH NAME
--htdigest \- manage user files for digest authentication
-+htdigest2 \- manage user files for digest authentication
-
- .SH "SYNOPSIS"
-
- .PP
--\fBhtdigest\fR [ -\fBc\fR ] \fIpasswdfile\fR \fIrealm\fR \fIusername\fR
-+\fBhtdigest2\fR [ -\fBc\fR ] \fIpasswdfile\fR \fIrealm\fR \fIusername\fR
-
-
- .SH "SUMMARY"
-
- .PP
--htdigest is used to create and update the flat-files used to store usernames, realm and password for digest authentication of HTTP users\&. Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by htdigest\&.
-+htdigest2 is used to create and update the flat-files used to store usernames, realm and password for digest authentication of HTTP users\&. Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by htdigest2\&.
-
- .PP
- This manual page only lists the command line arguments\&. For details of the directives necessary to configure digest authentication in httpd see the Apache manual, which is part of the Apache distribution or can be found at http://httpd\&.apache\&.org/\&.
Index: patches/patch-docs_man_htpasswd_1
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-docs_man_htpasswd_1,v
retrieving revision 1.6
diff -u -p -r1.6 patch-docs_man_htpasswd_1
--- patches/patch-docs_man_htpasswd_1 15 May 2015 08:08:04 -0000 1.6
+++ patches/patch-docs_man_htpasswd_1 30 Sep 2018 14:53:12 -0000
@@ -1,12 +1,13 @@
$OpenBSD: patch-docs_man_htpasswd_1,v 1.6 2015/05/15 08:08:04 stsp Exp $
---- docs/man/htpasswd.1.orig Tue Jun 24 07:53:21 2014
-+++ docs/man/htpasswd.1 Sat Jan 10 15:20:47 2015
+Index: docs/man/htpasswd.1
+--- docs/man/htpasswd.1.orig
++++ docs/man/htpasswd.1
@@ -19,36 +19,36 @@
.el .ne 3
.IP "\\$1" \\$2
..
--.TH "HTPASSWD" 1 "2014-06-24" "Apache HTTP Server" "htpasswd"
-+.TH "HTPASSWD2" 1 "2014-06-24" "Apache HTTP Server" "htpasswd2"
+-.TH "HTPASSWD" 1 "2018-07-06" "Apache HTTP Server" "htpasswd"
++.TH "HTPASSWD2" 1 "2018-07-06" "Apache HTTP Server" "htpasswd2"
.SH NAME
-htpasswd \- Manage user files for basic authentication
@@ -15,61 +16,61 @@ $OpenBSD: patch-docs_man_htpasswd_1,v 1.
.SH "SYNOPSIS"
.PP
--\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
+-\fB\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\fR
++\fB\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\fR
.PP
--\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
+-\fB\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\fR
++\fB\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\fR
.PP
--\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
+-\fB\fBhtpasswd\fR -\fBn\fR [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR\fR
++\fB\fBhtpasswd2\fR -\fBn\fR [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR\fR
.PP
--\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
+-\fB\fBhtpasswd\fR -\fBnb\fR [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR \fIpassword\fR\fR
++\fB\fBhtpasswd2\fR -\fBnb\fR [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR \fIpassword\fR\fR
.SH "SUMMARY"
.PP
--htpasswd is used to create and update the flat-files used to store usernames and password for basic authentication of HTTP users\&. If htpasswd 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\&.
-+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\&.
+-\fBhtpasswd\fR is used to create and update the flat-files used to store usernames and password for basic authentication of HTTP users\&. If \fBhtpasswd\fR 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\&.
++\fBhtpasswd2\fR is used to create and update the flat-files used to store usernames and password for basic authentication of HTTP users\&. If \fBhtpasswd2\fR 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 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\&.
+-Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by \fBhtpasswd\fR\&. 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 \fBhtpasswd2\fR\&. 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 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()\&.
+-\fBhtpasswd\fR encrypts passwords using either bcrypt, a version of MD5 modified for Apache, SHA1, or the system's \fBcrypt()\fR routine\&. Files managed by \fBhtpasswd\fR 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 \fBcrypt()\fR\&.
++\fBhtpasswd2\fR encrypts passwords using either bcrypt, a version of MD5 modified for Apache, SHA1, or the system's \fBcrypt()\fR routine\&. Files managed by \fBhtpasswd2\fR 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 \fBcrypt()\fR\&.
.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/\&.
-@@ -86,13 +86,13 @@ Use crypt() encryption for passwords\&. This is not su
+@@ -86,13 +86,13 @@ Use \fBcrypt()\fR encryption for passwords\&. This is
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 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\&.
+ \fB-p\fR
+-Use plaintext passwords\&. Though \fBhtpasswd\fR will support creation on all platforms, the httpd daemon will only accept plain text passwords on Windows and Netware\&.
++Use plaintext passwords\&. Though \fBhtpasswd2\fR will support creation on all platforms, the httpd daemon will only accept plain text passwords on Windows and Netware\&.
.TP
- -D
+ \fB-D\fR
-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
+ \fB-v\fR
-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\&.
+ \fB\fIpasswdfile\fR\fR
+ Name of the file to contain the user name and password\&. If \fB-c\fR 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
--htpasswd returns a zero status ("true") if the username and password have been successfully added or updated in the \fIpasswdfile\fR\&. htpasswd returns 1 if it encounters some problem accessing files, 2 if there was a syntax problem with the command line, 3 if the password was entered interactively and the verification entry didn't match, 4 if its operation was interrupted, 5 if a value is too long (username, filename, password, or final computed record), 6 if the username contains illegal characters (see the Restrictions section), and 7 if the file is not a valid password file\&.
-+htpasswd2 returns a zero status ("true") if the username and password have been successfully added or updated in the \fIpasswdfile\fR\&. htpasswd2 returns 1 if it encounters some problem accessing files, 2 if there was a syntax problem with the command line, 3 if the password was entered interactively and the verification entry didn't match, 4 if its operation was interrupted, 5 if a value is too long (username, filename, password, or final computed record), 6 if the username contains illegal characters (see the Restrictions section), and 7 if the file is not a valid password file\&.
+-\fBhtpasswd\fR returns a zero status ("true") if the username and password have been successfully added or updated in the \fIpasswdfile\fR\&. \fBhtpasswd\fR returns \fB1\fR if it encounters some problem accessing files, \fB2\fR if there was a syntax problem with the command line, \fB3\fR if the password was entered interactively and the verification entry didn't match, \fB4\fR if its operation was interrupted, \fB5\fR if a value is too long (username, filename, password, or final computed record), \fB6\fR if the username contains illegal characters (see the Restrictions section), and \fB7\fR if the file is not a valid password file\&.
++\fBhtpasswd2\fR returns a zero status ("true") if the username and password have been successfully added or updated in the \fIpasswdfile\fR\&. \fBhtpasswd2\fR returns \fB1\fR if it encounters some problem accessing files, \fB2\fR if there was a syntax problem with the command line, \fB3\fR if the password was entered interactively and the verification entry didn't match, \fB4\fR if its operation was interrupted, \fB5\fR if a value is too long (username, filename, password, or final computed record), \fB6\fR if the username contains illegal characters (see the Restrictions section), and \fB7\fR if the file is not a valid password file\&.
.SH "EXAMPLES"
@@ -81,19 +82,19 @@ $OpenBSD: patch-docs_man_htpasswd_1,v 1.
.fi
.PP
--Adds or modifies the password for user jsmith\&. The user is prompted for the password\&. The password will be encrypted using the modified Apache MD5 algorithm\&. If the file does not exist, htpasswd will do nothing except return an error\&.
-+Adds or modifies the password for user jsmith\&. The user is prompted for the password\&. The password will be encrypted using the modified Apache MD5 algorithm\&. If the file does not exist, htpasswd2 will do nothing except return an error\&.
+-Adds or modifies the password for user \fBjsmith\fR\&. The user is prompted for the password\&. The password will be encrypted using the modified Apache MD5 algorithm\&. If the file does not exist, \fBhtpasswd\fR will do nothing except return an error\&.
++Adds or modifies the password for user \fBjsmith\fR\&. The user is prompted for the password\&. The password will be encrypted using the modified Apache MD5 algorithm\&. If the file does not exist, \fBhtpasswd2\fR will do nothing except return an error\&.
.nf
- htpasswd -c /home/doe/public_html/\&.htpasswd jane
-+ htpasswd2 -c /home/doe/public_html/\&.htpasswd2 jane
++ htpasswd2 -c /home/doe/public_html/\&.htpasswd jane
.fi
.PP
--Creates a new file and stores a record in it for user jane\&. The user is prompted for the password\&. If the file exists and cannot be read, or cannot be written, it is not altered and htpasswd will display a message and return an error status\&.
-+Creates a new file and stores a record in it for user jane\&. The user is prompted for the password\&. If the file exists and cannot be read, or cannot be written, it is not altered and htpasswd2 will display a message and return an error status\&.
+-Creates a new file and stores a record in it for user \fBjane\fR\&. The user is prompted for the password\&. If the file exists and cannot be read, or cannot be written, it is not altered and \fBhtpasswd\fR will display a message and return an error status\&.
++Creates a new file and stores a record in it for user \fBjane\fR\&. The user is prompted for the password\&. If the file exists and cannot be read, or cannot be written, it is not altered and \fBhtpasswd2\fR will display a message and return an error status\&.
.nf
@@ -102,25 +103,25 @@ $OpenBSD: patch-docs_man_htpasswd_1,v 1.
.fi
-@@ -140,7 +140,7 @@ Encrypts the password from the command line (Pwd4Steve
+@@ -140,7 +140,7 @@ Encrypts the password from the command line (\fBPwd4St
.SH "SECURITY CONSIDERATIONS"
.PP
--Web password files such as those managed by htpasswd should \fInot\fR be within the Web server's URI space -- that is, they should not be fetchable with a browser\&.
-+Web password files such as those managed by htpasswd2 should \fInot\fR be within the Web server's URI space -- that is, they should not be fetchable with a browser\&.
+-Web password files such as those managed by \fBhtpasswd\fR should \fInot\fR be within the Web server's URI space -- that is, they should not be fetchable with a browser\&.
++Web password files such as those managed by \fBhtpasswd2\fR should \fInot\fR be within the Web server's URI space -- that is, they should not be fetchable with a browser\&.
.PP
This program is not safe as a setuid executable\&. Do \fInot\fR make it setuid\&.
-@@ -160,10 +160,10 @@ The SHA and crypt() formats are insecure by today's st
+@@ -160,10 +160,10 @@ The SHA and \fBcrypt()\fR formats are insecure by toda
.SH "RESTRICTIONS"
.PP
--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\&.
+-On the Windows platform, passwords encrypted with \fBhtpasswd\fR are limited to no more than \fB255\fR characters in length\&. Longer passwords will be truncated to 255 characters\&.
++On the Windows platform, passwords encrypted with \fBhtpasswd2\fR are limited to no more than \fB255\fR 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\&.
-+The MD5 algorithm used by htpasswd2 is specific to the Apache software; passwords encrypted using it will not be usable with other Web servers\&.
+-The MD5 algorithm used by \fBhtpasswd\fR is specific to the Apache software; passwords encrypted using it will not be usable with other Web servers\&.
++The MD5 algorithm used by \fBhtpasswd2\fR is specific to the Apache software; passwords encrypted using it will not be usable with other Web servers\&.
.PP
- Usernames are limited to 255 bytes and may not include the character :\&.
+ Usernames are limited to \fB255\fR bytes and may not include the character \fB:\fR\&.
Index: patches/patch-docs_man_httpd_8
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-docs_man_httpd_8,v
retrieving revision 1.7
diff -u -p -r1.7 patch-docs_man_httpd_8
--- patches/patch-docs_man_httpd_8 14 Jul 2017 17:04:12 -0000 1.7
+++ patches/patch-docs_man_httpd_8 30 Sep 2018 14:53:12 -0000
@@ -6,8 +6,8 @@ Index: docs/man/httpd.8
.el .ne 3
.IP "\\$1" \\$2
..
--.TH "HTTPD" 8 "2012-02-10" "Apache HTTP Server" "httpd"
-+.TH "HTTPD2" 8 "2012-02-10" "Apache HTTP Server" "httpd2"
+-.TH "HTTPD" 8 "2018-07-06" "Apache HTTP Server" "httpd"
++.TH "HTTPD2" 8 "2018-07-06" "Apache HTTP Server" "httpd2"
.SH NAME
-httpd \- Apache Hypertext Transfer Protocol Server
@@ -16,69 +16,35 @@ Index: docs/man/httpd.8
.SH "SYNOPSIS"
.PP
--\fBhttpd\fR [ -\fBd\fR \fIserverroot\fR ] [ -\fBf\fR \fIconfig\fR ] [ -\fBC\fR \fIdirective\fR ] [ -\fBc\fR \fIdirective\fR ] [ -\fBD\fR \fIparameter\fR ] [ -\fBe\fR \fIlevel\fR ] [ -\fBE\fR \fIfile\fR ] [ \fB-k\fR start|restart|graceful|stop|graceful-stop ] [ -\fBh\fR ] [ -\fBl\fR ] [ -\fBL\fR ] [ -\fBS\fR ] [ -\fBt\fR ] [ -\fBv\fR ] [ -\fBV\fR ] [ -\fBX\fR ] [ -\fBM\fR ] [ -\fBT\fR ]
-+\fBhttpd2\fR [ -\fBd\fR \fIserverroot\fR ] [ -\fBf\fR \fIconfig\fR ] [ -\fBC\fR \fIdirective\fR ] [ -\fBc\fR \fIdirective\fR ] [ -\fBD\fR \fIparameter\fR ] [ -\fBe\fR \fIlevel\fR ] [ -\fBE\fR \fIfile\fR ] [ \fB-k\fR start|restart|graceful|stop|graceful-stop ] [ -\fBh\fR ] [ -\fBl\fR ] [ -\fBL\fR ] [ -\fBS\fR ] [ -\fBt\fR ] [ -\fBv\fR ] [ -\fBV\fR ] [ -\fBX\fR ] [ -\fBM\fR ] [ -\fBT\fR ]
+-\fB\fBhttpd\fR [ -\fBd\fR \fIserverroot\fR ] [ -\fBf\fR \fIconfig\fR ] [ -\fBC\fR \fIdirective\fR ] [ -\fBc\fR \fIdirective\fR ] [ -\fBD\fR \fIparameter\fR ] [ -\fBe\fR \fIlevel\fR ] [ -\fBE\fR \fIfile\fR ] [ \fB-k\fR start|restart|graceful|stop|graceful-stop ] [ -\fBh\fR ] [ -\fBl\fR ] [ -\fBL\fR ] [ -\fBS\fR ] [ -\fBt\fR ] [ -\fBv\fR ] [ -\fBV\fR ] [ -\fBX\fR ] [ -\fBM\fR ] [ -\fBT\fR ] \fR
++\fB\fBhttpd2\fR [ -\fBd\fR \fIserverroot\fR ] [ -\fBf\fR \fIconfig\fR ] [ -\fBC\fR \fIdirective\fR ] [ -\fBc\fR \fIdirective\fR ] [ -\fBD\fR \fIparameter\fR ] [ -\fBe\fR \fIlevel\fR ] [ -\fBE\fR \fIfile\fR ] [ \fB-k\fR start|restart|graceful|stop|graceful-stop ] [ -\fBh\fR ] [ -\fBl\fR ] [ -\fBL\fR ] [ -\fBS\fR ] [ -\fBt\fR ] [ -\fBv\fR ] [ -\fBV\fR ] [ -\fBX\fR ] [ -\fBM\fR ] [ -\fBT\fR ] \fR
.PP
On Windows systems, the following additional arguments are available:
.PP
--\fBhttpd\fR [ -\fBk\fR install|config|uninstall ] [ -\fBn\fR \fIname\fR ] [ -\fBw\fR ]
-+\fBhttpd2\fR [ -\fBk\fR install|config|uninstall ] [ -\fBn\fR \fIname\fR ] [ -\fBw\fR ]
+-\fB\fBhttpd\fR [ -\fBk\fR install|config|uninstall ] [ -\fBn\fR \fIname\fR ] [ -\fBw\fR ]\fR
++\fB\fBhttpd2\fR [ -\fBk\fR install|config|uninstall ] [ -\fBn\fR \fIname\fR ] [ -\fBw\fR ]\fR
.SH "SUMMARY"
.PP
--httpd is the Apache HyperText Transfer Protocol (HTTP) server program\&. It is designed to be run as a standalone daemon process\&. When used like this it will create a pool of child processes or threads to handle requests\&.
-+httpd2 is the Apache HyperText Transfer Protocol (HTTP) server program\&. It is designed to be run as a standalone daemon process\&. When used like this it will create a pool of child processes or threads to handle requests\&.
+-\fBhttpd\fR is the Apache HyperText Transfer Protocol (HTTP) server program\&. It is designed to be run as a standalone daemon process\&. When used like this it will create a pool of child processes or threads to handle requests\&.
++\fBhttpd2\fR is the Apache HyperText Transfer Protocol (HTTP) server program\&. It is designed to be run as a standalone daemon process\&. When used like this it will create a pool of child processes or threads to handle requests\&.
.PP
--In general, httpd should not be invoked directly, but rather should be invoked via apachectl on Unix-based systems or as a service on Windows NT, 2000 and XP and as a console application on Windows 9x and ME\&.
-+In general, httpd2 should not be invoked directly, but rather should be invoked via apachectl on Unix-based systems or as a service on Windows NT, 2000 and XP and as a console application on Windows 9x and ME\&.
+-In general, \fBhttpd\fR should not be invoked directly, but rather should be invoked via apachectl on Unix-based systems or as a service on Windows NT, 2000 and XP and as a console application on Windows 9x and ME\&.
++In general, \fBhttpd2\fR should not be invoked directly, but rather should be invoked via apachectl on Unix-based systems or as a service on Windows NT, 2000 and XP and as a console application on Windows 9x and ME\&.
.SH "OPTIONS"
-@@ -53,10 +53,10 @@ In general, httpd should not be invoked directly, but
- Set the initial value for the ServerRoot directive to \fIserverroot\fR\&. This can be overridden by the ServerRoot directive in the configuration file\&. The default is /usr/local/apache2\&.
+@@ -53,7 +53,7 @@ In general, \fBhttpd\fR should not be invoked directly
+ Set the initial value for the ServerRoot directive to \fIserverroot\fR\&. This can be overridden by the ServerRoot directive in the configuration file\&. The default is \fB/usr/local/apache2\fR\&.
.TP
- -f \fIconfig\fR
--Uses the directives in the file \fIconfig\fR on startup\&. If \fIconfig\fR does not begin with a /, then it is taken to be a path relative to the ServerRoot\&. The default is conf/httpd\&.conf\&.
-+Uses the directives in the file \fIconfig\fR on startup\&. If \fIconfig\fR does not begin with a /, then it is taken to be a path relative to the ServerRoot\&. The default is conf/httpd2\&.conf\&.
+ \fB-f \fIconfig\fR\fR
+-Uses the directives in the file \fIconfig\fR on startup\&. If \fIconfig\fR does not begin with a /, then it is taken to be a path relative to the ServerRoot\&. The default is \fBconf/httpd\&.conf\fR\&.
++Uses the directives in the file \fIconfig\fR on startup\&. If \fIconfig\fR does not begin with a /, then it is taken to be a path relative to the ServerRoot\&. The default is \fBconf/httpd2\&.conf\fR\&.
.TP
- -k start|restart|graceful|stop|graceful-stop
--Signals httpd to start, restart, or stop\&. See Stopping Apache httpd for more information\&.
-+Signals httpd2 to start, restart, or stop\&. See Stopping Apache httpd2 for more information\&.
- .TP
- -C \fIdirective\fR
- Process the configuration \fIdirective\fR before reading config files\&.
-@@ -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
--Print the version of httpd, and then exit\&.
-+Print the version of httpd2, and then exit\&.
- .TP
- -V
--Print the version and build parameters of httpd, and then exit\&.
-+Print the version and build parameters of httpd2, and then exit\&.
- .TP
- -X
--Run httpd in debug mode\&. Only one worker will be started and the server will not detach from the console\&.
-+Run httpd2 in debug mode\&. Only one worker will be started and the server will not detach from the console\&.
-
- .PP
- The following arguments are available only on the Windows platform:
-@@ -109,10 +109,10 @@ The following arguments are available only on the Wind
-
- .TP
- -k install|config|uninstall
--Install Apache httpd as a Windows NT service; change startup options for the Apache httpd service; and uninstall the Apache httpd service\&.
-+Install Apache httpd2 as a Windows NT service; change startup options for the Apache httpd2 service; and uninstall the Apache httpd2 service\&.
- .TP
- -n \fIname\fR
--The \fIname\fR of the Apache httpd service to signal\&.
-+The \fIname\fR of the Apache httpd2 service to signal\&.
- .TP
- -w
- Keep the console window open on error so that the error message can be read\&.
+ \fB-k \fBstart|restart|graceful|stop|graceful-stop\fR\fR
+ Signals \fBhttpd\fR to start, restart, or stop\&. See Stopping Apache httpd for more information\&.
Index: patches/patch-docs_man_logresolve_1
===================================================================
RCS file: patches/patch-docs_man_logresolve_1
diff -N patches/patch-docs_man_logresolve_1
--- patches/patch-docs_man_logresolve_1 15 May 2015 08:08:04 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-$OpenBSD: patch-docs_man_logresolve_1,v 1.3 2015/05/15 08:08:04 stsp Exp $
---- 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_rotatelogs_8
===================================================================
RCS file: patches/patch-docs_man_rotatelogs_8
diff -N patches/patch-docs_man_rotatelogs_8
--- patches/patch-docs_man_rotatelogs_8 15 May 2015 08:08:04 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,87 +0,0 @@
-$OpenBSD: patch-docs_man_rotatelogs_8,v 1.6 2015/05/15 08:08:04 stsp Exp $
---- 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 "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
-+rotatelogs2 \- Piped logging program to rotate Apache logs
-
- .SH "SYNOPSIS"
-
- .PP
--\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"
-
- .PP
--rotatelogs is a simple program for use in conjunction with Apache's piped logfile feature\&. It supports rotation based on a time interval or maximum size of the log\&.
-+rotatelogs2 is a simple program for use in conjunction with Apache's piped logfile feature\&. It supports rotation based on a time interval or maximum size of the log\&.
-
-
- .SH "OPTIONS"
-@@ -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)
-+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
- -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 -l /var/log/logfile\&.%Y\&.%m\&.%d 86400" common
-+ CustomLog "|bin/rotatelogs2 -l /var/log/logfile\&.%Y\&.%m\&.%d 86400" common
-
- .fi
-
-@@ -101,7 +101,7 @@ This creates the files /var/log/logfile\&.yyyy\&.mm\&.
-
- .nf
-
-- CustomLog "|bin/rotatelogs /var/log/logfile 5M" common
-+ CustomLog "|bin/rotatelogs2 /var/log/logfile 5M" common
-
- .fi
-
-@@ -110,7 +110,7 @@ This configuration will rotate the logfile whenever it
-
- .nf
-
-- 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
-
-@@ -119,7 +119,7 @@ This configuration will rotate the error logfile whene
-
- .nf
-
-- 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: patches/patch-docs_man_suexec_8
diff -N patches/patch-docs_man_suexec_8
--- patches/patch-docs_man_suexec_8 15 May 2015 08:08:04 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-$OpenBSD: patch-docs_man_suexec_8,v 1.4 2015/05/15 08:08:04 stsp Exp $
---- 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 "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
-+suexec2 \- Switch user before executing external programs
-
- .SH "SYNOPSIS"
-
- .PP
--\fBsuexec\fR -\fBV\fR
-+\fBsuexec2\fR -\fBV\fR
-
-
- .SH "SUMMARY"
-
- .PP
--suexec 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 suexec executable needs the setuid bit set and must be owned by root\&. It should never be writable for any other person than root\&.
-+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\&.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"
-@@ -44,5 +44,5 @@ For further information about the concepts and the sec
-
- .TP
- -V
--If you are root, this option displays the compile options of suexec\&. For security reasons all configuration options are changeable only at compile time\&.
-+If you are root, this option displays the compile options of suexec2\&. For security reasons all configuration options are changeable only at compile time\&.
-
Index: patches/patch-modules_md_md_crypt_c
===================================================================
RCS file: patches/patch-modules_md_md_crypt_c
diff -N patches/patch-modules_md_md_crypt_c
--- patches/patch-modules_md_md_crypt_c 29 Mar 2018 19:30:53 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-modules_md_md_crypt_c,v 1.1 2018/03/29 19:30:53 sthen Exp $
-
-Index: modules/md/md_crypt.c
---- modules/md/md_crypt.c.orig
-+++ modules/md/md_crypt.c
-@@ -471,7 +471,8 @@ apr_status_t md_pkey_gen(md_pkey_t **ppkey, apr_pool_t
- }
- }
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-
- #ifndef NID_tlsfeature
- #define NID_tlsfeature 1020
Index: patches/patch-support_apachectl_in
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-support_apachectl_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-support_apachectl_in
--- patches/patch-support_apachectl_in 15 May 2015 08:08:04 -0000 1.4
+++ patches/patch-support_apachectl_in 30 Sep 2018 14:53:12 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-support_apachectl_in,v 1.4 2015/05/15 08:08:04 stsp Exp $
---- support/apachectl.in.orig Wed Feb 1 04:47:28 2012
-+++ support/apachectl.in Sat Jan 10 15:05:02 2015
+Index: support/apachectl.in
+--- support/apachectl.in.orig
++++ support/apachectl.in
@@ -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
@@ -21,14 +22,12 @@ $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
-@@ -83,8 +87,8 @@ start|stop|restart|graceful|graceful-stop)
+@@ -83,7 +87,7 @@ start|stop|restart|graceful|graceful-stop)
;;
startssl|sslstart|start-SSL)
echo The startssl option is no longer supported.
- echo Please edit httpd.conf to include the SSL configuration settings
-- echo and then use "apachectl start".
+ echo Please edit httpd2.conf to include the SSL configuration settings
-+ echo and then use "apachectl2 start".
+ echo and then use "apachectl start".
ERROR=2
;;
- configtest)
Index: patches/patch-support_apxs_in
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-support_apxs_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-support_apxs_in
--- patches/patch-support_apxs_in 15 May 2015 08:08:04 -0000 1.3
+++ patches/patch-support_apxs_in 30 Sep 2018 14:53:12 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-support_apxs_in,v 1.3 2015/05/15 08:08:04 stsp Exp $
---- 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__
+Index: support/apxs.in
+--- support/apxs.in.orig
++++ support/apxs.in
+@@ -671,8 +671,8 @@ __DATA__
##
builddir=.
@@ -12,8 +13,3 @@ $OpenBSD: patch-support_apxs_in,v 1.3 20
include %INSTALLBUILDDIR%/special.mk
# the used tools
--APACHECTL=apachectl
-+APACHECTL=apachectl2
-
- # additional defines, includes and libraries
- #DEFS=-Dmy_define=my_value
Index: patches/patch-support_rotatelogs_c
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-support_rotatelogs_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-support_rotatelogs_c
--- patches/patch-support_rotatelogs_c 29 Mar 2018 19:30:53 -0000 1.6
+++ patches/patch-support_rotatelogs_c 30 Sep 2018 14:53:12 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-support_rotatelogs_c,v 1
Index: support/rotatelogs.c
--- support/rotatelogs.c.orig
+++ support/rotatelogs.c
-@@ -129,7 +129,7 @@ static void usage(const char *argv0, const char *reaso
+@@ -128,7 +128,7 @@ static void usage(const char *argv0, const char *reaso
"or \n\nTransferLog \"|%s /some/where 5M\"\n\n", argv0);
No comments:
Post a Comment