Merge branch '3.0' into 3.1

Conflicts:
	samba/.footprint

gnupg/.md5sum

@@ -1 +1 @@
-1c30b3aa1f99f17b4988e1ab616355d4  gnupg-2.0.23.tar.bz2
+94cd984321b44ab622aa50f93ee66671  gnupg-2.0.24.tar.bz2

gnupg/Pkgfile

@@ -5,7 +5,7 @@
 # Depends on:  libgcrypt, libassuan, libksba, pinentry, libpth
 
 name=gnupg
-version=2.0.23
+version=2.0.24
 release=1
 source=(ftp://ftp.gnupg.org/gcrypt/$name/$name-$version.tar.bz2)
         

mailx/.md5sum

@@ -1 +1 @@
-e4e542a2b7afab82d4f0ff641c6b2b1a  s-nail-14_7.tar.xz
+ffa2493166d4c299fc08ca51a30dece8  s-nail-14_7_1.tar.xz

mailx/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  openssl readline
 
 name=mailx
-version=14.7
+version=14.7.1
 release=1
 source=(http://downloads.sourceforge.net/project/s-nail/s-nail-${version//./_}.tar.xz)
 

samba/.footprint

@@ -281,6 +281,8 @@ drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.18/Parse/Pidl/Samba4/NDR/
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.18/Parse/Pidl/Wireshark/
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.18/Parse/Pidl/Wireshark/Conformance.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.18/Parse/Pidl/Wireshark/NDR.pm
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.18/Parse/Yapp/
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.18/Parse/Yapp/Driver.pm
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/dcerpc.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/dcerpc_atsvc.pc

samba/.md5sum

@@ -1,2 +1,2 @@
 448caca4745aef1a842f4fdb1aa62e1e  samba
-212b7568d44e7668a7dc8a45c5558764  samba-4.1.8.tar.gz
+f9efc506e08c680d2b79b13be28c959c  samba-4.1.9.tar.gz

samba/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  ncurses openssl readline zlib tdb talloc libcap acl libaio popt
 
 name=samba
-version=4.1.8
+version=4.1.9
 release=1
 source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \
         samba)