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

Conflicts:
	community/balsa/PKGBUILD
	community/bitcoin/PKGBUILD
	community/jack2/PKGBUILD
	community/kadu/PKGBUILD
	community/oss/PKGBUILD
	core/sudo/PKGBUILD
	extra/djvulibre/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/samba/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	libre/kdenetwork-kopete-libre/PKGBUILD
	multilib/jack2-multilib/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-sdl/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/zsnes/PKGBUILD
	testing/btrfs-progs/PKGBUILD
	testing/dnsutils/PKGBUILD
	testing/man-db/PKGBUILD
	testing/postgresql/PKGBUILD
	testing/postgresql/postgresql.install
	testing/postgresql/postgresql.service
	testing/procps-ng/PKGBUILD
	testing/procps-ng/sysctl.conf
	testing/sudo/PKGBUILD
	testing/xf86-video-nouveau/PKGBUILD
	testing/xf86-video-nouveau/xf86-video-nouveau.install

13 files changed, 302 insertions, 44 deletions

diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index debbe962a..7ee1ae928 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165283 2012-08-14 20:43:47Z ronald $
+# $Id: PKGBUILD 166650 2012-09-14 11:11:15Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Tom Killian <tom.archlinux.org>
 # Contributor: Judd Vinet <jvinet.zeroflux.org>
 
 pkgname=dhcpcd
-pkgver=5.6.0
+pkgver=5.6.2
 pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/projects/dhcpcd/"
@@ -16,7 +16,7 @@ backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
 options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
 source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
         'dhcpcd.conf.d' 'dhcpcd.service')
-sha1sums=('28ad6931393420a72da307ee173466a9e00cd952'
+sha1sums=('7127237b5594ba50642829e76033a04d1c6fd42e'
           'b67b9ce6a2faaca75fea356966a16be2283b7db0'
           '3d0542eab1b89a88d56ca427128228ac72c40d1f')
 
diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD
index 42f938f26..ae29490bd 100644
--- a/core/dnsutils/PKGBUILD
+++ b/core/dnsutils/PKGBUILD
@@ -1,15 +1,12 @@
-# $Id: PKGBUILD 164066 2012-07-26 15:21:23Z bisson $
+# $Id: PKGBUILD 166636 2012-09-13 23:21:14Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: mario <mario_vazq@hotmail.com>
 
 pkgname=dnsutils
-
-# Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.9.1.P2
-_pkgver=9.9.1-P2
+_pkgver=9.9.1-P3
+pkgver=${_pkgver//-/.}
 pkgrel=1
-
 pkgdesc='DNS utilities: dig host nslookup'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
@@ -18,7 +15,7 @@ options=('!makeflags')
 depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors')
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'remove-bind.patch')
-sha1sums=('449b12c32682b5bef64c7b53cd0fc0c6b731c8a7'
+sha1sums=('1c890f69f627ffbc76460c766bafefde408ed799'
           'b465ef6160b004838f04de9978fe1be8422af777')
 
 replaces=('bind-tools' 'host')
diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD
index 6f32487fe..5e579adb6 100644
--- a/core/kmod/PKGBUILD
+++ b/core/kmod/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 163513 2012-07-14 13:07:23Z allan $
+# $Id: PKGBUILD 166572 2012-09-12 13:25:27Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=kmod
-pkgver=9
-pkgrel=2
+pkgver=10
+pkgrel=1
 pkgdesc="Linux kernel module handling"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
 license=('GPL2')
 depends=('glibc' 'zlib')
+makedepends=('gtk-doc')
 options=('!libtool')
 provides=('module-init-tools=3.16')
 conflicts=('module-init-tools')
 replaces=('module-init-tools')
-install=kmod.install
 source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
         "depmod-search.conf")
-md5sums=('c8ae2d2694fbca2b28e238b30543a0cd'
+md5sums=('e2a883c4df15a50f78a7a61d5b64089f'
          'dd62cbf62bd8f212f51ef8c43bec9a77')
 
 build() {
@@ -24,8 +24,8 @@ build() {
 
   ./configure \
     --sysconfdir=/etc \
-    --with-zlib \
-    --with-rootprefix=/usr
+    --enable-gtk-doc \
+    --with-zlib
 
   make
 }
diff --git a/core/libpipeline/PKGBUILD b/core/libpipeline/PKGBUILD
index 484b21921..6691c7042 100644
--- a/core/libpipeline/PKGBUILD
+++ b/core/libpipeline/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 160243 2012-05-31 15:59:08Z andyrtr $
+# $Id: PKGBUILD 166835 2012-09-19 19:45:26Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libpipeline
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('glibc')
 options=('!libtool')
 source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz)
-md5sums=('20896c919eca4acb3d2f13012fb7ba02')
+md5sums=('4367a3f598d171fd43dfa8620ed16d55')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD
index 4106f80fa..cbc6f77c1 100644
--- a/core/make/PKGBUILD
+++ b/core/make/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 138005 2011-09-14 05:05:13Z allan $
+# $Id: PKGBUILD 166683 2012-09-15 15:22:53Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=make
 pkgver=3.82
-pkgrel=4
+pkgrel=5
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/make"
@@ -12,34 +12,44 @@ license=('GPL3')
 groups=('base-devel')
 depends=('glibc' 'sh')
 install=$pkgname.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        bug30612.patch
-        bug30723.patch
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+        make-3.82-bug30612.patch
+        make-3.82-bug30723.patch
         make-3.82-sort-blank.patch
-        make-3.82-makeflags.patch)
+        make-3.82-makeflags.patch
+        make-3.82-expensive_glob.patch
+        make-3.82-dont-prune-intermediate.patch)
 md5sums=('1a11100f3c63fcf5753818e59d63088f'
+         'c78daf24f4ec5900c8f81e89a6e1cd5a'
          'c8f496b22191f9fb9420ab14c1a19a47'
          '662e6450e19a5acdaa5c9fcb8ad78dea'
          '7d01a99f389d8f08dec93ed479071ee4'
-         'bc12ad4d0c6e6c0e72d9fb61054f446b')
+         'bc12ad4d0c6e6c0e72d9fb61054f446b'
+         'e58d4211c5b29d7d927a304d082849e7'
+         '45ac9e987f4bf16c0d7e1685db943917')
 
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   
   # http://savannah.gnu.org/bugs/?30612
-  patch -Np1 -i $srcdir/bug30612.patch
+  patch -Np1 -i $srcdir/make-3.82-bug30612.patch
   
   # http://savannah.gnu.org/bugs/?30723
-  patch -Np1 -i $srcdir/bug30723.patch
+  patch -Np1 -i $srcdir/make-3.82-bug30723.patch
   
   # https://bugs.archlinux.org/task/22733 (fix from Fedora)
   patch -Np1 -i $srcdir/make-3.82-sort-blank.patch
   
-  # https://savannah.gnu.org/support/index.php?107487
   # https://savannah.gnu.org/bugs/?33873
   patch -Np0 -i $srcdir/make-3.82-makeflags.patch
   
+  # http://lists.gnu.org/archive/html/bug-make/2011-04/msg00002.html
+  patch -Np0 -i $srcdir/make-3.82-expensive_glob.patch
+ 
+  # https://savannah.gnu.org/bugs/?30653
+  patch -Np0 -i $srcdir/make-3.82-dont-prune-intermediate.patch
+
   ./configure --prefix=/usr
   make
 }
diff --git a/core/make/make-3.82-bug30612.patch b/core/make/make-3.82-bug30612.patch
new file mode 100644
index 000000000..fb843bcd9
--- /dev/null
+++ b/core/make/make-3.82-bug30612.patch
@@ -0,0 +1,66 @@
+diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c
+--- make-3.82-orig/main.c	2010-07-19 17:10:53.000000000 +1000
++++ make-3.82-fix30612//main.c	2010-09-23 23:33:37.908855839 +1000
+@@ -1,3 +1,4 @@
++
+ /* Argument parsing and main program of GNU Make.
+ Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+ 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+@@ -1138,7 +1139,7 @@
+      a macro and some compilers (MSVC) don't like conditionals in macros.  */
+   {
+     const char *features = "target-specific order-only second-expansion"
+-                           " else-if shortest-stem undefine"
++                           " else-if shortest-stem undefine oneshell"
+ #ifndef NO_ARCHIVES
+                            " archives"
+ #endif
+diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c
+--- make-3.82-orig/read.c	2010-07-13 11:20:42.000000000 +1000
++++ make-3.82-fix30612//read.c	2010-09-23 23:30:58.018855839 +1000
+@@ -3028,7 +3028,7 @@
+             {
+               /* This looks like the first element in an open archive group.
+                  A valid group MUST have ')' as the last character.  */
+-              const char *e = p + nlen;
++              const char *e = p;
+               do
+                 {
+                   e = next_token (e);
+@@ -3084,19 +3084,19 @@
+          Go to the next item in the string.  */
+       if (flags & PARSEFS_NOGLOB)
+         {
+-          NEWELT (concat (2, prefix, tp));
++          NEWELT (concat (2, prefix, tmpbuf));
+           continue;
+         }
+ 
+       /* If we get here we know we're doing glob expansion.
+          TP is a string in tmpbuf.  NLEN is no longer used.
+          We may need to do more work: after this NAME will be set.  */
+-      name = tp;
++      name = tmpbuf;
+ 
+       /* Expand tilde if applicable.  */
+-      if (tp[0] == '~')
++      if (tmpbuf[0] == '~')
+ 	{
+-	  tildep = tilde_expand (tp);
++	  tildep = tilde_expand (tmpbuf);
+ 	  if (tildep != 0)
+             name = tildep;
+ 	}
+@@ -3152,7 +3152,11 @@
+             else
+               {
+                 /* We got a chain of items.  Attach them.  */
+-                (*newp)->next = found;
++                if (*newp)
++                  (*newp)->next = found;
++                else
++                  *newp = found;
++
+ 
+                 /* Find and set the new end.  Massage names if necessary.  */
+                 while (1)
diff --git a/core/make/make-3.82-bug30723.patch b/core/make/make-3.82-bug30723.patch
new file mode 100644
index 000000000..84e7ebe7a
--- /dev/null
+++ b/core/make/make-3.82-bug30723.patch
@@ -0,0 +1,12 @@
+diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c
+--- make-3.82-orig/main.c	2010-07-19 17:10:53.000000000 +1000
++++ make-3.82-fix30723//main.c	2010-09-23 23:34:10.932188592 +1000
+@@ -2093,7 +2093,7 @@
+             const char *pv = define_makeflags (1, 1);
+             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
+             sprintf (p, "MAKEFLAGS=%s", pv);
+-            putenv (p);
++            putenv (allocated_variable_expand (p));
+           }
+ 
+ 	  if (ISDB (DB_BASIC))
diff --git a/core/make/make-3.82-dont-prune-intermediate.patch b/core/make/make-3.82-dont-prune-intermediate.patch
new file mode 100644
index 000000000..f4f47dd27
--- /dev/null
+++ b/core/make/make-3.82-dont-prune-intermediate.patch
@@ -0,0 +1,57 @@
+2012-09-09  Paul Smith  <psmith@gnu.org>
+
+	* remake.c (update_file_1): Force intermediate files to be
+	considered, not pruned, if their non-intermediate parent needs to
+	be remade.  Fixes Savannah bug #30653.
+
+Index: remake.c
+===================================================================
+RCS file: /sources/make/make/remake.c,v
+retrieving revision 1.153
+retrieving revision 1.154
+diff -u -r1.153 -r1.154
+--- remake.c	5 Mar 2012 14:10:45 -0000	1.153
++++ remake.c	10 Sep 2012 02:36:05 -0000	1.154
+@@ -612,6 +612,10 @@
+                 d->file->dontcare = file->dontcare;
+               }
+ 
++            /* We may have already considered this file, when we didn't know
++               we'd need to update it.  Force update_file() to consider it and
++               not prune it.  */
++            d->file->considered = !considered;
+ 
+ 	    dep_status |= update_file (d->file, depth);
+ 
+Index: tests/scripts/features/parallelism
+===================================================================
+RCS file: /sources/make/make/tests/scripts/features/parallelism,v
+retrieving revision 1.19
+retrieving revision 1.20
+diff -u -r1.19 -r1.20
+--- tests/scripts/features/parallelism	4 Mar 2012 00:24:32 -0000	1.19
++++ tests/scripts/features/parallelism	10 Sep 2012 02:36:05 -0000	1.20
+@@ -214,6 +214,23 @@
+     rmfiles(qw(foo.y foo.y.in main.bar));
+ }
+ 
++# Ensure intermediate/secondary files are not pruned incorrectly.
++# See Savannah bug #30653
++
++utouch(-15, 'file2');
++utouch(-10, 'file4');
++utouch(-5,  'file1');
++
++run_make_test(q!
++.INTERMEDIATE: file3
++file4: file3 ; @mv -f $< $@
++file3: file2 ; touch $@
++file2: file1 ; @touch $@
++!,
++              '--no-print-directory -j2', "touch file3");
++
++#rmfiles('file1', 'file2', 'file3', 'file4');
++
+ if ($all_tests) {
+     # Jobserver FD handling is messed up in some way.
+     # Savannah bug #28189
diff --git a/core/make/make-3.82-expensive_glob.patch b/core/make/make-3.82-expensive_glob.patch
new file mode 100644
index 000000000..8663f5039
--- /dev/null
+++ b/core/make/make-3.82-expensive_glob.patch
@@ -0,0 +1,116 @@
+Index: read.c
+===================================================================
+RCS file: /sources/make/make/read.c,v
+retrieving revision 1.198
+retrieving revision 1.200
+diff -u -r1.198 -r1.200
+--- read.c	29 Apr 2011 15:27:39 -0000	1.198
++++ read.c	7 May 2011 14:36:12 -0000	1.200
+@@ -2901,6 +2901,7 @@
+       const char *name;
+       const char **nlist = 0;
+       char *tildep = 0;
++      int globme = 1;
+ #ifndef NO_ARCHIVES
+       char *arname = 0;
+       char *memname = 0;
+@@ -3109,32 +3110,40 @@
+ 	}
+ #endif /* !NO_ARCHIVES */
+ 
+-      switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
+-	{
+-	case GLOB_NOSPACE:
+-	  fatal (NILF, _("virtual memory exhausted"));
+-
+-	case 0:
+-          /* Success.  */
+-          i = gl.gl_pathc;
+-          nlist = (const char **)gl.gl_pathv;
+-          break;
+-
+-        case GLOB_NOMATCH:
+-          /* If we want only existing items, skip this one.  */
+-          if (flags & PARSEFS_EXISTS)
+-            {
+-              i = 0;
+-              break;
+-            }
+-          /* FALLTHROUGH */
+-
+-	default:
+-          /* By default keep this name.  */
++      /* glob() is expensive: don't call it unless we need to.  */
++      if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
++        {
++          globme = 0;
+           i = 1;
+           nlist = &name;
+-          break;
+-	}
++        }
++      else
++        switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
++          {
++          case GLOB_NOSPACE:
++            fatal (NILF, _("virtual memory exhausted"));
++
++          case 0:
++            /* Success.  */
++            i = gl.gl_pathc;
++            nlist = (const char **)gl.gl_pathv;
++            break;
++
++          case GLOB_NOMATCH:
++            /* If we want only existing items, skip this one.  */
++            if (flags & PARSEFS_EXISTS)
++              {
++                i = 0;
++                break;
++              }
++            /* FALLTHROUGH */
++
++          default:
++            /* By default keep this name.  */
++            i = 1;
++            nlist = &name;
++            break;
++          }
+ 
+       /* For each matched element, add it to the list.  */
+       while (i-- > 0)
+@@ -3174,7 +3183,8 @@
+ #endif /* !NO_ARCHIVES */
+           NEWELT (concat (2, prefix, nlist[i]));
+ 
+-      globfree (&gl);
++      if (globme)
++        globfree (&gl);
+ 
+ #ifndef NO_ARCHIVES
+       if (arname)
+Index: tests/scripts/functions/wildcard
+===================================================================
+RCS file: /sources/make/make/tests/scripts/functions/wildcard,v
+retrieving revision 1.6
+retrieving revision 1.7
+diff -u -r1.6 -r1.7
+--- tests/scripts/functions/wildcard	13 Jun 2009 21:21:49 -0000	1.6
++++ tests/scripts/functions/wildcard	7 May 2011 14:36:11 -0000	1.7
+@@ -88,4 +88,16 @@
+ !,
+               '', "\n");
+ 
++# TEST #5: wildcard used to verify file existence
++
++touch('xxx.yyy');
++
++run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
++              '', "file=xxx.yyy\n");
++
++unlink('xxx.yyy');
++
++run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
++              '', "file=\n");
++
+ 1;
diff --git a/core/make/make.install b/core/make/make.install
index 6cf8b0dc4..84260853c 100644
--- a/core/make/make.install
+++ b/core/make/make.install
@@ -2,7 +2,7 @@ infodir=usr/share/info
 filelist=(make.info make.info-1 make.info-2)
 
 post_install() {
-  [ -x usr/bin/install-info ] || return 0
+  [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
     install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
@@ -13,7 +13,7 @@ post_upgrade() {
 }
 
 pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
+  [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
     install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD
index ae322488d..818087e98 100644
--- a/core/man-db/PKGBUILD
+++ b/core/man-db/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162129 2012-06-21 16:20:53Z andyrtr $
+# $Id: PKGBUILD 166836 2012-09-19 19:45:35Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
 
 pkgname=man-db
-pkgver=2.6.2
+pkgver=2.6.3
 pkgrel=1
 pkgdesc="A utility for reading man pages"
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,8 +21,8 @@ install=${pkgname}.install
 source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig}
         convert-mans man-db.cron.daily)
 options=('!libtool')
-md5sums=('647c48d46c464419185d031d04481ee5'
-         'a9de1f9bbe620a5a9b9f5da8c58cd96c'
+md5sums=('a593a095599ae97bcacf8d038659a146'
+         '64975c20b1a6453f9b860ff7f916bcf1'
          '2b7662a7d5b33fe91f9f3e034361a2f6'
          'd30c39ae47560304471b5461719e0f03')
 
diff --git a/core/pinentry/PKGBUILD b/core/pinentry/PKGBUILD
index 5ae256a42..280ef63fc 100644
--- a/core/pinentry/PKGBUILD
+++ b/core/pinentry/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 160802 2012-06-06 10:36:53Z tpowa $
+# $Id: PKGBUILD 166720 2012-09-17 05:06:14Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pinentry
-pkgver=0.8.1
-pkgrel=4
+pkgver=0.8.2
+pkgrel=1
 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -11,7 +11,7 @@ depends=('ncurses' 'libcap>=2.16')
 makedepends=('gtk2' 'qt')
 optdepends=('gtk2: for gtk2 backend'
             'qt: for qt4 backend')  
-source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz
+source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
         qt4-pinentry-window.patch)
 install=pinentry.install
 
@@ -36,5 +36,5 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=${pkgdir} install 
 }
-md5sums=('81f99904daee5331eb6738408bb024b6'
+md5sums=('82e6114e5e27a8ab36f314b332a6e024'
          '450b8713fe42f1bd93311ef84767c3d8')
diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index a140af0dc..8c659f14a 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166192 2012-09-05 13:26:53Z foutrelis $
+# $Id: PKGBUILD 166770 2012-09-18 20:26:27Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sudo
-_sudover=1.8.6
+_sudover=1.8.6p2
 pkgver=${_sudover/p/.p}
 pkgrel=1
 pkgdesc="Give certain users the ability to run some commands as root"
@@ -16,7 +16,7 @@ backup=('etc/sudoers' 'etc/pam.d/sudo')
 options=('!libtool')
 source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz
         sudo.pam)
-sha256sums=('9f2aa50c3358d1056506fa637ba6fe7a0e7e29ab3dca816b98a0af7ea4c59c7e'
+sha256sums=('d342ba710cc326bfa2065ed8ebe262a72b54a497a686aa4cbbbd0ae3028dcf4b'
             'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae')
 
 build() {