diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 627a105532..1088ca6c8b 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -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 diff --git a/packages/linux/patches/4.1.11/linux-999.10-inet-fix-race-in-reqsk_queue_unlink.patch b/packages/linux/patches/4.1.11/linux-999.10-inet-fix-race-in-reqsk_queue_unlink.patch deleted file mode 100644 index c5c766990d..0000000000 --- a/packages/linux/patches/4.1.11/linux-999.10-inet-fix-race-in-reqsk_queue_unlink.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 8f6a05588928ef61e751ca3cb008b9847fb6b83d Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -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 -Cc: Yuchung Cheng ---- - 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 - diff --git a/packages/linux/patches/4.1.11/linux-003-no_dev_console.patch b/packages/linux/patches/4.1.12/linux-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-003-no_dev_console.patch rename to packages/linux/patches/4.1.12/linux-003-no_dev_console.patch diff --git a/packages/linux/patches/4.1.11/linux-051-ouya_controller_support.patch b/packages/linux/patches/4.1.12/linux-051-ouya_controller_support.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-051-ouya_controller_support.patch rename to packages/linux/patches/4.1.12/linux-051-ouya_controller_support.patch diff --git a/packages/linux/patches/4.1.11/linux-052-XBOX_remote_support.patch b/packages/linux/patches/4.1.12/linux-052-XBOX_remote_support.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-052-XBOX_remote_support.patch rename to packages/linux/patches/4.1.12/linux-052-XBOX_remote_support.patch diff --git a/packages/linux/patches/4.1.11/linux-053-spinelplus-remote-0.2.patch b/packages/linux/patches/4.1.12/linux-053-spinelplus-remote-0.2.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-053-spinelplus-remote-0.2.patch rename to packages/linux/patches/4.1.12/linux-053-spinelplus-remote-0.2.patch diff --git a/packages/linux/patches/4.1.11/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch b/packages/linux/patches/4.1.12/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch rename to packages/linux/patches/4.1.12/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch diff --git a/packages/linux/patches/4.1.11/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch b/packages/linux/patches/4.1.12/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch rename to packages/linux/patches/4.1.12/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/4.1.11/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch b/packages/linux/patches/4.1.12/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch rename to packages/linux/patches/4.1.12/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch diff --git a/packages/linux/patches/4.1.11/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch b/packages/linux/patches/4.1.12/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch rename to packages/linux/patches/4.1.12/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch diff --git a/packages/linux/patches/4.1.11/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch b/packages/linux/patches/4.1.12/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch rename to packages/linux/patches/4.1.12/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch diff --git a/packages/linux/patches/4.1.11/linux-062-imon_pad_ignore_diagonal.patch b/packages/linux/patches/4.1.12/linux-062-imon_pad_ignore_diagonal.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-062-imon_pad_ignore_diagonal.patch rename to packages/linux/patches/4.1.12/linux-062-imon_pad_ignore_diagonal.patch diff --git a/packages/linux/patches/4.1.11/linux-063-xpad-fix_xbox360_wireless.patch b/packages/linux/patches/4.1.12/linux-063-xpad-fix_xbox360_wireless.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-063-xpad-fix_xbox360_wireless.patch rename to packages/linux/patches/4.1.12/linux-063-xpad-fix_xbox360_wireless.patch diff --git a/packages/linux/patches/4.1.11/linux-200-rtl28xxu-fix-control-message-flaws.patch b/packages/linux/patches/4.1.12/linux-200-rtl28xxu-fix-control-message-flaws.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-200-rtl28xxu-fix-control-message-flaws.patch rename to packages/linux/patches/4.1.12/linux-200-rtl28xxu-fix-control-message-flaws.patch diff --git a/packages/linux/patches/4.1.11/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/4.1.12/linux-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/4.1.12/linux-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/4.1.11/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/4.1.12/linux-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/4.1.12/linux-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/4.1.11/linux-221-ngene-octopus.patch b/packages/linux/patches/4.1.12/linux-221-ngene-octopus.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-221-ngene-octopus.patch rename to packages/linux/patches/4.1.12/linux-221-ngene-octopus.patch diff --git a/packages/linux/patches/4.1.11/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/4.1.12/linux-222-stb0899_signal_quality.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-222-stb0899_signal_quality.patch rename to packages/linux/patches/4.1.12/linux-222-stb0899_signal_quality.patch diff --git a/packages/linux/patches/4.1.11/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch b/packages/linux/patches/4.1.12/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch rename to packages/linux/patches/4.1.12/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch diff --git a/packages/linux/patches/4.1.11/linux-224-STK1160-addFramescaling.patch b/packages/linux/patches/4.1.12/linux-224-STK1160-addFramescaling.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-224-STK1160-addFramescaling.patch rename to packages/linux/patches/4.1.12/linux-224-STK1160-addFramescaling.patch diff --git a/packages/linux/patches/4.1.11/linux-227-ds3000-invalid-symbol-rate.patch b/packages/linux/patches/4.1.12/linux-227-ds3000-invalid-symbol-rate.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-227-ds3000-invalid-symbol-rate.patch rename to packages/linux/patches/4.1.12/linux-227-ds3000-invalid-symbol-rate.patch diff --git a/packages/linux/patches/4.1.11/linux-228-fix-tt-s2-4600.patch b/packages/linux/patches/4.1.12/linux-228-fix-tt-s2-4600.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-228-fix-tt-s2-4600.patch rename to packages/linux/patches/4.1.12/linux-228-fix-tt-s2-4600.patch diff --git a/packages/linux/patches/4.1.11/linux-229-hauppauge-hvr-2205-and-2255.patch b/packages/linux/patches/4.1.12/linux-229-hauppauge-hvr-2205-and-2255.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-229-hauppauge-hvr-2205-and-2255.patch rename to packages/linux/patches/4.1.12/linux-229-hauppauge-hvr-2205-and-2255.patch diff --git a/packages/linux/patches/4.1.11/linux-230-elgato-eyetv-sat-v3.patch b/packages/linux/patches/4.1.12/linux-230-elgato-eyetv-sat-v3.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-230-elgato-eyetv-sat-v3.patch rename to packages/linux/patches/4.1.12/linux-230-elgato-eyetv-sat-v3.patch diff --git a/packages/linux/patches/4.1.11/linux-706-Sitecom-N300.patch b/packages/linux/patches/4.1.12/linux-706-Sitecom-N300.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-706-Sitecom-N300.patch rename to packages/linux/patches/4.1.12/linux-706-Sitecom-N300.patch diff --git a/packages/linux/patches/4.1.11/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/4.1.12/linux-950-saa716x_PCIe_interface_chipset.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-950-saa716x_PCIe_interface_chipset.patch rename to packages/linux/patches/4.1.12/linux-950-saa716x_PCIe_interface_chipset.patch diff --git a/packages/linux/patches/4.1.11/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch b/packages/linux/patches/4.1.12/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch rename to packages/linux/patches/4.1.12/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch diff --git a/packages/linux/patches/4.1.11/linux-995-CX24120-13Z_frontend.patch b/packages/linux/patches/4.1.12/linux-995-CX24120-13Z_frontend.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-995-CX24120-13Z_frontend.patch rename to packages/linux/patches/4.1.12/linux-995-CX24120-13Z_frontend.patch diff --git a/packages/linux/patches/4.1.11/linux-999-i915-use-legacy-turbo.patch b/packages/linux/patches/4.1.12/linux-999-i915-use-legacy-turbo.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-999-i915-use-legacy-turbo.patch rename to packages/linux/patches/4.1.12/linux-999-i915-use-legacy-turbo.patch diff --git a/packages/linux/patches/4.1.11/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch b/packages/linux/patches/4.1.12/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch rename to packages/linux/patches/4.1.12/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch diff --git a/packages/linux/patches/4.1.11/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch b/packages/linux/patches/4.1.12/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch rename to packages/linux/patches/4.1.12/linux-999.05-eMMC-Don-t-initialize-partitions-on-RPMB-flagged-are.patch diff --git a/packages/linux/patches/4.1.11/linux-999.20-mt7601u-support.patch b/packages/linux/patches/4.1.12/linux-999.20-mt7601u-support.patch similarity index 100% rename from packages/linux/patches/4.1.11/linux-999.20-mt7601u-support.patch rename to packages/linux/patches/4.1.12/linux-999.20-mt7601u-support.patch diff --git a/packages/mediacenter/kodi/patches/kodi-999.37-KEY_MAIL.patch b/packages/mediacenter/kodi/patches/kodi-999.37-KEY_MAIL.patch new file mode 100644 index 0000000000..c85c50aa1b --- /dev/null +++ b/packages/mediacenter/kodi/patches/kodi-999.37-KEY_MAIL.patch @@ -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 diff --git a/packages/mediacenter/kodi/patches/kodi-999.38-KEY_SEARCH.patch b/packages/mediacenter/kodi/patches/kodi-999.38-KEY_SEARCH.patch new file mode 100644 index 0000000000..7f300cb588 --- /dev/null +++ b/packages/mediacenter/kodi/patches/kodi-999.38-KEY_SEARCH.patch @@ -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 diff --git a/packages/mediacenter/kodi/patches/kodi-999.39-KEY_FILE.patch b/packages/mediacenter/kodi/patches/kodi-999.39-KEY_FILE.patch new file mode 100644 index 0000000000..e3e1ccfd00 --- /dev/null +++ b/packages/mediacenter/kodi/patches/kodi-999.39-KEY_FILE.patch @@ -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 diff --git a/packages/mediacenter/kodi/patches/kodi-999.40-KEY_SELECT.patch b/packages/mediacenter/kodi/patches/kodi-999.40-KEY_SELECT.patch new file mode 100644 index 0000000000..bd16336c8d --- /dev/null +++ b/packages/mediacenter/kodi/patches/kodi-999.40-KEY_SELECT.patch @@ -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 diff --git a/packages/network/libnl/package.mk b/packages/network/libnl/package.mk index cddeb5d366..287ca26732 100644 --- a/packages/network/libnl/package.mk +++ b/packages/network/libnl/package.mk @@ -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" diff --git a/packages/x11/driver/xf86-input-evdev/package.mk b/packages/x11/driver/xf86-input-evdev/package.mk index e41659039c..56e2e6596e 100644 --- a/packages/x11/driver/xf86-input-evdev/package.mk +++ b/packages/x11/driver/xf86-input-evdev/package.mk @@ -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" diff --git a/packages/x11/driver/xf86-input-libinput/package.mk b/packages/x11/driver/xf86-input-libinput/package.mk index a388f7a5da..ff0e48887b 100644 --- a/packages/x11/driver/xf86-input-libinput/package.mk +++ b/packages/x11/driver/xf86-input-libinput/package.mk @@ -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" diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk index efb2d1ad1c..c710d68c84 100644 --- a/packages/x11/xserver/xorg-server/package.mk +++ b/packages/x11/xserver/xorg-server/package.mk @@ -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"