Author: eandry
Date: Sat Feb 3 19:29:58 2007
New Revision: 116091
Added:
packages/cooker/icecast/current/SOURCES/icecast-curl.patch
packages/cooker/icecast/current/SOURCES/icecast.conf.patch
Removed:
packages/cooker/icecast/current/SOURCES/icecast.conf.patch.bz2
Modified:
packages/cooker/icecast/current/SPECS/icecast.spec
Log:
bunzipped patch
- added patch from fedora to fix build against latest curl
Added: packages/cooker/icecast/current/SOURCES/icecast-curl.patch
==============================================================================
--- (empty file)
+++ packages/cooker/icecast/current/SOURCES/icecast-curl.patch Sat Feb 3
19:29:58 2007
@@ -0,0 +1,10 @@
+--- icecast-2.3.1/src/auth_url.c.curl 2005-11-30 13:16:17.000000000 -0500
++++ icecast-2.3.1/src/auth_url.c 2006-11-06 07:21:06.000000000 -0500
+@@ -518,7 +518,6 @@
+ curl_easy_setopt (url_info->handle, CURLOPT_WRITEDATA, url_info->handle);
+ curl_easy_setopt (url_info->handle, CURLOPT_NOSIGNAL, 1L);
+ curl_easy_setopt (url_info->handle, CURLOPT_TIMEOUT, 15L);
+- curl_easy_setopt (url_info->handle, CURLOPT_PASSWDFUNCTION, my_getpass);
+ curl_easy_setopt (url_info->handle, CURLOPT_ERRORBUFFER,
&url_info->errormsg[0]);
+
+ if (url_info->username && url_info->password)
Added: packages/cooker/icecast/current/SOURCES/icecast.conf.patch
==============================================================================
--- (empty file)
+++ packages/cooker/icecast/current/SOURCES/icecast.conf.patch Sat Feb 3
19:29:58 2007
@@ -0,0 +1,40 @@
+Index: conf/icecast.xml.in
+===================================================================
+--- conf/icecast.xml.in
++++ conf/icecast.xml.in 2005-05-21 02:24:39.211077978 +0200
+@@ -94,7 +94,7 @@
+ <hidden>1</hidden>
+ <no-yp>1</no-yp>
+ <authentication type="htpasswd">
+- <option name="filename" value="myauth"/>
++ <option name="filename" value="/usr/share/icecast/myauth"/>
+ <option name="allow_duplicate_users" value="0"/>
+ </authentication>
+ </mount>
+@@ -114,10 +114,10 @@
+
+ <!-- Note that if <chroot> is turned on below, these paths must both
+ be relative to the new root, not the original root -->
+- <logdir>@localstatedir@/log/@PACKAGE@</logdir>
++ <logdir>/var/log/icecast</logdir>
+ <webroot>@pkgdatadir@/web</webroot>
+ <adminroot>@pkgdatadir@/admin</adminroot>
+- <!-- <pidfile>@pkgdatadir@/icecast.pid</pidfile> -->
++ <pidfile>/var/run/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"
+@@ -142,10 +142,10 @@
+
+ <security>
+ <chroot>0</chroot>
+- <!--
++ <!-- Changing user will break logrotate support ( cannot create pid
file )
+ <changeowner>
+- <user>nobody</user>
+- <group>nogroup</group>
++ <user>icecast</user>
++ <group>icecast</group>
+ </changeowner>
+ -->
+ </security>
Modified: packages/cooker/icecast/current/SPECS/icecast.spec
==============================================================================
--- packages/cooker/icecast/current/SPECS/icecast.spec (original)
+++ packages/cooker/icecast/current/SPECS/icecast.spec Sat Feb 3 19:29:58 2007
@@ -1,6 +1,6 @@
%define name icecast
%define version 2.3.1
-%define release %mkrel 2
+%define release %mkrel 3
Name: %{name}
Version: %{version}
@@ -12,7 +12,8 @@
Source0:
http://downloads.us.xiph.org/releases/icecast/%{name}-%{version}.tar.bz2
Source1: %{name}.init.bz2
Source2: %{name}.logrotate
-Patch0: %{name}.conf.patch.bz2
+Patch0: %{name}.conf.patch
+Patch1: %{name}-curl.patch
BuildRoot: %{_tmppath}/%{name}-buildroot
Requires(pre): rpm-helper
Requires(post): rpm-helper
@@ -37,7 +38,8 @@
%prep
%setup -q -n %{name}-%{version}
-%patch
+%patch0
+%patch1 -p1
bzcat %{SOURCE1} > %{name}
%build
