Unbreak proxychains #89464 by Cliff Barnes.

(Portage version: 2.0.51.19)

4 files changed, 53 insertions, 15 deletions

diff --git a/net-misc/proxychains/ChangeLog b/net-misc/proxychains/ChangeLog
index 452c376895c6..aaf8c9a04a18 100644
--- a/net-misc/proxychains/ChangeLog
+++ b/net-misc/proxychains/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/proxychains
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/ChangeLog,v 1.5 2005/03/12 20:39:07 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/ChangeLog,v 1.6 2005/04/19 22:12:01 vapier Exp $
+
+*proxychains-2.1-r2 (19 Apr 2005)
+
+  19 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  files/proxychains-2.1-libc-connect.patch, +proxychains-2.1-r2.ebuild:
+  Unbreak proxychains #89464 by Cliff Barnes.
 
 *proxychains-2.1-r1 (12 Mar 2005)
 
diff --git a/net-misc/proxychains/files/digest-proxychains-2.1-r2 b/net-misc/proxychains/files/digest-proxychains-2.1-r2
new file mode 100644
index 000000000000..d061ba9f252d
--- /dev/null
+++ b/net-misc/proxychains/files/digest-proxychains-2.1-r2
@@ -0,0 +1 @@
+MD5 5f54d41265a20ae48c261a53ca603139 proxychains-2.1.tar.gz 181095
diff --git a/net-misc/proxychains/files/proxychains-2.1-libc-connect.patch b/net-misc/proxychains/files/proxychains-2.1-libc-connect.patch
index 7f9bb98cc4d9..3751de4c164d 100644
--- a/net-misc/proxychains/files/proxychains-2.1-libc-connect.patch
+++ b/net-misc/proxychains/files/proxychains-2.1-libc-connect.patch
@@ -1,16 +1,12 @@
+This is an ugly hax, but it's what upstream does, so i don't really care
+to try and 'fix' it.
+
 --- proxychains-2.1/proxychains/core.h
 +++ proxychains-2.1/proxychains/core.h
-@@ -65,11 +65,9 @@
- 
- int proxychains_write_log(char *str,...);
- 
--#ifndef __linux__
--#define __libc_connect _connect
--#endif
-+#include <sys/socket.h>
-+#define __libc_connect connect
- 
--extern int __libc_connect (int sock, const struct sockaddr *addr, unsigned int len);
- 
- 
+@@ -68,4 +68,6 @@
+ #ifndef __linux__
+ #define __libc_connect _connect
++#else
++#define __libc_connect __connect
  #endif
+ 
diff --git a/net-misc/proxychains/proxychains-2.1-r2.ebuild b/net-misc/proxychains/proxychains-2.1-r2.ebuild
new file mode 100644
index 000000000000..fff7979549c5
--- /dev/null
+++ b/net-misc/proxychains/proxychains-2.1-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/proxychains-2.1-r2.ebuild,v 1.1 2005/04/19 22:12:01 vapier Exp $
+
+# This doesn't seem to be 64bit clean ... on amd64 for example,
+# trying to do `proxychains telnet 192.168.0.77` will attempt to 
+# connect to '10.0.0.5' instead:
+# $ strace -econnect ./proxychains telnet 192.168.0.77
+# connect(4, {sa_family=AF_INET, sin_port=htons(3128), sin_addr=inet_addr("10.0.0.5")}, 16) = -1 
+
+inherit eutils
+
+DESCRIPTION="force any tcp connections to flow through a proxy (or proxy chain)"
+HOMEPAGE="http://proxychains.sourceforge.net/"
+SRC_URI="mirror://sourceforge/proxychains/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack () {
+	unpack ${A}
+	cd "${S}"
+	sed -i 's:/etc/:$(DESTDIR)/etc/:' proxychains/Makefile.in || die
+	epatch "${FILESDIR}"/${P}-libc-connect.patch
+	touch *
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README TODO
+}