Accepting request 1006088 from server:proxy

- Migration to /usr/etc: Saving user changed configuration files
  in /etc and restoring them while an RPM update.

and CVE references,
  - Regression Fix: Typo in manager ACL (bsc#1203677, CVE-2022-41317)
    (bsc#1203680, CVE-2022-41318)

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

squid.changes

@@ -1,11 +1,18 @@
+-------------------------------------------------------------------
+Thu Sep 15 10:41:14 UTC 2022 - Stefan Schubert <schubi@suse.com>
+
+- Migration to /usr/etc: Saving user changed configuration files
+  in /etc and restoring them while an RPM update.
+
 -------------------------------------------------------------------
 Sun Sep 11 08:00:04 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
 - update to 5.7:
-  - Regression Fix: Typo in manager ACL
+  - Regression Fix: Typo in manager ACL (bsc#1203677, CVE-2022-41317)
   - Bug 5186: noteDestinationsEnd check failed: transportWait
   - Bug 5160: Test suite fails with -flto=auto
   - Bug 3193 pt2: NTLM decoder truncating strings
+    (bsc#1203680, CVE-2022-41318)
   - Bug 5133: OpenSSL 3.0 support
   - ext_session_acl: fix TDB key lookup
   - forward_max_tries: Do not count discarded connections

squid.spec

@@ -270,6 +270,20 @@ if [ $(%{_bindir}/id -nG %{name} 2>/dev/null | grep -q winbind; echo $?) -ne 0 ]
 fi
 %endif
 %service_add_pre %{name}.service
+%if 0%{?suse_version} > 1500
+# Prepare for migration to /usr/etc; save any old .rpmsave
+for i in logrotate.d/%{name} ; do
+   test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
+done
+%endif
+
+%if 0%{?suse_version} > 1500
+%posttrans
+# Migration to /usr/etc, restore just created .rpmsave
+for i in logrotate.d/%{name} ; do
+   test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
+done
+%endif
 
 # update mode?
 if [ "$1" -gt "1" ]; then