summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/icecast/Makefile5
-rw-r--r--audio/icecast/PLIST3
-rw-r--r--audio/icecast/distinfo10
-rw-r--r--audio/icecast/patches/patch-aa12
-rw-r--r--audio/icecast/patches/patch-ab17
5 files changed, 23 insertions, 24 deletions
diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
index 64581f69565..40131c1f788 100644
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2004/12/28 02:47:41 reed Exp $
+# $NetBSD: Makefile,v 1.31 2005/01/02 17:46:39 wiz Exp $
#
-DISTNAME= icecast-2.1.0
-PKGREVISION= 1
+DISTNAME= icecast-2.2.0
CATEGORIES= audio
MASTER_SITES= http://svn.xiph.org/releases/icecast/
diff --git a/audio/icecast/PLIST b/audio/icecast/PLIST
index 958878c144d..2e60c72b3ed 100644
--- a/audio/icecast/PLIST
+++ b/audio/icecast/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/11/27 20:45:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/01/02 17:46:39 wiz Exp $
bin/icecast
share/doc/icecast/AUTHORS
share/doc/icecast/COPYING
@@ -25,6 +25,7 @@ share/icecast/admin/manageauth.xsl
share/icecast/admin/moveclients.xsl
share/icecast/admin/response.xsl
share/icecast/admin/stats.xsl
+share/icecast/admin/updatemetadata.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 f6fe902edaf..70240fb98c4 100644
--- a/audio/icecast/distinfo
+++ b/audio/icecast/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2004/11/27 20:45:04 wiz Exp $
+$NetBSD: distinfo,v 1.13 2005/01/02 17:46:39 wiz Exp $
-SHA1 (icecast-2.1.0.tar.gz) = 48913d2f50e1eb2fbf058080d11413d709c95fa0
-Size (icecast-2.1.0.tar.gz) = 684382 bytes
-SHA1 (patch-aa) = fa92a4a704a3f471a0669c9933b36a3586425dc5
-SHA1 (patch-ab) = 39cf0ed1e9da8c7d90fa192731307817e91496c9
+SHA1 (icecast-2.2.0.tar.gz) = 5cfd558b159517a55bdf99da8e5e5ebeca232a5e
+Size (icecast-2.2.0.tar.gz) = 702418 bytes
+SHA1 (patch-aa) = 8da022897737e6fd5ef335b75ecde119bc01a114
+SHA1 (patch-ab) = 521ccf6ed4fb6492197a86c9c3a83aa56b40ef12
diff --git a/audio/icecast/patches/patch-aa b/audio/icecast/patches/patch-aa
index 012e0f86bd1..be4c056aa38 100644
--- a/audio/icecast/patches/patch-aa
+++ b/audio/icecast/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2004/01/08 20:49:39 xtraeme Exp $
+$NetBSD: patch-aa,v 1.3 2005/01/02 17:46:39 wiz Exp $
---- Makefile.in.orig 2004-01-08 18:59:21.000000000 +0100
-+++ Makefile.in 2004-01-08 18:59:45.000000000 +0100
-@@ -112,7 +112,7 @@
+--- Makefile.in.orig 2004-12-21 20:31:02.000000000 +0100
++++ Makefile.in
+@@ -124,7 +124,7 @@ install_sh = @install_sh@
AUTOMAKE_OPTIONS = 1.6 foreign dist-zip
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src conf debian doc web admin win32
+SUBDIRS = src doc web admin
- EXTRA_DIST = HACKING m4/acx_pthread.m4 m4/ogg.m4 m4/vorbis.m4 \
- m4/xiph_compiler.m4 m4/xiph_curl.m4 m4/xiph_net.m4 \
+ EXTRA_DIST = HACKING m4/acx_pthread.m4 m4/ogg.m4 \
+ m4/theora.m4 m4/vorbis.m4 \
diff --git a/audio/icecast/patches/patch-ab b/audio/icecast/patches/patch-ab
index 5c9894598c4..38399e8b614 100644
--- a/audio/icecast/patches/patch-ab
+++ b/audio/icecast/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2004/01/08 20:49:39 xtraeme Exp $
+$NetBSD: patch-ab,v 1.6 2005/01/02 17:46:39 wiz Exp $
---- conf/icecast.fixme.orig 2004-01-08 19:10:14.000000000 +0100
-+++ conf/icecast.fixme 2004-01-08 19:14:15.000000000 +0100
-@@ -82,14 +82,15 @@
+--- conf/icecast.fixme.orig 2004-12-02 22:15:35.000000000 +0100
++++ conf/icecast.fixme
+@@ -110,14 +110,15 @@
<paths>
<!-- basedir is only used if chroot is enabled -->
@@ -23,24 +23,23 @@ $NetBSD: patch-ab,v 1.5 2004/01/08 20:49:39 xtraeme 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"
-@@ -103,16 +104,14 @@
- <logging>
+@@ -137,15 +138,15 @@
<accesslog>access.log</accesslog>
<errorlog>error.log</errorlog>
+ <!-- <playlistlog>playlist.log</playlistlog> -->
- <loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+ <loglevel>2</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
</logging>
<security>
- <chroot>0</chroot>
-- <!--
+ <chroot>1</chroot>
+ <!--
<changeowner>
- <user>nobody</user>
- <group>nogroup</group>
+ <user>@ICECAST_USER@</user>
+ <group>@ICECAST_GROUP@</group>
</changeowner>
-- -->
+ -->
</security>
- </icecast>