From 8a6fb40f409b0377c89c0f206dcb11c10104f23afc394f76f2fedebc868d6d4e Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Mon, 13 May 2019 14:51:46 +0000
Subject: [PATCH] - revive apache-22-24-upgrade [bsc#1134294] (internal) -
 added sources   + apache-22-24-upgrade

OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=583
---
 apache-22-24-upgrade | 22 ++++++++++++++++++++++
 apache2.changes      |  7 +++++++
 apache2.spec         |  4 ++++
 3 files changed, 33 insertions(+)
 create mode 100644 apache-22-24-upgrade

diff --git a/apache-22-24-upgrade b/apache-22-24-upgrade
new file mode 100644
index 0000000..cff684b
--- /dev/null
+++ b/apache-22-24-upgrade
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# obsolete 2.2 modules -> 2.4 modules
+
+for module in mod_authn_default mod_authz_default mod_mem_cache authz_default authn_default mem_cache; do
+	if /usr/sbin/a2enmod -q "$module"; then
+	echo "!!ATTENTION! $module was removed from apache version 2.4 or later, CHECK YOUR CONFIGURATION!!!"
+	/usr/sbin/a2dismod "$module"
+	fi
+done
+
+if ! /usr/sbin/a2enmod -q authn_core; then
+  /usr/sbin/a2enmod authn_core
+fi
+
+if ! /usr/sbin/a2enmod -q authz_core; then
+  /usr/sbin/a2enmod authz_core
+fi
+
+if ! /usr/sbin/a2enmod -q log_config; then
+  /usr/sbin/a2enmod log_config
+fi
diff --git a/apache2.changes b/apache2.changes
index 8b21bf1..e2a41bd 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon May 13 14:31:22 UTC 2019 - pgajdos@suse.com
+
+- revive apache-22-24-upgrade [bsc#1134294] (internal)
+- added sources
+  + apache-22-24-upgrade
+
 -------------------------------------------------------------------
 Tue Apr  2 10:26:21 UTC 2019 - pgajdos@suse.com
 
diff --git a/apache2.spec b/apache2.spec
index 9ddbac5..4f3ac80 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -124,6 +124,7 @@ Source119:      apache2-protocols.conf
 Source130:      apache2-vhost.template
 Source131:      apache2-vhost-ssl.template
 Source140:      apache2-check_forensic
+Source141:      apache-22-24-upgrade
 Source142:      start_apache2
 Source143:      apache2-systemd-ask-pass
 Source144:      apache2.service
@@ -562,6 +563,7 @@ tar -xjf %{SOURCE29} -C %{buildroot}/%{sysconfdir}
 install -m 644 %{_sourcedir}/apache2-script-helpers %{buildroot}/%{_datadir}/%{name}/script-helpers
 install -m 744 %{_sourcedir}/start_apache2 %{buildroot}/%{_sbindir}/
 cp -r deprecated-scripts %{buildroot}/%{_datadir}/%{name}/
+install -m 755 %{_sourcedir}/apache-22-24-upgrade %{buildroot}/%{_datadir}/%{name}/
 %if 0%{?suse_version} >= 1210
 mkdir -p %{buildroot}%{_unitdir}/
 install -m 700 %{_sourcedir}/apache2-systemd-ask-pass %{buildroot}/%{_sbindir}/
@@ -861,6 +863,7 @@ rm %{buildroot}/%{sysconfdir}/*.test
 %{_libdir}/%{name}/mod_*.so
 %dir %{installbuilddir}
 %dir %{_datadir}/%{name}
+%{_datadir}/%{name}/apache-22-24-upgrade
 %{_datadir}/%{name}/deprecated-scripts
 %{_datadir}/%{name}/script-helpers
 %{_datadir}/%{name}/sysconf_addword
@@ -1448,6 +1451,7 @@ fi
 exit 0
 
 %posttrans
+%{_datadir}/%{name}/apache-22-24-upgrade
 %apache_restart_if_needed
 
 %verifyscript