CVS commit: pkgsrc/audio/icecast

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Dec 20 15:42:14 UTC 2018

Modified Files:
        pkgsrc/audio/icecast: Makefile distinfo
Added Files:
        pkgsrc/audio/icecast/patches: patch-src_connection.c

Log Message:
icecast: update to 2.4.3nb10.

Check some return values, fixes core dump when ssl_ctx is NULL.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/audio/icecast/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/audio/icecast/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/icecast/patches/patch-src_connection.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/icecast/Makefile
diff -u pkgsrc/audio/icecast/Makefile:1.69 pkgsrc/audio/icecast/Makefile:1.70
--- pkgsrc/audio/icecast/Makefile:1.69  Thu Dec 13 19:51:41 2018
+++ pkgsrc/audio/icecast/Makefile       Thu Dec 20 15:42:13 2018
@@ -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/
 

Index: pkgsrc/audio/icecast/distinfo
diff -u pkgsrc/audio/icecast/distinfo:1.22 pkgsrc/audio/icecast/distinfo:1.23
--- pkgsrc/audio/icecast/distinfo:1.22  Tue Feb  9 07:02:54 2016
+++ pkgsrc/audio/icecast/distinfo       Thu Dec 20 15:42:14 2018
@@ -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 by
 SHA1 (patch-aa) = d3f4891295143adc261b3bf076e924f4540c6030
 SHA1 (patch-ab) = 4abb78f2067369600851abca71bb19049d8a41e8
 SHA1 (patch-ac) = ce0a5474a88e5b768cd1c37ee0c934895a49093a
+SHA1 (patch-src_connection.c) = 8f1421cc84cacabfd94d873f2b6a159337944a79

Added files:

Index: pkgsrc/audio/icecast/patches/patch-src_connection.c
diff -u /dev/null pkgsrc/audio/icecast/patches/patch-src_connection.c:1.1
--- /dev/null   Thu Dec 20 15:42:14 2018
+++ pkgsrc/audio/icecast/patches/patch-src_connection.c Thu Dec 20 15:42:14 2018
@@ -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);