jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-6.0

Browse Source
This commit is contained in:
Stephan Raue 2015-10-29 18:03:31 +01:00
commit 64942aecc4
40 changed files with 50 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/linux/package.mk
View File

@ -40,7 +40,7 @@ case "$LINUX" in
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan"
;;
*)
PKG_VERSION="4.1.11"
PKG_VERSION="4.1.12"
PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
;;
esac

63
packages/linux/patches/4.1.11/linux-999.10-inet-fix-race-in-reqsk_queue_unlink.patch vendored
View File

@ -1,63 +0,0 @@
From 8f6a05588928ef61e751ca3cb008b9847fb6b83d Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Thu, 1 Oct 2015 05:39:26 -0700
Subject: [PATCH] inet: fix race in reqsk_queue_unlink()
reqsk_timer_handler() tests if icsk_accept_queue.listen_opt
is NULL at its beginning.
By the time it calls inet_csk_reqsk_queue_drop() and
reqsk_queue_unlink(), listener might have been closed and
inet_csk_listen_stop() had called reqsk_queue_yank_acceptq()
which sets icsk_accept_queue.listen_opt to NULL
We therefore need to correctly check listen_opt being NULL
after holding syn_wait_lock for proper synchronization.
Fixes: fa76ce7328b2 ("inet: get rid of central tcp/dccp listener timer")
Fixes: b357a364c57c ("inet: fix possible panic in reqsk_queue_unlink()")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Yuchung Cheng <ycheng@google.com>
---
net/ipv4/inet_connection_sock.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index e664706b350c..37c8b45af44b 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -568,21 +568,22 @@ EXPORT_SYMBOL(inet_rtx_syn_ack);
static bool reqsk_queue_unlink(struct request_sock_queue *queue,
struct request_sock *req)
{
- struct listen_sock *lopt = queue->listen_opt;
struct request_sock **prev;
+ struct listen_sock *lopt;
bool found = false;
spin_lock(&queue->syn_wait_lock);
-
- for (prev = &lopt->syn_table[req->rsk_hash]; *prev != NULL;
- prev = &(*prev)->dl_next) {
- if (*prev == req) {
- *prev = req->dl_next;
- found = true;
- break;
+ lopt = queue->listen_opt;
+ if (lopt) {
+ for (prev = &lopt->syn_table[req->rsk_hash]; *prev != NULL;
+ prev = &(*prev)->dl_next) {
+ if (*prev == req) {
+ *prev = req->dl_next;
+ found = true;
+ break;
+ }
}
}
-
spin_unlock(&queue->syn_wait_lock);
if (timer_pending(&req->rsk_timer) && del_timer_sync(&req->rsk_timer))
reqsk_put(req);
--
2.4.3

0
packages/linux/patches/4.1.11/linux-003-no_dev_console.patch → packages/linux/patches/4.1.12/linux-003-no_dev_console.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-051-ouya_controller_support.patch → packages/linux/patches/4.1.12/linux-051-ouya_controller_support.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-052-XBOX_remote_support.patch → packages/linux/patches/4.1.12/linux-052-XBOX_remote_support.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-053-spinelplus-remote-0.2.patch → packages/linux/patches/4.1.12/linux-053-spinelplus-remote-0.2.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch → packages/linux/patches/4.1.12/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch → packages/linux/patches/4.1.12/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch → packages/linux/patches/4.1.12/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch → packages/linux/patches/4.1.12/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch → packages/linux/patches/4.1.12/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-062-imon_pad_ignore_diagonal.patch → packages/linux/patches/4.1.12/linux-062-imon_pad_ignore_diagonal.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-063-xpad-fix_xbox360_wireless.patch → packages/linux/patches/4.1.12/linux-063-xpad-fix_xbox360_wireless.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-200-rtl28xxu-fix-control-message-flaws.patch → packages/linux/patches/4.1.12/linux-200-rtl28xxu-fix-control-message-flaws.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-203-stb0899_enable_low_symbol_rate.patch → packages/linux/patches/4.1.12/linux-203-stb0899_enable_low_symbol_rate.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-212-mantis_stb0899_faster_lock.patch → packages/linux/patches/4.1.12/linux-212-mantis_stb0899_faster_lock.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-221-ngene-octopus.patch → packages/linux/patches/4.1.12/linux-221-ngene-octopus.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-222-stb0899_signal_quality.patch → packages/linux/patches/4.1.12/linux-222-stb0899_signal_quality.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch → packages/linux/patches/4.1.12/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-224-STK1160-addFramescaling.patch → packages/linux/patches/4.1.12/linux-224-STK1160-addFramescaling.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-227-ds3000-invalid-symbol-rate.patch → packages/linux/patches/4.1.12/linux-227-ds3000-invalid-symbol-rate.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-228-fix-tt-s2-4600.patch → packages/linux/patches/4.1.12/linux-228-fix-tt-s2-4600.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-229-hauppauge-hvr-2205-and-2255.patch → packages/linux/patches/4.1.12/linux-229-hauppauge-hvr-2205-and-2255.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-230-elgato-eyetv-sat-v3.patch → packages/linux/patches/4.1.12/linux-230-elgato-eyetv-sat-v3.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-706-Sitecom-N300.patch → packages/linux/patches/4.1.12/linux-706-Sitecom-N300.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-950-saa716x_PCIe_interface_chipset.patch → packages/linux/patches/4.1.12/linux-950-saa716x_PCIe_interface_chipset.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch → packages/linux/patches/4.1.12/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-995-CX24120-13Z_frontend.patch → packages/linux/patches/4.1.12/linux-995-CX24120-13Z_frontend.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-999-i915-use-legacy-turbo.patch → packages/linux/patches/4.1.12/linux-999-i915-use-legacy-turbo.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch → packages/linux/patches/4.1.12/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch → packages/linux/patches/4.1.12/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch vendored
View File

0
packages/linux/patches/4.1.11/linux-999.20-mt7601u-support.patch → packages/linux/patches/4.1.12/linux-999.20-mt7601u-support.patch vendored
View File

11
packages/mediacenter/kodi/patches/kodi-999.37-KEY_MAIL.patch Normal file
View File

@ -0,0 +1,11 @@
diff -Naur kodi-15.2-02e7013/xbmc/input/linux/LinuxInputDevices.cpp kodi-15.2-02e7013.patch/xbmc/input/linux/LinuxInputDevices.cpp
--- kodi-15.2-02e7013/xbmc/input/linux/LinuxInputDevices.cpp 2015-10-29 15:52:52.297267009 +0100
+++ kodi-15.2-02e7013.patch/xbmc/input/linux/LinuxInputDevices.cpp 2015-10-29 15:56:57.543790220 +0100
@@ -261,6 +261,7 @@
{ KEY_YELLOW , XBMCK_YELLOW },
{ KEY_BLUE , XBMCK_BLUE },
{ KEY_HOMEPAGE , XBMCK_HOMEPAGE },
+ { KEY_MAIL , XBMCK_LAUNCH_MAIL },
// The Little Black Box Remote Additions
{ 384 , XBMCK_LEFT }, // Red
{ 378 , XBMCK_RIGHT }, // Green

11
packages/mediacenter/kodi/patches/kodi-999.38-KEY_SEARCH.patch Normal file
View File

@ -0,0 +1,11 @@
diff -Naur kodi-15.2-02e7013/xbmc/input/linux/LinuxInputDevices.cpp kodi-15.2-02e7013.patch/xbmc/input/linux/LinuxInputDevices.cpp
--- kodi-15.2-02e7013/xbmc/input/linux/LinuxInputDevices.cpp 2015-10-29 16:04:09.614715465 +0100
+++ kodi-15.2-02e7013.patch/xbmc/input/linux/LinuxInputDevices.cpp 2015-10-29 16:11:31.666651957 +0100
@@ -262,6 +262,7 @@
{ KEY_BLUE , XBMCK_BLUE },
{ KEY_HOMEPAGE , XBMCK_HOMEPAGE },
{ KEY_MAIL , XBMCK_LAUNCH_MAIL },
+ { KEY_SEARCH , XBMCK_BROWSER_SEARCH},
// The Little Black Box Remote Additions
{ 384 , XBMCK_LEFT }, // Red
{ 378 , XBMCK_RIGHT }, // Green

11
packages/mediacenter/kodi/patches/kodi-999.39-KEY_FILE.patch Normal file
View File

@ -0,0 +1,11 @@
diff -Naur kodi-15.2-02e7013/xbmc/input/linux/LinuxInputDevices.cpp kodi-15.2-02e7013.patch/xbmc/input/linux/LinuxInputDevices.cpp
--- kodi-15.2-02e7013/xbmc/input/linux/LinuxInputDevices.cpp 2015-10-29 16:12:09.309732925 +0100
+++ kodi-15.2-02e7013.patch/xbmc/input/linux/LinuxInputDevices.cpp 2015-10-29 16:13:25.219883774 +0100
@@ -263,6 +263,7 @@
{ KEY_HOMEPAGE , XBMCK_HOMEPAGE },
{ KEY_MAIL , XBMCK_LAUNCH_MAIL },
{ KEY_SEARCH , XBMCK_BROWSER_SEARCH},
+ { KEY_FILE , XBMCK_LAUNCH_FILE_BROWSER},
// The Little Black Box Remote Additions
{ 384 , XBMCK_LEFT }, // Red
{ 378 , XBMCK_RIGHT }, // Green

11
packages/mediacenter/kodi/patches/kodi-999.40-KEY_SELECT.patch Normal file
View File

@ -0,0 +1,11 @@
diff -Naur kodi-15.2-02e7013/xbmc/input/linux/LinuxInputDevices.cpp kodi-15.2-02e7013.patch/xbmc/input/linux/LinuxInputDevices.cpp
--- kodi-15.2-02e7013/xbmc/input/linux/LinuxInputDevices.cpp 2015-10-29 17:41:15.031724794 +0100
+++ kodi-15.2-02e7013.patch/xbmc/input/linux/LinuxInputDevices.cpp 2015-10-29 17:43:27.420981312 +0100
@@ -264,6 +264,7 @@
{ KEY_MAIL , XBMCK_LAUNCH_MAIL },
{ KEY_SEARCH , XBMCK_BROWSER_SEARCH},
{ KEY_FILE , XBMCK_LAUNCH_FILE_BROWSER},
+ { KEY_SELECT , XBMCK_RETURN },
// The Little Black Box Remote Additions
{ 384 , XBMCK_LEFT }, // Red
{ 378 , XBMCK_RIGHT }, // Green

2
packages/network/libnl/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="libnl"
PKG_VERSION="3.2.26"
PKG_VERSION="3.2.27"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"

4
packages/x11/driver/xf86-input-evdev/package.mk
View File

@ -17,13 +17,13 @@
################################################################################
PKG_NAME="xf86-input-evdev"
PKG_VERSION="2.9.1"
PKG_VERSION="2.10.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.X.org"
PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS_TARGET="toolchain util-macros inputproto libevdev systemd"
PKG_DEPENDS_TARGET="toolchain util-macros inputproto libevdev mtdev systemd"
PKG_PRIORITY="optional"
PKG_SECTION="x11/driver"
PKG_SHORTDESC="xf86-input-evdev: Generic Xorg Linux input driver"

2
packages/x11/driver/xf86-input-libinput/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="xf86-input-libinput"
PKG_VERSION="0.14.0"
PKG_VERSION="0.15.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

2
packages/x11/xserver/xorg-server/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="xorg-server"
PKG_VERSION="1.17.2"
PKG_VERSION="1.17.4"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"