Hello community, here is the log from the commit of package squid for openSUSE:Factory checked in at 2020-02-19 12:43:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/squid (Old) and /work/SRC/openSUSE:Factory/.squid.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "squid" Wed Feb 19 12:43:04 2020 rev:77 rq:776229 version:4.10 Changes: -------- --- /work/SRC/openSUSE:Factory/squid/squid.changes 2020-02-05 19:44:59.083361494 +0100 +++ /work/SRC/openSUSE:Factory/.squid.new.26092/squid.changes 2020-02-19 12:43:13.455934661 +0100 @@ -1,0 +2,6 @@ +Tue Feb 18 15:46:02 CET 2020 - [email protected] + +- Use sysusers instead of shadow to create squid user and groups +- Don't hard require systemd + +------------------------------------------------------------------- New: ---- squid-user.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid.spec ++++++ --- /var/tmp/diff_new_pack.J3lJxd/_old 2020-02-19 12:43:15.259938134 +0100 +++ /var/tmp/diff_new_pack.J3lJxd/_new 2020-02-19 12:43:15.263938142 +0100 @@ -33,6 +33,7 @@ Source9: %{name}.permissions Source10: README.kerberos Source11: %{name}.service +Source12: %{name}-user.conf # http://lists.squid-cache.org/pipermail/squid-announce/2016-October/000064.html Source13: http://www.squid-cache.org/pgp.asc#/squid.keyring Source15: cache_dir.sed @@ -55,6 +56,8 @@ BuildRequires: pkgconfig BuildRequires: samba-winbind BuildRequires: sharutils +BuildRequires: sysuser-shadow +BuildRequires: sysuser-tools BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(gssrpc) BuildRequires: pkgconfig(kdb) @@ -64,16 +67,16 @@ BuildRequires: pkgconfig(nettle) Requires: logrotate Requires(pre): permissions -Requires(pre): shadow Provides: http_proxy # due to package rename # Wed Aug 15 17:40:30 UTC 2012 Provides: %{name}3 = %{version} Obsoletes: %{name}3 < %{version} -%{?systemd_requires} +%{?systemd_ordering} %if 0%{?suse_version} >= 1330 BuildRequires: libnsl-devel %endif +%sysusers_requires %description Squid is a caching proxy for the Web supporting HTTP(S), FTP, and @@ -142,6 +145,7 @@ --enable-security-cert-generators \ --enable-security-cert-validators make SAMBAPREFIX=%{_prefix} %{?_smp_mflags} +%sysusers_generate_pre %{SOURCE12} squid %install install -d -m 750 %{buildroot}%{_localstatedir}/{cache,log}/%{name} @@ -197,28 +201,15 @@ mv %{buildroot}%{_datadir}/squid/mib.txt \ %{buildroot}%{_datadir}/snmp/mibs/SQUID-MIB.txt +# Install sysusers file. +mkdir -p %{buildroot}%{_sysusersdir} +install -m 644 %{SOURCE12} %{buildroot}%{_sysusersdir}/ + %check # Fails in chroot environment make %{?_smp_mflags} check -%pre -# we need this group for /usr/sbin/pinger -getent group %{name} >/dev/null || %{_sbindir}/groupadd -g 31 -r %{name} -# we need this group for squid (ntlmauth) -# read access to /var/lib/samba/winbindd_privileged -getent group winbind >/dev/null || %{_sbindir}/groupadd -r winbind -getent passwd squid >/dev/null || \ - %{_sbindir}/useradd -c "WWW-proxy squid" -d %{_localstatedir}/cache/%{name} \ - -G winbind -g %{name} -o -u 31 -r -s /bin/false \ - %{name} -# if default group is not squid, change it -if [ "$(%{_bindir}/id -ng %{name} 2>/dev/null)" != "%{name}" ]; then - %{_sbindir}/usermod -g %{name} %{name} -fi -# if squid is not member of winbind, add him -if [ $(%{_bindir}/id -nG %{name} 2>/dev/null | grep -q winbind; echo $?) -ne 0 ]; then - %{_sbindir}/usermod -G winbind %{name} -fi +%pre -f squid.pre %service_add_pre %{name}.service # update mode? @@ -265,6 +256,7 @@ %dir %{squidconfdir} %dir %{_tmpfilesdir} %{_tmpfilesdir}/squid.conf +%{_sysusersdir}/squid-user.conf %config(noreplace) %{squidconfdir}/cachemgr.conf %config(noreplace) %{squidconfdir}/errorpage.css %config(noreplace) %{squidconfdir}/errors ++++++ squid-user.conf ++++++ # Type Name ID GECOS [HOME] u squid - "WWW-proxy squid" /var/cache/squid g winbind - - m squid winbind
