From a7689c2abcff4374b84d95fb2df980ec9a566965 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Mar 2024 19:00:40 +0000 Subject: gentoo auto-resync : 24:03:2024 - 19:00:40 --- net-proxy/Manifest.gz | Bin 5382 -> 5380 bytes net-proxy/torsocks/Manifest | 5 ++- .../torsocks/files/torsocks-2.4.0-configure.patch | 23 ++++++++++ net-proxy/torsocks/torsocks-2.4.0-r1.ebuild | 47 --------------------- net-proxy/torsocks/torsocks-2.4.0-r2.ebuild | 47 +++++++++++++++++++++ 5 files changed, 73 insertions(+), 49 deletions(-) create mode 100644 net-proxy/torsocks/files/torsocks-2.4.0-configure.patch delete mode 100644 net-proxy/torsocks/torsocks-2.4.0-r1.ebuild create mode 100644 net-proxy/torsocks/torsocks-2.4.0-r2.ebuild (limited to 'net-proxy') diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz index de7c719dd7e3..5c2e59a00a84 100644 Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest index 4152bb899f3c..1ebac2f109bf 100644 --- a/net-proxy/torsocks/Manifest +++ b/net-proxy/torsocks/Manifest @@ -1,4 +1,5 @@ AUX torsocks-2.4.0-clang16.patch 643 BLAKE2B 83b1d794a2dceaad0ae1321092ce11cb41bdce27ded71c40ce6f7c50ae2c9cae405de4f55636019928dc395684a7614a0b2d7b7123c0d710aa785dee0ef1d50e SHA512 c40dff7ccca62f73e205a32e17090aa5a79de3a06424595fc8c18e969045b12611df73c8e272aa97e6e3708b4b96c0d82be035d0f9c389dcd332536b3ced7337 -DIST torsocks-2.4.0-r1.tar.gz 118991 BLAKE2B e1817c3bbf10f83431292c644d7187e40b62c5f223784074b3f9c082d8d75243090e226ffebb6fd81805fbd887588790833adc4ab8923e8116585c0a29255ad0 SHA512 7d625ce3a4600f87b86ae9ac79dfd206e7709cb0bafe0b7afcf33a6f1825f968cc63ad3e23c584582b244647bdeafbfdbfc54f7c81e521b0a3d278a1483ce86e -EBUILD torsocks-2.4.0-r1.ebuild 1023 BLAKE2B 9bbaaa65228d8a9dde314edfffe37547afd9b34b47eda6491af952d0c0379ebe3e9ffd413f9617350387fc777059d20cce0589498aea2ca82ea411d41287870f SHA512 dcd194a327ed8fc76cc90254ea39a29a0683a20de6ac0f190e3e53a908e8f9c1bac34b02e1aa6e6af25385d1dc7dfaf8031474c3221fb34b8aee25860aff11f9 +AUX torsocks-2.4.0-configure.patch 902 BLAKE2B ad3986489d91a44462f054b49a6cf5540991ca2a7e49a019372472af357ac52361874f98cec79c75ab9256b05ba691e193f51907fb2bf3e37a89bb79dfab3a81 SHA512 4a91ba12b3d1f4d3492be83541cc7a0e3e678f0a42f6445f9dadf562f07a244f8f27f8faa3b1c44197c9e99fa66a96bbde81372b8519963dfd5e8dc64a4d62fa +DIST torsocks-v2.4.0.tar.bz2 96757 BLAKE2B af21b49623b01c6f70f4103168b2624837ca3c3905f5d39ed85482171ba608f74f4845bc05ad0df8353ce901a82ace1a3152fe6f61bd8ffbcbc74d2d80aa105a SHA512 95a97380d4b0f10296554dd5601e0f640d571454719998229974c4d2269ca636b74b7e8b402dddea68c0cbfce5ca5f2531690e1915167b3c7b87e9066e41bd83 +EBUILD torsocks-2.4.0-r2.ebuild 1050 BLAKE2B 43fd990d8caf8de99148be89529a30ec30f5785d5bd23eb1ae06b1f98600326663f703343b5b8861728392c6862ef02b7d06715dcdce8fa9f695d02a4abb061b SHA512 29478c67029db8471c906268e3daf7fdfe54aa4c8cee813479ec3a099059c5999adb4432c14772f5bed90b54930d934c665b944554530dad6223553cef0def71 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 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-r1.ebuild deleted file mode 100644 index f4f8ba36bbf0..000000000000 --- a/net-proxy/torsocks/torsocks-2.4.0-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2023 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} - -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" - -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 - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.0-clang16.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 -} diff --git a/net-proxy/torsocks/torsocks-2.4.0-r2.ebuild b/net-proxy/torsocks/torsocks-2.4.0-r2.ebuild new file mode 100644 index 000000000000..dc8c8a23ac6d --- /dev/null +++ b/net-proxy/torsocks/torsocks-2.4.0-r2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +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_P}.tar.bz2" +S="${WORKDIR}"/${UPSTREAM_P} + +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 + +PATCHES=( + "${FILESDIR}"/${PN}-2.4.0-clang16.patch + "${FILESDIR}"/${PN}-2.4.0-configure.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 "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3