From d35ba78de273e5513156fd2b6bf8ccbe438fb42b821cdccbc42507dbe6df89fb Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 14 Jan 2021 08:11:23 +0000 Subject: [PATCH 1/4] Accepting request 862975 from home:adkorte:branches:Apache - suexec2 was renamed to suexec in 2015 and the symlink to suexec no longer exists OBS-URL: https://build.opensuse.org/request/show/862975 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=644 --- apache2.changes | 6 ++++++ apache2.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apache2.changes b/apache2.changes index 091ebb5..6511a8a 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 13 20:16:34 UTC 2021 - Arjen de Korte + +- suexec2 was renamed to suexec in 2015 and the symlink to suexec + no longer exists + ------------------------------------------------------------------- Tue Jan 12 22:29:52 UTC 2021 - Christian Boltz diff --git a/apache2.spec b/apache2.spec index 6070e12..b646fd0 100644 --- a/apache2.spec +++ b/apache2.spec @@ -968,7 +968,7 @@ if grep -q "^wwwadmin:" %{_sysconfdir}/group; then fi %service_add_post apache2.service apache2@.service apache2.target %set_permissions %{_sbindir}/suexec || \ - echo "Please check %{_sysconfdir}/permissions.local for settings of %{_sbindir}/suexec2 ." + echo "Please check %{_sysconfdir}/permissions.local for settings of %{_sbindir}/suexec" %{fillup_only apache2} %if %{use_firewalld} %firewalld_reload From 709e869e67a9dbda00e4a3e4c3654f5b580122359128bcb495d72b9d09d305c5 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 22 Jan 2021 07:35:48 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=645 --- apache2.changes | 6 ------ apache2.spec | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/apache2.changes b/apache2.changes index 6511a8a..091ebb5 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Jan 13 20:16:34 UTC 2021 - Arjen de Korte - -- suexec2 was renamed to suexec in 2015 and the symlink to suexec - no longer exists - ------------------------------------------------------------------- Tue Jan 12 22:29:52 UTC 2021 - Christian Boltz diff --git a/apache2.spec b/apache2.spec index b646fd0..6070e12 100644 --- a/apache2.spec +++ b/apache2.spec @@ -968,7 +968,7 @@ if grep -q "^wwwadmin:" %{_sysconfdir}/group; then fi %service_add_post apache2.service apache2@.service apache2.target %set_permissions %{_sbindir}/suexec || \ - echo "Please check %{_sysconfdir}/permissions.local for settings of %{_sbindir}/suexec" + echo "Please check %{_sysconfdir}/permissions.local for settings of %{_sbindir}/suexec2 ." %{fillup_only apache2} %if %{use_firewalld} %firewalld_reload From 8e2693c4ad1e612a2c2cd05308ca481e167925a3e794121d09a93f5cda12cfb8 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 22 Jan 2021 07:45:17 +0000 Subject: [PATCH 3/4] - remove suexec2 from premissions as well - modified sources % permissions.apache2 - suexec2 was renamed to suexec in 2015 and the symlink to suexec no longer exists OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=646 --- apache2.changes | 13 +++++++++++++ apache2.spec | 2 +- permissions.apache2 | 1 - 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/apache2.changes b/apache2.changes index 091ebb5..27d7bbf 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Jan 22 07:44:28 UTC 2021 - pgajdos@suse.com + +- remove suexec2 from premissions as well +- modified sources + % permissions.apache2 + +------------------------------------------------------------------- +Wed Jan 13 20:16:34 UTC 2021 - Arjen de Korte + +- suexec2 was renamed to suexec in 2015 and the symlink to suexec + no longer exists + ------------------------------------------------------------------- Tue Jan 12 22:29:52 UTC 2021 - Christian Boltz diff --git a/apache2.spec b/apache2.spec index 6070e12..ef57aaa 100644 --- a/apache2.spec +++ b/apache2.spec @@ -968,7 +968,7 @@ if grep -q "^wwwadmin:" %{_sysconfdir}/group; then fi %service_add_post apache2.service apache2@.service apache2.target %set_permissions %{_sbindir}/suexec || \ - echo "Please check %{_sysconfdir}/permissions.local for settings of %{_sbindir}/suexec2 ." + echo "Please check %{_sysconfdir}/permissions.local for settings of %{_sbindir}/suexec ." %{fillup_only apache2} %if %{use_firewalld} %firewalld_reload diff --git a/permissions.apache2 b/permissions.apache2 index 9d04059..5cb7079 100644 --- a/permissions.apache2 +++ b/permissions.apache2 @@ -1,2 +1 @@ /usr/sbin/suexec root:root 4755 -/usr/sbin/suexec2 root:root 4755 From a9058495403d4cd439cb21c8aa06156b07c2d14822deadbc2c4848cb2672a0b6 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 22 Jan 2021 12:59:39 +0000 Subject: [PATCH 4/4] Accepting request 865975 from home:stroeder:branches:Apache - added Provides: http_daemon to fix bsc#1180132 OBS-URL: https://build.opensuse.org/request/show/865975 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=647 --- apache2.changes | 5 +++++ apache2.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/apache2.changes b/apache2.changes index 27d7bbf..a88cf41 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 22 12:25:23 UTC 2021 - Michael Ströder + +- added Provides: http_daemon to fix bsc#1180132 + ------------------------------------------------------------------- Fri Jan 22 07:44:28 UTC 2021 - pgajdos@suse.com diff --git a/apache2.spec b/apache2.spec index ef57aaa..64733e0 100644 --- a/apache2.spec +++ b/apache2.spec @@ -279,6 +279,7 @@ Suggests: apache2-%{default_mpm} Recommends: apache2-utils Requires: logrotate Provides: %{apache_mmn} +Provides: http_daemon Provides: httpd Provides: suse_maintenance_mmn_%{suse_maintenance_mmn} Obsoletes: apache2-example-pages