Date: Monday, March 15, 2010 @ 15:27:01 Author: andrea Revision: 72434
upgpkg: icecast 2.3.2-2 create log dir; forward icecast output to /dev/null Added: icecast/trunk/icecastd Modified: icecast/trunk/PKGBUILD Deleted: icecast/trunk/icecast ----------+ PKGBUILD | 38 +++++++++++++++++++++++++------------- icecast | 36 ------------------------------------ icecastd | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 49 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-03-15 19:12:51 UTC (rev 72433) +++ PKGBUILD 2010-03-15 19:27:01 UTC (rev 72434) @@ -1,37 +1,49 @@ # $Id$ -# Maintainer: Andreas Radke <andy...@archlinux.org> +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Andreas Radke <andy...@archlinux.org> # Contributer: Jason Chu <j...@xentac.net> # Contributor: dorphell <dorph...@archlinux.org> pkgname=icecast pkgver=2.3.2 -pkgrel=1 -pkgdesc="Streaming OGG and MP3 server. Replacement for shoutcase." -arch=(i686 x86_64) +pkgrel=2 +pkgdesc="Streaming audio over the Internet" +arch=('i686' 'x86_64') license=('GPL') url="http://www.icecast.org/" -depends=('libxslt' 'libvorbis' 'curl>=7.19.2' 'speex' 'libtheora') +depends=('libxslt' 'libvorbis' 'curl' 'speex' 'libtheora') makedepends=('sed') backup=('etc/icecast.xml' 'etc/logrotate.d/icecast') -source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz - icecast icecast.logrotate) +source=("http://downloads.us.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'icecastd' 'icecast.logrotate') md5sums=('ff516b3ccd2bcc31e68f460cd316093f' - 'fe65f4d6826a750a868227b9d86f1be3' + '5500f0c01e48adf154bcc428f0515c9d' '8fad3bf3283fa2bd651b71fdf505eae9') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var make || return 1 +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install || 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 + install -Dm644 debian/icecast2.1 \ + ${pkgdir}/usr/share/man/man1/icecast.1 || return 1 # 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 + install -Dm755 ${srcdir}/icecastd \ + ${pkgdir}/etc/rc.d/icecast || return 1 + # rotate the logs (taken from Fedora) + install -Dm644 ${srcdir}/icecast.logrotate \ + ${pkgdir}/etc/logrotate.d/icecast || return 1 + # install log dir + install -d ${pkgdir}/var/log/icecast || return 1 } Deleted: icecast =================================================================== --- icecast 2010-03-15 19:12:51 UTC (rev 72433) +++ icecast 2010-03-15 19:27:01 UTC (rev 72434) @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/icecast` -case "$1" in - start) - stat_busy "Starting Icecast Server" - [ -z "$PID" ] && /usr/bin/icecast -b -c /etc/icecast.xml - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon icecast - stat_done - fi - ;; - stop) - stat_busy "Stopping Icecast Server" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon icecast - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 Added: icecastd =================================================================== --- icecastd (rev 0) +++ icecastd 2010-03-15 19:27:01 UTC (rev 72434) @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/icecast` +case "$1" in + start) + stat_busy "Starting Icecast Server" + [ -z "$PID" ] && /usr/bin/icecast -b -c /etc/icecast.xml &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon icecast + stat_done + fi + ;; + stop) + stat_busy "Stopping Icecast Server" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon icecast + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0