Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/hostapd/PKGBUILD
	community-testing/hostapd/config.bz2
	community-testing/hostapd/hostap_allow-linking-with-libnl-3.2.patch
	community-testing/hostapd/hostapd
	community-testing/hostapd/hostapd.conf.d
	community-testing/hostapd/hostapd.install
	community-testing/ipvsadm/PKGBUILD
	community-testing/ipvsadm/ipvsadm.conf
	community-testing/ipvsadm/ipvsadm.rc
	community-testing/ipvsadm/ipvsadm.rules
	community-testing/keepalived/PKGBUILD
	community-testing/keepalived/ip_vs_moved.patch
	community-testing/keepalived/keepalived.conf
	community-testing/keepalived/keepalived.rc
	community-testing/knemo/PKGBUILD
	community-testing/knemo/knemo.install
	community-testing/simh/LICENSE
	community-testing/simh/PKGBUILD
	community-testing/simh/simh.install
	community/fityk/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/sage-mathematics/PKGBUILD
	community/xylib/PKGBUILD
	core/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
	extra/kradio/PKGBUILD
	extra/phonon-gstreamer/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	testing/bluez/PKGBUILD
	testing/bluez/bluetooth.conf.d
	testing/bluez/fix-a2dp.patch
	testing/bluez/rc.bluetooth
	testing/crda/PKGBUILD
	testing/crda/crda.install
	testing/crda/crda.rc
	testing/crda/libnl32.patch
	testing/iw/PKGBUILD
	testing/kismet/PKGBUILD
	testing/kismet/kismet.changelog
	testing/kismet/kismet.install
	testing/libnl/PKGBUILD
	testing/libnl1/PKGBUILD
	testing/libnl1/fix-compilation.patch
	testing/libpcap/PKGBUILD
	testing/libpcap/libnl32.patch
	testing/net-snmp/PKGBUILD
	testing/net-snmp/libnl32.patch
	testing/net-snmp/snmpd.confd
	testing/net-snmp/snmpd.rc
	testing/networkmanager/NetworkManager.conf
	testing/networkmanager/PKGBUILD
	testing/networkmanager/disable_set_hostname.patch
	testing/networkmanager/networkmanager.install
	testing/ntrack/PKGBUILD
	testing/ntrack/libnl3.patch
	testing/wpa_supplicant/PKGBUILD
	testing/wpa_supplicant/config
	testing/wpa_supplicant/dbus.patch
	testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch

7 files changed, 72 insertions, 232 deletions

diff --git a/testing/glibc/glibc-2.15-arena.patch b/testing/glibc/glibc-2.15-arena.patch
deleted file mode 100644
index 46f52e98d..000000000
--- a/testing/glibc/glibc-2.15-arena.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/malloc/arena.c b/malloc/arena.c
-index d3cf4b9..b1c9469 100644
---- a/malloc/arena.c
-+++ b/malloc/arena.c
-@@ -828,7 +828,7 @@ arena_get2(mstate a_tsd, size_t size)
- 	{
- 	  if (mp_.arena_max != 0)
- 	    narenas_limit = mp_.arena_max;
--	  else
-+	  else if (narenas > mp_.arena_test)
- 	    {
- 	      int n  = __get_nprocs ();
- 
-@@ -842,7 +842,14 @@ arena_get2(mstate a_tsd, size_t size)
- 	}
-     repeat:;
-       size_t n = narenas;
--      if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0))
-+      /* NB: the following depends on the fact that (size_t)0 - 1 is a
-+	 very large number and that the underflow is OK.  If arena_max
-+	 is set the value of arena_test is irrelevant.  If arena_test
-+	 is set but narenas is not yet larger or equal to arena_test
-+	 narenas_limit is 0.  There is no possibility for narenas to
-+	 be too big for the test to always fail since there is not
-+	 enough address space to create that many arenas.  */
-+      if (__builtin_expect (n <= narenas_limit - 1, 0))
- 	{
- 	  if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n))
- 	    goto repeat;
diff --git a/testing/glibc/glibc-2.15-negative-result-cache.patch b/testing/glibc/glibc-2.15-negative-result-cache.patch
deleted file mode 100644
index c09e79a17..000000000
--- a/testing/glibc/glibc-2.15-negative-result-cache.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/nscd/aicache.c b/nscd/aicache.c
-index aaaf80d..e1f1244 100644
---- a/nscd/aicache.c
-+++ b/nscd/aicache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 2004-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2004-2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
- 
-@@ -514,8 +514,9 @@ next_nip:
-       if (fd != -1)
- 	TEMP_FAILURE_RETRY (send (fd, &notfound, total, MSG_NOSIGNAL));
- 
--      /* If we cannot permanently store the result, so be it.  */
--      if (__builtin_expect (db->negtimeout == 0, 0))
-+      /* If we have a transient error or cannot permanently store the
-+	 result, so be it.  */
-+      if (rc4 == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	{
- 	  /* Mark the old entry as obsolete.  */
- 	  if (dh != NULL)
-diff --git a/nscd/grpcache.c b/nscd/grpcache.c
-index e9607c6..a698f36 100644
---- a/nscd/grpcache.c
-+++ b/nscd/grpcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for group lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -120,8 +120,9 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
- 	  else
- 	    written = total;
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (db->negtimeout == 0)
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/hstcache.c b/nscd/hstcache.c
-index 4d68ade..c72feaa 100644
---- a/nscd/hstcache.c
-+++ b/nscd/hstcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -141,8 +141,9 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
- 					MSG_NOSIGNAL)) != total)
- 	    all_written = false;
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
-index 4ac9942..2019991 100644
---- a/nscd/initgrcache.c
-+++ b/nscd/initgrcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 2004-2006, 2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2004-2006, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
- 
-@@ -202,8 +202,9 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (all_tryagain || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
-index 49e130c..e2ba09d 100644
---- a/nscd/pwdcache.c
-+++ b/nscd/pwdcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for passwd lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -124,8 +124,9 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/servicescache.c b/nscd/servicescache.c
-index d3d5dce..a6337e3 100644
---- a/nscd/servicescache.c
-+++ b/nscd/servicescache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for services lookup.
--   Copyright (C) 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@drepper.com>, 2007.
- 
-@@ -108,8 +108,9 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
diff --git a/testing/glibc/glibc-2.15-strcasecmp-disable-avx.patch b/testing/glibc/glibc-2.15-strcasecmp-disable-avx.patch
deleted file mode 100644
index 4c104fa55..000000000
--- a/testing/glibc/glibc-2.15-strcasecmp-disable-avx.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
-index f93c83d..d8aa889 100644
---- a/sysdeps/x86_64/multiarch/strcmp.S
-+++ b/sysdeps/x86_64/multiarch/strcmp.S
-@@ -105,11 +105,6 @@ ENTRY(__strcasecmp)
-	jne	1f
-	call	__init_cpu_features
- 1:
--#  ifdef HAVE_AVX_SUPPORT
--	leaq	__strcasecmp_avx(%rip), %rax
--	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
--	jnz	2f
--#  endif
-	leaq	__strcasecmp_sse42(%rip), %rax
-	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
-	jnz	2f
-@@ -128,11 +123,6 @@ ENTRY(__strncasecmp)
-	jne	1f
-	call	__init_cpu_features
- 1:
--#  ifdef HAVE_AVX_SUPPORT
--	leaq	__strncasecmp_avx(%rip), %rax
--	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
--	jnz	2f
--#  endif
-	leaq	__strncasecmp_sse42(%rip), %rax
-	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
-	jnz	2f
-@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp)
- # include "strcmp-sse42.S"
-
-
--# ifdef HAVE_AVX_SUPPORT
--#  if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L
--#   define LABEL(l) .L##l##_avx
--#   define GLABEL(l) l##_avx
--#   define USE_AVX 1
--#   undef STRCMP_SSE42
--#   define STRCMP_SSE42 STRCMP_AVX
--#   define SECTION avx
--#   include "strcmp-sse42.S"
--#  endif
--# endif
--
--
- # undef ENTRY
- # define ENTRY(name) \
-	.type STRCMP_SSE2, @function; \
diff --git a/testing/ruby/PKGBUILD b/testing/ruby/PKGBUILD
new file mode 100644
index 000000000..8ceaba4b4
--- /dev/null
+++ b/testing/ruby/PKGBUILD
@@ -0,0 +1,56 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: John Proctor <jproctor@prium.net>
+# Contributor: Jeramy Rutley <jrutley@gmail.com>
+
+pkgname=ruby
+pkgver=1.9.3_p125
+pkgrel=1
+pkgdesc='An object-oriented language for quick and easy programming'
+arch=('i686' 'x86_64')
+url='http://www.ruby-lang.org/en/'
+license=('BSD' 'custom')
+backup=('etc/gemrc')
+provides=('rubygems' 'rake')
+conflicts=('rake')
+depends=('openssl' 'libffi' 'libyaml')
+makedepends=('tk')
+optdepends=('tk: for Ruby/TK'
+            'ruby-docs: Ruby documentation')
+options=('!emptydirs' '!makeflags')
+install='ruby.install'
+source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
+        'gemrc')
+md5sums=('341b8fc42aa18bd668314199f219db14'
+         '6fb8e7a09955e0f64be3158fb4a27e7a')
+
+build() {
+  cd ruby-${pkgver//_/-}
+
+  PKG_CONFIG=/usr/bin/pkg-config ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --enable-shared \
+    --enable-pthread \
+    --disable-rpath \
+    --disable-install-doc
+
+  make
+}
+
+check() {
+  cd ruby-${pkgver//_/-}
+
+  make test
+}
+
+package() {
+  cd ruby-${pkgver//_/-}
+
+  make DESTDIR="${pkgdir}" install-nodoc
+
+  install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc"
+
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE"
+  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL"
+}
diff --git a/testing/ruby/gemrc b/testing/ruby/gemrc
new file mode 100644
index 000000000..3d11de1ec
--- /dev/null
+++ b/testing/ruby/gemrc
@@ -0,0 +1,5 @@
+# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11
+
+# --user-install is used to install to $HOME/.gem/ by default since we want to separate
+#                pacman installed gems and gem installed gems
+gem: --user-install
diff --git a/testing/ruby/ruby.install b/testing/ruby/ruby.install
new file mode 100644
index 000000000..f91254084
--- /dev/null
+++ b/testing/ruby/ruby.install
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if [ "$(vercmp $2 1.9.3_p125)" -lt 0 ]; then
+    echo 'The default location of gem installs has changed to $HOME/.gem/ruby'
+    echo 'If you want to install to the system wide location, you must either:'
+    echo 'edit /etc/gemrc or run gem with the --no-user-install flag.'
+  fi
+}
diff --git a/testing/shadow/nscd-error-reporting.patch b/testing/shadow/nscd-error-reporting.patch
deleted file mode 100644
index a4075756e..000000000
--- a/testing/shadow/nscd-error-reporting.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/upstream/trunk/lib/nscd.c b/upstream/trunk/lib/nscd.c
-index 227c205..7adb58f 100644
---- a/lib/nscd.c
-+++ b/lib/nscd.c
-@@ -39,8 +39,11 @@ int nscd_flush_cache (const char *service)
- 		/* nscd is not installed, or it is installed but uses an
- 		   interpreter that is missing.  Probably the former. */
- 		return 0;
-+	} else if (code == 1) {
-+		/* nscd is installed, but it isn't active. */
-+		return 0;
- 	} else if (code != 0) {
--		(void) fprintf (stderr, _("%s: nscd exited with status %d"),
-+		(void) fprintf (stderr, _("%s: nscd exited with status %d\n"),
- 		                Prog, code);
- 		(void) fprintf (stderr, _(MSG_NSCD_FLUSH_CACHE_FAILED), Prog);
- 		return -1;