From f2c041ba3a38367b28c8ebfc0a25395ab1cb0dcb Mon Sep 17 00:00:00 2001 From: Leo Date: Sat, 8 Jun 2019 05:26:34 -0300 Subject: main/libshout: fix license fix url remove unused patch --- ...1-libshout-tls-compile-with-OpenSSL-1.1.0.patch | 25 ---------------------- main/libshout/APKBUILD | 6 +++--- 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 main/libshout/01-libshout-tls-compile-with-OpenSSL-1.1.0.patch (limited to 'main') diff --git a/main/libshout/01-libshout-tls-compile-with-OpenSSL-1.1.0.patch b/main/libshout/01-libshout-tls-compile-with-OpenSSL-1.1.0.patch deleted file mode 100644 index 33d00187e9..0000000000 --- a/main/libshout/01-libshout-tls-compile-with-OpenSSL-1.1.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/tls.c b/src/tls.c -index aed5bfc..0d55861 100644 ---- a/src/tls.c -+++ b/src/tls.c -@@ -86,14 +86,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; - diff --git a/main/libshout/APKBUILD b/main/libshout/APKBUILD index e273f965af..dea1dd0bcb 100644 --- a/main/libshout/APKBUILD +++ b/main/libshout/APKBUILD @@ -2,11 +2,11 @@ # Maintainer: Francesco Colista pkgname=libshout pkgver=2.4.3 -pkgrel=0 +pkgrel=1 pkgdesc="Library for accessing a shoutcast/icecast server" -url="http://www.icecast.org/" +url="https://icecast.org/" arch="all" -license="LGPL-2.1" +license="GPL-2.0-only" makedepends="speex-dev libtheora-dev libvorbis-dev openssl-dev" subpackages="$pkgname-static $pkgname-doc $pkgname-dev" source="http://downloads.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" -- cgit v1.2.3