From 095d56d658bc9b766779818d785c62ba3d9d0436 Mon Sep 17 00:00:00 2001 From: lijingyuan007 <18829898205@163.com> Date: Fri, 23 Jul 2021 11:27:33 +0800 Subject: [PATCH] fix squid-conf-tests failed when use rpmbuild command --- squid.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/squid.spec b/squid.spec index b2eece6..c055f70 100644 --- a/squid.spec +++ b/squid.spec @@ -2,7 +2,7 @@ Name: squid Version: 4.9 -Release: 7 +Release: 8 Summary: The Squid proxy caching server Epoch: 7 License: GPLv2+ and (LGPLv2+ and MIT and BSD and Public Domain) @@ -93,7 +93,13 @@ LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel" make DEFAULT_SWAP_DIR=%{_localstatedir}/spool/squid %{?_smp_mflags} %check -make check +if ! getent passwd squid >/dev/null 2>&1 && [ `id -u` -eq 0 ];then + /usr/sbin/useradd -u 23 -d /var/spool/squid -r -s /sbin/nologin squid >/dev/null 2>&1 || exit 1 + make check + /usr/sbin/userdel squid +else + make check +fi %install rm -rf $RPM_BUILD_ROOT @@ -217,6 +223,12 @@ fi chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || : %changelog +* Fri Jul 23 2021 lijingyuan - 4.9-8 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix squid-conf-tests failed when use 'rpmbuild' command + * Wed Jun 16 2021 xihaochen - 4.9-7 - Type:cves - ID:CVE-2021-28651 CVE-2021-28652 CVE-2021-28662 CVE-2021-31806 CVE-2021-31808 CVE-2021-33620 -- Gitee