From b45566e90dc6cc37c4aa49888bd7a613a6bfd0a9 Mon Sep 17 00:00:00 2001 From: Albert Xu <19632674+1582130940@users.noreply.github.com> Date: Mon, 19 Dec 2022 12:45:05 +0800 Subject: [PATCH] package: Sync with upstream (#10641) * firmware-utils: bump to git HEAD Adds support for building TP-Link CPE605v1 factory images bd856eff4850 tplink-safeloader: add TP-Link CPE605 v1 Support Signed-off-by: Sander Vanheule * firmware-utils: fix archive checksum PKG_SOURCE_DATE was modified after updating PKG_MIRROR_HASH, causing the latter to change. This results in a warning during builds and rejected downloads. Fixes: 232879a7b7f8 ("firmware-utils: bump to git HEAD") Signed-off-by: Sander Vanheule * libtracefs: update to 1.6.2 378a9dd libtracefs: version 1.6.2 e6daa60 libtracefs: Add unit test to test mounting of tracefs_{tracing,debug}_dir() 32acbbf libtracefs: Have tracefs_{tracing,debug}_dir() mount {tracefs,debugfs} if not mounted Signed-off-by: Nick Hainke * ethtool: add PKG_CPE_ID Add CPE ID for tracking CVEs. Signed-off-by: Nick Hainke * ethtool: update to 6.0 Release Notes: https://lwn.net/Articles/910841/ Signed-off-by: Nick Hainke * strace: update to 6.1 Release Notes: https://github.com/strace/strace/releases/tag/v6.1 Signed-off-by: Nick Hainke * trace-cmd: update to v3.1.5 Update to latest release. Signed-off-by: Nick Hainke * libtraceevent: update to 1.7.0 Update to latest release. Signed-off-by: Nick Hainke * libtracefs: update to 1.6.3 Update to latest release. Signed-off-by: Nick Hainke * tools/bash: update to 5.2.15 Update to the latest released version. Signed-off-by: Linhui Liu * tools/ccache: update to 4.7.4 Release Notes: https://ccache.dev/releasenotes.html#_ccache_4_7_3 https://ccache.dev/releasenotes.html#_ccache_4_7_4 Signed-off-by: Linhui Liu * tools/libressl: update to 3.7.0 Release notes: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.6.0-relnotes.txt https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.6.1-relnotes.txt https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.0-relnotes.txt Signed-off-by: Linhui Liu * tools/mpc: update to 1.3.1 Version 1.3.1 new features: Bug fix: It is again possible to include mpc.h without including stdio.h. Version 1.3.0 new features: New function: mpc_agm New rounding modes "away from zero", indicated by the letter "A" and corresponding to MPFR_RNDA on the designated real or imaginary part. New experimental ball arithmetic. New experimental function: mpc_eta_fund Bug fixes: mpc_asin for asin(z) with small |Re(z)| and tiny |Im(z)| mpc_pow_fr: sign of zero part of result when the base has up to sign the same real and imaginary part, and the exponent is an even positive integer mpc_fma: the returned int value was incorrect in some cases (indicating whether the rounded real/imaginary parts were smaller/equal/greater than the exact values), but the computed complex value was correct. Remove the unmaintained Makefile.vc; build files for Visual Studio are maintained independently by Brian Gladman. Signed-off-by: Linhui Liu * tools/patchelf: update to 0.17.0 Update to the latest released version. Signed-off-by: Linhui Liu Signed-off-by: Sander Vanheule Signed-off-by: Nick Hainke Signed-off-by: Linhui Liu Co-authored-by: Sander Vanheule Co-authored-by: Nick Hainke Co-authored-by: Linhui Liu --- package/devel/strace/Makefile | 4 ++-- package/devel/trace-cmd/Makefile | 4 ++-- package/libs/libtraceevent/Makefile | 4 ++-- package/libs/libtracefs/Makefile | 4 ++-- package/network/utils/ethtool/Makefile | 5 +++-- tools/bash/Makefile | 4 ++-- tools/ccache/Makefile | 4 ++-- tools/ccache/patches/100-honour-copts.patch | 2 +- tools/firmware-utils/Makefile | 6 +++--- tools/libressl/Makefile | 4 ++-- tools/mpc/Makefile | 4 ++-- tools/patchelf/Makefile | 9 ++++----- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package/devel/strace/Makefile b/package/devel/strace/Makefile index 7500c3731..2a4516f4b 100644 --- a/package/devel/strace/Makefile +++ b/package/devel/strace/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=strace -PKG_VERSION:=6.0 +PKG_VERSION:=6.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://strace.io/files/$(PKG_VERSION) -PKG_HASH:=92d720a666855e9f1c6a11512fd6e99674a82bbfe1442557815f2ce8e1293338 +PKG_HASH:=2579e9cec37dbb786f6ea0bebd15f40dd561ef2bde2a2a2ecdce5963b01859fd PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=LGPL-2.1-or-later diff --git a/package/devel/trace-cmd/Makefile b/package/devel/trace-cmd/Makefile index b6a28ab93..47929491e 100644 --- a/package/devel/trace-cmd/Makefile +++ b/package/devel/trace-cmd/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trace-cmd -PKG_VERSION:=v3.1.4 +PKG_VERSION:=v3.1.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/ -PKG_HASH:=447e095dbdfb0d362ab8c2086d62d80c5a2ecf67aef09b8f6b0cc064c0e1bfb5 +PKG_HASH:=9af1ea00e312d03639470e126fa9c786789f03c16df93a57c0bc90eeffbc7d50 PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=COPYING diff --git a/package/libs/libtraceevent/Makefile b/package/libs/libtraceevent/Makefile index c09197cc7..63f954ba0 100644 --- a/package/libs/libtraceevent/Makefile +++ b/package/libs/libtraceevent/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtraceevent -PKG_VERSION:=1.6.3 +PKG_VERSION:=1.7.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/ -PKG_HASH:=031e4428586788bb835d894f7f11c54e482764063d96ead303c7f208fb59e353 +PKG_HASH:=3e902184f743c955b183b45f25ea163a3d41c9f287fdcfc95cd9cca748c563c8 PKG_MAINTAINER:=Nick Hainke diff --git a/package/libs/libtracefs/Makefile b/package/libs/libtracefs/Makefile index aa3fdb44f..a3d08d298 100644 --- a/package/libs/libtracefs/Makefile +++ b/package/libs/libtracefs/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtracefs -PKG_VERSION:=1.6.1 +PKG_VERSION:=1.6.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/ -PKG_HASH:=215a5182ee7d5a813ff84d290bb8988aa4c04cc16bb837780f61b0f5bf7494ab +PKG_HASH:=de307faaa54ac52cf0ce3ff19b32b51af24897e3440e643068ac82d31e197e92 PKG_MAINTAINER:=Nick Hainke diff --git a/package/network/utils/ethtool/Makefile b/package/network/utils/ethtool/Makefile index 5e684ceed..467630d24 100644 --- a/package/network/utils/ethtool/Makefile +++ b/package/network/utils/ethtool/Makefile @@ -8,16 +8,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ethtool -PKG_VERSION:=5.19 +PKG_VERSION:=6.0 PKG_RELEASE:=1 PKG_MAINTAINER:=Felix Fietkau PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/network/ethtool -PKG_HASH:=3b752a3329827907ac3812f2831dfecf51c8c41c55d2d69cfb9c53ca06449fc6 +PKG_HASH:=d5446c93de570ce68f3b1ea69dbfa12fcfd67fc19897f655d3f18231e2b818d6 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING +PKG_CPE_ID:=cpe:/a:kernel:ethtool PKG_FIXUP:=autoreconf PKG_INSTALL:=1 diff --git a/tools/bash/Makefile b/tools/bash/Makefile index 11b38da6a..f4bfc0739 100644 --- a/tools/bash/Makefile +++ b/tools/bash/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bash PKG_CPE_ID:=cpe:/a:gnu:bash -PKG_VERSION:=5.2.9 +PKG_VERSION:=5.2.15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/bash -PKG_HASH:=68d978264253bc933d692f1de195e2e5b463a3984dfb4e5504b076865f16b6dd +PKG_HASH:=13720965b5f4fc3a0d4b61dd37e7565c741da9a5be24edc2ae00182fc1b3588c HOST_BUILD_PARALLEL := 1 diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile index 6d92c2f14..25ab4a46e 100644 --- a/tools/ccache/Makefile +++ b/tools/ccache/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/target.mk PKG_NAME:=ccache -PKG_VERSION:=4.7.2 +PKG_VERSION:=4.7.4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION) -PKG_HASH:=17ca75a577d49c1e4f2ac86d53126859de52b789cfe85dd532758518db114eaf +PKG_HASH:=df0c64d15d3efaf0b4f6837dd6b1467e40eeaaa807db25ce79c3a08a46a84e36 include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/cmake.mk diff --git a/tools/ccache/patches/100-honour-copts.patch b/tools/ccache/patches/100-honour-copts.patch index b4c1be4df..5358d425c 100644 --- a/tools/ccache/patches/100-honour-copts.patch +++ b/tools/ccache/patches/100-honour-copts.patch @@ -1,6 +1,6 @@ --- a/src/ccache.cpp +++ b/src/ccache.cpp -@@ -1762,6 +1762,7 @@ get_manifest_key(Context& ctx, Hash& hash) +@@ -1779,6 +1779,7 @@ get_manifest_key(Context& ctx, Hash& has "CPLUS_INCLUDE_PATH", "OBJC_INCLUDE_PATH", "OBJCPLUS_INCLUDE_PATH", // clang diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile index 731bc8a04..1c47a3109 100644 --- a/tools/firmware-utils/Makefile +++ b/tools/firmware-utils/Makefile @@ -11,9 +11,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware-utils.git -PKG_SOURCE_DATE:=2022-09-12 -PKG_SOURCE_VERSION:=0c92b20ad488a4fb5fb290f6d1b893df45761275 -PKG_MIRROR_HASH:=2cfd36e749b51d539cffe22c77a4c3ccd3bac2eca482affe23e1cab539e8bd16 +PKG_SOURCE_DATE:=2022-12-15 +PKG_SOURCE_VERSION:=bd856eff48509fa4511169ee55f639ede8dd4ac6 +PKG_MIRROR_HASH:=4dc754b403b10f43dc2871f17ef7b223c85ad3b14c57899497f0b6bb304756d9 include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/cmake.mk diff --git a/tools/libressl/Makefile b/tools/libressl/Makefile index fe73e7cde..f687f6b41 100644 --- a/tools/libressl/Makefile +++ b/tools/libressl/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libressl -PKG_VERSION:=3.5.3 -PKG_HASH:=3ab5e5eaef69ce20c6b170ee64d785b42235f48f2e62b095fca5d7b6672b8b28 +PKG_VERSION:=3.7.0 +PKG_HASH:=3fc1290f4007ec75f6e9acecbb25512630d1b9ab8c53ba79844e395868c3e006 PKG_RELEASE:=1 PKG_CPE_ID:=cpe:/a:openbsd:libressl diff --git a/tools/mpc/Makefile b/tools/mpc/Makefile index b170043c1..5c196a27e 100644 --- a/tools/mpc/Makefile +++ b/tools/mpc/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mpc -PKG_VERSION:=1.2.1 +PKG_VERSION:=1.3.1 PKG_SOURCE_URL:=@GNU/mpc/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459 +PKG_HASH:=ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8 HOST_BUILD_PARALLEL:=1 diff --git a/tools/patchelf/Makefile b/tools/patchelf/Makefile index 4cf039c40..1271a393c 100644 --- a/tools/patchelf/Makefile +++ b/tools/patchelf/Makefile @@ -7,12 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=patchelf +PKG_VERSION:=0.17.0 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/NixOS/patchelf.git -PKG_SOURCE_VERSION:=f34751b88bd07d7f44f5cd3200fb4122bf916c7e -PKG_SOURCE_DATE:=2020-12-07 -PKG_MIRROR_HASH:=ac746930b919b97da40f259cfc9ab7bbd48a0c9cbf2eebd8cee5ae19a94356fd +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://github.com/NixOS/patchelf/releases/download/$(PKG_VERSION) +PKG_HASH:=45d76f4a31688a523718ec512f31650b1f35d1affec3eafeb3feeb5448d341e1 HOST_BUILD_PARALLEL:=1 HOST_FIXUP:=autoreconf