[Midnightbsd-cvs] mports [20547] trunk/www/apache24: apache 2.4.17
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Oct 28 21:41:27 EDT 2015
Revision: 20547
http://svnweb.midnightbsd.org/mports/?rev=20547
Author: laffer1
Date: 2015-10-28 21:41:26 -0400 (Wed, 28 Oct 2015)
Log Message:
-----------
apache 2.4.17
Modified Paths:
--------------
trunk/www/apache24/Makefile
trunk/www/apache24/Makefile.options
trunk/www/apache24/Makefile.options.desc
trunk/www/apache24/distinfo
trunk/www/apache24/files/apache24.in
trunk/www/apache24/files/patch-config.layout
trunk/www/apache24/files/patch-configure.in
trunk/www/apache24/files/patch-docs__conf__extra__httpd-autoindex.conf.in
trunk/www/apache24/files/patch-docs__conf__extra__httpd-ssl.conf.in
trunk/www/apache24/files/patch-docs__conf__extra__httpd-userdir.conf.in
trunk/www/apache24/files/patch-docs__conf__httpd.conf.in
trunk/www/apache24/files/patch-support__Makefile.in
trunk/www/apache24/files/patch-support__apachectl.in
trunk/www/apache24/files/patch-support__apxs.in
trunk/www/apache24/files/patch-support__envvars-std.in
trunk/www/apache24/files/patch-support__log_server_status.in
Modified: trunk/www/apache24/Makefile
===================================================================
--- trunk/www/apache24/Makefile 2015-10-19 17:07:06 UTC (rev 20546)
+++ trunk/www/apache24/Makefile 2015-10-29 01:41:26 UTC (rev 20547)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= apache24
-PORTVERSION= 2.4.16
+PORTVERSION= 2.4.17
PORTREVISION= 0
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
Modified: trunk/www/apache24/Makefile.options
===================================================================
--- trunk/www/apache24/Makefile.options 2015-10-19 17:07:06 UTC (rev 20546)
+++ trunk/www/apache24/Makefile.options 2015-10-29 01:41:26 UTC (rev 20547)
@@ -11,10 +11,11 @@
PROXY_ENABLED_MODULES= \
PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_EXPRESS PROXY_FCGI \
- PROXY_FTP PROXY_HTTP PROXY_SCGI PROXY_WSTUNNEL
+ PROXY_FDPASS PROXY_FTP PROXY_HTTP PROXY_SCGI PROXY_WSTUNNEL
+# mod_proxy_html depends on libxml2
PROXY_DISABLED_MODULES= \
- PROXY_FDPASS PROXY_HTML
+ PROXY_HTML
# SESSION_CRYPTO need APR build with crypto (EVP support in APR)
SESSION_ENABLED_MODULES= \
@@ -22,46 +23,40 @@
SESSION_DISABLED_MODULES=
-HEARTBEAT_MODULES= \
- HEARTBEAT HEARTMONITOR LBMETHOD_HEARTBEAT
-
EXAMPLE_MODULES= \
- CASE_FILTER CASE_FILTER_IN ECHO EXAMPLE_HOOKS EXAMPLE_IPC \
+ BUCKETEER CASE_FILTER CASE_FILTER_IN ECHO EXAMPLE_HOOKS EXAMPLE_IPC \
OPTIONAL_FN_EXPORT OPTIONAL_FN_IMPORT OPTIONAL_HOOK_EXPORT \
OPTIONAL_HOOK_IMPORT
-DEV_MODULES= BUCKETEER
-
MOST_ENABLED_MODULES= \
ACCESS_COMPAT ACTIONS ALIAS ALLOWMETHODS ASIS \
AUTHN_ANON AUTHN_CORE AUTHN_DBD AUTHN_DBM AUTHN_FILE AUTHN_SOCACHE \
- AUTHZ_CORE AUTHZ_DBD AUTHZ_DBM AUTHZ_GROUPFILE AUTHZ_HOST \
+ AUTHZ_CORE AUTHZ_DBD AUTHZ_DBM AUTHNZ_FCGI AUTHZ_GROUPFILE AUTHZ_HOST \
AUTHZ_OWNER AUTHZ_USER \
AUTH_BASIC AUTH_DIGEST AUTH_FORM AUTOINDEX \
BUFFER \
- CACHE CACHE_DISK CACHE_SOCACHE CGI CGID \
- DAV DAV_FS DBD DEFLATE DIR DUMPIO \
+ CACHE CACHE_DISK CACHE_SOCACHE CERN_META CGI CGID \
+ CHARSET_LITE \
+ DATA DAV DAV_FS DAV_LOCK DBD DEFLATE DIALUP DIR DUMPIO \
ENV EXPIRES EXT_FILTER \
FILE_CACHE FILTER \
- HEADERS \
+ HEADERS HEARTBEAT HEARTMONITOR \
IMAGEMAP INCLUDE INFO \
LBMETHOD_BYBUSYNESS LBMETHOD_BYREQUESTS LBMETHOD_BYTRAFFIC \
- LOGIO LOG_DEBUG \
+ LBMETHOD_HEARTBEAT LOGIO LOG_DEBUG LOG_FORENSIC \
MACRO MIME MIME_MAGIC \
NEGOTIATION \
- RATELIMIT REMOTEIP REQTIMEOUT REQUEST REWRITE \
- SED SETENVIF SLOTMEM_SHM SOCACHE_DBM SOCACHE_MEMCACHE SOCACHE_SHMCB SPELING \
- SSL STATUS SUBSTITUTE \
- UNIQUE_ID USERDIR \
- VERSION VHOST_ALIAS
+ RATELIMIT REFLECTOR REMOTEIP REQTIMEOUT REQUEST REWRITE \
+ SED SETENVIF \
+ SLOTMEM_PLAIN SLOTMEM_SHM SOCACHE_DBM SOCACHE_MEMCACHE SOCACHE_SHMCB \
+ SPELING SSL STATUS SUBSTITUTE \
+ UNIQUE_ID USERDIR USERTRACK \
+ VERSION VHOST_ALIAS \
+ WATCHDOG
MOST_DISABLED_MODULES:= \
- AUTHNZ_LDAP AUTHNZ_FCGI LDAP CERN_META CHARSET_LITE DATA DAV_LOCK DIALUP IDENT \
- LOG_FORENSIC LUA REFLECTOR SLOTMEM_PLAIN SOCACHE_DC SUEXEC USERTRACK \
- XML2ENC WATCHDOG ${HEARTBEAT_MODULES} ${EXAMPLE_MODULES} ${DEV_MODULES}
+ AUTHNZ_LDAP IDENT LDAP LUA SOCACHE_DC SUEXEC XML2ENC HTTP2
-#MULTI_MODULES:= ${OPTIONS_MULTI}
-
# XXX PROXY and SESSION are modules but also used to
# enable/disable additional PROXY/SESSION modules
META_MODULES= PROXY SESSION
@@ -70,21 +65,20 @@
MOST_ENABLED MOST_DISABLED MULTI \
PROXY_ENABLED PROXY_DISABLED \
SESSION_ENABLED SESSION_DISABLED \
- META
+ META EXAMPLE
-#STATIC= STATIC_AB STATIC_CHECKGID STATIC_FCGISTARTER STATIC_HTCACHECLEAN \
-# STATIC_HTDBM STATIC_HTDIGEST STATIC_HTPASSWD STATIC_HTTXT2DBM \
-# STATIC_LOGRESOLVE STATIC_ROTATELOGS STATIC_SUPPORT
-
ADDITIONAL_OPT= LUAJIT IPV4_MAPPED
# ===================================================================================
-NO_OPTIONS_SORT= yes
+#NO_OPTIONS_SORT= yes
-OPTIONS_MULTI= ${META_MODULES}
+OPTIONS_MULTI:= ${META_MODULES}
OPTIONS_MULTI_PROXY:= ${PROXY_ENABLED_MODULES} ${PROXY_DISABLED_MODULES}
OPTIONS_MULTI_SESSION:= ${SESSION_ENABLED_MODULES} ${SESSION_DISABLED_MODULES}
+OPTIONS_GROUP= EXAMPLE
+OPTIONS_GROUP_EXAMPLE:= ${EXAMPLE_MODULES}
+
OPTIONS_RADIO= SHARED_MPM
OPTIONS_RADIO_SHARED_MPM= MPM_SHARED
@@ -104,5 +98,6 @@
${OPTIONS_MULTI} \
${SESSION_ENABLED_MODULES} \
${PROXY_ENABLED_MODULES} \
+ MPM_SHARED \
MPM_PREFORK
Modified: trunk/www/apache24/Makefile.options.desc
===================================================================
--- trunk/www/apache24/Makefile.options.desc 2015-10-19 17:07:06 UTC (rev 20546)
+++ trunk/www/apache24/Makefile.options.desc 2015-10-29 01:41:26 UTC (rev 20547)
@@ -7,6 +7,7 @@
SESSION_DESC= Build enabled SESSION modules
DEFAULT_MPM_DESC= The default MPM module
SHARED_MPM_DESC= Build all MPMs as shared Module
+EXAMPLE_DESC= Example and devel modules (do not use in prod)
# =====================================
# MPMs
@@ -88,7 +89,7 @@
ECHO_DESC= (dev) example echo server
ENV_DESC= Clearing/setting of ENV vars
EXAMPLE_HOOKS_DESC= (dev) example hook callback handler module
-EXAMPLE_IPC_DESC= (dev) Example of shared memory and mutex usage
+EXAMPLE_IPC_DESC= (dev) example of shared memory and mutex usage
EXPIRES_DESC= Expires header control
EXT_FILTER_DESC= External filter module
@@ -98,6 +99,7 @@
HEADERS_DESC= HTTP header control
HEARTBEAT_DESC= Generates Heartbeats
HEARTMONITOR_DESC= Collects Heartbeats
+HTTP2_DESC= HTTP/2 (RFC 7540) support (experimental)
IDENT_DESC= RFC 1413 ident lookups
IMAGEMAP_DESC= Server-side imagemaps
Modified: trunk/www/apache24/distinfo
===================================================================
--- trunk/www/apache24/distinfo 2015-10-19 17:07:06 UTC (rev 20546)
+++ trunk/www/apache24/distinfo 2015-10-29 01:41:26 UTC (rev 20547)
@@ -1,2 +1,2 @@
-SHA256 (apache24/httpd-2.4.16.tar.bz2) = ac660b47aaa7887779a6430404dcb40c0b04f90ea69e7bd49a40552e9ff13743
-SIZE (apache24/httpd-2.4.16.tar.bz2) = 5101005
+SHA256 (apache24/httpd-2.4.17.tar.bz2) = 331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798
+SIZE (apache24/httpd-2.4.17.tar.bz2) = 5157721
Modified: trunk/www/apache24/files/apache24.in
===================================================================
--- trunk/www/apache24/files/apache24.in 2015-10-19 17:07:06 UTC (rev 20546)
+++ trunk/www/apache24/files/apache24.in 2015-10-29 01:41:26 UTC (rev 20547)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD$
+# $FreeBSD: head/www/apache24/files/apache24.in 362371 2014-07-20 20:49:32Z ohauer $
# PROVIDE: apache24
# REQUIRE: LOGIN cleanvar sshd
@@ -23,6 +23,7 @@
# Set to yes to check for accf_http kernel
# module on start up and load if not loaded.
# apache24_fib (str): Set an altered default network view for apache
+# apache24_configcheck_disable (bool): Set to "YES" to disable sanity check on startup
. /etc/rc.subr
@@ -46,6 +47,7 @@
[ -z "$apache24limits_enable" ] && apache24limits_enable="NO"
[ -z "$apache24limits_args" ] && apache24limits_args="-e -C daemon"
[ -z "$apache24_http_accept_enable" ] && apache24_http_accept_enable="NO"
+[ -z "$apache24_configcheck_disable" ] && apache24_configcheck_disable="NO"
apache24_accf()
{
@@ -75,6 +77,7 @@
eval apache24limits_enable="\${apache24limits_${profile}_enable:-${apache24limits_enable}}"
eval apache24limits_args="\${apache24limits_${profile}_args:-${apache24limits_args}}"
eval apache24_fib="\${apache24_${profile}_fib:-${apache24_fib}}"
+ eval apache24_configcheck_disable="\${apache24_${profile}_configcheck_disable:-${apache24_configcheck_disable}}"
eval command="\${apache24_${profile}_command:-${command}}"
eval pidfile="\${apache24_${profile}_pidfile:-${pidfile}}"
eval apache24_envvars="\${apache24_${profile}_envvars:-${envvars}}"
@@ -123,10 +126,14 @@
apache24_accf
fi
+if checkyesno apache24_configcheck_disable
+then
+ unset restart_precmd
+ unset reload_precmd
+fi
+
apache24_requirepidfile()
{
- apache24_checkconfig
-
if [ ! "0`check_pidfile ${pidfile} ${command}`" -gt 1 ]; then
echo "${name} not running? (check $pidfile)."
exit 1
@@ -147,6 +154,11 @@
apache24_graceful() {
apache24_requirepidfile
+ if ! checkyesno apache24_configcheck_disable
+ then
+ apache24_checkconfig
+ fi
+
echo "Performing a graceful restart"
eval ${command} ${apache24_flags} -k graceful
}
@@ -154,6 +166,11 @@
apache24_gracefulstop() {
apache24_requirepidfile
+ if ! checkyesno apache24_configcheck_disable
+ then
+ apache24_checkconfig
+ fi
+
echo "Performing a graceful stop"
eval ${command} ${apache24_flags} -k graceful-stop
}
@@ -160,7 +177,10 @@
apache24_precmd()
{
- apache24_checkconfig
+ if ! checkyesno apache24_configcheck_disable
+ then
+ apache24_checkconfig
+ fi
if checkyesno apache24limits_enable
then
Modified: trunk/www/apache24/files/patch-config.layout
===================================================================
--- trunk/www/apache24/files/patch-config.layout 2015-10-19 17:07:06 UTC (rev 20546)
+++ trunk/www/apache24/files/patch-config.layout 2015-10-29 01:41:26 UTC (rev 20547)
@@ -1,5 +1,5 @@
---- ./config.layout.orig 2012-04-17 16:01:41.000000000 +0200
-+++ ./config.layout 2013-03-22 18:55:53.000000000 +0100
+--- config.layout.orig 2012-04-17 14:01:41 UTC
++++ config.layout
@@ -257,17 +257,17 @@
bindir: ${exec_prefix}/bin
sbindir: ${exec_prefix}/sbin
Modified: trunk/www/apache24/files/patch-configure.in
===================================================================
--- trunk/www/apache24/files/patch-configure.in 2015-10-19 17:07:06 UTC (rev 20546)
+++ trunk/www/apache24/files/patch-configure.in 2015-10-29 01:41:26 UTC (rev 20547)
@@ -1,6 +1,6 @@
---- ./configure.in.orig 2013-01-09 17:39:05.000000000 +0100
-+++ ./configure.in 2013-03-22 18:55:53.000000000 +0100
-@@ -111,7 +111,7 @@
+--- configure.in.orig 2015-01-22 17:33:07 UTC
++++ configure.in
+@@ -111,7 +111,7 @@ fi
if test "$apr_found" = "reconfig"; then
APR_SUBDIR_CONFIG(srclib/apr,
@@ -9,7 +9,7 @@
[--enable-layout=*|\'--enable-layout=*])
dnl We must be the first to build and the last to be cleaned
AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"
-@@ -177,7 +177,7 @@
+@@ -177,7 +177,7 @@ esac
if test "$apu_found" = "reconfig"; then
APR_SUBDIR_CONFIG(srclib/apr-util,
@@ -18,7 +18,7 @@
[--enable-layout=*|\'--enable-layout=*])
dnl We must be the last to build and the first to be cleaned
AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
-@@ -822,8 +822,14 @@
+@@ -830,8 +830,14 @@ AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_pre
[Root directory of the Apache install area])
AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
[Location of the config file, relative to the Apache root directory])
Modified: trunk/www/apache24/files/patch-docs__conf__extra__httpd-autoindex.conf.in
===================================================================
--- trunk/www/apache24/files/patch-docs__conf__extra__httpd-autoindex.conf.in 2015-10-19 17:07:06 UTC (rev 20546)
+++ trunk/www/apache24/files/patch-docs__conf__extra__httpd-autoindex.conf.in 2015-10-29 01:41:26 UTC (rev 20547)
@@ -1,6 +1,6 @@
---- ./docs/conf/extra/httpd-autoindex.conf.in.orig 2010-06-15 13:05:13.000000000 +0200
-+++ ./docs/conf/extra/httpd-autoindex.conf.in 2013-03-22 18:55:53.000000000 +0100
-@@ -89,5 +89,5 @@
+--- docs/conf/extra/httpd-autoindex.conf.in.orig 2010-06-15 11:05:13 UTC
++++ docs/conf/extra/httpd-autoindex.conf.in
+@@ -89,5 +89,5 @@ HeaderName HEADER.html
# IndexIgnore is a set of filenames which directory indexing should ignore
# and not include in the listing. Shell-style wildcarding is permitted.
#
Modified: trunk/www/apache24/files/patch-docs__conf__extra__httpd-ssl.conf.in
===================================================================
--- trunk/www/apache24/files/patch-docs__conf__extra__httpd-ssl.conf.in 2015-10-19 17:07:06 UTC (rev 20546)
+++ trunk/www/apache24/files/patch-docs__conf__extra__httpd-ssl.conf.in 2015-10-29 01:41:26 UTC (rev 20547)
@@ -1,6 +1,6 @@
---- ./docs/conf/extra/httpd-ssl.conf.in.orig 2012-12-11 10:55:03.000000000 +0100
-+++ ./docs/conf/extra/httpd-ssl.conf.in 2013-03-22 18:55:53.000000000 +0100
-@@ -86,8 +86,8 @@
+--- docs/conf/extra/httpd-ssl.conf.in.orig 2015-05-27 13:59:59.000000000 -0500
++++ docs/conf/extra/httpd-ssl.conf.in 2015-07-15 09:50:31.369623000 -0500
+@@ -124,8 +124,8 @@
DocumentRoot "@exp_htdocsdir@"
ServerName www.example.com:@@SSLPort@@
ServerAdmin you at example.com
@@ -11,7 +11,7 @@
# SSL Engine Switch:
# Enable/Disable SSL for this virtual host.
-@@ -246,7 +246,7 @@
+@@ -284,7 +284,7 @@
# Per-Server Logging:
# The home of a custom SSL log file. Use this when you want a
# compact non-error SSL logfile on a virtual host basis.
Modified: trunk/www/apache24/files/patch-docs__conf__extra__httpd-userdir.conf.in
===================================================================
--- trunk/www/apache24/files/patch-docs__conf__extra__httpd-userdir.conf.in 2015-10-19 17:07:06 UTC (rev 20546)
+++ trunk/www/apache24/files/patch-docs__conf__extra__httpd-userdir.conf.in 2015-10-29 01:41:26 UTC (rev 20547)
@@ -1,5 +1,5 @@
---- ./docs/conf/extra/httpd-userdir.conf.in.orig 2011-06-06 23:40:41.000000000 +0200
-+++ ./docs/conf/extra/httpd-userdir.conf.in 2013-03-22 18:55:53.000000000 +0100
+--- docs/conf/extra/httpd-userdir.conf.in.orig 2011-06-06 21:40:41 UTC
++++ docs/conf/extra/httpd-userdir.conf.in
@@ -9,6 +9,8 @@
#
UserDir public_html
Modified: trunk/www/apache24/files/patch-docs__conf__httpd.conf.in
===================================================================
--- trunk/www/apache24/files/patch-docs__conf__httpd.conf.in 2015-10-19 17:07:06 UTC (rev 20546)
+++ trunk/www/apache24/files/patch-docs__conf__httpd.conf.in 2015-10-29 01:41:26 UTC (rev 20547)
@@ -1,6 +1,6 @@
---- ./docs/conf/httpd.conf.in.orig 2012-11-08 04:05:38.000000000 +0100
-+++ ./docs/conf/httpd.conf.in 2013-10-26 19:29:20.000000000 +0200
-@@ -65,6 +65,9 @@
+--- docs/conf/httpd.conf.in.orig 2012-11-08 03:05:38 UTC
++++ docs/conf/httpd.conf.in
+@@ -65,6 +65,9 @@ Listen @@Port@@
#
@@LoadModule@@
@@ -10,7 +10,7 @@
<IfModule unixd_module>
#
# If you wish httpd to run as a different user or group, you must run
-@@ -74,8 +77,8 @@
+@@ -74,8 +77,8 @@ Listen @@Port@@
# It is usually good practice to create a dedicated user and group for
# running httpd, as with most system services.
#
@@ -21,7 +21,7 @@
</IfModule>
-@@ -181,7 +184,7 @@
+@@ -181,7 +184,7 @@ DocumentRoot "@exp_htdocsdir@"
# logged here. If you *do* define an error logfile for a <VirtualHost>
# container, that host's errors will be logged there and not here.
#
@@ -30,7 +30,7 @@
#
# LogLevel: Control the number of messages logged to the error_log.
-@@ -210,13 +213,13 @@
+@@ -210,13 +213,13 @@ LogLevel warn
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
@@ -46,7 +46,7 @@
</IfModule>
<IfModule alias_module>
-@@ -418,3 +421,5 @@
+@@ -418,3 +421,5 @@ SSLRandomSeed connect builtin
#RequestHeader unset DNT env=bad_DNT
#</IfModule>
Modified: trunk/www/apache24/files/patch-support__Makefile.in
===================================================================
--- trunk/www/apache24/files/patch-support__Makefile.in 2015-10-19 17:07:06 UTC (rev 20546)
+++ trunk/www/apache24/files/patch-support__Makefile.in 2015-10-29 01:41:26 UTC (rev 20547)
@@ -1,6 +1,6 @@
---- ./support/Makefile.in.orig 2012-12-11 11:37:25.000000000 +0100
-+++ ./support/Makefile.in 2013-10-26 19:29:20.000000000 +0200
-@@ -17,10 +17,10 @@
+--- support/Makefile.in.orig 2012-12-11 10:37:25 UTC
++++ support/Makefile.in
+@@ -17,10 +17,10 @@ install:
@test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
@cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
@@ -14,7 +14,7 @@
fi ; \
done
@for i in apachectl; do \
-@@ -30,10 +30,7 @@
+@@ -30,10 +30,7 @@ install:
fi ; \
done
@if test -f "$(builddir)/envvars-std"; then \
Modified: trunk/www/apache24/files/patch-support__apachectl.in
===================================================================
--- trunk/www/apache24/files/patch-support__apachectl.in 2015-10-19 17:07:06 UTC (rev 20546)
+++ trunk/www/apache24/files/patch-support__apachectl.in 2015-10-29 01:41:26 UTC (rev 20547)
@@ -1,6 +1,6 @@
---- ./support/apachectl.in.orig 2012-02-01 04:47:28.000000000 +0100
-+++ ./support/apachectl.in 2013-03-22 18:55:53.000000000 +0100
-@@ -43,6 +43,7 @@
+--- support/apachectl.in.orig 2012-02-01 03:47:28 UTC
++++ support/apachectl.in
+@@ -43,6 +43,7 @@ ARGV="$@"
#
# the path to your httpd binary, including options if necessary
HTTPD='@exp_sbindir@/@progname@'
@@ -8,7 +8,7 @@
#
# pick up any necessary environment variables
if test -f @exp_sbindir@/envvars; then
-@@ -66,19 +67,21 @@
+@@ -66,19 +67,21 @@ ULIMIT_MAX_FILES="@APACHECTL_ULIMIT@"
# -------------------- --------------------
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
@@ -34,7 +34,7 @@
ERROR=$?
;;
startssl|sslstart|start-SSL)
-@@ -88,11 +91,13 @@
+@@ -88,11 +91,13 @@ startssl|sslstart|start-SSL)
ERROR=2
;;
configtest)
Modified: trunk/www/apache24/files/patch-support__apxs.in
===================================================================
--- trunk/www/apache24/files/patch-support__apxs.in 2015-10-19 17:07:06 UTC (rev 20546)
+++ trunk/www/apache24/files/patch-support__apxs.in 2015-10-29 01:41:26 UTC (rev 20547)
@@ -1,6 +1,6 @@
---- ./support/apxs.in.orig 2012-07-25 13:42:40.000000000 +0200
-+++ ./support/apxs.in 2013-03-22 18:55:53.000000000 +0100
-@@ -636,7 +636,13 @@
+--- support/apxs.in.orig 2013-12-26 18:01:53 UTC
++++ support/apxs.in
+@@ -636,7 +636,13 @@ if ($opt_i or $opt_e) {
}
} else {
# replace already existing LoadModule line
@@ -15,7 +15,7 @@
}
$lmd =~ m|LoadModule\s+(.+?)_module.*|;
notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]");
-@@ -645,8 +651,7 @@
+@@ -645,8 +651,7 @@ if ($opt_i or $opt_e) {
if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) {
print FP $content;
close(FP);
Modified: trunk/www/apache24/files/patch-support__envvars-std.in
===================================================================
--- trunk/www/apache24/files/patch-support__envvars-std.in 2015-10-19 17:07:06 UTC (rev 20546)
+++ trunk/www/apache24/files/patch-support__envvars-std.in 2015-10-29 01:41:26 UTC (rev 20547)
@@ -1,6 +1,6 @@
---- ./support/envvars-std.in.orig 2012-03-08 17:10:51.000000000 +0100
-+++ ./support/envvars-std.in 2013-03-22 18:55:53.000000000 +0100
-@@ -26,3 +26,10 @@
+--- support/envvars-std.in.orig 2012-03-08 16:10:51 UTC
++++ support/envvars-std.in
+@@ -26,3 +26,10 @@ fi
export @SHLIBPATH_VAR@
#
@OS_SPECIFIC_VARS@
Modified: trunk/www/apache24/files/patch-support__log_server_status.in
===================================================================
--- trunk/www/apache24/files/patch-support__log_server_status.in 2015-10-19 17:07:06 UTC (rev 20546)
+++ trunk/www/apache24/files/patch-support__log_server_status.in 2015-10-29 01:41:26 UTC (rev 20547)
@@ -1,6 +1,6 @@
---- ./support/log_server_status.in.orig 2012-04-29 01:08:09.000000000 +0200
-+++ ./support/log_server_status.in 2013-03-22 18:55:53.000000000 +0100
-@@ -29,7 +29,7 @@
+--- support/log_server_status.in.orig 2012-04-28 23:08:09 UTC
++++ support/log_server_status.in
+@@ -29,7 +29,7 @@ use IO::Socket;
use strict;
use warnings;
@@ -9,7 +9,7 @@
my $server = "localhost"; # Name of server, could be "www.foo.com"
my $port = "@PORT@"; # Port on server
my $request = "/server-status/?auto"; # Request to send
-@@ -46,7 +46,7 @@
+@@ -46,7 +46,7 @@ my $time =
. sprintf( "%02d", $ltime[1] )
. sprintf( "%02d", $ltime[0] );
More information about the Midnightbsd-cvs
mailing list