Accepting request 895417 from server:proxy

Automatic submission by obs-autosubmit

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

squid.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 18 09:43:49 UTC 2021 - Adam Majer <adam.majer@suse.de>
+
+- fix building with SLE12
+
 -------------------------------------------------------------------
 Tue May 11 21:54:04 UTC 2021 - Dirk Müller <dmueller@suse.com>
 
@@ -22,6 +27,7 @@ Tue May 11 21:54:04 UTC 2021 - Dirk Müller <dmueller@suse.com>
 Tue Feb  9 22:55:15 UTC 2021 - Dirk Müller <dmueller@suse.com>
 
 - update to 4.14:
+  - fixes HTTP Request Smuggling vulnerability (bsc#1183436, CVE-2020-25097)
   - Regression Fix: support for non-lowercase Transfer-Encoding value
   - Regression Fix: cachemgr.cgi wrong 403 response to authenticated menu URIs
   - Bug 5076: WCCP Security Info incorrect

squid.spec

@@ -153,7 +153,7 @@ export LDFLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,relro,-z,now -pie"
 	--disable-arch-native \
 	--enable-security-cert-generators \
 	--enable-security-cert-validators
-%make_build -O SAMBAPREFIX=%{_prefix}
+make -O SAMBAPREFIX=%{_prefix} %{?_smp_mflags}
 %if 0%{?suse_version} >= 1500
 %sysusers_generate_pre %{SOURCE12} squid
 %endif
@@ -200,9 +200,6 @@ for i in errors/*; do
 done
 ln -sf %{_datadir}/%{name}/errors/en %{buildroot}%{squidconfdir}/errors
 
-# fix file duplicates
-%fdupes -s %{buildroot}%{_prefix}
-
 # systemd
 install -D -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/%{name}.service
 install -D -m 755 %{SOURCE15} %{buildroot}%{squidlibexecdir}/cache_dir.sed
@@ -219,13 +216,15 @@ mkdir -p %{buildroot}%{_datadir}/snmp/mibs
 mv %{buildroot}%{_datadir}/squid/mib.txt \
   %{buildroot}%{_datadir}/snmp/mibs/SQUID-MIB.txt
 
+%if 0%{?suse_version} >= 1500
 # Install sysusers file.
 mkdir -p %{buildroot}%{_sysusersdir}
 install -m 644 %{SOURCE12} %{buildroot}%{_sysusersdir}/
+%endif
 
 %check
 # Fails in chroot environment
-%make_build check
+make check %{?_smp_mflags}
 
 %if 0%{?suse_version} >= 1500
 %pre -f squid.pre
@@ -298,7 +297,9 @@ fi
 %dir %{_tmpfilesdir}
 %dir %{_libexecdir}/%{name}
 %{_tmpfilesdir}/squid.conf
+%if 0%{?suse_version} >= 1500
 %{_sysusersdir}/squid-user.conf
+%endif
 %config(noreplace) %{squidconfdir}/cachemgr.conf
 %config(noreplace) %{squidconfdir}/errorpage.css
 %config(noreplace) %{squidconfdir}/errors