rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

- do not call and do not ship apache-22-24-upgrade [bsc#1042037]

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=522
This commit is contained in:
Petr Gajdos 2017-10-03 16:18:03 +00:00 committed by Git OBS Bridge
parent 955adce8b6
commit 5dced272cc
3 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apache-22-24-upgrade
View File

@ -1,22 +0,0 @@
#!/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 a2enmod -q "$module"; then
echo "!!ATTENTION! $module was removed from apache version 2.4 or later, CHECK YOUR CONFIGURATION!!!"
a2dismod "$module"
fi
done
if ! a2enmod -q authn_core; then
a2enmod authn_core
fi
if ! a2enmod -q authz_core; then
a2enmod authz_core
fi
if ! a2enmod -q log_config; then
a2enmod log_config
fi

5
apache2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 3 16:13:13 UTC 2017 - pgajdos@suse.com
- do not call and do not ship apache-22-24-upgrade [bsc#1042037]
-------------------------------------------------------------------
Mon Jul 24 15:25:09 UTC 2017 - schneemann@b1-systems.de

10
apache2.spec
View File

@ -107,7 +107,6 @@ 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
@ -115,7 +114,7 @@ Source145: apache2-find-directives
Source146: apache2@.service
Source147: apache2-script-helpers
Source148: apache2.target
Source149: %{name}-init.logrotate
Source149: %{name}-init.logrotate
Patch2: httpd-2.1.3alpha-layout.dif
Patch23: httpd-apachectl.patch
Patch66: httpd-2.0.54-envvars.dif
@ -128,7 +127,7 @@ Patch109: httpd-2.4.3-mod_systemd.patch
Patch111: httpd-visibility.patch
# PATCH-FEATURE-UPSTREAM kstreitova@suse.com -- backport of HttpContentLengthHeadZero and HttpExpectStrict
Patch115: httpd-2.4.x-fate317766-config-control-two-protocol-options.diff
Patch116: deprecated-scripts-arch.patch
Patch116: deprecated-scripts-arch.patch
BuildRequires: apache-rpm-macros-control
BuildRequires: apr-util-devel
BuildRequires: automake
@ -564,7 +563,6 @@ do
chmod +x %{buildroot}/%{_datadir}/%{name}/$file
done
%endif
install -m 755 $RPM_SOURCE_DIR/apache-22-24-upgrade %{buildroot}/%{_datadir}/%{name}/
install -m 755 $RPM_SOURCE_DIR/sysconf_addword %{buildroot}/%{_datadir}/%{name}/
install -m 755 $RPM_SOURCE_DIR/a2enflag %{buildroot}/%{_sbindir}
ln -s a2enflag %{buildroot}/%{_sbindir}/a2disflag
@ -607,7 +605,6 @@ cat > %{buildroot}/%{sysconfdir}/uid.conf <<-EOF
Group %{httpdgroup}
EOF
# fixup libdir
%if "%{_lib}" != "lib64"
sed -e 's/lib64/%{_lib}/' -i \
@ -841,7 +838,6 @@ mv %{buildroot}/%{sysconfdir}/original .
%{_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
@ -1447,8 +1443,6 @@ fi
exit 0
%posttrans
%{_datadir}/%{name}/apache-22-24-upgrade
%verifyscript
%verify_permissions -e %{_sbindir}/suexec
%apache_restart_if_needed