rpms/icecast/EL-5 icecast.init, 1.3, 1.4 icecast.spec, 1.3, 1.4 icecast.xml, 1.1, 1.2 sources, 1.2, 1.3

Andreas Thienemann ixs at fedoraproject.org
Wed Oct 21 11:23:09 UTC 2009 

Author: ixs

Update of /cvs/pkgs/rpms/icecast/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6967

Modified Files:
	icecast.init icecast.spec icecast.xml sources 
Log Message:
* Wed Oct 21 2009 Andreas Thienemann <andreas at bawue.net> - 2.3.2-4
- Added SSL support
- Added LSB header to the initscripts
- Reworked config example to contain newest changes
- Added alternative config files and authentication example



Index: icecast.init
===================================================================
RCS file: /cvs/pkgs/rpms/icecast/EL-5/icecast.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- icecast.init	4 May 2006 16:18:39 -0000	1.3
+++ icecast.init	21 Oct 2009 11:23:09 -0000	1.4
@@ -9,6 +9,14 @@
 # processname: icecast
 # pidfile: /var/run/icecast/icecast.pid
 # config: /etc/icecast.xml
+### BEGIN INIT INFO
+# Provides: icecast
+# Required-Start: $local_fs $remote_fs $network $named
+# Required-Stop: $local_fs $remote_fs $network
+# Short-Description: start and stop the Icecast server
+# Description: The Icecast Server is a network audio streaming server
+### END INIT INFO
+
 
 # Source function library.
 . /etc/rc.d/init.d/functions


Index: icecast.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecast/EL-5/icecast.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- icecast.spec	8 Sep 2006 17:27:54 -0000	1.3
+++ icecast.spec	21 Oct 2009 11:23:09 -0000	1.4
@@ -1,9 +1,9 @@
 Summary: ShoutCast compatible streaming media server
 Name: icecast
-Version: 2.3.1
-Release: 3%{?dist}
+Version: 2.3.2
+Release: 4%{?dist}
 Group: Applications/Multimedia
-License: GPL
+License: GPLv2
 URL: http://www.icecast.org/
 Source0: http://downloads.xiph.org/releases/icecast/icecast-%{version}.tar.gz
 Source1: status3.xsl
@@ -16,9 +16,8 @@ Provides: streaming-server
 
 BuildRequires: automake
 BuildRequires: libvorbis-devel >= 1.0, libogg-devel >= 1.0, curl-devel >= 7.10.0
-BuildRequires: libxml2-devel, libxslt-devel, speex-devel
-# To be enabled as soon as Fedora's libtheora supports ogg_stream_init
-BuildRequires: libtheora-devel >= 1.0
+BuildRequires: libxml2-devel, libxslt-devel, speex-devel, libtheora-devel >= 1.0
+BuildRequires: openssl-devel
 
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -41,10 +40,12 @@ find -name "*.html" -or -name "*.jpg" -o
 
 
 %build
-# theora support is to be enabled as soon as Fedora's libtheora supports
-# ogg_stream_init
-# --disable-theora
-%configure
+%configure \
+	--with-curl \
+	--with-openssl \
+	--with-ogg \
+	--with-theora \
+	--with-speex
 %{__make} %{?_smp_mflags}
 
 
@@ -93,10 +94,9 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING NEWS ChangeLog
-%doc doc/*.html
-%doc doc/*.jpg
-%doc doc/*.css
+%doc AUTHORS COPYING NEWS ChangeLog TODO
+%doc doc/*.html doc/*.jpg doc/*.css
+%doc conf/*.dist examples/icecast_auth-1.0.tar.gz
 %config(noreplace) %{_sysconfdir}/icecast.xml
 %{_sysconfdir}/logrotate.d/icecast
 %{_initrddir}/icecast
@@ -107,6 +107,28 @@ fi
 %dir %attr(-,icecast,icecast) %{_localstatedir}/run/icecast
 
 %changelog
+* Wed Oct 21 2009 Andreas Thienemann <andreas at bawue.net> - 2.3.2-4
+- Added SSL support
+- Added LSB header to the initscripts
+- Reworked config example to contain newest changes
+- Added alternative config files and authentication example
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Jul 31 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.2-1
+- update to 2.3.2
+- fix license tag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.3.1-5
+- Autorebuild for GCC 4.3
+
+* Mon Nov 06 2006 Jindrich Novy <jnovy at redhat.com> - 2.3.1-4
+- rebuild because of the new curl
+
 * Fri Sep 08 2006 Andreas Thienemann <andreas at bawue.net> - 2.3.1-3
 - FE6 Rebuild
 


Index: icecast.xml
===================================================================
RCS file: /cvs/pkgs/rpms/icecast/EL-5/icecast.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- icecast.xml	16 Feb 2006 07:23:04 -0000	1.1
+++ icecast.xml	21 Oct 2009 11:23:09 -0000	1.2
@@ -7,6 +7,13 @@
         <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  -->
@@ -24,16 +31,18 @@
         <admin-password>hackme</admin-password>
     </authentication>
 
+    <!-- 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>
+    -->
+
     <!-- 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.
@@ -41,14 +50,11 @@
     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> -->
+        <bind-address>127.0.0.1</bind-address>
+        <!-- <shoutcast-mount>/stream</shoutcast-mount> -->
     </listen-socket>
     <!--
     <listen-socket>
@@ -60,29 +66,19 @@
     <!--<master-server-port>8001</master-server-port>-->
     <!--<master-update-interval>120</master-update-interval>-->
     <!--<master-password>hackme</master-password>-->
-    <!--<master-relay-auth>1</master-relay-auth>-->
 
     <!-- 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>-->
 
-
-    <!-- Report <hostname> and this port to master server for redirecting
-         clients to this slave -->
-    <!--<master-redirect-port>8000</master-redirect-port>-->
-
-    <!-- Relays. State connection information, and by default 
-         request inline metadata for mp3 streams if available.
-         An on-demand relay will only retrieve the stream if
-         there are listeners connected -->
     <!--
     <relay>
         <server>127.0.0.1</server>
         <port>8001</port>
         <mount>/example.ogg</mount>
         <local-mount>/different.ogg</local-mount>
-        <on-demand>1</on-demand>
+        <on-demand>0</on-demand>
 
         <relay-shoutcast-metadata>0</relay-shoutcast-metadata>
     </relay>
@@ -102,8 +98,9 @@
         <fallback-mount>/example2.ogg</fallback-mount>
         <fallback-override>1</fallback-override>
         <fallback-when-full>1</fallback-when-full>
-        <intro>/path/to/stream-intro.ogg</intro>
+        <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"/>
@@ -111,43 +108,21 @@
         <on-connect>/home/icecast/bin/stream-start</on-connect>
         <on-disconnect>/home/icecast/bin/stream-stop</on-disconnect>
     </mount>
-    -->
-    <!-- other auth possibilities include running a command
-         to do the auth, mount, user and pass are passed via
-         stdin to the program
-    <mount>
-    ....
-        <authentication type="command">
-             <option name="filename" value="auth_verify"/>
-        </authentication>
-        
-        or 
-
-        for url auth, the add url needs to return a "icecast-auth-user: 1" http
-        header for a user to authenicate. Both urls are sent params via POST,
-        add is sent id, mount, user, pass, ip, useragent
-        remove is passed id, mount, user, pass, duration
 
+    <mount>
+        <mount-name>/auth_example.ogg</mount-name>
         <authentication type="url">
-
-             state username/password if url requires it
-
-             <option name="username" value="admin"/>
-             <option name="password" value="hackme"/>
-             <option name="add"    value="http://myauthserver.com/scripts/add_listener.php"/>
-             <option name="remove" value="http://myauthserver.com/scripts/del_listener.php"/>
+            <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 -->
+    </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>
@@ -176,8 +151,15 @@
     <logging>
         <accesslog>access.log</accesslog>
         <errorlog>error.log</errorlog>
-        <playlistlog>playlist.log</playlistlog>
-      	<loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+        <!-- <playlistlog>playlist.log</playlistlog> -->
+        <loglevel>3</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>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icecast/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Feb 2006 07:23:04 -0000	1.2
+++ sources	21 Oct 2009 11:23:09 -0000	1.3
@@ -1 +1 @@
-2d80a249fa8529f82d018c6216108ea8  icecast-2.3.1.tar.gz
+ff516b3ccd2bcc31e68f460cd316093f  icecast-2.3.2.tar.gz

More information about the fedora-extras-commits mailing list