From ea45ffe410146c26879259e74ef85ace966303d5 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 20 Jul 2024 03:28:03 +0000 Subject: [PATCH] v4l-utils: update to 1.28.0 and HSTS --- packages/sysutils/v4l-utils/package.mk | 8 ++-- .../v4l-utils-001-fix-keytable-crash.patch | 47 ------------------- 2 files changed, 4 insertions(+), 51 deletions(-) delete mode 100644 packages/sysutils/v4l-utils/patches/v4l-utils-001-fix-keytable-crash.patch diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk index aa32fc7de8..8224b456aa 100644 --- a/packages/sysutils/v4l-utils/package.mk +++ b/packages/sysutils/v4l-utils/package.mk @@ -5,11 +5,11 @@ # with 1.0.0 repeat delay is broken. test on upgrade PKG_NAME="v4l-utils" -PKG_VERSION="1.26.1" -PKG_SHA256="4a71608c0ef7df2931176989e6d32b445c0bdc1030a2376d929c8ca6e550ec4e" +PKG_VERSION="1.28.0" +PKG_SHA256="fcb1ac1f22c1673e932b1779384f61cd6b7dd76e0e500bfb57e7a598588980b4" PKG_LICENSE="GPL" -PKG_SITE="http://linuxtv.org/" -PKG_URL="http://linuxtv.org/downloads/v4l-utils/${PKG_NAME}-${PKG_VERSION}.tar.xz" +PKG_SITE="https://linuxtv.org/" +PKG_URL="https://linuxtv.org/downloads/v4l-utils/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain alsa-lib elfutils ir-bpf-decoders libbpf systemd zlib" PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)." diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-001-fix-keytable-crash.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-001-fix-keytable-crash.patch deleted file mode 100644 index c3bd042578..0000000000 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-001-fix-keytable-crash.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f39acb7f375887e5ecf09128609318d717eda51d Mon Sep 17 00:00:00 2001 -From: Matthias Reichl -Date: Wed, 20 Dec 2023 16:28:26 +0100 -Subject: [PATCH] keytable: fix segfault when reading legacy keymaps - -Since commit ae1492611432 ("keytable: remove line length limits") -ir-keytable crashes when reading keymaps in legacy (non-toml) format -and valgrind reports an UMR: - -valgrind ir-keytable -w /etc/rc_keymaps/hiastest -... -==83788== Conditional jump or move depends on uninitialised value(s) -==83788== at 0x48E8B8C: getdelim (iogetdelim.c:59) -==83788== by 0x1105C6: getline (stdio.h:120) -==83788== by 0x1105C6: parse_plain_keymap (keymap.c:98) -==83788== by 0x1105C6: parse_keymap (keymap.c:533) -==83788== by 0x112798: parse_opt (keytable.c:569) -==83788== by 0x4986E50: group_parse (argp-parse.c:257) -==83788== by 0x4986E50: parser_parse_opt (argp-parse.c:747) -==83788== by 0x4986E50: parser_parse_next (argp-parse.c:867) -==83788== by 0x4986E50: argp_parse (argp-parse.c:921) -==83788== by 0x10E470: main (keytable.c:2071) - -Fix this by properly initializing line to NULL so getline will allocate -a buffer instead of using some random memory locations. - -Signed-off-by: Matthias Reichl ---- - utils/common/keymap.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/common/keymap.c b/utils/common/keymap.c -index 04c5ef54723c..21c1c0b5d581 100644 ---- a/utils/common/keymap.c -+++ b/utils/common/keymap.c -@@ -75,7 +75,7 @@ static error_t parse_plain_keymap(char *fname, struct keymap **keymap, bool verb - { - FILE *fin; - int line_no = 0; -- char *scancode, *keycode, *line; -+ char *scancode, *keycode, *line = NULL; - size_t line_size; - struct scancode_entry *se; - struct keymap *map; --- -2.39.2 -