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

Conflicts:
	community-staging/mplayer2/PKGBUILD
	community/pcmanfm/PKGBUILD
	extra/liblrdf/PKGBUILD
	extra/php-apc/PKGBUILD
	extra/sqlite/PKGBUILD
	kde-unstable/libkgapi/PKGBUILD
	kde-unstable/soprano/PKGBUILD
	multilib/lib32-libphobos-ldc/PKGBUILD
	multilib/lib32-pixman/PKGBUILD
	multilib/lib32-sqlite3/PKGBUILD

10 files changed, 0 insertions, 276 deletions

diff --git a/staging/bind/127.0.0.zone b/staging/bind/127.0.0.zone
deleted file mode 100644
index 509c311f6..000000000
--- a/staging/bind/127.0.0.zone
+++ /dev/null
@@ -1,11 +0,0 @@
-$ORIGIN 0.0.127.in-addr.arpa.
-
-@			1D IN SOA	localhost. root.localhost. (
-					42		; serial (yyyymmdd##)
-					3H		; refresh
-					15M		; retry
-					1W		; expiry
-					1D )		; minimum ttl
-
-			1D IN NS	localhost.
-1			1D IN PTR	localhost.
diff --git a/staging/bind/PKGBUILD b/staging/bind/PKGBUILD
deleted file mode 100644
index 99bbd00d4..000000000
--- a/staging/bind/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 161312 2012-06-09 06:22:34Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Contributor: Mario Vazquez <mario_vazq@hotmail.com>
-
-pkgname=bind
-
-# Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.9.1.P1
-_pkgver=9.9.1-P1
-pkgrel=2
-
-pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
-url='http://www.isc.org/software/bind/'
-license=('custom:ISC')
-arch=('i686' 'x86_64')
-options=('!makeflags' '!libtool')
-depends=('openssl' 'krb5' 'libxml2')
-source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
-        'root.hint::http://www.internic.net/zones/named.root'
-        'remove-tools.patch'
-        'named'
-        'named.conf'
-        'named.conf.d'
-        'named.service'
-        'named.logrotate'
-        'localhost.zone'
-        '127.0.0.zone')
-sha1sums=('a2263b96ccd8a143ea54b39958142c542bf605a8'
-          'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
-          '18f477f510df31e6c6f547ee2d5fc46e973479bf'
-          '46232e9db243c6c05e170a1781d7a7f413be5d03'
-          '5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
-          '7848edbfb9a848843f57c11c02b0289eefd42d00'
-          '05fb2346a30dee2f99c40914dd23708729839b64'
-          '9ffb5c3f72390a517aeae557e32349d5d278cb63'
-          '76a0d4cd1b913db177a5a375bebc47e5956866ec'
-          '53be0f1437ebe595240d8dbdd819939582b97fb9')
-
-provides=('dns-server')
-
-install=install
-backup=('etc/logrotate.d/named'
-        'etc/conf.d/named'
-        'etc/named.conf')
-
-build() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	patch -p1 -i ../remove-tools.patch
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-linux-caps \
-		--with-openssl \
-		--with-libxml2 \
-		--with-libtool \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-	make DESTDIR="${pkgdir}" install
-
-	rmdir "${pkgdir}/var/run"
-	install -d "${pkgdir}"/usr/share/doc/bind
-	install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind
-
-	install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
-	install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
-	install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service
-	install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named
-	install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf
-
-	install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named
-}
diff --git a/staging/bind/install b/staging/bind/install
deleted file mode 100644
index 287d0e05b..000000000
--- a/staging/bind/install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-	getent group named &>/dev/null || groupadd -g 40 named
-	getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named
-	passwd -l named &>/dev/null
-
-	touch var/log/named.log
-	chown named:named var/log/named.log
-
-	# create an rndc.key if it doesn't already exist
-	if [[ ! -s etc/rndc.key ]]; then
-		usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key
-		chown root:named etc/rndc.key
-		chmod 640 etc/rndc.key
-	fi
-}
-
-pre_remove() {
-	getent passwd named &>/dev/null && userdel named >/dev/null
-	getent group named &>/dev/null && groupdel named >/dev/null
-	return 0
-}
diff --git a/staging/bind/localhost.zone b/staging/bind/localhost.zone
deleted file mode 100644
index e3ff9641c..000000000
--- a/staging/bind/localhost.zone
+++ /dev/null
@@ -1,10 +0,0 @@
-$ORIGIN localhost.
-@			1D IN SOA	@ root (
-					42		; serial (yyyymmdd##)
-					3H		; refresh
-					15M		; retry
-					1W		; expiry
-					1D )		; minimum ttl
-
-			1D IN NS	@
-			1D IN A		127.0.0.1
diff --git a/staging/bind/named b/staging/bind/named
deleted file mode 100755
index 7907f9983..000000000
--- a/staging/bind/named
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/named
-
-[[ -d /var/run/named ]] || mkdir -p /var/run/named
-chown named:named /var/run/named
-
-PIDFILE=/var/run/named/named.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; }
-
-case "$1" in
-  start)
-    stat_busy "Starting BIND"
-    [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon named
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping BIND"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon named
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  reload)
-    stat_busy "Reloading BIND"
-    [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  *)
-    echo "usage: $0 {start|stop|reload|restart}"
-esac
-exit 0
diff --git a/staging/bind/named.conf b/staging/bind/named.conf
deleted file mode 100644
index 38fb12cbe..000000000
--- a/staging/bind/named.conf
+++ /dev/null
@@ -1,64 +0,0 @@
-// 
-// /etc/named.conf
-//
-
-options {
-	directory "/var/named";
-	pid-file "/var/run/named/named.pid";
-	auth-nxdomain yes;
-	datasize default;
-// Uncomment these to enable IPv6 connections support
-// IPv4 will still work:
-//	listen-on-v6 { any; };
-// Add this for no IPv4:
-//	listen-on { none; };
-
-	// Default security settings.
-	allow-recursion { 127.0.0.1; };
-	allow-transfer { none; };
-	allow-update { none; };
-    version none;
-    hostname none;
-    server-id none;
-};
-
-zone "localhost" IN {
-	type master;
-	file "localhost.zone";
-	allow-transfer { any; };
-};
-
-zone "0.0.127.in-addr.arpa" IN {
-	type master;
-	file "127.0.0.zone";
-	allow-transfer { any; };
-};
-
-zone "." IN {
-	type hint;
-	file "root.hint";
-};
-
-//zone "example.org" IN {
-//	type slave;
-//	file "example.zone";
-//	masters {
-//		192.168.1.100; 
-//	};
-//	allow-query { any; };
-//	allow-transfer { any; };
-//};
-
-logging {
-        channel xfer-log {
-                file "/var/log/named.log";
-                print-category yes;
-                print-severity yes;
-                print-time yes;
-                severity info;
-        };
-        category xfer-in { xfer-log; };
-        category xfer-out { xfer-log; };
-        category notify { xfer-log; };
-};
-
diff --git a/staging/bind/named.conf.d b/staging/bind/named.conf.d
deleted file mode 100644
index aecbd2307..000000000
--- a/staging/bind/named.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to BIND
-#
-NAMED_ARGS="-u named"
diff --git a/staging/bind/named.logrotate b/staging/bind/named.logrotate
deleted file mode 100644
index ef1a2d032..000000000
--- a/staging/bind/named.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/named.log {
-   missingok
-   postrotate
-      /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/staging/bind/named.service b/staging/bind/named.service
deleted file mode 100644
index 77196f785..000000000
--- a/staging/bind/named.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Internet domain name server
-
-[Service]
-ExecStart=/usr/sbin/named -f -u named
-ExecReload=/usr/sbin/rndc reload
-ExecStop=/usr/sbin/rndc stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/staging/bind/remove-tools.patch b/staging/bind/remove-tools.patch
deleted file mode 100644
index cbd1c53ad..000000000
--- a/staging/bind/remove-tools.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur old/bin/Makefile.in new/bin/Makefile.in
---- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
-+++ new/bin/Makefile.in	2011-08-28 19:14:17.025674400 -0700
-@@ -19,7 +19,7 @@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
-+SUBDIRS =	named rndc dnssec tests tools nsupdate \
- 		check confgen @PKCS11_TOOLS@
- TARGETS =
-