Fri Aug 16 01:44:39 PDT 2013

7 files changed, 148 insertions, 57 deletions

diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index 04d9afab7..25560318d 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 190839 2013-07-18 17:45:57Z bpiotrowski $
+# $Id: PKGBUILD 193074 2013-08-15 15:18:16Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
 pkgver=5.5.32
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://mariadb.org/'
@@ -35,7 +35,7 @@ build() {
     -DENABLED_LOCAL_INFILE=ON \
     -DINSTALL_INFODIR=share/mysql/docs \
     -DINSTALL_MANDIR=share/man \
-    -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
+    -DINSTALL_PLUGINDIR=lib/mysql/plugin \
     -DINSTALL_SCRIPTDIR=bin \
     -DINSTALL_INCLUDEDIR=include/mysql \
     -DINSTALL_DOCREADMEDIR=share/mysql \
diff --git a/extra/perl-net-upnp/PKGBUILD b/extra/perl-net-upnp/PKGBUILD
index 9d2945e27..88a29c7d5 100644
--- a/extra/perl-net-upnp/PKGBUILD
+++ b/extra/perl-net-upnp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143946 2011-11-30 21:55:00Z giovanni $
+# $Id: PKGBUILD 193058 2013-08-15 05:11:38Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Drew Gilbert <gilbert dot drew at gmail dot com>
 
 pkgname=perl-net-upnp
 pkgver=1.4.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Perl Module UPnP"
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/~skonno/Net-UPnP-1.4.2/"
@@ -22,11 +22,17 @@ build() {
   make
 }
 
-package() {
+check() {
   cd "${srcdir}/Net-UPnP-${pkgver}"
 
-  make install DESTDIR="${pkgdir}" 
+  make test
+}
+
+package() {
+  cd "${srcdir}/Net-UPnP-${pkgver}"
 
-  find ${pkgdir} -name '.packlist' -delete
-  find ${pkgdir} -name '*.pod' -delete
+  make install DESTDIR="${pkgdir}"
+  
+  # install license file
+  install -Dm644 "README" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index ce5dea5d9..f8185ed5b 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 189298 2013-07-02 15:47:31Z schiv $
+# $Id: PKGBUILD 193060 2013-08-15 10:40:13Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: see .contrib
 
 pkgname=snd
-pkgver=13.8
+pkgver=13.9
 pkgrel=1
 pkgdesc="An advanced sound editor"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=('wavpack' 'flac' 'speex' 'mpg123'
             'timidity++' 'vorbis-tools')
 install=$pkgname.install
 source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz")
-md5sums=('d70148dc06073b49a854ada504e8a2d4')
+md5sums=('acceab2d1e30720640aca54d4b68d45b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index fd6cd7b6d..44b5394c8 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,28 +1,39 @@
-# $Id: PKGBUILD 173941 2012-12-28 13:12:00Z allan $
+# $Id: PKGBUILD 193067 2013-08-15 12:08:37Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=valgrind
 pkgver=3.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool to help find memory-management problems in programs"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://valgrind.org/"
-depends=('glibc>=2.17' 'glibc<2.18' 'perl')
+depends=('glibc>=2.18' 'glibc<2.19' 'perl')
 makedepends=('gdb')
 options=('!emptydirs')
 source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-        valgrind-3.8.1-glibc-2.17.patch)
+        valgrind-3.8.1-glibc-2.18.patch
+        valgrind-3.8.1-ptrace-build-fix.patch)
 md5sums=('288758010b271119a0ffc0183f1d6e38'
-         'e87c34f9f9ce0040d141b3bd57842b5c')
+         'f3f911e6f5b0ab9d176d40b47d6cae24'
+         '9d429e62255621a0c190a8180d8ab1a4')
 
-build() {
+prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  patch -p1 -i $srcdir/valgrind-3.8.1-glibc-2.17.patch
+  patch -p1 -i $srcdir/valgrind-3.8.1-glibc-2.18.patch
+  
+  # based on svn commits 13471 & 13482
+  patch -p0 -i $srcdir/valgrind-3.8.1-ptrace-build-fix.patch
+  
+  ./autogen.sh
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
 
-  if [ "${CARCH}" = "x86_64" ]; then
+  if [[ ${CARCH} = "x86_64" ]]; then
     ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
   else
     ./configure --prefix=/usr --mandir=/usr/share/man
diff --git a/extra/valgrind/valgrind-3.8.1-glibc-2.17.patch b/extra/valgrind/valgrind-3.8.1-glibc-2.17.patch
deleted file mode 100644
index bfeb9486d..000000000
--- a/extra/valgrind/valgrind-3.8.1-glibc-2.17.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur valgrind-3.8.1-orig/configure valgrind-3.8.1/configure
---- valgrind-3.8.1-orig/configure	2012-09-19 05:19:23.000000000 +1000
-+++ valgrind-3.8.1/configure	2012-12-27 08:11:36.645429011 +1000
-@@ -6612,6 +6612,24 @@
- 
- 	# DEFAULT_SUPP set by kernel version check above.
- 	;;
-+     2.17)
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.17 family" >&5
-+$as_echo "2.17 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_17 1" >>confdefs.h
-+
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-+     darwin)
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
-+$as_echo "Darwin" >&6; }
-+
-+$as_echo "#define DARWIN_LIBC 1" >>confdefs.h
-+
-+	# DEFAULT_SUPP set by kernel version check above.
-+	;;
-      bionic)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Bionic" >&5
- $as_echo "Bionic" >&6; }
-@@ -6624,7 +6642,7 @@
-      *)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
- $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
--	as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5
-+	as_fn_error "Valgrind requires glibc version 2.2 - 2.17" "$LINENO" 5
- 	as_fn_error "or Darwin libc" "$LINENO" 5
- 	;;
- esac
diff --git a/extra/valgrind/valgrind-3.8.1-glibc-2.18.patch b/extra/valgrind/valgrind-3.8.1-glibc-2.18.patch
new file mode 100644
index 000000000..9f471ad1c
--- /dev/null
+++ b/extra/valgrind/valgrind-3.8.1-glibc-2.18.patch
@@ -0,0 +1,33 @@
+diff -Naur valgrind-3.8.1-orig/configure.in valgrind-3.8.1/configure.in
+--- valgrind-3.8.1-orig/configure.in	2013-08-13 22:36:20.201676976 +1000
++++ valgrind-3.8.1/configure.in	2013-08-13 22:38:18.402750093 +1000
+@@ -906,6 +906,20 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.17)
++	AC_MSG_RESULT(2.17 family)
++	AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x])
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
++     2.18)
++	AC_MSG_RESULT(2.18 family)
++	AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.x])
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      darwin)
+ 	AC_MSG_RESULT(Darwin)
+ 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
+@@ -919,7 +933,7 @@
+ 
+      *)
+ 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16])
++	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.18])
+ 	AC_MSG_ERROR([or Darwin libc])
+ 	;;
+ esac
diff --git a/extra/valgrind/valgrind-3.8.1-ptrace-build-fix.patch b/extra/valgrind/valgrind-3.8.1-ptrace-build-fix.patch
new file mode 100644
index 000000000..89af000b1
--- /dev/null
+++ b/extra/valgrind/valgrind-3.8.1-ptrace-build-fix.patch
@@ -0,0 +1,78 @@
+Index: coregrind/vgdb.c
+===================================================================
+--- coregrind/vgdb.c	(revision 13470)
++++ coregrind/vgdb.c	(revision 13471)
+@@ -100,11 +100,10 @@
+ 
+ #if defined(PTRACEINVOKER)
+ #include <sys/user.h>
+ #if defined(VGO_linux)
+ #  include <sys/prctl.h>
+-#  include <linux/ptrace.h>
+ #endif
+ #endif
+ 
+ 
+ // Outputs information for the user about ptrace not working.
+
+Index: coregrind/vgdb.c
+===================================================================
+--- coregrind/vgdb.c	(revision 13481)
++++ coregrind/vgdb.c	(revision 13482)
+@@ -691,7 +691,7 @@
+ //       runtime check not yet done.
+ //   0 : PTRACE_GETREGS runtime check has failed.
+ //   1 : PTRACE_GETREGS defined and runtime check ok.
+-#ifdef PTRACE_GETREGS
++#ifdef HAVE_PTRACE_GETREGS
+ static int has_working_ptrace_getregs = -1;
+ #endif
+ 
+@@ -702,7 +702,7 @@
+ Bool getregs (int pid, void *regs, long regs_bsz)
+ {
+    DEBUG(1, "getregs regs_bsz %ld\n", regs_bsz);
+-#  ifdef PTRACE_GETREGS
++#  ifdef HAVE_PTRACE_GETREGS
+    if (has_working_ptrace_getregs) {
+       // Platforms having GETREGS
+       long res;
+@@ -773,7 +773,7 @@
+    DEBUG(1, "setregs regs_bsz %ld\n", regs_bsz);
+ // Note : the below is checking for GETREGS, not SETREGS
+ // as if one is defined and working, the other one should also work.
+-#  ifdef PTRACE_GETREGS
++#  ifdef HAVE_PTRACE_GETREGS
+    if (has_working_ptrace_getregs) {
+       // Platforms having SETREGS
+       long res;
+Index: configure.in
+===================================================================
+--- configure.in	(revision 13481)
++++ configure.in	(revision 13482)
+@@ -1040,6 +1040,25 @@
+ 
+ AM_CONDITIONAL([HAVE_GNU_STPNCPY], [test x$ac_have_gnu_stpncpy = xyes])
+ 
++# Check for PTRACE_GETREGS
++
++AC_MSG_CHECKING([for PTRACE_GETREGS])
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++#include <stddef.h>
++#include <sys/ptrace.h>
++#include <sys/user.h>
++]], [[
++  void *p;
++  long res = ptrace (PTRACE_GETREGS, 0, p, p);
++]])], [
++AC_MSG_RESULT([yes])
++AC_DEFINE([HAVE_PTRACE_GETREGS], 1,
++          [Define to 1 if you have the `PTRACE_GETREGS' ptrace request.])
++], [
++AC_MSG_RESULT([no])
++])
++
++
+ # Check for CLOCK_MONOTONIC
+ 
+ AC_MSG_CHECKING([for CLOCK_MONOTONIC])