[or-cvs] r11718: Replace squid/privoxy with polipo. (in incognito/branches/polipo: . arch/x86 portage.config portage.overlay/kde-misc/tork portage.overlay/net-misc/trans-proxy-tor portage.overlay/net-proxy portage.overlay/net-proxy/polipo portage.overlay/net-proxy/polipo/files root_overlay/etc root_overlay/etc/env.d root_overlay/etc/polipo root_overlay/etc/polipo/forbidden.d root_overlay/etc/splash/livecd-2006.1/icons root_overlay/usr/share/incognito root_overlay/var/lib/iptables root_overlay/var/lib/kdesession)

double at seul.org double at seul.org
Sun Sep 30 12:32:12 UTC 2007 

Author: double
Date: 2007-09-30 08:32:12 -0400 (Sun, 30 Sep 2007)
New Revision: 11718

Added:
   incognito/branches/polipo/portage.overlay/net-proxy/polipo/
   incognito/branches/polipo/portage.overlay/net-proxy/polipo/Manifest
   incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/
   incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/config
   incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/digest-polipo-1.0.2-r1
   incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/polipo.crond
   incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/polipo.initd
   incognito/branches/polipo/portage.overlay/net-proxy/polipo/polipo-1.0.2-r1.ebuild
   incognito/branches/polipo/root_overlay/etc/polipo/
   incognito/branches/polipo/root_overlay/etc/polipo/config
   incognito/branches/polipo/root_overlay/etc/polipo/forbidden.d/
   incognito/branches/polipo/root_overlay/etc/polipo/forbidden.d/ads
   incognito/branches/polipo/root_overlay/etc/splash/livecd-2006.1/icons/unlit_polipo.png
Removed:
   incognito/branches/polipo/portage.overlay/net-proxy/privoxy/
   incognito/branches/polipo/root_overlay/etc/privoxy/
   incognito/branches/polipo/root_overlay/etc/splash/livecd-2006.1/icons/unlit_squid.png
   incognito/branches/polipo/root_overlay/etc/squid/
Modified:
   incognito/branches/polipo/ChangeLog
   incognito/branches/polipo/TODO
   incognito/branches/polipo/arch/x86/livecd-stage1-tiny.spec
   incognito/branches/polipo/arch/x86/livecd-stage1.spec
   incognito/branches/polipo/arch/x86/livecd-stage2-tiny.spec
   incognito/branches/polipo/arch/x86/livecd-stage2.spec
   incognito/branches/polipo/building.html
   incognito/branches/polipo/livecd-stage2.sh
   incognito/branches/polipo/portage.config/package.keywords
   incognito/branches/polipo/portage.overlay/kde-misc/tork/Manifest
   incognito/branches/polipo/portage.overlay/kde-misc/tork/tork-0.20.ebuild
   incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/Manifest
   incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/trans-proxy-tor-0.1.0.ebuild
   incognito/branches/polipo/root_overlay/etc/env.d/99proxy
   incognito/branches/polipo/root_overlay/etc/links.cfg
   incognito/branches/polipo/root_overlay/usr/share/incognito/readme.html
   incognito/branches/polipo/root_overlay/var/lib/iptables/rules-save
   incognito/branches/polipo/root_overlay/var/lib/kdesession/kioslaverc
   incognito/branches/polipo/root_overlay/var/lib/kdesession/torkrc
Log:
Replace squid/privoxy with polipo.


Modified: incognito/branches/polipo/ChangeLog
===================================================================
--- incognito/branches/polipo/ChangeLog	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/ChangeLog	2007-09-30 12:32:12 UTC (rev 11718)
@@ -1,3 +1,6 @@
+
+	- Replace squid/privoxy with polipo
+
 27 Sep 2007
 20070824.2 changes since 20070824.1:
 

Modified: incognito/branches/polipo/TODO
===================================================================
--- incognito/branches/polipo/TODO	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/TODO	2007-09-30 12:32:12 UTC (rev 11718)
@@ -40,8 +40,6 @@
 
 - Consider using grsec ?
 
-- Replace squid/privoxy with polipo
-
 - Add torbutton, disabling tor enable/disable in toolbar and status bar
 
 - FireGPG (http://firegpg.tuxfamily.org) when out of beta

Modified: incognito/branches/polipo/arch/x86/livecd-stage1-tiny.spec
===================================================================
--- incognito/branches/polipo/arch/x86/livecd-stage1-tiny.spec	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/arch/x86/livecd-stage1-tiny.spec	2007-09-30 12:32:12 UTC (rev 11718)
@@ -116,7 +116,7 @@
 	sys-boot/syslinux
 	dev-libs/libevent
 	net-misc/tor
-	net-proxy/privoxy
+	net-proxy/polipo
 	app-misc/secure-delete
 	net-misc/netkit-telnetd
 	net-analyzer/macchanger

Modified: incognito/branches/polipo/arch/x86/livecd-stage1.spec
===================================================================
--- incognito/branches/polipo/arch/x86/livecd-stage1.spec	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/arch/x86/livecd-stage1.spec	2007-09-30 12:32:12 UTC (rev 11718)
@@ -131,7 +131,7 @@
 	sys-boot/syslinux
 	dev-libs/libevent
 	net-misc/tor
-	net-proxy/privoxy
+	net-proxy/polipo
 	x11-misc/xdialog
 	x11-misc/xsri
 	x11-terms/xterm

Modified: incognito/branches/polipo/arch/x86/livecd-stage2-tiny.spec
===================================================================
--- incognito/branches/polipo/arch/x86/livecd-stage2-tiny.spec	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/arch/x86/livecd-stage2-tiny.spec	2007-09-30 12:32:12 UTC (rev 11718)
@@ -26,10 +26,9 @@
 
 livecd/rcadd:
 	tor|default
-	privoxy|default
+	polipo|default
 	iptables|default
 	xdm|default
-	squid|default
 	acpid|boot
 	gpm|boot
 	external-config-setup|boot
@@ -91,7 +90,6 @@
 #	x11-drivers/nvidia-drivers
 #	x11-drivers/ati-drivers
 	net-firewall/iptables
-	net-proxy/squid
 	app-crypt/truecrypt
 
 livecd/unmerge:
@@ -330,7 +328,6 @@
 	/etc/make.globals
 	/etc/make.profile
 	/etc/conf.d/net.example
-	/etc/squid/*.default
 	/etc/kernels
 	/etc/man.conf
 #	/etc/resolv.conf
@@ -468,6 +465,7 @@
 	/usr/lib/pkgconfig
 	/usr/share/sounds/alsa
 	/usr/share/pixmaps/gentoo-livecd-2006.1
+	/usr/share/polipo/www/doc
 	/var/log/*.log
 	/usr/lib/gcc/i686-pc-linux-gnu/*/include
 	/usr/lib/gcc/i686-pc-linux-gnu/*/libgfortran*

Modified: incognito/branches/polipo/arch/x86/livecd-stage2.spec
===================================================================
--- incognito/branches/polipo/arch/x86/livecd-stage2.spec	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/arch/x86/livecd-stage2.spec	2007-09-30 12:32:12 UTC (rev 11718)
@@ -26,13 +26,12 @@
 
 livecd/rcadd:
 	tor|default
-	privoxy|default
+	polipo|default
 	dns-proxy-tor|default
 	pdnsd|default
 	iptables|default
 	xdm|default
 	cupsd|default
-	squid|default
 	mixminion-smtp|default
 	external-config-setup|boot
 	macchanger|default
@@ -105,7 +104,6 @@
 	app-laptop/laptop-mode-tools
 	net-firewall/ipsec-tools
 	net-firewall/iptables
-	net-proxy/squid
 	net-misc/trans-proxy-tor
 	app-crypt/truecrypt
 	net-misc/networkmanager
@@ -331,7 +329,6 @@
 	/etc/make.globals
 	/etc/make.profile
 	/etc/conf.d/net.example
-	/etc/squid/*.default
 	/etc/kernels
 #	/etc/man.conf
 #	/etc/resolv.conf
@@ -484,6 +481,7 @@
 	/sbin/ldconfig
 	/usr/share/doc/*-*
 	/usr/kde/*/share/doc/*-*
+	/usr/share/polipo/www/doc
 	/usr/share/applications/Assistant.desktop
 	/usr/share/applications/Designer.desktop
 	/usr/share/applications/Linguist.desktop

Modified: incognito/branches/polipo/building.html
===================================================================
--- incognito/branches/polipo/building.html	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/building.html	2007-09-30 12:32:12 UTC (rev 11718)
@@ -61,7 +61,7 @@
 </ol>
 
 <p>
-Updating the Incognito CD with specific software, generally Tor, Privoxy, TorK,
+Updating the Incognito CD with specific software, generally Tor, Polipo, TorK,
 Vidalia, can be done with the following steps:
 </p>
 

Modified: incognito/branches/polipo/livecd-stage2.sh
===================================================================
--- incognito/branches/polipo/livecd-stage2.sh	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/livecd-stage2.sh	2007-09-30 12:32:12 UTC (rev 11718)
@@ -58,7 +58,7 @@
 # Do branding replacement
 # TODO: Get these two from somewhere else
 INCOGNITO="Incognito"
-INCOGNITO_TITLE="Incognito CD/USB"
+INCOGNITO_TITLE="Incognito"
 INCOGNITO_VERSION="custom"
 
 # Add revision

Modified: incognito/branches/polipo/portage.config/package.keywords
===================================================================
--- incognito/branches/polipo/portage.config/package.keywords	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/portage.config/package.keywords	2007-09-30 12:32:12 UTC (rev 11718)
@@ -2,7 +2,6 @@
 app-portage/cfg-update ~*
 net-misc/tor ~*
 <kde-misc/tork-9999 ~*
-net-proxy/privoxy ~*
 net-proxy/tsocks ~*
 net-proxy/dante ~*
 net-misc/trans-proxy-tor ~*

Modified: incognito/branches/polipo/portage.overlay/kde-misc/tork/Manifest
===================================================================
--- incognito/branches/polipo/portage.overlay/kde-misc/tork/Manifest	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/portage.overlay/kde-misc/tork/Manifest	2007-09-30 12:32:12 UTC (rev 11718)
@@ -1,8 +1,8 @@
 DIST tork-0.20.tar.bz2 2936150 RMD160 84628f70e2627468f37a9e2a641dab01033b0702 SHA1 2d46566a2ae6d63a1112176cface132bb38373a5 SHA256 355dfd0b60fedb7ffe5c54375ffd5d2aebaeaf696b64ab46c240ba9f0e4b4ec5
-EBUILD tork-0.20.ebuild 1208 RMD160 c9e68058831284a7d8bf0560471b76275c7b7931 SHA1 7680de891800fbc0abd50a237a040a8a4c03c805 SHA256 5e3f419b9f229b3f33c8ca096fbeebce4d084456acb759abe93cec4cc2ace4a3
-MD5 5e1968e756a6655680e365340fdb0b9c tork-0.20.ebuild 1208
-RMD160 c9e68058831284a7d8bf0560471b76275c7b7931 tork-0.20.ebuild 1208
-SHA256 5e3f419b9f229b3f33c8ca096fbeebce4d084456acb759abe93cec4cc2ace4a3 tork-0.20.ebuild 1208
+EBUILD tork-0.20.ebuild 1178 RMD160 c5d6645f42408931ac1dcbf8b7fdb9d6a53204bf SHA1 a7a6c7ad71f0651f6f30e0ddf6982c32d768d23c SHA256 2b8f9371772dfb1e79da8490244bf14c6f087a7fc5b7f54d9bd4e67f64a14b07
+MD5 28fc6ef46406272107e0692d6767130f tork-0.20.ebuild 1178
+RMD160 c5d6645f42408931ac1dcbf8b7fdb9d6a53204bf tork-0.20.ebuild 1178
+SHA256 2b8f9371772dfb1e79da8490244bf14c6f087a7fc5b7f54d9bd4e67f64a14b07 tork-0.20.ebuild 1178
 MD5 a28543226b33451d6203d4642b851bc5 files/digest-tork-0.20 235
 RMD160 65db1b0dad165a4d6ee3a83f5082605ff82a8505 files/digest-tork-0.20 235
 SHA256 2f7d323e19c33536f882253a779b0fdd6a026d768072b6a3b733684362bcff1d files/digest-tork-0.20 235

Modified: incognito/branches/polipo/portage.overlay/kde-misc/tork/tork-0.20.ebuild
===================================================================
--- incognito/branches/polipo/portage.overlay/kde-misc/tork/tork-0.20.ebuild	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/portage.overlay/kde-misc/tork/tork-0.20.ebuild	2007-09-30 12:32:12 UTC (rev 11718)
@@ -16,7 +16,6 @@
 DEPEND="dev-libs/openssl"
 
 RDEPEND=">=net-misc/tor-0.1.2.3
-	>=net-proxy/privoxy-3.0.3-r5
 	net-proxy/tsocks
 	${DEPEND}"
 

Modified: incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/Manifest
===================================================================
--- incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/Manifest	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/Manifest	2007-09-30 12:32:12 UTC (rev 11718)
@@ -23,10 +23,10 @@
 RMD160 ce19433bc54d9ff5655e33b4b44a369bab494f50 files/trans-proxy-tor.logrotate.d 85
 SHA256 6de9caac788e8e2fe317c8d59caf44c71f8c04e040880aa9b611f6606cec375c files/trans-proxy-tor.logrotate.d 85
 DIST trans-proxy-tor-0.1.0.tar.gz 25752 RMD160 70253c34188cfd6b955eac05b999c9a1c63cdbc9 SHA1 ff0c90ec2db2616633060594bc96cdaeb0391cb9 SHA256 876b6ff00cc2b60e432ffd19aae09e0fcf509ae11977b1ac73894052e9946717
-EBUILD trans-proxy-tor-0.1.0.ebuild 1271 RMD160 7b030903640ac6c42abdbd40cd05767acc34f893 SHA1 c792d86895003acf7f9a603dcb2916d2f7d2877e SHA256 be3bdfb0145087f4d39a08587d4f49dcb494aba25040bc12c347bad559fd5f3f
-MD5 acddf8d079b2bdf48454ff272cb967a0 trans-proxy-tor-0.1.0.ebuild 1271
-RMD160 7b030903640ac6c42abdbd40cd05767acc34f893 trans-proxy-tor-0.1.0.ebuild 1271
-SHA256 be3bdfb0145087f4d39a08587d4f49dcb494aba25040bc12c347bad559fd5f3f trans-proxy-tor-0.1.0.ebuild 1271
-MD5 36d5c9d67e961abe068918fe5af9ebdc files/digest-trans-proxy-tor-0.1.0 262
-RMD160 bbf95bca10d495216fbf7d0679254798dff77940 files/digest-trans-proxy-tor-0.1.0 262
-SHA256 0a7d3dd3af5f26063448545aed6df5a26194654cb1a57cbdda79fe31ce6a348d files/digest-trans-proxy-tor-0.1.0 262
+EBUILD trans-proxy-tor-0.1.0.ebuild 1251 RMD160 2c97bb15df3ca40595520861324ea9726d9ebd4c SHA1 370f44d8fc8b483488b9f6262fe81952a53773f2 SHA256 9cc75aefc9becd6bebeed54a0f5b7fb630ecb2d60e5cc9f5efd92b0b46120ca5
+MD5 e73aa4bf6df8afa375f56d2c1cf37e1f trans-proxy-tor-0.1.0.ebuild 1251
+RMD160 2c97bb15df3ca40595520861324ea9726d9ebd4c trans-proxy-tor-0.1.0.ebuild 1251
+SHA256 9cc75aefc9becd6bebeed54a0f5b7fb630ecb2d60e5cc9f5efd92b0b46120ca5 trans-proxy-tor-0.1.0.ebuild 1251
+MD5 7dd19410e476b51f6130c8c4a86de886 files/digest-trans-proxy-tor-0.1.0 190
+RMD160 41bfd68e947414ceadc5ac443f64c304a953f74a files/digest-trans-proxy-tor-0.1.0 190
+SHA256 45778f1bd863d29b928e161a207ae549d5c7d01478cf8a590172990d837b14e6 files/digest-trans-proxy-tor-0.1.0 190

Modified: incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/trans-proxy-tor-0.1.0.ebuild
===================================================================
--- incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/trans-proxy-tor-0.1.0.ebuild	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/trans-proxy-tor-0.1.0.ebuild	2007-09-30 12:32:12 UTC (rev 11718)
@@ -14,7 +14,6 @@
 
 DEPEND="dev-lang/perl"
 RDEPEND="net-misc/tor 
-	net-proxy/privoxy 
 	net-firewall/iptables 
 	logrotate? ( app-admin/logrotate )"
 

Added: incognito/branches/polipo/portage.overlay/net-proxy/polipo/Manifest
===================================================================
--- incognito/branches/polipo/portage.overlay/net-proxy/polipo/Manifest	                        (rev 0)
+++ incognito/branches/polipo/portage.overlay/net-proxy/polipo/Manifest	2007-09-30 12:32:12 UTC (rev 11718)
@@ -0,0 +1,20 @@
+AUX config 167 RMD160 c277cb5c2a60d11ce7eeee781a335f1f475e9287 SHA1 b0ed88a7494f7fe756a1a9999e495a377fc88d11 SHA256 3b600497508790390eb5413cc53ab04bfe8b083324472732b11847acddc91bda
+MD5 fdf9f12df918b0d2623ebe825a1aa705 files/config 167
+RMD160 c277cb5c2a60d11ce7eeee781a335f1f475e9287 files/config 167
+SHA256 3b600497508790390eb5413cc53ab04bfe8b083324472732b11847acddc91bda files/config 167
+AUX polipo.crond 234 RMD160 463895559a9d28d38bc11064cdab7882a56128e6 SHA1 59a70f72fdb01f381199f566c3146d7810273363 SHA256 cab7448361658d34593822893688df11d6f02f8b2927dbbbbe84642b335575d0
+MD5 e5ef4a8d1d756db7687c7bafe3e846f3 files/polipo.crond 234
+RMD160 463895559a9d28d38bc11064cdab7882a56128e6 files/polipo.crond 234
+SHA256 cab7448361658d34593822893688df11d6f02f8b2927dbbbbe84642b335575d0 files/polipo.crond 234
+AUX polipo.initd 1357 RMD160 f07a38b41e627665025b1f1102de7c8ab11e89f0 SHA1 492d5a612211023d1bc52a218ae5f49541c7cd20 SHA256 b66110d4cb0feb35323d004f5a9a2efe5e81c87847927bd96135d21505aca021
+MD5 ff9f18cb46b9cdf54e9ef9c64c6a4944 files/polipo.initd 1357
+RMD160 f07a38b41e627665025b1f1102de7c8ab11e89f0 files/polipo.initd 1357
+SHA256 b66110d4cb0feb35323d004f5a9a2efe5e81c87847927bd96135d21505aca021 files/polipo.initd 1357
+DIST polipo-1.0.2.tar.gz 177584 RMD160 7e934fb7a8ffd62627fe93661fecbcec74285f80 SHA1 2097a2b3733229010621d4ecdc3f57e3cbf95d16 SHA256 796c5fec2276029e3f1ac6c6fc5abddf35eb24f10cb8b2dba04f91923ca8b0b0
+EBUILD polipo-1.0.2-r1.ebuild 1170 RMD160 fa1c40ca0ce61107e4790644ba3a1d16f2f2bcb6 SHA1 92d39ea4514e3d86201d00600d8ecf9ca98fcb73 SHA256 e6b2e1e9932dc133933162c9bb368fadae6fef852dd490658c77f6efcc533b74
+MD5 cf89ca25043a75fd26007aee4414507b polipo-1.0.2-r1.ebuild 1170
+RMD160 fa1c40ca0ce61107e4790644ba3a1d16f2f2bcb6 polipo-1.0.2-r1.ebuild 1170
+SHA256 e6b2e1e9932dc133933162c9bb368fadae6fef852dd490658c77f6efcc533b74 polipo-1.0.2-r1.ebuild 1170
+MD5 62fc575773a71bf5a49c8de5991c3e9a files/digest-polipo-1.0.2-r1 238
+RMD160 df962c47b5f5acea9bfa735927f104dd76e18d22 files/digest-polipo-1.0.2-r1 238
+SHA256 23837a34374b0865455923750929518d6abf97d491189d6b2d775d8763769eec files/digest-polipo-1.0.2-r1 238

Added: incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/config
===================================================================
--- incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/config	                        (rev 0)
+++ incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/config	2007-09-30 12:32:12 UTC (rev 11718)
@@ -0,0 +1,8 @@
+daemonise=false
+diskCacheRoot=/var/cache/polipo/
+proxyAddress=127.0.0.1
+proxyName=localhost
+serverSlots=4
+serverMaxSlots=8
+cacheIsShared=true
+allowedClients=127.0.0.1

Added: incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/digest-polipo-1.0.2-r1
===================================================================
--- incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/digest-polipo-1.0.2-r1	                        (rev 0)
+++ incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/digest-polipo-1.0.2-r1	2007-09-30 12:32:12 UTC (rev 11718)
@@ -0,0 +1,3 @@
+MD5 2d1d8af414429e5823675a781604c70a polipo-1.0.2.tar.gz 177584
+RMD160 7e934fb7a8ffd62627fe93661fecbcec74285f80 polipo-1.0.2.tar.gz 177584
+SHA256 796c5fec2276029e3f1ac6c6fc5abddf35eb24f10cb8b2dba04f91923ca8b0b0 polipo-1.0.2.tar.gz 177584

Added: incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/polipo.crond
===================================================================
--- incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/polipo.crond	                        (rev 0)
+++ incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/polipo.crond	2007-09-30 12:32:12 UTC (rev 11718)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if /etc/init.d/polipo --quiet status; then
+	#Expire old cached objects
+	kill -USR1 $(cat /var/run/polipo.pid)
+	sleep 1
+	nice -n 15 su -s "/bin/sh" -c "polipo -x" polipo > /dev/null
+	kill -USR2 $(cat /var/run/polipo.pid)
+fi

Added: incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/polipo.initd
===================================================================
--- incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/polipo.initd	                        (rev 0)
+++ incognito/branches/polipo/portage.overlay/net-proxy/polipo/files/polipo.initd	2007-09-30 12:32:12 UTC (rev 11718)
@@ -0,0 +1,56 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/files/polipo.initd,v 1.4 2007/06/17 07:00:10 mrness Exp $
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	polipo -v | (
+		local retvalue=0
+		local name type value desc
+		while read name type value desc ; do
+			case ${name} in
+				configFile)
+					if [[ "${value}" == "(none)" ]]; then
+						eerror "Unable to read configuration file /etc/polipo/config"
+						retvalue=1
+					fi
+					;;
+				daemonise)
+					if [[ "${value}" != "false" ]]; then
+						eerror "Configuration option not supported by this init script: ${name}=${value}"
+						retvalue=1
+					fi
+					;;
+				pidFile)
+					if [[ "${value}" != "(none)" ]]; then
+						eerror "Configuration option not supported by this init script: ${name}=${value}"
+						retvalue=1
+					fi
+					;;
+			esac
+		done
+		return ${retvalue}
+	)
+	[[ ${PIPESTATUS[0]} == 0 && ${PIPESTATUS[1]} == 0 ]]
+	return $?
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting Polipo HTTP proxy"
+	start-stop-daemon --start --chuid polipo \
+		--background --pidfile /var/run/polipo.pid --make-pidfile \
+			--exec /usr/bin/polipo
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Polipo HTTP proxy"
+	start-stop-daemon --stop --pidfile /var/run/polipo.pid
+	eend $?
+}

Added: incognito/branches/polipo/portage.overlay/net-proxy/polipo/polipo-1.0.2-r1.ebuild
===================================================================
--- incognito/branches/polipo/portage.overlay/net-proxy/polipo/polipo-1.0.2-r1.ebuild	                        (rev 0)
+++ incognito/branches/polipo/portage.overlay/net-proxy/polipo/polipo-1.0.2-r1.ebuild	2007-09-30 12:32:12 UTC (rev 11718)
@@ -0,0 +1,45 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-1.0.2-r1.ebuild,v 1.3 2007/09/02 20:42:38 opfer Exp $
+
+inherit eutils
+
+DESCRIPTION="A caching web proxy"
+HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/"
+SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="sys-apps/texinfo"
+
+pkg_setup() {
+	enewgroup polipo
+	enewuser polipo -1 -1 /var/cache/polipo polipo
+}
+
+src_compile() {
+	emake PREFIX=/usr "CDEBUGFLAGS=${CFLAGS}" all || die "build failed"
+}
+
+src_install() {
+	einstall PREFIX=/usr MANDIR=/usr/share/man INFODIR=/usr/share/info "TARGET=${D}" || die "install failed"
+
+	newinitd "${FILESDIR}/polipo.initd" polipo
+	insinto /etc/polipo ; doins "${FILESDIR}/config"
+	exeinto /etc/cron.daily ; newexe "${FILESDIR}/polipo.crond" polipo.sh
+
+	diropts -m0750 -o polipo -g polipo
+	keepdir /var/cache/polipo
+}
+
+pkg_preinst() {
+	pkg_setup
+}
+
+pkg_postinst() {
+	einfo "Do not forget to read the manual."
+	einfo "Change the config file in /etc/polipo to suit your needs."
+}

Modified: incognito/branches/polipo/root_overlay/etc/env.d/99proxy
===================================================================
--- incognito/branches/polipo/root_overlay/etc/env.d/99proxy	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/root_overlay/etc/env.d/99proxy	2007-09-30 12:32:12 UTC (rev 11718)
@@ -1,7 +1,5 @@
 http_proxy=http://localhost:3128
 HTTP_PROXY=http://localhost:3128
-ftp_proxy=http://localhost:3128
-FTP_PROXY=http://localhost:3128
 SOCKS_SERVER=localhost:9050
 SOCKS5_SERVER=localhost:9050
 

Modified: incognito/branches/polipo/root_overlay/etc/links.cfg
===================================================================
--- incognito/branches/polipo/root_overlay/etc/links.cfg	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/root_overlay/etc/links.cfg	2007-09-30 12:32:12 UTC (rev 11718)
@@ -1,3 +1,2 @@
 http_proxy 127.0.0.1:3128
-ftp_proxy 127.0.0.1:3128
 

Added: incognito/branches/polipo/root_overlay/etc/polipo/config
===================================================================
--- incognito/branches/polipo/root_overlay/etc/polipo/config	                        (rev 0)
+++ incognito/branches/polipo/root_overlay/etc/polipo/config	2007-09-30 12:32:12 UTC (rev 11718)
@@ -0,0 +1,15 @@
+daemonise=false
+diskCacheRoot=
+proxyAddress=127.0.0.1
+proxyName=localhost
+proxyPort=3128
+serverSlots=4
+serverMaxSlots=8
+cacheIsShared=false
+allowedClients=127.0.0.1
+socksParentProxy=localhost:9050
+socksProxyType=socks5
+disableVia=true
+censoredHeaders=from, accept-language, x-pad, link, warning
+censorReferer=maybe
+forbiddenFile=/etc/polipo/forbidden.d

Added: incognito/branches/polipo/root_overlay/etc/polipo/forbidden.d/ads
===================================================================
--- incognito/branches/polipo/root_overlay/etc/polipo/forbidden.d/ads	                        (rev 0)
+++ incognito/branches/polipo/root_overlay/etc/polipo/forbidden.d/ads	2007-09-30 12:32:12 UTC (rev 11718)
@@ -0,0 +1,5 @@
+doubleclick\..*
+ads\..*
+adserv.*
+banners.*
+

Copied: incognito/branches/polipo/root_overlay/etc/splash/livecd-2006.1/icons/unlit_polipo.png (from rev 11677, incognito/branches/polipo/root_overlay/etc/splash/livecd-2006.1/icons/unlit_squid.png)
===================================================================
(Binary files differ)

Deleted: incognito/branches/polipo/root_overlay/etc/splash/livecd-2006.1/icons/unlit_squid.png
===================================================================
(Binary files differ)

Modified: incognito/branches/polipo/root_overlay/usr/share/incognito/readme.html
===================================================================
--- incognito/branches/polipo/root_overlay/usr/share/incognito/readme.html	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/root_overlay/usr/share/incognito/readme.html	2007-09-30 12:32:12 UTC (rev 11718)
@@ -133,12 +133,9 @@
 <dt><a href="<!-- #homepage(net-misc/tor) -->">Tor</a> <!-- #version(net-misc/tor) --></dt>
 <dd><!-- #description(net-misc/tor) -->. Every attempt is to use the latest version.</dd>
 
-<dt><a href="<!-- #homepage(net-proxy/privoxy) -->">Privoxy</a> <!-- #version(net-proxy/privoxy) --></dt>
-<dd><!-- #description(net-proxy/privoxy) --></dd>
+<dt><a href="<!-- #homepage(net-proxy/polipo) -->">polipo</a> <!-- #version(net-proxy/polipo) --></dt>
+<dd><!-- #description(net-proxy/polipo) --></dd>
 
-<dt><a href="<!-- #homepage(net-proxy/squid) -->">squid</a> <!-- #version(net-proxy/squid) --></dt>
-<dd><!-- #description(net-proxy/squid) --></dd>
-
 <dt><a href="<!-- #homepage(www-client/mozilla-firefox-bin) -->">Firefox</a> <!-- #version(www-client/mozilla-firefox-bin) --></dt>
 <dd><!-- #description(www-client/mozilla-firefox-bin) --></dd>
 
@@ -327,14 +324,13 @@
 <li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/conf.d/net">/etc/conf.d/net</a></li>
 </ul>
 
-<h3>HTTP Proxies</h3>
+<h3>HTTP Proxy</h3>
 <p>
-Two HTTP proxies are used, Privoxy and Squid. Squid is used for efficient caching and transparent proxying of port 80 traffic. Privoxy is used after Squid for its filtering and blocking capabilities.
+Polipo is used as the HTTP proxy. It contacts Tor via SOCKS5 to make the real connections.
 </p>
 
 <ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/privoxy/config">/etc/privoxy/config</a></li>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/squid/squid.conf">/etc/squid/squid.conf</a></li>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/polipo/config">/etc/polipo/config</a></li>
 <li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/env.d/99proxy">/etc/env.d/99proxy</a></li>
 <li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/kdesession/kioslaverc">/var/lib/kdesession/kioslaverc</a> (copied to /home/gentoo/.kde3.5/... during build)</li>
 </ul>
@@ -404,7 +400,7 @@
 
 <h3>Network Filter</h3>
 <p>
-One of the security issues is we don't know what software will attempt to contact the network without consideration for proxies. This is solved by forwarding all TCP connections that are not targetted to Tor (or localhost) through Tor. Linux has a kernel level network filter that accomplishes this. The CD is configured to pass all TCP traffic through Tor in case an application does not recognize or support HTTP/SOCKS proxies. Port 80 (HTTP) traffic is routed through squid first so that the DNS resolution will be sent to Privoxy/Tor which is better than using the local name server.
+One of the security issues is we don't know what software will attempt to contact the network without consideration for proxies. This is solved by forwarding all TCP connections that are not targetted to Tor (or localhost) through Tor. Linux has a kernel level network filter that accomplishes this. The CD is configured to pass all TCP traffic through Tor in case an application does not recognize or support HTTP/SOCKS proxies.
 </p>
 
 <ul>
@@ -486,7 +482,7 @@
 <li>Tor</li>
 <li>TorK</li>
 <li>Vidalia</li>
-<li>Privoxy</li>
+<li>Polipo</li>
 <li>Mixminion</li>
 </ul>
 

Modified: incognito/branches/polipo/root_overlay/var/lib/iptables/rules-save
===================================================================
--- incognito/branches/polipo/root_overlay/var/lib/iptables/rules-save	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/root_overlay/var/lib/iptables/rules-save	2007-09-30 12:32:12 UTC (rev 11718)
@@ -31,8 +31,9 @@
 :POSTROUTING ACCEPT [13134711:761547407]
 :OUTPUT ACCEPT [13096834:759280116]
 
-# Tor is allowed to do anything it wants to
+# Tor and polipo are allowed to do anything they want to
 [787:47220] -A OUTPUT -m owner --uid-owner tor -j RETURN 
+[787:47220] -A OUTPUT -m owner --uid-owner polipo -j RETURN 
 
 # Local networks should not go through Tor
 [0:0] -A OUTPUT -d 192.168.0.0/255.255.0.0 -j RETURN 
@@ -44,9 +45,6 @@
 # .onion mapped addresses
 [0:0] -A OUTPUT -d 127.192.0.0/255.192.0.0 -p tcp -m tcp -j DNAT --to-destination 127.0.0.1:9040
 
-# Redirect standard HTTP traffic (port 80) to squid
-[0:0] -A OUTPUT -o ! lo -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK SYN --dport 80 -j DNAT --to-destination 127.0.0.1:3128
-
 # Redirect all remaining TCP to Tor
 [547:32820] -A OUTPUT -o ! lo -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK SYN -j DNAT --to-destination 127.0.0.1:9040 
 

Modified: incognito/branches/polipo/root_overlay/var/lib/kdesession/kioslaverc
===================================================================
--- incognito/branches/polipo/root_overlay/var/lib/kdesession/kioslaverc	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/root_overlay/var/lib/kdesession/kioslaverc	2007-09-30 12:32:12 UTC (rev 11718)
@@ -4,6 +4,5 @@
 [Proxy Settings]
 NoProxyFor=127.0.0.1,localhost,10.0.0.0,192.168.0.0,172.16.0.0
 ProxyType=1
-ftpProxy=http://127.0.0.1:3128
 httpProxy=http://127.0.0.1:3128
 httpsProxy=http://127.0.0.1:3128

Modified: incognito/branches/polipo/root_overlay/var/lib/kdesession/torkrc
===================================================================
--- incognito/branches/polipo/root_overlay/var/lib/kdesession/torkrc	2007-09-30 11:14:28 UTC (rev 11717)
+++ incognito/branches/polipo/root_overlay/var/lib/kdesession/torkrc	2007-09-30 12:32:12 UTC (rev 11718)
@@ -67,7 +67,6 @@
 OriginalHttpProxy=http://127.0.0.1:3128
 OriginalHttpsProxy=http://127.0.0.1:3128
 OriginalProxyType=1
-PrivoxyLocation=/usr/sbin/privoxy
 QuickConfigure=6
 ShowApplySettingsQuestions=false
 ShowDNSLeaks=false

More information about the tor-commits mailing list