Merge branch '3.2' into 3.3

17 files changed, 22 insertions, 21 deletions

diff --git a/gnupg/.footprint b/gnupg/.footprint
index 80e9dbbf3..0800ca9f0 100644
--- a/gnupg/.footprint
+++ b/gnupg/.footprint
@@ -18,6 +18,7 @@ drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/gpg-check-pattern
 -rwxr-xr-x	root/root	usr/lib/gpg-preset-passphrase
 -rwxr-xr-x	root/root	usr/lib/gpg-protect-tool
+-rwxr-xr-x	root/root	usr/lib/gpg-wks-client
 -rwxr-xr-x	root/root	usr/lib/scdaemon
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/addgnupghome
diff --git a/gnupg/.md5sum b/gnupg/.md5sum
index 4093d14ec..d76683a5e 100644
--- a/gnupg/.md5sum
+++ b/gnupg/.md5sum
@@ -1 +1 @@
-808d10b89c1f0de8d4d2a556aa36b623  gnupg-2.1.15.tar.bz2
+bfb53004773a014d401694f94229fc00  gnupg-2.1.16.tar.bz2
diff --git a/gnupg/Pkgfile b/gnupg/Pkgfile
index 0949fc4fd..5c0cb2eb7 100644
--- a/gnupg/Pkgfile
+++ b/gnupg/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:  libgcrypt, libassuan, libksba, pinentry, npth
 
 name=gnupg
-version=2.1.15
+version=2.1.16
 release=1
 source=(ftp://ftp.gnupg.org/gcrypt/$name/$name-$version.tar.bz2)
         
diff --git a/libgpg-error/.footprint b/libgpg-error/.footprint
index 7fbd6110f..b8459d3c0 100644
--- a/libgpg-error/.footprint
+++ b/libgpg-error/.footprint
@@ -7,9 +7,9 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libgpg-error.a
 -rwxr-xr-x	root/root	usr/lib/libgpg-error.la
-lrwxrwxrwx	root/root	usr/lib/libgpg-error.so -> libgpg-error.so.0.19.1
-lrwxrwxrwx	root/root	usr/lib/libgpg-error.so.0 -> libgpg-error.so.0.19.1
--rwxr-xr-x	root/root	usr/lib/libgpg-error.so.0.19.1
+lrwxrwxrwx	root/root	usr/lib/libgpg-error.so -> libgpg-error.so.0.20.0
+lrwxrwxrwx	root/root	usr/lib/libgpg-error.so.0 -> libgpg-error.so.0.20.0
+-rwxr-xr-x	root/root	usr/lib/libgpg-error.so.0.20.0
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/gpg-error.m4
diff --git a/libgpg-error/.md5sum b/libgpg-error/.md5sum
index 5c2ee2c2a..15dc4f44d 100644
--- a/libgpg-error/.md5sum
+++ b/libgpg-error/.md5sum
@@ -1 +1 @@
-feb42198c0aaf3b28eabe8f41a34b983  libgpg-error-1.24.tar.bz2
+d9fa545922a5060cbfbd87464bc31686  libgpg-error-1.25.tar.bz2
diff --git a/libgpg-error/Pkgfile b/libgpg-error/Pkgfile
index a94503e53..d83463cda 100644
--- a/libgpg-error/Pkgfile
+++ b/libgpg-error/Pkgfile
@@ -4,7 +4,7 @@
 # Packager:    Matt Housh, jaeger at morpheus dot net
 
 name=libgpg-error
-version=1.24
+version=1.25
 release=1
 source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/$name-$version.tar.bz2)
 
diff --git a/npth/.footprint b/npth/.footprint
index d6ccc1c11..f9feb5234 100644
--- a/npth/.footprint
+++ b/npth/.footprint
@@ -5,9 +5,9 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/npth.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libnpth.la
-lrwxrwxrwx	root/root	usr/lib/libnpth.so -> libnpth.so.0.0.5
-lrwxrwxrwx	root/root	usr/lib/libnpth.so.0 -> libnpth.so.0.0.5
--rwxr-xr-x	root/root	usr/lib/libnpth.so.0.0.5
+lrwxrwxrwx	root/root	usr/lib/libnpth.so -> libnpth.so.0.0.6
+lrwxrwxrwx	root/root	usr/lib/libnpth.so.0 -> libnpth.so.0.0.6
+-rwxr-xr-x	root/root	usr/lib/libnpth.so.0.0.6
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/npth.m4
diff --git a/npth/.md5sum b/npth/.md5sum
index 68de84430..008597b16 100644
--- a/npth/.md5sum
+++ b/npth/.md5sum
@@ -1 +1 @@
-226bac7374b9466c6ec26b1c34dab844  npth-1.2.tar.bz2
+efe1524c53670b5755dc27893d2d68a0  npth-1.3.tar.bz2
diff --git a/npth/Pkgfile b/npth/Pkgfile
index edf30a71b..212dc8c7d 100644
--- a/npth/Pkgfile
+++ b/npth/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  Thomas Penteker, tek at serverop dot de
 
 name=npth
-version=1.2
+version=1.3
 release=1
 source=(ftp://ftp.gnupg.org/gcrypt/npth/npth-$version.tar.bz2)
 
diff --git a/pinentry-gtk2/.md5sum b/pinentry-gtk2/.md5sum
index 627352bf1..7618cf2f0 100644
--- a/pinentry-gtk2/.md5sum
+++ b/pinentry-gtk2/.md5sum
@@ -1 +1 @@
-9510b2de013e818dab619e468298703a  pinentry-0.9.7.tar.bz2
+4a3fad8b31f9b4c5526c8837495015dc  pinentry-1.0.0.tar.bz2
diff --git a/pinentry-gtk2/Pkgfile b/pinentry-gtk2/Pkgfile
index 15732ee44..425cb5adb 100644
--- a/pinentry-gtk2/Pkgfile
+++ b/pinentry-gtk2/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:  pinentry, gtk
 
 name=pinentry-gtk2
-version=0.9.7
+version=1.0.0
 release=1
 source=(ftp://ftp.gnupg.org/gcrypt/pinentry/pinentry-$version.tar.bz2)
 
diff --git a/pinentry-qt4/.md5sum b/pinentry-qt4/.md5sum
index 627352bf1..7618cf2f0 100644
--- a/pinentry-qt4/.md5sum
+++ b/pinentry-qt4/.md5sum
@@ -1 +1 @@
-9510b2de013e818dab619e468298703a  pinentry-0.9.7.tar.bz2
+4a3fad8b31f9b4c5526c8837495015dc  pinentry-1.0.0.tar.bz2
diff --git a/pinentry-qt4/Pkgfile b/pinentry-qt4/Pkgfile
index 6a9374db6..f6ed8c164 100644
--- a/pinentry-qt4/Pkgfile
+++ b/pinentry-qt4/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:  pinentry qt4
 
 name=pinentry-qt4
-version=0.9.7
+version=1.0.0
 release=1
 source=(ftp://ftp.gnupg.org/gcrypt/pinentry/pinentry-$version.tar.bz2)
 
diff --git a/pinentry/.md5sum b/pinentry/.md5sum
index 417acc946..cbcc2ebad 100644
--- a/pinentry/.md5sum
+++ b/pinentry/.md5sum
@@ -1,2 +1,2 @@
 b3f2692e792f14df7d0ccfcc19399f66  pinentry
-9510b2de013e818dab619e468298703a  pinentry-0.9.7.tar.bz2
+4a3fad8b31f9b4c5526c8837495015dc  pinentry-1.0.0.tar.bz2
diff --git a/pinentry/Pkgfile b/pinentry/Pkgfile
index 7edb624d1..82588a818 100644
--- a/pinentry/Pkgfile
+++ b/pinentry/Pkgfile
@@ -6,8 +6,8 @@
 # Nice to have: pinentry-gtk2 pinentry-qt4
 
 name=pinentry
-version=0.9.7
-release=2
+version=1.0.0
+release=1
 source=(ftp://ftp.gnupg.org/gcrypt/$name/$name-$version.tar.bz2 pinentry)
 
 build() {
diff --git a/thunderbird/.md5sum b/thunderbird/.md5sum
index 37a1ed0f5..da08de31e 100644
--- a/thunderbird/.md5sum
+++ b/thunderbird/.md5sum
@@ -1,4 +1,4 @@
-39b50c7659fa106eb53e5ea4c8bc7b2a  thunderbird-45.5.0.source.tar.xz
+c2bef91b1c1672646b7b21928c9439c4  thunderbird-45.5.1.source.tar.xz
 6e75d01fea2602a9fc33028dc3441cfa  thunderbird-gcc6.patch
 9a78c5c35311cc20425913c5598bf2b9  thunderbird-install-dir.patch
 87f8666f06ba8c3668e39068050bb77a  thunderbird.desktop
diff --git a/thunderbird/Pkgfile b/thunderbird/Pkgfile
index 46005088f..87c19db23 100644
--- a/thunderbird/Pkgfile
+++ b/thunderbird/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  python,unzip,zip,gtk,alsa-lib,xorg-libxt,libidl,nss,yasm,mesa3d,libjpeg-turbo
 
 name=thunderbird
-version=45.5.0
+version=45.5.1
 release=1
 source=(http://ftp.mozilla.org/pub/thunderbird/releases/$version/source/$name-$version.source.tar.xz
 	$name.desktop thunderbird-install-dir.patch thunderbird-gcc6.patch)