From 6a1051790073b2f7cb1760d5159cdf968784e9a0 Mon Sep 17 00:00:00 2001
From: eaglegai <eaglegai@163.com>
Date: Wed, 30 Jun 2021 11:01:05 +0800
Subject: [PATCH] fix squid-conf-tests failed when use 'rpmbuild' command

---
 squid.spec | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/squid.spec b/squid.spec
index b7f1a28..4637e12 100644
--- a/squid.spec
+++ b/squid.spec
@@ -2,7 +2,7 @@
 
 Name:     squid
 Version:  4.9
-Release:  8
+Release:  9
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+ and (LGPLv2+ and MIT and BSD and Public Domain)
@@ -94,8 +94,14 @@ 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
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -218,6 +224,12 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jun 30 2021 gaihuiying <gaihuiying1@huawei.com> - 4.9-9
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix squid-conf-tests failed when use 'rpmbuild' command
+
 * Wed Jun 16 2021 xihaochen<xihaochen@huawei.com> - 4.9-8
 - Type:cves
 - ID:CVE-2021-28651 CVE-2021-28652 CVE-2021-28662 CVE-2021-31806 CVE-2021-31808 CVE-2021-33620
-- 
Gitee