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

Conflicts:
	community/mfs/PKGBUILD
	core/procps-ng/PKGBUILD
	extra/nx/PKGBUILD

6 files changed, 18 insertions, 183 deletions

diff --git a/community/mfs/PKGBUILD b/community/mfs/PKGBUILD
index ded698166..2fc29c3d5 100644
--- a/community/mfs/PKGBUILD
+++ b/community/mfs/PKGBUILD
@@ -1,43 +1,35 @@
-# $Id: PKGBUILD 75321 2012-08-19 15:17:28Z arodseth $
+# $Id: PKGBUILD 87206 2013-03-28 15:53:12Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 
 pkgbase=mfs
 pkgname=('mfs-master' 'mfs-chunkserver' 'mfs-client')
-pkgver=1.6.26
+pkgver=1.6.27_1
 pkgrel=1
 pkgdesc='MooseFS, fault tolerant, network distributed file system'
-license=('GPL3')
+url='http://www.moosefs.com/'
 arch=('x86_64' 'i686' 'mips64el')
-options=('!libtool')
+license=('GPL3')
 depends=('zlib' 'fuse' 'python2' 'bash' 'xfsprogs')
-url='http://www.moosefs.com/'
-install=mfs.install
-source=("http://www.moosefs.org/tl_files/mfscode/mfs-$pkgver.tar.gz"
+install="$pkgbase.install"
+options=('!libtool')
+source=("http://www.moosefs.org/tl_files/${pkgbase}code/$pkgbase-${pkgver/_/-}.tar.gz"
         'mfsmaster.service'
         'mfschunkserver.service'
         'mfsmetalogger.service'
-        'mfscgiserv.service'
-        'mfsmaster'
-        'mfschunkserver'
-        'mfsmetalogger'
-        'mfscgiserv')
-sha256sums=('f250f97c6f2a229277fdbf9fe96036873fd6c95a38f484f06e6b87a404c01885'
+        'mfscgiserv.service')
+sha256sums=('dfe682f0b184ed13e602274825148cd9a7ddfe4f0894e1ab9c1823f66208cb28'
             'b24fc4f699e7d11fcda00d83a1feb45aa0e6f4f448e675a1857edcf315427fe0'
             '19262bde4dbefb1d3eba09ba7d507595aed9647328a0a7822bbc1915ae3201a7'
             'bf92e93be68308d53f649de84dc5bbb0fb433e33306b8d0c303be6c6c3e59a55'
-            '6725a732c6294ee8817be6c24e3811481bf05e97a0a64108908e2312d7687f1a'
-            '7c307f7be520644ac5d9c71e39ff7ec7e26800aa77c8a18c51a2d0087e5b2f48'
-            '2d07e544f4bfeb497c24276936d3a8ce9f906597d6b9c898dc491426b21e74e0'
-            'd9c072cbb9d9645e5131d08b08628ccc2a2bef0a4e9c6fd8c3c33e50efce39f3'
-            'a2e1951888887e928e68a3a010047fa3528182e93c086e4addb5abc14ea72c3b')
+            '6725a732c6294ee8817be6c24e3811481bf05e97a0a64108908e2312d7687f1a')
 
 build() {
   cd "$srcdir"
 
   msg2 'Building client...'
-  cp -r $pkgbase-$pkgver $pkgbase-client
-  cd $pkgbase-client
+  cp -r "$pkgbase-${pkgver%_1}" "$pkgbase-client"
+  cd "$pkgbase-client"
   ./configure \
       --prefix=/usr \
       --sysconfdir=/etc/mfs \
@@ -50,8 +42,8 @@ build() {
   cd ..
   
   msg2 'Building chunkserver...'
-  cp -r $pkgbase-$pkgver $pkgbase-chunk
-  cd $pkgbase-chunk
+  cp -r "$pkgbase-${pkgver%_1}" "$pkgbase-chunk"
+  cd "$pkgbase-chunk"
   ./configure \
       --prefix=/usr \
       --sysconfdir=/etc/mfs \
@@ -64,8 +56,8 @@ build() {
   cd ..
   
   msg2 'Building master...'
-  cp -r $pkgbase-$pkgver $pkgbase-master
-  cd $pkgbase-master
+  cp -r "$pkgbase-${pkgver%_1}" "$pkgbase-master"
+  cd "$pkgbase-master"
   ./configure \
       --prefix=/usr \
       --sysconfdir=/etc/mfs \
@@ -98,9 +90,6 @@ package_mfs-chunkserver() {
   install -Dm644 "$srcdir/mfschunkserver.service" \
     "$pkgdir/usr/lib/systemd/system/mfschunkserver.service"
 
-  msg2 'Packaging initscript...'
-  install -Dm755 "$srcdir/mfschunkserver" "$pkgdir/etc/rc.d/mfschunkserver"
-
   msg2 'Cleaning up...'
   rm -rf "$pkgdir/usr/share/man/man7"
   rmdir "$pkgdir/usr/share/man/man1"
@@ -120,9 +109,8 @@ package_mfs-master() {
   install -Dm644 NEWS "$pkgdir/usr/share/doc/$pkgbase/NEWS"
   install -Dm644 UPGRADE "$pkgdir/usr/share/doc/$pkgbase/UPGRADE"
 
-  msg2 'Packaging Systemd services and initscripts...'
+  msg2 'Packaging Systemd services...'
   for fn in master metalogger cgiserv; do
-    install -Dm755 "$srcdir/mfs$fn" "$pkgdir/etc/rc.d/mfs$fn"
     install -Dm644 "$srcdir/mfs$fn.service" \
       "$pkgdir/usr/lib/systemd/system/mfs$fn.service"
   done
diff --git a/community/mfs/mfs.install b/community/mfs/mfs.install
index 906932aaa..433595cb0 100644
--- a/community/mfs/mfs.install
+++ b/community/mfs/mfs.install
@@ -17,8 +17,7 @@ post_install() {
   echo 'To troubleshoot a service, like "mfschunkserver", just running'
   echo '"/usr/bin/mfschunkserver start" can be helpful.'
   echo
-  echo '"systemctl enable mfschunkserver" can be used to enable a service'
-  echo "at boot, if you're using systemd."
+  echo 'Systemd is supported for starting services at boot.'
   echo
 }
 
diff --git a/community/mfs/mfscgiserv b/community/mfs/mfscgiserv
deleted file mode 100644
index 2f176d239..000000000
--- a/community/mfs/mfscgiserv
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(ps aux | grep -v grep | grep /usr/bin/mfscgiserv | awk '{print $2}')
-case "$1" in
-  start)
-    stat_busy "Starting MooseFS CGI Web Frontend Daemon"
-    [ -z "$PID" ] && /usr/bin/mfscgiserv &> /dev/null
-    if [ $? = 0 ]; then
-      add_daemon mfscgiserv
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping MooseFS CGI Web Frontend Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mfscgiserv
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/mfs/mfschunkserver b/community/mfs/mfschunkserver
deleted file mode 100644
index 606d00f48..000000000
--- a/community/mfs/mfschunkserver
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/mfschunkserver`
-case "$1" in
-  start)
-    stat_busy "Starting MooseFS Chunkserver Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/bin/mfschunkserver start
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=`pidof -o %PPID /usr/bin/mfschunkserver`
-      echo $PID > /var/run/mfsmetalogger.pid
-      add_daemon mfschunkserver
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping MooseFS Chunkserver Daemon"
-    [ ! -z "$PID" ]  && /usr/bin/mfschunkserver stop &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mfschunkserver
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/mfs/mfsmaster b/community/mfs/mfsmaster
deleted file mode 100644
index b0cfd8299..000000000
--- a/community/mfs/mfsmaster
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID -x /usr/bin/mfsmaster`
-case "$1" in
-  start)
-    stat_busy "Starting MooseFS Master Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/bin/mfsmaster start
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=`pidof -o %PPID -x /usr/bin/mfsmaster`
-      echo $PID > /var/run/mfsmaster.pid
-      add_daemon mfsmaster
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping MooseFS Master Daemon"
-    [ ! -z "$PID" ]  && /usr/bin/mfsmaster stop &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mfsmaster
-      rm /var/run/mfsmaster.pid
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/mfs/mfsmetalogger b/community/mfs/mfsmetalogger
deleted file mode 100644
index a870cc5a7..000000000
--- a/community/mfs/mfsmetalogger
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/mfsmetalogger`
-case "$1" in
-  start)
-    stat_busy "Starting MooseFS Metalogger Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/bin/mfsmetalogger start
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=`pidof -o %PPID /usr/bin/mfsmetalogger`
-      echo $PID > /var/run/mfsmetalogger.pid
-      add_daemon mfsmetalogger
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping MooseFS Metalogger Daemon"
-    [ ! -z "$PID" ]  && /usr/bin/mfsmetalogger stop &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mfsmetalogger
-      rm /var/run/mfsmetalogger.pid
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac