Tue May 14 01:18:40 PDT 2013

2 files changed, 3 insertions, 72 deletions

diff --git a/community/icecast/PKGBUILD b/community/icecast/PKGBUILD
index 3888f8540..aad4ca008 100644
--- a/community/icecast/PKGBUILD
+++ b/community/icecast/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84031 2013-02-08 17:31:49Z lfleischer $
+# $Id: PKGBUILD 90559 2013-05-13 07:47:15Z lfleischer $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=icecast
 pkgver=2.3.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Streaming audio over the Internet'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,12 +15,10 @@ depends=('libxslt' 'libvorbis' 'curl' 'speex' 'libtheora')
 backup=('etc/icecast.xml'
         'etc/logrotate.d/icecast')
 source=("http://downloads.us.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'icecastd'
         'icecast.logrotate'
         'start-by-nobody.patch'
         'icecast.service')
 md5sums=('2b5d1b40778922e5f6431b7758c359ad'
-         'e823c1fdb080aae3d0c54ef8be95f7cb'
          '59c6552bcb1dd9fb542af8670dfabd3c'
          'd8e929d2214123a1954da4383bf16583'
          '1468e59f76de194579b615889e20198f')
@@ -43,8 +41,7 @@ package() {
   sed -i -e 's/icecast2/icecast/g' debian/icecast2.1
   install -Dm644 debian/icecast2.1 "${pkgdir}/usr/share/man/man1/icecast.1"
 
-  # install rc.d script and logrotate config (taken from Fedora)
-  install -Dm755 "${srcdir}/icecastd" "${pkgdir}/etc/rc.d/icecast"
+  # install logrotate config (taken from Fedora)
   install -Dm644 "${srcdir}/icecast.logrotate" "${pkgdir}/etc/logrotate.d/icecast"
 
   # create log directory
diff --git a/community/icecast/icecastd b/community/icecast/icecastd
deleted file mode 100644
index e6c91b08c..000000000
--- a/community/icecast/icecastd
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-timeo=30
-
-getPID() {
-   pgrep -u nobody icecast 2>/dev/null
-}
-
-case $1 in
-  start)
-    stat_busy "Starting Icecast Server"
-    if getPID >/dev/null; then
-      # already running
-      stat_fail
-      exit 1
-    else
-      /usr/bin/icecast -b -c /etc/icecast.xml &>/dev/null
-      while (( timeo > 0 )); do
-        if getPID >/dev/null; then
-          add_daemon icecast
-          stat_done
-          exit 0
-        fi
-        sleep 1
-        (( timeo-- ))
-      done
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Icecast Server"
-    if ! getPID >/dev/null; then
-      # not running
-      stat_done
-      exit 1
-    fi
-    if ! kill $(getPID) &> /dev/null; then
-      stat_fail
-      exit 1
-    fi
-    while (( timeo > 0 )); do
-      if getPID >/dev/null; then
-        rm_daemon icecast
-        stat_done
-        exit 0
-      fi
-      sleep 1
-      (( timeo-- ))
-    done
-    stat_fail
-    exit 1
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0