Accepting request 942126 from server:proxy

- Adjust harden_squid.service.patch to resolve boo#1193938

OBS-URL: https://build.opensuse.org/request/show/942126
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/squid?expand=0&rev=97

harden_squid.service.patch

@@ -1,15 +1,14 @@
-Index: squid-5.2/tools/systemd/squid.service
+Index: squid-5.3/tools/systemd/squid.service
 ===================================================================
---- squid-5.2.orig/tools/systemd/squid.service
-+++ squid-5.2/tools/systemd/squid.service
-@@ -11,6 +11,19 @@ Documentation=man:squid(8)
+--- squid-5.3.orig/tools/systemd/squid.service
++++ squid-5.3/tools/systemd/squid.service
+@@ -11,6 +11,18 @@ Documentation=man:squid(8)
  After=network.target network-online.target nss-lookup.target
  
  [Service]
 +# added automatically, for details please see
 +# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
 +ProtectSystem=full
-+ProtectHome=true
 +PrivateDevices=true
 +ProtectHostname=true
 +ProtectClock=true

squid.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Dec 22 14:03:32 UTC 2021 - Martin Pluskal <mpluskal@suse.com>
+
+- Adjust harden_squid.service.patch to resolve boo#1193938
+
 -------------------------------------------------------------------
 Sat Dec 11 09:36:41 UTC 2021 - Dirk Müller <dmueller@suse.com>
 

squid.spec

@@ -69,15 +69,14 @@ BuildRequires:  pkgconfig(tdb)
 Requires(pre):  permissions
 Recommends:     logrotate
 Provides:       http_proxy
-%if 0%{suse_version} <= 1500
+%{?systemd_ordering}
+%if 0%{?suse_version} <= 1500
 # due to package rename
 # Wed Aug 15 17:40:30 UTC 2012
 # remove this after SLE15
 Provides:       %{name}3 = %{version}
 Obsoletes:      %{name}3 < %{version}
 %endif
-
-%{?systemd_ordering}
 %if 0%{?suse_version} >= 1500
 BuildRequires:  sysuser-shadow
 BuildRequires:  sysuser-tools
@@ -236,7 +235,6 @@ make check %{?_smp_mflags}
 %if 0%{?suse_version} >= 1500
 %pre -f squid.pre
 %else
-
 %pre
 # we need this group for /usr/sbin/pinger
 getent group %{name} >/dev/null || %{_sbindir}/groupadd -g 31 -r %{name}