From 6688769a54e41b1fdc7fdde6133f9b8e8da82b9f Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 12 Jun 2019 19:07:26 +0100 Subject: [PATCH 01/11] Mako: update to Mako-1.0.12 --- packages/python/devel/Mako/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/python/devel/Mako/package.mk b/packages/python/devel/Mako/package.mk index c829adeeee..e103ea5caa 100644 --- a/packages/python/devel/Mako/package.mk +++ b/packages/python/devel/Mako/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="Mako" -PKG_VERSION="1.0.10" -PKG_SHA256="7165919e78e1feb68b4dbe829871ea9941398178fa58e6beedb9ba14acf63965" +PKG_VERSION="1.0.12" +PKG_SHA256="0cfa65de3a835e87eeca6ac856b3013aade55f49e32515f65d999f91a2324162" PKG_LICENSE="GPL" PKG_SITE="https://pypi.org/project/Mako" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" From 4c2cd23c742d28e5f0953f6131fa8a58dde6b560 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 12 Jun 2019 19:07:55 +0100 Subject: [PATCH 02/11] e2fsprogs: update to e2fsprogs-1.45.2 --- packages/sysutils/e2fsprogs/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk index b29564be7c..ee226c7d8c 100644 --- a/packages/sysutils/e2fsprogs/package.mk +++ b/packages/sysutils/e2fsprogs/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="e2fsprogs" -PKG_VERSION="1.45.1" -PKG_SHA256="24acedbe376a9c1b5c0a0b15c9fb84b3bef4943d669caf40b2e3e41e86d95548" +PKG_VERSION="1.45.2" +PKG_SHA256="4952c9ae91e36d762e13cc5b9e8f7eeb5453e4aee4cd9b7402e73f2d4e65e009" PKG_LICENSE="GPL" PKG_SITE="http://e2fsprogs.sourceforge.net/" PKG_URL="https://www.kernel.org/pub/linux/kernel/people/tytso/$PKG_NAME/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" From 6899f3dd8ea4a8f725f7c1ec6779c45f497a390d Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 12 Jun 2019 19:08:30 +0100 Subject: [PATCH 03/11] libevdev: update to libevdev-1.7.0 --- packages/sysutils/libevdev/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/libevdev/package.mk b/packages/sysutils/libevdev/package.mk index c90e030f05..34a56e673f 100644 --- a/packages/sysutils/libevdev/package.mk +++ b/packages/sysutils/libevdev/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libevdev" -PKG_VERSION="1.6.0" -PKG_SHA256="f5005c865987d980cc1279b9ec6131b06a89fd9892f649f2a68262b8786ef814" +PKG_VERSION="1.7.0" +PKG_SHA256="11dbe1f2b1d03a51f3e9a196757a75c3a999042ce34cf1fdc00a2363e5a2e369" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/libevdev/" PKG_URL="http://www.freedesktop.org/software/libevdev/$PKG_NAME-$PKG_VERSION.tar.xz" From 450eca49ede7982d49ffd82c4e15b067a3446673 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 12 Jun 2019 19:09:15 +0100 Subject: [PATCH 04/11] libmicrohttpd: update to libmicrohttpd-0.9.64 --- packages/web/libmicrohttpd/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web/libmicrohttpd/package.mk b/packages/web/libmicrohttpd/package.mk index 8144bc2934..b75d299dfe 100644 --- a/packages/web/libmicrohttpd/package.mk +++ b/packages/web/libmicrohttpd/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libmicrohttpd" -PKG_VERSION="0.9.63" -PKG_SHA256="37c36f1be177f0e37ef181a645cd3baac1000bd322a01c2eff70f3cc8c91749c" +PKG_VERSION="0.9.64" +PKG_SHA256="e792d8ed5990823a0baadea0adf94365999e702f6f1314ef9c555018dafc350e" PKG_LICENSE="LGPLv2.1" PKG_SITE="http://www.gnu.org/software/libmicrohttpd/" PKG_URL="http://ftpmirror.gnu.org/libmicrohttpd/$PKG_NAME-$PKG_VERSION.tar.gz" From b280ec3bb457de88c47d5d84bed0c6aeae1a0a56 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 12 Jun 2019 19:10:08 +0100 Subject: [PATCH 05/11] mariadb-connector-c: update to mariadb-connector-c-3.1.1 --- packages/databases/mariadb-connector-c/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/databases/mariadb-connector-c/package.mk b/packages/databases/mariadb-connector-c/package.mk index f191780f68..2f0c31bd3a 100644 --- a/packages/databases/mariadb-connector-c/package.mk +++ b/packages/databases/mariadb-connector-c/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mariadb-connector-c" -PKG_VERSION="3.1.0" -PKG_SHA256="feb82b124fd492264a07ca9618bf68d65487ec4a39c8375015f6b0f58c0ab17c" +PKG_VERSION="3.1.1" +PKG_SHA256="63a0ecfa3c87ba0361aef3b2c849abe280f7371030e84f41ce0dc4466db85637" PKG_LICENSE="LGPL" PKG_SITE="https://mariadb.org/" PKG_URL="https://github.com/MariaDB/mariadb-connector-c/archive/v$PKG_VERSION.tar.gz" From 2cea126511a369955c182f2f3bc544e2db78733f Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 12 Jun 2019 19:10:45 +0100 Subject: [PATCH 06/11] nghttp2: update to nghttp2-1.39.1 --- packages/web/nghttp2/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web/nghttp2/package.mk b/packages/web/nghttp2/package.mk index e0f68b9a65..0ff720eb1c 100644 --- a/packages/web/nghttp2/package.mk +++ b/packages/web/nghttp2/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nghttp2" -PKG_VERSION="1.38.0" -PKG_SHA256="ef75c761858241c6b4372fa6397aa0481a984b84b7b07c4ec7dc2d7b9eee87f8" +PKG_VERSION="1.39.1" +PKG_SHA256="679160766401f474731fd60c3aca095f88451e3cc4709b72306e4c34cf981448" PKG_LICENSE="MIT" PKG_SITE="http://www.linuxfromscratch.org/blfs/view/cvs/basicnet/nghttp2.html" PKG_URL="https://github.com/nghttp2/nghttp2/releases/download/v$PKG_VERSION/nghttp2-$PKG_VERSION.tar.xz" From a4c72d752c8fde6901f32b71c1e58b748c277f9a Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 12 Jun 2019 19:11:11 +0100 Subject: [PATCH 07/11] pycryptodome: update to pycryptodome-3.8.2 --- packages/python/security/pycryptodome/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/python/security/pycryptodome/package.mk b/packages/python/security/pycryptodome/package.mk index a191c3f932..77630980df 100644 --- a/packages/python/security/pycryptodome/package.mk +++ b/packages/python/security/pycryptodome/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pycryptodome" -PKG_VERSION="3.8.1" -PKG_SHA256="68ad0ce4a374577a26bb7f458575abe3c2a342818b5280de6e5738870b7761b3" +PKG_VERSION="3.8.2" +PKG_SHA256="5bc40f8aa7ba8ca7f833ad2477b9d84e1bfd2630b22a46d9bbd221982f8c3ac0" PKG_LICENSE="BSD" PKG_SITE="https://pypi.org/project/pycryptodome" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" From a109984ffe8561306154e1038a3d6d0a82f24a9a Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 12 Jun 2019 19:12:02 +0100 Subject: [PATCH 08/11] xkeyboard-config: update to xkeyboard-config-2.27 --- packages/x11/data/xkeyboard-config/package.mk | 11 +-- .../xkeyboard-config-0001-pt-layout.patch | 85 ------------------- ...its-depending-on-unreleased-packages.patch | 20 ++--- ...config-0003-drop-unsupported-keycode.patch | 45 ++++++++++ 4 files changed, 57 insertions(+), 104 deletions(-) delete mode 100644 packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-pt-layout.patch create mode 100644 packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch diff --git a/packages/x11/data/xkeyboard-config/package.mk b/packages/x11/data/xkeyboard-config/package.mk index 92ebd3dce1..da05e2ffb9 100644 --- a/packages/x11/data/xkeyboard-config/package.mk +++ b/packages/x11/data/xkeyboard-config/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="xkeyboard-config" -PKG_VERSION="2.26" -PKG_SHA256="393718c7460cd06c4e8cb819d943ca54812ea476f32714c4d8975c77031a038e" +PKG_VERSION="2.27" +PKG_SHA256="690daec8fea63526c07620c90e6f3f10aae34e94b6db6e30906173480721901f" PKG_LICENSE="MIT" PKG_SITE="http://www.X.org" PKG_URL="http://www.x.org/releases/individual/data/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2" @@ -32,10 +32,3 @@ pre_configure_target() { --with-xkb-rules-symlink=xorg" fi } - -pre_build_target() { -# broken autoreconf - ( cd ${PKG_BUILD} - intltoolize --force - ) -} diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-pt-layout.patch b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-pt-layout.patch deleted file mode 100644 index 19c1d0603d..0000000000 --- a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-pt-layout.patch +++ /dev/null @@ -1,85 +0,0 @@ -From af6c0f29dbee1cc7b280eed891592797c2e31220 Mon Sep 17 00:00:00 2001 -From: Sergey Udaltsov -Date: Thu, 7 Feb 2019 20:40:35 +0000 -Subject: [PATCH] Fixed broken pt layout - -Backticks broke it, removed ---- - symbols/pt | 62 +++++++++++++++++++++++++++--------------------------- - 1 file changed, 31 insertions(+), 31 deletions(-) - -diff --git a/symbols/pt b/symbols/pt -index 73a1b7b..3ec0981 100644 ---- a/symbols/pt -+++ b/symbols/pt -@@ -221,35 +221,35 @@ xkb_symbols "colemak" { - - name[Group1]="Portuguese (Colemak)"; - -- key `` { [ q, Q, at, Greek_OMEGA ] }; -- key `` { [ w, W, lstroke, Lstroke ] }; -- key `` { [ f, F, dstroke, ordfeminine ] }; -- key `` { [ p, P, thorn, THORN ] }; -- key `` { [ g, G, eng, ENG ] }; -- key `` { [ j, J, dead_hook, dead_horn ] }; -- key `` { [ l, L, lstroke, Lstroke ] }; -- key `` { [ u, U, downarrow, uparrow ] }; -- key `` { [ y, Y, leftarrow, yen ] }; -- key `` { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] }; -- -- key `` { [ a, A, ae, AE ] }; -- key `` { [ r, R, paragraph, registered ] }; -- key `` { [ s, S, ssharp, section ] }; -- key `` { [ t, T, tslash, Tslash ] }; -- key `` { [ d, D, eth, ETH ] }; -- key `` { [ h, H, hstroke, Hstroke ] }; -- key `` { [ n, N, n, N ] }; -- key `` { [ e, E, EuroSign, cent ] }; -- key `` { [ i, I, rightarrow, idotless ] }; -- key `` { [ o, O, oslash, Ooblique ] }; -- -- key `` { [ z, Z, guillemotleft, less ] }; -- key `` { [ x, X, guillemotright, greater ] }; -- key `` { [ c, C, cent, copyright ] }; -- key `` { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; -- key `` { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; -- key `` { [ k, K, kra, ampersand ] }; -- key `` { [ m, M, mu, masculine ] }; -- -- key `` { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; -+ key { [ q, Q, at, Greek_OMEGA ] }; -+ key { [ w, W, lstroke, Lstroke ] }; -+ key { [ f, F, dstroke, ordfeminine ] }; -+ key { [ p, P, thorn, THORN ] }; -+ key { [ g, G, eng, ENG ] }; -+ key { [ j, J, dead_hook, dead_horn ] }; -+ key { [ l, L, lstroke, Lstroke ] }; -+ key { [ u, U, downarrow, uparrow ] }; -+ key { [ y, Y, leftarrow, yen ] }; -+ key { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] }; -+ -+ key { [ a, A, ae, AE ] }; -+ key { [ r, R, paragraph, registered ] }; -+ key { [ s, S, ssharp, section ] }; -+ key { [ t, T, tslash, Tslash ] }; -+ key { [ d, D, eth, ETH ] }; -+ key { [ h, H, hstroke, Hstroke ] }; -+ key { [ n, N, n, N ] }; -+ key { [ e, E, EuroSign, cent ] }; -+ key { [ i, I, rightarrow, idotless ] }; -+ key { [ o, O, oslash, Ooblique ] }; -+ -+ key { [ z, Z, guillemotleft, less ] }; -+ key { [ x, X, guillemotright, greater ] }; -+ key { [ c, C, cent, copyright ] }; -+ key { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; -+ key { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; -+ key { [ k, K, kra, ampersand ] }; -+ key { [ m, M, mu, masculine ] }; -+ -+ key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; - }; --- -2.18.1 - - diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch index 72add37985..7cbb8fc69c 100644 --- a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch +++ b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch @@ -57,10 +57,10 @@ index 90b8278d..f2630ffe 100644 = 255; // #define KEY_RFKILL 247 = 372; // #define KEY_FAVORITES 364 -- = 374; // #define KEY_KEYBOARD 366 +- = 382; // #define KEY_KEYBOARD 374 + = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561 // Fake keycodes for virtual keys - = 92; diff --git a/symbols/inet b/symbols/inet index 4d774fac..469a7d65 100644 --- a/symbols/inet @@ -69,10 +69,10 @@ index 4d774fac..469a7d65 100644 key { [ XF86RFKill ] }; // KEY_RFKILL key { [ XF86Favorites ] }; -- key { [ XF86Keyboard ] }; +- key { [ XF86Keyboard ] }; + key { [ XF86RotationLockToggle ] }; key { [ XF86Tools ] }; - key { [ XF86Launch5 ] }; commit 3dd87655fd92a375ada3fc6d8cfe90d431baecaa Author: Andreas Boll Date: Mon Feb 11 14:55:34 2019 +0100 @@ -97,25 +97,25 @@ diff --git a/keycodes/evdev b/keycodes/evdev index f2630ffe..51a6e26d 100644 --- a/keycodes/evdev +++ b/keycodes/evdev -@@ -284,8 +284,6 @@ default xkb_keycodes "evdev" { +@@ -284,8 +284,7 @@ default xkb_keycodes "evdev" { = 254; // #define KEY_WWAN 246 = 255; // #define KEY_RFKILL 247 - = 372; // #define KEY_FAVORITES 364 -- + = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561 + // Fake keycodes for virtual keys = 92; - = 203; diff --git a/symbols/inet b/symbols/inet index 469a7d65..ef0635a7 100644 --- a/symbols/inet +++ b/symbols/inet -@@ -218,8 +218,6 @@ xkb_symbols "evdev" { +@@ -218,8 +218,7 @@ xkb_symbols "evdev" { key { [ XF86WWAN ] }; // KEY_WWAN key { [ XF86RFKill ] }; // KEY_RFKILL - key { [ XF86Favorites ] }; -- + key { [ XF86RotationLockToggle ] }; + key { [ XF86Tools ] }; key { [ XF86Launch5 ] }; - key { [ XF86Launch6 ] }; diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch new file mode 100644 index 0000000000..3815c0bf78 --- /dev/null +++ b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch @@ -0,0 +1,45 @@ +From 86c0e56796658a8a3ba1246252e88a997f48a359 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Fri, 14 Jun 2019 01:00:37 +0100 +Subject: [PATCH] drop unsupported keycodes + +Jun 14 00:55:54 NUC xorg-launch[722]: The XKEYBOARD keymap compiler (xkbcomp) reports: +Jun 14 00:55:54 NUC xorg-launch[722]: > Warning: Unsupported high keycode 569 for name ignored +Jun 14 00:55:54 NUC xorg-launch[722]: > X11 cannot support keycodes above 255. +Jun 14 00:55:54 NUC xorg-launch[722]: > This warning only shows for the first high keycode. +Jun 14 00:55:54 NUC xorg-launch[722]: > Internal error: Could not resolve keysym XF86RotationLockToggle +Jun 14 00:55:54 NUC xorg-launch[722]: Errors from xkbcomp are not fatal to the X server +--- + keycodes/evdev | 2 -- + symbols/inet | 2 -- + 2 files changed, 4 deletions(-) + +diff --git a/keycodes/evdev b/keycodes/evdev +index bac7e36..51a6e26 100644 +--- a/keycodes/evdev ++++ b/keycodes/evdev +@@ -284,8 +284,6 @@ default xkb_keycodes "evdev" { + = 254; // #define KEY_WWAN 246 + = 255; // #define KEY_RFKILL 247 + +- = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561 +- + // Fake keycodes for virtual keys + = 92; + = 203; +diff --git a/symbols/inet b/symbols/inet +index 1229617..39cf9dc 100644 +--- a/symbols/inet ++++ b/symbols/inet +@@ -218,8 +218,6 @@ xkb_symbols "evdev" { + key { [ XF86WWAN ] }; // KEY_WWAN + key { [ XF86RFKill ] }; // KEY_RFKILL + +- key { [ XF86RotationLockToggle ] }; +- + key { [ XF86Tools ] }; + key { [ XF86Launch5 ] }; + key { [ XF86Launch6 ] }; +-- +2.14.1 + From e6107599a7e40b38eea1cbea5f54e9a924663a64 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 12 Jun 2019 22:25:54 +0100 Subject: [PATCH 09/11] nss-mdns: update to nss-mdns-0.14.1 --- packages/network/nss-mdns/package.mk | 7 +- .../patches/nss-mdns-fix-out-of-bounds.patch | 70 ------------------- 2 files changed, 4 insertions(+), 73 deletions(-) delete mode 100644 packages/network/nss-mdns/patches/nss-mdns-fix-out-of-bounds.patch diff --git a/packages/network/nss-mdns/package.mk b/packages/network/nss-mdns/package.mk index 3a0b782778..53aa3b3f74 100644 --- a/packages/network/nss-mdns/package.mk +++ b/packages/network/nss-mdns/package.mk @@ -1,12 +1,13 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nss-mdns" -PKG_VERSION="47edc38" -PKG_SHA256="f02e8baeceea30e82a2ecdaa8cafdbcabfdaa33a766f6942e7dc8aa81948f7b6" +PKG_VERSION="0.14.1" +PKG_SHA256="4fe54bffd20e410fc41382dc6c4708cdfa3a65f50c3753f262dc4c78fd864a6e" PKG_LICENSE="GPL" PKG_SITE="https://github.com/lathiat/nss-mdns" -PKG_URL="https://github.com/lathiat/nss-mdns/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/lathiat/nss-mdns/archive/v$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain avahi" PKG_LONGDESC="A plugin for nss to allow name resolution via Multicast DNS." PKG_TOOLCHAIN="autotools" diff --git a/packages/network/nss-mdns/patches/nss-mdns-fix-out-of-bounds.patch b/packages/network/nss-mdns/patches/nss-mdns-fix-out-of-bounds.patch deleted file mode 100644 index a7fe5edb79..0000000000 --- a/packages/network/nss-mdns/patches/nss-mdns-fix-out-of-bounds.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 29fdeb2387e3a9cd49d5b1aa09ca23cdea60b91a Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Tue, 15 Aug 2017 09:45:29 +0100 -Subject: [PATCH] src/nss.c: fix out-of-bounds memset() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -out-of-bounds access happens at memset() call site: - - @@ -272,9 +272,9 @@ enum nss_status _nss_mdns_gethostbyname4_r( - // Copy address - memcpy(&(tuple->addr), &(u.data.result[i].address), address_length); - if(address_length < sizeof(ipv6_address_t)) { - memset((&(tuple->addr) + address_length - sizeof(ipv6_address_t)), 0, - (sizeof(ipv6_address_t) - address_length) - ); - } - -The problem here is in 'addr' type: - struct gaih_addrtuple { - ... - uint32_t addr[4]; - ... - }; - -It means pointer addressing is not byte-based as offsets imply and memset() -wipes 12 bytes in hearby memory (of stack in glibc case). - -valgrind detects the overflow as: - - ==12732== Invalid write of size 1 - ==12732== at 0x4C11A29: memset (vg_replace_strmem.c:1239) - ==12732== by 0x57FA348: _nss_mdns_minimal_gethostbyname4_r (nss.c:292) - ==12732== by 0x4F016D8: gaih_inet.constprop.7 (getaddrinfo.c:806) - ==12732== by 0x4F02673: getaddrinfo (getaddrinfo.c:2317) - ==12732== by 0x4800B3B: main (a.c:34) - -The effect is SIGSEGV-ing getaddrinfo() call on systems with -the following nsswitch.conf: - - hosts: files mdns_minimal [NOTFOUND=return] dns - -The fix is to simplify memset()/memcpy() sequence. - -Reported-by: Michał Górny -Bug: https://bugs.gentoo.org/627770 -Signed-off-by: Sergei Trofimovich ---- - src/nss.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/src/nss.c b/src/nss.c -index ebb887c..1f50bad 100644 ---- a/src/nss.c -+++ b/src/nss.c -@@ -271,12 +271,8 @@ enum nss_status _nss_mdns_gethostbyname4_r( - tuple->family = u.data.result[i].af; - - // Copy address -+ memset(&(tuple->addr), 0, sizeof(ipv6_address_t)); - memcpy(&(tuple->addr), &(u.data.result[i].address), address_length); -- if(address_length < sizeof(ipv6_address_t)) { -- memset((&(tuple->addr) + address_length - sizeof(ipv6_address_t)), 0, -- (sizeof(ipv6_address_t) - address_length) -- ); -- } - - // Assign interface scope id - tuple->scopeid = u.data.result[i].scopeid; From ea16f6fb69c5ab80e79d8f30bab77a310b5cad8d Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 12 Jun 2019 22:27:55 +0100 Subject: [PATCH 10/11] nss: update to nss-3.44 --- packages/security/nss/package.mk | 7 ++++--- .../patches/nss-06-always-include-fstar.patch | 19 +++++++------------ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/packages/security/nss/package.mk b/packages/security/nss/package.mk index 540ccf7e9a..8b3fd439b1 100644 --- a/packages/security/nss/package.mk +++ b/packages/security/nss/package.mk @@ -1,12 +1,13 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nss" -PKG_VERSION="3.37.1" -PKG_SHA256="5ac4a388b06b2785fb7f4f0ae3c909d8cbb2ab370147ff61fe2517cc5bf3c685" +PKG_VERSION="3.44" +PKG_SHA256="298d86e18e96660d3c98476274b5857b48c135d809a10d6528d8661bdf834a49" PKG_LICENSE="Mozilla Public License" PKG_SITE="http://ftp.mozilla.org/" -PKG_URL="http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_37_1_RTM/src/nss-3.37.1-with-nspr-4.19.tar.gz" +PKG_URL="http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_44_RTM/src/nss-3.44-with-nspr-4.21.tar.gz" PKG_DEPENDS_HOST="nspr:host zlib:host" PKG_DEPENDS_TARGET="toolchain nss:host nspr zlib sqlite" PKG_LONGDESC="The Network Security Services (NSS) package is a set of libraries designed to support cross-platform development of security-enabled client and server applications" diff --git a/packages/security/nss/patches/nss-06-always-include-fstar.patch b/packages/security/nss/patches/nss-06-always-include-fstar.patch index 3490e6f3f8..60c0766dc6 100644 --- a/packages/security/nss/patches/nss-06-always-include-fstar.patch +++ b/packages/security/nss/patches/nss-06-always-include-fstar.patch @@ -1,20 +1,15 @@ diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index e6a94d35c..0c714c85c 100644 +index bff11c7..0c714c8 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile -@@ -535,12 +535,14 @@ ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH))) - # All intel architectures get the 64 bit version - # With custom uint128 if necessary (faster than generic 32 bit version). - ECL_SRCS += curve25519_64.c -- VERIFIED_SRCS += Hacl_Curve25519.c FStar.c -+ VERIFIED_SRCS += Hacl_Curve25519.c - else - # All non intel architectures get the generic 32 bit implementation (slow!) +@@ -541,9 +541,7 @@ else ECL_SRCS += curve25519_32.c endif - + +-ifndef HAVE_INT128_SUPPORT +- VERIFIED_SRCS += FStar.c +-endif +VERIFIED_SRCS += FStar.c -+ + ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # - ####################################################################### From 588cc04f6f4a8b805233159c6fb6fa29bf9cec10 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 12 Jun 2019 22:58:17 +0100 Subject: [PATCH 11/11] procps-ng: use gitlab.com for download url --- packages/tools/procps-ng/package.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/tools/procps-ng/package.mk b/packages/tools/procps-ng/package.mk index 900389a0bb..3b91e9ff6b 100644 --- a/packages/tools/procps-ng/package.mk +++ b/packages/tools/procps-ng/package.mk @@ -3,12 +3,13 @@ PKG_NAME="procps-ng" PKG_VERSION="3.3.15" -PKG_SHA256="10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465" +PKG_SHA256="191391fde24a1d3b9b0030d26f8dfdcbf641d36297aab7ecf2f941c5ca927e21" PKG_LICENSE="GPL" PKG_SITE="https://gitlab.com/procps-ng/procps" -PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/Production/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://gitlab.com/procps-ng/procps/-/archive/v${PKG_VERSION}/procps-v${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain ncurses" PKG_LONGDESC="Command line and full screen utilities for browsing procfs." +PKG_TOOLCHAIN="autotools" PKG_BUILD_FLAGS="+pic" PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \