diff --git a/apache2-default-server.conf b/apache2-default-server.conf
index 2fd0e74..13ffee7 100644
--- a/apache2-default-server.conf
+++ b/apache2-default-server.conf
@@ -28,7 +28,7 @@ DocumentRoot "/srv/www/htdocs"
AllowOverride None
# Controls who can get stuff from this server.
- Require all granted
+ Require all granted
Order allow,deny
diff --git a/apache2-listen.conf b/apache2-listen.conf
index 205dc33..808d598 100644
--- a/apache2-listen.conf
+++ b/apache2-listen.conf
@@ -20,13 +20,13 @@ Listen 80
-
+
- Listen 443
+ Listen 443
-
+
diff --git a/apache2-mod_info.conf b/apache2-mod_info.conf
index 2928d43..c0f53c8 100644
--- a/apache2-mod_info.conf
+++ b/apache2-mod_info.conf
@@ -5,16 +5,16 @@
# see http://httpd.apache.org/docs/2.4/mod/mod_info.html
#
-
- SetHandler server-info
-
- Require local
-
-
- Order deny,allow
- Deny from all
- Allow from localhost
-
-
+
+ SetHandler server-info
+
+ Require local
+
+
+ Order deny,allow
+ Deny from all
+ Allow from localhost
+
+
diff --git a/apache2-mod_status.conf b/apache2-mod_status.conf
index 4f489b7..8a60fe9 100644
--- a/apache2-mod_status.conf
+++ b/apache2-mod_status.conf
@@ -5,16 +5,16 @@
# see http://httpd.apache.org/docs/2.4/mod/mod_status.html
#
-
- SetHandler server-status
-
- Require local
-
-
- Order deny,allow
- Deny from all
- Allow from localhost
-
-
+
+ SetHandler server-status
+
+ Require local
+
+
+ Order deny,allow
+ Deny from all
+ Allow from localhost
+
+
diff --git a/apache2-vhost.template b/apache2-vhost.template
index 6275aa9..10191f7 100644
--- a/apache2-vhost.template
+++ b/apache2-vhost.template
@@ -58,15 +58,15 @@
# CGI directory exists, if you have one, and where ScriptAlias points to.
#
- AllowOverride None
- Options +ExecCGI -Includes
+ AllowOverride None
+ Options +ExecCGI -Includes
- Require all granted
+ Require all granted
- Order allow,deny
- Allow from all
-
+ Order allow,deny
+ Allow from all
+
@@ -77,18 +77,18 @@
# in /etc/sysconfig/apache2.
#
- # Note that the name of the user directory ("public_html") cannot simply be
- # changed here, since it is a compile time setting. The apache package
- # would have to be rebuilt. You could work around by deleting
- # /usr/sbin/suexec, but then all scripts from the directories would be
- # executed with the UID of the webserver.
- UserDir public_html
- # The actual configuration of the directory is in
- # /etc/apache2/mod_userdir.conf.
- Include /etc/apache2/mod_userdir.conf
- # You can, however, change the ~ if you find it awkward, by mapping e.g.
- # http://www.example.com/users/karl-heinz/ --> /home/karl-heinz/public_html/
- #AliasMatch ^/users/([a-zA-Z0-9-_.]*)/?(.*) /home/$1/public_html/$2
+ # Note that the name of the user directory ("public_html") cannot simply be
+ # changed here, since it is a compile time setting. The apache package
+ # would have to be rebuilt. You could work around by deleting
+ # /usr/sbin/suexec, but then all scripts from the directories would be
+ # executed with the UID of the webserver.
+ UserDir public_html
+ # The actual configuration of the directory is in
+ # /etc/apache2/mod_userdir.conf.
+ Include /etc/apache2/mod_userdir.conf
+ # You can, however, change the ~ if you find it awkward, by mapping e.g.
+ # http://www.example.com/users/karl-heinz/ --> /home/karl-heinz/public_html/
+ #AliasMatch ^/users/([a-zA-Z0-9-_.]*)/?(.*) /home/$1/public_html/$2
@@ -96,39 +96,39 @@
# This should be changed to whatever you set DocumentRoot to.
#
-
- #
- # Possible values for the Options directive are "None", "All",
- # or any combination of:
- # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
- #
- # Note that "MultiViews" must be named *explicitly* --- "Options All"
- # doesn't give it to you.
- #
- # The Options directive is both complicated and important. Please see
- # http://httpd.apache.org/docs/2.4/mod/core.html#options
- # for more information.
- #
- Options Indexes FollowSymLinks
-
- #
- # AllowOverride controls what directives may be placed in .htaccess files.
- # It can be "All", "None", or any combination of the keywords:
- # Options FileInfo AuthConfig Limit
- #
- AllowOverride None
-
- #
- # Controls who can get stuff from this server.
- #
-
- Require all granted
-
-
- Order allow,deny
- Allow from all
-
-
+
+ #
+ # Possible values for the Options directive are "None", "All",
+ # or any combination of:
+ # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+ #
+ # Note that "MultiViews" must be named *explicitly* --- "Options All"
+ # doesn't give it to you.
+ #
+ # The Options directive is both complicated and important. Please see
+ # http://httpd.apache.org/docs/2.4/mod/core.html#options
+ # for more information.
+ #
+ Options Indexes FollowSymLinks
+
+ #
+ # AllowOverride controls what directives may be placed in .htaccess files.
+ # It can be "All", "None", or any combination of the keywords:
+ # Options FileInfo AuthConfig Limit
+ #
+ AllowOverride None
+
+ #
+ # Controls who can get stuff from this server.
+ #
+
+ Require all granted
+
+
+ Order allow,deny
+ Allow from all
+
+
diff --git a/apache2.changes b/apache2.changes
index 8a8b420..0e8f993 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Dec 9 12:21:27 UTC 2016 - pgajdos@suse.com
+
+- fix build with new systemd
+ + amended httpd-2.4.3-mod_systemd.patch
+
+-------------------------------------------------------------------
+Fri Dec 2 20:53:50 UTC 2016 - jimmy@boombatower.com
+
+- Replace mixed indentation with predominant style.
+
-------------------------------------------------------------------
Tue Sep 13 06:39:50 UTC 2016 - pgajdos@suse.com
diff --git a/apache2.spec b/apache2.spec
index 7c0d166..1e6ed8c 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -266,8 +266,8 @@ for development using the Apache API.
%package doc
Summary: Additional Package Documentation
-Group: Documentation/Other
# Remove after 13.2 is out of support scope
+Group: Documentation/Other
Provides: apache-doc = %{version}
Obsoletes: apache-doc < %{version}
%if 0%{?suse_version} >= 1120
@@ -280,8 +280,8 @@ this package's base documentation.
%package example-pages
Summary: Example Pages for the Apache 2 Web Server
-Group: Productivity/Networking/Web/Servers
# Remove after 13.2 is out of support scope
+Group: Productivity/Networking/Web/Servers
Provides: apache-example-pages
Obsoletes: apache-example-pages
diff --git a/httpd-2.4.3-mod_systemd.patch b/httpd-2.4.3-mod_systemd.patch
index db02def..c030e43 100644
--- a/httpd-2.4.3-mod_systemd.patch
+++ b/httpd-2.4.3-mod_systemd.patch
@@ -1,20 +1,31 @@
---- httpd-2.4.11.orig/modules/arch/unix/config5.m4
-+++ httpd-2.4.11/modules/arch/unix/config5.m4
-@@ -18,6 +18,12 @@ APACHE_MODULE(privileges, Per-virtualhos
+Index: httpd-2.4.23/modules/arch/unix/config5.m4
+===================================================================
+--- httpd-2.4.23.orig/modules/arch/unix/config5.m4 2016-12-09 12:29:49.398598223 +0100
++++ httpd-2.4.23/modules/arch/unix/config5.m4 2016-12-09 13:00:35.429783217 +0100
+@@ -18,6 +18,19 @@ APACHE_MODULE(privileges, Per-virtualhos
fi
])
+
+APACHE_MODULE(systemd, Systemd support, , , $unixd_mods_enabled, [
-+ PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon])
++ PKG_CHECK_MODULES([SYSTEMD],
++ [libsystemd >= 209],
++ [have_systemd=yes],
++ [PKG_CHECK_MODULES([SYSTEMD],
++ [libsystemd-login >= 32, libsystemd-daemon >= 32, libsystemd-journal >= 32],
++ [have_systemd=yes],
++ [have_systemd=no])])
+ APR_ADDTO(MOD_SYSTEMD_LDADD, [$SYSTEMD_LIBS])
+])
++
+
APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
APACHE_MODPATH_FINISH
---- /dev/null
-+++ httpd-2.4.11/modules/arch/unix/mod_systemd.c
+Index: httpd-2.4.23/modules/arch/unix/mod_systemd.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ httpd-2.4.23/modules/arch/unix/mod_systemd.c 2016-12-09 12:30:21.935147438 +0100
@@ -0,0 +1,138 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
@@ -154,8 +165,10 @@
+ NULL,
+ systemd_register_hooks,
+};
---- httpd-2.4.11.orig/configure.in
-+++ httpd-2.4.11/configure.in
+Index: httpd-2.4.23/configure.in
+===================================================================
+--- httpd-2.4.23.orig/configure.in 2016-12-09 12:29:49.398598223 +0100
++++ httpd-2.4.23/configure.in 2016-12-09 12:30:21.939147506 +0100
@@ -77,6 +77,7 @@ dnl shared library support for these pac
dnl work on some platforms
diff --git a/rc.apache2 b/rc.apache2
index 3f21732..5a59c4d 100644
--- a/rc.apache2
+++ b/rc.apache2
@@ -323,8 +323,8 @@ case "$action" in
## give out the argument which is required for a reload.
for i in $httpd_conf \
- $APACHE_CONF_INCLUDE_FILES \
- $APACHE_CONF_INCLUDE_DIRS
+ $APACHE_CONF_INCLUDE_FILES \
+ $APACHE_CONF_INCLUDE_DIRS
do
if [ $i -nt $pidfile ]; then
echo reload
@@ -344,8 +344,8 @@ case "$action" in
cmdline=$(echo $apache_bin -f $httpd_conf $server_flags "$@")
out=$(su - nobody -c "$cmdline" 2>&1)
case $out in
- *make_sock:\ could\ not\ bind\ to\ address*) echo Syntax: OK; rc_failed=0;;
- *) echo Syntax: NOT OK:; echo $out; rc_failed=1;;
+ *make_sock:\ could\ not\ bind\ to\ address*) echo Syntax: OK; rc_failed=0;;
+ *) echo Syntax: NOT OK:; echo $out; rc_failed=1;;
esac
rc_exit
;;