Merge branch '3.0' into 3.1

Conflicts:
	samba/.footprint

14 files changed, 19 insertions, 91 deletions

diff --git a/cups/Pkgfile b/cups/Pkgfile
index a43cf5c64..f2604bdc1 100644
--- a/cups/Pkgfile
+++ b/cups/Pkgfile
@@ -42,7 +42,7 @@ build () {
     rm -r $PKG/usr/share/cups/{banners,data}
     
     # cleanup
-    rm -r $PKG/usr/share/icons
+    rm -rf $PKG/usr/share/icons
     chmod 0755 $PKG/var/{cache,spool}   
     chmod -R +w $PKG
 
diff --git a/hpcups/.footprint b/hpcups/.footprint
index 17fa121bd..ead5eeab8 100644
--- a/hpcups/.footprint
+++ b/hpcups/.footprint
@@ -94,6 +94,7 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_4500ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_4520mfp-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_4520ps-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_d5800-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_t1100ps_24in-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_t1100ps_44in-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_t1120ps_24in-ps.ppd.gz
@@ -103,8 +104,10 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_t1500-postscript.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_t2300_postscript-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_t2500-postscript.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_t3500-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_t7100ps-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_t7100ps_monochrome-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_t7200-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_t770_postscript-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_t770ps_24in-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_t790ps_24in-ps.ppd.gz
@@ -117,6 +120,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_z6100ps_60in_photo-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_z6200_42in_photo-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_z6200_60in_photo-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_z6600-postscript.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-designjet_z6800_photo-postscript.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_100_color_mfp_m175-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1200-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1200n-ps.ppd.gz
diff --git a/hpcups/.md5sum b/hpcups/.md5sum
index d459ec2a2..e47b3329b 100644
--- a/hpcups/.md5sum
+++ b/hpcups/.md5sum
@@ -1 +1 @@
-6e8d53fb2284271505d2e1706c01f6c5  hplip-3.14.4.tar.gz
+ec14b3bf3ac17a7c00b96e51d4c38114  hplip-3.14.6.tar.gz
diff --git a/hpcups/Pkgfile b/hpcups/Pkgfile
index 5f4b63db0..71b6271fa 100644
--- a/hpcups/Pkgfile
+++ b/hpcups/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  cups
 
 name=hpcups
-version=3.14.4
+version=3.14.6
 release=1
 source=(http://downloads.sourceforge.net/project/hplip/hplip/$version/hplip-$version.tar.gz)
 
diff --git a/mdadm/.md5sum b/mdadm/.md5sum
index 839a34ff8..803471532 100644
--- a/mdadm/.md5sum
+++ b/mdadm/.md5sum
@@ -1 +1 @@
-abb19b309281b93cf79d29fb2dfb2e85  mdadm-3.3.tar.xz
+4227d48de62dfb217c92fa0c54171bbe  mdadm-3.3.1.tar.xz
diff --git a/mdadm/Pkgfile b/mdadm/Pkgfile
index 1e0c19248..d91192b3b 100644
--- a/mdadm/Pkgfile
+++ b/mdadm/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 
 name=mdadm
-version=3.3
+version=3.3.1
 release=1
 source=(http://www.kernel.org/pub/linux/utils/raid/$name/$name-$version.tar.xz)
 
diff --git a/samba/.footprint b/samba/.footprint
index f18783288..f98e3c20c 100644
--- a/samba/.footprint
+++ b/samba/.footprint
@@ -281,8 +281,6 @@ 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
diff --git a/samba/.md5sum b/samba/.md5sum
index 5dd17cf67..ebc577df8 100644
--- a/samba/.md5sum
+++ b/samba/.md5sum
@@ -1,2 +1,2 @@
 448caca4745aef1a842f4fdb1aa62e1e  samba
-bc44b0a245468c3574ef07644206ede3  samba-4.1.7.tar.gz
+212b7568d44e7668a7dc8a45c5558764  samba-4.1.8.tar.gz
diff --git a/samba/Pkgfile b/samba/Pkgfile
index 28a1b8e2e..a2afb900f 100644
--- a/samba/Pkgfile
+++ b/samba/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  ncurses openssl readline zlib tdb talloc libcap acl libaio popt
 
 name=samba
-version=4.1.7
+version=4.1.8
 release=1
 source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \
         samba)
@@ -15,15 +15,12 @@ build () {
     local JOBS=$(awk 'BEGIN{RS="-j|--jobs="} NR==2 {print $1}' <<< $MAKEFLAGS)
     test -n "$JOBS" && export JOBS="$JOBS"
 
-    eval $(perl -V:sitelib)
-
     ./configure --enable-fhs \
                 --prefix=/usr \
                 --localstatedir=/var \
                 --mandir=/usr/man \
                 --sysconfdir=/etc \
-                --with-privatedir=/etc/samba/private \
-                --with-perl-vendor{arch,lib}="$sitelib"
+                --with-privatedir=/etc/samba/private
 
     make
     make DESTDIR=$PKG install
diff --git a/sqlite3/.md5sum b/sqlite3/.md5sum
index 587e7023a..203ce2cb8 100644
--- a/sqlite3/.md5sum
+++ b/sqlite3/.md5sum
@@ -1 +1 @@
-0f5459cde43cb269e5120ecd2c671ced  sqlite-autoconf-3080403.tar.gz
+0544ef6d7afd8ca797935ccc2685a9ed  sqlite-autoconf-3080500.tar.gz
diff --git a/sqlite3/Pkgfile b/sqlite3/Pkgfile
index 3b0fafb98..aaef1c41d 100644
--- a/sqlite3/Pkgfile
+++ b/sqlite3/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  ncurses, readline
 
 name=sqlite3
-version=3.8.4.3
+version=3.8.5
 release=1
 _version=$(printf "%i%.2i%.2i%.2i" ${version//./ })
 
diff --git a/wpa_supplicant/.md5sum b/wpa_supplicant/.md5sum
index a00a43c70..af1e489f9 100644
--- a/wpa_supplicant/.md5sum
+++ b/wpa_supplicant/.md5sum
@@ -1,2 +1 @@
-ba6674b926dc30cfca46cf9a6bdacd23  revert-51e3eaf.patch
-e96b8db5a8171cd17a5b2012d6ad7cc7  wpa_supplicant-2.1.tar.gz
+238e8e888bbd558e1a57e3eb28d1dd07  wpa_supplicant-2.2.tar.gz
diff --git a/wpa_supplicant/Pkgfile b/wpa_supplicant/Pkgfile
index fb3d96845..21640b3b5 100644
--- a/wpa_supplicant/Pkgfile
+++ b/wpa_supplicant/Pkgfile
@@ -4,14 +4,11 @@
 # Depends on:  openssl ncurses readline libnl
 
 name=wpa_supplicant
-version=2.1
-release=2
-source=(http://hostap.epitest.fi/releases/$name-$version.tar.gz \
-    revert-51e3eaf.patch)
+version=2.2
+release=1
+source=(http://hostap.epitest.fi/releases/$name-$version.tar.gz)
 
 build () {
-    patch -d $name-$version -p1 -i $SRC/revert-51e3eaf.patch
-
     cd $name-$version/$name
 
     cp defconfig .config
diff --git a/wpa_supplicant/revert-51e3eaf.patch b/wpa_supplicant/revert-51e3eaf.patch
deleted file mode 100644
index e3141b0ea..000000000
--- a/wpa_supplicant/revert-51e3eaf.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From b62d5b5450101676a0c05691b4bcd94e11426397 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Wed, 19 Feb 2014 09:56:02 +0000
-Subject: Revert "OpenSSL: Do not accept SSL Client certificate for server"
-
-This reverts commit 51e3eafb68e15e78e98ca955704be8a6c3a7b304. There are
-too many deployed AAA servers that include both id-kp-clientAuth and
-id-kp-serverAuth EKUs for this change to be acceptable as a generic rule
-for AAA authentication server validation. OpenSSL enforces the policy of
-not connecting if only id-kp-clientAuth is included. If a valid EKU is
-listed with it, the connection needs to be accepted.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
-diff --git a/src/crypto/tls.h b/src/crypto/tls.h
-index 287fd33..feba13f 100644
---- a/src/crypto/tls.h
-+++ b/src/crypto/tls.h
-@@ -41,8 +41,7 @@ enum tls_fail_reason {
- 	TLS_FAIL_ALTSUBJECT_MISMATCH = 6,
- 	TLS_FAIL_BAD_CERTIFICATE = 7,
- 	TLS_FAIL_SERVER_CHAIN_PROBE = 8,
--	TLS_FAIL_DOMAIN_SUFFIX_MISMATCH = 9,
--	TLS_FAIL_SERVER_USED_CLIENT_CERT = 10
-+	TLS_FAIL_DOMAIN_SUFFIX_MISMATCH = 9
- };
- 
- union tls_event_data {
-diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
-index a13fa38..8cf1de8 100644
---- a/src/crypto/tls_openssl.c
-+++ b/src/crypto/tls_openssl.c
-@@ -105,7 +105,6 @@ struct tls_connection {
- 	unsigned int ca_cert_verify:1;
- 	unsigned int cert_probe:1;
- 	unsigned int server_cert_only:1;
--	unsigned int server:1;
- 
- 	u8 srv_cert_hash[32];
- 
-@@ -1480,16 +1479,6 @@ static int tls_verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx)
- 				       TLS_FAIL_SERVER_CHAIN_PROBE);
- 	}
- 
--	if (!conn->server && err_cert && preverify_ok && depth == 0 &&
--	    (err_cert->ex_flags & EXFLAG_XKUSAGE) &&
--	    (err_cert->ex_xkusage & XKU_SSL_CLIENT)) {
--		wpa_printf(MSG_WARNING, "TLS: Server used client certificate");
--		openssl_tls_fail_event(conn, err_cert, err, depth, buf,
--				       "Server used client certificate",
--				       TLS_FAIL_SERVER_USED_CLIENT_CERT);
--		preverify_ok = 0;
--	}
--
- 	if (preverify_ok && context->event_cb != NULL)
- 		context->event_cb(context->cb_ctx,
- 				  TLS_CERT_CHAIN_SUCCESS, NULL);
-@@ -2541,8 +2530,6 @@ openssl_handshake(struct tls_connection *conn, const struct wpabuf *in_data,
- 	int res;
- 	struct wpabuf *out_data;
- 
--	conn->server = !!server;
--
- 	/*
- 	 * Give TLS handshake data from the server (if available) to OpenSSL
- 	 * for processing.
---
-cgit v0.9.2