update to 2.3.3

changes:
-fixed 3 security issues:
 -Improved HTTPS cipher handling and added support for chained certificates
 -Allow the source password to be undefined
 -Prevent error log injection of control characters by substituting
  non-alphanumeric characters with a '.' (CVE-2011-4612)
-Bugfixes
-Sources can now be authenticated via URL, like listeners
-XSL update

pkgsrc change:
don't set the "chroot" flag in the installed sample config file -- this
configuration doesn't work without further work because the web server
misses its data files in the sandbox

approved by The Maintainer

5 files changed, 25 insertions, 28 deletions

diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
index 427dd9e61b1..4f86c427780 100644
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2013/07/12 10:44:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.56 2013/10/22 19:27:52 drochner Exp $
 #
 
-DISTNAME=		icecast-2.3.2
-PKGREVISION=		8
+DISTNAME=		icecast-2.3.3
 CATEGORIES=		audio
 MASTER_SITES=		http://downloads.xiph.org/releases/icecast/
 
diff --git a/audio/icecast/PLIST b/audio/icecast/PLIST
index 543dae78d53..eaf1bd8eae4 100644
--- a/audio/icecast/PLIST
+++ b/audio/icecast/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 17:32:11 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2013/10/22 19:27:52 drochner Exp $
 bin/icecast
 share/doc/icecast/AUTHORS
 share/doc/icecast/COPYING
@@ -33,6 +33,8 @@ share/icecast/admin/moveclients.xsl
 share/icecast/admin/response.xsl
 share/icecast/admin/stats.xsl
 share/icecast/admin/updatemetadata.xsl
+share/icecast/admin/vclt.xsl
+share/icecast/admin/xspf.xsl
 share/icecast/web/auth.xsl
 share/icecast/web/corner_bottomleft.jpg
 share/icecast/web/corner_bottomright.jpg
diff --git a/audio/icecast/distinfo b/audio/icecast/distinfo
index 6f3eaf215ff..f4bcac83752 100644
--- a/audio/icecast/distinfo
+++ b/audio/icecast/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2009/07/29 13:59:59 drochner Exp $
+$NetBSD: distinfo,v 1.19 2013/10/22 19:27:52 drochner Exp $
 
-SHA1 (icecast-2.3.2.tar.gz) = a52b13505548c2eff2c64aab95a42dcafda11227
-RMD160 (icecast-2.3.2.tar.gz) = ec14553cce652fb80823316c9705f4cb6179cc2a
-Size (icecast-2.3.2.tar.gz) = 1152319 bytes
+SHA1 (icecast-2.3.3.tar.gz) = 61cf1bd5b4ed491aad488dc6cf1ca2d8eb657363
+RMD160 (icecast-2.3.3.tar.gz) = be8e45623c065e7beffbe6266a8bbf7bc9fe93d8
+Size (icecast-2.3.3.tar.gz) = 1161774 bytes
 SHA1 (patch-aa) = 2d85cabe25cf3860e42110eaf3fa5e2b1775e0cf
-SHA1 (patch-ab) = 3b9ecb2caf222f6c08646d856419595f3585f70b
-SHA1 (patch-ac) = 5637f0cd10dc4b8d03e674b701bcb16f45339eaa
+SHA1 (patch-ab) = 96fb7e5b569dc69d272b38064dee5937bb2f467a
+SHA1 (patch-ac) = 2dc9423ed461bb9da95aaa4bc5384966bfbe05a0
 SHA1 (patch-ad) = 9b6388d99bae8239138689673dc26286323ae803
diff --git a/audio/icecast/patches/patch-ab b/audio/icecast/patches/patch-ab
index a8640e4437d..20da368a6b1 100644
--- a/audio/icecast/patches/patch-ab
+++ b/audio/icecast/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2008/08/10 11:09:01 kim Exp $
+$NetBSD: patch-ab,v 1.9 2013/10/22 19:27:52 drochner Exp $
 
---- conf/icecast.fixme.orig	2008-04-04 18:14:10.000000000 +0300
-+++ conf/icecast.fixme	2008-06-21 13:12:37.000000000 +0300
-@@ -125,14 +125,14 @@
+--- conf/icecast.fixme.orig	2012-06-11 16:45:19.000000000 +0000
++++ conf/icecast.fixme
+@@ -131,14 +131,14 @@
  
      <paths>
  		<!-- basedir is only used if chroot is enabled -->
@@ -22,7 +22,7 @@ $NetBSD: patch-ab,v 1.8 2008/08/10 11:09:01 kim Exp $
  
          <!-- Aliases: treat requests for 'source' path as being for 'dest' path
               May be made specific to a port or bound address using the "port"
-@@ -152,7 +152,7 @@
+@@ -158,7 +158,7 @@
          <accesslog>access.log</accesslog>
          <errorlog>error.log</errorlog>
          <!-- <playlistlog>playlist.log</playlistlog> -->
@@ -31,12 +31,8 @@ $NetBSD: patch-ab,v 1.8 2008/08/10 11:09:01 kim Exp $
        	<logsize>10000</logsize> <!-- Max size of a logfile -->
          <!-- If logarchive is enabled (1), then when logsize is reached
               the logfile will be moved to [error|access|playlist].log.DATESTAMP,
-@@ -163,11 +163,11 @@
-     </logging>
- 
-     <security>
--        <chroot>0</chroot>
-+        <chroot>1</chroot>
+@@ -172,8 +172,8 @@
+         <chroot>0</chroot>
          <!--
          <changeowner>
 -            <user>nobody</user>
diff --git a/audio/icecast/patches/patch-ac b/audio/icecast/patches/patch-ac
index 173fd91e375..d49cc536c57 100644
--- a/audio/icecast/patches/patch-ac
+++ b/audio/icecast/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.3 2008/09/08 05:32:59 dholland Exp $
+$NetBSD: patch-ac,v 1.4 2013/10/22 19:27:52 drochner Exp $
 
---- configure~	2008-05-26 20:21:57.000000000 -0400
-+++ configure	2008-09-08 01:29:19.000000000 -0400
-@@ -23300,7 +23300,7 @@ else
+--- configure.orig	2012-06-11 17:03:18.000000000 +0000
++++ configure
+@@ -13214,7 +13214,7 @@ else
    have_kate=no
  fi
  
 -if test "x$have_kate" == "xyes"
 +if test "x$have_kate" = "xyes"
  then
-   { echo "$as_me:$LINENO: checking for kate_ogg_decode_headerin in -loggkate" >&5
- echo $ECHO_N "checking for kate_ogg_decode_headerin in -loggkate... $ECHO_C" >&6; }
-@@ -23369,7 +23369,7 @@ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kate_ogg_decode_headerin in -loggkate" >&5
+ $as_echo_n "checking for kate_ogg_decode_headerin in -loggkate... " >&6; }
+@@ -13258,7 +13258,7 @@ else
    have_kate=no
  fi