Tue May 12 07:49:16 2015 UTC ()
Upgrade to icecast-2.4.2.

Addresses a security issue with "stream_auth" (not used by default).
http://lists.xiph.org/pipermail/icecast-dev/2015-April/002460.html


(kim)
diff -r1.58 -r1.59 pkgsrc/audio/icecast/Makefile
diff -r1.16 -r1.17 pkgsrc/audio/icecast/PLIST
diff -r1.19 -r1.20 pkgsrc/audio/icecast/distinfo
diff -r1.5 -r1.6 pkgsrc/audio/icecast/patches/patch-aa
diff -r1.9 -r1.10 pkgsrc/audio/icecast/patches/patch-ab
diff -r1.4 -r1.5 pkgsrc/audio/icecast/patches/patch-ac
diff -r1.1 -r0 pkgsrc/audio/icecast/patches/patch-ad
cvs diff -r1.58 -r1.59 pkgsrc/audio/icecast/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/icecast/Makefile 2014/02/12 23:17:33 1.58
+++ pkgsrc/audio/icecast/Makefile 2015/05/12 07:49:16 1.59
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: Makefile,v 1.58 2014/02/12 23:17:33 tron Exp $ 1# $NetBSD: Makefile,v 1.59 2015/05/12 07:49:16 kim Exp $
2# 2#
3 3
4DISTNAME= icecast-2.3.3 4DISTNAME= icecast-2.4.2
5PKGREVISION= 2 5#PKGREVISION= 0
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= http://downloads.xiph.org/releases/icecast/ 7MASTER_SITES= http://downloads.xiph.org/releases/icecast/
8 8
9MAINTAINER= kim@tac.nyc.ny.us 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.icecast.org/ 10HOMEPAGE= http://www.icecast.org/
11COMMENT= Live streaming audio server 11COMMENT= Live streaming audio server
 12LICENSE= gnu-gpl-v2
12 13
13USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
14USE_LIBTOOL= yes 15USE_LIBTOOL= yes
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16PTHREAD_AUTO_VARS= yes 17PTHREAD_AUTO_VARS= yes
17 18
18BUILD_DEFS+= ICECAST_CHROOTDIR 19BUILD_DEFS+= ICECAST_CHROOTDIR
19 20
20PKG_SYSCONFSUBDIR= icecast 21PKG_SYSCONFSUBDIR= icecast
21RCD_SCRIPTS= icecast 22RCD_SCRIPTS= icecast
22 23
23ICECAST_LOGDIR?= ${ICECAST_CHROOTDIR}/log 24ICECAST_LOGDIR?= ${ICECAST_CHROOTDIR}/log
24 25
cvs diff -r1.16 -r1.17 pkgsrc/audio/icecast/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/icecast/PLIST 2014/03/11 14:04:57 1.16
+++ pkgsrc/audio/icecast/PLIST 2015/05/12 07:49:16 1.17
@@ -1,49 +1,59 @@ @@ -1,49 +1,59 @@
1@comment $NetBSD: PLIST,v 1.16 2014/03/11 14:04:57 jperkin Exp $ 1@comment $NetBSD: PLIST,v 1.17 2015/05/12 07:49:16 kim Exp $
2bin/icecast 2bin/icecast
3share/doc/icecast/AUTHORS 3share/doc/icecast/AUTHORS
4share/doc/icecast/COPYING 4share/doc/icecast/COPYING
5share/doc/icecast/ChangeLog 5share/doc/icecast/ChangeLog
6share/doc/icecast/NEWS 6share/doc/icecast/NEWS
7share/doc/icecast/README 7share/doc/icecast/README
8share/doc/icecast/TODO 8share/doc/icecast/TODO
9share/doc/icecast/icecast2_admin.html 9share/doc/icecast/admin-interface.html
10share/doc/icecast/icecast2_basicsetup.html 10share/doc/icecast/assets/css/style.css
11share/doc/icecast/icecast2_changes.html 11share/doc/icecast/assets/font/FiraMono-Bold.eot
12share/doc/icecast/icecast2_config_file.html 12share/doc/icecast/assets/font/FiraMono-Bold.woff
13share/doc/icecast/icecast2_faq.html 13share/doc/icecast/assets/font/FiraMono-Regular.eot
14share/doc/icecast/icecast2_glossary.html 14share/doc/icecast/assets/font/FiraMono-Regular.woff
15share/doc/icecast/icecast2_introduction.html 15share/doc/icecast/assets/font/FiraSans-Bold.eot
16share/doc/icecast/icecast2_listenerauth.html 16share/doc/icecast/assets/font/FiraSans-Bold.woff
17share/doc/icecast/icecast2_relay.html 17share/doc/icecast/assets/font/FiraSans-BoldItalic.eot
18share/doc/icecast/icecast2_stats.html 18share/doc/icecast/assets/font/FiraSans-BoldItalic.woff
19share/doc/icecast/icecast2_win32.html 19share/doc/icecast/assets/font/FiraSans-Italic.eot
20share/doc/icecast/icecast2_yp.html 20share/doc/icecast/assets/font/FiraSans-Italic.woff
 21share/doc/icecast/assets/font/FiraSans-Regular.eot
 22share/doc/icecast/assets/font/FiraSans-Regular.woff
 23share/doc/icecast/assets/img/xiph-community.svg
 24share/doc/icecast/auth.html
 25share/doc/icecast/basic-setup.html
 26share/doc/icecast/changes.html
 27share/doc/icecast/config-file.html
 28share/doc/icecast/faq.html
 29share/doc/icecast/glossary.html
 30share/doc/icecast/img/listener_auth1.png
 31share/doc/icecast/img/listener_auth2.png
 32share/doc/icecast/img/listener_auth3.png
 33share/doc/icecast/img/masterslave.png
 34share/doc/icecast/img/relay.png
21share/doc/icecast/index.html 35share/doc/icecast/index.html
22share/doc/icecast/listener_auth1.jpg 36share/doc/icecast/introduction.html
23share/doc/icecast/listener_auth2.jpg 37share/doc/icecast/relaying.html
24share/doc/icecast/listener_auth3.jpg 38share/doc/icecast/server-stats.html
25share/doc/icecast/masterslave.png 39share/doc/icecast/win32.html
26share/doc/icecast/relay.png 40share/doc/icecast/yp.html
27share/examples/icecast/icecast.xml 41share/examples/icecast/icecast.xml
28share/icecast/admin/listclients.xsl 42share/icecast/admin/listclients.xsl
29share/icecast/admin/listmounts.xsl 43share/icecast/admin/listmounts.xsl
30share/icecast/admin/manageauth.xsl 44share/icecast/admin/manageauth.xsl
31share/icecast/admin/moveclients.xsl 45share/icecast/admin/moveclients.xsl
32share/icecast/admin/response.xsl 46share/icecast/admin/response.xsl
33share/icecast/admin/stats.xsl 47share/icecast/admin/stats.xsl
34share/icecast/admin/updatemetadata.xsl 48share/icecast/admin/updatemetadata.xsl
35share/icecast/admin/vclt.xsl 49share/icecast/admin/vclt.xsl
36share/icecast/admin/xspf.xsl 50share/icecast/admin/xspf.xsl
37share/icecast/web/auth.xsl 51share/icecast/web/auth.xsl
38share/icecast/web/corner_bottomleft.jpg 
39share/icecast/web/corner_bottomright.jpg 
40share/icecast/web/corner_topleft.jpg 
41share/icecast/web/corner_topright.jpg 
42share/icecast/web/icecast.png 52share/icecast/web/icecast.png
43share/icecast/web/key.gif 
44share/icecast/web/key.png 53share/icecast/web/key.png
45share/icecast/web/server_version.xsl 54share/icecast/web/server_version.xsl
 55share/icecast/web/status-json.xsl
46share/icecast/web/status.xsl 56share/icecast/web/status.xsl
47share/icecast/web/status2.xsl 
48share/icecast/web/style.css 57share/icecast/web/style.css
49share/icecast/web/tunein.png 58share/icecast/web/tunein.png
 59share/icecast/web/xml2json.xslt
cvs diff -r1.19 -r1.20 pkgsrc/audio/icecast/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/icecast/distinfo 2013/10/22 19:27:52 1.19
+++ pkgsrc/audio/icecast/distinfo 2015/05/12 07:49:16 1.20
@@ -1,9 +1,8 @@ @@ -1,9 +1,8 @@
1$NetBSD: distinfo,v 1.19 2013/10/22 19:27:52 drochner Exp $ 1$NetBSD: distinfo,v 1.20 2015/05/12 07:49:16 kim Exp $
2 2
3SHA1 (icecast-2.3.3.tar.gz) = 61cf1bd5b4ed491aad488dc6cf1ca2d8eb657363 3SHA1 (icecast-2.4.2.tar.gz) = 57a092302ab8aa4993fa280f299c099d25e875a5
4RMD160 (icecast-2.3.3.tar.gz) = be8e45623c065e7beffbe6266a8bbf7bc9fe93d8 4RMD160 (icecast-2.4.2.tar.gz) = ecf6d75c722766782c8f61b9a206bb35f8dcfcff
5Size (icecast-2.3.3.tar.gz) = 1161774 bytes 5Size (icecast-2.4.2.tar.gz) = 2388381 bytes
6SHA1 (patch-aa) = 2d85cabe25cf3860e42110eaf3fa5e2b1775e0cf 6SHA1 (patch-aa) = d3f4891295143adc261b3bf076e924f4540c6030
7SHA1 (patch-ab) = 96fb7e5b569dc69d272b38064dee5937bb2f467a 7SHA1 (patch-ab) = f5607e7337399d356997c327f3bf89957f6e770e
8SHA1 (patch-ac) = 2dc9423ed461bb9da95aaa4bc5384966bfbe05a0 8SHA1 (patch-ac) = ce0a5474a88e5b768cd1c37ee0c934895a49093a
9SHA1 (patch-ad) = 9b6388d99bae8239138689673dc26286323ae803 
cvs diff -r1.5 -r1.6 pkgsrc/audio/icecast/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/icecast/patches/patch-aa 2008/08/10 11:09:01 1.5
+++ pkgsrc/audio/icecast/patches/patch-aa 2015/05/12 07:49:16 1.6
@@ -1,13 +1,16 @@ @@ -1,13 +1,16 @@
1$NetBSD: patch-aa,v 1.5 2008/08/10 11:09:01 kim Exp $ 1$NetBSD: patch-aa,v 1.6 2015/05/12 07:49:16 kim Exp $
2 2
3--- Makefile.in.orig 2008-05-30 02:58:59.000000000 +0300 3Do not build conf (installed "manually" by pkgsrc Makefile),
4+++ Makefile.in 2008-06-21 13:05:29.000000000 +0300 4win32 (not needed) or examples (not wanted).
5@@ -236,7 +236,7 @@ 5
 6--- Makefile.in.orig 2015-04-08 10:11:17.000000000 +0000
 7+++ Makefile.in 2015-05-12 07:15:38.000000000 +0000
 8@@ -386,7 +386,7 @@
6 top_srcdir = @top_srcdir@ 9 top_srcdir = @top_srcdir@
7 AUTOMAKE_OPTIONS = foreign dist-zip 10 AUTOMAKE_OPTIONS = foreign dist-zip
8 ACLOCAL_AMFLAGS = -I m4 11 ACLOCAL_AMFLAGS = -I m4
9-SUBDIRS = src conf debian doc web admin win32 examples 12-SUBDIRS = src conf doc web admin win32 examples
10+SUBDIRS = src doc web admin 13+SUBDIRS = src doc web admin
11 EXTRA_DIST = HACKING m4/acx_pthread.m4 m4/ogg.m4 \ 14 EXTRA_DIST = HACKING m4/acx_pthread.m4 m4/ogg.m4 \
12 m4/theora.m4 m4/vorbis.m4 m4/speex.m4 \ 15 m4/theora.m4 m4/vorbis.m4 m4/speex.m4 \
13 m4/xiph_compiler.m4 m4/xiph_curl.m4 m4/xiph_net.m4 \ 16 m4/xiph_compiler.m4 m4/xiph_curl.m4 m4/xiph_net.m4 \
cvs diff -r1.9 -r1.10 pkgsrc/audio/icecast/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/audio/icecast/patches/patch-ab 2013/10/22 19:27:52 1.9
+++ pkgsrc/audio/icecast/patches/patch-ab 2015/05/12 07:49:16 1.10
@@ -1,44 +1,47 @@ @@ -1,44 +1,47 @@
1$NetBSD: patch-ab,v 1.9 2013/10/22 19:27:52 drochner Exp $ 1$NetBSD: patch-ab,v 1.10 2015/05/12 07:49:16 kim Exp $
2 2
3--- conf/icecast.fixme.orig 2012-06-11 16:45:19.000000000 +0000 3Allow for paths, user and group to be set via pkgsrc Makefile.
4+++ conf/icecast.fixme 4Decrease amount of logging a little bit by default.
5@@ -131,14 +131,14 @@ 5
 6--- conf/icecast.fixme.orig 2015-04-08 08:06:13.000000000 +0000
 7+++ conf/icecast.fixme 2015-05-12 07:19:45.000000000 +0000
 8@@ -191,14 +191,14 @@
6  9
7 <paths> 10 <paths>
8 <!-- basedir is only used if chroot is enabled --> 11 <!-- basedir is only used if chroot is enabled -->
9- <basedir>@pkgdatadir@</basedir> 12- <basedir>@pkgdatadir@</basedir>
10+ <basedir>@BASEDIR@</basedir> 13+ <basedir>@BASEDIR@</basedir>
11  14
12 <!-- Note that if <chroot> is turned on below, these paths must both 15 <!-- Note that if <chroot> is turned on below, these paths must both
13 be relative to the new root, not the original root --> 16 be relative to the new root, not the original root -->
14- <logdir>@localstatedir@/log/@PACKAGE@</logdir> 17- <logdir>@localstatedir@/log/@PACKAGE@</logdir>
15- <webroot>@pkgdatadir@/web</webroot> 18- <webroot>@pkgdatadir@/web</webroot>
16- <adminroot>@pkgdatadir@/admin</adminroot> 19- <adminroot>@pkgdatadir@/admin</adminroot>
17- <!-- <pidfile>@pkgdatadir@/icecast.pid</pidfile> --> 20- <!-- <pidfile>@pkgdatadir@/icecast.pid</pidfile> -->
18+ <logdir>@LOGDIR@</logdir> 21+ <logdir>@LOGDIR@</logdir>
19+ <webroot>@WEBROOT@</webroot> 22+ <webroot>@WEBROOT@</webroot>
20+ <adminroot>@ADMINROOT@</adminroot> 23+ <adminroot>@ADMINROOT@</adminroot>
21+ <pidfile>@PIDDIR@/icecast.pid</pidfile> 24+ <pidfile>@PIDDIR@/icecast.pid</pidfile>
22  25
23 <!-- Aliases: treat requests for 'source' path as being for 'dest' path 26 <!-- Aliases: treat requests for 'source' path as being for 'dest' path
24 May be made specific to a port or bound address using the "port" 27 May be made specific to a port or bound address using the "port"
25@@ -158,7 +158,7 @@ 28@@ -222,7 +222,7 @@
26 <accesslog>access.log</accesslog> 29 <accesslog>access.log</accesslog>
27 <errorlog>error.log</errorlog> 30 <errorlog>error.log</errorlog>
28 <!-- <playlistlog>playlist.log</playlistlog> --> 31 <!-- <playlistlog>playlist.log</playlistlog> -->
29- <loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error --> 32- <loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
30+ <loglevel>2</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error --> 33+ <loglevel>2</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
31 <logsize>10000</logsize> <!-- Max size of a logfile --> 34 <logsize>10000</logsize> <!-- Max size of a logfile -->
32 <!-- If logarchive is enabled (1), then when logsize is reached 35 <!-- If logarchive is enabled (1), then when logsize is reached
33 the logfile will be moved to [error|access|playlist].log.DATESTAMP, 36 the logfile will be moved to [error|access|playlist].log.DATESTAMP,
34@@ -172,8 +172,8 @@ 37@@ -236,8 +236,8 @@
35 <chroot>0</chroot> 38 <chroot>0</chroot>
36 <!-- 39 <!--
37 <changeowner> 40 <changeowner>
38- <user>nobody</user> 41- <user>nobody</user>
39- <group>nogroup</group> 42- <group>nogroup</group>
40+ <user>@ICECAST_USER@</user> 43+ <user>@ICECAST_USER@</user>
41+ <group>@ICECAST_GROUP@</group> 44+ <group>@ICECAST_GROUP@</group>
42 </changeowner> 45 </changeowner>
43 --> 46 -->
44 </security> 47 </security>
cvs diff -r1.4 -r1.5 pkgsrc/audio/icecast/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/audio/icecast/patches/patch-ac 2013/10/22 19:27:52 1.4
+++ pkgsrc/audio/icecast/patches/patch-ac 2015/05/12 07:49:16 1.5
@@ -1,22 +1,24 @@ @@ -1,22 +1,24 @@
1$NetBSD: patch-ac,v 1.4 2013/10/22 19:27:52 drochner Exp $ 1$NetBSD: patch-ac,v 1.5 2015/05/12 07:49:16 kim Exp $
2 2
3--- configure.orig 2012-06-11 17:03:18.000000000 +0000 3Fix bashisms. Only doing configure, to avoid regen from configure.in.
4+++ configure 4
5@@ -13214,7 +13214,7 @@ else 5--- configure.orig 2015-04-08 09:30:42.000000000 +0000
 6+++ configure 2015-05-12 07:01:52.000000000 +0000
 7@@ -13435,7 +13435,7 @@
6 have_kate=no 8 have_kate=no
7 fi 9 fi
8  10
9-if test "x$have_kate" == "xyes" 11-if test "x$have_kate" == "xyes"
10+if test "x$have_kate" = "xyes" 12+if test "x$have_kate" = "xyes"
11 then 13 then
12 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kate_ogg_decode_headerin in -loggkate" >&5 14 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kate_ogg_decode_headerin in -loggkate" >&5
13 $as_echo_n "checking for kate_ogg_decode_headerin in -loggkate... " >&6; } 15 $as_echo_n "checking for kate_ogg_decode_headerin in -loggkate... " >&6; }
14@@ -13258,7 +13258,7 @@ else 16@@ -13479,7 +13479,7 @@
15 have_kate=no 17 have_kate=no
16 fi 18 fi
17  19
18- if test "x$have_kate" == "xyes" 20- if test "x$have_kate" == "xyes"
19+ if test "x$have_kate" = "xyes" 21+ if test "x$have_kate" = "xyes"
20 then 22 then
21 KATE_LIBS="-loggkate -lkate -logg" 23 KATE_LIBS="-loggkate -lkate -logg"
22  24
File Deleted: pkgsrc/audio/icecast/patches/Attic/patch-ad