* [gentoo-commits] dev/blueness:master commit in: net-misc/torsocks/, net-misc/torsocks/files/
@ 2011-09-12 22:59 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2011-09-12 22:59 UTC (permalink / raw
To: gentoo-commits
commit: 05ec2c4c2fa7c44b8335708f5b99852c3720caaf
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 12 22:59:33 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 22:59:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=05ec2c4c
net-misc/torsocks: initial commit
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 0xD0455535)
---
net-misc/torsocks/ChangeLog | 8 +++++
net-misc/torsocks/Manifest | 15 +++++++++
net-misc/torsocks/files/remove-LD_PRELOAD.patch | 29 +++++++++++++++++
net-misc/torsocks/metadata.xml | 12 +++++++
net-misc/torsocks/torsocks-1.1.ebuild | 38 +++++++++++++++++++++++
5 files changed, 102 insertions(+), 0 deletions(-)
diff --git a/net-misc/torsocks/ChangeLog b/net-misc/torsocks/ChangeLog
new file mode 100644
index 0000000..ca411aa
--- /dev/null
+++ b/net-misc/torsocks/ChangeLog
@@ -0,0 +1,8 @@
+
+
+*torsocks-1.1 (12 Sep 2011)
+
+ 12 Sep 2011; Anthony G. Basile <blueness@gentoo.org> +torsocks-1.1.ebuild,
+ +files/remove-LD_PRELOAD.patch, +metadata.xml:
+ Initial commit
+
diff --git a/net-misc/torsocks/Manifest b/net-misc/torsocks/Manifest
new file mode 100644
index 0000000..0d072d4
--- /dev/null
+++ b/net-misc/torsocks/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX remove-LD_PRELOAD.patch 735 RMD160 1c572ef1a13093b98d67dd14ac2ee59c872282b0 SHA1 aea20c24ee9e78821b0207ef5a1e42726345901f SHA256 69a13799685a765662c00e8066041370e2428e1628b2fe7906bf7b4f09da78c5
+DIST torsocks-1.1.tar.gz 674386 RMD160 90282cd84f8e86c55a38492621a4ba99590b4a88 SHA1 67a0ed1115a99a5f282157cda6a743f3f20f080d SHA256 09dac54c2bb4e57cfdc449dc45b97be832910a4d81d5a2931543b469d97fdf01
+EBUILD torsocks-1.1.ebuild 851 RMD160 47949f5a95c649ebde27d2262a6de76ab187c874 SHA1 501cec975064b95e4c994cd7410445ae63f7f942 SHA256 1f6170a6d291a15f7e54872b598187fc8d810e9bb1e5279d2624f84c431714d2
+MISC ChangeLog 175 RMD160 cf1b58e577a2252fdcaa4730971398f8618acd03 SHA1 0f1a5411a238f8df5a336e6f99802afc924f8222 SHA256 d5791b41b7c3aee2a166ca61952fb59f4f60b2ce69df67d822cb1b8144a50d62
+MISC metadata.xml 382 RMD160 0631dd80787ed0fb51d60cb725b0925247bc370d SHA1 6a4acc9411c20ed2540054c755ec69923ffa7bcd SHA256 3cfd5b79381b053fbb20391ed19f544411effaed42bf4875b036249b39f1eff2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk5ujtUACgkQl5yvQNBFVTWLsgCZAbbJz7yz/OFwzNXUThwEOdx/
+tqsAoKUIoxOdGKwcjBivSdBzEcrVwKEs
+=6yr6
+-----END PGP SIGNATURE-----
diff --git a/net-misc/torsocks/files/remove-LD_PRELOAD.patch b/net-misc/torsocks/files/remove-LD_PRELOAD.patch
new file mode 100644
index 0000000..0d99ab8
--- /dev/null
+++ b/net-misc/torsocks/files/remove-LD_PRELOAD.patch
@@ -0,0 +1,29 @@
+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="$LDFLAGS"
+ SHLIB_EXT="so"
+- LD_PRELOAD="LD_PRELOAD"
+ LDFLAGS="$LDFLAGS -single_module"
+ AC_TRY_COMPILE(,,
+ [
+ SHLIB_EXT="dylib"
+- LD_PRELOAD="DYLD_INSERT_LIBRARIES"
+ AC_MSG_RESULT(yes)
+ ], [
+ LDFLAGS="$OLDLDFLAGS"
+@@ -584,12 +582,10 @@
+ ;;
+ *)
+ SHLIB_EXT="so"
+- LD_PRELOAD="LD_PRELOAD"
+ ;;
+ esac
+
+ AC_SUBST(SHLIB_EXT)
+-AC_SUBST(LD_PRELOAD)
+
+
+
diff --git a/net-misc/torsocks/metadata.xml b/net-misc/torsocks/metadata.xml
new file mode 100644
index 0000000..f429301
--- /dev/null
+++ b/net-misc/torsocks/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+ <use>
+ <flag name='socksdns'>force dns lookups to use tcp</flag>
+ <flag name='tordns'>override name lookup calls to use SOCKS</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-misc/torsocks/torsocks-1.1.ebuild b/net-misc/torsocks/torsocks-1.1.ebuild
new file mode 100644
index 0000000..b754aba
--- /dev/null
+++ b/net-misc/torsocks/torsocks-1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit autotools
+
+DESCRIPTION="Use most socks-friendly applications with Tor."
+HOMEPAGE="http://code.google.com/p/torsocks"
+SRC_URI="http://torsocks.googlecode.com/files/torsocks-1.1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+socksdns static-libs +tordns"
+
+# We do not depend on tor which might be running on a different box
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/remove-LD_PRELOAD.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable socksdns) \
+ $(use_enable static-libs static) \
+ $(use_enable tordns)
+}
+
+pkg_postinst() {
+ if ! use socksdns || ! use tordns; then
+ ewarn "To use torsocks safely, you must enable both socksdns and tordns"
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: net-misc/torsocks/, net-misc/torsocks/files/
@ 2011-09-12 23:37 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2011-09-12 23:37 UTC (permalink / raw
To: gentoo-commits
commit: 6f739bf06277a309cca8f6c2ac5fdf16e1d7bccb
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 12 23:37:13 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 23:37:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=6f739bf0
net-misc/torsocks: disambiguate build systems @LD_PRELOAD@ from env LD_PRELOAD
(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
-AUX remove-LD_PRELOAD.patch 735 RMD160 1c572ef1a13093b98d67dd14ac2ee59c872282b0 SHA1 aea20c24ee9e78821b0207ef5a1e42726345901f SHA256 69a13799685a765662c00e8066041370e2428e1628b2fe7906bf7b4f09da78c5
+AUX fix-LD_PRELOAD.patch 4777 RMD160 0d972a92d4ad3b5324cbef2dc91e7df5973fe0b0 SHA1 86aea26883c6d6dc25655f9c60e9b7189ea2fb99 SHA256 67b5da24843a487b4802af17eaa80060be048cbd1b2b56b38c887f27d9e6daba
DIST torsocks-1.1.tar.gz 674386 RMD160 90282cd84f8e86c55a38492621a4ba99590b4a88 SHA1 67a0ed1115a99a5f282157cda6a743f3f20f080d SHA256 09dac54c2bb4e57cfdc449dc45b97be832910a4d81d5a2931543b469d97fdf01
-EBUILD torsocks-1.1.ebuild 968 RMD160 32e278694c8d3728b81f8fe67c004c40915bd734 SHA1 d6899d84d7154ab9006007bb1b0fe6e1e4e83683 SHA256 f168f0633e74a4d59e6f5bf46d3ccd30195845fb3482f39f5ec943adddbcaa7e
+EBUILD torsocks-1.1.ebuild 965 RMD160 0571428d3f9c204dac12c43c9fe86366e4cdb49d SHA1 613e602909e69092dad8eb75db8865c8a2abf8fa SHA256 c9c79a931339001df9db076ea44ac7ed5f216e42f984a85c1b4b0a2a9d4d194a
MISC ChangeLog 271 RMD160 9a67e70eaf9cd70f9dcac680a3f05828f367c3d6 SHA1 f91fec44b056a2458a98c5e8705703164fedc2e7 SHA256 747f8042745e3ad6470e6f46aa3a45639d7c7609d607b2389bd317535ad2ff0c
MISC metadata.xml 382 RMD160 0631dd80787ed0fb51d60cb725b0925247bc370d SHA1 6a4acc9411c20ed2540054c755ec69923ffa7bcd SHA256 3cfd5b79381b053fbb20391ed19f544411effaed42bf4875b036249b39f1eff2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEAREIAAYFAk5ukKkACgkQl5yvQNBFVTXsHwCfY8EpsUA2BKIxyZROpgLYeDUv
-DMcAnAzO5Vt2wsf/0D8aHJEwiRZ+LTvO
-=rHK2
+iEYEAREIAAYFAk5ul6kACgkQl5yvQNBFVTUvAACfXEVdb2T/Alky14VN5fxxDMbN
+qdQAn2+oHTQVlyHv77Bbfrn2m2HCzQgq
+=bRaC
-----END PGP SIGNATURE-----
diff --git a/net-misc/torsocks/files/fix-LD_PRELOAD.patch b/net-misc/torsocks/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="$LDFLAGS"
+ SHLIB_EXT="so"
+- LD_PRELOAD="LD_PRELOAD"
++ LDPRELOAD="LD_PRELOAD"
+ LDFLAGS="$LDFLAGS -single_module"
+ AC_TRY_COMPILE(,,
+ [
+ SHLIB_EXT="dylib"
+- LD_PRELOAD="DYLD_INSERT_LIBRARIES"
++ LDPRELOAD="DYLD_INSERT_LIBRARIES"
+ AC_MSG_RESULT(yes)
+ ], [
+ LDFLAGS="$OLDLDFLAGS"
+@@ -584,12 +584,12 @@
+ ;;
+ *)
+ SHLIB_EXT="so"
+- LD_PRELOAD="LD_PRELOAD"
++ LDPRELOAD="LD_PRELOAD"
+ ;;
+ esac
+
+ AC_SUBST(SHLIB_EXT)
+-AC_SUBST(LD_PRELOAD)
++AC_SUBST(LDPRELOAD)
+
+
+
+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 = @INSTALL_STRIP_PROGRAM@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+-LD_PRELOAD = @LD_PRELOAD@
++LD_PRELOAD = @LDPRELOAD@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @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 -0500
++++ 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 torsocks(8)
++# This form sets the users @LDPRELOAD@ environment variable so that torsocks(8)
+ # will be loaded to socksify the application then executes the specified
+ # program (with the provided arguments). The following simple example might
+ # be used to telnet to www.foo.org via a torsocks.conf(5) configured socks 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@ environment
+ # variable). This form must be _sourced_ into the user's existing session
+ # (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 achieved
++# The third form creates a new shell with @LDPRELOAD@ set and is achieved
+ # simply by running the script with no arguments
+ #
+ # @prefix@/bin/torsocks
+@@ -75,12 +75,12 @@
+
+ case "$1" in
+ on)
+- if [ -z "$@LD_PRELOAD@" ]
++ if [ -z "$@LDPRELOAD@" ]
+ then
+- export @LD_PRELOAD@="${SHLIB}"
++ export @LDPRELOAD@="${SHLIB}"
+ else
+- echo $@LD_PRELOAD@ | grep -q "${SHLIB}" || \
+- export @LD_PRELOAD@="${SHLIB} $@LD_PRELOAD@"
++ echo $@LDPRELOAD@ | grep -q "${SHLIB}" || \
++ export @LDPRELOAD@="${SHLIB} $@LDPRELOAD@"
+ fi
+ # FIXME: This env variable is only meaningful on Mac OSX, so it would be better
+ # not to set it at all on other platforms.
+@@ -89,29 +89,29 @@
+ off)
+ #replace '/' with '\/' in @prefix@
+ # escprefix=`echo '@prefix@' |sed 's/\\//\\\\\//g'`
+- # export @LD_PRELOAD@=`echo -n $@LD_PRELOAD@ | sed "s/$escprefix\/lib\/torsocks\/libtorsocks.so \?//"`
+- export @LD_PRELOAD@=`echo -n $@LD_PRELOAD@ | sed "s#@prefix@/lib/torsocks/libtorsocks\.@SHLIB_EXT@ *##"`
+- if [ -z "$@LD_PRELOAD@" ]
++ # export @LDPRELOAD@=`echo -n $@LDPRELOAD@ | sed "s/$escprefix\/lib\/torsocks\/libtorsocks.so \?//"`
++ export @LDPRELOAD@=`echo -n $@LDPRELOAD@ | sed "s#@prefix@/lib/torsocks/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=1
+ fi
+ ;;
+ show|sh)
+- echo "@LD_PRELOAD@=\"$@LD_PRELOAD@\""
++ echo "@LDPRELOAD@=\"$@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@="${SHLIB}"
++ export @LDPRELOAD@="${SHLIB}"
+ else
+- echo $@LD_PRELOAD@ | grep -q "${SHLIB}" || \
+- export @LD_PRELOAD@="${SHLIB} $@LD_PRELOAD@"
++ echo $@LDPRELOAD@ | grep -q "${SHLIB}" || \
++ export @LDPRELOAD@="${SHLIB} $@LDPRELOAD@"
+ fi
+ export DYLD_FORCE_FLAT_NAMESPACE=1
+
diff --git a/net-misc/torsocks/files/remove-LD_PRELOAD.patch b/net-misc/torsocks/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="$LDFLAGS"
- SHLIB_EXT="so"
-- LD_PRELOAD="LD_PRELOAD"
- LDFLAGS="$LDFLAGS -single_module"
- AC_TRY_COMPILE(,,
- [
- SHLIB_EXT="dylib"
-- LD_PRELOAD="DYLD_INSERT_LIBRARIES"
- AC_MSG_RESULT(yes)
- ], [
- LDFLAGS="$OLDLDFLAGS"
-@@ -584,12 +582,10 @@
- ;;
- *)
- SHLIB_EXT="so"
-- LD_PRELOAD="LD_PRELOAD"
- ;;
- esac
-
- AC_SUBST(SHLIB_EXT)
--AC_SUBST(LD_PRELOAD)
-
-
-
diff --git a/net-misc/torsocks/torsocks-1.1.ebuild b/net-misc/torsocks/torsocks-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=""
RDEPEND="${DEPEND}"
src_prepare() {
- epatch "${FILESDIR}"/remove-LD_PRELOAD.patch
+ epatch "${FILESDIR}"/fix-LD_PRELOAD.patch
eautoreconf
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: net-misc/torsocks/, net-misc/torsocks/files/
@ 2011-09-13 16:49 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2011-09-13 16:49 UTC (permalink / raw
To: gentoo-commits
commit: 4dd303508ed16ce62b511cc444ab55301ae9c85c
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 16:49:02 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 16:49:02 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=4dd30350
net-misc/torsocks: bump to self made tarball with lots of fixes
---
net-misc/torsocks/Manifest | 17 +--
net-misc/torsocks/files/fix-LD_PRELOAD.patch | 131 --------------------
net-misc/torsocks/metadata.xml | 4 -
.../{torsocks-1.1.ebuild => torsocks-1.1a.ebuild} | 18 +--
4 files changed, 8 insertions(+), 162 deletions(-)
diff --git a/net-misc/torsocks/Manifest b/net-misc/torsocks/Manifest
index 0de6c3c..a2c3e00 100644
--- a/net-misc/torsocks/Manifest
+++ b/net-misc/torsocks/Manifest
@@ -1,15 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX fix-LD_PRELOAD.patch 4777 RMD160 0d972a92d4ad3b5324cbef2dc91e7df5973fe0b0 SHA1 86aea26883c6d6dc25655f9c60e9b7189ea2fb99 SHA256 67b5da24843a487b4802af17eaa80060be048cbd1b2b56b38c887f27d9e6daba
-DIST torsocks-1.1.tar.gz 674386 RMD160 90282cd84f8e86c55a38492621a4ba99590b4a88 SHA1 67a0ed1115a99a5f282157cda6a743f3f20f080d SHA256 09dac54c2bb4e57cfdc449dc45b97be832910a4d81d5a2931543b469d97fdf01
-EBUILD torsocks-1.1.ebuild 965 RMD160 0571428d3f9c204dac12c43c9fe86366e4cdb49d SHA1 613e602909e69092dad8eb75db8865c8a2abf8fa SHA256 c9c79a931339001df9db076ea44ac7ed5f216e42f984a85c1b4b0a2a9d4d194a
+DIST torsocks-1.1a.tar.gz 375896 RMD160 ace896fad0dfccb18259cda03709e1bc7bf6ebe3 SHA1 7889bb0680d911689d1c280ec41ae6918b9241cb SHA256 86cdf9eb88aff7a2fe9ff327aaf5b0663448c0a2104901cf87e6a39da897420f
+EBUILD torsocks-1.1a.ebuild 818 RMD160 d6ccd809c7d949145500a7a178099ff826db97f0 SHA1 af747e05a6e979309c451c2ae6cbd6f28b7dff16 SHA256 f62e90994aeb73d4bafd549aad77a399f0be248050e09e71dc44ab42bcd2707e
MISC ChangeLog 271 RMD160 9a67e70eaf9cd70f9dcac680a3f05828f367c3d6 SHA1 f91fec44b056a2458a98c5e8705703164fedc2e7 SHA256 747f8042745e3ad6470e6f46aa3a45639d7c7609d607b2389bd317535ad2ff0c
-MISC metadata.xml 382 RMD160 0631dd80787ed0fb51d60cb725b0925247bc370d SHA1 6a4acc9411c20ed2540054c755ec69923ffa7bcd SHA256 3cfd5b79381b053fbb20391ed19f544411effaed42bf4875b036249b39f1eff2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk5ul6kACgkQl5yvQNBFVTUvAACfXEVdb2T/Alky14VN5fxxDMbN
-qdQAn2+oHTQVlyHv77Bbfrn2m2HCzQgq
-=bRaC
------END PGP SIGNATURE-----
+MISC metadata.xml 238 RMD160 6401efde1642c40e91d5a41a966b9dbff0512eab SHA1 9751c07b46aec3d4f96133758cdd23a3e2ca2835 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f
diff --git a/net-misc/torsocks/files/fix-LD_PRELOAD.patch b/net-misc/torsocks/files/fix-LD_PRELOAD.patch
deleted file mode 100644
index ba6440c..0000000
--- a/net-misc/torsocks/files/fix-LD_PRELOAD.patch
+++ /dev/null
@@ -1,131 +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 19:29:37.000000000 -0400
-@@ -568,12 +568,12 @@
- AC_MSG_CHECKING(if the linker accepts -single_module)
- OLDLDFLAGS="$LDFLAGS"
- SHLIB_EXT="so"
-- LD_PRELOAD="LD_PRELOAD"
-+ LDPRELOAD="LD_PRELOAD"
- LDFLAGS="$LDFLAGS -single_module"
- AC_TRY_COMPILE(,,
- [
- SHLIB_EXT="dylib"
-- LD_PRELOAD="DYLD_INSERT_LIBRARIES"
-+ LDPRELOAD="DYLD_INSERT_LIBRARIES"
- AC_MSG_RESULT(yes)
- ], [
- LDFLAGS="$OLDLDFLAGS"
-@@ -584,12 +584,12 @@
- ;;
- *)
- SHLIB_EXT="so"
-- LD_PRELOAD="LD_PRELOAD"
-+ LDPRELOAD="LD_PRELOAD"
- ;;
- esac
-
- AC_SUBST(SHLIB_EXT)
--AC_SUBST(LD_PRELOAD)
-+AC_SUBST(LDPRELOAD)
-
-
-
-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 = @INSTALL_STRIP_PROGRAM@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
--LD_PRELOAD = @LD_PRELOAD@
-+LD_PRELOAD = @LDPRELOAD@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @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 -0500
-+++ 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 torsocks(8)
-+# This form sets the users @LDPRELOAD@ environment variable so that torsocks(8)
- # will be loaded to socksify the application then executes the specified
- # program (with the provided arguments). The following simple example might
- # be used to telnet to www.foo.org via a torsocks.conf(5) configured socks 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@ environment
- # variable). This form must be _sourced_ into the user's existing session
- # (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 achieved
-+# The third form creates a new shell with @LDPRELOAD@ set and is achieved
- # simply by running the script with no arguments
- #
- # @prefix@/bin/torsocks
-@@ -75,12 +75,12 @@
-
- case "$1" in
- on)
-- if [ -z "$@LD_PRELOAD@" ]
-+ if [ -z "$@LDPRELOAD@" ]
- then
-- export @LD_PRELOAD@="${SHLIB}"
-+ export @LDPRELOAD@="${SHLIB}"
- else
-- echo $@LD_PRELOAD@ | grep -q "${SHLIB}" || \
-- export @LD_PRELOAD@="${SHLIB} $@LD_PRELOAD@"
-+ echo $@LDPRELOAD@ | grep -q "${SHLIB}" || \
-+ export @LDPRELOAD@="${SHLIB} $@LDPRELOAD@"
- fi
- # FIXME: This env variable is only meaningful on Mac OSX, so it would be better
- # not to set it at all on other platforms.
-@@ -89,29 +89,29 @@
- off)
- #replace '/' with '\/' in @prefix@
- # escprefix=`echo '@prefix@' |sed 's/\\//\\\\\//g'`
-- # export @LD_PRELOAD@=`echo -n $@LD_PRELOAD@ | sed "s/$escprefix\/lib\/torsocks\/libtorsocks.so \?//"`
-- export @LD_PRELOAD@=`echo -n $@LD_PRELOAD@ | sed "s#@prefix@/lib/torsocks/libtorsocks\.@SHLIB_EXT@ *##"`
-- if [ -z "$@LD_PRELOAD@" ]
-+ # export @LDPRELOAD@=`echo -n $@LDPRELOAD@ | sed "s/$escprefix\/lib\/torsocks\/libtorsocks.so \?//"`
-+ export @LDPRELOAD@=`echo -n $@LDPRELOAD@ | sed "s#@prefix@/lib/torsocks/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=1
- fi
- ;;
- show|sh)
-- echo "@LD_PRELOAD@=\"$@LD_PRELOAD@\""
-+ echo "@LDPRELOAD@=\"$@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@="${SHLIB}"
-+ export @LDPRELOAD@="${SHLIB}"
- else
-- echo $@LD_PRELOAD@ | grep -q "${SHLIB}" || \
-- export @LD_PRELOAD@="${SHLIB} $@LD_PRELOAD@"
-+ echo $@LDPRELOAD@ | grep -q "${SHLIB}" || \
-+ export @LDPRELOAD@="${SHLIB} $@LDPRELOAD@"
- fi
- export DYLD_FORCE_FLAT_NAMESPACE=1
-
diff --git a/net-misc/torsocks/metadata.xml b/net-misc/torsocks/metadata.xml
index f429301..1e75873 100644
--- a/net-misc/torsocks/metadata.xml
+++ b/net-misc/torsocks/metadata.xml
@@ -5,8 +5,4 @@
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
- <use>
- <flag name='socksdns'>force dns lookups to use tcp</flag>
- <flag name='tordns'>override name lookup calls to use SOCKS</flag>
- </use>
</pkgmetadata>
diff --git a/net-misc/torsocks/torsocks-1.1.ebuild b/net-misc/torsocks/torsocks-1.1a.ebuild
similarity index 65%
rename from net-misc/torsocks/torsocks-1.1.ebuild
rename to net-misc/torsocks/torsocks-1.1a.ebuild
index 1d31774..9eb4a39 100644
--- a/net-misc/torsocks/torsocks-1.1.ebuild
+++ b/net-misc/torsocks/torsocks-1.1a.ebuild
@@ -4,38 +4,30 @@
EAPI=4
-inherit autotools
+inherit autotools multilib
DESCRIPTION="Use most socks-friendly applications with Tor."
HOMEPAGE="http://code.google.com/p/torsocks"
-SRC_URI="http://torsocks.googlecode.com/files/torsocks-1.1.tar.gz"
+SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+socksdns static-libs +tordns"
+IUSE="static-libs"
# We do not depend on tor which might be running on a different box
DEPEND=""
RDEPEND="${DEPEND}"
-src_prepare() {
- epatch "${FILESDIR}"/fix-LD_PRELOAD.patch
- eautoreconf
-}
-
src_configure() {
- econf \
- $(use_enable socksdns) \
- $(use_enable static-libs static) \
- $(use_enable tordns)
+ econf $(use_enable static-libs static)
}
src_install() {
emake DESTDIR="${D}" install
#Remove libtool .la files
- cd "${D}"/usr/lib/torsocks
+ cd "${D}"/usr/$(get_libdir)/torsocks
rm -f *.la
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-13 16:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-12 23:37 [gentoo-commits] dev/blueness:master commit in: net-misc/torsocks/, net-misc/torsocks/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2011-09-13 16:49 Anthony G. Basile
2011-09-12 22:59 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox