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

Conflicts:
	community/libvisual-projectm/PKGBUILD
	community/python-memcached/PKGBUILD
	community/python-mpi4py/PKGBUILD
	core/sqlite3/PKGBUILD
	core/udev/PKGBUILD
	extra/kdeplasma-applets-networkmanagement/PKGBUILD
	extra/pixman/PKGBUILD
	extra/sg3_utils/PKGBUILD
	libre/kdeutils-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/linux-libre/linux-libre.install
	multilib/lib32-libxcb/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/lib32-sqlite3/PKGBUILD
	multilib/lib32-udev/PKGBUILD

1 files changed, 0 insertions, 49 deletions

diff --git a/testing/openldap/slapd b/testing/openldap/slapd
deleted file mode 100755
index 4f212da66..000000000
--- a/testing/openldap/slapd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd
-
-PID=`pidof -o %PPID /usr/sbin/slapd`
-case "$1" in
-  start)
-    stat_busy "Starting OpenLDAP"
-    [ ! -d /run/openldap ] && install -d -m755 -o ldap -g ldap /run/openldap
-    if [ -z "$PID" ]; then
-      if [ -z "$SLAPD_SERVICES" ]; then
-        /usr/sbin/slapd -u ldap -g ldap $SLAPD_OPTIONS
-      else
-        /usr/sbin/slapd -u ldap -g ldap -h "$SLAPD_SERVICES" $SLAPD_OPTIONS
-      fi
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        stat_done
-      fi
-      add_daemon slapd
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OpenLDAP"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /run/openldap/slapd.pid
-      rm -f /run/openldap/slapd.args
-      rm_daemon slapd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0