Merged in dzhidzhoev/haikuports-gci/privoxy (pull request #284)

Added recipe and patch for privoxy-3.0.21

net-proxy/privoxy/patches/privoxy-3.0.19.patch

@@ -1,72 +0,0 @@
-diff -Naur privoxy-3.0.19-stable/configure.in privoxy-3.0.19-stable-haiku/configure.in
---- privoxy-3.0.19-stable/configure.in	2012-09-12 20:00:37.292814848 -0400
-+++ privoxy-3.0.19-stable-haiku/configure.in	2012-09-12 22:21:25.287309824 -0400
-@@ -160,7 +160,7 @@
- dnl =================================================================
- 
- 
--if test "$EMXOS2" = yes; then
-+if test "$EMXOS2" = yes || test "$host_os" = haiku; then
-   echo "Skipping user and group validity stuff.";
- 
- else
-@@ -677,6 +677,26 @@
- AC_SUBST(AMIGAOS_ONLY)
- 
- dnl =================================================================
-+dnl Haiku specific
-+dnl =================================================================
-+
-+if test "$host_os" = haiku; then
-+  # Omit the "-pthread" flag to gcc, even when building with gcc 2.95
-+  SPECIAL_CFLAGS=
-+
-+  # Haiku's pthreads implementation exists in its system library,
-+  # libroot, not in a separate pthreads library
-+  PTHREAD_LIB=
-+
-+  # Networking code exists in libnetwork
-+  SOCKET_LIB=-lnetwork
-+
-+  # Search Haiku's common-library folder to find its pcre and
-+  # pcreposix libraries
-+  LIBS="-L/boot/common/lib $LIBS"
-+fi
-+
-+dnl =================================================================
- dnl Check for standard compiler stuff
- dnl =================================================================
- 
-diff -Naur privoxy-3.0.19-stable/filters.c privoxy-3.0.19-stable-haiku/filters.c
---- privoxy-3.0.19-stable/filters.c	2012-09-12 20:00:37.720371712 -0400
-+++ privoxy-3.0.19-stable-haiku/filters.c	2012-09-12 22:21:28.150470656 -0400
-@@ -1095,6 +1095,11 @@
-    char *new_url = NULL;
-    char *tmp;
- 
-+   char *url_segment = NULL;
-+   char **url_segments;
-+   size_t max_segments;
-+   int segments;
-+
-    assert(subject);
-    assert(redirect_mode);
- 
-@@ -1117,14 +1122,13 @@
-        * and look for a URL in the decoded result.
-        * Stop the search after the first match.
-        */
--      char *url_segment = NULL;
-+
-       /*
-        * XXX: This estimate is guaranteed to be high enough as we
-        *      let ssplit() ignore empty fields, but also a bit wasteful.
-        */
--      size_t max_segments = strlen(subject) / 2;
--      char **url_segments = malloc(max_segments * sizeof(char *));
--      int segments;
-+      max_segments = strlen(subject) / 2;
-+      url_segments = malloc(max_segments * sizeof(char *));
- 
-       if (NULL == url_segments)
-       {

net-proxy/privoxy/patches/privoxy-3.0.21.patch

@@ -0,0 +1,12 @@
+--- /boot/home/Desktop/GNUmakefile.in	2014-12-06 15:06:33.557580288 +0000
++++ privoxy-3.0.21-stable/GNUmakefile.in	2013-02-05 14:04:11.051642368 +0000
+@@ -889,7 +889,7 @@
+ 	@# FIXME: group/user validation is overly convoluted.
+ 	@# If superuser install ... we require a minimum of group ownership
+ 	@# of those files the daemon writes to, to be non-root owned.
+-	@if [ "`$(ID) |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] ;then\
++	@if [ "`$(ID) |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] && [$host_os != haiku] ;then\
+ 		if [ x$(USER) = x ] || [ $(USER) = root ]; then \
+ 			if [ x$(GROUP) = x ] || [ $(GROUP) = root ]; then \
+ 				if [ "`$(ID) privoxy`" ] && \
+

net-proxy/privoxy/privoxy-3.0.19.recipe

@@ -1,34 +0,0 @@
-DESCRIPTION="
-A web proxy with advanced filtering capabilities for protecting privacy \
-against Internet junk.
-"
-HOMEPAGE="http://www.privoxy.org/"
-SRC_URI="http://sourceforge.net/projects/ijbswa/files/Sources/3.0.19%20%28stable%29/privoxy-3.0.19-stable-src.tar.gz/download"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="57acc79059565cc42eda67982842785d"
-
-BUILD()
-{
-	cd privoxy-3.0.19-stable
-	autoheader
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
-		--sysconfdir=`finddir B_COMMON_ETC_DIRECTORY`/privoxy \
-		--localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \
-		--datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \
-		--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	make
-}
-
-INSTALL()
-{
-	cd privoxy-3.0.19-stable
-	make install
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2001-2011 Privoxy Developers"

net-proxy/privoxy/privoxy-3.0.21.recipe

@@ -0,0 +1,57 @@
+SUMMARY="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk."
+DESCRIPTION="
+	Privoxy is a non-caching web proxy with advanced filtering
+	capabilities for enhancing privacy, modifying web page data and
+	HTTP headers, controlling access, and removing ads and other
+	obnoxious Internet junk. Privoxy has a flexible configuration and
+	can be customized to suit individual needs and tastes. It has
+	application for both stand-alone systems and multi-user
+	networks.
+    "
+HOMEPAGE="http://www.privoxy.org/"
+SRC_URI="http://sourceforge.net/projects/ijbswa/files/Sources/3.0.21%20%28stable%29/privoxy-3.0.21-stable-src.tar.gz"
+SOURCE_DIR="privoxy-3.0.21-stable"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 !ppc"
+CHECKSUM_SHA256="5ec7e601948d2bd0ebf0ebe90eed7d49e7663c395ce16d0403e91ea2d459ddb8"
+PATCHES="privoxy-3.0.21.patch"
+
+REQUIRES="
+	haiku >= $haikuVersion 
+"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+"
+
+BUILD_PREREQUIRES="
+	cmd:autoheader
+	cmd:autoconf
+	cmd:make
+	cmd:grep
+	cmd:sed
+	cmd:g++
+	cmd:find
+"
+
+PROVIDES="
+	cmd:privoxy = $portVersion
+	"
+
+BUILD()
+{
+	host_os=haiku
+	autoheader
+	autoconf
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	host_os=haiku
+	make install
+}
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2001-2011 Privoxy Developers"