public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/torsocks/files/, net-proxy/torsocks/
@ 2015-10-09  1:35 Anthony G. Basile
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2015-10-09  1:35 UTC (permalink / raw
  To: gentoo-commits

commit:     2a232f1ede1952b43592ccfba4b4f4e91ffdb9d4
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  9 01:41:02 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Oct  9 01:41:02 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a232f1e

net-proxy/torsocks: remove older stable version 1.2

Package-Manager: portage-2.2.20.1

 net-proxy/torsocks/files/avoid-pie-static.patch | 67 -------------------------
 net-proxy/torsocks/files/fix-docdir-r2.patch    | 21 --------
 net-proxy/torsocks/files/fix-find-libc.so.patch | 12 -----
 net-proxy/torsocks/torsocks-1.2.ebuild          | 32 ------------
 4 files changed, 132 deletions(-)

diff --git a/net-proxy/torsocks/files/avoid-pie-static.patch b/net-proxy/torsocks/files/avoid-pie-static.patch
deleted file mode 100644
index 7556556..0000000
--- a/net-proxy/torsocks/files/avoid-pie-static.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-We need to avoid tests which have -static and -pie together.
-
-See https://bugs.gentoo.org/show_bug.cgi?id=533862
-
-diff -Naur torsocks-2.0.0.orig/configure.ac torsocks-2.0.0/configure.ac
---- torsocks-2.0.0.orig/configure.ac	2014-08-11 12:44:46.000000000 -0400
-+++ torsocks-2.0.0/configure.ac	2015-01-11 12:00:21.174826622 -0500
-@@ -144,24 +144,6 @@
- # Version information for libtorsocks
- TORSOCKSLDFLAGS="$LDFLAGS -version-info 1:0:0"
- 
--# Check for the gcc hardening flags.
--AX_CHECK_COMPILE_FLAG([-fPIE],[CFLAGS="$CFLAGS -fPIE"],[],[])
--AX_CHECK_COMPILE_FLAG([-fwrapv],[CFLAGS="$CFLAGS -fwrapv"],[],[])
--AX_CHECK_COMPILE_FLAG([--param ssp-buffer-size=1],
--	[CFLAGS="$CFLAGS --param ssp-buffer-size=1"],[],[])
--AX_CHECK_COMPILE_FLAG([-fstack-protector-all],
--	[CFLAGS="$CFLAGS -fstack-protector-all"],[],[]
--)
--AX_CHECK_COMPILE_FLAG([-fno-strict-overflow],
--	[CFLAGS="$CFLAGS -fno-strict-overflow"],[],[]
--)
--
--dnl Add hardening linker flags
--AX_CHECK_LINK_FLAG([-pie],[LDFLAGS="$LDFLAGS -pie"],[],[])
--AX_CHECK_LINK_FLAG([-z relro],[LDFLAGS="$LDFLAGS -z relro"],[],[])
--AX_CHECK_LINK_FLAG([-z now],[LDFLAGS="$LDFLAGS -z now"],[],[])
--LDFLAGS="$LDFLAGS -D_FORTIFY_SOURCE=2"
--
- dnl Linker checks for Mac OSX, which uses DYLD_INSERT_LIBRARIES
- dnl instead of LD_PRELOAD
- case "$host_os" in
-@@ -255,6 +237,34 @@
- DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include -include config.h"
- AC_SUBST(DEFAULT_INCLUDES)
- 
-+##############################################################################
-+# 9. Test and add hardening flags
-+##############################################################################
-+
-+# Check for the gcc hardening flags.
-+AX_CHECK_COMPILE_FLAG([-fPIE],[CFLAGS="$CFLAGS -fPIE"],[],[])
-+AX_CHECK_COMPILE_FLAG([-fwrapv],[CFLAGS="$CFLAGS -fwrapv"],[],[])
-+AX_CHECK_COMPILE_FLAG([--param ssp-buffer-size=1],
-+	[CFLAGS="$CFLAGS --param ssp-buffer-size=1"],[],[])
-+AX_CHECK_COMPILE_FLAG([-fstack-protector-all],
-+	[CFLAGS="$CFLAGS -fstack-protector-all"],[],[]
-+)
-+AX_CHECK_COMPILE_FLAG([-fno-strict-overflow],
-+	[CFLAGS="$CFLAGS -fno-strict-overflow"],[],[]
-+)
-+
-+dnl Add hardening linker flags
-+AX_CHECK_LINK_FLAG([-pie],[LDFLAGS="$LDFLAGS -pie"],[],[])
-+AX_CHECK_LINK_FLAG([-z relro],[LDFLAGS="$LDFLAGS -z relro"],[],[])
-+AX_CHECK_LINK_FLAG([-z now],[LDFLAGS="$LDFLAGS -z now"],[],[])
-+
-+dnl Add glibc hardening
-+CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
-+
-+##############################################################################
-+# 10. Finish up
-+##############################################################################
-+
- AC_CONFIG_FILES([
- 	Makefile
- 	extras/Makefile

diff --git a/net-proxy/torsocks/files/fix-docdir-r2.patch b/net-proxy/torsocks/files/fix-docdir-r2.patch
deleted file mode 100644
index 05986ec..0000000
--- a/net-proxy/torsocks/files/fix-docdir-r2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur torsocks-2.0.0-rc2.orig/doc/Makefile.am torsocks-2.0.0-rc2/doc/Makefile.am
---- torsocks-2.0.0-rc2.orig/doc/Makefile.am	2013-09-02 14:06:44.000000000 -0400
-+++ torsocks-2.0.0-rc2/doc/Makefile.am	2013-09-17 14:19:37.769272561 -0400
-@@ -6,5 +6,5 @@
- dist_man5_MANS = torsocks.conf.5
- dist_man8_MANS = torsocks.8
- 
--dist_data_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG
-+#dist_data_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG
- 
-diff -Naur torsocks-2.0.0-rc2.orig/Makefile.am torsocks-2.0.0-rc2/Makefile.am
---- torsocks-2.0.0-rc2.orig/Makefile.am	2013-09-02 14:06:44.000000000 -0400
-+++ torsocks-2.0.0-rc2/Makefile.am	2013-09-17 14:20:07.945273935 -0400
-@@ -2,6 +2,6 @@
- 
- SUBDIRS = src doc tests
- 
--dist_doc_DATA = ChangeLog
-+#dist_doc_DATA = ChangeLog
- 
- EXTRA_DIST = gpl-2.0.txt

diff --git a/net-proxy/torsocks/files/fix-find-libc.so.patch b/net-proxy/torsocks/files/fix-find-libc.so.patch
deleted file mode 100644
index 0fb1949..0000000
--- a/net-proxy/torsocks/files/fix-find-libc.so.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar torsocks-2.0.0-rc3.orig/configure.ac torsocks-2.0.0-rc3/configure.ac
---- torsocks-2.0.0-rc3.orig/configure.ac	2013-11-03 13:24:51.000000000 -0500
-+++ torsocks-2.0.0-rc3/configure.ac	2014-01-26 12:49:55.157606016 -0500
-@@ -132,7 +132,7 @@
- dnl Get libc full system path. Use prefix or some hardcoded standard
- dnl location on Unixish system.
- AC_MSG_CHECKING(location of libc.so)
--for DIR in "$prefix/lib" "$prefix/usr/lib" '/lib' '/usr/lib'; do
-+for DIR in "$prefix/lib*" "$prefix/usr/lib*" '/lib*' '/usr/lib*'; do
- 	if test "${LIBC_PATH}" = ""; then
- 		LIBC_PATH=`$FIND $DIR -name "libc.so.?" 2>/dev/null | $TAIL -1`
- 	fi

diff --git a/net-proxy/torsocks/torsocks-1.2.ebuild b/net-proxy/torsocks/torsocks-1.2.ebuild
deleted file mode 100644
index f010fa0..0000000
--- a/net-proxy/torsocks/torsocks-1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit 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_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	#Remove libtool .la files
-	cd "${D}"/usr/$(get_libdir)/torsocks
-	rm -f *.la
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/torsocks/files/, net-proxy/torsocks/
@ 2016-10-13  9:04 Anthony G. Basile
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2016-10-13  9:04 UTC (permalink / raw
  To: gentoo-commits

commit:     26ab0d26a3447e795e3766c08a599b41d974d81b
Author:     Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Tue Oct 11 23:43:45 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 09:03:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26ab0d26

net-proxy/torsocks: fix build with musl libc, bump eapi

Gentoo-Bug: https://bugs.gentoo.org/583730

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 net-proxy/torsocks/files/torsocks-2.1.0-musl.patch | 121 +++++++++++++++++++++
 ...socks-2.1.0.ebuild => torsocks-2.1.0-r1.ebuild} |  17 +--
 2 files changed, 130 insertions(+), 8 deletions(-)

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 00000000..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/torsocks-2.1.0.ebuild b/net-proxy/torsocks/torsocks-2.1.0-r1.ebuild
similarity index 75%
rename from net-proxy/torsocks/torsocks-2.1.0.ebuild
rename to net-proxy/torsocks/torsocks-2.1.0-r1.ebuild
index b085f65..b389659 100644
--- a/net-proxy/torsocks/torsocks-2.1.0.ebuild
+++ b/net-proxy/torsocks/torsocks-2.1.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit autotools eutils multilib versionator
+inherit autotools versionator
 
 MY_PV="$(replace_version_separator 3 -)"
 MY_PF="${PN}-${MY_PV}"
@@ -23,6 +23,9 @@ IUSE="static-libs"
 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
 
@@ -30,6 +33,7 @@ src_prepare() {
 	sed -i -e '/^\.\/test_dns$/d' tests/test_list || \
 		die "failed to disable network tests"
 
+	default
 	eautoreconf
 }
 
@@ -40,9 +44,6 @@ src_configure() {
 src_install() {
 	default
 
-	dodoc ChangeLog README.md TODO doc/notes/DEBUG doc/socks/{SOCKS5,socks-extensions.txt}
-
-	#Remove libtool .la files
-	cd "${D}"/usr/$(get_libdir)/torsocks || die
-	rm -f *.la
+	# Remove libtool .la files
+	find "${D}" -name '*.la' -delete || die
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/torsocks/files/, net-proxy/torsocks/
@ 2023-01-04  4:32 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-01-04  4:32 UTC (permalink / raw
  To: gentoo-commits

commit:     6322dc8cf0f9fb5c7dc487c271f50b855bc0e10b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 03:46:34 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 04:31:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6322dc8c

net-proxy/torsocks: drop 2.3.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-proxy/torsocks/Manifest                        |  1 -
 .../files/torsocks-2.3.0-fix-syscall.patch         | 94 ----------------------
 net-proxy/torsocks/torsocks-2.3.0.ebuild           | 48 -----------
 3 files changed, 143 deletions(-)

diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest
index 7bed495316dd..b9bfe25373d6 100644
--- a/net-proxy/torsocks/Manifest
+++ b/net-proxy/torsocks/Manifest
@@ -1,2 +1 @@
-DIST torsocks-2.3.0.tar.gz 118033 BLAKE2B a4329ffa5e20204024c4f7dda8619ba2d3e2a5f370727acdc720527688bdb3f8735b0386dfa07758fe59e1890f9ce88bb148a1b0c401bbb5966d2fe17934ca61 SHA512 139f4cf60191632add8bc845b2d68d25a0285e9746988167d832e50cedb8083f2765571429d3a11350fa2d327a1ff0a0ead9b464dac90d897b13ab948f609114
 DIST torsocks-2.4.0.tar.gz 118991 BLAKE2B e1817c3bbf10f83431292c644d7187e40b62c5f223784074b3f9c082d8d75243090e226ffebb6fd81805fbd887588790833adc4ab8923e8116585c0a29255ad0 SHA512 7d625ce3a4600f87b86ae9ac79dfd206e7709cb0bafe0b7afcf33a6f1825f968cc63ad3e23c584582b244647bdeafbfdbfc54f7c81e521b0a3d278a1483ce86e

diff --git a/net-proxy/torsocks/files/torsocks-2.3.0-fix-syscall.patch b/net-proxy/torsocks/files/torsocks-2.3.0-fix-syscall.patch
deleted file mode 100644
index 93eb7ad45379..000000000000
--- a/net-proxy/torsocks/files/torsocks-2.3.0-fix-syscall.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 4c00ec8773fd63fa48ef49e1ccf2adac598427be Mon Sep 17 00:00:00 2001
-From: Alejandro Alvarado <44826516+seisvelas@users.noreply.github.com>
-Date: Mon, 17 Dec 2018 19:25:18 -0600
-Subject: Add getdents / getdents64 support re ticket 28861
-
----
- src/common/compat.h |  8 ++++++++
- src/lib/syscall.c   | 37 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 45 insertions(+)
-
-diff --git a/src/common/compat.h b/src/common/compat.h
-index a9b73c2..d79301f 100644
---- a/src/common/compat.h
-+++ b/src/common/compat.h
-@@ -129,6 +129,12 @@ void tsocks_once(tsocks_once_t *o, void (*init_routine)(void));
- #ifndef __NR_memfd_create
- #define __NR_memfd_create -19
- #endif
-+#ifndef __NR_getdents
-+#define __NR_getdents -20
-+#endif
-+#ifndef __NR_getdents64
-+#define __NR_getdents64 -21
-+#endif
- 
- #define TSOCKS_NR_SOCKET    __NR_socket
- #define TSOCKS_NR_CONNECT   __NR_connect
-@@ -149,6 +155,8 @@ void tsocks_once(tsocks_once_t *o, void (*init_routine)(void));
- #define TSOCKS_NR_CLOCK_GETTIME __NR_clock_gettime
- #define TSOCKS_NR_FORK      __NR_fork
- #define TSOCKS_NR_MEMFD_CREATE __NR_memfd_create
-+#define TSOCKS_NR_GETDENTS __NR_getdents
-+#define TSOCKS_NR_GETDENTS64 __NR_getdents64
- 
- /*
-  * Despite glibc providing wrappers for these calls for a long time
-diff --git a/src/lib/syscall.c b/src/lib/syscall.c
-index 7fba580..f793da7 100644
---- a/src/lib/syscall.c
-+++ b/src/lib/syscall.c
-@@ -437,6 +437,37 @@ static LIBC_SYSCALL_RET_TYPE handle_memfd_create(va_list args)
- 
- 	return tsocks_libc_syscall(TSOCKS_NR_MEMFD_CREATE, name, flags);
- }
-+/*
-+ * Handle getdents(2) syscall.
-+ */
-+static LIBC_SYSCALL_RET_TYPE handle_getdents(va_list args)
-+{
-+	unsigned int fd;
-+	struct linux_dirent *dirp;
-+	unsigned int count;
-+
-+	fd = va_arg(args, __typeof__(fd));
-+	dirp = va_arg(args, __typeof__(dirp));
-+	count = va_arg(args, __typeof__(count));
-+
-+	return tsocks_libc_syscall(TSOCKS_NR_GETDENTS, fd, dirp, count);
-+}
-+/*
-+ * Handle getdents64(2) syscall.
-+ */
-+static LIBC_SYSCALL_RET_TYPE handle_getdents64(va_list args)
-+{
-+	unsigned int fd;
-+	struct linux_dirent64 *dirp;
-+	unsigned int count;
-+
-+	fd = va_arg(args, __typeof__(fd));
-+	dirp = va_arg(args, __typeof__(dirp));
-+	count = va_arg(args, __typeof__(count));
-+
-+	return tsocks_libc_syscall(TSOCKS_NR_GETDENTS64, fd, dirp, count);
-+}
-+
- #endif /* __linux__ */
- 
- /*
-@@ -558,6 +589,12 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int number, va_list args)
- 	case TSOCKS_NR_MEMFD_CREATE:
- 		ret = handle_memfd_create(args);
- 		break;
-+	case TSOCKS_NR_GETDENTS:
-+		ret = handle_getdents(args);
-+		break;
-+	case TSOCKS_NR_GETDENTS64:
-+		ret = handle_getdents64(args);
-+		break;
- #endif /* __linux__ */
- 	default:
- 		/*
--- 
-cgit v1.1
-

diff --git a/net-proxy/torsocks/torsocks-2.3.0.ebuild b/net-proxy/torsocks/torsocks-2.3.0.ebuild
deleted file mode 100644
index 60d7ee656ce1..000000000000
--- a/net-proxy/torsocks/torsocks-2.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_PV="$(ver_rs 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}-fix-syscall.patch )
-
-src_prepare() {
-	# Disable tests requiring network access.
-	local test
-	for test in dns fd_passing getpeername; do
-		sed -i -e "/^	test_${test} \\\\\$/d" tests/Makefile.am || \
-			die "failed to disable network tests"
-	done
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	# Remove libtool .la files
-	find "${D}" -name '*.la' -delete || die
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/torsocks/files/, net-proxy/torsocks/
@ 2024-03-24  7:46 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-03-24  7:46 UTC (permalink / raw
  To: gentoo-commits

commit:     9ff2562afb78630fdc3b6e9b9853a26a8181e637
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 07:12:48 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 07:32:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff2562a

net-proxy/torsocks: fix bashism in configure & don't clobber _F_S

Closes: https://bugs.gentoo.org/895874
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-proxy/torsocks/Manifest                        |  2 +-
 .../torsocks/files/torsocks-2.4.0-configure.patch  | 23 ++++++++++++++++++++++
 ...ks-2.4.0-r1.ebuild => torsocks-2.4.0-r2.ebuild} | 12 +++++------
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest
index 3af31a60f5ef..8fa5efad25c4 100644
--- a/net-proxy/torsocks/Manifest
+++ b/net-proxy/torsocks/Manifest
@@ -1 +1 @@
-DIST torsocks-2.4.0-r1.tar.gz 118991 BLAKE2B e1817c3bbf10f83431292c644d7187e40b62c5f223784074b3f9c082d8d75243090e226ffebb6fd81805fbd887588790833adc4ab8923e8116585c0a29255ad0 SHA512 7d625ce3a4600f87b86ae9ac79dfd206e7709cb0bafe0b7afcf33a6f1825f968cc63ad3e23c584582b244647bdeafbfdbfc54f7c81e521b0a3d278a1483ce86e
+DIST torsocks-v2.4.0.tar.bz2 96757 BLAKE2B af21b49623b01c6f70f4103168b2624837ca3c3905f5d39ed85482171ba608f74f4845bc05ad0df8353ce901a82ace1a3152fe6f61bd8ffbcbc74d2d80aa105a SHA512 95a97380d4b0f10296554dd5601e0f640d571454719998229974c4d2269ca636b74b7e8b402dddea68c0cbfce5ca5f2531690e1915167b3c7b87e9066e41bd83

diff --git a/net-proxy/torsocks/files/torsocks-2.4.0-configure.patch b/net-proxy/torsocks/files/torsocks-2.4.0-configure.patch
new file mode 100644
index 000000000000..96af0b4ee510
--- /dev/null
+++ b/net-proxy/torsocks/files/torsocks-2.4.0-configure.patch
@@ -0,0 +1,23 @@
+Fix bashism in libc.so filename check, and don't unconditionally set _F_S=2,
+as it clobbers e.g. _F_S=3.
+--- a/configure.ac
++++ b/configure.ac
+@@ -124,7 +124,7 @@ AS_CASE([$host_os],
+ 	[linux*|kfreebsd*-gnu|freebsd*],
+ 	[
+ 		libc_name=`ldd /usr/bin/yes | grep 'libc\.' | cut -d ' ' -f 1 | tr -d '\t'`
+-		if test "${libc_name}" == ""; then
++		if test "${libc_name}" = ""; then
+ 			# Default libc on most system.
+ 			libc_name="libc.so.6"
+ 		fi
+@@ -258,9 +258,6 @@ AX_CHECK_LINK_FLAG([-pie],[LDFLAGS="$LDFLAGS -pie"],[],[])
+ AX_CHECK_LINK_FLAG([-z relro],[LDFLAGS="$LDFLAGS -z relro"],[],[])
+ AX_CHECK_LINK_FLAG([-z now],[LDFLAGS="$LDFLAGS -z now"],[],[])
+ 
+-dnl Add glibc hardening
+-CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+-
+ ##############################################################################
+ # 10. Finish up
+ ##############################################################################

diff --git a/net-proxy/torsocks/torsocks-2.4.0-r1.ebuild b/net-proxy/torsocks/torsocks-2.4.0-r2.ebuild
similarity index 80%
rename from net-proxy/torsocks/torsocks-2.4.0-r1.ebuild
rename to net-proxy/torsocks/torsocks-2.4.0-r2.ebuild
index f4f8ba36bbf0..dc8c8a23ac6d 100644
--- a/net-proxy/torsocks/torsocks-2.4.0-r1.ebuild
+++ b/net-proxy/torsocks/torsocks-2.4.0-r2.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit autotools
 
-UPSTREAM_PF="${PN}-v${PV}"
-S=${WORKDIR}/${UPSTREAM_PF}
-
+UPSTREAM_P="${PN}-v${PV}"
 DESCRIPTION="Use most socks-friendly applications with Tor"
 HOMEPAGE="https://gitlab.torproject.org/tpo/core/torsocks"
-SRC_URI="https://gitlab.torproject.org/tpo/core/torsocks/-/archive/v${PV}/${UPSTREAM_PF}.tar.gz -> ${PF}.tar.gz"
+SRC_URI="https://gitlab.torproject.org/tpo/core/torsocks/-/archive/v${PV}/${UPSTREAM_P}.tar.bz2"
+S="${WORKDIR}"/${UPSTREAM_P}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,6 +20,7 @@ IUSE="static-libs"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.0-clang16.patch
+	"${FILESDIR}"/${PN}-2.4.0-configure.patch
 )
 
 src_prepare() {
@@ -43,5 +43,5 @@ src_install() {
 	default
 
 	# Remove libtool .la files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-24  7:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-04  4:32 [gentoo-commits] repo/gentoo:master commit in: net-proxy/torsocks/files/, net-proxy/torsocks/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-03-24  7:46 Sam James
2016-10-13  9:04 Anthony G. Basile
2015-10-09  1:35 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