commit: aa416a3334ac2a92532484e4441c1af2aa56412c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jan 7 19:03:35 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jan 7 19:03:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa416a33
media-libs/libshout: cleanup old Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/libshout/Manifest | 1 - ...hout-2.4.1-tls-compile-with-OpenSSL-1.1.0.patch | 58 -------------------- ...hout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch | 61 ---------------------- media-libs/libshout/libshout-2.4.1-r2.ebuild | 59 --------------------- 4 files changed, 179 deletions(-) diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest index 1394514c5f3..c1123e9c32e 100644 --- a/media-libs/libshout/Manifest +++ b/media-libs/libshout/Manifest @@ -1,3 +1,2 @@ -DIST libshout-2.4.1.tar.gz 516161 BLAKE2B bedea3c043018eff4675fdb8b95e0bb8ff02a98994a4afcc76537124ebf7357f012f2e9445ebd207b576fc4166fb761d65066fe166fc8b611b96f5c5482a0e92 SHA512 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219 DIST libshout-2.4.3.tar.gz 529563 BLAKE2B 30d982fcf52507e07af23113560cfc9e43ca4ce37c286854326ea09215dc30c3c0d57320dce46dd4faec43b3d473df2f7882ad759479fb023166cec3f24327c5 SHA512 fe36778c6640e620f27504cb21234940e18a65a33f9178bf7e77d4baf854a9affc82d85db8ed8c1c8e2d80399685d8be10106fff5be1ddf76e03e2ffeeed1d34 DIST libshout-2.4.5.tar.gz 543991 BLAKE2B a3ceabd150413e9d1cee2118fe9576959bfa05d86e261b2574969a9a665aba3da4ac1c39db2b27d033fe587232a69a569d80362f856bba667277b5454dd170ca SHA512 290844185da16961f03434d3e341573dd6cb0139e5fa81902903021b641382d2629302d7c356bc591b35656754e07f4e44a8d9e782e092b17a051b9ae8f54341 diff --git a/media-libs/libshout/files/libshout-2.4.1-tls-compile-with-OpenSSL-1.1.0.patch b/media-libs/libshout/files/libshout-2.4.1-tls-compile-with-OpenSSL-1.1.0.patch deleted file mode 100644 index befd16e3846..00000000000 --- a/media-libs/libshout/files/libshout-2.4.1-tls-compile-with-OpenSSL-1.1.0.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 01fafc449f0de56743d08e7976933c49e2915bfa Mon Sep 17 00:00:00 2001 -From: Sebastian Andrzej Siewior <sebast...@breakpoint.cc> -Date: Wed, 15 Nov 2017 12:46:25 +0000 -Subject: [PATCH] tls: compile with OpenSSL 1.1.0 - -The init functions are not longer required in OpenSSL 1.1 so I dropped -them. - -TLSv1_client_method() should not be used because it enables only the -TLSv1.0 protocol. Better is to use SSLv23_client_method() which enable -all the protocols including TLSv1.2. With this functions SSLv2 and SSLv3 -is theoretically possible but as of today those protocols are usually -build-time disabled. -To avoid all this OpenSSL 1.1 provides TLS_client_method() which is aim -to provide to highest TLS protocol version (same as -SSLv23_client_method() but it is deprecated in 1.1). - -Signed-off-by: Sebastian Andrzej Siewior <sebast...@breakpoint.cc> ---- - src/tls.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/src/tls.c b/src/tls.c -index 4562c7327077..e0e5c1a5f079 100644 ---- a/src/tls.c -+++ b/src/tls.c -@@ -24,6 +24,7 @@ - #endif - - #include <shout/shout.h> -+#include <string.h> - #include "shout_private.h" - - #ifndef XXX_HAVE_X509_check_host -@@ -61,14 +62,17 @@ shout_tls_t *shout_tls_new(shout_t *self, sock_t socket) - - static inline int tls_setup(shout_tls_t *tls) - { -- SSL_METHOD *meth; -- -+ const SSL_METHOD *meth; -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - SSL_library_init(); - SSL_load_error_strings(); - SSLeay_add_all_algorithms(); -- SSLeay_add_ssl_algorithms(); -+ SSLeay_add_ssl_algorithms(); - -- meth = TLSv1_client_method(); -+ meth = SSLv23_client_method(); -+#else -+ meth = TLS_client_method(); -+#endif - if (!meth) - goto error; - --- -2.15.0 diff --git a/media-libs/libshout/files/libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch b/media-libs/libshout/files/libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch deleted file mode 100644 index 55f2189e15f..00000000000 --- a/media-libs/libshout/files/libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 3f07c95482c15f151e10f06c89302d3700c6430f Mon Sep 17 00:00:00 2001 -From: Sebastian Andrzej Siewior <sebast...@breakpoint.cc> -Date: Mon, 6 May 2019 13:33:48 +0200 -Subject: [PATCH] tls: compile with OpenSSL 1.1.0 - -The init functions are not longer required in OpenSSL 1.1 so I dropped -them. - -TLSv1_client_method() should not be used because it enables only the -TLSv1.0 protocol. Better is to use SSLv23_client_method() which enable -all the protocols including TLSv1.2. With this functions SSLv2 and SSLv3 -is theoretically possible but as of today those protocols are usually -build-time disabled. -To avoid all this OpenSSL 1.1 provides TLS_client_method() which is aim -to provide to highest TLS protocol version (same as -SSLv23_client_method() but it is deprecated in 1.1). - -Signed-off-by: Sebastian Andrzej Siewior <sebast...@breakpoint.cc> - -Forward-ported to libshout-2.4.2 by Lars Wendler <polynomia...@gentoo.org> -Signed-off-by: Lars Wendler <polynomia...@gentoo.org> ---- - src/tls.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/src/tls.c b/src/tls.c -index aed5bfc..d60fb57 100644 ---- a/src/tls.c -+++ b/src/tls.c -@@ -26,6 +26,7 @@ - #include <string.h> - - #include <shout/shout.h> -+#include <string.h> - #include "shout_private.h" - - #ifndef XXX_HAVE_X509_check_host -@@ -86,14 +87,17 @@ shout_tls_t *shout_tls_new(shout_t *self, sock_t socket) - - static inline int tls_setup(shout_tls_t *tls) - { -- SSL_METHOD *meth; -- -+ const SSL_METHOD *meth; -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - SSL_library_init(); - SSL_load_error_strings(); - SSLeay_add_all_algorithms(); - SSLeay_add_ssl_algorithms(); - -- meth = TLSv1_client_method(); -+ meth = SSLv23_client_method(); -+#else -+ meth = TLS_client_method(); -+#endif - if (!meth) - goto error; - --- -2.21.0 - diff --git a/media-libs/libshout/libshout-2.4.1-r2.ebuild b/media-libs/libshout/libshout-2.4.1-r2.ebuild deleted file mode 100644 index 345c937f291..00000000000 --- a/media-libs/libshout/libshout-2.4.1-r2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal - -DESCRIPTION="library for connecting and sending data to icecast servers" -HOMEPAGE="https://www.icecast.org/" -SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="libressl speex static-libs theora" - -RDEPEND=" - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) - theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/shout/shout.h -) - -DOCS=( README examples/example.c ) - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.1-underlinking.patch - "${FILESDIR}"/${PN}-2.4.1-tls-compile-with-OpenSSL-1.1.0.patch -) - -src_prepare() { - default - eautoreconf - multilib_copy_sources -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable theora) - $(use_enable speex) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - rm -rf "${ED}"/usr/share/doc/${PN} || die - find "${D}" -name '*.la' -delete || die -}