From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R3G4A-0007qI-Tn for garchives@archives.gentoo.org; Mon, 12 Sep 2011 23:37:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 934EC21C186; Mon, 12 Sep 2011 23:37:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 54DA521C186 for ; Mon, 12 Sep 2011 23:37:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A19811B4010 for ; Mon, 12 Sep 2011 23:37:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 07AA880042 for ; Mon, 12 Sep 2011 23:37:22 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <6f739bf06277a309cca8f6c2ac5fdf16e1d7bccb.blueness@gentoo> Subject: [gentoo-commits] dev/blueness:master commit in: net-misc/torsocks/, net-misc/torsocks/files/ X-VCS-Repository: dev/blueness X-VCS-Files: net-misc/torsocks/Manifest net-misc/torsocks/files/fix-LD_PRELOAD.patch net-misc/torsocks/files/remove-LD_PRELOAD.patch net-misc/torsocks/torsocks-1.1.ebuild X-VCS-Directories: net-misc/torsocks/ net-misc/torsocks/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 6f739bf06277a309cca8f6c2ac5fdf16e1d7bccb Date: Mon, 12 Sep 2011 23:37:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: ccf58a9ce8ef86eb354af0c3c2cc4566 commit: 6f739bf06277a309cca8f6c2ac5fdf16e1d7bccb Author: Anthony G. Basile gentoo org> AuthorDate: Mon Sep 12 23:37:13 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon Sep 12 23:37:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/blueness.git;a= =3Dcommit;h=3D6f739bf0 net-misc/torsocks: disambiguate build systems @LD_PRELOAD@ from env LD_PR= ELOAD (Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with= key 0xD0455535) --- net-misc/torsocks/Manifest | 10 +- net-misc/torsocks/files/fix-LD_PRELOAD.patch | 131 +++++++++++++++++= ++++++ net-misc/torsocks/files/remove-LD_PRELOAD.patch | 29 ----- net-misc/torsocks/torsocks-1.1.ebuild | 2 +- 4 files changed, 137 insertions(+), 35 deletions(-) diff --git a/net-misc/torsocks/Manifest b/net-misc/torsocks/Manifest index 1ba4ca9..0de6c3c 100644 --- a/net-misc/torsocks/Manifest +++ b/net-misc/torsocks/Manifest @@ -1,15 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 =20 -AUX remove-LD_PRELOAD.patch 735 RMD160 1c572ef1a13093b98d67dd14ac2ee59c8= 72282b0 SHA1 aea20c24ee9e78821b0207ef5a1e42726345901f SHA256 69a13799685a= 765662c00e8066041370e2428e1628b2fe7906bf7b4f09da78c5 +AUX fix-LD_PRELOAD.patch 4777 RMD160 0d972a92d4ad3b5324cbef2dc91e7df5973= fe0b0 SHA1 86aea26883c6d6dc25655f9c60e9b7189ea2fb99 SHA256 67b5da24843a48= 7b4802af17eaa80060be048cbd1b2b56b38c887f27d9e6daba DIST torsocks-1.1.tar.gz 674386 RMD160 90282cd84f8e86c55a38492621a4ba995= 90b4a88 SHA1 67a0ed1115a99a5f282157cda6a743f3f20f080d SHA256 09dac54c2bb4= e57cfdc449dc45b97be832910a4d81d5a2931543b469d97fdf01 -EBUILD torsocks-1.1.ebuild 968 RMD160 32e278694c8d3728b81f8fe67c004c4091= 5bd734 SHA1 d6899d84d7154ab9006007bb1b0fe6e1e4e83683 SHA256 f168f0633e74a= 4d59e6f5bf46d3ccd30195845fb3482f39f5ec943adddbcaa7e +EBUILD torsocks-1.1.ebuild 965 RMD160 0571428d3f9c204dac12c43c9fe86366e4= cdb49d SHA1 613e602909e69092dad8eb75db8865c8a2abf8fa SHA256 c9c79a9313390= 01df9db076ea44ac7ed5f216e42f984a85c1b4b0a2a9d4d194a MISC ChangeLog 271 RMD160 9a67e70eaf9cd70f9dcac680a3f05828f367c3d6 SHA1 = f91fec44b056a2458a98c5e8705703164fedc2e7 SHA256 747f8042745e3ad6470e6f46a= a3a45639d7c7609d607b2389bd317535ad2ff0c MISC metadata.xml 382 RMD160 0631dd80787ed0fb51d60cb725b0925247bc370d SH= A1 6a4acc9411c20ed2540054c755ec69923ffa7bcd SHA256 3cfd5b79381b053fbb2039= 1ed19f544411effaed42bf4875b036249b39f1eff2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iEYEAREIAAYFAk5ukKkACgkQl5yvQNBFVTXsHwCfY8EpsUA2BKIxyZROpgLYeDUv -DMcAnAzO5Vt2wsf/0D8aHJEwiRZ+LTvO -=3DrHK2 +iEYEAREIAAYFAk5ul6kACgkQl5yvQNBFVTUvAACfXEVdb2T/Alky14VN5fxxDMbN +qdQAn2+oHTQVlyHv77Bbfrn2m2HCzQgq +=3DbRaC -----END PGP SIGNATURE----- diff --git a/net-misc/torsocks/files/fix-LD_PRELOAD.patch b/net-misc/tors= ocks/files/fix-LD_PRELOAD.patch new file mode 100644 index 0000000..ba6440c --- /dev/null +++ b/net-misc/torsocks/files/fix-LD_PRELOAD.patch @@ -0,0 +1,131 @@ +diff -Naur torsocks-1.1.orig//configure.in torsocks-1.1/configure.in +--- torsocks-1.1.orig//configure.in 2010-12-11 11:28:08.000000000 -0500 ++++ torsocks-1.1/configure.in 2011-09-12 19:29:37.000000000 -0400 +@@ -568,12 +568,12 @@ + AC_MSG_CHECKING(if the linker accepts -single_module) + OLDLDFLAGS=3D"$LDFLAGS" + SHLIB_EXT=3D"so" +- LD_PRELOAD=3D"LD_PRELOAD" ++ LDPRELOAD=3D"LD_PRELOAD" + LDFLAGS=3D"$LDFLAGS -single_module" + AC_TRY_COMPILE(,, + [ + SHLIB_EXT=3D"dylib" +- LD_PRELOAD=3D"DYLD_INSERT_LIBRARIES" ++ LDPRELOAD=3D"DYLD_INSERT_LIBRARIES" + AC_MSG_RESULT(yes) + ], [ + LDFLAGS=3D"$OLDLDFLAGS" +@@ -584,12 +584,12 @@ + ;; + *) + SHLIB_EXT=3D"so" +- LD_PRELOAD=3D"LD_PRELOAD" ++ LDPRELOAD=3D"LD_PRELOAD" + ;; + esac +=20 + AC_SUBST(SHLIB_EXT) +-AC_SUBST(LD_PRELOAD) ++AC_SUBST(LDPRELOAD) +=20 +=20 +=20 +diff -Naur torsocks-1.1.orig//Makefile.in torsocks-1.1/Makefile.in +--- torsocks-1.1.orig//Makefile.in 2010-12-11 11:39:27.000000000 -0500 ++++ torsocks-1.1/Makefile.in 2011-09-12 19:30:40.000000000 -0400 +@@ -135,7 +135,7 @@ + INSTALL_STRIP_PROGRAM =3D @INSTALL_STRIP_PROGRAM@ + LD =3D @LD@ + LDFLAGS =3D @LDFLAGS@ +-LD_PRELOAD =3D @LD_PRELOAD@ ++LD_PRELOAD =3D @LDPRELOAD@ + LIBOBJS =3D @LIBOBJS@ + LIBS =3D @LIBS@ + LIBTOOL =3D @LIBTOOL@ +diff -Naur torsocks-1.1.orig//src/torsocks.in torsocks-1.1/src/torsocks.= in +--- torsocks-1.1.orig//src/torsocks.in 2010-12-11 11:28:08.000000000 -05= 00 ++++ torsocks-1.1/src/torsocks.in 2011-09-12 19:30:26.000000000 -0400 +@@ -30,7 +30,7 @@ + # + # @prefix@/bin/torsocks program [program arguments...] + # +-# This form sets the users @LD_PRELOAD@ environment variable so that to= rsocks(8) ++# This form sets the users @LDPRELOAD@ environment variable so that tor= socks(8) + # will be loaded to socksify the application then executes the specifie= d=20 + # program (with the provided arguments). The following simple example m= ight=20 + # be used to telnet to www.foo.org via a torsocks.conf(5) configured so= cks server: +@@ -38,7 +38,7 @@ + # @prefix@/bin/torsocks telnet www.foo.org + # + # The second form allows for torsocks(8) to be switched on and off for = a +-# session (that is, it adds and removes torsocks from the @LD_PRELOAD@ = environment ++# session (that is, it adds and removes torsocks from the @LDPRELOAD@ e= nvironment + # variable). This form must be _sourced_ into the user's existing sessi= on + # (and will only work with bourne shell users): + # +@@ -52,7 +52,7 @@ + # telnet www.foo.org + # source @prefix@/bin/torsocks off + # +-# The third form creates a new shell with @LD_PRELOAD@ set and is achie= ved ++# The third form creates a new shell with @LDPRELOAD@ set and is achiev= ed + # simply by running the script with no arguments=20 + #=20 + # @prefix@/bin/torsocks +@@ -75,12 +75,12 @@ +=20 + case "$1" in + on) +- if [ -z "$@LD_PRELOAD@" ] ++ if [ -z "$@LDPRELOAD@" ] + then +- export @LD_PRELOAD@=3D"${SHLIB}" ++ export @LDPRELOAD@=3D"${SHLIB}" + else +- echo $@LD_PRELOAD@ | grep -q "${SHLIB}" || \ +- export @LD_PRELOAD@=3D"${SHLIB} $@LD_PRELOAD@" ++ echo $@LDPRELOAD@ | grep -q "${SHLIB}" || \ ++ export @LDPRELOAD@=3D"${SHLIB} $@LDPRELOAD@" + fi + # FIXME: This env variable is only meaningful on Mac OSX, so it wou= ld be better + # not to set it at all on other platforms. +@@ -89,29 +89,29 @@ + off) + #replace '/' with '\/' in @prefix@ + # escprefix=3D`echo '@prefix@' |sed 's/\\//\\\\\//g'` +- # export @LD_PRELOAD@=3D`echo -n $@LD_PRELOAD@ | sed "s/$escprefix\= /lib\/torsocks\/libtorsocks.so \?//"` +- export @LD_PRELOAD@=3D`echo -n $@LD_PRELOAD@ | sed "s#@prefix@/lib/= torsocks/libtorsocks\.@SHLIB_EXT@ *##"` +- if [ -z "$@LD_PRELOAD@" ] ++ # export @LDPRELOAD@=3D`echo -n $@LDPRELOAD@ | sed "s/$escprefix\/l= ib\/torsocks\/libtorsocks.so \?//"` ++ export @LDPRELOAD@=3D`echo -n $@LDPRELOAD@ | sed "s#@prefix@/lib/to= rsocks/libtorsocks\.@SHLIB_EXT@ *##"` ++ if [ -z "$@LDPRELOAD@" ] + then +- unset @LD_PRELOAD@ ++ unset @LDPRELOAD@ + # FIXME: This env variable is only meaningful on Mac OSX, so it= would be better + # not to set it at all on other platforms. + unset DYLD_FORCE_FLAT_NAMESPACE=3D1 + fi + ;; + show|sh) +- echo "@LD_PRELOAD@=3D\"$@LD_PRELOAD@\"" ++ echo "@LDPRELOAD@=3D\"$@LDPRELOAD@\"" + ;; + -h|-?) + echo "$0: Please see torsocks(1) or read comment at top of $0" + ;; + *) +- if [ -z "$@LD_PRELOAD@" ] ++ if [ -z "$@LDPRELOAD@" ] + then +- export @LD_PRELOAD@=3D"${SHLIB}" ++ export @LDPRELOAD@=3D"${SHLIB}" + else +- echo $@LD_PRELOAD@ | grep -q "${SHLIB}" || \ +- export @LD_PRELOAD@=3D"${SHLIB} $@LD_PRELOAD@" ++ echo $@LDPRELOAD@ | grep -q "${SHLIB}" || \ ++ export @LDPRELOAD@=3D"${SHLIB} $@LDPRELOAD@" + fi + export DYLD_FORCE_FLAT_NAMESPACE=3D1 +=20 diff --git a/net-misc/torsocks/files/remove-LD_PRELOAD.patch b/net-misc/t= orsocks/files/remove-LD_PRELOAD.patch deleted file mode 100644 index 0d99ab8..0000000 --- a/net-misc/torsocks/files/remove-LD_PRELOAD.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur torsocks-1.1.orig//configure.in torsocks-1.1/configure.in ---- torsocks-1.1.orig//configure.in 2010-12-11 11:28:08.000000000 -0500 -+++ torsocks-1.1/configure.in 2011-09-12 18:47:59.000000000 -0400 -@@ -568,12 +568,10 @@ - AC_MSG_CHECKING(if the linker accepts -single_module) - OLDLDFLAGS=3D"$LDFLAGS" - SHLIB_EXT=3D"so" -- LD_PRELOAD=3D"LD_PRELOAD" - LDFLAGS=3D"$LDFLAGS -single_module" - AC_TRY_COMPILE(,, - [ - SHLIB_EXT=3D"dylib" -- LD_PRELOAD=3D"DYLD_INSERT_LIBRARIES" - AC_MSG_RESULT(yes) - ], [ - LDFLAGS=3D"$OLDLDFLAGS" -@@ -584,12 +582,10 @@ - ;; - *) - SHLIB_EXT=3D"so" -- LD_PRELOAD=3D"LD_PRELOAD" - ;; - esac -=20 - AC_SUBST(SHLIB_EXT) --AC_SUBST(LD_PRELOAD) -=20 -=20 -=20 diff --git a/net-misc/torsocks/torsocks-1.1.ebuild b/net-misc/torsocks/to= rsocks-1.1.ebuild index a6da0da..1d31774 100644 --- a/net-misc/torsocks/torsocks-1.1.ebuild +++ b/net-misc/torsocks/torsocks-1.1.ebuild @@ -20,7 +20,7 @@ DEPEND=3D"" RDEPEND=3D"${DEPEND}" =20 src_prepare() { - epatch "${FILESDIR}"/remove-LD_PRELOAD.patch + epatch "${FILESDIR}"/fix-LD_PRELOAD.patch eautoreconf } =20