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

Accepting request 643973 from home:adamm:branches:server:proxy

Browse Source 
- Create runtime directories needed when SMP mode is enabled.
  (bsc#1112695, bsc#1112066)
- Make changelog entries format consistent

OBS-URL: https://build.opensuse.org/request/show/643973
OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=169
This commit is contained in:
Martin Pluskal 2018-10-23 13:55:38 +00:00 committed by Git OBS Bridge
parent 5f431c6df6
commit b13fb97e7d
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
squid.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Oct 23 09:20:12 UTC 2018 - adam.majer@suse.de
- Create runtime directories needed when SMP mode is enabled.
(bsc#1112695, bsc#1112066)
- Make changelog entries format consistent
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 4 07:36:49 UTC 2018 - Martin Pluskal <mpluskal@suse.com> Thu Oct 4 07:36:49 UTC 2018 - Martin Pluskal <mpluskal@suse.com>
@ -8,16 +15,16 @@ Thu Oct 4 07:36:49 UTC 2018 - Martin Pluskal <mpluskal@suse.com>
Tue Oct 02 10:16:22 UTC 2018 - sean@suspend.net Tue Oct 02 10:16:22 UTC 2018 - sean@suspend.net
- New upstream stable version 4.3: - New upstream stable version 4.3:
* Bug 4885: Excessive memory usage when running out of descriptors + Bug 4885: Excessive memory usage when running out of descriptors
* Bug 4877: Add missing text about external_acl_type %DATA changes + Bug 4877: Add missing text about external_acl_type %DATA changes
* Bug 4875 pt1: GCC-8 compile errors with -O3 optimization + Bug 4875 pt1: GCC-8 compile errors with -O3 optimization
* Bug 4716: Blank lines in cachemgr.conf are not skipped + Bug 4716: Blank lines in cachemgr.conf are not skipped
* Bug 4691: balance_on_multiple_ip config option docs + Bug 4691: balance_on_multiple_ip config option docs
* basic_pop3_auth: fix startup errors + basic_pop3_auth: fix startup errors
* langpack: Add missing dialect aliases + langpack: Add missing dialect aliases
* Fix range_offset_limit debugging + Fix range_offset_limit debugging
* Fix icc build errors + Fix icc build errors
* Update systemd dependencies in squid.service + Update systemd dependencies in squid.service
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 13 07:30:05 UTC 2018 - adam.majer@suse.de Mon Aug 13 07:30:05 UTC 2018 - adam.majer@suse.de

11
squid.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
@ -37,6 +37,7 @@ Source11: %{name}.service
Source13: http://www.squid-cache.org/pgp.asc#/squid.keyring Source13: http://www.squid-cache.org/pgp.asc#/squid.keyring
Source15: cache_dir.sed Source15: cache_dir.sed
Source16: initialize_cache_if_needed.sh Source16: initialize_cache_if_needed.sh
Source17: tmpfilesdir.squid.conf
Patch1: missing_installs.patch Patch1: missing_installs.patch
BuildRequires: cppunit-devel BuildRequires: cppunit-devel
BuildRequires: db-devel BuildRequires: db-devel
@ -181,6 +182,10 @@ install -D -m 755 %{SOURCE16} %{buildroot}%{squidlibdir}/initialize_cache_if_nee
sed -i -e 's!%%{_libdir}!%{_libdir}!' %{buildroot}%{_unitdir}/%{name}.service sed -i -e 's!%%{_libdir}!%{_libdir}!' %{buildroot}%{_unitdir}/%{name}.service
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
# needed for smp support (bsc#1112695, bsc#1112066)
mkdir -p %{buildroot}%{_tmpfilesdir}
install -D -m 755 %{SOURCE17} %{buildroot}%{_tmpfilesdir}/squid.conf
# Move the MIB definition to the proper place (and name) # Move the MIB definition to the proper place (and name)
mkdir -p %{buildroot}%{_datadir}/snmp/mibs mkdir -p %{buildroot}%{_datadir}/snmp/mibs
mv %{buildroot}%{_datadir}/squid/mib.txt \ mv %{buildroot}%{_datadir}/squid/mib.txt \
@ -228,7 +233,7 @@ fi
%set_permissions %{_sbindir}/pinger %set_permissions %{_sbindir}/pinger
%set_permissions %{_localstatedir}/cache/squid/ %set_permissions %{_localstatedir}/cache/squid/
%set_permissions %{_localstatedir}/log/squid/ %set_permissions %{_localstatedir}/log/squid/
%tmpfiles_create %{_tmpfilesdir}/squid.conf
%service_add_post squid.service %service_add_post squid.service
%preun %preun
@ -257,6 +262,8 @@ fi
%verify(not user group mode) %attr(750,%{name},root) %dir %{_localstatedir}/cache/%{name}/ %verify(not user group mode) %attr(750,%{name},root) %dir %{_localstatedir}/cache/%{name}/
%verify(not user group mode) %attr(750,%{name},root) %dir %{_localstatedir}/log/%{name}/ %verify(not user group mode) %attr(750,%{name},root) %dir %{_localstatedir}/log/%{name}/
%dir %{squidconfdir} %dir %{squidconfdir}
%dir %{_tmpfilesdir}
%{_tmpfilesdir}/squid.conf
%config(noreplace) %{squidconfdir}/cachemgr.conf %config(noreplace) %{squidconfdir}/cachemgr.conf
%config(noreplace) %{squidconfdir}/errorpage.css %config(noreplace) %{squidconfdir}/errorpage.css
%config(noreplace) %{squidconfdir}/errors %config(noreplace) %{squidconfdir}/errors

3
tmpfilesdir.squid.conf Normal file
View File

@ -0,0 +1,3 @@
# See tmpfiles.d(5) for details
d /run/squid 0700 squid root -