From 23a5364eb64e84f9aaae5ed252319ff26cc8d8bd Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 26 Jan 2016 21:52:17 +0000
Subject: [PATCH] update to privoxy 3.0.24, including crash fixes and security
 fixes for CVE-2016-1982 (invalid reads in case of corrupt chunk-encoded
 content) and CVE-2016-1983 (invalid reads with empty Host headers).

While there, drop MESSAGE that relates to updating from a <=2011 version
of the port, and use an autoconf version from this century (upstream
doesn't provide a generated script so there is no "right" version).
---
 www/privoxy/Makefile    | 7 ++++---
 www/privoxy/distinfo    | 4 ++--
 www/privoxy/pkg/MESSAGE | 6 ------
 3 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 www/privoxy/pkg/MESSAGE

diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index e6ea88430d9..86275ca9388 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.31 2015/01/30 15:26:14 jasper Exp $
+# $OpenBSD: Makefile,v 1.32 2016/01/26 21:52:17 sthen Exp $
 
 COMMENT=	web proxy with advanced filtering capabilities
 
-V=		3.0.23
+V=		3.0.24
 DISTNAME=	privoxy-${V}-stable
 PKGNAME=	privoxy-${V}
 CATEGORIES=	www
@@ -23,7 +23,8 @@ MAKE_FILE=	GNUmakefile
 
 LIB_DEPENDS=	devel/pcre
 
-CONFIGURE_STYLE=	autoconf
+CONFIGURE_STYLE= autoconf
+AUTOCONF_VERSION= 2.69
 CONFIGURE_ENV=	CPPFLAGS="-Dunix -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/www/privoxy/distinfo b/www/privoxy/distinfo
index 44e7a163e8d..7f9434525db 100644
--- a/www/privoxy/distinfo
+++ b/www/privoxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (privoxy-3.0.23-stable-src.tar.gz) = gLGhctBRip+Vzeg9GNxiucfxF7mtp3vc09MQEH8o+WQ=
-SIZE (privoxy-3.0.23-stable-src.tar.gz) = 1715099
+SHA256 (privoxy-3.0.24-stable-src.tar.gz) = o4H23HjwjeDUojQtR6WUmmYIBzraNLkzE3GE88qfsBI=
+SIZE (privoxy-3.0.24-stable-src.tar.gz) = 1728265
diff --git a/www/privoxy/pkg/MESSAGE b/www/privoxy/pkg/MESSAGE
deleted file mode 100644
index aad64063d4d..00000000000
--- a/www/privoxy/pkg/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-Note for people upgrading from 3.0.16 and before: There is now an rc
-script that will start privoxy chrooted to /var/privoxy. Any
-configuration files will be copied over automatically, but you need to
-make sure that any other directories which are needed by privoxy (e.g.
-the log directories) exist relative to the chroot and have proper
-privileges for the _privoxy user.