From a38acb62a98eb96c33fda28227c4ace1e6325215 Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Mon, 19 Jul 2021 20:56:38 +0800 Subject: [PATCH] libs: sync upstream (#7420) * elfutils: update to 0.182 Add --disable-libdebuginfod with remove libcurl dependency. Remove totally unused host elfutils. Refreshed and rebased patches. Also happens to fix compilation with GCC11. Newer versions of elfutils seem to have some kind of dependency on obstack. Signed-off-by: Rosen Penev * libcap: update to 2.51 Switched to AUTORELEASE to avoid manual increments. Signed-off-by: Rosen Penev * libnftnl: update to 1.2.0 Switch to AUTORELEASE to avoid manual increments. Signed-off-by: Rosen Penev * libpcap: update to 1.10.1 Switch to AUTORELEASE to avoid manual increments. Refreshed patches. Signed-off-by: Rosen Penev * mbedtls: update to 2.16.11 Switched to AUTORELEASE to avoid manual increments. Signed-off-by: Rosen Penev * nettle: update to 3.7.3 Switch to AUTORELEASE to avoid manual increments. Refreshed patches. Signed-off-by: Rosen Penev * pcre: update to 8.45 Switch to AUTORELEASE to avoid manual increments. Signed-off-by: Rosen Penev Co-authored-by: Rosen Penev --- package/libs/elfutils/Makefile | 10 +++++--- ...cliude-asm-ptrace.h-for-pt_regs-defi.patch | 5 ---- .../patches/003-libintl-compatibility.patch | 4 +-- .../patches/005-build_only_libs.patch | 6 ++--- .../006-Fix-build-on-aarch64-musl.patch | 6 +---- .../libs/elfutils/patches/110-no-cdefs.patch | 25 ------------------- package/libs/libcap/Makefile | 6 ++--- package/libs/libnftnl/Makefile | 6 ++--- package/libs/libpcap/Makefile | 6 ++--- .../libs/libpcap/patches/100-no-openssl.patch | 2 +- .../libpcap/patches/102-skip-manpages.patch | 2 +- package/libs/mbedtls/Makefile | 6 ++--- package/libs/nettle/Makefile | 6 ++--- .../libs/nettle/patches/100-portability.patch | 8 +++--- package/libs/pcre/Makefile | 6 ++--- 15 files changed, 36 insertions(+), 68 deletions(-) diff --git a/package/libs/elfutils/Makefile b/package/libs/elfutils/Makefile index 3e36dc27b..d595e4caf 100644 --- a/package/libs/elfutils/Makefile +++ b/package/libs/elfutils/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=elfutils -PKG_VERSION:=0.180 -PKG_RELEASE:=2 +PKG_VERSION:=0.182 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://sourceware.org/$(PKG_NAME)/ftp/$(PKG_VERSION) -PKG_HASH:=b827b6e35c59d188ba97d7cf148fa8dc6f5c68eb6c5981888dfdbb758c0b569d +PKG_HASH:=ecc406914edf335f0b7fc084ebe6c460c4d6d5175bfdd6688c1c78d9146b8858 PKG_MAINTAINER:=Luiz Angelo Daros de Luca PKG_LICENSE:=GPL-3.0-or-later @@ -63,7 +63,9 @@ endif CONFIGURE_ARGS += \ --program-prefix=eu- \ --disable-debuginfod \ - --without-lzma + --disable-libdebuginfod \ + --without-lzma \ + --without-zstd TARGET_CFLAGS += -D_GNU_SOURCE -Wno-unused-result -Wno-format-nonliteral diff --git a/package/libs/elfutils/patches/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch b/package/libs/elfutils/patches/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch index 904da2b44..839f86ee6 100644 --- a/package/libs/elfutils/patches/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch +++ b/package/libs/elfutils/patches/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch @@ -17,8 +17,6 @@ Signed-off-by: Khem Raj backends/ppc_initreg.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c -index 0e0d359..e5cca7e 100644 --- a/backends/ppc_initreg.c +++ b/backends/ppc_initreg.c @@ -33,6 +33,7 @@ @@ -29,6 +27,3 @@ index 0e0d359..e5cca7e 100644 # include #endif --- -2.23.0 - diff --git a/package/libs/elfutils/patches/003-libintl-compatibility.patch b/package/libs/elfutils/patches/003-libintl-compatibility.patch index e883a302e..26fcc85c8 100644 --- a/package/libs/elfutils/patches/003-libintl-compatibility.patch +++ b/package/libs/elfutils/patches/003-libintl-compatibility.patch @@ -11,7 +11,7 @@ Requires.private: zlib --- a/configure.ac +++ b/configure.ac -@@ -586,6 +586,9 @@ AC_CONFIG_FILES([config/libelf.pc config +@@ -590,6 +590,9 @@ AC_CONFIG_FILES([config/libelf.pc config AC_SUBST(USE_NLS, yes) AM_PO_SUBDIRS @@ -47,7 +47,7 @@ #define _(Str) dgettext ("elfutils", Str) --- a/libdwfl/libdwflP.h +++ b/libdwfl/libdwflP.h -@@ -44,6 +44,9 @@ +@@ -47,6 +47,9 @@ typedef struct Dwfl_Process Dwfl_Process; diff --git a/package/libs/elfutils/patches/005-build_only_libs.patch b/package/libs/elfutils/patches/005-build_only_libs.patch index a81d1d2ca..501348f21 100644 --- a/package/libs/elfutils/patches/005-build_only_libs.patch +++ b/package/libs/elfutils/patches/005-build_only_libs.patch @@ -4,8 +4,8 @@ pkginclude_HEADERS = version.h SUBDIRS = config m4 lib libelf libcpu backends libebl libdwelf libdwfl libdw \ -- libasm src po doc tests +- libasm debuginfod src po doc tests + libasm - if DEBUGINFOD - SUBDIRS += debuginfod + EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ + COPYING COPYING-GPLV2 COPYING-LGPLV3 diff --git a/package/libs/elfutils/patches/006-Fix-build-on-aarch64-musl.patch b/package/libs/elfutils/patches/006-Fix-build-on-aarch64-musl.patch index 6f7956c5a..d8066c5ca 100644 --- a/package/libs/elfutils/patches/006-Fix-build-on-aarch64-musl.patch +++ b/package/libs/elfutils/patches/006-Fix-build-on-aarch64-musl.patch @@ -22,8 +22,6 @@ Signed-off-by: Hongxu Jia backends/arm_initreg.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/backends/aarch64_initreg.c b/backends/aarch64_initreg.c -index daf6f37..6445276 100644 --- a/backends/aarch64_initreg.c +++ b/backends/aarch64_initreg.c @@ -33,7 +33,7 @@ @@ -35,7 +33,7 @@ index daf6f37..6445276 100644 # include # include /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */ -@@ -82,7 +82,7 @@ aarch64_set_initial_registers_tid (pid_t tid __attribute__ ((unused)), +@@ -82,7 +82,7 @@ aarch64_set_initial_registers_tid (pid_t Dwarf_Word dwarf_fregs[32]; for (int r = 0; r < 32; r++) @@ -44,8 +42,6 @@ index daf6f37..6445276 100644 if (! setfunc (64, 32, dwarf_fregs, arg)) return false; -diff --git a/backends/arm_initreg.c b/backends/arm_initreg.c -index efcabaf..062bb9e 100644 --- a/backends/arm_initreg.c +++ b/backends/arm_initreg.c @@ -38,7 +38,7 @@ diff --git a/package/libs/elfutils/patches/110-no-cdefs.patch b/package/libs/elfutils/patches/110-no-cdefs.patch index f95625a91..d66f1e924 100644 --- a/package/libs/elfutils/patches/110-no-cdefs.patch +++ b/package/libs/elfutils/patches/110-no-cdefs.patch @@ -24,28 +24,3 @@ Signed-off-by: Rosen Penev #include ---- a/libelf/elf.h -+++ b/libelf/elf.h -@@ -19,9 +19,9 @@ - #ifndef _ELF_H - #define _ELF_H 1 - --#include -- --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - /* Standard ELF types. */ - -@@ -4103,6 +4103,8 @@ enum - #define R_ARC_TLS_LE_S9 0x4a - #define R_ARC_TLS_LE_32 0x4b - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* elf.h */ diff --git a/package/libs/libcap/Makefile b/package/libs/libcap/Makefile index b8e45a52c..53a577f1f 100644 --- a/package/libs/libcap/Makefile +++ b/package/libs/libcap/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libcap -PKG_VERSION:=2.48 -PKG_RELEASE:=1 +PKG_VERSION:=2.51 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/libs/security/linux-privs/libcap2 -PKG_HASH:=4de9590ee09a87c282d558737ffb5b6175ccbfd26d580add10df44d0f047f6c2 +PKG_HASH:=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9 PKG_MAINTAINER:=Paul Wassi PKG_LICENSE:=GPL-2.0-only diff --git a/package/libs/libnftnl/Makefile b/package/libs/libnftnl/Makefile index 198e01ba2..4c7f6ad46 100644 --- a/package/libs/libnftnl/Makefile +++ b/package/libs/libnftnl/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnftnl -PKG_VERSION:=1.1.8 -PKG_RELEASE:=1 +PKG_VERSION:=1.2.0 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files -PKG_HASH:=04a3fa5b08b736268f7e65836b9f05d9d5f438181467bee3c76c3c4a4f3ab711 +PKG_HASH:=90b01fddfe9be8c3245c3ba5ff5a4424a8df708828f92b2b361976b658c074f5 PKG_MAINTAINER:=Steven Barth PKG_LICENSE:=GPL-2.0-or-later diff --git a/package/libs/libpcap/Makefile b/package/libs/libpcap/Makefile index 6168d4c45..6fb55f89d 100644 --- a/package/libs/libpcap/Makefile +++ b/package/libs/libpcap/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpcap -PKG_VERSION:=1.10.0 -PKG_RELEASE:=1 +PKG_VERSION:=1.10.1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.us.tcpdump.org/release/ \ http://www.tcpdump.org/release/ -PKG_HASH:=8d12b42623eeefee872f123bd0dc85d535b00df4d42e865f993c40f7bfc92b1e +PKG_HASH:=ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=BSD-3-Clause diff --git a/package/libs/libpcap/patches/100-no-openssl.patch b/package/libs/libpcap/patches/100-no-openssl.patch index 6424cf8c6..56896ad8b 100644 --- a/package/libs/libpcap/patches/100-no-openssl.patch +++ b/package/libs/libpcap/patches/100-no-openssl.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1006,7 +1006,6 @@ endif() +@@ -1042,7 +1042,6 @@ endif() # # OpenSSL/libressl. # diff --git a/package/libs/libpcap/patches/102-skip-manpages.patch b/package/libs/libpcap/patches/102-skip-manpages.patch index 57b780c1f..79a365643 100644 --- a/package/libs/libpcap/patches/102-skip-manpages.patch +++ b/package/libs/libpcap/patches/102-skip-manpages.patch @@ -9,7 +9,7 @@ Subject: [PATCH] skip manpages --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2701,57 +2701,6 @@ if(NOT MSVC) +@@ -2732,57 +2732,6 @@ if(NOT MSVC) if(MINGW) find_program(LINK_EXECUTABLE ln) endif(MINGW) diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile index 088d3284d..0ab238962 100644 --- a/package/libs/mbedtls/Makefile +++ b/package/libs/mbedtls/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mbedtls -PKG_VERSION:=2.16.10 -PKG_RELEASE:=1 +PKG_VERSION:=2.16.11 +PKG_RELEASE:=$(AUTORELEASE) PKG_USE_MIPS16:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ARMmbed/mbedtls/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=96257bb03b30300b2f35f861ffe204ed957e9fd0329d80646fe57fc49f589b29 +PKG_HASH:=c18e7e9abf95e69e425260493720470021384a1728417042060a35d0b7b18b41 PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=GPL-2.0-or-later diff --git a/package/libs/nettle/Makefile b/package/libs/nettle/Makefile index b15ea0fa0..3b4bd9d05 100644 --- a/package/libs/nettle/Makefile +++ b/package/libs/nettle/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nettle -PKG_VERSION:=3.6 -PKG_RELEASE:=1 +PKG_VERSION:=3.7.3 +PKG_RELEASE:=$(AUTORELEASE) PKG_USE_MIPS16:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/nettle -PKG_HASH:=d24c0d0f2abffbc8f4f34dcf114b0f131ec3774895f3555922fe2f40f3d5e3f1 +PKG_HASH:=661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0 PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING diff --git a/package/libs/nettle/patches/100-portability.patch b/package/libs/nettle/patches/100-portability.patch index 2849e53ea..5bbae2275 100644 --- a/package/libs/nettle/patches/100-portability.patch +++ b/package/libs/nettle/patches/100-portability.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -4635,6 +4635,7 @@ $as_echo_n "checking build system compil +@@ -4661,6 +4661,7 @@ $as_echo_n "checking build system compil # remove anything that might look like compiler output to our "||" expression rm -f conftest* a.out b.out a.exe a_out.exe cat >conftest.c <conftest.c <conftest.c <conftest.c < PKG_LICENSE:=BSD-3-Clause