--- make/privoxy/patches/100-ldflags.privoxy.patch.orig	2006-09-23 13:21:52.000000000 +0200
+++ make/privoxy/patches/100-ldflags.privoxy.patch	2006-10-02 15:51:55.000000000 +0200
@@ -0,0 +1,11 @@
+--- GNUmakefile.in.orig	2006-09-29 22:10:01.000000000 +0200
++++ GNUmakefile.in	2006-09-29 22:11:34.000000000 +0200
+@@ -246,7 +246,7 @@
+ CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \
+          @STATIC_PCRE_ONLY@ -Ipcre 
+ 
+-LDFLAGS = $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
++LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
+ 
+ 
+ #############################################################################
--- make/privoxy/patches/110-pcre-chartables.privoxy.patch.orig	2006-09-23 13:22:00.000000000 +0200
+++ make/privoxy/patches/110-pcre-chartables.privoxy.patch	2006-10-02 15:51:54.000000000 +0200
@@ -0,0 +1,200 @@
+--- pcre/chartables.c.orig	2006-09-29 21:43:05.000000000 +0200
++++ pcre/chartables.c	2006-09-29 21:27:12.000000000 +0200
+@@ -0,0 +1,183 @@
++/*************************************************
++*      Perl-Compatible Regular Expressions       *
++*************************************************/
++
++/* This file is automatically written by the dftables auxiliary 
++program. If you edit it by hand, you might like to edit the Makefile to 
++prevent its ever being regenerated.
++
++This file is #included in the compilation of pcre.c to build the default
++character tables which are used when no tables are passed to the compile
++function. */
++
++static unsigned char pcre_default_tables[] = {
++
++/* This table is a lower casing table. */
++
++    0,  1,  2,  3,  4,  5,  6,  7,
++    8,  9, 10, 11, 12, 13, 14, 15,
++   16, 17, 18, 19, 20, 21, 22, 23,
++   24, 25, 26, 27, 28, 29, 30, 31,
++   32, 33, 34, 35, 36, 37, 38, 39,
++   40, 41, 42, 43, 44, 45, 46, 47,
++   48, 49, 50, 51, 52, 53, 54, 55,
++   56, 57, 58, 59, 60, 61, 62, 63,
++   64, 97, 98, 99,100,101,102,103,
++  104,105,106,107,108,109,110,111,
++  112,113,114,115,116,117,118,119,
++  120,121,122, 91, 92, 93, 94, 95,
++   96, 97, 98, 99,100,101,102,103,
++  104,105,106,107,108,109,110,111,
++  112,113,114,115,116,117,118,119,
++  120,121,122,123,124,125,126,127,
++  128,129,130,131,132,133,134,135,
++  136,137,138,139,140,141,142,143,
++  144,145,146,147,148,149,150,151,
++  152,153,154,155,156,157,158,159,
++  160,161,162,163,164,165,166,167,
++  168,169,170,171,172,173,174,175,
++  176,177,178,179,180,181,182,183,
++  184,185,186,187,188,189,190,191,
++  192,193,194,195,196,197,198,199,
++  200,201,202,203,204,205,206,207,
++  208,209,210,211,212,213,214,215,
++  216,217,218,219,220,221,222,223,
++  224,225,226,227,228,229,230,231,
++  232,233,234,235,236,237,238,239,
++  240,241,242,243,244,245,246,247,
++  248,249,250,251,252,253,254,255,
++
++/* This table is a case flipping table. */
++
++    0,  1,  2,  3,  4,  5,  6,  7,
++    8,  9, 10, 11, 12, 13, 14, 15,
++   16, 17, 18, 19, 20, 21, 22, 23,
++   24, 25, 26, 27, 28, 29, 30, 31,
++   32, 33, 34, 35, 36, 37, 38, 39,
++   40, 41, 42, 43, 44, 45, 46, 47,
++   48, 49, 50, 51, 52, 53, 54, 55,
++   56, 57, 58, 59, 60, 61, 62, 63,
++   64, 97, 98, 99,100,101,102,103,
++  104,105,106,107,108,109,110,111,
++  112,113,114,115,116,117,118,119,
++  120,121,122, 91, 92, 93, 94, 95,
++   96, 65, 66, 67, 68, 69, 70, 71,
++   72, 73, 74, 75, 76, 77, 78, 79,
++   80, 81, 82, 83, 84, 85, 86, 87,
++   88, 89, 90,123,124,125,126,127,
++  128,129,130,131,132,133,134,135,
++  136,137,138,139,140,141,142,143,
++  144,145,146,147,148,149,150,151,
++  152,153,154,155,156,157,158,159,
++  160,161,162,163,164,165,166,167,
++  168,169,170,171,172,173,174,175,
++  176,177,178,179,180,181,182,183,
++  184,185,186,187,188,189,190,191,
++  192,193,194,195,196,197,198,199,
++  200,201,202,203,204,205,206,207,
++  208,209,210,211,212,213,214,215,
++  216,217,218,219,220,221,222,223,
++  224,225,226,227,228,229,230,231,
++  232,233,234,235,236,237,238,239,
++  240,241,242,243,244,245,246,247,
++  248,249,250,251,252,253,254,255,
++
++/* This table contains bit maps for various character classes.
++Each map is 32 bytes long and the bits run from the least
++significant end of each byte. The classes that have their own
++maps are: space, xdigit, digit, upper, lower, word, graph
++print, punct, and cntrl. Other classes are built from combinations. */
++
++  0x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++
++  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
++  0x7e,0x00,0x00,0x00,0x7e,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++
++  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++  0xfe,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x07,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++
++  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
++  0xfe,0xff,0xff,0x87,0xfe,0xff,0xff,0x07,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++
++  0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
++  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++
++  0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
++  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++
++  0x00,0x00,0x00,0x00,0xfe,0xff,0x00,0xfc,
++  0x01,0x00,0x00,0xf8,0x01,0x00,0x00,0x78,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++
++  0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++
++/* This table identifies various classes of character by individual bits:
++  0x01   white space character
++  0x02   letter
++  0x04   decimal digit
++  0x08   hexadecimal digit
++  0x10   alphanumeric or '_'
++  0x80   regular expression metacharacter or binary zero
++*/
++
++  0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
++  0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00, /*   8- 15 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  16- 23 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31 */
++  0x01,0x00,0x00,0x00,0x80,0x00,0x00,0x00, /*    - '  */
++  0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x00, /*  ( - /  */
++  0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c, /*  0 - 7  */
++  0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x80, /*  8 - ?  */
++  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  @ - G  */
++  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  H - O  */
++  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  P - W  */
++  0x12,0x12,0x12,0x80,0x00,0x00,0x80,0x10, /*  X - _  */
++  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  ` - g  */
++  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  h - o  */
++  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  p - w  */
++  0x12,0x12,0x12,0x80,0x80,0x00,0x00,0x00, /*  x -127 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 128-135 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 136-143 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144-151 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 152-159 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160-167 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 168-175 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 176-183 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 192-199 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 200-207 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 208-215 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 216-223 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 224-231 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 232-239 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
++  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
++
++/* End of chartables.c */
+--- GNUmakefile.in.orig	2006-09-29 22:16:14.000000000 +0200
++++ GNUmakefile.in	2006-09-29 22:14:45.000000000 +0200
+@@ -990,8 +990,9 @@
+ 
+ # An auxiliary program makes the PCRE default character table source
+ 
+-pcre/chartables.c:   pcre/dftables@EXEEXT@
+-		pcre/dftables@EXEEXT@ >pcre/chartables.c
++#pcre/chartables.c:   pcre/dftables@EXEEXT@
++#		pcre/dftables@EXEEXT@ >pcre/chartables.c
++pcre/chartables.c:
+ 
+ pcre/dftables@EXEEXT@:       pcre/dftables.c pcre/maketables.c pcre/pcre.h pcre/internal.h pcre/config.h
+ 		$(CC) -o pcre/dftables@EXEEXT@ $(CFLAGS) pcre/dftables.c
--- make/privoxy/Config.in.orig	2006-09-23 13:22:00.000000000 +0200
+++ make/privoxy/Config.in	2006-11-20 20:52:38.000000000 +0100
@@ -0,0 +1,11 @@
+config DS_PACKAGE_PRIVOXY
+	bool "privoxy 3.0.6"
+	default n
+	help
+		Privoxy is a web proxy with advanced filtering capabilities for protecting privacy, modifying web page
+		data, managing cookies, controlling access, and removing ads, banners, pop-ups and other obnoxious
+		Internet junk.
+
+		It can also be used together with Tor Proxy to forward HTTP traffic to Tor as described in the Tor
+		documentation.
+
--- make/privoxy/Makefile.in.orig	2006-09-23 13:21:52.000000000 +0200
+++ make/privoxy/Makefile.in	2006-10-02 15:51:16.000000000 +0200
@@ -0,0 +1,3 @@
+ifeq ($(strip $(DS_PACKAGE_PRIVOXY)),y)
+PACKAGES+=privoxy
+endif
--- make/privoxy/privoxy.mk.orig	2006-09-23 13:21:46.000000000 +0200
+++ make/privoxy/privoxy.mk	2006-12-03 19:48:03.000000000 +0100
@@ -0,0 +1,108 @@
+# released under the GNU public license v2
+#
+PRIVOXY_VERSION:=3.0.6
+PRIVOXY_SOURCE:=privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz
+PRIVOXY_SITE:=http://surfnet.dl.sourceforge.net/sourceforge/ijbswa
+PRIVOXY_DIR:=$(SOURCE_DIR)/privoxy-$(PRIVOXY_VERSION)-stable
+PRIVOXY_MAKE_DIR:=$(MAKE_DIR)/privoxy
+PRIVOXY_TARGET_BINARY:=privoxy
+PRIVOXY_PKG_VERSION:=0.4
+PRIVOXY_PKG_SITE:=http://netfreaks.org/ds-mod
+PRIVOXY_PKG_NAME:=privoxy-$(PRIVOXY_VERSION)
+PRIVOXY_PKG_SOURCE:=privoxy-$(PRIVOXY_VERSION)-dsmod-$(PRIVOXY_PKG_VERSION).tar.bz2
+PRIVOXY_TARGET_DIR:=$(PACKAGES_DIR)/$(PRIVOXY_PKG_NAME)
+
+$(DL_DIR)/$(PRIVOXY_SOURCE):
+	wget -P $(DL_DIR) $(PRIVOXY_SITE)/$(PRIVOXY_SOURCE)
+
+$(DL_DIR)/$(PRIVOXY_PKG_SOURCE):
+	@wget -P $(DL_DIR) $(PRIVOXY_PKG_SITE)/$(PRIVOXY_PKG_SOURCE)
+
+$(PRIVOXY_DIR)/.unpacked: $(DL_DIR)/$(PRIVOXY_SOURCE)
+	tar -C $(SOURCE_DIR) $(VERBOSE) -xzf $(DL_DIR)/$(PRIVOXY_SOURCE)
+	for i in $(PRIVOXY_MAKE_DIR)/patches/*.patch; do \
+		patch -d $(PRIVOXY_DIR) -p0 < $$i; \
+	done
+	touch $@
+
+
+$(PRIVOXY_DIR)/.configured: $(PRIVOXY_DIR)/.unpacked
+	( cd $(PRIVOXY_DIR); rm -f config.status; \
+		autoheader; \
+		autoconf; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CPPFLAGS="-I$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/include" \
+		LDFLAGS="-static-libgcc" \
+		ac_cv_func_setpgrp_void=yes \
+		./configure \
+		  --target=$(GNU_TARGET_NAME) \
+		  --host=$(GNU_TARGET_NAME) \
+		  --build=$(GNU_HOST_NAME) \
+		  --program-prefix="" \
+		  --program-suffix="" \
+		  --prefix=/usr \
+		  --exec-prefix=/usr \
+		  --bindir=/usr/sbin \
+		  --datadir=/usr/share \
+		  --includedir=/usr/include \
+		  --infodir=/usr/share/info \
+		  --libdir=/usr/lib \
+		  --libexecdir=/usr/lib \
+		  --localstatedir=/var \
+		  --mandir=/usr/share/man \
+		  --sbindir=/usr/sbin \
+		  --sysconfdir=/mod/etc \
+		  $(DISABLE_LARGEFILE) \
+		  $(DISABLE_NLS) \
+		  --with-docbook=no \
+		  --disable-pthread \
+		  --disable-stats \
+		  --disable-dynamic-pcre \
+		  --disable-dynamic-pcrs \
+	);
+	touch $@
+
+$(PRIVOXY_DIR)/$(PRIVOXY_TARGET_BINARY): $(PRIVOXY_DIR)/.configured
+	PATH="$(TARGET_PATH)" \
+	$(MAKE) -C $(PRIVOXY_DIR)
+
+$(PACKAGES_DIR)/.$(PRIVOXY_PKG_NAME): $(DL_DIR)/$(PRIVOXY_PKG_SOURCE)
+	@tar -C $(PACKAGES_DIR) -xjf $(DL_DIR)/$(PRIVOXY_PKG_SOURCE)
+	@touch $@
+
+privoxy: $(PACKAGES_DIR)/.$(PRIVOXY_PKG_NAME)
+
+privoxy-package: $(PACKAGES_DIR)/.$(PRIVOXY_PKG_NAME)
+	tar -C $(PACKAGES_DIR) $(VERBOSE) -cjf $(PACKAGES_BUILD_DIR)/$(PRIVOXY_PKG_SOURCE) $(PRIVOXY_PKG_NAME)
+
+privoxy-precompiled: $(PRIVOXY_DIR)/$(PRIVOXY_TARGET_BINARY) privoxy
+	$(TARGET_STRIP) $(PRIVOXY_DIR)/$(PRIVOXY_TARGET_BINARY)
+	cp $(PRIVOXY_DIR)/$(PRIVOXY_TARGET_BINARY) $(PRIVOXY_TARGET_DIR)/root/usr/sbin
+	for s in `find $(PRIVOXY_DIR)/templates/ -type f`; do \
+		d=$$(basename $$s); \
+		egrep -v "^#\ " $$s | egrep -v "^#*$$" >$(PRIVOXY_TARGET_DIR)/root/etc/privoxy/templates/$$d; \
+	done
+	for s in $(PRIVOXY_DIR)/default.filter $(PRIVOXY_DIR)/default.action $(PRIVOXY_DIR)/standard.action \
+		$(PRIVOXY_DIR)/user.action $(PRIVOXY_DIR)/user.filter; do \
+		d=$$(basename $$s); \
+		egrep -v "^#" $$s | egrep -v "^$$" >$(PRIVOXY_TARGET_DIR)/root/etc/privoxy/$$d; \
+	done; true
+
+privoxy-source: $(PRIVOXY_DIR)/.unpacked $(PACKAGES_DIR)/.$(PRIVOXY_PKG_NAME)
+
+privoxy-clean:
+	-$(MAKE) -C $(PRIVOXY_DIR) clean
+	rm -f $(PACKAGES_BUILD_DIR)/$(PRIVOXY_PKG_SOURCE)
+
+privoxy-dirclean:
+	rm -rf $(PRIVOXY_DIR)
+	rm -rf $(PACKAGES_DIR)/$(PRIVOXY_PKG_NAME)
+	rm -f $(PACKAGES_DIR)/.$(PRIVOXY_PKG_NAME)
+
+privoxy-list:
+ifeq ($(strip $(DS_PACKAGE_PRIVOXY)),y)
+	@echo "S40privoxy-$(PRIVOXY_VERSION)" >> .static
+else
+	@echo "S40privoxy-$(PRIVOXY_VERSION)" >> .dynamic
+endif
--- make/Config.in.orig	2006-10-02 16:37:48.000000000 +0200
+++ make/Config.in	2006-12-03 19:49:40.000000000 +0100
@@ -20,6 +20,7 @@
 source make/dropbear/Config.in
 source make/mc/Config.in
 source make/openvpn/Config.in
+source make/privoxy/Config.in
 source make/samba/Config.in
 source make/screen/Config.in
 source make/vpnc/Config.in