Hello community, here is the log from the commit of package privoxy for openSUSE:Factory checked in at 2014-02-02 18:11:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/privoxy (Old) and /work/SRC/openSUSE:Factory/.privoxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "privoxy" Changes: -------- --- /work/SRC/openSUSE:Factory/privoxy/privoxy.changes 2013-12-30 10:29:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.privoxy.new/privoxy.changes 2014-02-02 18:11:52.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Jan 24 14:08:59 UTC 2014 - [email protected] + +- Add proper sysv to service migration +- Readd rc link +- Remove reference to nonexisting dns6 nss module (bnc#849923) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ privoxy.spec ++++++ --- /var/tmp/diff_new_pack.ZVJmBZ/_old 2014-02-02 18:11:53.000000000 +0100 +++ /var/tmp/diff_new_pack.ZVJmBZ/_new 2014-02-02 18:11:53.000000000 +0100 @@ -110,7 +110,12 @@ cp -a templates $RPM_BUILD_ROOT/%chroot/etc install -m 644 config *.action *.filter trust $RPM_BUILD_ROOT/%chroot/etc %if %{with_systemd} -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_unitdir}/%{name}.service +sed -e 's/@lib@/%{_lib}/g' %{SOURCE3} > $RPM_BUILD_ROOT/%{_unitdir}/%{name}.service +%if 0%{?suse_version} >= 1310 +ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rc%{name} +%else +ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rc%{name} +%endif %else install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d/privoxyd ln -sf ../../etc/init.d/privoxyd $RPM_BUILD_ROOT/usr/sbin/rcprivoxyd @@ -124,6 +129,51 @@ ln -sf %chroot/etc/ $RPM_BUILD_ROOT/etc/privoxy %pre +%if %{with_systemd} +mkdir -p /var/lib/systemd/migrated || : +if test $1 -eq 1; then + touch /var/lib/systemd/migrated/%{name} || : +else + if test ! -e /var/lib/systemd/migrated/%{name}; then + # /usr/sbin/systemd-sysv-convert --save privoxy{d} + find_service() { + local runlevel + declare -i priority + runlevel=$1 + priority=-1 + for l in /etc/rc.d/rc$runlevel.d/*; do + test -f "$l" || continue + initscript=$(basename $l) + if test ${initscript:0:1} != "S" || test ${initscript:3} != privoxyd; then + continue + fi + if test ${initscript:1:2} -ge 0 && test ${initscript:1:2} -le 99 && + test ${initscript:1:2} -ge $priority; then + if test ${initscript:1:1} = 0; then + priority=${initscript:2:1} + else + priority=${initscript:1:2} + fi + fi + done + if test $priority -ge 0; then + return $priority + else + return 255 + fi + } + if test -r /etc/init.d/privoxyd; then + for runlevel in 2 3 4 5; do + find_service $runlevel + priority=$? + if test $priority -lt 255; then + printf "%%s\t%%s\t%%s\n" %{name} $runlevel $priority >> /var/lib/systemd/sysv-convert/database + fi + done + fi + fi +fi +%endif /usr/sbin/groupadd -r privoxy 2> /dev/null ||: /usr/sbin/useradd -r -g privoxy -s /bin/false -c "Daemon user for privoxy" \ -d /var/lib/privoxy privoxy 2> /dev/null ||: @@ -183,8 +233,8 @@ %else %config /etc/init.d/privoxyd /usr/sbin/rcprivoxyd -/usr/sbin/rcprivoxy %endif +/usr/sbin/rcprivoxy /etc/privoxy %files doc ++++++ privoxy.service ++++++ --- /var/tmp/diff_new_pack.ZVJmBZ/_old 2014-02-02 18:11:53.000000000 +0100 +++ /var/tmp/diff_new_pack.ZVJmBZ/_new 2014-02-02 18:11:53.000000000 +0100 @@ -5,8 +5,8 @@ [Service] Type=forking PIDFile=/run/privoxy.pid -ExecStartPre=-/bin/bash -c "/usr/bin/cp -upf /etc/{resolv.conf,host.conf,hosts,localtime} /var/lib/privoxy/etc/" -ExecStartPre=-/bin/bash -c "/usr/bin/cp -upf /$(basename $(echo /var/lib/privoxy/lib*))/{libresolv.so.2,libnss_dns{,6}.so.2} /var/lib/privoxy/lib*/" +ExecStartPre=-/usr/bin/cp -upf /etc/resolv.conf /etc/host.conf /etc/hosts /etc/localtime /var/lib/privoxy/etc/ +ExecStartPre=-/usr/bin/cp -upf /@lib@/libresolv.so.2 /@lib@/libnss_dns.so.2 /var/lib/privoxy/@lib@/ ExecStart=/usr/sbin/privoxy --chroot --pidfile /run/privoxy.pid --user privoxy /etc/config [Install] -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
