Merge branch 'rawhide' into f39

2024-10-11 14:54:12 +02:00 · 2024-08-01 13:55:21 +02:00 · 2024-07-19 16:25:05 +02:00 · 2024-07-03 22:27:08 +02:00 · 2024-04-17 16:57:13 +01:00
3 changed files with 2 additions and 40 deletions
--- a/httpd.service
+++ b/httpd.service
@ -26,25 +26,8 @@ ExecReload=/usr/sbin/httpd $OPTIONS -k graceful
 # Send SIGWINCH for graceful stop
 KillSignal=SIGWINCH
 KillMode=mixed
-DevicePolicy=closed
-KeyringMode=private
-LockPersonality=yes
-MemoryDenyWriteExecute=yes
-OOMPolicy=continue
-PrivateDevices=yes
 PrivateTmp=true
-ProtectClock=yes
-ProtectControlGroups=yes
-ProtectHome=read-only
-ProtectHostname=yes
-ProtectKernelLogs=yes
-ProtectKernelModules=yes
-ProtectKernelTunables=yes
-ProtectSystem=yes
-RestrictNamespaces=yes
-RestrictRealtime=yes
-RestrictSUIDSGID=yes
-SystemCallArchitectures=native
+OOMPolicy=continue

 [Install]
 WantedBy=multi-user.target
--- a/httpd.spec
+++ b/httpd.spec
@ -889,10 +889,6 @@ exit $rv
 * Thu Mar 28 2024 Joe Orton <jorton@redhat.com> - 2.4.58-8
 - rebuild to fix changelog ordering

-* Thu Mar 7 2024 Rahul Sundaram <sundaram@fedoraproject.org> - 2.4.58-7
- Update Systemd security settings as part of https://fedoraproject.org/wiki/Changes/SystemdSecurityHardening
- updated httpd.service(5) (Joe Orton)
-
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.58-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

--- a/httpd@.service
+++ b/httpd@.service
@ -19,25 +19,8 @@ ExecReload=/usr/sbin/httpd $OPTIONS -k graceful -f conf/%i.conf
 # Send SIGWINCH for graceful stop
 KillSignal=SIGWINCH
 KillMode=mixed
-DevicePolicy=closed
-KeyringMode=private
-LockPersonality=yes
-MemoryDenyWriteExecute=yes
-OOMPolicy=continue
-PrivateDevices=yes
 PrivateTmp=true
-ProtectClock=yes
-ProtectControlGroups=yes
-ProtectHome=read-only
-ProtectHostname=yes
-ProtectKernelLogs=yes
-ProtectKernelModules=yes
-ProtectKernelTunables=yes
-ProtectSystem=yes
-RestrictNamespaces=yes
-RestrictRealtime=yes
-RestrictSUIDSGID=yes
-SystemCallArchitectures=native
+OOMPolicy=continue

 [Install]
 WantedBy=multi-user.target
Author	SHA1	Message	Date
Luboš Uhliarik	330495d9a1	Merge branch 'rawhide' into f39	2024-10-11 14:54:12 +02:00
Luboš Uhliarik	b10e552335	Merge branch 'rawhide' into f39	2024-08-01 13:55:21 +02:00
Luboš Uhliarik	9517a5bb17	Merge branch 'rawhide' into f39	2024-07-19 16:25:05 +02:00
Luboš Uhliarik	d203c80d14	Merge branch 'rawhide' into f39	2024-07-03 22:27:08 +02:00
Joe Orton	18d75f8ac9	Revert "- Updated Systemd security settings (closes #3 ) (Rahul Sundaram)" This reverts commit `dee54cd734`.	2024-04-17 16:57:13 +01:00