Hello community, here is the log from the commit of package squid for openSUSE:Factory checked in at 2019-02-19 12:00:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/squid (Old) and /work/SRC/openSUSE:Factory/.squid.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "squid" Tue Feb 19 12:00:50 2019 rev:68 rq:677001 version:4.5 Changes: -------- --- /work/SRC/openSUSE:Factory/squid/squid.changes 2019-01-03 18:08:11.476057035 +0100 +++ /work/SRC/openSUSE:Factory/.squid.new.28833/squid.changes 2019-02-19 12:02:04.701085979 +0100 @@ -1,0 +2,11 @@ +Mon Feb 18 10:03:23 UTC 2019 - [email protected] + +- Revert whitespace deletions of .changes as it makes diffs a pain. + +------------------------------------------------------------------- +Sat Feb 16 00:19:25 UTC 2019 - Jan Engelhardt <[email protected]> + +- Do not hide errors from useradd. Make scriptlets + plain sh compatible. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid.spec ++++++ --- /var/tmp/diff_new_pack.4TrEnj/_old 2019-02-19 12:02:06.505085047 +0100 +++ /var/tmp/diff_new_pack.4TrEnj/_new 2019-02-19 12:02:06.509085045 +0100 @@ -197,26 +197,21 @@ %pre # we need this group for /usr/sbin/pinger -if [[ -z $(%{_bindir}/getent group %{name} 2>/dev/null) ]]; then - %{_sbindir}/groupadd -g 31 -r %{name} 2>/dev/null -fi +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 -if [[ -z $(%{_bindir}/getent group winbind 2>/dev/null) ]]; then - %{_sbindir}/groupadd -r winbind 2>/dev/null -fi -if [[ -z $(%{_bindir}/getent passwd squid 2>/dev/null) ]]; then +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} 2>/dev/null -fi + %{name} # if default group is not squid, change it -if [[ "$(%{_bindir}/id -ng %{name} 2>/dev/null)" != "%{name}" ]]; then - %{_sbindir}/usermod -g %{name} %{name} 2>/dev/null +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 >/dev/null; echo $?) -ne 0 ]]; then - %{_sbindir}/usermod -G winbind %{name} 2>/dev/null +if [ $(%{_bindir}/id -nG %{name} 2>/dev/null | grep -q winbind; echo $?) -ne 0 ]; then + %{_sbindir}/usermod -G winbind %{name} fi %service_add_pre %{name}.service
