Hello community, here is the log from the commit of package squid for openSUSE:Factory checked in at 2017-03-24 02:22:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/squid (Old) and /work/SRC/openSUSE:Factory/.squid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "squid" Fri Mar 24 02:22:51 2017 rev:44 rq:482005 version:3.5.24 Changes: -------- --- /work/SRC/openSUSE:Factory/squid/squid.changes 2017-02-03 20:02:19.965794852 +0100 +++ /work/SRC/openSUSE:Factory/.squid.new/squid.changes 2017-03-24 02:22:51.737811399 +0100 @@ -1,0 +2,7 @@ +Wed Mar 22 14:28:05 UTC 2017 - [email protected] + +- initialize_cache_if_needed.sh, squid_dir.sed: Initialize cache + directory on startup if it is missing. Move scripts out of + systemd service file and into individual files. (bnc#1030421) + +------------------------------------------------------------------- New: ---- cache_dir.sed initialize_cache_if_needed.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid.spec ++++++ --- /var/tmp/diff_new_pack.LsdZjx/_old 2017-03-24 02:22:52.649682376 +0100 +++ /var/tmp/diff_new_pack.LsdZjx/_new 2017-03-24 02:22:52.653681809 +0100 @@ -38,6 +38,8 @@ Source11: %{name}.service Source13: %{name}.keyring Source14: squid.init.rh +Source15: cache_dir.sed +Source16: initialize_cache_if_needed.sh # do not show some rpmlint warnings Source99: squid-rpmlintrc @@ -259,6 +261,9 @@ # systemd vs SysVinit %if 0%{?has_systemd} install -D -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/%{name}.service + install -D -m 755 %{SOURCE15} %{buildroot}%{squidlibdir}/cache_dir.sed + install -D -m 755 %{SOURCE16} %{buildroot}%{squidlibdir}/initialize_cache_if_needed.sh + sed -i -e 's!%%{_libdir}!%{_libdir}!' %{buildroot}%{_unitdir}/%{name}.service ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} %else # SysVinit # fix postrotate script for SysVinit @@ -406,6 +411,8 @@ %doc %{_mandir}/man?/* %if 0%{?has_systemd} %{_unitdir}/%{name}.service +%{squidlibdir}/initialize_cache_if_needed.sh +%{squidlibdir}/cache_dir.sed %else %{_sysconfdir}/init.d/%{name} %endif ++++++ cache_dir.sed ++++++ #!/usr/bin/sed -nf /^\s*cache_dir\s\+[[:alnum:]]\+\s\+\([[:graph:]\/]\+\)\s.*/ { s//\1\/00/p q } ++++++ initialize_cache_if_needed.sh ++++++ #!/bin/sh DIR=$(dirname $0) CACHE_DIR=$($DIR/cache_dir.sed < /etc/squid/squid.conf) if [ 'x'$CACHE_DIR = 'x' ]; then exit 0 fi if ! test -d $CACHE_DIR; then echo "Initializing cache directories..." exec /usr/sbin/squid -z -F -N -S -f /etc/squid/squid.conf fi ++++++ squid.service ++++++ --- /var/tmp/diff_new_pack.LsdZjx/_old 2017-03-24 02:22:52.829656911 +0100 +++ /var/tmp/diff_new_pack.LsdZjx/_new 2017-03-24 02:22:52.833656345 +0100 @@ -5,7 +5,7 @@ [Service] Type=forking EnvironmentFile=-/etc/sysconfig/squid -ExecStartPre=/bin/sh -c "test -d \"`sed -n 's/^cache_dir\s\+[[:alnum:]]\+\s\+\([[:graph:]\/]\+\)\s.*/\1/p' /etc/squid/squid.conf | sed '1 q'`/00\" || /usr/sbin/squid -z -F -N -S -f /etc/squid/squid.conf" +ExecStartPre=%{_libdir}/squid/initialize_cache_if_needed.sh ExecStart=/usr/sbin/squid -F $SQUID_START_OPTIONS -f /etc/squid/squid.conf ExecReload=/usr/sbin/squid -F $SQUID_START_OPTIONS -f /etc/squid/squid.conf -k reconfigure ExecStop=/usr/sbin/squid -F -f /etc/squid/squid.conf -k shutdown
