Hello community, here is the log from the commit of package privoxy for openSUSE:Factory checked in at 2013-07-02 07:41:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-12-10 17:18:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.privoxy.new/privoxy.changes 2013-07-02 07:41:48.000000000 +0200 @@ -1,0 +2,68 @@ +Sat Jun 22 11:55:46 UTC 2013 - p.drou...@gmail.com + +- update to version 3.0.21 + - Bug fixes: + - On POSIX-like platforms, network sockets with file descriptor + values above FD_SETSIZE are properly rejected. Previously they + could cause memory corruption in configurations that allowed + the limit to be reached. + - Proxy authentication headers are removed unless the new directive + enable-proxy-authentication-forwarding is used. Forwarding the + headers potentionally allows malicious sites to trick the user + into providing them with login information. + Reported by Chris John Riley. + - Compiles on OS/2 again now that unistd.h is only included + on platforms that have it. + + - General improvements: + - The show-status page shows the FEATURE_STRPTIME_SANITY_CHECKS status. + - A couple of assert()s that could theoretically dereference + NULL pointers in debug builds have been relocated. + - Added an LSB info block to the generic start script. + Based on a patch from Natxo Asenjo. + - The max-client-connections default has been changed to 128 + which should be more than enough for most setups. + + - Action file improvements: + - Block rover.ebay./ar.*\&adtype= instead of "/.*\&adtype=" which + caused too man false positives. + Reported by u302320 in #360284, additional feedback from Adam Piggott. + - Unblock '.advrider.com/' and '/.*ADVrider'. + Anonymously reported in #3603636. + - Stop blocking '/js/slider\.js'. + Reported by Adam Piggott in #3606635 and _lvm in #2791160. + + - Filter file improvements: + - Added an iframes filter. + + - Documentation improvements: + - The whole GPLv2 text is included in the user manual now, + so Privoxy can serve it itself and the user can read it + without having to wade through GPLv3 ads first. + - Properly numbered and underlined a couple of section titles + in the config that where previously overlooked due to a flaw + in the conversion script. Reported by Ralf Jungblut. + - Improved the support instruction to hopefully make it harder to + unintentionally provide insufficient information when requesting + support. Previously it wasn't obvious that the information we need + in bug reports is usually also required in support requests. + - Removed documentation about packages that haven't been provided + in years. + + - Privoxy-Regression-Test: + - Only log the test number when not running in verbose mode + The position of the test is rarely relevant and it previously + wasn't exactly obvious which one of the numbers was useful to + repeat the test with --test-number. + + - GNUmakefile improvements: + - Factor generate-config-file out of config-file to make testing + more convenient. + - The clean target now also takes care of patch leftovers. +- Use original source tarball; can't use sourceurl due to OpenSuse < 12.1 + support +- Update patch to upstream changes + privoxy-3.0.17-config.patch > privoxy-3.0.21-config.patch +- Use systemd instead of sysvinit for OpenSuse > 12.1 + +------------------------------------------------------------------- Old: ---- privoxy-3.0.17-config.patch privoxy-3.0.19-stable-src.tar.bz2 New: ---- privoxy-3.0.21-config.patch privoxy-3.0.21-stable-src.tar.gz privoxy.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ privoxy.spec ++++++ --- /var/tmp/diff_new_pack.XwzWEZ/_old 2013-07-02 07:41:49.000000000 +0200 +++ /var/tmp/diff_new_pack.XwzWEZ/_new 2013-07-02 07:41:49.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package privoxy # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,29 +15,51 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%if 0%{?suse_version} > 1210 +%define with_systemd 1 +%else +%define with_systemd 0 +%endif + +%if %{with_systemd} +%if 0%{?suse_version} < 1230 +%define _unitdir /lib/systemd/system +%else +%define _unitdir /usr/lib/systemd/system +%endif +%endif Name: privoxy BuildRequires: automake BuildRequires: pcre-devel BuildRequires: w3m BuildRequires: zlib-devel +%if %{with_systemd} +BuildRequires: systemd +%endif Url: http://www.privoxy.org/ Provides: ijb Provides: junkbuster Obsoletes: ijb Obsoletes: junkbuster +%if %{with_systemd} +%{?systemd_requires} +PreReq: /usr/sbin/useradd /usr/sbin/groupadd +%else PreReq: %fillup_prereq %insserv_prereq /usr/sbin/useradd /usr/sbin/groupadd -Version: 3.0.19 +%endif +Version: 3.0.21 Release: 0 Summary: The Internet Junkbuster - HTTP Proxy Server License: GPL-2.0+ Group: Productivity/Networking/Web/Proxy -Source: privoxy-%{version}-stable-src.tar.bz2 -Source1: privoxy.logrotate +Source: %{name}-%{version}-stable-src.tar.gz +Source1: %{name}.logrotate Source2: %{name}-3.0.16-init.suse -Patch1: privoxy-3.0.17-config.patch -Patch2: privoxy-3.0.17-utf8.patch -Patch3: privoxy-3.0.16-networkmanager.patch +Source3: %{name}.service +Patch1: %{name}-3.0.21-config.patch +Patch2: %{name}-3.0.17-utf8.patch +Patch3: %{name}-3.0.16-networkmanager.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: cron Requires: logrotate @@ -71,7 +93,11 @@ make %install +%if %{with_systemd} +mkdir -p $RPM_BUILD_ROOT/%{_unitdir} +%else mkdir -p $RPM_BUILD_ROOT/etc/init.d +%endif mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d mkdir -p $RPM_BUILD_ROOT/%chroot/etc mkdir -p $RPM_BUILD_ROOT/usr/sbin @@ -83,12 +109,16 @@ mkdir -p $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d 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 755 %{SOURCE3} $RPM_BUILD_ROOT/%{_unitdir}/%{name}.service +%else install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d/privoxyd +ln -sf ../../etc/init.d/privoxyd $RPM_BUILD_ROOT/usr/sbin/rcprivoxyd +ln -sf ../../etc/init.d/privoxyd $RPM_BUILD_ROOT/usr/sbin/rcprivoxy +%endif install -m 755 privoxy $RPM_BUILD_ROOT/usr/sbin install -m 755 privoxy_nm $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/privoxyd install -m 644 privoxy.1 $RPM_BUILD_ROOT%_mandir/man1 -ln -sf ../../etc/init.d/privoxyd $RPM_BUILD_ROOT/usr/sbin/rcprivoxyd -ln -sf ../../etc/init.d/privoxyd $RPM_BUILD_ROOT/usr/sbin/rcprivoxy install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/privoxy ln -s ../../log $RPM_BUILD_ROOT/%chroot/var/log/privoxy ln -sf %chroot/etc/ $RPM_BUILD_ROOT/etc/privoxy @@ -100,7 +130,11 @@ exit 0 %post +%if %{with_systemd} +%service_add_post %{name}.service +%else %{fillup_and_insserv privoxyd} +%endif # create logfiles if missing for i in ./%chroot/log/logfile ./%chroot/log/jarfile; do if ! test -e $i; then touch $i; chown privoxy: $i; chmod 640 $i ; fi @@ -108,11 +142,19 @@ exit 0 %preun +%if %{with_systemd} +%service_del_preun %{name}.service +%else %stop_on_removal privoxyd +%endif %postun +%if %{with_systemd} +%service_del_postun %{name}.service +%else %restart_on_update privoxyd %insserv_cleanup +%endif %files %defattr(-,root,root) @@ -136,9 +178,13 @@ %chroot/var %chroot/%_lib %chroot/etc/regression-tests.action +%if %{with_systemd} +%{_unitdir}/%{name}.service +%else %config /etc/init.d/privoxyd /usr/sbin/rcprivoxyd /usr/sbin/rcprivoxy +%endif /etc/privoxy %files doc ++++++ privoxy-3.0.17-config.patch -> privoxy-3.0.21-config.patch ++++++ --- /work/SRC/openSUSE:Factory/privoxy/privoxy-3.0.17-config.patch 2011-12-05 12:45:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.privoxy.new/privoxy-3.0.21-config.patch 2013-07-02 07:41:48.000000000 +0200 @@ -1,20 +1,20 @@ --- config +++ config -@@ -265,7 +265,7 @@ +@@ -260,7 +260,7 @@ # # No trailing "/", please. # -confdir . +confdir /etc # - # # 2.2. templdir -@@ -322,7 +322,7 @@ + # ============== +@@ -315,7 +315,7 @@ # # No trailing "/", please. # -logdir . +logdir /log # - # # 2.4. actionsfile + # ================= ++++++ privoxy.service ++++++ [Unit] Description=Privoxy Web Proxy With Advanced Filtering Capabilities After=network.target [Service] Type=forking PIDFile=/run/privoxy.pid ExecStart=/usr/sbin/privoxy --pidfile /run/privoxy.pid --user privoxy /etc/privoxy/config [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
