diff --git a/srcpkgs/opusfile/patches/libressl.patch b/srcpkgs/opusfile/patches/libressl.patch index c1c9f58e5dd..5cb8a0bcb69 100644 --- a/srcpkgs/opusfile/patches/libressl.patch +++ b/srcpkgs/opusfile/patches/libressl.patch @@ -1,6 +1,6 @@ ---- src/http.c +--- src/http.c.orig +++ src/http.c -@@ -1517,7 +1517,7 @@ static long op_bio_retry_ctrl(BIO *_b,int _cmd,long _num,void *_ptr){ +@@ -1530,7 +1530,7 @@ return ret; } @@ -8,8 +8,8 @@ +# if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) # define BIO_set_data(_b,_ptr) ((_b)->ptr=(_ptr)) # define BIO_set_init(_b,_init) ((_b)->init=(_init)) - # endif -@@ -1524,7 +1524,7 @@ static long op_bio_retry_ctrl(BIO *_b,int _cmd,long _num,void *_ptr){ + # define ASN1_STRING_get0_data ASN1_STRING_data +@@ -1538,7 +1538,7 @@ static int op_bio_retry_new(BIO *_b){ BIO_set_init(_b,1); @@ -18,7 +18,7 @@ _b->num=0; # endif BIO_set_data(_b,NULL); -@@ -1535,7 +1535,7 @@ static int op_bio_retry_free(BIO *_b){ +@@ -1549,7 +1549,7 @@ return _b!=NULL; } @@ -27,7 +27,7 @@ /*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={ -@@ -1556,7 +1556,7 @@ static BIO_METHOD op_bio_retry_method={ +@@ -1570,7 +1570,7 @@ proxying https URL requests.*/ static int op_http_conn_establish_tunnel(OpusHTTPStream *_stream, OpusHTTPConn *_conn,op_sock _fd,SSL *_ssl_conn,BIO *_ssl_bio){ @@ -36,7 +36,7 @@ BIO_METHOD *bio_retry_method; # endif BIO *retry_bio; -@@ -1569,7 +1569,7 @@ static int op_http_conn_establish_tunnel(OpusHTTPStream *_stream, +@@ -1583,7 +1583,7 @@ ret=op_http_conn_write_fully(_conn, _stream->proxy_connect.buf,_stream->proxy_connect.nbuf); if(OP_UNLIKELY(ret<0))return ret; @@ -45,7 +45,7 @@ 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); -@@ -1592,7 +1592,7 @@ static int op_http_conn_establish_tunnel(OpusHTTPStream *_stream, +@@ -1606,7 +1606,7 @@ /*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); @@ -54,7 +54,41 @@ BIO_meth_free(bio_retry_method); # endif /*Only now do we disable write coalescing, to allow the CONNECT -@@ -2231,7 +2231,7 @@ static int op_http_stream_open(OpusHTTPStream *_stream,const char *_url, +@@ -1635,7 +1635,7 @@ + return NULL; + } + +-# if OPENSSL_VERSION_NUMBER<0x10002000L ++# if OPENSSL_VERSION_NUMBER<0x10002000L || defined(LIBRESSL_VERSION_NUMBER) + /*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 +1893,7 @@ + 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 && !defined(LIBRESSL_VERSION_NUMBER) + /*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 +1956,13 @@ + 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 || defined(LIBRESSL_VERSION_NUMBER) + ||!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 || defined(LIBRESSL_VERSION_NUMBER) + /*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 +2314,7 @@ /*Initialize the SSL library if necessary.*/ if(OP_URL_IS_SSL(&_stream->url)&&_stream->ssl_ctx==NULL){ SSL_CTX *ssl_ctx; diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template index 9dc33fe587e..9de294f1c24 100644 --- a/srcpkgs/opusfile/template +++ b/srcpkgs/opusfile/template @@ -1,7 +1,7 @@ # Template file for 'opusfile' pkgname=opusfile -version=0.8 -revision=4 +version=0.9 +revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="libogg-devel opus-devel libressl-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://www.opus-codec.org/" license="BSD" distfiles="http://downloads.xiph.org/releases/opus/${pkgname}-${version}.tar.gz" -checksum=2c231ed3cfaa1b3173f52d740e5bbd77d51b9dfecb87014b404917fba4b855a4 +checksum=f75fb500e40b122775ac1a71ad80c4477698842a8fe9da4a1b4a1a9f16e4e979 pre_configure() { autoreconf -fi