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

Conflicts:
	community/apcupsd/PKGBUILD
	community/bmp-musepack/PKGBUILD
	community/bmp-wma/PKGBUILD
	community/bonnie++/PKGBUILD
	community/cantata/PKGBUILD
	community/checkinstall/PKGBUILD
	community/chrootuid/PKGBUILD
	community/compiz-bcop/PKGBUILD
	community/compiz-fusion-plugins-extra/PKGBUILD
	community/compiz-fusion-plugins-main/PKGBUILD
	community/compiz/PKGBUILD
	community/compizconfig-backend-gconf/PKGBUILD
	community/compizconfig-python/PKGBUILD
	community/ekg2/PKGBUILD
	community/emerald/PKGBUILD
	community/fbgetty/PKGBUILD
	community/flumotion/PKGBUILD
	community/leafnode/PKGBUILD
	community/libcompizconfig/PKGBUILD
	community/libdnet/PKGBUILD
	community/libee/PKGBUILD
	community/libtxc_dxtn/PKGBUILD
	community/linux-tools/PKGBUILD
	community/openntpd/PKGBUILD
	community/osiris/PKGBUILD
	community/perl-package-stash-xs/PKGBUILD
	community/perl-params-util/PKGBUILD
	community/procstatd/PKGBUILD
	community/scponly/PKGBUILD
	community/sniffit/PKGBUILD
	community/synergy/PKGBUILD
	community/turbojpeg/PKGBUILD
	community/unbound/PKGBUILD
	community/uucp/PKGBUILD
	core/gawk/PKGBUILD
	core/ifenslave/PKGBUILD
	core/jfsutils/PKGBUILD
	core/openldap/PKGBUILD
	core/rfkill/PKGBUILD
	core/systemd/PKGBUILD
	core/wireless_tools/PKGBUILD
	core/xinetd/PKGBUILD
	extra/avahi/PKGBUILD
	extra/calligra/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/flac/PKGBUILD
	extra/hddtemp/PKGBUILD
	extra/libbluray/PKGBUILD
	extra/libdmx/PKGBUILD
	extra/libfs/PKGBUILD
	extra/libjpeg-turbo/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libxau/PKGBUILD
	extra/libxfixes/PKGBUILD
	extra/licq/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/perl-guard/PKGBUILD
	extra/perl-template-toolkit/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pigeonhole/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/python/PKGBUILD
	extra/samba/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vde2/PKGBUILD
	extra/vim/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-dict/PKGBUILD
	libre/libquicktime-libre/PKGBUILD
	libre/xscreensaver-libre/PKGBUILD

3 files changed, 7 insertions, 7 deletions

diff --git a/community/leafnode/PKGBUILD b/community/leafnode/PKGBUILD
index 6e2ce806d..58a1a1858 100644
--- a/community/leafnode/PKGBUILD
+++ b/community/leafnode/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 64337 2012-02-11 23:22:13Z allan $
+# $Id: PKGBUILD 91512 2013-05-23 11:13:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=leafnode
 pkgver=1.11.8
-pkgrel=5.1
+pkgrel=6
 pkgdesc="implements a store & forward NNTP proxy (client and server) with IPv4 and IPv6"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://leafnode.sourceforge.net/"
@@ -15,11 +15,11 @@ backup=('etc/xinetd.d/leafnode')
 source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
 	leafnode.xinetd)
 md5sums=('a3edafeb854efaa3fbb0f7951d02160f'
-         'db3c6ad1ff9fc03442949456d1d21304')
+         '08cd0a81d6efe0803b5d0747ab31903f')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/leafnode \
+  ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/leafnode --sbindir=/usr/bin \
 	--with-user=9 \
 	--with-group=13
   sed -i 's|#define NEWS_USER .*|#define NEWS_USER "news"|' config.h
diff --git a/community/leafnode/leafnode.install b/community/leafnode/leafnode.install
index 5f8a74c04..8c5f10484 100644
--- a/community/leafnode/leafnode.install
+++ b/community/leafnode/leafnode.install
@@ -1,7 +1,7 @@
 post_install() {
   echo "-- Adding user 'news' and group 'news', chowning /var/spool/news"
-  grep -e "^news:" /etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&-
-  grep -e "^news:" /etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&-
+  grep -e "^news:" etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&-
+  grep -e "^news:" etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&-
   chown -R root:news etc/leafnode
   # create dir if necessary
   if [ ! -d var/spool/news ]; then
diff --git a/community/leafnode/leafnode.xinetd b/community/leafnode/leafnode.xinetd
index 94c7c6ca7..98b5c24e0 100644
--- a/community/leafnode/leafnode.xinetd
+++ b/community/leafnode/leafnode.xinetd
@@ -7,7 +7,7 @@ service nntp
 	socket_type		= stream
 	wait			= no
 	user			= news
-	server			= /usr/sbin/leafnode
+	server			= /usr/bin/leafnode
 	log_type		= SYSLOG news
 	log_on_success		+= USERID
 	log_on_failure		+= USERID