From ce99e9214d1490182d0672b9bf09285143218deb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Sun, 21 Oct 2012 19:57:39 +0200
Subject: update to latest upstream version

---
 package/privoxy/Makefile            |  7 ++++---
 package/privoxy/patches/patch-cgi_c | 11 +++++++++++
 package/privoxy/patches/patch-jcc_c | 11 +++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 package/privoxy/patches/patch-cgi_c
 create mode 100644 package/privoxy/patches/patch-jcc_c

(limited to 'package/privoxy')

diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile
index 7e83f7607..628177132 100644
--- a/package/privoxy/Makefile
+++ b/package/privoxy/Makefile
@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		privoxy
-PKG_VERSION:=		3.0.15
+PKG_VERSION:=		3.0.19
 PKG_RELEASE:=		1
-PKG_VARIANT:=		beta
-PKG_MD5SUM:=		6571dc9524e945e79c2af62fefe7b107
+PKG_VARIANT:=		stable
+PKG_MD5SUM:=		57acc79059565cc42eda67982842785d
 PKG_DESCR:=		web proxy with advanced filtering capabilities
 PKG_SECTION:=		proxy
 PKG_DEPENDS:=		libpthread libpcre
@@ -22,6 +22,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PRIVOXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_CPPFLAGS+=	-DFEATURE_CONNECTION_KEEP_ALIVE
 TARGET_LDFLAGS+=	-pthread
 CONFIGURE_ARGS+=	--disable-editor \
 			--disable-jar-files \
diff --git a/package/privoxy/patches/patch-cgi_c b/package/privoxy/patches/patch-cgi_c
new file mode 100644
index 000000000..f00e8cc77
--- /dev/null
+++ b/package/privoxy/patches/patch-cgi_c
@@ -0,0 +1,11 @@
+--- privoxy-3.0.19-stable.orig/cgi.c	2011-10-08 19:31:05.000000000 +0200
++++ privoxy-3.0.19-stable/cgi.c	2012-10-21 19:35:50.000000000 +0200
+@@ -49,6 +49,8 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.1
+ #include <limits.h>
+ #include <assert.h>
+ 
++#define CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE  0x00008000U
++
+ #ifdef FEATURE_COMPRESSION
+ #include <zlib.h>
+ #endif
diff --git a/package/privoxy/patches/patch-jcc_c b/package/privoxy/patches/patch-jcc_c
new file mode 100644
index 000000000..3222454c6
--- /dev/null
+++ b/package/privoxy/patches/patch-jcc_c
@@ -0,0 +1,11 @@
+--- privoxy-3.0.19-stable.orig/jcc.c	2011-12-10 18:26:11.000000000 +0100
++++ privoxy-3.0.19-stable/jcc.c	2012-10-21 19:37:22.000000000 +0200
+@@ -45,6 +45,8 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.3
+ #include <errno.h>
+ #include <assert.h>
+ 
++#define CSP_FLAG_CONTENT_LENGTH_SET            0x00004000U
++
+ #ifdef _WIN32
+ # ifndef FEATURE_PTHREAD
+ #  ifndef STRICT
-- 
cgit v1.2.3