From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- net-libs/libtorrent/Manifest | 13 +-- .../libtorrent-0.13.7-execinfo-configure.patch | 24 ----- .../files/libtorrent-0.13.7-kqueue-configure.patch | 46 --------- .../files/libtorrent-0.13.8-sysroot.patch | 33 +++++++ ...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 ------------- net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild | 57 ----------- net-libs/libtorrent/libtorrent-0.13.8-r2.ebuild | 59 ++++++++++++ net-libs/libtorrent/metadata.xml | 5 - 12 files changed, 95 insertions(+), 509 deletions(-) delete mode 100644 net-libs/libtorrent/files/libtorrent-0.13.7-execinfo-configure.patch delete mode 100644 net-libs/libtorrent/files/libtorrent-0.13.7-kqueue-configure.patch create mode 100644 net-libs/libtorrent/files/libtorrent-0.13.8-sysroot.patch delete mode 100644 net-libs/libtorrent/files/libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch delete mode 100644 net-libs/libtorrent/files/libtorrent-openssl-1.1-part2.patch delete mode 100644 net-libs/libtorrent/files/libtorrent-openssl-1.1-part3.patch delete mode 100644 net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild delete mode 100644 net-libs/libtorrent/libtorrent-0.13.7.ebuild delete mode 100644 net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild create mode 100644 net-libs/libtorrent/libtorrent-0.13.8-r2.ebuild (limited to 'net-libs/libtorrent') diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest index 47e99758327a..154274e95504 100644 --- a/net-libs/libtorrent/Manifest +++ b/net-libs/libtorrent/Manifest @@ -1,11 +1,4 @@ -AUX libtorrent-0.13.7-execinfo-configure.patch 907 BLAKE2B 7af92d6e3901a8683f86a61e27072ab0d002d54a30bcb756cc9c0fb56621b09cada5bae2ccd7149fa18f98ebcb01544eea6eb0ab0dba71706c6208944b1d1111 SHA512 4bf8c5063f82833f84da6cef56bd892d77bba30d66a2fff4e4705629dfedb222fd025001ae78841d0ccff67d5b9f14ba46d5b569332a03eeab2f78331a254f89 -AUX libtorrent-0.13.7-kqueue-configure.patch 1439 BLAKE2B f7a55999fe7760ad7edf9b1d6e2b3d64e457a115517d8f188ff3ffa6f0e32bf9039b5c8fd690345955b46f902c013aa1be05ef0a2f4729eb9f283f9972540e61 SHA512 795789be85bd461d907d52884a6fe9ef2f7e100b27d5aba0920bf7d56b5e812391796f277c02f9246c3b792a43e1f25144a4f4064a4c68b436a03c2a287623af -AUX libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch 3172 BLAKE2B 2a56ba61b9516b3cf430a79c146c81bd2934449fd46f85bc41ecfc5032faba58cdde86233790bf9d456b28f6760132096188afaeca5b8356ce586e6ad9fbd494 SHA512 e427b4b96a92e1dbbb8883d84688984b9ec7c6815f333bca8a0ad0a8a32b25766100a8182a3d11720563d376501f64b71d86d92379450e41da706dd47e0381d5 -AUX libtorrent-openssl-1.1-part2.patch 1902 BLAKE2B 1d0e405a0a72be250c7a79e410860d8a0afefda3f574d3854469620157d1a3184d63d902af9694d27c786728beb45d93225c09a8b427edf630675fe251d63298 SHA512 baee88e7609fe3976d59bd220c545473a336765fe9f618502cbc6450b43f8c384b56afeea379d42b2f2ee748ab088badb841140d2ea82a91b9f34cd25ff05ef3 -AUX libtorrent-openssl-1.1-part3.patch 1882 BLAKE2B ad7b62d238ad57966c91e38f32b2d45673d9caa1bb4347788cde366a5235c1a02b0b290c3b4e010c0c19baf36c0e2ad7b2651c9bed67a51714b877924f0e6c22 SHA512 aa83d4e636b3327cf78e9eb4bab14e3254d90829549020240e4498d78308cdc6e058035457341d51a1d5d6cd9b89364ebad33f6d46364f9b72171abb49c954f0 -DIST libtorrent-0.13.7.tar.gz 782854 BLAKE2B 940e6162567d391f3d05034bf6d7d55a40070da7e2fd3279b1aa6acd169ca2783e7a2040efc472285f918c434e74380ec40fcddb823871ecf441c85670b9f273 SHA512 7bf3e87dbd19eb4e6806dff8a01c3ec61ea960bbd809d4bcbee96a46e169f97d0baf0fc85ab4a1efbbab07850e9b1060bae46c453ea6c42f5c23f8d921295efb +AUX libtorrent-0.13.8-sysroot.patch 851 BLAKE2B 17ee86d4f92e87b678b62a5c00c1ebba69dd2cfca8a09aa3dca7ba36801469281ad5cb47f1d3ea920b989d7c210f180c4d94bf23da6dac7ef078b7b1f4d07048 SHA512 883c02909863354f0450161d4a7e191ef90cc6692b7f0739693a9e3047cb0c23668aabc98bbb9d2a0986535f4416b3fe7d92809e3ef35116e261a06851f67625 DIST libtorrent-0.13.8.tar.gz 834027 BLAKE2B 374f33af52a45c244182d36bacd6b42eea9edc179e42fb40f4170a47a0cdd39cfb3f42f82fc26ab36718afb9a28a8dd72ca139b3646bbc1c2887444905438cdd SHA512 417177df5b27cd8c6a6317063b0846da2690de4633836466728605c2edad2de407d29d321cc481b8d1352dd0ff6dd89f4566a830424a8cf986f2fddb04704da4 -EBUILD libtorrent-0.13.7-r1.ebuild 1946 BLAKE2B 78e63b6d7f8242f88308d24276ca9b067556e399849df3a188a81d337d5d90dff63959be3fe92fe9777f57f3a4b46b14bbc208e8b8a73029a224848531cdff69 SHA512 1b717332a854c8df3e391ebb0121db61675bb4d48fb2ca46adefd4140639fa9b35e2de7bc542f35187bf3c9d340a8b59a2432b0abf2cf571b79e3f9813878df5 -EBUILD libtorrent-0.13.7.ebuild 1810 BLAKE2B 601e5454903fecbda7df1d1125de727e9c78b79f25455bdbd987c2cd2e6ed58ebacc7c2a8b0c8eeaab7c961662d665ebf86bccef81f444aaf38204ebb7f15d14 SHA512 1d9130fe49e8a76aa255585cbfa45fcf55e527479c9b4bd2665b28c20210a1536bcbfe879cbcc291961f305199ed45ff133dbddc9fef510da3c48129d96711b7 -EBUILD libtorrent-0.13.8-r1.ebuild 1668 BLAKE2B 8124c909ae8df30347131c8b6aa6290e7af9ab81182ea1d5a0bea2f0c1279ba5cd214efa5a26350e1472f86a9988f07e2653bdd3052d0c9572edfbaf727a1701 SHA512 26a8b530ca6cd6e3c37ed7a1b778bd259f545e7ed35049b16df640c0a0073b1ecd134072b2a82754434ad5d77171f087d38a924a9858e0654b897aa98f8a1c3f -MISC metadata.xml 458 BLAKE2B 2c606f962f731b694b15abe7c8ba072856740433acb1d557785a319aef0ca9b2ff6a086a953391f5b06a0ae5ffc2521f7505376d73058211aa1c9b9bc0331705 SHA512 7181c32330f6bc7cbc2e0422a7274a3d7fe6629a70a6b453f059276f5c37c8cf8b6cd3d23b6d23f3f01a311d5a461db2e5980a662364830b66bb73888e2baa6a +EBUILD libtorrent-0.13.8-r2.ebuild 1762 BLAKE2B ee26974c1b9ce4ea95e0bab1cc7dd1b53ba54cea94bad6ab7781aa5e4a57733b3b4fb82cdbfd48c818270b8aea9c2fe75ee6b8c40372f9e35ec9b4948171d4b6 SHA512 66d186c0791b0a634010cb8bbf7d515f9bbe5ed53d2b10df399738653afe17eedc93e2c3ba57492c73ba40e8bba3067dcccf9e6df582ae139b3e33d18bba38f7 +MISC metadata.xml 332 BLAKE2B 83ae91b4dea009d642d92334a5675f7adf861a1e623ef3f483d3ffdcdcce91f9b9b3ed0e5b164ea5c31c228fc4992638df50e221cd6b97e04b96d1518b901546 SHA512 2745495bd2d107326ab4ebeff7d7669b2706a130571ee4f2144ae67d92835acaf04d9ba4f45148f16b0138170ebe6d50019d5ee1b9ad66332338e9c02ecd3624 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 -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 - 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 -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-0.13.8-sysroot.patch b/net-libs/libtorrent/files/libtorrent-0.13.8-sysroot.patch new file mode 100644 index 000000000000..9f696c01ef61 --- /dev/null +++ b/net-libs/libtorrent/files/libtorrent-0.13.8-sysroot.patch @@ -0,0 +1,33 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -43,7 +43,6 @@ + TORRENT_ENABLE_INTERRUPT_SOCKET + + TORRENT_ENABLE_ARCH +-TORRENT_WITH_SYSROOT + + dnl TORRENT_WITH_XFS + TORRENT_WITHOUT_KQUEUE +@@ -59,8 +58,7 @@ + CC_ATTRIBUTE_VISIBILITY + + AX_PTHREAD +-AX_CHECK_ZLIB +- ++PKG_CHECK_MODULES([ZLIB], [zlib]) + PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"]) + + CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS" +--- a/src/torrent/utils/Makefile.am ++++ b/src/torrent/utils/Makefile.am +@@ -23,8 +23,9 @@ + thread_interrupt.h \ + uri_parser.cc \ + uri_parser.h ++libsub_torrentutils_la_LIBADD = $(ZLIB_LIBS) + +-AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. -I$(top_srcdir) ++AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. -I$(top_srcdir) $(ZLIB_CFLAGS) + + libtorrentincludedir = $(includedir)/torrent/utils + libtorrentinclude_HEADERS = \ 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 -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 -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 -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 \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 \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 -} diff --git a/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild deleted file mode 100644 index 5d3d38cc3667..000000000000 --- a/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" -IUSE="debug ssl test" -RESTRICT="!test? ( test )" - -# cppunit dependency - https://github.com/rakshasa/libtorrent/issues/182 -RDEPEND=" - dev-util/cppunit:= - sys-libs/zlib - ssl? ( - dev-libs/openssl:0= - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - # bug 518582 - local disable_instrumentation - echo -e "#include \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.8-r2.ebuild b/net-libs/libtorrent/libtorrent-0.13.8-r2.ebuild new file mode 100644 index 000000000000..5bb36208d46b --- /dev/null +++ b/net-libs/libtorrent/libtorrent-0.13.8-r2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" +IUSE="debug ssl" + +# cppunit dependency - https://github.com/rakshasa/libtorrent/issues/182 +RDEPEND=" + dev-util/cppunit:= + sys-libs/zlib + ssl? ( dev-libs/openssl:= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${PN}-0.13.8-sysroot.patch ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # bug 518582 + local disable_instrumentation + echo -e "#include \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 + einfo "Disabling instrumentation" + 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 "${ED}" -type f -name '*.la' -delete || die +} diff --git a/net-libs/libtorrent/metadata.xml b/net-libs/libtorrent/metadata.xml index a6f8bb76cf75..3e85eb36e275 100644 --- a/net-libs/libtorrent/metadata.xml +++ b/net-libs/libtorrent/metadata.xml @@ -1,15 +1,10 @@ - - ss23@ss23.geek.nz - Stephen Shkardoon - perfinion@gentoo.org Jason Zaman - rakshasa/libtorrent -- cgit v1.2.3