[pkgsrc/trunk]: pkgsrc/audio/icecast Upgrade to icecast-2.4.2.

[kim <kim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c31db664943c
branches:  trunk
changeset: 651776:c31db664943c
user:      kim <kim%pkgsrc.org@localhost>
date:      Tue May 12 07:49:16 2015 +0000

description:
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

diffstat:

 audio/icecast/Makefile         |   9 +++--
 audio/icecast/PLIST            |  58 ++++++++++++++++++++++++-----------------
 audio/icecast/distinfo         |  15 +++++-----
 audio/icecast/patches/patch-aa |  13 +++++---
 audio/icecast/patches/patch-ab |  23 +++++++++-------
 audio/icecast/patches/patch-ac |  12 +++++---
 audio/icecast/patches/patch-ad |  15 ----------
 7 files changed, 74 insertions(+), 71 deletions(-)

diffs (241 lines):

diff -r 9f6d13b2923d -r c31db664943c audio/icecast/Makefile
--- a/audio/icecast/Makefile    Mon May 11 21:43:56 2015 +0000
+++ b/audio/icecast/Makefile    Tue May 12 07:49:16 2015 +0000
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.58 2014/02/12 23:17:33 tron Exp $
+# $NetBSD: Makefile,v 1.59 2015/05/12 07:49:16 kim Exp $
 #
 
-DISTNAME=              icecast-2.3.3
-PKGREVISION=           2
+DISTNAME=              icecast-2.4.2
+#PKGREVISION=          0
 CATEGORIES=            audio
 MASTER_SITES=          http://downloads.xiph.org/releases/icecast/
 
-MAINTAINER=            kim%tac.nyc.ny.us@localhost
+MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.icecast.org/
 COMMENT=               Live streaming audio server
+LICENSE=               gnu-gpl-v2
 
 USE_PKGLOCALEDIR=      yes
 USE_LIBTOOL=           yes
diff -r 9f6d13b2923d -r c31db664943c audio/icecast/PLIST
--- a/audio/icecast/PLIST       Mon May 11 21:43:56 2015 +0000
+++ b/audio/icecast/PLIST       Tue May 12 07:49:16 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2014/03/11 14:04:57 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.17 2015/05/12 07:49:16 kim Exp $
 bin/icecast
 share/doc/icecast/AUTHORS
 share/doc/icecast/COPYING
@@ -6,24 +6,38 @@
 share/doc/icecast/NEWS
 share/doc/icecast/README
 share/doc/icecast/TODO
-share/doc/icecast/icecast2_admin.html
-share/doc/icecast/icecast2_basicsetup.html
-share/doc/icecast/icecast2_changes.html
-share/doc/icecast/icecast2_config_file.html
-share/doc/icecast/icecast2_faq.html
-share/doc/icecast/icecast2_glossary.html
-share/doc/icecast/icecast2_introduction.html
-share/doc/icecast/icecast2_listenerauth.html
-share/doc/icecast/icecast2_relay.html
-share/doc/icecast/icecast2_stats.html
-share/doc/icecast/icecast2_win32.html
-share/doc/icecast/icecast2_yp.html
+share/doc/icecast/admin-interface.html
+share/doc/icecast/assets/css/style.css
+share/doc/icecast/assets/font/FiraMono-Bold.eot
+share/doc/icecast/assets/font/FiraMono-Bold.woff
+share/doc/icecast/assets/font/FiraMono-Regular.eot
+share/doc/icecast/assets/font/FiraMono-Regular.woff
+share/doc/icecast/assets/font/FiraSans-Bold.eot
+share/doc/icecast/assets/font/FiraSans-Bold.woff
+share/doc/icecast/assets/font/FiraSans-BoldItalic.eot
+share/doc/icecast/assets/font/FiraSans-BoldItalic.woff
+share/doc/icecast/assets/font/FiraSans-Italic.eot
+share/doc/icecast/assets/font/FiraSans-Italic.woff
+share/doc/icecast/assets/font/FiraSans-Regular.eot
+share/doc/icecast/assets/font/FiraSans-Regular.woff
+share/doc/icecast/assets/img/xiph-community.svg
+share/doc/icecast/auth.html
+share/doc/icecast/basic-setup.html
+share/doc/icecast/changes.html
+share/doc/icecast/config-file.html
+share/doc/icecast/faq.html
+share/doc/icecast/glossary.html
+share/doc/icecast/img/listener_auth1.png
+share/doc/icecast/img/listener_auth2.png
+share/doc/icecast/img/listener_auth3.png
+share/doc/icecast/img/masterslave.png
+share/doc/icecast/img/relay.png
 share/doc/icecast/index.html
-share/doc/icecast/listener_auth1.jpg
-share/doc/icecast/listener_auth2.jpg
-share/doc/icecast/listener_auth3.jpg
-share/doc/icecast/masterslave.png
-share/doc/icecast/relay.png
+share/doc/icecast/introduction.html
+share/doc/icecast/relaying.html
+share/doc/icecast/server-stats.html
+share/doc/icecast/win32.html
+share/doc/icecast/yp.html
 share/examples/icecast/icecast.xml
 share/icecast/admin/listclients.xsl
 share/icecast/admin/listmounts.xsl
@@ -35,15 +49,11 @@
 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
-share/icecast/web/corner_topleft.jpg
-share/icecast/web/corner_topright.jpg
 share/icecast/web/icecast.png
-share/icecast/web/key.gif
 share/icecast/web/key.png
 share/icecast/web/server_version.xsl
+share/icecast/web/status-json.xsl
 share/icecast/web/status.xsl
-share/icecast/web/status2.xsl
 share/icecast/web/style.css
 share/icecast/web/tunein.png
+share/icecast/web/xml2json.xslt
diff -r 9f6d13b2923d -r c31db664943c audio/icecast/distinfo
--- a/audio/icecast/distinfo    Mon May 11 21:43:56 2015 +0000
+++ b/audio/icecast/distinfo    Tue May 12 07:49:16 2015 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.19 2013/10/22 19:27:52 drochner Exp $
+$NetBSD: distinfo,v 1.20 2015/05/12 07:49:16 kim Exp $
 
-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) = 96fb7e5b569dc69d272b38064dee5937bb2f467a
-SHA1 (patch-ac) = 2dc9423ed461bb9da95aaa4bc5384966bfbe05a0
-SHA1 (patch-ad) = 9b6388d99bae8239138689673dc26286323ae803
+SHA1 (icecast-2.4.2.tar.gz) = 57a092302ab8aa4993fa280f299c099d25e875a5
+RMD160 (icecast-2.4.2.tar.gz) = ecf6d75c722766782c8f61b9a206bb35f8dcfcff
+Size (icecast-2.4.2.tar.gz) = 2388381 bytes
+SHA1 (patch-aa) = d3f4891295143adc261b3bf076e924f4540c6030
+SHA1 (patch-ab) = f5607e7337399d356997c327f3bf89957f6e770e
+SHA1 (patch-ac) = ce0a5474a88e5b768cd1c37ee0c934895a49093a
diff -r 9f6d13b2923d -r c31db664943c audio/icecast/patches/patch-aa
--- a/audio/icecast/patches/patch-aa    Mon May 11 21:43:56 2015 +0000
+++ b/audio/icecast/patches/patch-aa    Tue May 12 07:49:16 2015 +0000
@@ -1,12 +1,15 @@
-$NetBSD: patch-aa,v 1.5 2008/08/10 11:09:01 kim Exp $
+$NetBSD: patch-aa,v 1.6 2015/05/12 07:49:16 kim Exp $
 
---- Makefile.in.orig   2008-05-30 02:58:59.000000000 +0300
-+++ Makefile.in        2008-06-21 13:05:29.000000000 +0300
-@@ -236,7 +236,7 @@
+Do not build conf (installed "manually" by pkgsrc Makefile),
+win32 (not needed) or examples (not wanted).
+
+--- Makefile.in.orig   2015-04-08 10:11:17.000000000 +0000
++++ Makefile.in        2015-05-12 07:15:38.000000000 +0000
+@@ -386,7 +386,7 @@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign dist-zip
  ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = src conf debian doc web admin win32 examples
+-SUBDIRS = src conf doc web admin win32 examples
 +SUBDIRS = src doc web admin
  EXTRA_DIST = HACKING m4/acx_pthread.m4 m4/ogg.m4 \
      m4/theora.m4 m4/vorbis.m4 m4/speex.m4 \
diff -r 9f6d13b2923d -r c31db664943c audio/icecast/patches/patch-ab
--- a/audio/icecast/patches/patch-ab    Mon May 11 21:43:56 2015 +0000
+++ b/audio/icecast/patches/patch-ab    Tue May 12 07:49:16 2015 +0000
@@ -1,11 +1,14 @@
-$NetBSD: patch-ab,v 1.9 2013/10/22 19:27:52 drochner Exp $
+$NetBSD: patch-ab,v 1.10 2015/05/12 07:49:16 kim Exp $
 
---- conf/icecast.fixme.orig    2012-06-11 16:45:19.000000000 +0000
-+++ conf/icecast.fixme
-@@ -131,14 +131,14 @@
+Allow for paths, user and group to be set via pkgsrc Makefile.
+Decrease amount of logging a little bit by default.
+
+--- conf/icecast.fixme.orig    2015-04-08 08:06:13.000000000 +0000
++++ conf/icecast.fixme 2015-05-12 07:19:45.000000000 +0000
+@@ -191,14 +191,14 @@
  
      <paths>
-               <!-- basedir is only used if chroot is enabled -->
+         <!-- basedir is only used if chroot is enabled -->
 -        <basedir>@pkgdatadir@</basedir>
 +        <basedir>@BASEDIR@</basedir>
  
@@ -22,16 +25,16 @@
  
          <!-- Aliases: treat requests for 'source' path as being for 'dest' path
               May be made specific to a port or bound address using the "port"
-@@ -158,7 +158,7 @@
+@@ -222,7 +222,7 @@
          <accesslog>access.log</accesslog>
          <errorlog>error.log</errorlog>
          <!-- <playlistlog>playlist.log</playlistlog> -->
--              <loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
-+              <loglevel>2</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
-               <logsize>10000</logsize> <!-- Max size of a logfile -->
+-        <loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
++        <loglevel>2</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+         <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,
-@@ -172,8 +172,8 @@
+@@ -236,8 +236,8 @@
          <chroot>0</chroot>
          <!--
          <changeowner>
diff -r 9f6d13b2923d -r c31db664943c audio/icecast/patches/patch-ac
--- a/audio/icecast/patches/patch-ac    Mon May 11 21:43:56 2015 +0000
+++ b/audio/icecast/patches/patch-ac    Tue May 12 07:49:16 2015 +0000
@@ -1,8 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2013/10/22 19:27:52 drochner Exp $
+$NetBSD: patch-ac,v 1.5 2015/05/12 07:49:16 kim Exp $
+
+Fix bashisms. Only doing configure, to avoid regen from configure.in.
 
---- configure.orig     2012-06-11 17:03:18.000000000 +0000
-+++ configure
-@@ -13214,7 +13214,7 @@ else
+--- configure.orig     2015-04-08 09:30:42.000000000 +0000
++++ configure  2015-05-12 07:01:52.000000000 +0000
+@@ -13435,7 +13435,7 @@
    have_kate=no
  fi
  
@@ -11,7 +13,7 @@
  then
    { $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
+@@ -13479,7 +13479,7 @@
    have_kate=no
  fi
  
diff -r 9f6d13b2923d -r c31db664943c audio/icecast/patches/patch-ad
--- a/audio/icecast/patches/patch-ad    Mon May 11 21:43:56 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/07/29 13:59:59 drochner Exp $
-
---- src/main.c.orig    2008-04-23 07:18:53.000000000 +0200
-+++ src/main.c
-@@ -398,6 +398,10 @@ static void _ch_root_uid_setup(void)
-                fprintf(stdout, "Changed groupid to %i.\n", (int)gid);
-            else
-                fprintf(stdout, "Error changing groupid: %s.\n", strerror(errno));
-+         if(!setgroups(1, &gid))
-+             fprintf(stdout, "Dropped root's group memberships.\n");
-+         else
-+             fprintf(stdout, "Error dropping group memberships.\n");
-        }
- 
-        if(uid != -1) {