From 028198afb44e30a91dc716398a7adf9255c549ee2934c02aaecf5cb7f3a605bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Tue, 22 Oct 2013 15:46:52 +0000
Subject: [PATCH] Accepting request 204342 from home:elvigia:branches:Apache

- Correct build in old distros.

- disable (revert) mod_ssl changes in the previous
  commit so it does not end in factory or 13.1 yet.

- make mod_systemd static so scenarios described in
  [bnc#846897] do not happen again.

OBS-URL: https://build.opensuse.org/request/show/204342
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=395
---
 apache-20-22-upgrade          |  4 ----
 apache2.changes               | 17 +++++++++++++++++
 apache2.spec                  | 11 +++++++----
 httpd-2.4.3-mod_systemd.patch | 11 +++++------
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/apache-20-22-upgrade b/apache-20-22-upgrade
index fb8eb77..c119eb6 100644
--- a/apache-20-22-upgrade
+++ b/apache-20-22-upgrade
@@ -67,10 +67,6 @@ for module in mod_authn_default mod_authz_default mod_mem_cache authz_default; d
 	fi
 done
 
-if ! a2enmod -q systemd; then
-  a2enmod systemd
-fi
-
 if ! a2enmod -q authn_core; then
   a2enmod authn_core
 fi
diff --git a/apache2.changes b/apache2.changes
index 306bbdb..0284b41 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Oct 22 15:43:53 UTC 2013 - crrodriguez@opensuse.org
+
+- Correct build in old distros. 
+
+-------------------------------------------------------------------
+Tue Oct 22 15:09:21 UTC 2013 - crrodriguez@opensuse.org
+
+- disable (revert) mod_ssl changes in the previous
+  commit so it does not end in factory or 13.1 yet.
+
+-------------------------------------------------------------------
+Tue Oct 22 15:06:19 UTC 2013 - crrodriguez@opensuse.org
+
+- make mod_systemd static so scenarios described in 
+  [bnc#846897] do not happen again.
+
 -------------------------------------------------------------------
 Mon Oct 21 23:44:19 UTC 2013 - crrodriguez@opensuse.org
 
diff --git a/apache2.spec b/apache2.spec
index f9b58e6..ad1e087 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -69,10 +69,12 @@ BuildRequires:  expat-devel
 %define localstatedir	/var/lib/%{pname}
 %define proxycachedir 	/var/cache/%{pname}
 %define logfiledir	/var/log/%{pname}
-%if %suse_version > 1220
+%if %suse_version >= 1220
 %define runtimedir /run
+%define mods_static access_compat unixd systemd
 %else
 %define runtimedir	/var/run
+%define mods_static access_compat unixd
 %endif
 %define sysconfdir	/etc/%{pname}
 %define includedir 	%{_includedir}/%{pname}
@@ -85,6 +87,7 @@ BuildRequires:  expat-devel
 %else
 %define _unitdir /lib/systemd
 %endif
+
 # "Server:" header
 %define VENDOR SUSE
 %define platform_string	Linux/%VENDOR
@@ -160,7 +163,7 @@ Patch70:        apache2-implicit-pointer-decl.patch
 Patch109:       httpd-2.4.3-mod_systemd.patch
 Patch110:       http://people.apache.org/~minfrin/httpd-event-ssl.patch
 Patch111:       httpd-visibility.patch
-Patch112:       mod_ssl-2.4.x-ekh.diff
+#Patch112:       mod_ssl-2.4.x-ekh.diff
 Url:            http://httpd.apache.org/
 Icon:           Apache.xpm
 Summary:        The Apache Web Server Version 2.2
@@ -384,7 +387,7 @@ to administrators of web servers in general.
 %patch109 -p1
 %patch110 
 %patch111 -p1
-%patch112
+#%patch112
 cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE
 # install READMEs
 a=$(basename %{S:22})
@@ -442,7 +445,7 @@ function configure {
 		--enable-pie \
 %endif
 		--enable-mods-shared=all \
-        --enable-mods-static="access_compat unixd" \
+		--enable-mods-static="%{mods_static}" \
 		--enable-ssl=shared \
 		\
 		--disable-isapi \
diff --git a/httpd-2.4.3-mod_systemd.patch b/httpd-2.4.3-mod_systemd.patch
index 8b3c52c..673eb09 100644
--- a/httpd-2.4.3-mod_systemd.patch
+++ b/httpd-2.4.3-mod_systemd.patch
@@ -1,6 +1,6 @@
---- httpd-2.4.3/modules/arch/unix/config5.m4.systemd
-+++ httpd-2.4.3/modules/arch/unix/config5.m4
-@@ -18,6 +18,19 @@ APACHE_MODULE(privileges, Per-virtualhos
+--- httpd-2.4.6.orig/modules/arch/unix/config5.m4
++++ httpd-2.4.6/modules/arch/unix/config5.m4
+@@ -18,6 +18,18 @@ APACHE_MODULE(privileges, Per-virtualhos
    fi
  ])
  
@@ -13,15 +13,14 @@
 +    enable_systemd="no"
 +  else
 +    APR_ADDTO(MOD_SYSTEMD_LDADD, [$SYSTEMD_LIBS])
-+    enable_systemd="yes"
 +  fi
 +])
 +
  APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
  
  APACHE_MODPATH_FINISH
---- httpd-2.4.3/modules/arch/unix/mod_systemd.c.systemd
-+++ httpd-2.4.3/modules/arch/unix/mod_systemd.c
+--- /dev/null
++++ httpd-2.4.6/modules/arch/unix/mod_systemd.c
 @@ -0,0 +1,138 @@
 +/* Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with