Merge pull request #4846 from heitbaum/bump-systools

systemtools: addon update (117)
This commit is contained in:
CvH 2021-01-07 15:19:40 +01:00 committed by GitHub
commit 890d91d3c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 203 additions and 112 deletions

View File

@ -2,8 +2,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libmtp"
PKG_VERSION="1.1.13"
PKG_SHA256="494ee02fbfbc316aad75b93263dac00f02a4899f28cfda1decbbd6e26fda6d40"
PKG_VERSION="1.1.18"
PKG_SHA256="7280fe50c044c818a06667f45eabca884deab3193caa8682e0b581e847a281f0"
PKG_LICENSE="GPL"
PKG_SITE="http://libmtp.sourceforge.net/"
PKG_URL="$SOURCEFORGE_SRC/project/$PKG_NAME/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"

View File

@ -69,14 +69,14 @@ diff -Naur a/Makefile.in b/Makefile.in
install-dvi: install-dvi-recursive
@@ -932,7 +919,7 @@
distdir distuninstallcheck dvi dvi-am html html-am info \
info-am install install-am install-data install-data-am \
install-dvi install-dvi-am install-exec install-exec-am \
- install-html install-html-am install-hwdbDATA install-info \
+ install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
install-pkgconfigDATA install-ps install-ps-am install-strip \
install-udevrulesDATA installcheck installcheck-am installdirs \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
- install-hwdbDATA install-info install-info-am install-man \
+ install-info install-info-am install-man \
install-pdf install-pdf-am install-pkgconfigDATA install-ps \
install-ps-am install-strip install-udevrulesDATA installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
@@ -944,19 +931,6 @@
.PRECIOUS: Makefile

View File

@ -2,8 +2,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libssh2"
PKG_VERSION="1.8.0"
PKG_SHA256="39f34e2f6835f4b992cafe8625073a88e5a28ba78f83e8099610a7b3af4676d4"
PKG_VERSION="1.9.0"
PKG_SHA256="d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd"
PKG_LICENSE="BSD"
PKG_SITE="https://www.libssh2.org"
PKG_URL="https://www.libssh2.org/download/libssh2-$PKG_VERSION.tar.gz"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="oniguruma"
PKG_VERSION="6.9.1"
PKG_SHA256="c7c3feb7be45a5cc9f2dec239b4a317a422e6ffea299cf91ffab1b926633ea12"
PKG_VERSION="6.9.6"
PKG_SHA256="bd0faeb887f748193282848d01ec2dad8943b5dfcb8dc03ed52dcc963549e819"
PKG_LICENSE="BSD"
PKG_SITE="https://github.com/kkos/oniguruma"
PKG_URL="https://github.com/kkos/oniguruma/releases/download/v$PKG_VERSION/onig-$PKG_VERSION.tar.gz"

View File

@ -2,11 +2,11 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="fdupes"
PKG_VERSION="2.0.0"
PKG_SHA256="eb9e3bd3e722ebb2a272e45a1073f78c60f8989b151c3661421b86b14b203410"
PKG_VERSION="2.1.2"
PKG_SHA256="cd5cb53b6d898cf20f19b57b81114a5b263cc1149cd0da3104578b083b2837bd"
PKG_LICENSE="GPL"
PKG_SITE="http://premium.caribe.net/~adrian2/fdupes.html"
PKG_URL="https://github.com/adrianlopezroche/fdupes/releases/download/${PKG_VERSION}/fdupes-${PKG_VERSION}.tar.gz"
PKG_URL="https://github.com/adrianlopezroche/fdupes/releases/download/v${PKG_VERSION}/fdupes-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain ncurses"
PKG_LONGDESC="A program for identifying or deleting duplicate files residing within specified directories."
PKG_BUILD_FLAGS="-sysroot"

View File

@ -2,11 +2,11 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="file"
PKG_VERSION="87731415de945660b00f02207d8e9d986ef9b82e"
PKG_SHA256="8cb394b99ff9979bfa042e2daff404e9f65df18ec0045b901e91c024583e3f15"
PKG_VERSION="5.39"
PKG_SHA256="6c136f512bf4851b06de4d829ba4df8cbffc1ab1ecfbc1a4ded88a7c4f8c4180"
PKG_LICENSE="BSD"
PKG_SITE="http://www.darwinsys.com/file/"
PKG_URL="https://github.com/file/file/archive/${PKG_VERSION}.tar.gz"
PKG_URL="https://github.com/file/file/archive/FILE${PKG_VERSION/./_}.tar.gz"
PKG_DEPENDS_HOST="toolchain:host"
PKG_DEPENDS_TARGET="toolchain file:host zlib"
PKG_LONGDESC="The file utility is used to determine the types of various files."

View File

@ -2,11 +2,11 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="htop"
PKG_VERSION="3.0.0beta5"
PKG_SHA256="c439add8d6a463699629fc3f0103f55b045d519c31611fa4a68629063238985a"
PKG_VERSION="3.0.4"
PKG_SHA256="d8a0536ce95e3d59f8e292e73ee037033a74a8cc118fd10d22048bd4aeb61324"
PKG_LICENSE="GPL"
PKG_SITE="https://hisham.hm/htop"
PKG_URL="https://github.com/hishamhm/htop/archive/$PKG_VERSION.tar.gz"
PKG_URL="https://github.com/htop-dev/htop/archive/$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain ncurses"
PKG_LONGDESC="An interactive process viewer for Unix."
PKG_TOOLCHAIN="autotools"

View File

@ -1,52 +0,0 @@
From ee711740d2809e7aa3ebd57d58bfc02b1e9b034b Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Thu, 23 Jan 2020 17:27:10 +0100
Subject: [PATCH] Fix GCC 10 switch to `-fno-common` default
---
CRT.h | 6 +++---
linux/LinuxProcess.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CRT.h b/CRT.h
index 933fe068..65998ac6 100644
--- a/CRT.h
+++ b/CRT.h
@@ -140,7 +140,7 @@ extern const char **CRT_treeStr;
extern int CRT_delay;
-int* CRT_colors;
+extern int* CRT_colors;
extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];
@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount;
extern int CRT_scrollWheelVAmount;
-char* CRT_termType;
+extern char* CRT_termType;
// TODO move color scheme to Settings, perhaps?
extern int CRT_colorScheme;
-void *backtraceArray[128];
+extern void *backtraceArray[128];
#if HAVE_SETUID_ENABLED
diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h
index 6ce3037d..cbd77be9 100644
--- a/linux/LinuxProcess.h
+++ b/linux/LinuxProcess.h
@@ -144,7 +144,7 @@ typedef struct LinuxProcess_ {
#endif
-long long btime; /* semi-global */
+extern long long btime; /* semi-global */
extern ProcessFieldData Process_fields[];

View File

@ -3,10 +3,10 @@
PKG_NAME="i2c-tools"
PKG_VERSION="3.1.2"
PKG_SHA256="f939a6242c03950cc568d0efdfa3db7a9c29e0e8f5abd01f2908bdd344c054ff"
PKG_SHA256="6d6079153cd49a62d4addacef4c092db1a46ba60b2807070a3fbe050262aef87"
PKG_LICENSE="GPL"
PKG_SITE="http://www.lm-sensors.org/wiki/I2CTools"
PKG_URL="http://fossies.org/linux/misc/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_SITE="https://i2c.wiki.kernel.org/index.php/I2C_Tools"
PKG_URL="https://www.kernel.org/pub/software/utils/i2c-tools/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
PKG_LONGDESC="A heterogeneous set of I2C tools for Linux."
PKG_BUILD_FLAGS="-sysroot"

View File

@ -0,0 +1,46 @@
From 2b4135907c1aa27edeb397e62b67386ff5d7d3d5 Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
Date: Thu, 23 Jun 2016 18:59:07 +0200
Subject: decode-dimms: Correctly check for out-of-bounds vendor ID
---
CHANGES | 3 +++
eeprom/decode-dimms | 8 +++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/CHANGES b/CHANGES
index 69f9853..9d0acd7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
i2c-tools CHANGES
-----------------
+3.1.3 (work in progress)
+ decode-dimms: Correctly check for out-of-bounds vendor ID
+
3.1.2 (2015-06-17)
decode-dimms: Fix DDR3 extended temp range refresh rate decoding
py-smbus: Add support for python 3
diff --git a/eeprom/decode-dimms b/eeprom/decode-dimms
index a088ba0..4a15fd7 100755
--- a/eeprom/decode-dimms
+++ b/eeprom/decode-dimms
@@ -343,9 +343,11 @@ sub manufacturer_ddr3($$)
{
my ($count, $code) = @_;
return "Invalid" if parity($count) != 1;
- return "Invalid" if parity($code) != 1;
- return (($code & 0x7F) - 1 > $vendors[$count & 0x7F]) ? "Unknown" :
- $vendors[$count & 0x7F][($code & 0x7F) - 1];
+ return "Invalid" if parity($code) != 1
+ or ($code & 0x7F) == 0;
+ return "Unknown" if ($count & 0x7F) >= @vendors
+ or ($code & 0x7F) - 1 >= @{$vendors[$count & 0x7F]};
+ return $vendors[$count & 0x7F][($code & 0x7F) - 1];
}
sub manufacturer(@)
--
cgit 1.2.3-1.el7

View File

@ -0,0 +1,98 @@
From 11a1738e83bbb093f22e38ad11ba9f0e73ae9248 Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
Date: Tue, 8 Sep 2020 17:22:33 +0200
Subject: i2cset: Fix short writes with mask
Short writes used "daddress" for the value, but the masking code did
not expect that, and instead applied the mask to a variable that was
never used.
So change short writes to use "value" for the value, as all other
commands do. Adjust all code paths accordingly.
Reported by David Jedynak.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
CHANGES | 1 +
tools/i2cset.c | 25 +++++++++++++------------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/tools/i2cset.c b/tools/i2cset.c
index e143b65..84925d2 100644
--- a/tools/i2cset.c
+++ b/tools/i2cset.c
@@ -123,11 +123,11 @@ static int confirm(const char *filename, int address, int size, int daddress,
}
fprintf(stderr, "I will write to device file %s, chip address "
- "0x%02x, data address\n0x%02x, ", filename, address, daddress);
- if (size == I2C_SMBUS_BYTE)
- fprintf(stderr, "no data.\n");
- else if (size == I2C_SMBUS_BLOCK_DATA ||
- size == I2C_SMBUS_I2C_BLOCK_DATA) {
+ "0x%02x,\n", filename, address);
+ if (size != I2C_SMBUS_BYTE)
+ fprintf(stderr, "data address 0x%02x, ", daddress);
+ if (size == I2C_SMBUS_BLOCK_DATA ||
+ size == I2C_SMBUS_I2C_BLOCK_DATA) {
int i;
fprintf(stderr, "data");
@@ -138,7 +138,7 @@ static int confirm(const char *filename, int address, int size, int daddress,
} else
fprintf(stderr, "data 0x%02x%s, mode %s.\n", value,
vmask ? " (masked)" : "",
- size == I2C_SMBUS_BYTE_DATA ? "byte" : "word");
+ size == I2C_SMBUS_WORD_DATA ? "word" : "byte");
if (pec)
fprintf(stderr, "PEC checking enabled.\n");
@@ -261,6 +261,10 @@ int main(int argc, char *argv[])
/* read values from command line */
switch (size) {
+ case I2C_SMBUS_BYTE:
+ /* short write: data address was not really data address */
+ value = daddress;
+ break;
case I2C_SMBUS_BYTE_DATA:
case I2C_SMBUS_WORD_DATA:
value = strtol(argv[flags+4], &end, 0);
@@ -341,12 +345,10 @@ int main(int argc, char *argv[])
if (!yes) {
fprintf(stderr, "Old value 0x%0*x, write mask "
- "0x%0*x: Will write 0x%0*x to register "
- "0x%02x\n",
+ "0x%0*x, will write 0x%0*x\n",
size == I2C_SMBUS_WORD_DATA ? 4 : 2, oldvalue,
size == I2C_SMBUS_WORD_DATA ? 4 : 2, vmask,
- size == I2C_SMBUS_WORD_DATA ? 4 : 2, value,
- daddress);
+ size == I2C_SMBUS_WORD_DATA ? 4 : 2, value);
fprintf(stderr, "Continue? [Y/n] ");
fflush(stderr);
@@ -366,7 +368,7 @@ int main(int argc, char *argv[])
switch (size) {
case I2C_SMBUS_BYTE:
- res = i2c_smbus_write_byte(file, daddress);
+ res = i2c_smbus_write_byte(file, value);
break;
case I2C_SMBUS_WORD_DATA:
res = i2c_smbus_write_word_data(file, daddress, value);
@@ -404,7 +406,6 @@ int main(int argc, char *argv[])
switch (size) {
case I2C_SMBUS_BYTE:
res = i2c_smbus_read_byte(file);
- value = daddress;
break;
case I2C_SMBUS_WORD_DATA:
res = i2c_smbus_read_word_data(file, daddress);
--
cgit 1.2.3-1.el7

View File

@ -2,11 +2,11 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="inotify-tools"
PKG_VERSION="3.20.1"
PKG_SHA256="a433cc1dedba851078276db69b0e97f9fe41e4ba3336d2971adfca4b3a6242ac"
PKG_VERSION="3.20.11.0"
PKG_SHA256="58a3cde89e4a5111a87ac16b56b06a8f885460fca0aea51b69c856ce30a37a14"
PKG_LICENSE="GPLv2"
PKG_SITE="http://wiki.github.com/rvoicilas/inotify-tools/"
PKG_URL="https://github.com/rvoicilas/inotify-tools/archive/$PKG_VERSION.tar.gz"
PKG_SITE="http://wiki.github.com/inotify-tools/inotify-tools/"
PKG_URL="https://github.com/inotify-tools/inotify-tools/archive/$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="A C library and a set of command-line programs for Linux providing a simple interface to inotify."
PKG_TOOLCHAIN="autotools"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="smartmontools"
PKG_VERSION="7.0"
PKG_SHA256="e5e1ac2786bc87fdbd6f92d0ee751b799fbb3e1a09c0a6a379f9eb64b3e8f61c"
PKG_VERSION="7.2"
PKG_SHA256="5cd98a27e6393168bc6aaea070d9e1cd551b0f898c52f66b2ff2e5d274118cd6"
PKG_LICENSE="GPL"
PKG_SITE="https://www.smartmontools.org"
PKG_URL="https://downloads.sourceforge.net/sourceforge/smartmontools/smartmontools-$PKG_VERSION.tar.gz"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="strace"
PKG_VERSION="5.9"
PKG_SHA256="39473eb8465546c3e940fb663cb381eba5613160c7302794699d194a4d5d66d9"
PKG_VERSION="5.10"
PKG_SHA256="fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c"
PKG_LICENSE="BSD"
PKG_SITE="https://strace.io/"
PKG_URL="https://strace.io/files/$PKG_VERSION/strace-$PKG_VERSION.tar.xz"

View File

@ -11,7 +11,7 @@ index 4e7bc2a89..3b762c94c 100644
- [strace-devel@lists.strace.io],
- [strace],
- [https://strace.io])
+AC_INIT([strace],[5.9])
+AC_INIT([strace],[5.10])
m4_define([copyright_year], st_esyscmd_s([./copyright-year-gen .year]))
m4_define([manpage_date], st_esyscmd_s([./file-date-gen strace.1.in]))
AC_COPYRIGHT([Copyright (c) 1999-]copyright_year[ The strace developers.])

View File

@ -2,11 +2,11 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="stress-ng"
PKG_VERSION="0.11.14"
PKG_SHA256="b21436fdbd9dc482a3fd95ae27cccf0097d0f226361ea3785215f7a4ad50136b"
PKG_VERSION="0.12.01"
PKG_SHA256="d354bbbb1500cfe043c761014dc9c3f62779747fafea8a19af94402327f6d3fc"
PKG_LICENSE="GPLv2"
PKG_SITE="http://kernel.ubuntu.com/~cking/stress-ng/"
PKG_URL="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-$PKG_VERSION.tar.xz"
PKG_SITE="https://kernel.ubuntu.com/~cking/stress-ng/"
PKG_URL="https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain attr keyutils libaio libcap zlib"
PKG_LONGDESC="stress-ng will stress test a computer system in various selectable ways"
PKG_BUILD_FLAGS="-sysroot"

View File

@ -1,15 +0,0 @@
--- a/Makefile 2020-01-08 15:05:33.724535475 +0100
+++ b/Makefile 2020-01-08 15:06:22.475865004 +0100
@@ -339,11 +339,9 @@
endif
$(MAKE) stress-ng
-.SUFFIXES: .c .o
-
.o: stress-ng.h Makefile
-.c.o: stress-ng.h Makefile $(SRC)
+%.c.o: stress-ng.h Makefile %.c
@echo "CC $<"
@$(CC) $(CFLAGS) -c -o $@ $<

View File

@ -2,8 +2,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="usb-modeswitch"
PKG_VERSION="2.5.2"
PKG_SHA256="abffac09c87eacd78e101545967dc25af7e989745b4276756d45dbf4008a2ea6"
PKG_VERSION="2.6.1"
PKG_SHA256="5195d9e136e52f658f19e9f93e4f982b1b67bffac197d0a455cd8c2cd245fa34"
PKG_LICENSE="GPL"
PKG_SITE="http://www.draisberghof.de/usb_modeswitch/"
PKG_URL="http://www.draisberghof.de/usb_modeswitch/${PKG_NAME}-${PKG_VERSION}.tar.bz2"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vim"
PKG_VERSION="8.2.0023"
PKG_SHA256="100c1226286e24421084b9301d945d0310c7b3c9d45a6da4741dc23c0be60050"
PKG_VERSION="8.2.2293"
PKG_SHA256="20f9bc8b170fd278a6f319fde0edf5698f2707a395ebaafa9b1de9327f5a0775"
PKG_LICENSE="VIM"
PKG_SITE="http://www.vim.org/"
PKG_URL="https://github.com/vim/vim/archive/v$PKG_VERSION.tar.gz"

View File

@ -1,3 +1,17 @@
117
- fdupes: update to 2.1.2
- htop: update to 3.0.4
- i2c-tools: update to 3.1.2+patches
- inotify-tools: update to 3.20.11.0
- libmtp: update to 1.1.18
- libssh2: update to 1.9.0
- oniguruma: update to 6.9.6
- smartmontools: update to 7.2
- strace: update to 5.10
- stress-ng: update to 0.12.01
- usb-modeswitch: update to 2.6.1
- vim: update to 8.2.2293
116
- added st (Generic only)
- updated unrar to 6.0.3

View File

@ -3,7 +3,7 @@
PKG_NAME="system-tools"
PKG_VERSION="1.0"
PKG_REV="116"
PKG_REV="117"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://libreelec.tv"
@ -110,7 +110,7 @@ addon() {
# jq
cp -P $(get_install_dir jq)/usr/bin/jq $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $(get_install_dir oniguruma)/usr/lib/libonig.so $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -P $(get_install_dir oniguruma)/usr/lib/{libonig.so,libonig.so.5,libonig.so.5.1.0} $ADDON_BUILD/$PKG_ADDON_ID/lib
# lm_sensors
cp -P $(get_install_dir lm_sensors)/usr/bin/sensors $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :