diff options
| author | wiz <wiz@pkgsrc.org> | 2018-12-20 15:42:13 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2018-12-20 15:42:13 +0000 |
| commit | 1423662491b25cdae9c942f2deb608872f6427ee (patch) | |
| tree | 5099733f15c1912cd197becf57d96534ef4c59ba /audio | |
| parent | eb4463808710aebdc27252feab1d7bccb47045a2 (diff) | |
| download | pkgsrc-1423662491b25cdae9c942f2deb608872f6427ee.tar.gz | |
icecast: update to 2.4.3nb10.
Check some return values, fixes core dump when ssl_ctx is NULL.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/icecast/Makefile | 4 | ||||
| -rw-r--r-- | audio/icecast/distinfo | 3 | ||||
| -rw-r--r-- | audio/icecast/patches/patch-src_connection.c | 22 |
3 files changed, 26 insertions, 3 deletions
diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile index a6b6c62c609..68233a81411 100644 --- a/audio/icecast/Makefile +++ b/audio/icecast/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.69 2018/12/13 19:51:41 adam Exp $ +# $NetBSD: Makefile,v 1.70 2018/12/20 15:42:13 wiz Exp $ DISTNAME= icecast-2.4.3 -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/icecast/ diff --git a/audio/icecast/distinfo b/audio/icecast/distinfo index e0d0987615d..d7e531018d8 100644 --- a/audio/icecast/distinfo +++ b/audio/icecast/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2016/02/09 07:02:54 adam Exp $ +$NetBSD: distinfo,v 1.23 2018/12/20 15:42:14 wiz Exp $ SHA1 (icecast-2.4.3.tar.gz) = 230e2aa5abf80010c42d41cc7c0b078fb542b080 RMD160 (icecast-2.4.3.tar.gz) = 57717c26258dd9f2a52f548bff1745e8ea9e608c @@ -7,3 +7,4 @@ Size (icecast-2.4.3.tar.gz) = 2393358 bytes SHA1 (patch-aa) = d3f4891295143adc261b3bf076e924f4540c6030 SHA1 (patch-ab) = 4abb78f2067369600851abca71bb19049d8a41e8 SHA1 (patch-ac) = ce0a5474a88e5b768cd1c37ee0c934895a49093a +SHA1 (patch-src_connection.c) = 8f1421cc84cacabfd94d873f2b6a159337944a79 diff --git a/audio/icecast/patches/patch-src_connection.c b/audio/icecast/patches/patch-src_connection.c new file mode 100644 index 00000000000..e74591921e6 --- /dev/null +++ b/audio/icecast/patches/patch-src_connection.c @@ -0,0 +1,22 @@ +$NetBSD: patch-src_connection.c,v 1.1 2018/12/20 15:42:14 wiz Exp $ + +Check some return values, fixes core dump when ssl_ctx is NULL. + +--- src/connection.c.orig 2015-12-27 16:46:32.000000000 +0000 ++++ src/connection.c +@@ -202,7 +202,15 @@ static void get_ssl_certificate (ice_con + SSL_library_init(); /* initialize library */ + + method = SSLv23_server_method(); ++ if (method == NULL) { ++ ICECAST_LOG_INFO("No SSL capability on any configured ports"); ++ return; ++ } + ssl_ctx = SSL_CTX_new (method); ++ if (ssl_ctx == NULL) { ++ ICECAST_LOG_INFO("No SSL capability on any configured ports"); ++ return; ++ } + ssl_opts = SSL_CTX_get_options (ssl_ctx); + #ifdef SSL_OP_NO_COMPRESSION + SSL_CTX_set_options (ssl_ctx, ssl_opts|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_COMPRESSION); |