From a43fb5e8065f712d0f6afcc095b8a1da66462169 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Thu, 11 May 2023 20:47:34 +0200 Subject: [PATCH] package/diffutils: bump version to 3.9 Drop now included patches and regenerate ignore file. http://savannah.gnu.org/forum/forum.php?forum_id=10282 Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- .checkpackageignore | 5 -- ...rection.m4-fix-build-on-microblazeel.patch | 39 ------------- .../0002-sigsegv-fix-build-on-or1k.patch | 32 ---------- ..._random-port-better-to-uClibc-1-0-35.patch | 39 ------------- ...-Fix-compilation-error-on-arceb-CPUs.patch | 41 ------------- ...ort-for-Linux-PowerPC-32-bit-with-mu.patch | 58 ------------------- package/diffutils/diffutils.hash | 2 +- package/diffutils/diffutils.mk | 4 +- 8 files changed, 2 insertions(+), 218 deletions(-) delete mode 100644 package/diffutils/0001-m4-stack-direction.m4-fix-build-on-microblazeel.patch delete mode 100644 package/diffutils/0002-sigsegv-fix-build-on-or1k.patch delete mode 100644 package/diffutils/0003-sys_random-port-better-to-uClibc-1-0-35.patch delete mode 100644 package/diffutils/0004-sigsegv-Fix-compilation-error-on-arceb-CPUs.patch delete mode 100644 package/diffutils/0005-sigsegv-Add-support-for-Linux-PowerPC-32-bit-with-mu.patch diff --git a/.checkpackageignore b/.checkpackageignore index 05459362ee..a1895e54ea 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -351,11 +351,6 @@ package/dhrystone/0003-exit.patch Sob Upstream package/dhrystone/0004-headers.patch Sob Upstream package/dhrystone/0005-prototypes.patch Sob Upstream package/dht/0001-cmake.patch Upstream -package/diffutils/0001-m4-stack-direction.m4-fix-build-on-microblazeel.patch Upstream -package/diffutils/0002-sigsegv-fix-build-on-or1k.patch Upstream -package/diffutils/0003-sys_random-port-better-to-uClibc-1-0-35.patch Upstream -package/diffutils/0004-sigsegv-Fix-compilation-error-on-arceb-CPUs.patch Upstream -package/diffutils/0005-sigsegv-Add-support-for-Linux-PowerPC-32-bit-with-mu.patch Upstream package/dillo/0001-usr-local-include.patch Upstream package/dillo/0002-Fix-openssl-detection.patch Upstream package/dillo/0004-fix-build-with-gcc-10.patch Upstream diff --git a/package/diffutils/0001-m4-stack-direction.m4-fix-build-on-microblazeel.patch b/package/diffutils/0001-m4-stack-direction.m4-fix-build-on-microblazeel.patch deleted file mode 100644 index 6e60beecbd..0000000000 --- a/package/diffutils/0001-m4-stack-direction.m4-fix-build-on-microblazeel.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7fd9de7f12718db0ace575c15c3a0e061ef6c542 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 11 Nov 2021 09:46:41 +0100 -Subject: [PATCH] m4/stack-direction.m4: fix build on microblazeel - -Fix the following build failure on microblazeel with diffutils raised -since version 3.8 and -https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=e54aa6196947ed22ff66bcd714e4fc7bd0c5c3b4 - -sigsegv.c: In function 'sigsegv_handler': -sigsegv.c:979:28: error: 'struct vma_struct' has no member named 'is_near_this' - 979 | : vma.is_near_this (addr, &vma)) - | ^ - -Fixes: - - http://autobuild.buildroot.org/results/5ecd55b7c72f9630a7acc72341ccb60e94ddb574 - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to bug-gnulib@gnu.org] ---- - m4/stack-direction.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 -index c90d69733..70286c8f5 100644 ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -37,7 +37,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - m68* | \ - m88k | \ - mcore | \ -- microblaze | \ -+ microblaze* | \ - mips* | \ - mmix | \ - mn10200 | \ --- -2.33.0 - diff --git a/package/diffutils/0002-sigsegv-fix-build-on-or1k.patch b/package/diffutils/0002-sigsegv-fix-build-on-or1k.patch deleted file mode 100644 index 73385fe9f7..0000000000 --- a/package/diffutils/0002-sigsegv-fix-build-on-or1k.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 496c1740e5475be85b65fdb2b143771f09ed27cb Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 11 Nov 2021 10:06:31 +0100 -Subject: sigsegv: fix build on or1k - -Fix the following build failure on or1k with diffutils 3.8 -https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=e54aa6196947ed22ff66bcd714e4fc7bd0c5c3b4 -sigsegv.c:979:28: error: 'struct vma_struct' has no member named 'is_near_this' -http://autobuild.buildroot.org/results/5427e52489d29ed4f18b4a70b3c36f0f7bb0ddd9 - -[Retrieved from: -https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=496c1740e5475be85b65fdb2b143771f09ed27cb] -Signed-off-by: Fabrice Fontaine ---- - m4/stack-direction.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 -index 70286c8f5..29e398d77 100644 ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -45,6 +45,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - nios2 | \ - nds32* | \ - ns32k | \ -+ or1k | \ - pdp11 | \ - pj* | \ - powerpc* | rs6000 | \ --- -cgit v1.2.1 - diff --git a/package/diffutils/0003-sys_random-port-better-to-uClibc-1-0-35.patch b/package/diffutils/0003-sys_random-port-better-to-uClibc-1-0-35.patch deleted file mode 100644 index f9dd12f8e6..0000000000 --- a/package/diffutils/0003-sys_random-port-better-to-uClibc-1-0-35.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 135414a7f543e4d40ad0a7cbd51885e159a6e0f4 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Tue, 30 Nov 2021 17:50:01 -0800 -Subject: sys_random: port better to uClibc < 1.0.35 - -Problem reported by Fabrice Fontaine in: -https://lists.gnu.org/r/bug-gnulib/2021-11/msg00043.html -* lib/sys_random.in.h [HAVE_SYS_RANDOM_H && !__GLIBC__ && __UCLIBC__]: -Include , in case this file is included before -__UCLIBC__ is defined. - -[Retrieved (and backported to remove ChangeLog update) from: -https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=135414a7f543e4d40ad0a7cbd51885e159a6e0f4] -Signed-off-by: Fabrice Fontaine ---- - ChangeLog | 9 +++++++++ - lib/sys_random.in.h | 6 ++++-- - 2 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/lib/sys_random.in.h b/lib/sys_random.in.h -index 1abd6c544..8b4b934a1 100644 ---- a/lib/sys_random.in.h -+++ b/lib/sys_random.in.h -@@ -23,8 +23,10 @@ - - #if @HAVE_SYS_RANDOM_H@ - --/* On uClibc, assumes prior inclusion of . */ --# if defined __UCLIBC__ -+/* On uClibc < 1.0.35, assumes prior inclusion of . -+ Do not use __UCLIBC__ here, as it might not be defined yet. -+ But avoid namespace pollution on glibc systems. */ -+# ifndef __GLIBC__ - # include - # endif - /* On Mac OS X 10.5, assumes prior inclusion of . --- -cgit v1.2.1 - diff --git a/package/diffutils/0004-sigsegv-Fix-compilation-error-on-arceb-CPUs.patch b/package/diffutils/0004-sigsegv-Fix-compilation-error-on-arceb-CPUs.patch deleted file mode 100644 index 20db798f3a..0000000000 --- a/package/diffutils/0004-sigsegv-Fix-compilation-error-on-arceb-CPUs.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1957bb5113a2bf02c7ecf0815125eec04b9476d2 Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Sat, 16 Apr 2022 03:01:51 +0200 -Subject: sigsegv: Fix compilation error on arceb CPUs. - -Reported by Fabrice Fontaine in -. - -* m4/stack-direction.m4 (SV_STACK_DIRECTION): Treat the 'arc' variants -like 'arc'. - -[Retrieved (and backported) from: -https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=1957bb5113a2bf02c7ecf0815125eec04b9476d2] -Signed-off-by: Fabrice Fontaine ---- - ChangeLog | 8 ++++++++ - m4/stack-direction.m4 | 4 ++-- - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 -index 1df823e..924c5de 100644 ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -1,4 +1,4 @@ --# stack-direction.m4 serial 7 -+# stack-direction.m4 serial 11 - dnl Copyright (C) 2002-2021 Free Software Foundation, Inc. - dnl This file is free software, distributed under the terms of the GNU - dnl General Public License. As a special exception to the GNU General -@@ -18,7 +18,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - a29k | \ - aarch64* | \ - alpha* | \ -- arc | \ -+ arc | arceb | arc32 | arc64 | \ - arm* | strongarm* | xscale* | \ - avr | avr32 | \ - bfin | \ --- -cgit v1.1 - diff --git a/package/diffutils/0005-sigsegv-Add-support-for-Linux-PowerPC-32-bit-with-mu.patch b/package/diffutils/0005-sigsegv-Add-support-for-Linux-PowerPC-32-bit-with-mu.patch deleted file mode 100644 index 16e0941f6c..0000000000 --- a/package/diffutils/0005-sigsegv-Add-support-for-Linux-PowerPC-32-bit-with-mu.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 6f2f006185cdeeda997d19d651379bfc6887e394 Mon Sep 17 00:00:00 2001 -From: Joel Stanley -Date: Mon, 6 Jun 2022 17:14:12 +0930 -Subject: [PATCH] sigsegv: Add support for Linux/PowerPC (32-bit) with musl - libc. Reported by Khem Raj in - . - -* src/sigsegv.c (SIGSEGV_FAULT_STACKPOINTER): In the Linux/PowerPC -32-bit case, handle musl libc differently. -* modules/sigsegv (Files): Add m4/musl.m4. -(configure.ac): Invoke gl_MUSL_LIBC. - -Backported from http://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=2d830e4a792fcd9f614ed08a7f18584b8b21d23b -Signed-off-by: Joel Stanley ---- - lib/sigsegv.c | 25 +++++++++++++++++++++---- - 1 file changed, 21 insertions(+), 4 deletions(-) - -diff --git a/lib/sigsegv.c b/lib/sigsegv.c -index da70ffa5fda1..da64d7d0b617 100644 ---- a/lib/sigsegv.c -+++ b/lib/sigsegv.c -@@ -227,11 +227,28 @@ int libsigsegv_version = LIBSIGSEGV_VERSION; - # if defined __powerpc64__ || defined __powerpc64_elfv2__ /* 64-bit */ - # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1] - # else /* 32-bit */ --/* both should be equivalent */ --# if 0 --# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] -+# if MUSL_LIBC -+/* musl libc has a different structure of ucontext_t in -+ musl/arch/powerpc/bits/signal.h. */ -+/* The glibc comments say: -+ "Different versions of the kernel have stored the registers on signal -+ delivery at different offsets from the ucontext struct. Programs should -+ thus use the uc_mcontext.uc_regs pointer to find where the registers are -+ actually stored." */ -+# if 0 -+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1] -+# else -+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_regs->gregs[1] -+# endif - # else --# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] -+/* Assume the structure of ucontext_t in -+ glibc/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h. */ -+/* Because of the union, both definitions should be equivalent. */ -+# if 0 -+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] -+# else -+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] -+# endif - # endif - # endif - --- -2.35.1 - diff --git a/package/diffutils/diffutils.hash b/package/diffutils/diffutils.hash index 8cf4eb75c7..ff0e9ab278 100644 --- a/package/diffutils/diffutils.hash +++ b/package/diffutils/diffutils.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec diffutils-3.8.tar.xz +sha256 d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1 diffutils-3.9.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 6db68af7ec..1004437026 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -4,14 +4,12 @@ # ################################################################################ -DIFFUTILS_VERSION = 3.8 +DIFFUTILS_VERSION = 3.9 DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils DIFFUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) DIFFUTILS_LICENSE = GPL-3.0+ DIFFUTILS_LICENSE_FILES = COPYING -# We're patching m4/stack-direction.m4 -DIFFUTILS_AUTORECONF = YES # Since glibc >= 2.26, don't try to use getopt_long replacement bundled # with diffutils. It will conflict with the one from glibc.