Merge branch 'master' of gnunet.org:youbroketheinternet-overlay

8 files changed, 309 insertions, 0 deletions

diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest
new file mode 100644
index 0000000..5a0b5b3
--- /dev/null
+++ b/net-proxy/torsocks/Manifest
@@ -0,0 +1,3 @@
+DIST torsocks-1.2.tar.gz 456453 SHA256 bea57d3624d723724fd1e260f0e6b2a354c0da742c023aa994c7692270d111d4 SHA512 c48cf466c1d4f6204c90ccb5f741d14304b24651d18d080a73952b9a06bbe146e3f6e6c4343ed06ed7a73714d86561cde3eba369e17fc4e155f3553a8d0f3890 WHIRLPOOL af892c2a6f8070308f6867154c50ee8ce6fd20c761dbd6466ea1ae3b46730452ce0757e9de8bf698f8bd455649f3f76a4e9a0bd883408f464c619c1d41e937cf
+DIST torsocks-2.1.0.tar.gz 106339 SHA256 a72c3ea757f5fe81d1ab91e0d5f0d83f195e235aae66d4df2f88a20db7028104 SHA512 5bdec6fd6c2d99effb73e418acd37ee135b3c912fad7811bfc8c724282370beea23149c6e94b995cfed0e61be43e63ac11d8c6ef420ba0137a19b96d8ac370e5 WHIRLPOOL 4511c9bff51ec25efb9b6f211d4b37931ba9c23ad89b1b272adf6b60351308e59a5e3d5157ba4adfab9e085deba435a9a1a8b4c69ec98514069c42561799c25c
+DIST torsocks-2.2.0.tar.gz 115269 SHA256 36216a1e30f47fa0e5be84761e0d72133196c8a042716017da56e9439338c87d SHA512 903d11d58ece76eaf75ff8fc11a27e4a29f94be530f2d77d1a6f0982d556a4b9c78677a43eed88f2451054d0e985672900ecf73b360fa09e80195c3b9006622b WHIRLPOOL 3ce3ec9807a9b0bb55572f71541b0ba918223e3037914ed070cd97927446bd0b8666a70b568ebd5d7a5d310cd3c6fd4103f1ae8e616cc35e8a6a92d4a6b9051e
diff --git a/net-proxy/torsocks/files/fix-docdir.patch b/net-proxy/torsocks/files/fix-docdir.patch
new file mode 100644
index 0000000..899c15b
--- /dev/null
+++ b/net-proxy/torsocks/files/fix-docdir.patch
@@ -0,0 +1,24 @@
+diff -Naur torsocks-1.2.orig/doc/Makefile.am torsocks-1.2/doc/Makefile.am
+--- torsocks-1.2.orig/doc/Makefile.am   2011-10-26 14:30:26.000000000 -0400
++++ torsocks-1.2/doc/Makefile.am        2011-12-26 20:05:40.000000000 -0500
+@@ -7,8 +7,6 @@
+ # Install man pages
+ dist_man_MANS = torsocks.1 torsocks.8 usewithtor.1 torsocks.conf.5
+ 
+-dist_data_DATA = socks/SOCKS5 socks/SOCKS4.protocol socks/socks-extensions.txt \
+-                 patches/compilewarnings.patch patches/conffile.patch patches/getaddrbyhost.patch \
+-                 patches/getpeername.patch patches/infiniteloop.patch patches/localaddresses.patch \
+-                 patches/README patches/README.TORDNS patches/tordns.patch notes/DEBUG
++dist_doc_DATA =  socks/SOCKS5 socks/SOCKS4.protocol socks/socks-extensions.txt \
++                 notes/DEBUG
+ 
+diff -Naur torsocks-1.2.orig/test/Makefile.am torsocks-1.2/test/Makefile.am
+--- torsocks-1.2.orig/test/Makefile.am  2011-10-26 14:21:57.000000000 -0400
++++ torsocks-1.2/test/Makefile.am       2011-12-26 20:04:34.000000000 -0500
+@@ -4,4 +4,4 @@
+ test_torsocks_LDFLAGS= $(TESTLDFLAGS)
+ CLEANFILES= test_torsocks
+ 
+-dist_data_DATA = run_tests.sh expectedresults.txt
+\ No newline at end of file
++dist_doc_DATA = run_tests.sh expectedresults.txt
diff --git a/net-proxy/torsocks/files/suppress-warning-msgs.patch b/net-proxy/torsocks/files/suppress-warning-msgs.patch
new file mode 100644
index 0000000..7470b9f
--- /dev/null
+++ b/net-proxy/torsocks/files/suppress-warning-msgs.patch
@@ -0,0 +1,15 @@
+--- torsocks-1.2.orig/src/torsocks.c    2011-10-25 17:49:50.000000000 -0400
++++ torsocks-1.2/src/torsocks.c 2012-02-21 11:09:20.000000000 -0500
+@@ -124,9 +124,9 @@
+ #define LOAD_ERROR(s,l) { \
+     const char *error; \
+     error = dlerror(); \
+-    show_msg(l, "The symbol %s() was not found in any shared " \
+-                     "library. The error reported was: %s!\n", s, \
+-                     (error)?error:"not found"); \
++    if (error) \
++        show_msg(l, "The symbol %s() was not found in any shared " \
++            "library. The error reported was: %s!\n", s, error); \
+     dlerror(); \
+     }
+     pthread_mutex_lock(&torsocks_init_mutex);
diff --git a/net-proxy/torsocks/files/torsocks-2.1.0-musl.patch b/net-proxy/torsocks/files/torsocks-2.1.0-musl.patch
new file mode 100644
index 0000000..c11cf69
--- /dev/null
+++ b/net-proxy/torsocks/files/torsocks-2.1.0-musl.patch
@@ -0,0 +1,121 @@
+From 3e793e9eac05ad926cc016da5129e95986d105f2 Mon Sep 17 00:00:00 2001
+From: David Goulet <dgoulet@ev0ke.net>
+Date: Mon, 13 Jun 2016 14:39:53 -0400
+Subject: [PATCH] Add support for musl-libc
+
+Musl library does not have a specific define so use __linux__ instead.
+
+Signed-off-by: David Goulet <dgoulet@ev0ke.net>
+---
+ src/common/compat.c | 5 +++--
+ src/common/compat.h | 5 +++--
+ src/common/ref.h    | 5 +++--
+ src/lib/torsocks.h  | 9 +++++----
+ 4 files changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/src/common/compat.c b/src/common/compat.c
+index a861b3d..323f2ed 100644
+--- a/src/common/compat.c
++++ b/src/common/compat.c
+@@ -19,7 +19,8 @@
+ 
+ #include "compat.h"
+ 
+-#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
++#if (defined(__linux__) || defined(__GLIBC__) || defined(__FreeBSD__) || \
++               defined(__darwin__) || defined(__NetBSD__))
+ 
+ /*
+  * Initialize a pthread mutex. This never fails.
+@@ -96,4 +97,4 @@ void tsocks_once(tsocks_once_t *o, void (*init_routine)(void))
+        tsocks_mutex_unlock(&o->mutex);
+ }
+ 
+-#endif /* __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */
++#endif /* __linux__, __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */
+diff --git a/src/common/compat.h b/src/common/compat.h
+index ce47129..6c8ce32 100644
+--- a/src/common/compat.h
++++ b/src/common/compat.h
+@@ -22,7 +22,8 @@
+ #define __darwin__     1
+ #endif
+ 
+-#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
++#if (defined(__linux__) || defined(__GLIBC__) || defined(__FreeBSD__) || \
++               defined(__darwin__) || defined(__NetBSD__))
+ 
+ #define RTLD_NEXT      ((void *) -1)
+ 
+@@ -55,7 +56,7 @@ void tsocks_once(tsocks_once_t *o, void (*init_routine)(void));
+ 
+ #else
+ #error "OS not supported."
+-#endif /* __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */
++#endif /* __linux__, __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */
+ 
+ #if defined(__linux__)
+ #include <unistd.h>
+diff --git a/src/common/ref.h b/src/common/ref.h
+index 88aec2e..d9b9df8 100644
+--- a/src/common/ref.h
++++ b/src/common/ref.h
+@@ -26,7 +26,8 @@ struct ref {
+        long count;
+ };
+ 
+-#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
++#if (defined(__linux__) || defined(__GLIBC__) || defined(__FreeBSD__) || \
++               defined(__darwin__) || defined(__NetBSD__))
+ 
+ /*
+  * Get a reference by incrementing the refcount.
+@@ -57,6 +58,6 @@ static inline void ref_put(struct ref *r,
+ 
+ #else
+ #error "OS not supported"
+-#endif /* __GLIBC__, __FreeBSD__, __darwin__ */
++#endif /* __linux__, __GLIBC__, __FreeBSD__, __darwin__, __NetBSD__ */
+ 
+ #endif /* TORSOCKS_REF_H */
+diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h
+index 076f3a5..0eeef2a 100644
+--- a/src/lib/torsocks.h
++++ b/src/lib/torsocks.h
+@@ -33,7 +33,8 @@
+ #define TSOCKS_DECL(name, type, sig) \
+        extern type tsocks_##name(sig);
+ 
+-#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
++#if (defined(__linux__) || defined(__GLIBC__) || defined(__FreeBSD__) || \
++               defined(__darwin__) || defined(__NetBSD__))
+ 
+ /* connect(2) */
+ #include <sys/types.h>
+@@ -207,7 +208,7 @@ struct hostent **result, int *h_errnop
+ 
+ #else
+ #error "OS not supported."
+-#endif /* __GLIBC__ , __FreeBSD__, __darwin__, __NetBSD__ */
++#endif /* __linux__, __GLIBC__ , __FreeBSD__, __darwin__, __NetBSD__ */
+ 
+ #if (defined(__linux__))
+ 
+@@ -241,7 +242,7 @@ struct hostent **result, int *h_errnop
+ 
+ #endif /* __FreeBSD__, __darwin__, __NetBSD__ */
+ 
+-#if defined(__GLIBC__) && defined(__FreeBSD_kernel__)
++#if (defined(__linux__) || defined(__GLIBC__)) && defined(__FreeBSD_kernel__)
+ 
+ /* syscall(2) */
+ #define LIBC_SYSCALL_NAME syscall
+@@ -250,7 +251,7 @@ struct hostent **result, int *h_errnop
+ #define LIBC_SYSCALL_SIG long int number, ...
+ #define LIBC_SYSCALL_ARGS number
+ 
+-#endif /* __GLIBC__ && __FreeBSD_kernel__ */
++#endif /* (__linux__ || __GLIBC__) && __FreeBSD_kernel__ */
+ 
+ /* __syscall(2) */
+ #if defined(__FreeBSD__)
diff --git a/net-proxy/torsocks/metadata.xml b/net-proxy/torsocks/metadata.xml
new file mode 100644
index 0000000..a68cbcd
--- /dev/null
+++ b/net-proxy/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 type="person">
+                <email>blueness@gentoo.org</email>
+                <name>Anthony G. Basile</name>
+        </maintainer>
+        <upstream>
+                <remote-id type="google-code">torsocks</remote-id>
+                <remote-id type="github">dgoulet/torsocks</remote-id>
+        </upstream>
+</pkgmetadata>
diff --git a/net-proxy/torsocks/torsocks-1.2-r2.ebuild b/net-proxy/torsocks/torsocks-1.2-r2.ebuild
new file mode 100644
index 0000000..e506014
--- /dev/null
+++ b/net-proxy/torsocks/torsocks-1.2-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools eutils multilib
+
+DESCRIPTION="Use most socks-friendly applications with Tor"
+HOMEPAGE="https://code.google.com/p/torsocks"
+SRC_URI="https://${PN}.googlecode.com/files/${PN}-1.2.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static-libs"
+
+# We do not depend on tor which might be running on a different box
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+        epatch "${FILESDIR}"/suppress-warning-msgs.patch
+        epatch "${FILESDIR}"/fix-docdir.patch
+        eautoreconf
+}
+
+src_configure() {
+        econf --docdir=/usr/share/doc/${PF} \
+                $(use_enable static-libs static)
+}
+
+src_install() {
+        emake DESTDIR="${D}" install
+
+        dodoc README TODO INSTALL ChangeLog
+
+        #Remove libtool .la files
+        cd "${D}"/usr/$(get_libdir)/torsocks
+        rm -f *.la
+}
diff --git a/net-proxy/torsocks/torsocks-2.1.0-r1.ebuild b/net-proxy/torsocks/torsocks-2.1.0-r1.ebuild
new file mode 100644
index 0000000..b389659
--- /dev/null
+++ b/net-proxy/torsocks/torsocks-2.1.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools versionator
+
+MY_PV="$(replace_version_separator 3 -)"
+MY_PF="${PN}-${MY_PV}"
+S=${WORKDIR}/${MY_PF}
+
+DESCRIPTION="Use most socks-friendly applications with Tor"
+HOMEPAGE="https://github.com/dgoulet/torsocks"
+SRC_URI="https://github.com/dgoulet/torsocks/archive/v${MY_PV}.tar.gz -> ${MY_PF}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static-libs"
+
+# We do not depend on tor which might be running on a different box
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-musl.patch )
+DOCS=( ChangeLog README.md TODO doc/notes/DEBUG doc/socks/{SOCKS5,socks-extensions.txt} )
+
+src_prepare() {
+        sed -i -e "/dist_doc_DATA/s/^/#/" Makefile.am doc/Makefile.am || die
+
+        # Disable tests requiring network access.
+        sed -i -e '/^\.\/test_dns$/d' tests/test_list || \
+                die "failed to disable network tests"
+
+        default
+        eautoreconf
+}
+
+src_configure() {
+        econf $(use_enable static-libs static)
+}
+
+src_install() {
+        default
+
+        # Remove libtool .la files
+        find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-proxy/torsocks/torsocks-2.2.0.ebuild b/net-proxy/torsocks/torsocks-2.2.0.ebuild
new file mode 100644
index 0000000..1f850ec
--- /dev/null
+++ b/net-proxy/torsocks/torsocks-2.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools versionator
+
+MY_PV="$(replace_version_separator 3 -)"
+MY_PF="${PN}-${MY_PV}"
+S=${WORKDIR}/${MY_PF}
+
+DESCRIPTION="Use most socks-friendly applications with Tor"
+HOMEPAGE="https://github.com/dgoulet/torsocks"
+SRC_URI="https://github.com/dgoulet/torsocks/archive/v${MY_PV}.tar.gz -> ${MY_PF}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static-libs"
+
+# We do not depend on tor which might be running on a different box
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog README.md doc/notes/DEBUG doc/socks/{SOCKS5,socks-extensions.txt} )
+
+src_prepare() {
+        sed -i -e "/dist_doc_DATA/s/^/#/" Makefile.am doc/Makefile.am || die
+
+        default
+        eautoreconf
+}
+
+src_configure() {
+        econf $(use_enable static-libs static)
+}
+
+src_install() {
+        default
+
+        # Remove libtool .la files
+        find "${D}" -name '*.la' -delete || die
+}