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

Conflicts:
	community-testing/shotwell/PKGBUILD
	community/recoll/PKGBUILD
	cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
	cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
	cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.12.2-ignore-origin-of-privileged-program.patch
	cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-__i686.patch
	cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
	cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
	cross/mips64el-unknown-linux-gnu-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
	cross/mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch
	staging/nx-common/PKGBUILD
	staging/nx/PKGBUILD
	testing/devhelp/PKGBUILD
	testing/empathy/PKGBUILD
	testing/evolution-data-server/PKGBUILD
	testing/evolution-ews/PKGBUILD
	testing/evolution-exchange/PKGBUILD
	testing/evolution/PKGBUILD
	testing/folks/PKGBUILD
	testing/gcr/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/gnome-desktop/PKGBUILD
	testing/gnome-documents/PKGBUILD
	testing/gnome-keyring/PKGBUILD
	testing/gnome-panel/PKGBUILD
	testing/gnome-session/PKGBUILD
	testing/gnome-settings-daemon/PKGBUILD
	testing/gnome-terminal/PKGBUILD
	testing/gnome-themes-standard/PKGBUILD
	testing/gthumb/PKGBUILD
	testing/gtkhtml4/PKGBUILD
	testing/gtksourceview3/PKGBUILD
	testing/gvfs/PKGBUILD
	testing/libgnome-keyring/PKGBUILD
	testing/librsvg/PKGBUILD
	testing/librsvg/librsvg.install
	testing/mousetweaks/PKGBUILD
	testing/seahorse/PKGBUILD
	testing/sushi/PKGBUILD
	testing/totem-plparser/PKGBUILD
	testing/totem/PKGBUILD
	testing/vte3/PKGBUILD

3 files changed, 28 insertions, 33 deletions

diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD
index 2c0dcf5c3..ac4f13b38 100644
--- a/community/pound/PKGBUILD
+++ b/community/pound/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 64351 2012-02-11 23:23:24Z allan $
+# $Id: PKGBUILD 69456 2012-04-16 13:52:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=pound
 pkgver=2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A reverse proxy, load balancer, and SSL wrapper"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.apsis.ch/pound/index_html"
@@ -15,18 +15,14 @@ backup=(etc/pound/pound.cfg)
 source=(http://www.apsis.ch/pound/Pound-$pkgver.tgz
 	pound.init
 	pound.runit
-	pound.cfg
-	pound-2.5-openssl.patch)
+	pound.cfg)
 md5sums=('8c913b527332694943c4c67c8f152071'
-         '4df8548f106fca08323e8e4071beaa43'
-         '716cc0bf334b594751bece24c7d1df2d'
-         '8937808acd22c6391ebe4340af8df854'
-         'c2c48dc395ffc045f9d35394992292d0')
+         'bd3bddb6dc17fdcab824815a4705b055'
+         '4bd5e2a8d8e707eb900ae88929e00d4c'
+         '8937808acd22c6391ebe4340af8df854')
 
 build() {
     cd $srcdir/Pound-$pkgver
-    # Patch to build against OpenSSL 1.0.0 (Thanks Fedora!)
-#    patch -p1 -i $srcdir/pound-2.5-openssl.patch || return 1
     ./configure --prefix=/usr --sysconfdir=/etc/pound
     make 
 }
diff --git a/community/pound/pound.init b/community/pound/pound.init
index 369d6626d..b8187c81f 100755
--- a/community/pound/pound.init
+++ b/community/pound/pound.init
@@ -6,33 +6,33 @@
 
 case "$1" in
     start)
-        stat_busy "Starting Pound"
-        /usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid &
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon pound
-            stat_done
-        fi
-        ;;
+	stat_busy "Starting Pound"
+	/usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid &>/dev/null
+	if [ $? -gt 0 ]; then
+	    stat_fail
+	else
+	    add_daemon pound
+	    stat_done
+	fi
+	;;
     stop)
-        stat_busy "Stopping Pound"
+	stat_busy "Stopping Pound"
 	[ -f /var/run/pound.pid ] && kill `cat /var/run/pound.pid`
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
+	if [ $? -gt 0 ]; then
+	    stat_fail
+	else
 	    rm -f /var/run/pound.pid
-            rm_daemon pound
-            stat_done
-        fi
-        ;;
+	    rm_daemon pound
+	    stat_done
+	fi
+	;;
     restart)
-        $0 stop
+	$0 stop
 	sleep 1
-        $0 start
-        ;;
+	$0 start
+	;;
     *)
-        echo "usage: $0 {start|stop|restart}"
+	echo "usage: $0 {start|stop|restart}"
 	;;
 esac
 exit 0
diff --git a/community/pound/pound.runit b/community/pound/pound.runit
index 2e0be991e..ed59ea046 100755
--- a/community/pound/pound.runit
+++ b/community/pound/pound.runit
@@ -11,7 +11,7 @@ SVC=pound
 PID=`pidof $BIN`
 if [ -z "$PID" ]
 then
-	if [ -f /var/run/$SVC.pid ] 
+	if [ -f /var/run/$SVC.pid ]
 	then
 		rm /var/run/$SVC.pid
 		rm_daemon $SVC
@@ -21,4 +21,3 @@ then
 else
 	[ -z $PID ] || exec watchpid $PID
 fi
-