Merge branch 'master' of gparabola:abslibre-mips64el

5 files changed, 2 insertions, 119 deletions

diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD
index 9ec3784ca..7ce438422 100644
--- a/community/inn/PKGBUILD
+++ b/community/inn/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 82923 2013-01-25 21:39:24Z spupykin $
+# $Id: PKGBUILD 91652 2013-05-26 09:24:36Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Edward Tjörnhammar <xhemi@cube2.se>
 # Contributor: Edward Tjörnhammar <xhemi@cube2.se>
 
 pkgname=inn
 pkgver=2.5.3
-pkgrel=2
+pkgrel=6
 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers."
 url="http://www.isc.org/software/inn/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -47,18 +47,10 @@ backup=(etc/inn/newsfeeds
 	var/db/inn/history.index
 	var/db/inn/newsgroups)
 source=(http://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz
-	innd.rc
-	nnrpd.rc
-	innd.conf
-	nnrpd.conf
 	innd.service
 	inn.tmpfiles
 	site.make.patch)
 md5sums=('353fe95232828ddbc80debff86c240bc'
-         'a243d9498568f1beee20da5684b5fbfc'
-         'a0b1ff8501ac8a31ce81a2f9c9b4bac9'
-         'fbf1d2c5b3c5a08ae3e515c71c2e2e4a'
-         'bb4bbe86ae52fbbf08b0f6f370dea052'
          '9da925a486fcf0cd67fdf462cbb9c0b4'
          '050b7bffff3361c673a118739e42349e'
          '960c800026ed6e03901cf0bafdfd53d8')
@@ -96,7 +88,6 @@ build() {
 EOF
   sed -i 's|-export-dynamic gnu|-export-dynamic|' Makefile.global
   [ $NOEXTRACT -eq 1 ] || patch -p3 < $srcdir/site.make.patch
-  export LD_LIBRARY_PATH=.:$pkgdir/usr/lib:$LD_LIBRARY_PATH
 
   make
 }
@@ -107,13 +98,6 @@ package() {
 
   make DESTDIR=$pkgdir install
 
-  mkdir -p $pkgdir/etc/{conf,rc}.d
-  install -m0755 $srcdir/innd.rc $pkgdir/etc/rc.d/innd
-  install -m0644 $srcdir/innd.conf $pkgdir/etc/conf.d/innd
-
-  install -m0755 $srcdir/nnrpd.rc $pkgdir/etc/rc.d/nnrpd
-  install -m0644 $srcdir/nnrpd.conf $pkgdir/etc/conf.d/nnrpd
-
   cd $pkgdir/usr/lib
   for i in lib*.a; do
 	gcc -shared -o ${i%%.a}.so.2.0.0 $i
diff --git a/community/inn/innd.conf b/community/inn/innd.conf
deleted file mode 100644
index 48f96ba5e..000000000
--- a/community/inn/innd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-NEWS_USER=news
-NEWS_GROUP=news
diff --git a/community/inn/innd.rc b/community/inn/innd.rc
deleted file mode 100644
index 5e36aec0d..000000000
--- a/community/inn/innd.rc
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/innd ] && . /etc/conf.d/innd
-[ -z "$NEWS_USER" ] && print "Please set news username" && exit 1;
-[ -z "$NEWS_GROUP" ] && print "Please set news groupname" && exit 1;
-
-case "$1" in
-	start)
-		stat_busy "Starting InterNetNews"
-		[ -d /var/run/inn ] || {
-			mkdir -p /var/run/inn
-			chown -R $NEWS_USER:$NEWS_GROUP /var/run/inn
-		}
-		su $NEWS_USER -c /usr/bin/rc.news 2>&- >&-
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			echo $! > /var/run/innd.pid
-			add_daemon innd
-			stat_done
-		fi
-
-	;;
-	stop)
-		stat_busy "Stopping InterNetNews"
-		ctlinnd throttle "shutting down" 2>&- >&-
-		su $NEWS_USER -c /usr/bin/rc.news stop 2>&- >&-
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			kill `ps faxu| grep ^$NEWS_USER | awk -- '{print $2}'` 2>&- >&-
-			rm /var/run/innd.pid
-			rm_daemon innd
-			stat_done
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-	;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/inn/nnrpd.conf b/community/inn/nnrpd.conf
deleted file mode 100644
index 689a289ce..000000000
--- a/community/inn/nnrpd.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-USE_SSL=1
-LISTEN_PORT=563
-NNRPD_OPTS="-D -S -p $LISTEN_PORT -c /etc/inn/readers.conf"
diff --git a/community/inn/nnrpd.rc b/community/inn/nnrpd.rc
deleted file mode 100644
index d7c902832..000000000
--- a/community/inn/nnrpd.rc
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/nnrpd ] && . /etc/conf.d/nnrpd
-[ -z "$NNRPD_OPTS" ] && print "FATAL: No arguments where passed" && exit 1;
-
-PID=`pidof -o %PPID nnrpd`
-case "$1" in
-	start)
-		stat_busy "Starting InterNetNews Readers Daemon"
-		if [ ! -f /var/run/nnrpd.pid ]; then
-			stat_append ":: InterNetNews (innd) is not running"
-			stat_fail
-			exit 1
-		fi
-		
-		[ -d /var/run/inn ] || mkdir -p /var/run/inn
-		[ -z "$PID" ] && nnrpd $NNRPD_OPTS 2>&- >&-
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			PID=`pidof -o %PPID nnrpd`
-			echo $PID > /var/run/nnrpd.pid
-			add_daemon nnrpd
-			stat_done
-		fi
-
-	;;
-	stop)
-		stat_busy "Stopping InterNetNews Readers Daemon"
-		[ ! -z "$PID" ] && kill $PID >&-
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			rm /var/run/nnrpd.pid
-			rm_daemon nnrpd
-			stat_done
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-	;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0