pool/squid
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 677001 from server:proxy

Browse Source 
- Revert whitespace deletions of .changes as it makes diffs a pain.

- Do not hide errors from useradd. Make scriptlets
  plain sh compatible.

OBS-URL: https://build.opensuse.org/request/show/677001
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/squid?expand=0&rev=68
This commit is contained in:
Yuchen Lin 2019-02-19 11:00:50 +00:00 committed by Git OBS Bridge
commit 142b1d34e9
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
squid.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Feb 18 10:03:23 UTC 2019 - adam.majer@suse.de
- Revert whitespace deletions of .changes as it makes diffs a pain.
-------------------------------------------------------------------
Sat Feb 16 00:19:25 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Do not hide errors from useradd. Make scriptlets
plain sh compatible.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 02 05:45:03 UTC 2019 - sean@suspend.net Wed Jan 02 05:45:03 UTC 2019 - sean@suspend.net

21
squid.spec
View File

@ -197,26 +197,21 @@ make %{?_smp_mflags} check
%pre %pre
# we need this group for /usr/sbin/pinger # we need this group for /usr/sbin/pinger
if [[ -z $(%{_bindir}/getent group %{name} 2>/dev/null) ]]; then getent group %{name} >/dev/null || %{_sbindir}/groupadd -g 31 -r %{name}
%{_sbindir}/groupadd -g 31 -r %{name} 2>/dev/null
fi
# we need this group for squid (ntlmauth) # we need this group for squid (ntlmauth)
# read access to /var/lib/samba/winbindd_privileged # read access to /var/lib/samba/winbindd_privileged
if [[ -z $(%{_bindir}/getent group winbind 2>/dev/null) ]]; then getent group winbind >/dev/null || %{_sbindir}/groupadd -r winbind
%{_sbindir}/groupadd -r winbind 2>/dev/null getent passwd squid >/dev/null || \
fi
if [[ -z $(%{_bindir}/getent passwd squid 2>/dev/null) ]]; then
%{_sbindir}/useradd -c "WWW-proxy squid" -d %{_localstatedir}/cache/%{name} \ %{_sbindir}/useradd -c "WWW-proxy squid" -d %{_localstatedir}/cache/%{name} \
-G winbind -g %{name} -o -u 31 -r -s /bin/false \ -G winbind -g %{name} -o -u 31 -r -s /bin/false \
%{name} 2>/dev/null %{name}
fi
# if default group is not squid, change it # if default group is not squid, change it
if [[ "$(%{_bindir}/id -ng %{name} 2>/dev/null)" != "%{name}" ]]; then if [ "$(%{_bindir}/id -ng %{name} 2>/dev/null)" != "%{name}" ]; then
%{_sbindir}/usermod -g %{name} %{name} 2>/dev/null %{_sbindir}/usermod -g %{name} %{name}
fi fi
# if squid is not member of winbind, add him # 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 if [ $(%{_bindir}/id -nG %{name} 2>/dev/null | grep -q winbind; echo $?) -ne 0 ]; then
%{_sbindir}/usermod -G winbind %{name} 2>/dev/null %{_sbindir}/usermod -G winbind %{name}
fi fi
%service_add_pre %{name}.service %service_add_pre %{name}.service