Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/percona-server/PKGBUILD
	community/libdnet/PKGBUILD
	extra/libxfce4ui/PKGBUILD
	extra/libxi/PKGBUILD
	extra/live-media/PKGBUILD
	extra/python-urwid/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/rhythmbox/PKGBUILD
	extra/xfconf/PKGBUILD
	kde-unstable/kactivities/PKGBUILD
	kde-unstable/kdeaccessibility-jovie/PKGBUILD
	kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
	kde-unstable/kdeaccessibility-kmag/PKGBUILD
	kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
	kde-unstable/kdeaccessibility-kmouth/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdeartwork/PKGBUILD
	kde-unstable/kdebase-konsole/PKGBUILD
	kde-unstable/kdebase-runtime/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-kross/PKGBUILD
	kde-unstable/kdebindings-perlkde/PKGBUILD
	kde-unstable/kdebindings-perlqt/PKGBUILD
	kde-unstable/kdebindings-python/PKGBUILD
	kde-unstable/kdebindings-qtruby/PKGBUILD
	kde-unstable/kdebindings-qyoto/PKGBUILD
	kde-unstable/kdebindings-smokegen/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdebindings-smokeqt/PKGBUILD
	kde-unstable/kdeedu-analitza/PKGBUILD
	kde-unstable/kdeedu-blinken/PKGBUILD
	kde-unstable/kdeedu-cantor/PKGBUILD
	kde-unstable/kdeedu-kalgebra/PKGBUILD
	kde-unstable/kdeedu-kalzium/PKGBUILD
	kde-unstable/kdeedu-kanagram/PKGBUILD
	kde-unstable/kdeedu-kbruch/PKGBUILD
	kde-unstable/kdeedu-kgeography/PKGBUILD
	kde-unstable/kdeedu-khangman/PKGBUILD
	kde-unstable/kdeedu-kig/PKGBUILD
	kde-unstable/kdeedu-kiten/PKGBUILD
	kde-unstable/kdeedu-klettres/PKGBUILD
	kde-unstable/kdeedu-kmplot/PKGBUILD
	kde-unstable/kdeedu-kstars/PKGBUILD
	kde-unstable/kdeedu-ktouch/PKGBUILD
	kde-unstable/kdeedu-kturtle/PKGBUILD
	kde-unstable/kdeedu-kwordquiz/PKGBUILD
	kde-unstable/kdeedu-marble/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegames/PKGBUILD
	kde-unstable/kdegraphics-gwenview/PKGBUILD
	kde-unstable/kdegraphics-kamera/PKGBUILD
	kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
	kde-unstable/kdegraphics-kgamma/PKGBUILD
	kde-unstable/kdegraphics-kolourpaint/PKGBUILD
	kde-unstable/kdegraphics-kruler/PKGBUILD
	kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
	kde-unstable/kdegraphics-ksnapshot/PKGBUILD
	kde-unstable/kdegraphics-mobipocket/PKGBUILD
	kde-unstable/kdegraphics-okular/PKGBUILD
	kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdelibs/PKGBUILD
	kde-unstable/kdemultimedia/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	kde-unstable/kdepim-runtime/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	kde-unstable/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	kde-unstable/kdesdk-kate/kdesdk-kate.install
	kde-unstable/kdesdk/PKGBUILD
	kde-unstable/kdetoys/PKGBUILD
	kde-unstable/kdeutils-filelight/PKGBUILD
	kde-unstable/kdeutils-kcalc/PKGBUILD
	kde-unstable/kdeutils-kcharselect/PKGBUILD
	kde-unstable/kdeutils-kdf/PKGBUILD
	kde-unstable/kdeutils-kfloppy/PKGBUILD
	kde-unstable/kdeutils-kgpg/PKGBUILD
	kde-unstable/kdeutils-kremotecontrol/PKGBUILD
	kde-unstable/kdeutils-ktimer/PKGBUILD
	kde-unstable/kdeutils-kwallet/PKGBUILD
	kde-unstable/kdeutils-printer-applet/PKGBUILD
	kde-unstable/kdeutils-superkaramba/PKGBUILD
	kde-unstable/kdeutils-sweeper/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	multilib/lib32-attr/PKGBUILD
	multilib/lib32-libldap/PKGBUILD
	multilib/lib32-libxi/PKGBUILD
	~lukeshu/android-udev/51-android.rules
	~lukeshu/android-udev/PKGBUILD

2 files changed, 9 insertions, 3 deletions

diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD
index bf7e5856b..880fbd1ed 100644
--- a/community/inn/PKGBUILD
+++ b/community/inn/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=inn
 pkgver=2.5.2
-pkgrel=6
+pkgrel=8
 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')
@@ -53,7 +53,7 @@ source=(http://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz
 	nnrpd.conf
 	site.make.patch)
 md5sums=('a6e577dceb90d07501b96149508b974b'
-         '2ad5138dac7c7535278f73f30020d656'
+         'a243d9498568f1beee20da5684b5fbfc'
          'a0b1ff8501ac8a31ce81a2f9c9b4bac9'
          'fbf1d2c5b3c5a08ae3e515c71c2e2e4a'
          'bb4bbe86ae52fbbf08b0f6f370dea052'
diff --git a/community/inn/innd.rc b/community/inn/innd.rc
index e88bd0c39..5e36aec0d 100644
--- a/community/inn/innd.rc
+++ b/community/inn/innd.rc
@@ -4,11 +4,15 @@
 . /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
+		[ -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
@@ -21,10 +25,12 @@ case "$1" in
 	;;
 	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