commit: 45be33d39f5204912626d617ab81cdf56cea0a8e Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Jul 2 13:15:57 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Jul 2 13:15:57 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45be33d3
net-libs/libtorrent: drop 0.13.7, 0.13.7-r1 Closes: https://bugs.gentoo.org/623822 Closes: https://bugs.gentoo.org/629726 Signed-off-by: David Seifert <soap <AT> gentoo.org> net-libs/libtorrent/Manifest | 1 - .../libtorrent-0.13.7-execinfo-configure.patch | 24 ----- .../files/libtorrent-0.13.7-kqueue-configure.patch | 46 --------- ...DH-parameters-generation-with-OpenSSL-1.1.patch | 105 --------------------- .../files/libtorrent-openssl-1.1-part2.patch | 57 ----------- .../files/libtorrent-openssl-1.1-part3.patch | 68 ------------- net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild | 70 -------------- net-libs/libtorrent/libtorrent-0.13.7.ebuild | 67 ------------- 8 files changed, 438 deletions(-) diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest index c8b8a25f9e6b..b7cba0b5c684 100644 --- a/net-libs/libtorrent/Manifest +++ b/net-libs/libtorrent/Manifest @@ -1,2 +1 @@ -DIST libtorrent-0.13.7.tar.gz 782854 BLAKE2B 940e6162567d391f3d05034bf6d7d55a40070da7e2fd3279b1aa6acd169ca2783e7a2040efc472285f918c434e74380ec40fcddb823871ecf441c85670b9f273 SHA512 7bf3e87dbd19eb4e6806dff8a01c3ec61ea960bbd809d4bcbee96a46e169f97d0baf0fc85ab4a1efbbab07850e9b1060bae46c453ea6c42f5c23f8d921295efb DIST libtorrent-0.13.8.tar.gz 834027 BLAKE2B 374f33af52a45c244182d36bacd6b42eea9edc179e42fb40f4170a47a0cdd39cfb3f42f82fc26ab36718afb9a28a8dd72ca139b3646bbc1c2887444905438cdd SHA512 417177df5b27cd8c6a6317063b0846da2690de4633836466728605c2edad2de407d29d321cc481b8d1352dd0ff6dd89f4566a830424a8cf986f2fddb04704da4 diff --git a/net-libs/libtorrent/files/libtorrent-0.13.7-execinfo-configure.patch b/net-libs/libtorrent/files/libtorrent-0.13.7-execinfo-configure.patch deleted file mode 100644 index 1865e48992c4..000000000000 --- a/net-libs/libtorrent/files/libtorrent-0.13.7-execinfo-configure.patch +++ /dev/null @@ -1,24 +0,0 @@ -From f4dadb3850ef15dd7898d07fca72d2fa7e32ca6f Mon Sep 17 00:00:00 2001 -From: Stephen Shkardoon <[email protected]> -Date: Mon, 25 Jun 2018 20:05:18 +1200 -Subject: [PATCH] Use AC_COMPILE instead of AC_RUN to check for execinfo.h - -This way enables cross compiling, since we don't need to run anything -during the configure script. ---- - scripts/common.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/common.m4 b/scripts/common.m4 -index ff023928..b6d051f5 100644 ---- a/scripts/common.m4 -+++ b/scripts/common.m4 -@@ -153,7 +153,7 @@ dnl Need to fix this so that it uses the stuff defined by the system. - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ - #include <execinfo.h> - int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ])], diff --git a/net-libs/libtorrent/files/libtorrent-0.13.7-kqueue-configure.patch b/net-libs/libtorrent/files/libtorrent-0.13.7-kqueue-configure.patch deleted file mode 100644 index af8e53ddd233..000000000000 --- a/net-libs/libtorrent/files/libtorrent-0.13.7-kqueue-configure.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 755daf78769b048c868e6b62c68b4e545494c181 Mon Sep 17 00:00:00 2001 -From: Stephen Shkardoon <[email protected]> -Date: Thu, 21 Jun 2018 14:38:30 +1200 -Subject: [PATCH] Modify configure to prevent unnecessary kqueue checks - -By only running the TORRENT_CHECK_KQUEUE_SOCKET_ONLY check if kqueue support -is already detected, we increase the number of platforms that we can -cross compile on. -Otherwise, the cross compilation fails due to TORRENT_CHECK_KQUEUE_SOCKET_ONLY -using AC_RUN_IFELSE, which fails during cross compilation. ---- - scripts/checks.m4 | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/scripts/checks.m4 b/scripts/checks.m4 -index 8d77fc5e..c9333561 100644 ---- a/scripts/checks.m4 -+++ b/scripts/checks.m4 -@@ -88,6 +88,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [ - [ - AC_DEFINE(USE_KQUEUE, 1, Use kqueue.) - AC_MSG_RESULT(yes) -+ TORRENT_CHECK_KQUEUE_SOCKET_ONLY - ], [ - AC_MSG_RESULT(no) - ]) -@@ -137,7 +138,6 @@ AC_DEFUN([TORRENT_WITH_KQUEUE], [ - [ - if test "$withval" = "yes"; then - TORRENT_CHECK_KQUEUE -- TORRENT_CHECK_KQUEUE_SOCKET_ONLY - fi - ]) - ]) -@@ -149,11 +149,9 @@ AC_DEFUN([TORRENT_WITHOUT_KQUEUE], [ - [ - if test "$withval" = "yes"; then - TORRENT_CHECK_KQUEUE -- TORRENT_CHECK_KQUEUE_SOCKET_ONLY - fi - ], [ - TORRENT_CHECK_KQUEUE -- TORRENT_CHECK_KQUEUE_SOCKET_ONLY - ]) - ]) - diff --git a/net-libs/libtorrent/files/libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch b/net-libs/libtorrent/files/libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch deleted file mode 100644 index 55d0cb901b71..000000000000 --- a/net-libs/libtorrent/files/libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 4607bbf78040789dee29266878ce109136b984ef Mon Sep 17 00:00:00 2001 -From: rakshasa <[email protected]> -Date: Tue, 20 Dec 2016 19:51:02 +0900 -Subject: [PATCH] Added support for openssl 1.1. - ---- - configure.ac | 4 ++++ - src/utils/diffie_hellman.cc | 36 ++++++++++++++++++++++++++++++++++-- - 2 files changed, 38 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 65e34872..27e33570 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -69,12 +69,15 @@ AC_ARG_ENABLE(openssl, - [ --disable-openssl Don't use OpenSSL's SHA1 implementation.], - [ - if test "$enableval" = "yes"; then -+dnl move to scripts. - PKG_CHECK_MODULES(OPENSSL, libcrypto, - CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS"; - LIBS="$LIBS $OPENSSL_LIBS") - - AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.) - AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.) -+ AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)]) -+ - else - AC_DEFINE(USE_NSS_SHA, 1, Using Mozilla's SHA1 implementation.) - fi -@@ -85,6 +88,7 @@ AC_ARG_ENABLE(openssl, - - AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.) - AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.) -+ AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)]) - ] - ) - -diff --git a/src/utils/diffie_hellman.cc b/src/utils/diffie_hellman.cc -index aa653d45..7ec13165 100644 ---- a/src/utils/diffie_hellman.cc -+++ b/src/utils/diffie_hellman.cc -@@ -54,11 +54,23 @@ DiffieHellman::DiffieHellman(const unsigned char *prime, int primeLength, - m_secret(NULL), m_size(0) { - - #ifdef USE_OPENSSL -+ - m_dh = DH_new(); -+ -+#ifdef USE_OPENSSL_1_1 -+ BIGNUM * const dh_p = BN_bin2bn(prime, primeLength, NULL); -+ BIGNUM * const dh_g = BN_bin2bn(generator, generatorLength, NULL); -+ -+ if (dh_p == NULL || dh_g == NULL || -+ !DH_set0_pqg(m_dh, dh_p, NULL, dh_g)) -+ throw internal_error("Could not generate Diffie-Hellman parameters"); -+#else - m_dh->p = BN_bin2bn(prime, primeLength, NULL); - m_dh->g = BN_bin2bn(generator, generatorLength, NULL); -+#endif - - DH_generate_key(m_dh); -+ - #else - throw internal_error("Compiled without encryption support."); - #endif -@@ -74,7 +86,19 @@ DiffieHellman::~DiffieHellman() { - bool - DiffieHellman::is_valid() const { - #ifdef USE_OPENSSL -+ if (m_dh == NULL) -+ return false; -+ -+#ifdef USE_OPENSSL_1_1 -+ const BIGNUM *pub_key; -+ -+ DH_get0_key(m_dh, &pub_key, NULL); -+ -+ return pub_key != NULL; -+#else - return m_dh != NULL && m_dh->pub_key != NULL; -+#endif -+ - #else - return false; - #endif -@@ -103,8 +127,16 @@ DiffieHellman::store_pub_key(unsigned char* dest, unsigned int length) { - #ifdef USE_OPENSSL - std::memset(dest, 0, length); - -- if ((int)length >= BN_num_bytes(m_dh->pub_key)) -- BN_bn2bin(m_dh->pub_key, dest + length - BN_num_bytes(m_dh->pub_key)); -+ const BIGNUM *pub_key; -+ -+#ifdef USE_OPENSSL_1_1 -+ DH_get0_key(m_dh, &pub_key, NULL); -+#else -+ pub_key = m_dh->pub_key; -+#endif -+ -+ if ((int)length >= BN_num_bytes(pub_key)) -+ BN_bn2bin(pub_key, dest + length - BN_num_bytes(pub_key)); - #endif - } - diff --git a/net-libs/libtorrent/files/libtorrent-openssl-1.1-part2.patch b/net-libs/libtorrent/files/libtorrent-openssl-1.1-part2.patch deleted file mode 100644 index 60542e4b4464..000000000000 --- a/net-libs/libtorrent/files/libtorrent-openssl-1.1-part2.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 43213fecfad863e2c9e47accde9b76496ff6d1e5 Mon Sep 17 00:00:00 2001 -From: rakshasa <[email protected]> -Date: Sun, 25 Dec 2016 11:58:04 +0900 -Subject: [PATCH] Cleaned up openssl automake script. - ---- - configure.ac | 37 ++----------------------------------- - 1 file changed, 2 insertions(+), 35 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 27e33570..33f755c9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -65,41 +65,8 @@ CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS" - CXXFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CXXFLAGS" - LIBS="$PTHREAD_LIBS $CPPUNIT_LIBS $LIBS" - --AC_ARG_ENABLE(openssl, -- [ --disable-openssl Don't use OpenSSL's SHA1 implementation.], -- [ -- if test "$enableval" = "yes"; then --dnl move to scripts. -- PKG_CHECK_MODULES(OPENSSL, libcrypto, -- CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS"; -- LIBS="$LIBS $OPENSSL_LIBS") -- -- AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.) -- AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.) -- AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)]) -- -- else -- AC_DEFINE(USE_NSS_SHA, 1, Using Mozilla's SHA1 implementation.) -- fi -- ],[ -- PKG_CHECK_MODULES(OPENSSL, libcrypto, -- CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS"; -- LIBS="$LIBS $OPENSSL_LIBS") -- -- AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.) -- AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.) -- AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)]) -- ] --) -- --AC_ARG_ENABLE(cyrus-rc4, -- [ --enable-cyrus-rc4=PFX Use Cyrus RC4 implementation.], -- [ -- CXXFLAGS="$CXXFLAGS -I${enableval}/include"; -- LIBS="$LIBS -lrc4 -L${enableval}/lib" -- AC_DEFINE(USE_CYRUS_RC4, 1, Using Cyrus RC4 implementation.) -- ] --) -+TORRENT_ARG_OPENSSL -+TORRENT_ARG_CYRUS_RC4 - - AC_CHECK_FUNCS(posix_memalign) - diff --git a/net-libs/libtorrent/files/libtorrent-openssl-1.1-part3.patch b/net-libs/libtorrent/files/libtorrent-openssl-1.1-part3.patch deleted file mode 100644 index 3fc338d8b088..000000000000 --- a/net-libs/libtorrent/files/libtorrent-openssl-1.1-part3.patch +++ /dev/null @@ -1,68 +0,0 @@ -From d36561c8cc91698f3075c264af6d7d99e13cbff0 Mon Sep 17 00:00:00 2001 -From: rakshasa <[email protected]> -Date: Sun, 25 Dec 2016 12:09:35 +0900 -Subject: [PATCH] More stuff. - ---- - Makefile.am | 1 + - scripts/ssl.m4 | 39 +++++++++++++++++++++++++++++++++++++++ - 2 files changed, 40 insertions(+) - create mode 100644 scripts/ssl.m4 - -diff --git a/Makefile.am b/Makefile.am -index f175e634..9507b9ea 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,6 +8,7 @@ EXTRA_DIST= \ - scripts/checks.m4 \ - scripts/common.m4 \ - scripts/attributes.m4 \ -+ scripts/ssl.m4 \ - doc/main.xml \ - doc/http.xml \ - doc/torrent.xml \ -diff --git a/scripts/ssl.m4 b/scripts/ssl.m4 -new file mode 100644 -index 00000000..e9cf6303 ---- /dev/null -+++ b/scripts/ssl.m4 -@@ -0,0 +1,39 @@ -+AC_DEFUN([TORRENT_CHECK_OPENSSL], -+ [ -+ PKG_CHECK_MODULES(OPENSSL, libcrypto, -+ CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS"; -+ LIBS="$LIBS $OPENSSL_LIBS") -+ -+ AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.) -+ AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.) -+ AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)]) -+ ] -+) -+ -+AC_DEFUN([TORRENT_ARG_OPENSSL], -+ [ -+ AC_ARG_ENABLE(openssl, -+ [ --disable-openssl Don't use OpenSSL's SHA1 implementation.], -+ [ -+ if test "$enableval" = "yes"; then -+ TORRENT_CHECK_OPENSSL -+ else -+ AC_DEFINE(USE_NSS_SHA, 1, Using Mozilla's SHA1 implementation.) -+ fi -+ ],[ -+ TORRENT_CHECK_OPENSSL -+ ]) -+ ] -+) -+ -+AC_DEFUN([TORRENT_ARG_CYRUS_RC4], -+ [ -+ AC_ARG_ENABLE(cyrus-rc4, -+ [ --enable-cyrus-rc4=PFX Use Cyrus RC4 implementation.], -+ [ -+ CXXFLAGS="$CXXFLAGS -I${enableval}/include"; -+ LIBS="$LIBS -lrc4 -L${enableval}/lib" -+ AC_DEFINE(USE_CYRUS_RC4, 1, Using Cyrus RC4 implementation.) -+ ]) -+ ] -+) diff --git a/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild deleted file mode 100644 index d1d53acab68d..000000000000 --- a/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools toolchain-funcs - -DESCRIPTION="BitTorrent library written in C++ for *nix" -HOMEPAGE="https://rakshasa.github.io/rtorrent/"; -SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"; - -LICENSE="GPL-2" - -# The README says that the library ABI is not yet stable and dependencies on -# the library should be an explicit, syncronized version until the library -# has had more time to mature. Until it matures we should not include a soname -# subslot. -SLOT="0" - -KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" -IUSE="debug ssl test" -RESTRICT="!test? ( test )" - -RDEPEND=" - sys-libs/zlib - >=dev-libs/libsigc++-2.2.2:2 - ssl? ( - dev-libs/openssl:0= - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-util/cppunit" - -PATCHES=( - "${FILESDIR}/${PN}-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch" - "${FILESDIR}/${PN}-openssl-1.1-part2.patch" - "${FILESDIR}/${PN}-openssl-1.1-part3.patch" - "${FILESDIR}/${PN}-0.13.7-kqueue-configure.patch" - "${FILESDIR}/${PN}-0.13.7-execinfo-configure.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # bug 518582 - local disable_instrumentation - echo -e "#include <inttypes.h>\nint main(){ int64_t var = 7; __sync_add_and_fetch(&var, 1); return 0;}" > "${T}/sync_add_and_fetch.c" || die - $(tc-getCC) ${CFLAGS} -o /dev/null -x c "${T}/sync_add_and_fetch.c" >/dev/null 2>&1 - if [[ $? -ne 0 ]]; then - disable_instrumentation="--disable-instrumentation" - fi - - # configure needs bash or script bombs out on some null shift, bug #291229 - CONFIG_SHELL=${BASH} econf \ - --enable-aligned \ - $(use_enable debug) \ - $(use_enable ssl openssl) \ - ${disable_instrumentation} \ - --with-posix-fallocate \ - --with-zlib="${EROOT%/}/usr/" -} - -src_install() { - default - - find "${D}" -name '*.la' -delete -} diff --git a/net-libs/libtorrent/libtorrent-0.13.7.ebuild b/net-libs/libtorrent/libtorrent-0.13.7.ebuild deleted file mode 100644 index 73c2cd137518..000000000000 --- a/net-libs/libtorrent/libtorrent-0.13.7.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools toolchain-funcs - -DESCRIPTION="BitTorrent library written in C++ for *nix" -HOMEPAGE="https://rakshasa.github.io/rtorrent/"; -SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"; - -LICENSE="GPL-2" - -# The README says that the library ABI is not yet stable and dependencies on -# the library should be an explicit, syncronized version until the library -# has had more time to mature. Until it matures we should not include a soname -# subslot. -SLOT="0" - -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" -IUSE="debug ssl test" -RESTRICT="!test? ( test )" - -RDEPEND=" - sys-libs/zlib - >=dev-libs/libsigc++-2.2.2:2 - ssl? ( - dev-libs/openssl:0= - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-util/cppunit" - -PATCHES=( - "${FILESDIR}/${PN}-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch" - "${FILESDIR}/${PN}-openssl-1.1-part2.patch" - "${FILESDIR}/${PN}-openssl-1.1-part3.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # bug 518582 - local disable_instrumentation - echo -e "#include <inttypes.h>\nint main(){ int64_t var = 7; __sync_add_and_fetch(&var, 1); return 0;}" > "${T}/sync_add_and_fetch.c" || die - $(tc-getCC) ${CFLAGS} -o /dev/null -x c "${T}/sync_add_and_fetch.c" >/dev/null 2>&1 - if [[ $? -ne 0 ]]; then - disable_instrumentation="--disable-instrumentation" - fi - - # configure needs bash or script bombs out on some null shift, bug #291229 - CONFIG_SHELL=${BASH} econf \ - --enable-aligned \ - $(use_enable debug) \ - $(use_enable ssl openssl) \ - ${disable_instrumentation} \ - --with-posix-fallocate -} - -src_install() { - default - - find "${D}" -name '*.la' -delete -}
