diff options
author | maya <maya@pkgsrc.org> | 2018-05-13 09:44:03 +0000 |
---|---|---|
committer | maya <maya@pkgsrc.org> | 2018-05-13 09:44:03 +0000 |
commit | b6b3d042140cf67a9db09d2054e48304a9446f28 (patch) | |
tree | 7ef0f07e4c134f1c85b8eb6122303445ff6057f3 | |
parent | e83eda2373f1426ea4789a8e335f8f30b075962e (diff) | |
download | pkgsrc-b6b3d042140cf67a9db09d2054e48304a9446f28.tar.gz |
opusfile: update to 0.10. Fixes build with OpenSSL 1.1.x.
Changes since the v0.9 release:
Fix an out-of-bounds read matching serial numbers.
Changes since the v0.8 release:
Fix an invalid free with tag handling.
Improve handling of corrupt streams.
Improve performance on streams with many chain segments.
Improve TLS host validation.
Align op_raw_total to work better with op_raw_seek.
Documentation and build improvements.
Changes since the v0.7 release:
Add support for OpenSSL 1.1.x.
Fix issues with tag parsing introduced in v0.7.
Fix skip logic for multiplexed non-Opus data.
-rw-r--r-- | audio/opusfile/Makefile | 5 | ||||
-rw-r--r-- | audio/opusfile/PLIST | 4 | ||||
-rw-r--r-- | audio/opusfile/distinfo | 16 | ||||
-rw-r--r-- | audio/opusfile/patches/patch-configure | 14 | ||||
-rw-r--r-- | audio/opusfile/patches/patch-configure.ac | 8 | ||||
-rw-r--r-- | audio/opusfile/patches/patch-src_http.c | 48 |
6 files changed, 44 insertions, 51 deletions
diff --git a/audio/opusfile/Makefile b/audio/opusfile/Makefile index 247f769756c..385041cb5b4 100644 --- a/audio/opusfile/Makefile +++ b/audio/opusfile/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2016/03/13 08:04:06 tnn Exp $ +# $NetBSD: Makefile,v 1.7 2018/05/13 09:44:03 maya Exp $ -DISTNAME= opusfile-0.7 -PKGREVISION= 1 +DISTNAME= opusfile-0.10 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/opus/ diff --git a/audio/opusfile/PLIST b/audio/opusfile/PLIST index 18ecc9b5505..f4724d6c32f 100644 --- a/audio/opusfile/PLIST +++ b/audio/opusfile/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2016/03/13 08:04:06 tnn Exp $ +@comment $NetBSD: PLIST,v 1.4 2018/05/13 09:44:03 maya Exp $ include/opus/opusfile.h lib/libopusfile.la lib/libopusurl.la @@ -6,4 +6,4 @@ lib/pkgconfig/opusfile.pc lib/pkgconfig/opusurl.pc share/doc/opusfile/AUTHORS share/doc/opusfile/COPYING -share/doc/opusfile/README.txt +share/doc/opusfile/README.md diff --git a/audio/opusfile/distinfo b/audio/opusfile/distinfo index 729b513429c..cb002068d5b 100644 --- a/audio/opusfile/distinfo +++ b/audio/opusfile/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.8 2016/03/07 19:36:57 nros Exp $ +$NetBSD: distinfo,v 1.9 2018/05/13 09:44:03 maya Exp $ -SHA1 (opusfile-0.7.tar.gz) = 69dfca2092172f0837bb8b54dacfcb44fec6bd6f -RMD160 (opusfile-0.7.tar.gz) = 4acf7a9bf07e72c8e85e332724c410d767c00fa6 -SHA512 (opusfile-0.7.tar.gz) = 13ad627e314c0f35f987d8170e090e0683d898f8c553f53a37b66a4401ff1843069e0adc35b32ef6f838d86a2a333bf11a37b4cf99161d34d5a7530619a3ade6 -Size (opusfile-0.7.tar.gz) = 463581 bytes -SHA1 (patch-configure) = e66accedd8adbc6177b0abbec43b2d48b4a154c5 -SHA1 (patch-configure.ac) = d8384babab6d2e3e1fcf61380a8c3db70accf59d -SHA1 (patch-src_http.c) = 87aaa20b5fc6e7c07f40da47e47baee2833674f3 +SHA1 (opusfile-0.10.tar.gz) = ddbeba72d45cde54872cc6811ae3273ed1520968 +RMD160 (opusfile-0.10.tar.gz) = b9fcc6fd243b45c853aa64137f006d71d0c7cc2b +SHA512 (opusfile-0.10.tar.gz) = 302601c31ca28bff175cefa99ac16177122a786d043be229616e2c98b7ffaf4a96b8bb17ca16e31240325a92763f417315b54d8f1b2f4f63f445cb7ad43c4a37 +Size (opusfile-0.10.tar.gz) = 467700 bytes +SHA1 (patch-configure) = 27f0176b889eab6494e83b4d8cf2bdba1c03efa8 +SHA1 (patch-configure.ac) = 7a49191176154c0e7f9fb0182e0dda7dfab8d39c +SHA1 (patch-src_http.c) = 6b4f64a875c0fb5f9b9f63e041c232344c804dd3 diff --git a/audio/opusfile/patches/patch-configure b/audio/opusfile/patches/patch-configure index 52b8347f2ef..15cd655fe0d 100644 --- a/audio/opusfile/patches/patch-configure +++ b/audio/opusfile/patches/patch-configure @@ -1,8 +1,8 @@ -$NetBSD: patch-configure,v 1.1 2015/11/20 14:28:02 joerg Exp $ +$NetBSD: patch-configure,v 1.2 2018/05/13 09:44:03 maya Exp $ ---- configure.orig 2015-11-18 13:16:26.000000000 +0000 +--- configure.orig 2017-11-14 18:56:39.000000000 +0000 +++ configure -@@ -11897,70 +11897,6 @@ fi +@@ -12491,64 +12488,6 @@ fi fi fi @@ -64,12 +64,6 @@ $NetBSD: patch-configure,v 1.1 2015/11/20 14:28:02 joerg Exp $ - enable_http=no -fi - -- -- -- -- -- -- - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + diff --git a/audio/opusfile/patches/patch-configure.ac b/audio/opusfile/patches/patch-configure.ac index a5a214f7a4e..411ac34188c 100644 --- a/audio/opusfile/patches/patch-configure.ac +++ b/audio/opusfile/patches/patch-configure.ac @@ -1,6 +1,6 @@ -$NetBSD: patch-configure.ac,v 1.1 2015/11/20 14:28:02 joerg Exp $ +$NetBSD: patch-configure.ac,v 1.2 2018/05/13 09:44:03 maya Exp $ ---- configure.ac.orig 2015-11-18 13:16:13.000000000 +0000 +--- configure.ac.orig 2017-11-14 18:36:25.000000000 +0000 +++ configure.ac @@ -86,7 +86,6 @@ AM_COND_IF(OP_WIN32, ) @@ -8,5 +8,5 @@ $NetBSD: patch-configure.ac,v 1.1 2015/11/20 14:28:02 joerg Exp $ ) -AC_SEARCH_LIBS(ftime, [compat], , [enable_http=no]) - AS_IF([test "$enable_http" != "no"], [ - openssl="openssl" + m4_ifndef([PKG_PROG_PKG_CONFIG], + [m4_fatal([Could not locate the pkg-config autoconf macros. diff --git a/audio/opusfile/patches/patch-src_http.c b/audio/opusfile/patches/patch-src_http.c index 28400bb1320..055a89defab 100644 --- a/audio/opusfile/patches/patch-src_http.c +++ b/audio/opusfile/patches/patch-src_http.c @@ -1,11 +1,11 @@ -$NetBSD: patch-src_http.c,v 1.5 2016/03/07 19:36:57 nros Exp $ +$NetBSD: patch-src_http.c,v 1.6 2018/05/13 09:44:03 maya Exp $ * Avoid using the obsolete ftime() function. https://trac.xiph.org/ticket/2014 * Need sys/filio.h on SunOS for FIONREAD. ---- src/http.c.orig 2015-12-31 18:29:53.000000000 +0000 +--- src/http.c.orig 2017-08-03 00:27:06.000000000 +0000 +++ src/http.c @@ -14,6 +14,9 @@ #endif @@ -17,7 +17,7 @@ https://trac.xiph.org/ticket/2014 #include <ctype.h> #include <errno.h> #include <limits.h> -@@ -347,7 +350,7 @@ typedef int op_sock; +@@ -355,7 +358,7 @@ typedef int op_sock; # define op_reset_errno() (errno=0) # endif @@ -26,7 +26,7 @@ https://trac.xiph.org/ticket/2014 # include <openssl/x509v3.h> /*The maximum number of simultaneous connections. -@@ -788,7 +791,7 @@ struct OpusHTTPConn{ +@@ -799,7 +802,7 @@ struct OpusHTTPConn{ /*The next connection in either the LRU or free list.*/ OpusHTTPConn *next; /*The last time we blocked for reading from this connection.*/ @@ -35,7 +35,7 @@ https://trac.xiph.org/ticket/2014 /*The number of bytes we've read since the last time we blocked.*/ opus_int64 read_bytes; /*The estimated throughput of this connection, in bytes/s.*/ -@@ -838,7 +841,7 @@ struct OpusHTTPStream{ +@@ -849,7 +852,7 @@ struct OpusHTTPStream{ struct sockaddr_in6 v6; } addr; /*The last time we re-resolved the host.*/ @@ -44,7 +44,7 @@ https://trac.xiph.org/ticket/2014 /*A buffer used to build HTTP requests.*/ OpusStringBuf request; /*A buffer used to build proxy CONNECT requests.*/ -@@ -992,26 +995,26 @@ static int op_http_conn_estimate_availab +@@ -1004,26 +1007,26 @@ static int op_http_conn_estimate_availab return available; } @@ -79,16 +79,16 @@ https://trac.xiph.org/ticket/2014 read_delta_ms=op_time_diff_ms(&read_time,&_conn->read_time); read_rate=_conn->read_rate; read_delta_ms=OP_MAX(read_delta_ms,1); -@@ -1902,7 +1905,7 @@ static int op_sock_connect_next(op_sock +@@ -2015,7 +2018,7 @@ static int op_sock_connect_next(op_sock # define OP_NPROTOS (2) static int op_http_connect_impl(OpusHTTPStream *_stream,OpusHTTPConn *_conn, -- const struct addrinfo *_addrs,struct timeb *_start_time){ -+ const struct addrinfo *_addrs,struct timeval *_start_time){ - const struct addrinfo *addr; - const struct addrinfo *addrs[OP_NPROTOS]; - struct pollfd fds[OP_NPROTOS]; -@@ -1932,7 +1935,7 @@ static int op_http_connect_impl(OpusHTTP +- struct addrinfo *_addrs,struct timeb *_start_time){ ++ struct addrinfo *_addrs,struct timeval *_start_time){ + struct addrinfo *addr; + struct addrinfo *addrs[OP_NPROTOS]; + struct pollfd fds[OP_NPROTOS]; +@@ -2045,7 +2048,7 @@ static int op_http_connect_impl(OpusHTTP _stream->free_head=_conn->next; _conn->next=_stream->lru_head; _stream->lru_head=_conn; @@ -97,14 +97,14 @@ https://trac.xiph.org/ticket/2014 *&_conn->read_time=*_start_time; _conn->read_bytes=0; _conn->read_rate=0; -@@ -2034,14 +2037,14 @@ static int op_http_connect_impl(OpusHTTP +@@ -2147,14 +2150,14 @@ static int op_http_connect_impl(OpusHTTP } static int op_http_connect(OpusHTTPStream *_stream,OpusHTTPConn *_conn, -- const struct addrinfo *_addrs,struct timeb *_start_time){ +- struct addrinfo *_addrs,struct timeb *_start_time){ - struct timeb resolve_time; -+ const struct addrinfo *_addrs,struct timeval *_start_time){ -+ struct timeval resolve_time; ++ struct addrinfo *_addrs,struct timeval *_start_time){ ++ struct timeval resolve_time; struct addrinfo *new_addrs; int ret; /*Re-resolve the host if we need to (RFC 6555 says we MUST do so @@ -115,7 +115,7 @@ https://trac.xiph.org/ticket/2014 if(_addrs!=&_stream->addr_info||op_time_diff_ms(&resolve_time, &_stream->resolve_time)>=OP_RESOLVE_CACHE_TIMEOUT_MS){ new_addrs=op_resolve(_stream->connect_host,_stream->connect_port); -@@ -2191,8 +2194,8 @@ static int op_http_stream_open(OpusHTTPS +@@ -2305,8 +2308,8 @@ static int op_http_stream_open(OpusHTTPS addrs=NULL; for(nredirs=0;nredirs<OP_REDIRECT_LIMIT;nredirs++){ OpusParsedURL next_url; @@ -126,7 +126,7 @@ https://trac.xiph.org/ticket/2014 char *next; char *status_code; int minor_version_pos; -@@ -2321,7 +2324,7 @@ static int op_http_stream_open(OpusHTTPS +@@ -2440,7 +2443,7 @@ static int op_http_stream_open(OpusHTTPS if(OP_UNLIKELY(ret<0))return ret; ret=op_http_conn_read_response(_stream->conns+0,&_stream->response); if(OP_UNLIKELY(ret<0))return ret; @@ -135,7 +135,7 @@ https://trac.xiph.org/ticket/2014 next=op_http_parse_status_line(&v1_1_compat,&status_code, _stream->response.buf); if(OP_UNLIKELY(next==NULL))return OP_FALSE; -@@ -2733,8 +2736,8 @@ static int op_http_conn_handle_response( +@@ -2852,8 +2855,8 @@ static int op_http_conn_handle_response( converted into a request for the rest.*/ static int op_http_conn_open_pos(OpusHTTPStream *_stream, OpusHTTPConn *_conn,opus_int64 _pos,opus_int32 _chunk_size){ @@ -146,16 +146,16 @@ https://trac.xiph.org/ticket/2014 opus_int32 connect_rate; opus_int32 connect_time; int ret; -@@ -2744,7 +2747,7 @@ static int op_http_conn_open_pos(OpusHTT +@@ -2863,7 +2866,7 @@ static int op_http_conn_open_pos(OpusHTT if(OP_UNLIKELY(ret<0))return ret; ret=op_http_conn_handle_response(_stream,_conn); if(OP_UNLIKELY(ret!=0))return OP_FALSE; - ftime(&end_time); + gettimeofday(&end_time, NULL); - _stream->cur_conni=_conn-_stream->conns; + _stream->cur_conni=(int)(_conn-_stream->conns); OP_ASSERT(_stream->cur_conni>=0&&_stream->cur_conni<OP_NCONNS_MAX); /*The connection has been successfully opened. -@@ -2996,7 +2999,7 @@ static int op_http_conn_read_ahead(OpusH +@@ -3115,7 +3118,7 @@ static int op_http_conn_read_ahead(OpusH } static int op_http_stream_seek(void *_stream,opus_int64 _offset,int _whence){ @@ -164,7 +164,7 @@ https://trac.xiph.org/ticket/2014 OpusHTTPStream *stream; OpusHTTPConn *conn; OpusHTTPConn **pnext; -@@ -3037,7 +3040,7 @@ static int op_http_stream_seek(void *_st +@@ -3156,7 +3159,7 @@ static int op_http_stream_seek(void *_st op_http_conn_read_rate_update(stream->conns+ci); *&seek_time=*&stream->conns[ci].read_time; } |