Update to 2.2.23, fixes CVE-2012-2687 and CVE-2012-0883.
ok sthen@
This commit is contained in:
giovanni
parent
4da68b33fb
commit
f3cf748e56
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.31 2012/07/18 08:45:42 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.32 2012/10/18 08:12:16 giovanni Exp $
|
||||
|
||||
COMMENT= apache HTTP server
|
||||
|
||||
V= 2.2.22
|
||||
V= 2.2.23
|
||||
PKGNAME= apache-httpd-${V}
|
||||
DISTNAME= httpd-${V}
|
||||
|
||||
@ -77,8 +77,8 @@ FAKE_FLAGS+= rel_user=_apache2 rel_group=_apache2 \
|
||||
|
||||
A2SBIN= apachectl apxs dbmmanage htdigest htpasswd \
|
||||
logresolve rotatelogs suexec
|
||||
A2MAN1= apxs dbmmanage htdigest htpasswd logresolve
|
||||
A2MAN8= apachectl httpd rotatelogs suexec
|
||||
A2MAN1= dbmmanage htdigest htpasswd
|
||||
A2MAN8= apachectl apxs httpd logresolve rotatelogs suexec
|
||||
|
||||
pre-configure:
|
||||
@perl -pi -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/config.layout
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (httpd-2.2.22.tar.gz) = dMH//+/hpQIzmwBK1kiPvYWOtCWgWWjNZ8BWldvA/nw=
|
||||
SIZE (httpd-2.2.22.tar.gz) = 7200529
|
||||
SHA256 (httpd-2.2.23.tar.gz) = InyFpcV/LtrgxcVMaMzBJ/Bvbnz/U0DvoA3gT0Y/o6Q=
|
||||
SIZE (httpd-2.2.23.tar.gz) = 7374712
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure,v 1.9 2012/07/18 08:45:42 sthen Exp $
|
||||
--- configure.orig Wed Jan 25 22:26:34 2012
|
||||
+++ configure Tue Feb 21 23:16:50 2012
|
||||
@@ -3102,7 +3102,7 @@ do
|
||||
$OpenBSD: patch-configure,v 1.10 2012/10/18 08:12:17 giovanni Exp $
|
||||
--- configure.orig Tue Aug 21 20:39:21 2012
|
||||
+++ configure Thu Sep 20 09:59:57 2012
|
||||
@@ -3113,7 +3113,7 @@ do
|
||||
ap_last="${ap_cur}"
|
||||
ap_cur=`eval "echo ${ap_cur}"`
|
||||
done
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.9 2012/07/18 08:45:42 sthen Exp $
|
||||
|
||||
|
||||
APACHE_VAR_SUBST="$APACHE_VAR_SUBST exp_sysconfdir"
|
||||
@@ -4082,7 +4082,7 @@ SHLIBPATH_VAR=`$apr_config --shlib-path-var`
|
||||
@@ -4093,7 +4093,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.9 2012/07/18 08:45:42 sthen Exp $
|
||||
|
||||
echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
|
||||
|
||||
@@ -4389,7 +4389,7 @@ fi
|
||||
@@ -4400,7 +4400,7 @@ fi
|
||||
APU_BINDIR=`$apu_config --bindir`
|
||||
APU_INCLUDEDIR=`$apu_config --includedir`
|
||||
APU_VERSION=`$apu_config --version`
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-docs_conf_httpd_conf_in,v 1.2 2008/01/28 19:48:47 bernd Exp $
|
||||
--- docs/conf/httpd.conf.in.orig Wed Jan 23 22:22:19 2008
|
||||
+++ docs/conf/httpd.conf.in Wed Jan 23 22:22:36 2008
|
||||
@@ -63,8 +63,8 @@ Listen @@Port@@
|
||||
$OpenBSD: patch-docs_conf_httpd_conf_in,v 1.3 2012/10/18 08:12:17 giovanni Exp $
|
||||
--- docs/conf/httpd.conf.in.orig Mon Feb 6 17:54:24 2012
|
||||
+++ docs/conf/httpd.conf.in Thu Sep 20 09:59:57 2012
|
||||
@@ -64,8 +64,8 @@ Listen @@Port@@
|
||||
# It is usually good practice to create a dedicated user and group for
|
||||
# running httpd, as with most system services.
|
||||
#
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-docs_man_apxs_1,v 1.1 2012/07/18 08:45:42 sthen Exp $
|
||||
--- 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 @@
|
||||
$OpenBSD: patch-docs_man_apxs_8,v 1.4 2012/10/18 08:12:17 giovanni Exp $
|
||||
--- docs/man/apxs.8.orig Thu Sep 20 10:02:17 2012
|
||||
+++ docs/man/apxs.8 Thu Sep 20 10:04:53 2012
|
||||
@@ -19,36 +19,36 @@
|
||||
.el .ne 3
|
||||
.IP "\\$1" \\$2
|
||||
..
|
||||
-.TH "APXS" 1 "2012-01-10" "Apache HTTP Server" "apxs"
|
||||
+.TH "APXS2" 1 "2012-01-10" "Apache HTTP Server" "apxs2"
|
||||
-.TH "APXS" 8 "2012-03-21" "Apache HTTP Server" "apxs"
|
||||
+.TH "APXS2" 8 "2012-03-21" "Apache HTTP Server" "apxs2"
|
||||
|
||||
.SH NAME
|
||||
-apxs \- APache eXtenSion tool
|
||||
@ -43,13 +43,11 @@ $OpenBSD: patch-docs_man_apxs_1,v 1.1 2012/07/18 08:45:42 sthen Exp $
|
||||
|
||||
.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
|
||||
+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
|
||||
|
||||
- $ httpd -l
|
||||
+ $ httpd2 -l
|
||||
|
||||
@@ -57,26 +57,26 @@ So to use this extension mechanism your platform has t
|
||||
.fi
|
||||
|
||||
.PP
|
||||
@ -64,10 +62,9 @@ $OpenBSD: patch-docs_man_apxs_1,v 1.1 2012/07/18 08:45:42 sthen Exp $
|
||||
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]
|
||||
[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
|
||||
@ -116,22 +113,6 @@ $OpenBSD: patch-docs_man_apxs_1,v 1.1 2012/07/18 08:45:42 sthen Exp $
|
||||
|
||||
.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
|
||||
@ -141,12 +122,12 @@ $OpenBSD: patch-docs_man_apxs_1,v 1.1 2012/07/18 08:45:42 sthen Exp $
|
||||
/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
|
||||
@@ -171,11 +171,11 @@ Assume you have an Apache module named mod_foo\&.c ava
|
||||
.fi
|
||||
|
||||
.PP
|
||||
-Then you have to update the Apache configuration by making sure a LoadModule directive is present to load this shared object\&. To simplify this step apxs provides an automatic way to install the shared object in its "modules" directory and updating the httpd\&.conf file accordingly\&. This can be achieved by running:
|
||||
+Then you have to update the Apache configuration by making sure a LoadModule directive is present to load this shared object\&. To simplify this step apxs2 provides an automatic way to install the shared object in its "modules" directory and updating the httpd2\&.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
|
||||
|
||||
@ -155,12 +136,6 @@ $OpenBSD: patch-docs_man_apxs_1,v 1.1 2012/07/18 08:45:42 sthen Exp $
|
||||
/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
|
||||
@ -195,10 +170,9 @@ $OpenBSD: patch-docs_man_apxs_1,v 1.1 2012/07/18 08:45:42 sthen Exp $
|
||||
/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/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
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-docs_man_htdigest_1,v 1.2 2007/09/19 05:47:36 steven Exp $
|
||||
--- docs/man/htdigest.1.orig Tue Apr 24 18:18:39 2007
|
||||
+++ docs/man/htdigest.1 Tue Sep 18 17:02:08 2007
|
||||
@@ -19,24 +19,24 @@
|
||||
$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 "2007-04-24" "Apache HTTP Server" "htdigest"
|
||||
+.TH "HTDIGEST2" 1 "2007-04-24" "Apache HTTP Server" "htdigest2"
|
||||
-.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
|
||||
@ -26,8 +26,4 @@ $OpenBSD: patch-docs_man_htdigest_1,v 1.2 2007/09/19 05:47:36 steven Exp $
|
||||
+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/\&.
|
||||
+This manual page only lists the command line arguments\&. For details of the directives necessary to configure digest authentication in httpd2 see the Apache manual, which is part of the Apache distribution or can be found at http://httpd\&.apache\&.org/\&.
|
||||
|
||||
|
||||
.SH "OPTIONS"
|
||||
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/\&.
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-docs_man_httpd_8,v 1.4 2011/09/01 13:40:09 giovanni Exp $
|
||||
--- docs/man/httpd.8.orig Fri Feb 4 16:20:03 2011
|
||||
+++ docs/man/httpd.8 Wed Aug 31 11:57:42 2011
|
||||
$OpenBSD: patch-docs_man_httpd_8,v 1.5 2012/10/18 08:12:17 giovanni Exp $
|
||||
--- docs/man/httpd.8.orig Fri Feb 10 22:47:55 2012
|
||||
+++ docs/man/httpd.8 Wed Oct 10 16:31:01 2012
|
||||
@@ -19,30 +19,30 @@
|
||||
.el .ne 3
|
||||
.IP "\\$1" \\$2
|
||||
..
|
||||
-.TH "HTTPD" 8 "2010-09-28" "Apache HTTP Server" "httpd"
|
||||
+.TH "HTTPD2" 8 "2010-09-28" "Apache HTTP Server" "httpd"
|
||||
-.TH "HTTPD" 8 "2012-02-10" "Apache HTTP Server" "httpd"
|
||||
+.TH "HTTPD2" 8 "2012-02-10" "Apache HTTP Server" "httpd2"
|
||||
|
||||
.SH NAME
|
||||
-httpd \- Apache Hypertext Transfer Protocol Server
|
||||
@ -46,8 +46,8 @@ $OpenBSD: patch-docs_man_httpd_8,v 1.4 2011/09/01 13:40:09 giovanni Exp $
|
||||
+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\&.
|
||||
.TP
|
||||
-k start|restart|graceful|stop|graceful-stop
|
||||
-Signals httpd to start, restart, or stop\&. See Stopping Apache for more information\&.
|
||||
+Signals httpd2 to start, restart, or stop\&. See Stopping Apache for more information\&.
|
||||
-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\&.
|
||||
@ -68,3 +68,16 @@ $OpenBSD: patch-docs_man_httpd_8,v 1.4 2011/09/01 13:40:09 giovanni Exp $
|
||||
|
||||
.PP
|
||||
The following arguments are available only on the Windows platform:
|
||||
@@ -112,10 +112,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\&.
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-docs_man_logresolve_1,v 1.1 2012/07/18 08:45:42 sthen Exp $
|
||||
--- docs/man/logresolve.1.orig Tue Jan 10 23:32:02 2012
|
||||
+++ docs/man/logresolve.1 Tue Feb 21 23:13:49 2012
|
||||
$OpenBSD: patch-docs_man_logresolve_8,v 1.4 2012/10/18 08:12:17 giovanni Exp $
|
||||
--- docs/man/logresolve.8.orig Fri Oct 12 16:18:04 2012
|
||||
+++ docs/man/logresolve.8 Fri Oct 12 16:18:53 2012
|
||||
@@ -19,21 +19,21 @@
|
||||
.el .ne 3
|
||||
.IP "\\$1" \\$2
|
||||
..
|
||||
-.TH "LOGRESOLVE" 1 "2012-01-10" "Apache HTTP Server" "logresolve"
|
||||
+.TH "LOGRESOLVE2" 1 "2012-01-10" "Apache HTTP Server" "logresolve2"
|
||||
-.TH "LOGRESOLVE" 8 "2012-03-21" "Apache HTTP Server" "logresolve"
|
||||
+.TH "LOGRESOLVE2" 8 "2012-03-21" "Apache HTTP Server" "logresolve2"
|
||||
|
||||
.SH NAME
|
||||
-logresolve \- Resolve IP-addresses to hostnames in Apache log files
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-server_mpm_common_c,v 1.4 2011/09/01 13:40:09 giovanni Exp $
|
||||
--- server/mpm_common.c.orig Thu Apr 14 15:43:04 2011
|
||||
+++ server/mpm_common.c Wed Aug 31 12:01:22 2011
|
||||
@@ -979,18 +979,18 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
|
||||
$OpenBSD: patch-server_mpm_common_c,v 1.5 2012/10/18 08:12:17 giovanni Exp $
|
||||
--- server/mpm_common.c.orig Sat Aug 18 11:25:46 2012
|
||||
+++ server/mpm_common.c Fri Oct 12 16:17:16 2012
|
||||
@@ -981,18 +981,18 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
|
||||
*exit_status = 1;
|
||||
return 1;
|
||||
}
|
||||
@ -23,7 +23,7 @@ $OpenBSD: patch-server_mpm_common_c,v 1.4 2011/09/01 13:40:09 giovanni Exp $
|
||||
otherpid);
|
||||
}
|
||||
}
|
||||
@@ -1014,7 +1014,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
|
||||
@@ -1016,7 +1016,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
|
||||
|
||||
if (!strcmp(dash_k_arg, "restart")) {
|
||||
if (!running) {
|
||||
@ -32,7 +32,7 @@ $OpenBSD: patch-server_mpm_common_c,v 1.4 2011/09/01 13:40:09 giovanni Exp $
|
||||
}
|
||||
else {
|
||||
*exit_status = send_signal(otherpid, SIGHUP);
|
||||
@@ -1024,7 +1024,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
|
||||
@@ -1026,7 +1026,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
|
||||
|
||||
if (!strcmp(dash_k_arg, "graceful")) {
|
||||
if (!running) {
|
||||
@ -41,7 +41,7 @@ $OpenBSD: patch-server_mpm_common_c,v 1.4 2011/09/01 13:40:09 giovanni Exp $
|
||||
}
|
||||
else {
|
||||
*exit_status = send_signal(otherpid, AP_SIG_GRACEFUL);
|
||||
@@ -1041,7 +1041,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
|
||||
@@ -1043,7 +1043,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
|
||||
*exit_status = send_signal(otherpid, AP_SIG_GRACEFUL_STOP);
|
||||
}
|
||||
#else
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-server_util_pcre_c,v 1.1 2012/02/17 08:33:03 ajacoutot Exp $
|
||||
|
||||
Fix build with pcre >= 8.30 (from upstream)
|
||||
|
||||
--- server/util_pcre.c.orig Thu Nov 10 16:20:05 2005
|
||||
+++ server/util_pcre.c Fri Feb 17 09:27:20 2012
|
||||
@@ -137,7 +137,8 @@ preg->re_erroffset = erroffset;
|
||||
|
||||
if (preg->re_pcre == NULL) return AP_REG_INVARG;
|
||||
|
||||
-preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
|
||||
+pcre_fullinfo((const pcre *)preg->re_pcre, NULL,
|
||||
+ PCRE_INFO_CAPTURECOUNT, &(preg->re_nsub));
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.20 2012/07/18 08:45:42 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.21 2012/10/18 08:12:17 giovanni Exp $
|
||||
@newgroup _apache2:576
|
||||
@newuser _apache2:576:576:daemon:Apache HTTP Server:/var/empty:/sbin/nologin
|
||||
include/apache2/
|
||||
@ -112,17 +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/man1/httxt2dbm.1
|
||||
@man man/man1/logresolve2.1
|
||||
@man man/man8/ab.8
|
||||
@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
|
||||
@ -308,6 +308,7 @@ share/doc/apache2/images/mod_rewrite_fig1.png
|
||||
share/doc/apache2/images/mod_rewrite_fig2.gif
|
||||
share/doc/apache2/images/mod_rewrite_fig2.png
|
||||
share/doc/apache2/images/pixel.gif
|
||||
share/doc/apache2/images/rewrite_backreferences.png
|
||||
share/doc/apache2/images/rewrite_rule_flow.png
|
||||
share/doc/apache2/images/right.gif
|
||||
share/doc/apache2/images/ssl_intro_fig1.gif
|
||||
@ -920,6 +921,7 @@ share/doc/apache2/style/css/manual-print.css
|
||||
share/doc/apache2/style/css/manual-zip-100pc.css
|
||||
share/doc/apache2/style/css/manual-zip.css
|
||||
share/doc/apache2/style/css/manual.css
|
||||
share/doc/apache2/style/css/prettify.css
|
||||
share/doc/apache2/style/faq.dtd
|
||||
share/doc/apache2/style/lang/
|
||||
share/doc/apache2/style/lang.dtd
|
||||
@ -927,6 +929,8 @@ share/doc/apache2/style/latex/
|
||||
share/doc/apache2/style/latex/atbeginend.sty
|
||||
share/doc/apache2/style/manualpage.dtd
|
||||
share/doc/apache2/style/modulesynopsis.dtd
|
||||
share/doc/apache2/style/scripts/
|
||||
share/doc/apache2/style/scripts/prettify.js
|
||||
share/doc/apache2/style/sitemap.dtd
|
||||
share/doc/apache2/style/version.ent
|
||||
share/doc/apache2/style/xsl/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user