From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- media-libs/opusfile/Manifest | 5 +- .../opusfile/files/opusfile-0.11-libressl.patch | 142 --------------------- media-libs/opusfile/opusfile-0.11.ebuild | 43 ------- media-libs/opusfile/opusfile-0.12.ebuild | 4 +- 4 files changed, 3 insertions(+), 191 deletions(-) delete mode 100644 media-libs/opusfile/files/opusfile-0.11-libressl.patch delete mode 100644 media-libs/opusfile/opusfile-0.11.ebuild (limited to 'media-libs/opusfile') diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest index 895578173032..08a32b6455a9 100644 --- a/media-libs/opusfile/Manifest +++ b/media-libs/opusfile/Manifest @@ -1,6 +1,3 @@ -AUX opusfile-0.11-libressl.patch 6273 BLAKE2B d4868792619ce83d01994c034f9605a86929e52879a22010c0cc00c512a5b8c5abe2261e406616c04475307b7f9d16a5bc57281304d9462b0317849e7ceda922 SHA512 1eeb55595a125bd43469f47073f78bf392bf70ff5e1f94192bf9a5cfad0fd3a3887d9b38b10290cd32d357d8c6c1e00feddc4f6fa14f652ec56a7d365280d812 -DIST opusfile-0.11.tar.gz 467420 BLAKE2B e3e6ee2d1d4c7030bdd5f7ec14503d46ebbfcbc4481ab4652a0be9171d45fe2e855e0f17801cf28fda66f44496ba9f9a2996af7e5aaf5b008e4c3b14263f3160 SHA512 ec3e282310cc4f25475c27b7bc8d1652dcb25d3ac6badf87bd1b4e5397fbe106a0dab81c60d88d198003a23d8a2c9bae8b661edc9b31433effeca438ce56a349 DIST opusfile-0.12.tar.gz 471354 BLAKE2B d54d9b8ed011c018dc6de77afab524d2e47ba6cca69b911efacf361b41f3b59a31424cb15a778db14166815ba5e2352f33f8aa7987c30e5e14339c652558d18d SHA512 e25e6968a3183ac0628ce1000840fd6f9f636e92ba984d6a72b76fb2a98ec632d2de4c66a8e4c05ef30655c2a4a13ab35f89606fa7d79a54cfa8506543ca57af -EBUILD opusfile-0.11.ebuild 975 BLAKE2B d1d45f642892ec7cdc39c69a996f4bb47fc75914b6aa29602465f6b0191b2a6f22347b5c57b96bea05e8b929e547b9583cee725326b749d77a97be87a276da4c SHA512 75481cbddbd7d962e2bfda4ae14a41f367e6e8c3384998e314c5853abc584f7b2d4f183c17b4c4fa1f903c210c904828058d7212f1a6870117bfd15e63420c1f -EBUILD opusfile-0.12.ebuild 930 BLAKE2B 890f8722a8457520bef61d7282b23a8b79d25bc91ce717af81256dd79f7398237d19f6a7caff63d3c85e77300761689662249df3df3cc9081d1a1a093a2f3dc4 SHA512 8948b3340eb5dec762eef0d7b6b92c411921d63066d882286f2aade30a3d357163c08ac29e66f2c2e6c81b2a504c6404f000fecfd5563409c100c6d66971ed6c +EBUILD opusfile-0.12.ebuild 927 BLAKE2B 54f11de54ca7f62c918762b3be291b85c2267f7d43ab7817163769be0318c41243e87d3107b7e16afc07d600ad13f334066eaaecddf39cb71c2c96d274a4e352 SHA512 f08f9a3e25f8cd078d0e6ea7fe385ec361cd76cb1c6621d403e991088ab179a82f40b58a0748fd2ba4514b451cc8a34947b26cfb6dbae41a99cc91cb1b34d2fe MISC metadata.xml 574 BLAKE2B 67bceafd9042cb07a851772ca2b78b542783c6fd4e9bdd5e44643a36652e24907692465390b33ceddd44d37be297b096129ecb92940fe5d7ec5aedbd709c8cb1 SHA512 12eaea9edb76ed36ac8cd60af4b14cf395b4fcb81f4d3dabb1020a0139f05e05fe80bc800080913e66fcb967d4ed1de6b37238a7b0d72dad69de505354aa3830 diff --git a/media-libs/opusfile/files/opusfile-0.11-libressl.patch b/media-libs/opusfile/files/opusfile-0.11-libressl.patch deleted file mode 100644 index 72d807623a8c..000000000000 --- a/media-libs/opusfile/files/opusfile-0.11-libressl.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 27ab318babb96e10a9f007b7c7936fd42425f488 Mon Sep 17 00:00:00 2001 -From: Stefan Strogin -Date: Thu, 27 Sep 2018 04:53:29 +0300 -Subject: [PATCH] http: fix compilation with LibreSSL - -LibreSSL defines OPENSSL_VERSION_NUMBER to 0x20000000L, but its API is -compatible with OpenSSL 1.0.1. -Therefore redefine OPENSSL_VERSION_NUMBER to 0x1000115fL (1.0.1u) if -LibreSSL is used. - -Fixes: #2327 - -http: use new API with LibreSSL >=2.7.0 - -LibreSSL is not yet fully API compatible with OpenSSL 1.0.2 and later, -However many APIs from OpenSSL 1.0.2 and 1.1 are already implemented in -LibreSSL 2.7.0 and later. Old approach works in newer LibreSSL version -as well, but it's not nice to force deprecated functions on LibreSSL -users. - -Add additional conditionals for new LibreSSL versions to use the -available new APIs. ---- - src/http.c | 27 ++++++++++++++++----------- - 1 file changed, 16 insertions(+), 11 deletions(-) - -diff --git a/src/http.c b/src/http.c -index 8ba9b28..a47648f 100644 ---- a/src/http.c -+++ b/src/http.c -@@ -358,6 +358,11 @@ typedef int op_sock; - # include - # include - -+# if (defined(LIBRESSL_VERSION_NUMBER)&&OPENSSL_VERSION_NUMBER==0x20000000L) -+# undef OPENSSL_VERSION_NUMBER -+# define OPENSSL_VERSION_NUMBER 0x1000115fL -+# endif -+ - /*The maximum number of simultaneous connections. - RFC 2616 says this SHOULD NOT be more than 2, but everyone on the modern web - ignores that (e.g., IE 8 bumped theirs up from 2 to 6, Firefox uses 15). -@@ -1530,7 +1535,7 @@ static long op_bio_retry_ctrl(BIO *_b,int _cmd,long _num,void *_ptr){ - return ret; - } - --# if OPENSSL_VERSION_NUMBER<0x10100000L -+# if (OPENSSL_VERSION_NUMBER<0x10100000L&&LIBRESSL_VERSION_NUMBER<0x2070000fL) - # define BIO_set_data(_b,_ptr) ((_b)->ptr=(_ptr)) - # define BIO_set_init(_b,_init) ((_b)->init=(_init)) - # define ASN1_STRING_get0_data ASN1_STRING_data -@@ -1538,7 +1543,7 @@ static long op_bio_retry_ctrl(BIO *_b,int _cmd,long _num,void *_ptr){ - - static int op_bio_retry_new(BIO *_b){ - BIO_set_init(_b,1); --# if OPENSSL_VERSION_NUMBER<0x10100000L -+# if (OPENSSL_VERSION_NUMBER<0x10100000L&&LIBRESSL_VERSION_NUMBER<0x2070000fL) - _b->num=0; - # endif - BIO_set_data(_b,NULL); -@@ -1549,7 +1554,7 @@ static int op_bio_retry_free(BIO *_b){ - return _b!=NULL; - } - --# if OPENSSL_VERSION_NUMBER<0x10100000L -+# if (OPENSSL_VERSION_NUMBER<0x10100000L&&LIBRESSL_VERSION_NUMBER<0x2070000fL) - /*This is not const because OpenSSL doesn't allow it, even though it won't - write to it.*/ - static BIO_METHOD op_bio_retry_method={ -@@ -1570,7 +1575,7 @@ static BIO_METHOD op_bio_retry_method={ - proxying https URL requests.*/ - static int op_http_conn_establish_tunnel(OpusHTTPStream *_stream, - OpusHTTPConn *_conn,op_sock _fd,SSL *_ssl_conn,BIO *_ssl_bio){ --# if OPENSSL_VERSION_NUMBER>=0x10100000L -+# if (OPENSSL_VERSION_NUMBER>=0x10100000L||LIBRESSL_VERSION_NUMBER>=0x2070000fL) - BIO_METHOD *bio_retry_method; - # endif - BIO *retry_bio; -@@ -1583,7 +1588,7 @@ static int op_http_conn_establish_tunnel(OpusHTTPStream *_stream, - ret=op_http_conn_write_fully(_conn, - _stream->proxy_connect.buf,_stream->proxy_connect.nbuf); - if(OP_UNLIKELY(ret<0))return ret; --# if OPENSSL_VERSION_NUMBER>=0x10100000L -+# if (OPENSSL_VERSION_NUMBER>=0x10100000L||LIBRESSL_VERSION_NUMBER>=0x2070000fL) - bio_retry_method=BIO_meth_new(BIO_TYPE_NULL,"retry"); - if(bio_retry_method==NULL)return OP_EFAULT; - BIO_meth_set_write(bio_retry_method,op_bio_retry_write); -@@ -1606,7 +1611,7 @@ static int op_http_conn_establish_tunnel(OpusHTTPStream *_stream, - /*This shouldn't succeed, since we can't read yet.*/ - OP_ALWAYS_TRUE(SSL_connect(_ssl_conn)<0); - SSL_set_bio(_ssl_conn,_ssl_bio,_ssl_bio); --# if OPENSSL_VERSION_NUMBER>=0x10100000L -+# if (OPENSSL_VERSION_NUMBER>=0x10100000L||LIBRESSL_VERSION_NUMBER>=0x2070000fL) - BIO_meth_free(bio_retry_method); - # endif - /*Only now do we disable write coalescing, to allow the CONNECT -@@ -1635,7 +1640,7 @@ static struct addrinfo *op_inet_pton(const char *_host){ - return NULL; - } - --# if OPENSSL_VERSION_NUMBER<0x10002000L -+# if (OPENSSL_VERSION_NUMBER<0x10002000L&&LIBRESSL_VERSION_NUMBER<0x2070000fL) - /*Match a host name against a host with a possible wildcard pattern according - to the rules of RFC 6125 Section 6.4.3. - Return: 0 if the pattern doesn't match, and a non-zero value if it does.*/ -@@ -1893,7 +1898,7 @@ static int op_http_conn_start_tls(OpusHTTPStream *_stream,OpusHTTPConn *_conn, - SSL_set_tlsext_host_name(_ssl_conn,_stream->url.host); - # endif - skip_certificate_check=_stream->skip_certificate_check; --# if OPENSSL_VERSION_NUMBER>=0x10002000L -+# if (OPENSSL_VERSION_NUMBER>=0x10002000L||LIBRESSL_VERSION_NUMBER>=0x2070000fL) - /*As of version 1.0.2, OpenSSL can finally do hostname checks automatically. - Of course, they make it much more complicated than it needs to be.*/ - if(!skip_certificate_check){ -@@ -1956,13 +1961,13 @@ static int op_http_conn_start_tls(OpusHTTPStream *_stream,OpusHTTPConn *_conn, - if(OP_UNLIKELY(ret<=0))return OP_FALSE; - ssl_session=_stream->ssl_session; - if(ssl_session==NULL --# if OPENSSL_VERSION_NUMBER<0x10002000L -+# if (OPENSSL_VERSION_NUMBER<0x10002000L&&LIBRESSL_VERSION_NUMBER<0x2070000fL) - ||!skip_certificate_check - # endif - ){ - ret=op_do_ssl_step(_ssl_conn,_fd,SSL_do_handshake); - if(OP_UNLIKELY(ret<=0))return OP_FALSE; --# if OPENSSL_VERSION_NUMBER<0x10002000L -+# if (OPENSSL_VERSION_NUMBER<0x10002000L&&LIBRESSL_VERSION_NUMBER<0x2070000fL) - /*OpenSSL before version 1.0.2 does not do automatic hostname verification, - despite the fact that we just passed it the hostname above in the call - to SSL_set_tlsext_host_name(). -@@ -2314,7 +2319,7 @@ static int op_http_stream_open(OpusHTTPStream *_stream,const char *_url, - /*Initialize the SSL library if necessary.*/ - if(OP_URL_IS_SSL(&_stream->url)&&_stream->ssl_ctx==NULL){ - SSL_CTX *ssl_ctx; --# if OPENSSL_VERSION_NUMBER<0x10100000L -+# if (OPENSSL_VERSION_NUMBER<0x10100000L&&LIBRESSL_VERSION_NUMBER<0x2070000fL) - # if !defined(OPENSSL_NO_LOCKING) - /*The documentation says SSL_library_init() is not reentrant. - We don't want to add our own depenencies on a threading library, and it --- -2.19.1 - diff --git a/media-libs/opusfile/opusfile-0.11.ebuild b/media-libs/opusfile/opusfile-0.11.ebuild deleted file mode 100644 index f8f7409434ec..000000000000 --- a/media-libs/opusfile/opusfile-0.11.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A high-level decoding and seeking API for .opus files" -HOMEPAGE="https://www.opus-codec.org/" -SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="doc fixed-point +float +http libressl static-libs" - -RDEPEND="media-libs/libogg - media-libs/opus - http? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -REQUIRED_USE="^^ ( fixed-point float )" - -PATCHES=( "${FILESDIR}/opusfile-0.11-libressl.patch" ) - -src_configure() { - local myeconfargs=( - $(use_enable doc) - $(use_enable fixed-point)\ - $(use_enable float) - $(use_enable http) - $(use_enable static-libs static) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -name "*.la" -delete || die -} diff --git a/media-libs/opusfile/opusfile-0.12.ebuild b/media-libs/opusfile/opusfile-0.12.ebuild index 835914262b87..36ad0401dcc6 100644 --- a/media-libs/opusfile/opusfile-0.12.ebuild +++ b/media-libs/opusfile/opusfile-0.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="doc fixed-point +float +http libressl static-libs" RDEPEND="media-libs/libogg -- cgit v1.2.3