[arch-commits] CVS update of extra/multimedia/icecast (2 files)

Alexander Baldeck alexander at archlinux.org
Fri Jun 8 07:23:28 EDT 2007


    Date: Friday, June 8, 2007 @ 07:23:28
  Author: alexander
    Path: /home/cvs-extra/extra/multimedia/icecast

   Added: icecast-2.3.1-nocurlpassword.patch (1.1)
Modified: PKGBUILD (1.22 -> 1.23)

rebuilt against curl 7.16.2


------------------------------------+
 PKGBUILD                           |   20 ++++++++++++++------
 icecast-2.3.1-nocurlpassword.patch |   25 +++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 6 deletions(-)


Index: extra/multimedia/icecast/PKGBUILD
diff -u extra/multimedia/icecast/PKGBUILD:1.22 extra/multimedia/icecast/PKGBUILD:1.23
--- extra/multimedia/icecast/PKGBUILD:1.22	Fri Jun  1 14:45:49 2007
+++ extra/multimedia/icecast/PKGBUILD	Fri Jun  8 07:23:28 2007
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD,v 1.22 2007/06/01 18:45:49 jgc Exp $
+# $Id: PKGBUILD,v 1.23 2007/06/08 11:23:28 alexander Exp $
+# Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributer: Jason Chu <jchu at xentac.net>
-# Maintainer: dorphell <dorphell at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
 
 pkgname=icecast
 pkgver=2.3.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Streaming OGG and MP3 server.  Replacement for shoutcase."
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libxslt' 'libvorbis' 'curl' 'speex' 'libtheora')
+depends=('libxslt' 'libvorbis' 'curl>=7.16.2' 'speex' 'libtheora')
 backup=('etc/icecast.xml')
-source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz icecast)
+source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
+        icecast
+        icecast-2.3.1-nocurlpassword.patch)
 url="http://www.icecast.org/"
-md5sums=('2d80a249fa8529f82d018c6216108ea8' 'fe65f4d6826a750a868227b9d86f1be3')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+
+  patch -Np0 -i ${startdir}/src/icecast-2.3.1-nocurlpassword.patch || return 1
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make || return 1
   make DESTDIR=$startdir/pkg install
@@ -23,3 +28,6 @@
   install -D -m644 conf/icecast.xml.dist $startdir/pkg/usr/share/icecast/icecast.xml.dist
   install -D -m755 ${startdir}/src/icecast ${startdir}/pkg/etc/rc.d/icecast
 }
+md5sums=('2d80a249fa8529f82d018c6216108ea8'
+         'fe65f4d6826a750a868227b9d86f1be3'
+         'bb715704cf868017a10ec0c03fc18e17')
Index: extra/multimedia/icecast/icecast-2.3.1-nocurlpassword.patch
diff -u /dev/null extra/multimedia/icecast/icecast-2.3.1-nocurlpassword.patch:1.1
--- /dev/null	Fri Jun  8 07:23:28 2007
+++ extra/multimedia/icecast/icecast-2.3.1-nocurlpassword.patch	Fri Jun  8 07:23:28 2007
@@ -0,0 +1,25 @@
+--- ./src/auth_url.c.orig	2007-04-17 22:48:11.000000000 +1000
++++ ./src/auth_url.c	2007-04-17 22:48:59.000000000 +1000
+@@ -112,14 +112,6 @@
+ }
+ 
+ 
+-/* make sure that prompting at the console does not occur */
+-static int my_getpass(void *client, char *prompt, char *buffer, int buflen)
+-{
+-    buffer[0] = '\0';
+-    return 0;
+-}
+-
+-
+ static int handle_returned_header (void *ptr, size_t size, size_t nmemb, void *stream)
+ {
+     auth_client *auth_user = stream;
+@@ -518,7 +510,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)




More information about the arch-commits mailing list