Added proxychains with DNS resolution via Tor

doc/changelog.txt

@@ -2,6 +2,7 @@
   + 2012.4 release
 
   * Added UFRaw, a RAW images viewer and converter
+  * Added proxychains, a heterogeneous chaining proxyfier
 
 
 2012-09-01

src/etc/portage/package.keywords

@@ -29,6 +29,9 @@
 # Split gnuplot dependency (#425622)
 =sci-libs/libqalculate-0.9.7*
 
+# Compilation issues (#437232, #408427)
+=net-misc/proxychains-3.1_p20110225*
+
 # Firmware
 sys-firmware/amd-ucode
 net-wireless/b43-firmware

src/root/patches/portage/proxychains-3.1_p20110225-glibc215.patch

@@ -0,0 +1,45 @@
+diff -udr proxychains-3.1_p20110225.orig/proxychains/core.c proxychains-3.1_p20110225/proxychains/core.c
+--- proxychains-3.1_p20110225.orig/proxychains/core.c	2011-02-25 20:48:33.000000000 +0500
++++ proxychains-3.1_p20110225/proxychains/core.c	2012-08-25 19:02:04.610489009 +0600
+@@ -178,7 +178,7 @@
+   return size;
+ }
+ 
+-static int timed_connect(int sock, const struct sockaddr *addr, unsigned int len)
++static int timed_connect(int sock, const struct sockaddr *addr, socklen_t len)
+ {
+ 	int ret,value,value_len;
+  	struct pollfd pfd[1];
+diff -udr proxychains-3.1_p20110225.orig/proxychains/core.h proxychains-3.1_p20110225/proxychains/core.h
+--- proxychains-3.1_p20110225.orig/proxychains/core.h	2011-02-25 20:48:33.000000000 +0500
++++ proxychains-3.1_p20110225/proxychains/core.h	2012-08-25 19:15:37.785322924 +0600
+@@ -90,7 +90,7 @@
+ typedef int (*getnameinfo_t) (const struct sockaddr *,
+ 		socklen_t, char *,
+ 		socklen_t, char *,
+-		socklen_t, unsigned int);
++		socklen_t, int);
+ getnameinfo_t true_getnameinfo;
+ 
+ typedef struct hostent *(*gethostbyaddr_t) (const void *, socklen_t, int);
+diff -udr proxychains-3.1_p20110225.orig/proxychains/libproxychains.c proxychains-3.1_p20110225/proxychains/libproxychains.c
+--- proxychains-3.1_p20110225.orig/proxychains/libproxychains.c	2011-02-25 20:48:33.000000000 +0500
++++ proxychains-3.1_p20110225/proxychains/libproxychains.c	2012-08-25 19:15:14.750610897 +0600
+@@ -264,7 +264,7 @@
+ 
+ 
+ 
+-int connect (int sock, const struct sockaddr *addr, unsigned int len)
++int connect(int sock, const struct sockaddr *addr, socklen_t len)
+ {
+ 	int socktype=0,optlen=0,flags=0,ret=0;
+ 	char str[256];
+@@ -354,7 +354,7 @@
+ int getnameinfo (const struct sockaddr * sa,
+ 			socklen_t salen, char * host,
+ 			socklen_t hostlen, char * serv,
+-			socklen_t servlen, unsigned int flags)
++			socklen_t servlen, int flags)
+ {
+ 	int ret = 0;
+ 	if(!init_l)

src/root/setup

@@ -94,6 +94,10 @@ patch_ebuild ${HOME}/patches/portage/fbreader.patch
 # (#424816)
 patch_ebuild ${HOME}/patches/portage/virtualbox-guest-additions.patch
 patch_ebuild ${HOME}/patches/portage/xf86-video-virtualbox.patch
+# (#437232, #408427)
+cp                ${HOME}/patches/portage/proxychains-3.1_p20110225-glibc215.patch \
+  /usr/portage/net-misc/proxychains/files/proxychains-3.1_p20110225-glibc214.patch
+ebuild  /usr/portage/net-misc/proxychains/proxychains-3.1_p20110225.ebuild manifest
 # (restore removed unstable ebuild)
 khs=/usr/portage/sys-kernel/hardened-sources/hardened-sources-3.4.5.ebuild
 cp -a ${khs} ${khs/3.4.5/3.4.7}
@@ -492,6 +496,7 @@ dconf update
 
 
 sinfo "Installing wrappers"
+ln -sf ../local/libexec/proxyresolv.wrapper    /usr/bin/proxyresolv
 ln -sf ../local/libexec/vmmouse_detect.wrapper /usr/bin/vmmouse_detect
 
 

src/root/setup-copy

@@ -50,6 +50,7 @@ ebuilds="app-misc/ca-certificates
          media-plugins/gst-plugins-vp8
          net-dialup/pptpclient
          net-im/pidgin
+         net-misc/proxychains
          net-wireless/wimax
          sys-apps/lm_sensors
          sys-apps/portage
@@ -85,10 +86,12 @@ sed -i 's/^inherit /GENTOO_DEPEND_ON_PERL="no"\n&/' ${ebuild_obexftp}
 # [xcb-proto]              xcb-util-wm:      not needed              (#398953, upstream)
 # [liboil]                 vips:             not needed              (#416815)
 # [linux-headers]          wimax:            not needed              (#431988)
+# [bind-tools]             proxychains:      not needed              (proxyresolv -> tor-resolve)
 sed -i 's:\<sys-apps/debianutils\>::'                    ${ebuild_cacertificates}
 sed -i 's:\<x11-proto/xcb-proto\>::'                     ${ebuild_xcbutilwm}
 sed -i 's:>=dev-libs/liboil-[^[:blank:]"]*\>::'          ${ebuild_vips}
 sed -i 's:>=sys-kernel/linux-headers-[^[:blank:]"]*\>::' ${ebuild_wimax}
+sed -i 's:\<net-dns/bind-tools\>::'                      ${ebuild_proxychains}
 
 # [gst-plugins-bad] gst-plugins-vp8: only libgstbasevideo-0.10.so is needed
 sed -i 's:>=media-libs/gst-plugins-bad-[^[:blank:]"]*::' ${ebuild_gstpluginsvp8}

src/var/lib/portage/world

@@ -115,6 +115,7 @@ gnome-extra/nm-applet
 net-misc/htpdate
 net-misc/tor
 net-misc/connect
+net-misc/proxychains
 net-misc/whois
 net-p2p/i2p
 net-proxy/torsocks