[arch-commits] Commit in icecast/trunk (3 files)

[andyrtr at archlinux.org]

    Date: Wednesday, December 24, 2008 @ 05:13:12
  Author: andyrtr
Revision: 22239

upgpkg: icecast 2.3.2-1
    new version 2.3.2; added logrotate file from Fedora; we now keep the docs and config examples

Added:
  icecast/trunk/icecast.logrotate
Modified:
  icecast/trunk/PKGBUILD
Deleted:
  icecast/trunk/icecast-2.3.1-nocurlpassword.patch

------------------------------------+
 PKGBUILD                           |   42 +++++++++++++++++++----------------
 icecast-2.3.1-nocurlpassword.patch |   25 --------------------
 icecast.logrotate                  |    9 +++++++
 3 files changed, 32 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-12-24 09:30:16 UTC (rev 22238)
+++ PKGBUILD	2008-12-24 10:13:12 UTC (rev 22239)
@@ -1,33 +1,37 @@
 # $Id$
-# Maintainer: Alexander Baldeck <alexander at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Contributer: Jason Chu <jchu at xentac.net>
 # Contributor: dorphell <dorphell at archlinux.org>
 
 pkgname=icecast
-pkgver=2.3.1
-pkgrel=5
-pkgdesc="Streaming OGG and MP3 server.  Replacement for shoutcase."
+pkgver=2.3.2
+pkgrel=1
+pkgdesc="Streaming OGG and MP3 server. Replacement for shoutcase."
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libxslt' 'libvorbis' 'curl>=7.16.2' 'speex' 'libtheora')
+url="http://www.icecast.org/"
+depends=('libxslt' 'libvorbis' 'curl>=7.19.2' 'speex' 'libtheora')
+makedepends=('sed')
 backup=('etc/icecast.xml')
 source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
-        icecast
-        icecast-2.3.1-nocurlpassword.patch)
-url="http://www.icecast.org/"
+        icecast icecast.logrotate)
+md5sums=('ff516b3ccd2bcc31e68f460cd316093f'
+         'fe65f4d6826a750a868227b9d86f1be3'
+         '8fad3bf3283fa2bd651b71fdf505eae9')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make || return 1
+  make DESTDIR=${pkgdir} install || return 1
 
-  patch -Np0 -i ${startdir}/src/icecast-2.3.1-nocurlpassword.patch || return 1
+  # install man-page
+  sed -i -e 's/icecast2/icecast/g' debian/icecast2.1
+  install -D -m 644 debian/icecast2.1 ${pkgdir}/usr/share/man/man1/icecast.1
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  mkdir -p $startdir/pkg/usr/share/icecast
-  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
+  # init file
+  install -D -m755 ${srcdir}/icecast ${pkgdir}/etc/rc.d/icecast
+  # rotate the logs (taken from Fedora
+  install -D -m644 ${srcdir}/icecast.logrotate ${pkgdir}/etc/logrotate.d/icecast
 }
-md5sums=('2d80a249fa8529f82d018c6216108ea8'
-         'fe65f4d6826a750a868227b9d86f1be3'
-         'bb715704cf868017a10ec0c03fc18e17')
+

Deleted: icecast-2.3.1-nocurlpassword.patch
===================================================================
--- icecast-2.3.1-nocurlpassword.patch	2008-12-24 09:30:16 UTC (rev 22238)
+++ icecast-2.3.1-nocurlpassword.patch	2008-12-24 10:13:12 UTC (rev 22239)
@@ -1,25 +0,0 @@
---- ./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)

Added: icecast.logrotate
===================================================================
--- icecast.logrotate	                        (rev 0)
+++ icecast.logrotate	2008-12-24 10:13:12 UTC (rev 22239)
@@ -0,0 +1,9 @@
+/var/log/icecast/*log {
+    missingok
+    notifempty
+    sharedscripts
+    postrotate
+	/bin/kill -HUP `cat /var/run/icecast/icecast.pid 2>/dev/null` 2> /dev/null || true
+    endscript
+}
+