Apply fix for glibc-2.14 (bug #375065), add bdep on xz-utils, and use autotools-utils...

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/net-misc/proxychains/ChangeLog b/net-misc/proxychains/ChangeLog
index df70ec19eea5ca6904d69b7e5bc8330bd3997253..69cbcecbe7f7f823b070fbc1a7ab6fef6d1d74e6 100644 (file)
--- a/net-misc/proxychains/ChangeLog
+++ b/net-misc/proxychains/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/proxychains
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/ChangeLog,v 1.15 2011/03/11 09:18:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/ChangeLog,v 1.16 2011/11/08 07:36:18 radhermit Exp $
+
+  08 Nov 2011; Tim Harder <radhermit@gentoo.org>
+  proxychains-3.1_p20110225.ebuild,
+  +files/proxychains-3.1_p20110225-glibc214.patch,
+  +files/proxychains-3.1_p20110225-sysconf.patch:
+  Apply fix for glibc-2.14 (bug #375065), add bdep on xz-utils, and use
+  autotools-utils eclass.
 
 *proxychains-3.1_p20110225 (11 Mar 2011)
 

diff --git a/net-misc/proxychains/Manifest b/net-misc/proxychains/Manifest
index e990cdd14da445edd53aa0ba9c2b1b87d1731012..802e05a31aeed70b6cddd02fc08e425baa3d778d 100644 (file)
--- a/net-misc/proxychains/Manifest
+++ b/net-misc/proxychains/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX proxychains-3.1_p20110225-glibc214.patch 3187 RMD160 8697adc22049f0b64541652f058ea563aa11a9ff SHA1 ab0302b8f9ea60e0017bbe2787ab4b279b2fc2d6 SHA256 88c8190de4aefe2e4605ca49eeaa5cab43a0d342569503fe5f85c3ba6dd472b6
+AUX proxychains-3.1_p20110225-sysconf.patch 330 RMD160 b50790c9a5aa017384b37cf7c3c226211951073b SHA1 fd78390fa3fdebf8de5744a0aa006129f2907c5b SHA256 4408b2495ee557d7d072c76549ba55fdd84ff47725f8200c85c486282df8d238
 DIST proxychains-3.1.tar.gz 327057 RMD160 3795ec1f0b33271a16d1a9769f94d85fe9f7f179 SHA1 3d4ab30c65d4dc21af9898464e5789a09194d04c SHA256 9a27657fe9f6e17de9e402ba5c60f9954e7e79fb270c1ef242770f3c01d8515a
 DIST proxychains-3.1_p20110225.tar.xz 178544 RMD160 0fe7ab67f09c4c43dde4e9617780f172b0e9477a SHA1 d9410d0b0a3f0a5fce770fe2c036530207c74f98 SHA256 b3b8f877be14b7bb0c71b298cd658d9937b91f2c31fece2576961fc6602e0f6d
 EBUILD proxychains-3.1.ebuild 930 RMD160 61487941d81232f9fe282a88ed94e35f5181e977 SHA1 9da9566e99ccd3b97659090791aa2c85d4dd7755 SHA256 88d9cb16175e54cbc0de25dcb51926d124a37a3715b2c97a31a0fac636056cad
-EBUILD proxychains-3.1_p20110225.ebuild 711 RMD160 325051e11946818a83a8fe48cec8177d88b1d1ca SHA1 26ba8d1d611d1b5bd20b6dfa83baeab023f53b19 SHA256 9f605f22ce6ca60913a3b19073c00debfddcf1f2f22982f38f12889b1dc4a712
-MISC ChangeLog 2351 RMD160 47c01c94ab74f6e7f265bd2d5f40c849a4fe7b5c SHA1 0f8d070b53c4ecc2d199741feaaba070c3123420 SHA256 659f55d906432c4c9201fdd84ef1c55d980b1442e80157657c9496c3fc9bbdb9
+EBUILD proxychains-3.1_p20110225.ebuild 804 RMD160 a8aeb64c0860f40816036ac74d5ebfd0f7c5317b SHA1 31e86bac3314d4d6a16694abf08609b146dd61e9 SHA256 852059d148354b0ea04e3241042fe2552e7f4cfe6eb967a3c21c6f64d6dc27c6
+MISC ChangeLog 2636 RMD160 b6571eb7164b644a5967629c96b5cb3a1f9331df SHA1 326a701cc047055942a1e42ea22051c9f15d14a8 SHA256 09bf42dd6c17e5c9b54fc2d3e6697c204cdb9bc014b21f1d5f9b5ca04494f5ca
 MISC metadata.xml 232 RMD160 9725fc18735b1d8d4079f25759ee0823a0c6795d SHA1 ec75efe30e67f74a4f315324afc75ed2a8d30bb4 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rRsACgkQfXuS5UK5QB1wPgP9Fek22gUmA8QHfaAH7wVQ2fQN
-BRIdMX+iHQqtNBEdt4ZHHTLBzBjMYVk6/2Wh4Yx4GLnHBv6dUHx/txC3YnGYM7cF
-lvtnJm1w/quKA6zXgOe7qsEIjbS8a0dlCkci5+HUnonWmuDtYjq0N+l/ycXz5xGI
-PgpncOss8ckva81r900=
-=USP8
+iQEcBAEBCgAGBQJOuNv8AAoJEEqz6FtPBkyj8lcH/iOj/vKnZHIuYC1Q/LJW9XDh
+bYjvhTyuDfc0Zj5x48MDuAVGBPFAASKeY3gn1SSxYmSJMWJ9cAyIAy8kGFi13x+C
+2z1x/IELb+MUsc8ryolchJ483EIucidx8+a7vynotgrPthPGEXYRwdiMYRStnRTD
+1SB5B4PRY9IGM3P6SjXCTqOkXLxE3/8WcQa/Qp8N6kGGASTbtdE8CSo9LySOdD8o
+WE0w6/HEb3Qe5kr0/YIdjOqy1uAzbfOT86xpapLizsHpKv4LvuBokO4ezMF9dx9v
+pKOVh78mm6U0QJYjFqhDx9HLWtBAuCWp8gSK9eUXBq8LRrYk3KUQz/wW8FHy/wE=
+=ial/
 -----END PGP SIGNATURE-----

diff --git a/net-misc/proxychains/files/proxychains-3.1_p20110225-glibc214.patch b/net-misc/proxychains/files/proxychains-3.1_p20110225-glibc214.patch
new file mode 100644 (file)
index 0000000..762f4e4
--- /dev/null
+++ b/net-misc/proxychains/files/proxychains-3.1_p20110225-glibc214.patch
@@ -0,0 +1,127 @@
+--- proxychains-3.1_p20110225.orig/proxychains/libproxychains.c
++++ proxychains-3.1_p20110225/proxychains/libproxychains.c
+@@ -261,124 +261,3 @@
+       *proxy_count=count;
+       proxychains_got_chain_data=1;
+ }
+-
+-
+-
+-int connect (int sock, const struct sockaddr *addr, unsigned int len)
+-{
+-      int socktype=0,optlen=0,flags=0,ret=0;
+-      char str[256];
+-      struct in_addr *p_addr_in;
+-      size_t i;
+-
+-      if(!init_l)
+-              init_lib();
+-      optlen=sizeof(socktype);
+-      getsockopt(sock,SOL_SOCKET,SO_TYPE,&socktype,&optlen);
+-      if (! (SOCKFAMILY(*addr)==AF_INET  && socktype==SOCK_STREAM))
+-              return true_connect(sock,addr,len);
+-
+-      p_addr_in = &((struct sockaddr_in *)addr)->sin_addr;
+-
+-      //PDEBUG("localnet: %s; ", inet_ntop(AF_INET,&in_addr_localnet, str, sizeof(str)));
+-      //PDEBUG("netmask: %s; " , inet_ntop(AF_INET, &in_addr_netmask, str, sizeof(str)));
+-      //PDEBUG("target: %s\n", inet_ntop(AF_INET, p_addr_in, str, sizeof(str)));
+-
+-      for (i = 0; i < num_localnet_addr; i++) {
+-              if ((localnet_addr[i].in_addr.s_addr & localnet_addr[i].netmask.s_addr)
+-                      == (p_addr_in->s_addr & localnet_addr[i].netmask.s_addr))
+-              {
+-                      PDEBUG("accessing localnet using true_connect\n");
+-                      return true_connect(sock,addr,len);
+-              }
+-      }
+-
+-      flags=fcntl(sock, F_GETFL, 0);
+-      if(flags & O_NONBLOCK)
+-      fcntl(sock, F_SETFL, !O_NONBLOCK);
+-      ret=connect_proxy_chain(
+-              sock,
+-              SOCKADDR(*addr),
+-              SOCKPORT(*addr),
+-              proxychains_pd,
+-              proxychains_proxy_count,
+-              proxychains_ct,
+-                proxychains_max_chain );
+-      fcntl(sock, F_SETFL, flags);
+-      if(ret!=SUCCESS)
+-      errno=ECONNREFUSED;
+-      return ret;
+-}
+-
+-struct hostent *gethostbyname(const char *name)
+-{
+-      PDEBUG("gethostbyname: %s\n",name);
+-      if(!init_l)
+-              init_lib();
+-      if(proxychains_resolver)
+-              return proxy_gethostbyname(name);
+-      else
+-              return true_gethostbyname(name);
+-                      
+-      return NULL;
+-}
+-int getaddrinfo(const char *node, const char *service,
+-              const struct addrinfo *hints,
+-              struct addrinfo **res)
+-{
+-      int ret = 0;
+-      PDEBUG("getaddrinfo: %s %s\n",node ,service);
+-      if(!init_l)
+-              init_lib();
+-      if(proxychains_resolver)
+-              ret = proxy_getaddrinfo(node, service, hints, res);
+-      else
+-              ret = true_getaddrinfo(node, service, hints, res);
+-                      
+-      return ret;
+-}
+-void freeaddrinfo(struct addrinfo *res)
+-{
+-      PDEBUG("freeaddrinfo %p \n",res);
+-      if(!init_l)
+-              init_lib();
+-      if(!proxychains_resolver)
+-              true_freeaddrinfo(res);
+-      else {
+-              free(res->ai_addr);
+-              free(res);
+-      }
+-      return;
+-}
+-
+-int getnameinfo (const struct sockaddr * sa,
+-                      socklen_t salen, char * host,
+-                      socklen_t hostlen, char * serv,
+-                      socklen_t servlen, unsigned int flags)
+-{
+-      int ret = 0;
+-      if(!init_l)
+-              init_lib();
+-      if(!proxychains_resolver) {
+-              ret = true_getnameinfo(sa,salen,host,hostlen,
+-                              serv,servlen,flags);
+-      } else {
+-              if(hostlen) 
+-                      strncpy(host, inet_ntoa(SOCKADDR_2(*sa)),hostlen);
+-              if(servlen) 
+-                      snprintf(serv, servlen,"%d",ntohs(SOCKPORT(*sa)));
+-      }
+-      PDEBUG("getnameinfo: %s %s\n", host, serv);
+-      return ret;
+-}
+-
+-struct hostent *gethostbyaddr (const void *addr, socklen_t len, int type)
+-{
+-      PDEBUG("TODO: gethostbyaddr hook\n"); 
+-      if(!init_l)
+-              init_lib();
+-      if(!proxychains_resolver)
+-              return true_gethostbyaddr(addr,len,type);
+-      return NULL;
+-}
+-      

diff --git a/net-misc/proxychains/files/proxychains-3.1_p20110225-sysconf.patch b/net-misc/proxychains/files/proxychains-3.1_p20110225-sysconf.patch
new file mode 100644 (file)
index 0000000..0db2e70
--- /dev/null
+++ b/net-misc/proxychains/files/proxychains-3.1_p20110225-sysconf.patch
@@ -0,0 +1,11 @@
+--- proxychains-3.1_p20110225/proxychains/Makefile.am.orig
++++ proxychains-3.1_p20110225/proxychains/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ EXTRA_DIST = proxychains.conf core.c core.h libproxychains.c 
+ 
+-sysconf_DATA=$(srcdir)/proxychains.conf
++sysconf_DATA=proxychains.conf
+ 
+ install-data-local:
+       $(mkinstalldirs) ${DESTDIR}${bindir}

diff --git a/net-misc/proxychains/proxychains-3.1_p20110225.ebuild b/net-misc/proxychains/proxychains-3.1_p20110225.ebuild
index d297a1f0cc81bd9542c5cb3e279059c9e76e65e4..7cee4ab95fb0f08d40aa1f8b1d58e7930b2e2cd9 100644 (file)
--- a/net-misc/proxychains/proxychains-3.1_p20110225.ebuild
+++ b/net-misc/proxychains/proxychains-3.1_p20110225.ebuild
@@ -1,25 +1,30 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/proxychains-3.1_p20110225.ebuild,v 1.1 2011/03/11 09:18:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/proxychains-3.1_p20110225.ebuild,v 1.2 2011/11/08 07:36:18 radhermit Exp $
 
 EAPI=4
 
+inherit autotools-utils
+
 DESCRIPTION="force any tcp connections to flow through a proxy (or proxy chain)"
 HOMEPAGE="http://proxychains.sourceforge.net/
        https://github.com/haad/proxychains/tree/proxychain_fixes"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
+SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="static-libs"
 
-DEPEND=""
+DEPEND="app-arch/xz-utils"
 RDEPEND="net-dns/bind-tools"
 
-src_configure() {
-       econf \
-               --disable-dependency-tracking \
-               --enable-shared \
-               $(use_enable static-libs static)
+PATCHES=(
+       "${FILESDIR}"/${P}-glibc214.patch
+       "${FILESDIR}"/${P}-sysconf.patch
+)
+
+src_prepare() {
+       autotools-utils_src_prepare
+       eautoreconf
 }