[privoxy/f17] 3.0.21.

[Jon Ciesla]

commit 1b72fecc98e3f590e95bd2805ee6552b8b51d51d
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Mar 12 09:24:47 2013 -0500

    3.0.21.

 .gitignore                     |    1 +
 privoxy-3.0.21-configdir.patch |   17 +++++++++++++++++
 privoxy.spec                   |   15 +++++++++------
 sources                        |    2 +-
 4 files changed, 28 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8662c6b..c36d0c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 privoxy-3.0.16-stable-src.tar.gz
+/privoxy-3.0.21-stable-src.tar.gz
diff --git a/privoxy-3.0.21-configdir.patch b/privoxy-3.0.21-configdir.patch
new file mode 100644
index 0000000..2ff4d88
--- /dev/null
+++ b/privoxy-3.0.21-configdir.patch
@@ -0,0 +1,17 @@
+--- privoxy-generic.init~	2013-01-26 07:32:57.000000000 -0600
++++ privoxy-generic.init	2013-03-12 09:22:55.123296165 -0500
+@@ -48,12 +48,12 @@
+ # logfile is writable by $P_USER (logfile is defined in config), and that
+ # there is suitable write access for $P_PIDFILE.
+ 
+-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/xpg4/bin:/usr/bin:/sbin:/bin
++PATH=/usr/bin:/bin:/sbin:/usr/sbin
+ P_NAME=Privoxy
+ # Path to executable.
+ P_DAEMON=privoxy
+ # Full path to location of Privoxy config file.
+-P_CONF_FILE=/usr/local/etc/privoxy/config
++P_CONF_FILE=/etc/privoxy/config
+ # Full path to PID file location. Location must be writable by
+ # whoever runs this script and by Privoxy itself.
+ P_PIDFILE=/var/run/privoxy.pid
diff --git a/privoxy.spec b/privoxy.spec
index 87e7aee..35d5f2a 100644
--- a/privoxy.spec
+++ b/privoxy.spec
@@ -5,13 +5,13 @@
 #define beta_or_stable beta
 
 Name: privoxy
-Version: 3.0.16
-Release: 6.2%{?dist}
+Version: 3.0.21
+Release: 1%{?dist}
 Summary: Privacy enhancing proxy
 License: GPLv2+
 Source0: http://downloads.sourceforge.net/ijbswa/%{name}-%{version}-%{beta_or_stable}-src.tar.gz
-Patch0:  privoxy-3.0.16-chkconfig.patch
-Patch1:  privoxy-3.0.16-configdir.patch
+#Patch0:  privoxy-3.0.16-chkconfig.patch
+Patch1:  privoxy-3.0.21-configdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group: System Environment/Daemons
 URL: http://www.privoxy.org/
@@ -33,8 +33,8 @@ Privoxy is based on the Internet Junkbuster.
 
 %prep
 %setup -q -n %{name}-%{version}-%{beta_or_stable}
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
+%patch1 -p0
 
 %build
 rm -rf autom4te.cache
@@ -116,6 +116,9 @@ fi
 #doc/source/developer-manual doc/source/faq doc/source/user-manual
 
 %changelog
+* Mon Mar 12 2013 Jon Ciesla <limburgher at gmail.com> - 3.0.21-1
+- 3.0.21, fix for CVE-2013-2503.
+
 * Mon Oct 01 2012 Jon Ciesla <limburgher at gmail.com> - 3.0.16-6.2
 - Change ownership of binary and config to root.
 
diff --git a/sources b/sources
index ca99ace..d755107 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-64d3ffcdf8307e04a375773bb4eb255e  privoxy-3.0.16-stable-src.tar.gz
+79558f2545cfcf9731f7de611646d837  privoxy-3.0.21-stable-src.tar.gz