Merge pull request #248 from chewitt/settings073

settings: bump to v0.7.3

config/version

@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  LIBREELEC_VERSION="6.95.2"
+  LIBREELEC_VERSION="7.0.0"
 
 # OS_VERSION: OS Version
   OS_VERSION="7.0"

packages/addons/addon-depends/RPi.GPIO/package.mk

@@ -0,0 +1,45 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="RPi.GPIO"
+PKG_VERSION="0.6.2"
+PKG_REV="1"
+PKG_ARCH="arm"
+PKG_LICENSE="MIT"
+PKG_SITE="http://sourceforge.net/p/raspberry-gpio-python/"
+PKG_URL="https://pypi.python.org/packages/source/R/RPi.GPIO/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python distutilscross:host"
+PKG_PRIORITY="optional"
+PKG_SECTION="python"
+PKG_SHORTDESC="A module to control Raspberry Pi GPIO channels"
+PKG_LONGDESC="A module to control Raspberry Pi GPIO channels"
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
+  export LDSHARED="$CC -shared"
+  export CPPFLAGS="$TARGET_CPPFLAGS -I${SYSROOT_PREFIX}/usr/include/python2.7"
+}
+
+make_target() {
+  python setup.py build
+}
+
+makeinstall_target() {
+  : # nop
+}

packages/addons/addon-depends/containerd/package.mk

@@ -0,0 +1,77 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="containerd"
+PKG_VERSION="d2f0386"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="APL"
+PKG_SITE="https://containerd.tools/"
+PKG_URL="https://github.com/docker/containerd/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_HOST="toolchain go"
+PKG_PRIORITY="optional"
+PKG_SECTION="system"
+PKG_SHORTDESC="containerd is a daemon to control runC"
+PKG_LONGDESC="containerd is a daemon to control runC, built for performance and density. containerd leverages runC's advanced features such as seccomp and user namespace support as well as checkpoint and restore for cloning and live migration of containers."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_make_target() {
+  case $TARGET_ARCH in
+    x86_64)
+      export GOARCH=amd64
+      ;;
+    arm)
+      export GOARCH=arm
+
+      case $TARGET_CPU in
+        arm1176jzf-s)
+          export GOARM=6
+          ;;
+        cortex-a7)
+         export GOARM=7
+         ;;
+      esac
+      ;;
+  esac
+
+  export GOOS=linux
+  export CGO_ENABLED=1
+  export CGO_NO_EMULATION=1
+  export CGO_CFLAGS=$CFLAGS
+  export LDFLAGS="-w -extldflags -static -X github.com/docker/containerd.GitCommit=${PKG_VERSION} -extld $TARGET_CC"
+  export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$ROOT/$PKG_BUILD.gopath:$ROOT/$PKG_BUILD/vendor/
+  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export PATH=$PATH:$GOROOT/bin
+
+  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/vendor/src/github.com/docker/containerd
+}
+
+make_target() {
+  mkdir -p bin
+  $GOLANG build -v -o bin/ctr             -a -tags "static_build" -ldflags "$LDFLAGS" ./ctr
+  $GOLANG build -v -o bin/containerd      -a -tags "static_build" -ldflags "$LDFLAGS" ./containerd
+  $GOLANG build -v -o bin/containerd-shim -a -tags "static_build" -ldflags "$LDFLAGS" ./containerd-shim
+}
+
+makeinstall_target() {
+  :
+}
+

packages/addons/addon-depends/go/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="go"
-PKG_VERSION="1.6"
+PKG_VERSION="1.6.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

packages/addons/addon-depends/go/patches/go-0001-add-ca-cert-location.patch

@@ -0,0 +1,11 @@
+diff -Naur a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
+--- a/src/crypto/x509/root_unix.go	2016-04-19 16:27:35.000000000 -0700
++++ b/src/crypto/x509/root_unix.go	2016-04-22 01:21:02.884977461 -0700
+@@ -13,6 +13,7 @@
+ var certDirectories = []string{
+ 	"/etc/ssl/certs",               // SLES10/SLES11, https://golang.org/issue/12139
+ 	"/system/etc/security/cacerts", // Android
++	"/etc/ssl",                     // LibreELEC
+ }
+ 
+ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {

packages/addons/addon-depends/gpiozero/package.mk

@@ -0,0 +1,39 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="gpiozero"
+PKG_VERSION="1.2.0"
+PKG_REV="1"
+PKG_ARCH="arm"
+PKG_LICENSE="BSD"
+PKG_SITE="https://github.com/RPi-Distro/python-gpiozero"
+PKG_URL="https://pypi.python.org/packages/source/g/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="python"
+PKG_SHORTDESC="A simple interface to everyday GPIO components used with Raspberry Pi"
+PKG_LONGDESC="A simple interface to everyday GPIO components used with Raspberry Pi"
+PKG_AUTORECONF="no"
+
+make_target() {
+  : # nop
+}
+
+makeinstall_target() {
+  : # nop
+}

packages/addons/addon-depends/picamera/package.mk

@@ -0,0 +1,39 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="picamera"
+PKG_VERSION="1.10"
+PKG_REV="1"
+PKG_ARCH="arm"
+PKG_LICENSE="BSD"
+PKG_SITE="https://github.com/waveform80/picamera"
+PKG_URL="https://pypi.python.org/packages/source/p/picamera/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python distutilscross:host bcm2835-driver"
+PKG_PRIORITY="optional"
+PKG_SECTION="python"
+PKG_SHORTDESC="A python and shell interface for the Raspberry Pi camera module"
+PKG_LONGDESC="A python and shell interface for the Raspberry Pi camera module"
+PKG_AUTORECONF="no"
+
+make_target() {
+  : # nop
+}
+
+makeinstall_target() {
+  : # nop
+}

packages/addons/addon-depends/runc/package.mk

@@ -0,0 +1,74 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="runc"
+PKG_VERSION="e874369"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="APL"
+PKG_SITE="https://github.com/opencontainers/runc"
+PKG_URL="https://github.com/opencontainers/runc/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_HOST="toolchain go"
+PKG_PRIORITY="optional"
+PKG_SECTION="system"
+PKG_SHORTDESC="runc is a CLI tool for spawning and running containers according to the OCI specification"
+PKG_LONGDESC="runc is a CLI tool for spawning and running containers according to the OCI specification"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_make_target() {
+  case $TARGET_ARCH in
+    x86_64)
+      export GOARCH=amd64
+      ;;
+    arm)
+      export GOARCH=arm
+
+      case $TARGET_CPU in
+        arm1176jzf-s)
+          export GOARM=6
+          ;;
+        cortex-a7)
+         export GOARM=7
+         ;;
+      esac
+      ;;
+  esac
+
+  export GOOS=linux
+  export CGO_ENABLED=1
+  export CGO_NO_EMULATION=1
+  export CGO_CFLAGS=$CFLAGS
+  export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_VERSION} -extld $TARGET_CC"
+  export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$ROOT/$PKG_BUILD.gopath:$ROOT/$PKG_BUILD/Godeps/_workspace/
+  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export PATH=$PATH:$GOROOT/bin
+
+  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/Godeps/_workspace/src/github.com/opencontainers/runc
+}
+
+make_target() {
+  mkdir -p bin
+  $GOLANG build -v -o bin/runc -a -tags "cgo static_build" -ldflags "$LDFLAGS" ./
+}
+
+makeinstall_target() {
+  :
+}

packages/addons/browser/chromium/changelog.txt

@@ -1,2 +1,5 @@
+7.0.101
+- update to version 50.0.2661.75
+
 7.0.100
 - initial LibreELEC release

packages/addons/browser/chromium/package.mk

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="chromium"
-PKG_VERSION="49.0.2623.87"
-PKG_REV="100"
+PKG_VERSION="50.0.2661.75"
+PKG_REV="101"
 PKG_ARCH="x86_64"
 PKG_LICENSE="Mixed"
 PKG_SITE="http://www.chromium.org/Home"
@@ -75,7 +75,7 @@ make_target() {
     -Dlinux_use_bundled_binutils=0
     -Dlinux_use_bundled_gold=0
     -Dlinux_use_gold_flags=0
-    -Dicu_use_data_file_flag=0
+    -Dicu_use_data_file_flag=1
     -Dlogging_like_official_build=1
     -Dtracing_like_official_build=1
     -Dfieldtrial_testing_like_official_build=1
@@ -126,7 +126,7 @@ addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P  $PKG_BUILD/out/Release/chrome $ADDON_BUILD/$PKG_ADDON_ID/bin/chromium.bin
   cp -P  $PKG_BUILD/out/Release/chrome_sandbox $ADDON_BUILD/$PKG_ADDON_ID/bin/chrome-sandbox
-  cp -P  $PKG_BUILD/out/Release/{*.pak,*.bin,libwidevinecdmadapter.so} $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P  $PKG_BUILD/out/Release/{*.pak,*.dat,*.bin,libwidevinecdmadapter.so} $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -PR $PKG_BUILD/out/Release/locales $ADDON_BUILD/$PKG_ADDON_ID/bin/
 
   $STRIP $ADDON_BUILD/$PKG_ADDON_ID/bin/chromium.bin
@@ -150,9 +150,6 @@ addon() {
   cp -PL $(get_build_dir gtk+)/.install_pkg/usr/lib/libgdk-x11-2.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -PL $(get_build_dir gtk+)/.install_pkg/usr/lib/libgtk-x11-2.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib
 
-  # atk
-  # cp -PL $(get_build_dir atk)/.install_pkg/usr/lib/libatk-1.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib
-
   # harfbuzz
   cp -PL $(get_build_dir harfbuzz)/.install_pkg/usr/lib/libharfbuzz.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib
 

packages/addons/browser/chromium/patches/chromium-0002_allow-runing-as-root.patch

@@ -1,10 +0,0 @@
---- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc	2015-12-15 12:05:07.000000000 -0800
-+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc	2016-01-12 16:08:45.701976368 -0800
-@@ -140,7 +140,6 @@
- #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-   // Now that we have some minimal ui initialized, check to see if we're
-   // running as root and bail if we are.
--  DetectRunningAsRoot();
- #endif
- }
- 

packages/addons/browser/chromium/patches/chromium-0004_enable-vaapi-on-linux.patch

@@ -295,13 +295,13 @@ Index: dev.wily/chrome/browser/about_flags.cc
 ===================================================================
 --- dev.wily.orig/chrome/browser/about_flags.cc
 +++ dev.wily/chrome/browser/about_flags.cc
-@@ -937,7 +937,7 @@
-      "disable-accelerated-video-decode",
-      IDS_FLAGS_ACCELERATED_VIDEO_DECODE_NAME,
-      IDS_FLAGS_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
--     kOsMac | kOsWin | kOsCrOS,
-+     kOsAll,
-      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
+@@ -854,7 +854,7 @@
+         "disable-accelerated-video-decode",
+         IDS_FLAGS_ACCELERATED_VIDEO_DECODE_NAME,
+         IDS_FLAGS_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
+-        kOsMac | kOsWin | kOsCrOS,
++        kOsAll,
+         SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
      },
  #if defined(USE_ASH)
 Index: dev.wily/content/common/gpu/media/vaapi_wrapper.cc

packages/addons/script/script.config.vdr/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="script.config.vdr"
-PKG_VERSION="1.1.0"
+PKG_VERSION="1.1.2"
 PKG_REV="101"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/addons/service/docker/changelog.txt

@@ -1,2 +1,6 @@
+7.0.101
+- Update to golan 1.6.2
+- Update to docker 1.11.0
+
 7.0.100
 - Initial release

packages/addons/service/docker/package.mk

@@ -17,14 +17,14 @@
 ################################################################################
 
 PKG_NAME="docker"
-PKG_VERSION="1.10.3"
-PKG_REV="100"
+PKG_VERSION="1.11.0"
+PKG_REV="101"
 PKG_ARCH="any"
 PKG_ADDON_PROJECTS="Generic RPi RPi2"
 PKG_LICENSE="ASL"
 PKG_SITE="http://www.docker.com/"
 PKG_URL="https://github.com/docker/docker/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain sqlite go:host"
+PKG_DEPENDS_TARGET="toolchain sqlite go:host containerd runc"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="Docker is an open-source engine that automates the deployment of any application as a lightweight, portable, self-sufficient container that will run virtually anywhere."
@@ -70,8 +70,6 @@ configure_target() {
   export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
 
-  ./hack/vendor.sh
-
   ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/vendor/src/github.com/docker/docker
 
   # used for docker version
@@ -91,6 +89,14 @@ makeinstall_target() {
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
-    cp -a $ROOT/$PKG_BUILD/bin/docker $ADDON_BUILD/$PKG_ADDON_ID/bin/
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $ROOT/$PKG_BUILD/bin/docker $ADDON_BUILD/$PKG_ADDON_ID/bin
+
+    # containerd
+    cp -P $(get_build_dir containerd)/bin/containerd $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-containerd
+    cp -P $(get_build_dir containerd)/bin/containerd-shim $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-containerd-shim
+    cp -P $(get_build_dir containerd)/bin/ctr $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-containerd-ctr
+
+    # runc
+    cp -P $(get_build_dir runc)/bin/runc $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-runc
 }

packages/addons/service/docker/patches/docker-001-use-addon-storage-location.patch

@@ -2,18 +2,18 @@
 # find . -name "*.go" -print | xargs sed -i 's/\/etc\/docker/\/storage\/.kodi\/userdata\/addon_data\/service.system.docker\/config/g'
 
 diff -Naur a/docker/daemon_unix.go b/docker/daemon_unix.go
---- a/docker/daemon_unix.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/docker/daemon_unix.go	2016-02-19 00:28:50.662085695 +0100
+--- a/docker/daemon_unix.go	2016-04-13 11:03:42.000000000 -0700
++++ b/docker/daemon_unix.go	2016-04-21 02:39:35.588218701 -0700
 @@ -16,7 +16,7 @@
- 	_ "github.com/docker/docker/daemon/execdriver/native"
+ 	"github.com/docker/docker/pkg/system"
  )
  
 -const defaultDaemonConfigFile = "/etc/docker/daemon.json"
 +const defaultDaemonConfigFile = "/storage/.kodi/userdata/addon_data/service.system.docker/config/daemon.json"
  
  func setPlatformServerConfig(serverConfig *apiserver.Config, daemonCfg *daemon.Config) *apiserver.Config {
- 	serverConfig.SocketGroup = daemonCfg.SocketGroup
-@@ -50,7 +50,7 @@
+ 	serverConfig.EnableCors = daemonCfg.EnableCors
+@@ -49,7 +49,7 @@
  }
  
  func getDaemonConfDir() string {
@@ -23,10 +23,10 @@ diff -Naur a/docker/daemon_unix.go b/docker/daemon_unix.go
  
  // setupConfigReloadTrap configures the USR2 signal to reload the configuration.
 diff -Naur a/integration-cli/docker_cli_authz_unix_test.go b/integration-cli/docker_cli_authz_unix_test.go
---- a/integration-cli/docker_cli_authz_unix_test.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/integration-cli/docker_cli_authz_unix_test.go	2016-02-19 00:28:50.642085661 +0100
-@@ -121,10 +121,10 @@
- 		}
+--- a/integration-cli/docker_cli_authz_unix_test.go	2016-04-13 11:03:42.000000000 -0700
++++ b/integration-cli/docker_cli_authz_unix_test.go	2016-04-21 02:39:35.417217012 -0700
+@@ -134,10 +134,10 @@
+ 		w.Write(b)
  	})
  
 -	err := os.MkdirAll("/etc/docker/plugins", 0755)
@@ -38,7 +38,7 @@ diff -Naur a/integration-cli/docker_cli_authz_unix_test.go b/integration-cli/doc
  	err = ioutil.WriteFile(fileName, []byte(s.server.URL), 0644)
  	c.Assert(err, checker.IsNil)
  }
-@@ -163,7 +163,7 @@
+@@ -186,7 +186,7 @@
  
  	s.server.Close()
  
@@ -48,9 +48,9 @@ diff -Naur a/integration-cli/docker_cli_authz_unix_test.go b/integration-cli/doc
  }
  
 diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go
---- a/integration-cli/docker_cli_daemon_test.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/integration-cli/docker_cli_daemon_test.go	2016-02-19 00:28:50.636085651 +0100
-@@ -537,13 +537,13 @@
+--- a/integration-cli/docker_cli_daemon_test.go	2016-04-13 11:03:42.000000000 -0700
++++ b/integration-cli/docker_cli_daemon_test.go	2016-04-21 02:39:35.482217654 -0700
+@@ -511,13 +511,13 @@
  
  func (s *DockerDaemonSuite) TestDaemonKeyGeneration(c *check.C) {
  	// TODO: skip or update for Windows daemon
@@ -66,7 +66,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err != nil {
  		c.Fatalf("Error opening key file")
  	}
-@@ -556,7 +556,7 @@
+@@ -530,7 +530,7 @@
  
  func (s *DockerDaemonSuite) TestDaemonKeyMigration(c *check.C) {
  	// TODO: skip or update for Windows daemon
@@ -75,7 +75,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	k1, err := libtrust.GenerateECP256PrivateKey()
  	if err != nil {
  		c.Fatalf("Error generating private key: %s", err)
-@@ -573,7 +573,7 @@
+@@ -547,7 +547,7 @@
  	}
  	s.d.Stop()
  
@@ -84,7 +84,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err != nil {
  		c.Fatalf("Error opening key file")
  	}
-@@ -1337,7 +1337,7 @@
+@@ -1295,7 +1295,7 @@
  		Y   string `json:"y"`
  	}
  
@@ -93,7 +93,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err := s.d.Start(); err != nil {
  		c.Fatalf("Failed to start daemon: %v", err)
  	}
-@@ -1347,7 +1347,7 @@
+@@ -1305,7 +1305,7 @@
  	}
  
  	config := &Config{}
@@ -102,7 +102,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err != nil {
  		c.Fatalf("Error reading key.json file: %s", err)
  	}
-@@ -1367,11 +1367,11 @@
+@@ -1325,11 +1325,11 @@
  	}
  
  	// write back
@@ -117,8 +117,8 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err := s.d.Start(); err == nil {
  		c.Fatalf("It should not be successful to start daemon with wrong key: %v", err)
 diff -Naur a/integration-cli/docker_cli_external_graphdriver_unix_test.go b/integration-cli/docker_cli_external_graphdriver_unix_test.go
---- a/integration-cli/docker_cli_external_graphdriver_unix_test.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/integration-cli/docker_cli_external_graphdriver_unix_test.go	2016-02-19 00:28:50.632085644 +0100
+--- a/integration-cli/docker_cli_external_graphdriver_unix_test.go	2016-04-13 11:03:42.000000000 -0700
++++ b/integration-cli/docker_cli_external_graphdriver_unix_test.go	2016-04-21 02:39:35.509217920 -0700
 @@ -283,18 +283,18 @@
  		respond(w, &graphDriverResponse{Size: size})
  	})
@@ -145,9 +145,9 @@ diff -Naur a/integration-cli/docker_cli_external_graphdriver_unix_test.go b/inte
  
  func (s *DockerExternalGraphdriverSuite) TestExternalGraphDriver(c *check.C) {
 diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go
---- a/integration-cli/docker_cli_network_unix_test.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/integration-cli/docker_cli_network_unix_test.go	2016-02-19 00:28:50.629085639 +0100
-@@ -201,14 +201,14 @@
+--- a/integration-cli/docker_cli_network_unix_test.go	2016-04-13 11:03:42.000000000 -0700
++++ b/integration-cli/docker_cli_network_unix_test.go	2016-04-21 02:39:35.506217891 -0700
+@@ -200,14 +200,14 @@
  		}
  	})
  
@@ -165,7 +165,7 @@ diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/d
  	err = ioutil.WriteFile(ipamFileName, []byte(url), 0644)
  	c.Assert(err, checker.IsNil)
  }
-@@ -220,7 +220,7 @@
+@@ -219,7 +219,7 @@
  
  	s.server.Close()
  
@@ -175,9 +175,9 @@ diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/d
  }
  
 diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integration-cli/docker_cli_start_volume_driver_unix_test.go
---- a/integration-cli/docker_cli_start_volume_driver_unix_test.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/integration-cli/docker_cli_start_volume_driver_unix_test.go	2016-02-19 00:28:50.651085676 +0100
-@@ -206,17 +206,17 @@
+--- a/integration-cli/docker_cli_start_volume_driver_unix_test.go	2016-04-13 11:03:42.000000000 -0700
++++ b/integration-cli/docker_cli_start_volume_driver_unix_test.go	2016-04-21 02:39:35.514217970 -0700
+@@ -216,17 +216,17 @@
  		send(w, nil)
  	})
  
@@ -198,7 +198,7 @@ diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integ
  	c.Assert(err, checker.IsNil)
  }
  
-@@ -301,7 +301,7 @@
+@@ -311,7 +311,7 @@
  
  // Make sure a request to use a down driver doesn't block other requests
  func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverLookupNotBlocked(c *check.C) {
@@ -207,7 +207,7 @@ diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integ
  	err := ioutil.WriteFile(specPath, []byte("tcp://127.0.0.7:9999"), 0644)
  	c.Assert(err, check.IsNil)
  	defer os.RemoveAll(specPath)
-@@ -340,7 +340,7 @@
+@@ -350,7 +350,7 @@
  	err := s.d.StartWithBusybox()
  	c.Assert(err, checker.IsNil)
  
@@ -216,33 +216,9 @@ diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integ
  	os.RemoveAll(specPath)
  	defer os.RemoveAll(specPath)
  
-diff -Naur a/integration-cli/docker_cli_volume_driver_compat_unix_test.go b/integration-cli/docker_cli_volume_driver_compat_unix_test.go
---- a/integration-cli/docker_cli_volume_driver_compat_unix_test.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/integration-cli/docker_cli_volume_driver_compat_unix_test.go	2016-02-19 00:28:50.646085667 +0100
-@@ -173,17 +173,17 @@
- 		send(w, nil)
- 	})
- 
--	err := os.MkdirAll("/etc/docker/plugins", 0755)
-+	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
- 	c.Assert(err, checker.IsNil)
- 
--	err = ioutil.WriteFile("/etc/docker/plugins/test-external-volume-driver.spec", []byte(s.server.URL), 0644)
-+	err = ioutil.WriteFile("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/test-external-volume-driver.spec", []byte(s.server.URL), 0644)
- 	c.Assert(err, checker.IsNil)
- }
- 
- func (s *DockerExternalVolumeSuiteCompatV1_1) TearDownSuite(c *check.C) {
- 	s.server.Close()
- 
--	err := os.RemoveAll("/etc/docker/plugins")
-+	err := os.RemoveAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins")
- 	c.Assert(err, checker.IsNil)
- }
- 
 diff -Naur a/pkg/plugins/discovery.go b/pkg/plugins/discovery.go
---- a/pkg/plugins/discovery.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/pkg/plugins/discovery.go	2016-02-19 00:28:50.247084996 +0100
+--- a/pkg/plugins/discovery.go	2016-04-13 11:03:42.000000000 -0700
++++ b/pkg/plugins/discovery.go	2016-04-21 02:39:35.668219491 -0700
 @@ -15,7 +15,7 @@
  	// ErrNotFound plugin not found
  	ErrNotFound = errors.New("plugin not found")
@@ -253,8 +229,8 @@ diff -Naur a/pkg/plugins/discovery.go b/pkg/plugins/discovery.go
  
  // localRegistry defines a registry that is local (using unix socket).
 diff -Naur a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
---- a/pkg/plugins/plugins.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/pkg/plugins/plugins.go	2016-02-19 00:28:50.263085023 +0100
+--- a/pkg/plugins/plugins.go	2016-04-13 11:03:42.000000000 -0700
++++ b/pkg/plugins/plugins.go	2016-04-21 02:39:35.667219481 -0700
 @@ -4,7 +4,7 @@
  // Docker discovers plugins by looking for them in the plugin directory whenever
  // a user or container tries to use one by name. UNIX domain socket files must
@@ -265,9 +241,9 @@ diff -Naur a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
  // its name if it exists.
  //
 diff -Naur a/registry/config_unix.go b/registry/config_unix.go
---- a/registry/config_unix.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/registry/config_unix.go	2016-02-19 00:28:50.742085829 +0100
-@@ -12,7 +12,7 @@
+--- a/registry/config_unix.go	2016-04-13 11:03:42.000000000 -0700
++++ b/registry/config_unix.go	2016-04-21 02:39:35.629219106 -0700
+@@ -4,7 +4,7 @@
  
  var (
  	// CertsDir is the directory where certificates are stored
@@ -276,10 +252,10 @@ diff -Naur a/registry/config_unix.go b/registry/config_unix.go
  )
  
  // cleanPath is used to ensure that a directory name is valid on the target
-diff -Naur a/registry/endpoint.go b/registry/endpoint.go
---- a/registry/endpoint.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/registry/endpoint.go	2016-02-19 00:28:50.740085826 +0100
-@@ -73,7 +73,7 @@
+diff -Naur a/registry/endpoint_v1.go b/registry/endpoint_v1.go
+--- a/registry/endpoint_v1.go	2016-04-13 11:03:42.000000000 -0700
++++ b/registry/endpoint_v1.go	2016-04-21 02:39:35.629219106 -0700
+@@ -49,7 +49,7 @@
  		if endpoint.IsSecure {
  			// If registry is secure and HTTPS failed, show user the error and tell them about `--insecure-registry`
  			// in case that's what they need. DO NOT accept unknown CA certificates, and DO NOT fallback to HTTP.

packages/addons/service/docker/source/systemd/service.system.docker.service

@@ -6,6 +6,7 @@ Requires=docker.socket
 
 [Service]
 Type=notify
+Environment=PATH=/bin:/sbin:/usr/bin:/usr/sbin:/storage/.kodi/addons/service.system.docker/bin
 ExecStartPre=/storage/.kodi/addons/service.system.docker/bin/docker-config
 EnvironmentFile=-/storage/.kodi/userdata/addon_data/service.system.docker/config/docker.conf
 ExecStart=/storage/.kodi/addons/service.system.docker/bin/docker daemon -H fd:// $DOCKER_DAEMON_OPTS $DOCKER_STORAGE_OPTS

packages/addons/service/tvheadend42/changelog.txt

@@ -1,2 +1,5 @@
+7.0.101
+- Update to Tvheadend 4.1.1928
+
 7.0.100
 - initial LibreELEC version

packages/addons/service/tvheadend42/package.mk

@@ -17,9 +17,9 @@
 ################################################################################
 
 PKG_NAME="tvheadend42"
-PKG_VERSION="616413f"
-PKG_VERSION_NUMBER="4.1.1892"
-PKG_REV="100"
+PKG_VERSION="ac2d90e"
+PKG_VERSION_NUMBER="4.1.1928"
+PKG_REV="101"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvheadend.org"

packages/addons/tools/rpi-tools/changelog.txt

@@ -0,0 +1,2 @@
+7.0.100
+- Initial Release

packages/addons/tools/rpi-tools/package.mk

@@ -0,0 +1,54 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="rpi-tools"
+PKG_VERSION=""
+PKG_REV="100"
+PKG_ARCH="arm"
+PKG_LICENSE="GPL"
+PKG_SITE=""
+PKG_URL=""
+PKG_DEPENDS_TARGET="toolchain RPi.GPIO picamera gpiozero"
+PKG_PRIORITY="optional"
+PKG_SECTION="virtual"
+PKG_SHORTDESC="A bundle of tools and programs for use on the Raspberry Pi"
+PKG_LONGDESC="This bundle currently includes RPi.GPIO, picamera, and gpiozero python modules"
+PKG_DISCAIMER="Raspberry Pi is a trademark of the Raspberry Pi Foundation http://www.raspberrypi.org"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="Raspberry Pi Tools"
+PKG_ADDON_TYPE="xbmc.python.module"
+PKG_ADDON_PROVIDES=""
+PKG_ADDON_PROJECTS="RPi RPi2"
+PKG_ADDON_REPOVERSION="7.0"
+
+PKG_AUTORECONF="no"
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/RPi/
+    cp -PR $(get_build_dir RPi.GPIO)/build/lib.linux-*/RPi/* $ADDON_BUILD/$PKG_ADDON_ID/lib/RPi
+    cp -PR $(get_build_dir picamera)/picamera $ADDON_BUILD/$PKG_ADDON_ID/lib/
+    cp -PR $(get_build_dir gpiozero)/gpiozero $ADDON_BUILD/$PKG_ADDON_ID/lib/
+
+  BCM2835_DIR="$(get_build_dir bcm2835-driver)"
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
+    cp -P $BCM2835_DIR/hardfp/opt/vc/bin/raspistill $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $BCM2835_DIR/hardfp/opt/vc/bin/raspiyuv $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $BCM2835_DIR/hardfp/opt/vc/bin/raspivid $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $BCM2835_DIR/hardfp/opt/vc/bin/raspividyuv $ADDON_BUILD/$PKG_ADDON_ID/bin
+}

packages/addons/tools/rpi-tools/source/default.py

@@ -0,0 +1,22 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+import xbmcgui
+
+dialog = xbmcgui.Dialog()
+dialog.ok('', 'This is a console-only addon')

packages/graphics/bcm2835-driver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="efdcf16"
+PKG_VERSION="c5e1319"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/linux/firmware/i915/skl_dmc_ver1.bin

@@ -1 +1 @@
-skl_dmc_ver1_22.bin
+skl_dmc_ver1_26.bin

packages/linux/firmware/i915/skl_guc_ver6.bin

@@ -0,0 +1 @@
+skl_guc_ver6_1.bin

packages/mediacenter/LibreELEC-settings/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="LibreELEC-settings"
-PKG_VERSION="69d7952"
+PKG_VERSION="bbe9cdf"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="prop."

packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.argustv"
-PKG_VERSION="654715b"
+PKG_VERSION="cdc86cc"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.dvblink"
-PKG_VERSION="88849a2"
+PKG_VERSION="026155e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.hts"
-PKG_VERSION="3c673b5"
+PKG_VERSION="ada1e05"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.mediaportal.tvserver"
-PKG_VERSION="330d90b"
+PKG_VERSION="7437171"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.mythtv"
-PKG_VERSION="f6b0483"
+PKG_VERSION="18ee0b5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.nextpvr"
-PKG_VERSION="9214bc0"
+PKG_VERSION="51169be"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.stalker"
-PKG_VERSION="92893c7"
+PKG_VERSION="72a064a"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.wmc"
-PKG_VERSION="6c8d668"
+PKG_VERSION="df5141d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-theme-Confluence/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi-theme-Confluence"
-PKG_VERSION="16.1-rc2-a7caa16"
+PKG_VERSION="16.1-c327c53"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi"
-PKG_VERSION="16.1-rc2-a7caa16"
+PKG_VERSION="16.1-c327c53"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/network/bluez/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bluez"
-PKG_VERSION="5.38"
+PKG_VERSION="5.39"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/network/bluez/system.d/bluetooth.service

@@ -12,6 +12,9 @@ ExecStart=/usr/lib/bluetooth/bluetoothd $BLUEZ_ARGS $BLUEZ_DEBUG
 CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW
 LimitNPROC=1
 TimeoutStopSec=1s
+Restart=on-failure
+RestartSec=2
+StartLimitInterval=0
 
 [Install]
 WantedBy=bluetooth.target

packages/security/libressl/patches/libressl-trusted-first.patch

@@ -0,0 +1,62 @@
+From 779c075d93f339ee4043ea026586a463376b301c Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Wed, 20 Apr 2016 22:26:49 +0200
+Subject: [PATCH] trusted first
+
+---
+ apps/apps.c                |  2 ++
+ crypto/x509/x509_vfy.c     | 14 ++++++++++++++
+ include/openssl/x509_vfy.h |  2 ++
+ 3 files changed, 18 insertions(+)
+
+diff --git a/apps/apps.c b/apps/apps.c
+index 6e40965..cbdd080 100644
+--- a/apps/apps.c
++++ b/apps/apps.c
+@@ -2051,6 +2051,8 @@ args_verify(char ***pargs, int *pargc, int *badarg, BIO *err,
+ 		flags |= X509_V_FLAG_NOTIFY_POLICY;
+ 	else if (!strcmp(arg, "-check_ss_sig"))
+ 		flags |= X509_V_FLAG_CHECK_SS_SIGNATURE;
++	else if (!strcmp(arg, "-trusted_first"))
++		flags |= X509_V_FLAG_TRUSTED_FIRST;
+ 	else
+ 		return 0;
+ 
+diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
+index f9fd3a0..6e51edb 100644
+--- a/crypto/x509/x509_vfy.c
++++ b/crypto/x509/x509_vfy.c
+@@ -209,6 +209,20 @@ X509_verify_cert(X509_STORE_CTX *ctx)
+ 		if (ctx->check_issued(ctx, x, x))
+ 			break;
+ 
++		/* If asked see if we can find issuer in trusted store first */
++		if (ctx->param->flags & X509_V_FLAG_TRUSTED_FIRST) {
++			ok = ctx->get_issuer(&xtmp, ctx, x);
++			if (ok < 0)
++				goto end;
++			/* If successful for now free up cert so it
++			 * will be picked up again later.
++			 */
++			if (ok > 0) {
++				X509_free(xtmp);
++				break;
++			}
++		}
++
+ 		/* If we were passed a cert chain, use it first */
+ 		if (ctx->untrusted != NULL) {
+ 			xtmp = find_issuer(ctx, sktmp, x);
+diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
+index e4050b2..ddf77e7 100644
+--- a/include/openssl/x509_vfy.h
++++ b/include/openssl/x509_vfy.h
+@@ -383,6 +383,8 @@ void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);
+ #define X509_V_FLAG_USE_DELTAS			0x2000
+ /* Check selfsigned CA signature */
+ #define X509_V_FLAG_CHECK_SS_SIGNATURE		0x4000
++/* Use trusted store first */
++#define X509_V_FLAG_TRUSTED_FIRST		0x8000
+ 
+ 
+ #define X509_VP_FLAG_DEFAULT			0x1

packages/tools/bcm2835-bootloader/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="efdcf16"
+PKG_VERSION="c5e1319"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

projects/RPi/linux/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.6 Kernel Configuration
+# Linux/arm 4.4.7 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -2595,6 +2595,8 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
 CONFIG_SND_BCM2708_SOC_RPI_DAC=m
 CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
+CONFIG_SND_BCM2708_SOC_BOOMBERRY_DAC=m
+CONFIG_SND_BCM2708_SOC_BOOMBERRY_DIGI=m
 CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
 CONFIG_SND_BCM2708_SOC_RASPIDAC3=m
 # CONFIG_SND_DESIGNWARE_I2S is not set

projects/RPi2/linux/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.6 Kernel Configuration
+# Linux/arm 4.4.7 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -2643,6 +2643,8 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
 CONFIG_SND_BCM2708_SOC_RPI_DAC=m
 CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
+CONFIG_SND_BCM2708_SOC_BOOMBERRY_DAC=m
+CONFIG_SND_BCM2708_SOC_BOOMBERRY_DIGI=m
 CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
 CONFIG_SND_BCM2708_SOC_RASPIDAC3=m
 # CONFIG_SND_DESIGNWARE_I2S is not set

projects/WeTek_Core/patches/linux/080-amlogic-cec-driver.patch

@@ -55,10 +55,10 @@ index 7a944cd..f74ec1f 100755
  #EXTRA_CFLAGS += -O2
 diff --git a/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
 new file mode 100644
-index 0000000..a3556b3
+index 0000000..1bfc29b
 --- /dev/null
 +++ b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
-@@ -0,0 +1,671 @@
+@@ -0,0 +1,679 @@
 +/* linux/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
 + *
 + * Copyright (c) 2016 Gerald Dachs
@@ -549,7 +549,6 @@ index 0000000..a3556b3
 +
 +    retval = entry->size;
 +
-+    amlogic_cec_set_rx_state(STATE_RX);
 +
 +error_exit:
 +    if (entry != NULL)
@@ -558,6 +557,11 @@ index 0000000..a3556b3
 +    	kfree(entry);
 +    }
 +
++    if (list_empty(&cec_rx_struct.list))
++    {
++        amlogic_cec_set_rx_state(STATE_RX);
++    }
++
 +    spin_unlock_irqrestore(&cec_rx_struct.lock, spin_flags);
 +
 +    return retval;
@@ -651,7 +655,11 @@ index 0000000..a3556b3
 +
 +static u32 amlogic_cec_poll(struct file *file, poll_table *wait)
 +{
-+    poll_wait(file, &cec_rx_struct.waitq, wait);
++
++    if (atomic_read(&cec_rx_struct.state) != STATE_DONE)
++    {
++        poll_wait(file, &cec_rx_struct.waitq, wait);
++    }
 +
 +    if (atomic_read(&cec_rx_struct.state) == STATE_DONE)
 +    {

projects/WeTek_Play/patches/linux/080-amlogic-cec-driver.patch

@@ -55,10 +55,10 @@ index 7a944cd..f74ec1f 100755
  #EXTRA_CFLAGS += -O2
 diff --git a/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
 new file mode 100644
-index 0000000..a3556b3
+index 0000000..1bfc29b
 --- /dev/null
 +++ b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
-@@ -0,0 +1,671 @@
+@@ -0,0 +1,679 @@
 +/* linux/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
 + *
 + * Copyright (c) 2016 Gerald Dachs
@@ -549,7 +549,6 @@ index 0000000..a3556b3
 +
 +    retval = entry->size;
 +
-+    amlogic_cec_set_rx_state(STATE_RX);
 +
 +error_exit:
 +    if (entry != NULL)
@@ -558,6 +557,11 @@ index 0000000..a3556b3
 +    	kfree(entry);
 +    }
 +
++    if (list_empty(&cec_rx_struct.list))
++    {
++        amlogic_cec_set_rx_state(STATE_RX);
++    }
++
 +    spin_unlock_irqrestore(&cec_rx_struct.lock, spin_flags);
 +
 +    return retval;
@@ -651,7 +655,11 @@ index 0000000..a3556b3
 +
 +static u32 amlogic_cec_poll(struct file *file, poll_table *wait)
 +{
-+    poll_wait(file, &cec_rx_struct.waitq, wait);
++
++    if (atomic_read(&cec_rx_struct.state) != STATE_DONE)
++    {
++        poll_wait(file, &cec_rx_struct.waitq, wait);
++    }
 +
 +    if (atomic_read(&cec_rx_struct.state) == STATE_DONE)
 +    {