rpm/squid
SHA256
1
0
Fork 0
forked from pool/squid
Code Pull Requests Activity

Accepting request 1055875 from server:proxy

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1055875
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/squid?expand=0&rev=108
This commit is contained in:
Dominique Leuenberger 2023-01-04 16:53:50 +00:00 committed by Git OBS Bridge
commit 6cca7078d5
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
squid.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jan 3 08:24:05 UTC 2023 - Stefan Schubert <schubi@suse.com>
- Migration of PAM settings to /usr/lib/pam.d.
-------------------------------------------------------------------
Thu Sep 15 10:41:14 UTC 2022 - Stefan Schubert <schubi@suse.com>

15
squid.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package squid
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -201,7 +201,12 @@ mv %{buildroot}%{_sbindir}/cachemgr.cgi %{buildroot}/%{_libdir}/%{name}
install -dpm 755 doc/contrib
install %{SOURCE6} doc/contrib
%if 0%{?suse_version} > 1500
mkdir -p %{buildroot}%{_pam_vendordir}
install -Dpm 644 %{SOURCE5} %{buildroot}%{_pam_vendordir}/%{name}
%else
install -Dpm 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/pam.d/%{name}
%endif
rm -rf %{buildroot}%{squidconfdir}/errors
for i in errors/*; do
@ -272,7 +277,7 @@ fi
%service_add_pre %{name}.service
%if 0%{?suse_version} > 1500
# Prepare for migration to /usr/etc; save any old .rpmsave
for i in logrotate.d/%{name} ; do
for i in logrotate.d/%{name} pam.d/%{name} ; do
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
done
%endif
@ -280,7 +285,7 @@ done
%if 0%{?suse_version} > 1500
%posttrans
# Migration to /usr/etc, restore just created .rpmsave
for i in logrotate.d/%{name} ; do
for i in logrotate.d/%{name} pam.d/%{name} ; do
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
done
%endif
@ -346,7 +351,11 @@ fi
%config %{squidconfdir}/errorpage.css.default
%config %{squidconfdir}/%{name}.conf.default
%config %{squidconfdir}/%{name}.conf.documented
%if 0%{?suse_version} > 1500
%{_pam_vendordir}/%{name}
%else
%config %{_sysconfdir}/pam.d/%{name}
%endif
%dir %{_datadir}/%{name}
%dir %{_datadir}/snmp
%dir %{_datadir}/snmp/mibs