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

4 files changed, 28 insertions, 35 deletions

diff --git a/audio/icecast/patches/patch-aa b/audio/icecast/patches/patch-aa
index 55d3d6d09bf..0715e442dc7 100644
--- a/audio/icecast/patches/patch-aa
+++ b/audio/icecast/patches/patch-aa
@@ -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 --git a/audio/icecast/patches/patch-ab b/audio/icecast/patches/patch-ab
index 20da368a6b1..2953cd194a4 100644
--- a/audio/icecast/patches/patch-ab
+++ b/audio/icecast/patches/patch-ab
@@ -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 @@ $NetBSD: patch-ab,v 1.9 2013/10/22 19:27:52 drochner 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"
-@@ -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 --git a/audio/icecast/patches/patch-ac b/audio/icecast/patches/patch-ac
index d49cc536c57..e5be9eb2a71 100644
--- a/audio/icecast/patches/patch-ac
+++ b/audio/icecast/patches/patch-ac
@@ -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 $
 
---- configure.orig	2012-06-11 17:03:18.000000000 +0000
-+++ configure
-@@ -13214,7 +13214,7 @@ else
+Fix bashisms. Only doing configure, to avoid regen from configure.in.
+
+--- 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 @@ $NetBSD: patch-ac,v 1.4 2013/10/22 19:27:52 drochner Exp $
  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 --git a/audio/icecast/patches/patch-ad b/audio/icecast/patches/patch-ad
deleted file mode 100644
index 8ea21813903..00000000000
--- a/audio/icecast/patches/patch-ad
+++ /dev/null
@@ -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) {