Updated default config to actually work rather then silently die because of bad log directory. Created log directory and icecast user to run as. Updated with chutzpah's permission.

(Portage version: 2.1_pre6-r5)

5 files changed, 284 insertions, 13 deletions

diff --git a/net-misc/icecast/ChangeLog b/net-misc/icecast/ChangeLog
index 7880d91c3c13..4f10e08dc889 100644
--- a/net-misc/icecast/ChangeLog
+++ b/net-misc/icecast/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/icecast
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.53 2005/12/16 20:54:31 chainsaw Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.54 2006/03/23 06:05:28 cardoe Exp $
+
+*icecast-2.3.1-r1 (23 Mar 2006)
+
+  23 Mar 2006; Doug Goldstein <cardoe@gentoo.org> +files/icecast.xml,
+  +icecast-2.3.1-r1.ebuild:
+  Updated default config to actually work rather then silently die because of
+  bad log directory. Created log directory and icecast user to run as. Updated
+  with chutzpah's permission.
 
 *icecast-2.3.1 (16 Dec 2005)
 
diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest
index d6c135bc3a91..3d1404441ac8 100644
--- a/net-misc/icecast/Manifest
+++ b/net-misc/icecast/Manifest
@@ -1,25 +1,54 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e38adcc9a1fbb28c8dcfac8132b2ee74 ChangeLog 7456
+MD5 1dc4b9143454450f4f79b1a78a7b6551 ChangeLog 7775
+RMD160 ddd0af1cd5ee7eb1c892e3aca35ba0db550e72c5 ChangeLog 7775
+SHA256 4050b0736fc360c4eb4ac782d683a31f04ff92a748fe87bda490b6d36363aeda ChangeLog 7775
 MD5 a5f4b4836da859fb3b50704c437e2ba9 files/1.3.12-errno.patch 1732
+RMD160 a7597217ced94b814dd7f8e5fe60fddfd68375ce files/1.3.12-errno.patch 1732
+SHA256 d8d9391a79d8a256e5aee184098a43c3a9ac8e06dd98861d75fa5ae55633e27f files/1.3.12-errno.patch 1732
 MD5 7fea29ea3b0c1cd4cda72553db01dfa9 files/2.2.0-gentoo.patch 15011
+RMD160 d46545edd4613d6443e0d816e77d7e0ecda1b996 files/2.2.0-gentoo.patch 15011
+SHA256 1c8c6757451f2cdca1308396472dfdc327f013244613c9b93285b36d389642b5 files/2.2.0-gentoo.patch 15011
 MD5 473c7b8b865ecfdfd794414c980fe659 files/digest-icecast-2.0.1-r1 65
+RMD160 43713900199fec10fefa6a7e83450a0ab19fff32 files/digest-icecast-2.0.1-r1 65
+SHA256 90d3f9cb140bfe4799406d155196c6f75cff82151107796310db6c576001562a files/digest-icecast-2.0.1-r1 65
 MD5 222ea172a59c3efde7c67585f4b08939 files/digest-icecast-2.0.2 65
+RMD160 f0aa433693eceedbb450edfc01e91db2879f6291 files/digest-icecast-2.0.2 65
+SHA256 0640cf1309e0e0e59496ff04562cc21bcf7791b8771d988365a736cc3cab7b76 files/digest-icecast-2.0.2 65
 MD5 0d1040986ca91ef513c0666a47161be0 files/digest-icecast-2.1.0 65
+RMD160 7cd6c7393b1f61c736cb1bc7d709af2775074f70 files/digest-icecast-2.1.0 65
+SHA256 a322ff996afe256c02587f36a7212723812547b1c5c073b9fb51e80719b059a8 files/digest-icecast-2.1.0 65
 MD5 31957ee65102675eaa5950f85de03a3f files/digest-icecast-2.2.0 65
+RMD160 c9ea2510ad67baf62dae09d331cf582f6600f52c files/digest-icecast-2.2.0 65
+SHA256 c64c26c306c556d65e550f5b9738f3aba046c1dee0a72a2691318023a725c514 files/digest-icecast-2.2.0 65
 MD5 9cc7157a1ef6f789d73cd9c2ff1815cb files/digest-icecast-2.3.1 66
+RMD160 c2a80cf0c836e2490afdeda57f2eedf23d9bdc83 files/digest-icecast-2.3.1 66
+SHA256 3dde17b0a5f6bed511fa4ebdf12a93ba415457f13c18e9f9039c45d5ca53003d files/digest-icecast-2.3.1 66
+MD5 f33f8da2aeb1ada3b139e312b46da35c files/digest-icecast-2.3.1-r1 244
+RMD160 6eaa14f31d03ac8f28037b7ea9556f4a32c79bb0 files/digest-icecast-2.3.1-r1 244
+SHA256 d273cd77e123cb2b8514a39410b40d2c008c12fe7867099efc2b59f7b3a5053a files/digest-icecast-2.3.1-r1 244
+MD5 43e606b53e25fe5f50467daaac229ecc files/icecast.xml 6810
+RMD160 8f1864d8d4af6092b3901f04d670b0ab5c4d7019 files/icecast.xml 6810
+SHA256 8c9c209797d79153e0995665d08007bc2d59ff564f5e415df77212767b78f3cb files/icecast.xml 6810
 MD5 294ad1abe0a9f4abc496f53e158695be files/init.d.icecast 357
+RMD160 2bca862859c52fa079100e1ce135384529bfb89f files/init.d.icecast 357
+SHA256 0f6ab4447a9c3788b4ca9685f3d2e37fa00173c7408008a8b1cce1d090c51575 files/init.d.icecast 357
 MD5 5eff8bd7d69f53898b122ef0ce6d4019 icecast-2.0.1-r1.ebuild 1047
+RMD160 458e5726008f48cc076476855c46c6af7be75a23 icecast-2.0.1-r1.ebuild 1047
+SHA256 463473d67494f528953cbbda68f0d985ba3ad22ada60063f350860710ffbd1da icecast-2.0.1-r1.ebuild 1047
 MD5 f21d4be19306962df91c96bc5cfd7f8c icecast-2.0.2.ebuild 1113
+RMD160 8c566740a49c65d4e83c4d56c34f128d41276a9a icecast-2.0.2.ebuild 1113
+SHA256 3dc9bd1ff3662642603e0cff8c6f9953bee246545945ea7af3c7fb4b759321ee icecast-2.0.2.ebuild 1113
 MD5 f0d6c4a492be7ed7ef6f3ee6a49cb2e0 icecast-2.1.0.ebuild 1068
+RMD160 ddc05b488a2d7e4993fad147277c221e323e6e71 icecast-2.1.0.ebuild 1068
+SHA256 96163c9d9cdeade54f6b3ed7fb08606f279535329326335635e0b0e20c3960ae icecast-2.1.0.ebuild 1068
 MD5 2c2b3c9ebae24f5549c6bf6b7b71a3db icecast-2.2.0.ebuild 1152
+RMD160 92b3ff09af4ef4c77999035c40371f570a91a7dc icecast-2.2.0.ebuild 1152
+SHA256 9a8827d21a3f927e8204b930baf039fde98d658045a0493f20a3c9137155952b icecast-2.2.0.ebuild 1152
+MD5 8f1e3fd60a893626feed4b67866ebbad icecast-2.3.1-r1.ebuild 1304
+RMD160 5cc080a66f3e4f7869d439624aae199ee026e452 icecast-2.3.1-r1.ebuild 1304
+SHA256 82a998aec3303ceb9ebb0a1b71840585137af41d61404926157eae52ec708dd1 icecast-2.3.1-r1.ebuild 1304
 MD5 ce7087d4df80d089969608a5e68a8acb icecast-2.3.1.ebuild 1108
+RMD160 03a8e79bf7faa7bead5f11004d735b5bb65bcb63 icecast-2.3.1.ebuild 1108
+SHA256 d791c3c88d6432bfa04df67949697889b7bf3649fbb3f52bace2cd808484a902 icecast-2.3.1.ebuild 1108
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDoyl7p5vW4rUFj5oRAs1OAJ48Df6Nu2X7Fj239uqOiLLliK2qowCfQiZu
-i+VWkibV5h0z1oscCicLCNA=
-=vbTI
------END PGP SIGNATURE-----
+RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 metadata.xml 221
+SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e metadata.xml 221
diff --git a/net-misc/icecast/files/digest-icecast-2.3.1-r1 b/net-misc/icecast/files/digest-icecast-2.3.1-r1
new file mode 100644
index 000000000000..0f54ccbe566a
--- /dev/null
+++ b/net-misc/icecast/files/digest-icecast-2.3.1-r1
@@ -0,0 +1,3 @@
+MD5 2d80a249fa8529f82d018c6216108ea8 icecast-2.3.1.tar.gz 1094154
+RMD160 394148f060daca979d49787530c4928558dd325c icecast-2.3.1.tar.gz 1094154
+SHA256 7bcc2a1e2137a143deeacd7619cd348300672aaf8774fcfcb2e43aa7c3e74660 icecast-2.3.1.tar.gz 1094154
diff --git a/net-misc/icecast/files/icecast.xml b/net-misc/icecast/files/icecast.xml
new file mode 100644
index 000000000000..4d0fd5dc6159
--- /dev/null
+++ b/net-misc/icecast/files/icecast.xml
@@ -0,0 +1,181 @@
+<icecast>
+    <limits>
+        <clients>100</clients>
+        <sources>2</sources>
+        <threadpool>5</threadpool>
+        <queue-size>524288</queue-size>
+        <client-timeout>30</client-timeout>
+        <header-timeout>15</header-timeout>
+        <source-timeout>10</source-timeout>
+        <!-- If enabled, this will provide a burst of data when a client 
+             first connects, thereby significantly reducing the startup 
+             time for listeners that do substantial buffering. However,
+             it also significantly increases latency between the source
+             client and listening client.  For low-latency setups, you
+             might want to disable this. -->
+        <burst-on-connect>1</burst-on-connect>
+        <!-- same as burst-on-connect, but this allows for being more
+             specific on how much to burst. Most people won't need to
+             change from the default 64k. Applies to all mountpoints  -->
+        <burst-size>65535</burst-size>
+    </limits>
+
+    <authentication>
+        <!-- Sources log in with username 'source' -->
+        <source-password>hackme</source-password>
+        <!-- Relays log in username 'relay' -->
+        <relay-password>hackme</relay-password>
+
+        <!-- Admin logs in with the username given below -->
+        <admin-user>admin</admin-user>
+        <admin-password>hackme</admin-password>
+    </authentication>
+
+    <!-- Uncomment this if you want directory listings -->
+    <!--
+    <directory>
+        <yp-url-timeout>15</yp-url-timeout>
+        <yp-url>http://dir.xiph.org/cgi-bin/yp-cgi</yp-url>
+    </directory>
+    <directory>
+        <yp-url-timeout>15</yp-url-timeout>
+        <yp-url>http://www.oddsock.org/cgi-bin/yp-cgi</yp-url>
+    </directory>
+     -->
+
+    <!-- This is the hostname other people will use to connect to your server.
+    It affects mainly the urls generated by Icecast for playlists and yp
+    listings. -->
+    <hostname>localhost</hostname>
+
+    <!-- You can use these two if you only want a single listener -->
+    <!--<port>8000</port> -->
+    <!--<bind-address>127.0.0.1</bind-address>-->
+
+    <!-- You may have multiple <listener> elements -->
+    <listen-socket>
+        <port>8000</port>
+        <!-- <bind-address>127.0.0.1</bind-address> -->
+    </listen-socket>
+    <!--
+    <listen-socket>
+        <port>8001</port>
+    </listen-socket>
+    -->
+
+    <!--<master-server>127.0.0.1</master-server>-->
+    <!--<master-server-port>8001</master-server-port>-->
+    <!--<master-update-interval>120</master-update-interval>-->
+    <!--<master-password>hackme</master-password>-->
+
+    <!-- setting this makes all relays on-demand unless overridden, this is
+         useful for master relays which do not have <relay> definitions here.
+         The default is 0 -->
+    <!--<relays-on-demand>1</relays-on-demand>-->
+
+    <!--
+    <relay>
+        <server>127.0.0.1</server>
+        <port>8001</port>
+        <mount>/example.ogg</mount>
+        <local-mount>/different.ogg</local-mount>
+        <on-demand>0</on-demand>
+
+        <relay-shoutcast-metadata>0</relay-shoutcast-metadata>
+    </relay>
+    -->
+
+    <!-- Only define a <mount> section if you want to use advanced options,
+         like alternative usernames or passwords -->
+    <!--
+    <mount>
+        <mount-name>/example-complex.ogg</mount-name>
+
+        <username>othersource</username>
+        <password>hackmemore</password>
+
+        <max-listeners>1</max-listeners>
+        <dump-file>/tmp/dump-example1.ogg</dump-file>
+        <burst-size>65536</burst-size>
+        <fallback-mount>/example2.ogg</fallback-mount>
+        <fallback-override>1</fallback-override>
+        <fallback-when-full>1</fallback-when-full>
+        <intro>/example_intro.ogg</intro>
+        <hidden>1</hidden>
+        <no-yp>1</no-yp>
+        <authentication type="htpasswd">
+                <option name="filename" value="myauth"/>
+                <option name="allow_duplicate_users" value="0"/>
+        </authentication>
+        <on-connect>/home/icecast/bin/stream-start</on-connect>
+        <on-disconnect>/home/icecast/bin/stream-stop</on-disconnect>
+    </mount>
+
+    <mount>
+        <mount-name>/auth_example.ogg</mount-name>
+        <authentication type="url">
+            <option name="mount_add"       value="http://myauthserver.net/notify_mount.php"/>
+            <option name="mount_remove"    value="http://myauthserver.net/notify_mount.php"/>
+            <option name="listener_add"    value="http://myauthserver.net/notify_listener.php"/>
+            <option name="listener_remove" value="http://myauthserver.net/notify_listener.php"/>
+        </authentication>
+    </mount>
+
+    -->
+
+    <fileserve>1</fileserve>
+
+    <!-- set the mountpoint for a shoutcast source to use, the default if not
+         specified is /stream but you can change it here if an alternative is
+         wanted or an extension is required -->
+    <!--
+    <shoutcast-mount>/live.nsv</shoutcast-mount>
+    -->
+
+    <paths>
+		<!-- basedir is only used if chroot is enabled -->
+        <basedir>/usr/share/icecast</basedir>
+
+        <!-- Note that if <chroot> is turned on below, these paths must both
+             be relative to the new root, not the original root -->
+        <logdir>/var/log/icecast</logdir>
+        <webroot>/usr/share/icecast/web</webroot>
+        <adminroot>/usr/share/icecast/admin</adminroot>
+        <!-- <pidfile>/usr/share/icecast/icecast.pid</pidfile> -->
+
+        <!-- Aliases: treat requests for 'source' path as being for 'dest' path
+             May be made specific to a port or bound address using the "port"
+             and "bind-address" attributes.
+          -->
+        <!--
+        <alias source="/foo" dest="/bar"/>
+          -->
+        <!-- Aliases: can also be used for simple redirections as well,
+             this example will redirect all requests for http://server:port/ to
+             the status page
+          -->
+        <alias source="/" dest="/status.xsl"/>
+    </paths>
+
+    <logging>
+        <accesslog>access.log</accesslog>
+        <errorlog>error.log</errorlog>
+        <!-- <playlistlog>playlist.log</playlistlog> -->
+      	<loglevel>4</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,
+             otherwise it will be moved to [error|access|playlist].log.old.
+             Default is non-archive mode (i.e. overwrite)
+        -->
+        <!-- <logarchive>1</logarchive> -->
+    </logging>
+
+    <security>
+        <chroot>0</chroot>
+        <changeowner>
+            <user>icecast</user>
+            <group>nogroup</group>
+        </changeowner>
+    </security>
+</icecast>
diff --git a/net-misc/icecast/icecast-2.3.1-r1.ebuild b/net-misc/icecast/icecast-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..ee1659baa928
--- /dev/null
+++ b/net-misc/icecast/icecast-2.3.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.3.1-r1.ebuild,v 1.1 2006/03/23 06:05:28 cardoe Exp $
+
+inherit eutils
+
+DESCRIPTION="An opensource alternative to shoutcast that supports mp3, ogg (vorbis/theora) and aac streaming"
+HOMEPAGE="http://www.icecast.org/"
+SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="theora yp"
+
+DEPEND="dev-libs/libxslt
+	media-libs/libogg
+	media-libs/libvorbis
+	theora? ( media-libs/libtheora )
+	yp? ( >=net-misc/curl-7.10.0 )"
+
+src_compile() {
+	econf \
+		--sysconfdir=/etc/icecast2 \
+		$(use_enable yp) || die "configure failed"
+
+	emake || die "make failed"
+}
+
+pkg_preinst() {
+	enewuser icecast -1 "-1" -1 nogroup || die "Problem adding icecast user"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
+	dohtml -A chm,hhc,hhp doc/*
+	doman ${S}/debian/icecast2.1
+
+	newinitd ${FILESDIR}/init.d.icecast icecast
+
+	insinto /etc/icecast2/
+	doins ${FILESDIR}/icecast.xml
+	fperms 600 /etc/icecast2/icecast.xml
+
+	keepdir /var/log/icecast
+	chown icecast ${D}/var/log/icecast
+
+	rm -rf ${D}/usr/share/doc/icecast
+}