Hello community,
here is the log from the commit of package apache2 for openSUSE:Factory checked
in at 2015-06-17 16:14:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2 (Old)
and /work/SRC/openSUSE:Factory/.apache2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2015-06-10
09:15:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.apache2.new/apache2.changes 2015-06-17
16:14:59.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Jun 11 09:09:05 UTC 2015 - pgaj...@suse.com
+
+- dropped 2.0 -> 2.2 modules transition during upgrade
+ * apache-20-22-upgrade renamed to apache-22-24-upgrade
+- apache-*-upgrade script is called in %posttrans now [bnc#927223]
+
+-------------------------------------------------------------------
Old:
----
apache-20-22-upgrade
New:
----
apache-22-24-upgrade
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2.spec ++++++
--- /var/tmp/diff_new_pack.yeLNM2/_old 2015-06-17 16:15:00.000000000 +0200
+++ /var/tmp/diff_new_pack.yeLNM2/_new 2015-06-17 16:15:00.000000000 +0200
@@ -105,7 +105,7 @@
Source132: apache2-default-vhost.conf
Source133: apache2-default-vhost-ssl.conf
Source140: apache2-check_forensic
-Source141: apache-20-22-upgrade
+Source141: apache-22-24-upgrade
Source142: start_apache2
Source143: apache2-systemd-ask-pass
Source144: apache2.service
@@ -544,7 +544,7 @@
install -m 755 $RPM_SOURCE_DIR/find_mpm
%{buildroot}/%{_datadir}/%{name}/
install -m 755 $RPM_SOURCE_DIR/get_includes
%{buildroot}/%{_datadir}/%{name}/
install -m 755 $RPM_SOURCE_DIR/find_httpd_includes
%{buildroot}/%{_datadir}/%{name}/
-install -m 755 $RPM_SOURCE_DIR/apache-20-22-upgrade
%{buildroot}/%{_datadir}/%{name}/
+install -m 755 $RPM_SOURCE_DIR/apache-22-24-upgrade
%{buildroot}/%{_datadir}/%{name}/
sed 's+%{_prefix}/lib+%{_libdir}+' $RPM_SOURCE_DIR/get_module_list \
> %{buildroot}/%{_datadir}/%{name}/get_module_list
chmod 755 %{buildroot}/%{_datadir}/%{name}/get_module_list
@@ -822,7 +822,7 @@
%{_libdir}/%{name}/mod_*.so
%dir %{installbuilddir}
%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/apache-20-22-upgrade
+%{_datadir}/%{name}/apache-22-24-upgrade
%{_datadir}/%{name}/get_module_list
%{_datadir}/%{name}/get_includes
%{_datadir}/%{name}/find_httpd_includes
@@ -1354,10 +1354,12 @@
fi
rm -rf $tmpdir
-%{_datadir}/%{name}/apache-20-22-upgrade
%{_datadir}/%{name}/get_module_list >/dev/null 2>&1
exit 0
+%posttrans
+%{_datadir}/%{name}/apache-22-24-upgrade
+
%verifyscript
%verify_permissions -e %{_sbindir}/suexec
++++++ apache-20-22-upgrade -> apache-22-24-upgrade ++++++
--- /work/SRC/openSUSE:Factory/apache2/apache-20-22-upgrade 2013-10-24
14:07:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.apache2.new/apache-22-24-upgrade
2015-06-17 16:14:59.000000000 +0200
@@ -1,66 +1,8 @@
#!/bin/bash
-# obsolete 2.0 modules -> 2.2 modules
+# obsolete 2.2 modules -> 2.4 modules
-echo 'looking for old 2.0 modules to be renamed...'
-
-if a2enmod -q auth; then
- echo 'auth -> auth_basic authn_file'
-
- a2dismod auth
- a2enmod auth_basic
- a2enmod authn_file
- a2enmod authz_groupfile
- a2enmod authz_default
- a2enmod authz_user
- cat <<-EOF
-
-
- !!!ATTENTION!!!
-
- If you use basic authentication, you will need to update your
- configuration. Typically, you need to add
- AuthBasicProvider file
- (example for file-based authentication) below "AuthType Basic".
-
- !!!ATTENTION!!!
-
-
- EOF
-
-fi
-
-if a2enmod -q access; then
- echo 'access -> authz_host'
- a2dismod access
- a2enmod authz_host
-fi
-
-if a2enmod -q auth_dbm; then
- echo 'auth_dbm -> authn_dbm'
- a2dismod auth_dbm
- a2enmod authn_dbm
-fi
-
-if a2enmod -q imap; then
- echo 'imap -> imagemap'
- a2dismod imap
- a2enmod imagemap
-fi
-
-if a2enmod -q image_map; then
- echo 'image_map -> imagemap'
- a2dismod image_map
- a2enmod imagemap
-fi
-
-if a2enmod -q auth_ldap; then
- echo 'auth_ldap -> mod_authnz_ldap'
- a2dismod auth_ldap
- a2enmod mod_authnz_ldap
-fi
-
-for module in mod_authn_default mod_authz_default mod_mem_cache authz_default;
do
+for module in mod_authn_default mod_authz_default mod_mem_cache authz_default
authn_default mem_cache; do
if a2enmod -q "$module"; then
echo "!!ATTENTION! $module was removed from apache version 2.4 or
later, CHECK YOUR CONFIGURATION!!!"
a2dismod "$module"
@@ -78,5 +20,3 @@
if ! a2enmod -q log_config; then
a2enmod log_config
fi
-
-echo 'Done.'
