Merge pull request #4824 from OpenELEC/package-updates

Package updates

packages/databases/sqlite/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3110000"
+PKG_VERSION="autoconf-3110100"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"

packages/network/connman/patches/connman-99-iptables-1.6.patch

@@ -0,0 +1,36 @@
+From acea08a0e4234a4c1a87bedc087c73ff36de0c7b Mon Sep 17 00:00:00 2001
+From: Wu Zheng <wu.zheng@intel.com>
+Date: Thu, 28 Jan 2016 18:04:17 +0800
+Subject: iptables: Add missing function item of xtables to match iptables 1.6
+
+The struct of xtables_globals has been modified in iptables 1.6.
+If connman runs with iptables 1.6, it can crash.
+
+Program received signal SIGSEGV, Segmentation fault.
+0x00000000 in ?? ()
+0xb7dea89c in xtables_find_target () from /usr/lib/libxtables.so.11
+0xb7deac1c in ?? () from /usr/lib/libxtables.so.11
+0xb7dea793 in xtables_find_target () from /usr/lib/libxtables.so.11
+
+The the missing function item of xtables is added to xtables_globals.
+---
+ src/iptables.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/iptables.c b/src/iptables.c
+index bc0c763..5ef757a 100644
+--- a/src/iptables.c
++++ b/src/iptables.c
+@@ -1566,6 +1566,9 @@ struct xtables_globals iptables_globals = {
+ 	.option_offset = 0,
+ 	.opts = iptables_opts,
+ 	.orig_opts = iptables_opts,
++#if XTABLES_VERSION_CODE > 10
++	.compat_rev = xtables_compatible_revision,
++#endif
+ };
+ 
+ static struct xtables_target *prepare_target(struct connman_iptables *table,
+-- 
+cgit v0.12
+

packages/network/openssh/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="openssh"
-PKG_VERSION="7.1p2"
+PKG_VERSION="7.2p1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/network/openssh/patches/openssh-silence-missing-identity-error.patch

@@ -5,10 +5,10 @@ index d6af0b9..22c0aa6 100644
 @@ -1320,8 +1320,7 @@ load_identity_file(char *filename, int userprovided)
  	struct stat st;
  
- 	if (stat(filename, &st) < 0) {
--		(userprovided ? logit : debug3)("no such identity: %s: %s",
--		    filename, strerror(errno));
-+		debug3("no such identity: %s", filename);
+ 	if (stat(id->filename, &st) < 0) {
+-		(id->userprovided ? logit : debug3)("no such identity: %s: %s",
+-		    id->filename, strerror(errno));
++		debug3("no such identity: %s", id->filename);
  		return NULL;
  	}
  	private = key_load_private_type(KEY_UNSPEC, filename, "", NULL, &perm_ok);

projects/RPi/options

@@ -60,10 +60,10 @@
     LINUX="default"
 
   # NOOBS supported hex versions (legacy)
-    NOOBS_HEX="2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19"
+    NOOBS_HEX="2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19,0092"
 
   # NOOBS supported model versions
-    NOOBS_SUPPORTED_MODELS="'Pi Model','Pi Zero'"
+    NOOBS_SUPPORTED_MODELS="'Pi Model','Pi Compute Module','Pi Zero'"
 
 ################################################################################
 # setup build defaults