From 0b6ad2e77d72ac09db3a46c4e4531ac6685fe973 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 12 Oct 2005 22:26:59 +0000 Subject: Update to 2.3.0. Slightly based on PR 31558 by Eric Schnoebelen. **** New features for 2.3.0 **** - Streaming support for ogg speex, ogg flac, ogg midi - intro file support - per mount settable Intro files will play when a listener first connects to a stream. This is designed for station jingles and the like. If you don't broadcast in ogg vorbis, you must make sure the bitrate/samplerate/number of channels match up to your stream. - on-demand relays, global and per-relay settable On demand relays only connect to the relayed content when there are listeners attached to the relay. This can save bandwidth in certain cases. - fallback to file, extends on the intro file handling. With this feature, you can specify a "fallback file" which will be played in a loop and sent your currently connected listeners in the event of a source client disconnect. This means your listeners stay connected while you fix your disconnect problem. Same rules regarding bitrate/samplerate/ number of channels apply as with intro files. - new mount-level settings 1. public, type/subtype, genre settings, stream description, stream url, stream name, bitrate (override what is sent from the source client) 2. mp3 metadata interval 3. on-[dis]connect scripts can be stated per-mount, invoked at source start/stop and take 1 arg which is the mountpoint. - New URL listener authenticator. This delegates your listener authorization to an external application. URL calls are made on listener connect/disconnect as well as source connect/disconnect. It is meant for large broadcasters who have existing authentication systems that need to be integrated into. Included is an example php-based application that can be used in conjunction with the url authenticator to manage a simple subscription-based broadcast. - HTPasswd authenticator uses in-memory structures now. - On demand files now can be fed through an authenticator - Update to admin/web xslt interface - Icecast can now be installed as a win32 service **** Fixes for 2.3.0 **** - real/helix works - win32 access log correct - stats client is stable now (curl -X STATS http://admin@host:port/) - show mountpoints on stats that are inactive but have an active fallback - more updates over HUP possible - improved stability under heavy load - moving clients will no longer sometimes deadlock the server - avoid small writes to reduce TCP overhead. pkg changes: Enable theora, speex. make libxml2 dependency explicit. --- audio/icecast/Makefile | 8 +++++--- audio/icecast/PLIST | 9 ++++++++- audio/icecast/distinfo | 12 ++++++------ audio/icecast/patches/patch-aa | 10 +++++----- audio/icecast/patches/patch-ab | 8 ++++---- 5 files changed, 28 insertions(+), 19 deletions(-) diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile index 0a9c55dc204..456f3edf70d 100644 --- a/audio/icecast/Makefile +++ b/audio/icecast/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.34 2005/08/23 11:48:47 rillig Exp $ +# $NetBSD: Makefile,v 1.35 2005/10/12 22:26:59 wiz Exp $ # -DISTNAME= icecast-2.2.0 -PKGREVISION= 1 +DISTNAME= icecast-2.3.0 CATEGORIES= audio MASTER_SITES= http://svn.xiph.org/releases/icecast/ @@ -54,7 +53,10 @@ post-install: ) .include "../../audio/libvorbis/buildlink3.mk" +.include "../../audio/speex/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" +.include "../../multimedia/libtheora/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../www/curl/buildlink3.mk" diff --git a/audio/icecast/PLIST b/audio/icecast/PLIST index 4ee60a415ae..9d25c81ef68 100644 --- a/audio/icecast/PLIST +++ b/audio/icecast/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2005/05/02 20:33:57 reed Exp $ +@comment $NetBSD: PLIST,v 1.12 2005/10/12 22:26:59 wiz Exp $ bin/icecast share/doc/icecast/AUTHORS share/doc/icecast/COPYING @@ -8,6 +8,7 @@ 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 @@ -18,6 +19,9 @@ share/doc/icecast/icecast2_stats.html share/doc/icecast/icecast2_win32.html share/doc/icecast/icecast2_yp.html share/doc/icecast/index.html +share/doc/icecast/listener_auth1.jpg +share/doc/icecast/listener_auth2.jpg +share/doc/icecast/listener_auth3.jpg share/examples/icecast/icecast.xml share/examples/rc.d/icecast share/icecast/admin/listclients.xsl @@ -34,9 +38,12 @@ 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.xsl share/icecast/web/status2.xsl share/icecast/web/style.css +share/icecast/web/tunein.png @dirrm share/icecast/web @dirrm share/icecast/admin @dirrm share/icecast diff --git a/audio/icecast/distinfo b/audio/icecast/distinfo index f8a853f4c13..4da6fb6885a 100644 --- a/audio/icecast/distinfo +++ b/audio/icecast/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.14 2005/02/23 20:39:46 agc Exp $ +$NetBSD: distinfo,v 1.15 2005/10/12 22:26:59 wiz Exp $ -SHA1 (icecast-2.2.0.tar.gz) = 5cfd558b159517a55bdf99da8e5e5ebeca232a5e -RMD160 (icecast-2.2.0.tar.gz) = 536ae6c658937e2b273ca218408056e69e26f798 -Size (icecast-2.2.0.tar.gz) = 702418 bytes -SHA1 (patch-aa) = 8da022897737e6fd5ef335b75ecde119bc01a114 -SHA1 (patch-ab) = 521ccf6ed4fb6492197a86c9c3a83aa56b40ef12 +SHA1 (icecast-2.3.0.tar.gz) = 9210403649d178591d5f750bc88896352480ccb8 +RMD160 (icecast-2.3.0.tar.gz) = 59ffe3fa53ef20d4a31c2d9ac3b73d2edc064911 +Size (icecast-2.3.0.tar.gz) = 1091422 bytes +SHA1 (patch-aa) = 907083be5ba10710180a58054358d53dbbce37e4 +SHA1 (patch-ab) = a0a1c457d772446e16caba1eec925ac3c4b760b7 diff --git a/audio/icecast/patches/patch-aa b/audio/icecast/patches/patch-aa index be4c056aa38..87297a1458e 100644 --- a/audio/icecast/patches/patch-aa +++ b/audio/icecast/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.3 2005/01/02 17:46:39 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2005/10/12 22:26:59 wiz Exp $ ---- Makefile.in.orig 2004-12-21 20:31:02.000000000 +0100 +--- Makefile.in.orig 2005-09-23 16:18:44.000000000 -0500 +++ Makefile.in -@@ -124,7 +124,7 @@ install_sh = @install_sh@ +@@ -128,7 +128,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 conf debian 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/theora.m4 m4/vorbis.m4 m4/speex.m4 \ diff --git a/audio/icecast/patches/patch-ab b/audio/icecast/patches/patch-ab index 38399e8b614..33fe059258c 100644 --- a/audio/icecast/patches/patch-ab +++ b/audio/icecast/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2005/01/02 17:46:39 wiz Exp $ +$NetBSD: patch-ab,v 1.7 2005/10/12 22:26:59 wiz Exp $ ---- conf/icecast.fixme.orig 2004-12-02 22:15:35.000000000 +0100 +--- conf/icecast.fixme.orig 2005-09-08 16:03:51.000000000 +0200 +++ conf/icecast.fixme -@@ -110,14 +110,15 @@ +@@ -132,14 +132,15 @@ @@ -23,7 +23,7 @@ $NetBSD: patch-ab,v 1.6 2005/01/02 17:46:39 wiz Exp $ -- cgit v1.2.3