Merge branch 'master' of git+ssh://openadk.org/git/openadk

10 files changed, 17 insertions, 56 deletions

diff --git a/package/curl/Makefile b/package/curl/Makefile
index 17bbda944..a977913a2 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		curl
-PKG_VERSION:=		7.42.0
+PKG_VERSION:=		7.42.1
 PKG_RELEASE:=		1
-PKG_HASH:=		088f6a63289dbdcf23d692fdfaaf6262c19e373beb5237b9b9e7bcf9815a8f49
+PKG_HASH:=		4fc504f4fac56d091162707941d06c72a4222fc6fa48ca8193e44ee74baf079c
 PKG_DESCR:=		client-side url transfer tool
 PKG_SECTION:=		net/http
 PKG_DEPENDS:=		libcurl
diff --git a/package/curl/patches/patch-lib_url_c b/package/curl/patches/patch-lib_url_c
deleted file mode 100644
index f4c934576..000000000
--- a/package/curl/patches/patch-lib_url_c
+++ /dev/null
@@ -1,28 +0,0 @@
---- curl-7.42.0.orig/lib/url.c	2015-04-22 07:55:54.000000000 +0200
-+++ curl-7.42.0/lib/url.c	2015-04-24 18:00:21.000000000 +0200
-@@ -3069,9 +3069,11 @@ ConnectionExists(struct SessionHandle *d
-   struct connectdata *check;
-   struct connectdata *chosen = 0;
-   bool canPipeline = IsPipeliningPossible(data, needle);
-+#ifdef USE_NTLM
-   bool wantNTLMhttp = ((data->state.authhost.want & CURLAUTH_NTLM) ||
-                        (data->state.authhost.want & CURLAUTH_NTLM_WB)) &&
-     (needle->handler->protocol & PROTO_FAMILY_HTTP) ? TRUE : FALSE;
-+#endif
-   struct connectbundle *bundle;
- 
-   *force_reuse = FALSE;
-@@ -3208,8 +3210,11 @@ ConnectionExists(struct SessionHandle *d
-           continue;
-       }
- 
--      if((!(needle->handler->flags & PROTOPT_CREDSPERREQUEST)) ||
--         (wantNTLMhttp || check->ntlm.state != NTLMSTATE_NONE)) {
-+      if((!(needle->handler->flags & PROTOPT_CREDSPERREQUEST))
-+#ifdef USE_NTLM
-+         || (wantNTLMhttp || check->ntlm.state != NTLMSTATE_NONE)
-+#endif
-+	) {
-         /* This protocol requires credentials per connection or is HTTP+NTLM,
-            so verify that we're using the same name and password as well */
-         if(!strequal(needle->user, check->user) ||
diff --git a/package/gawk/Makefile b/package/gawk/Makefile
index 45a02694e..bb98a5aaa 100644
--- a/package/gawk/Makefile
+++ b/package/gawk/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		gawk
-PKG_VERSION:=		4.1.1
+PKG_VERSION:=		4.1.2
 PKG_RELEASE:=		1
-PKG_HASH:=		efd4c6aafb1ce996309fc903ceb625e7012221c464eb72483dbb23adef1ee8db
+PKG_HASH:=		ea8b53c5834ee27012fecba7273f97fca7104884975cf81ddae6f85c5581f481
 PKG_DESCR:=		awk programming language interpreter
 PKG_SECTION:=		dev/lang
 PKG_URL:=		http://www.gnu.org/software/gawk/
diff --git a/package/libmicrohttpd/Makefile b/package/libmicrohttpd/Makefile
index 9ea642fca..4337f0bad 100644
--- a/package/libmicrohttpd/Makefile
+++ b/package/libmicrohttpd/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libmicrohttpd
-PKG_VERSION:=		0.9.38
+PKG_VERSION:=		0.9.41
 PKG_RELEASE:=		1
-PKG_HASH:=		8df2b4dd863c98799a4775a530d905363fbc02fec850af9094da890b28b9e721
+PKG_HASH:=		9798be637d4a1d76a377e1d805d142e6edcfd3ec99c443926448f647af1a7a7c
 PKG_DESCR:=		library make it easy to run an webserver
 PKG_SECTION:=		libs/net
 PKG_URL:=		http://www.gnu.org/software/libmicrohttpd/
diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile
index 299059ddb..343f6cf39 100644
--- a/package/libtasn1/Makefile
+++ b/package/libtasn1/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libtasn1
-PKG_VERSION:=		4.4
+PKG_VERSION:=		4.5
 PKG_RELEASE:=		1
-PKG_HASH:=		f8349db1b4fe634105c77e11d26b2173e587827e86e1a489b5e38ffa822e0c5d
+PKG_HASH:=		89b3b5dce119273431544ecb305081f3530911001bb12e5d76588907edb71bda
 PKG_DESCR:=		asn.1 and der structures manipulation library
 PKG_SECTION:=		libs/crypto
 PKG_URL:=		http://www.gnupg.org/
diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index 49db206c1..61d44c6bc 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		pcre
-PKG_VERSION:=		8.36
+PKG_VERSION:=		8.37
 PKG_RELEASE:=		1
-PKG_HASH:=		b37544f33caed0cc502a1e729c3b1d3df5086dcc819b9125c30700c239246c9e
+PKG_HASH:=		19d490a714274a8c4c9d131f651489b8647cdb40a159e9fb7ce17ba99ef992ab
 PKG_DESCR:=		perl compatible regular expression library
 PKG_SECTION:=		libs/misc
 PKG_BUILDDEPS:=		gettext-tiny
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index a7d5aea88..bec0422a1 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		qemu
-PKG_VERSION:=		2.2.1
+PKG_VERSION:=		2.3.0
 PKG_RELEASE:=		1
-PKG_HASH:=		4617154c6ef744b83e10b744e392ad111dd351d435d6563ce24d8da75b1335a0
+PKG_HASH:=		b6bab7f763d5be73e7cb5ee7d4c8365b7a8df2972c52fa5ded18893bd8281588
 PKG_DESCR:=		cpu and system emulator
 PKG_SECTION:=		sys/misc
 PKG_DEPENDS:=		zlib glib alsa-lib
diff --git a/package/stunnel/Makefile b/package/stunnel/Makefile
index a4678b3ab..97ed6e433 100644
--- a/package/stunnel/Makefile
+++ b/package/stunnel/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		stunnel
-PKG_VERSION:=		5.16
+PKG_VERSION:=		5.17
 PKG_RELEASE:=		1
-PKG_HASH:=		b6b7e93fb2626eaabae1c8474e1dfa23962cfde8fa35c8602289fcaa4f53608d
+PKG_HASH:=		c3e79e582621a0827125e35e1c00450190104fc02dc3c5274cb02b05859fd472
 PKG_DESCR:=		encryption wrapper
 PKG_SECTION:=		net/security
 PKG_DEPENDS:=		libopenssl
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 68f196009..09251de35 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -4,10 +4,10 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		util-linux
-PKG_VERSION:=		2.26.1
-PKG_RELEASE:=		2
+PKG_VERSION:=		2.26.2
+PKG_RELEASE:=		1
 PKG_EXTRAVER:=		v2.26
-PKG_HASH:=		22dc1c957262e2cbdfb4d524a63d5cd4f219d3ac9b5eab570fc771076799bb6e
+PKG_HASH:=		0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666
 PKG_DESCR:=		basic utilities
 PKG_SECTION:=		base/apps
 PKG_BUILDDEP:=		ncurses
diff --git a/package/util-linux/patches/patch-sys-utils_setarch_c b/package/util-linux/patches/patch-sys-utils_setarch_c
deleted file mode 100644
index 16558fa24..000000000
--- a/package/util-linux/patches/patch-sys-utils_setarch_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- util-linux-2.26.1.orig/sys-utils/setarch.c	2015-02-19 10:55:10.000000000 +0100
-+++ util-linux-2.26.1/sys-utils/setarch.c	2015-03-29 11:46:25.000000000 +0200
-@@ -309,7 +309,7 @@ int main(int argc, char *argv[])
- #if defined(__sparc64__) || defined(__sparc__)
- 	if (archwrapper && strcmp(arch, "sparc32bash") == 0) {
- 		if (set_arch(arch, 0L, 0))
--			err(EXIT_FAILURE, _("Failed to set personality to %s"), p);
-+			err(EXIT_FAILURE, _("Failed to set personality to %s"), arch);
- 		execl("/bin/bash", NULL);
- 		err(EXIT_FAILURE, _("failed to execute %s"), "/bin/bash");
- 	}