rpms/icecast/devel icecast-curl.patch, NONE, 1.1 icecast.spec, 1.3, 1.4

Jindrich Novy (jnovy) fedora-extras-commits at redhat.com
Mon Nov 6 12:31:25 UTC 2006


Author: jnovy

Update of /cvs/extras/rpms/icecast/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14997

Modified Files:
	icecast.spec 
Added Files:
	icecast-curl.patch 
Log Message:
- rebuild because of the new curl


icecast-curl.patch:

--- NEW FILE icecast-curl.patch ---
--- 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)


Index: icecast.spec
===================================================================
RCS file: /cvs/extras/rpms/icecast/devel/icecast.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- icecast.spec	8 Sep 2006 17:27:54 -0000	1.3
+++ icecast.spec	6 Nov 2006 12:30:55 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: ShoutCast compatible streaming media server
 Name: icecast
 Version: 2.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Multimedia
 License: GPL
 URL: http://www.icecast.org/
@@ -10,6 +10,7 @@
 Source2: icecast.init
 Source3: icecast.logrotate
 Source4: icecast.xml
+Patch1: icecast-curl.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: streaming-server
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .curl
 find -name "*.html" -or -name "*.jpg" -or -name "*.css" | xargs chmod 644
 %{__sed} -i -e 's/icecast2/icecast/g' debian/icecast2.1
 
@@ -107,6 +109,9 @@
 %dir %attr(-,icecast,icecast) %{_localstatedir}/run/icecast
 
 %changelog
+* 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
 




More information about the scm-commits mailing list