From ed62fc9a4329d915043bef7222afd44285dec18e Mon Sep 17 00:00:00 2001 From: Jelle Raaijmakers Date: Sun, 13 Jun 2021 16:43:45 +0200 Subject: [PATCH] Ports: Update diffutils to version 3.7 --- Ports/AvailablePorts.md | 2 +- Ports/diffutils/package.sh | 10 ++++------ Ports/diffutils/patches/config.sub.patch | 11 +++++++++++ Ports/diffutils/patches/fix-autoconf.patch | 10 ---------- .../diffutils/patches/fix-getdtablesize.patch | 18 ------------------ Ports/diffutils/patches/fix-intprops.patch | 17 ----------------- 6 files changed, 16 insertions(+), 52 deletions(-) create mode 100644 Ports/diffutils/patches/config.sub.patch delete mode 100644 Ports/diffutils/patches/fix-autoconf.patch delete mode 100644 Ports/diffutils/patches/fix-getdtablesize.patch delete mode 100644 Ports/diffutils/patches/fix-intprops.patch diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 6349e875279..6227191ed5b 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -20,7 +20,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^ | [`curl`](curl/) | curl | 7.77.0 | https://curl.se/ | | [`dash`](dash/) | DASH | 0.5.10.2 | http://gondor.apana.org.au/~herbert/dash | | [`dialog`](dialog/) | Dialog | 1.3-20210324 | https://invisible-island.net/dialog/ | -| [`diffutils`](diffutils/) | GNU Diffutils | 3.5 | https://www.gnu.org/software/diffutils/ | +| [`diffutils`](diffutils/) | GNU Diffutils | 3.7 | https://www.gnu.org/software/diffutils/ | | [`dmidecode`](dmidecode/) | dmidecode | 3.3 | https://github.com/mirror/dmidecode | | [`doom`](doom/) | DOOM | | https://github.com/SerenityOS/SerenityDOOM | | [`dropbear`](dropbear/) | Dropbear SSH | 2019.78 | https://dropbear.nl/mirror/dropbear.html | diff --git a/Ports/diffutils/package.sh b/Ports/diffutils/package.sh index 6443a11df0b..70dd8bfb078 100755 --- a/Ports/diffutils/package.sh +++ b/Ports/diffutils/package.sh @@ -1,9 +1,7 @@ #!/usr/bin/env -S bash ../.port_include.sh port=diffutils -version=3.5 -files="https://ftpmirror.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz diffutils-${version}.tar.xz -https://ftpmirror.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz.sig diffutils-${version}.tar.xz.sig -https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" +version=3.7 +files="https://ftpmirror.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz diffutils-${version}.tar.xz b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26" +auth_type=sha256 useconfigure=true -auth_type="sig" -auth_opts="--keyring ./gnu-keyring.gpg diffutils-${version}.tar.xz.sig" +depends="libiconv" diff --git a/Ports/diffutils/patches/config.sub.patch b/Ports/diffutils/patches/config.sub.patch new file mode 100644 index 00000000000..df5e712e87b --- /dev/null +++ b/Ports/diffutils/patches/config.sub.patch @@ -0,0 +1,11 @@ +--- diffutils-3.7/build-aux/config.sub 2018-12-24 02:21:56.000000000 +0100 ++++ diffutils-3.7-patched/build-aux/config.sub 2021-06-13 16:00:32.864108734 +0200 +@@ -1337,7 +1337,7 @@ + gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ +- | sym* | kopensolaris* | plan9* \ ++ | sym* | kopensolaris* | plan9* | serenity* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ diff --git a/Ports/diffutils/patches/fix-autoconf.patch b/Ports/diffutils/patches/fix-autoconf.patch deleted file mode 100644 index 3c51ece5650..00000000000 --- a/Ports/diffutils/patches/fix-autoconf.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- diffutils-3.5/build-aux/config.sub.orig Sat Jan 25 19:30:30 2020 -+++ diffutils-3.5/build-aux/config.sub Sat Jan 25 19:30:39 2020 -@@ -1382,6 +1382,7 @@ - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -+ | -serenity* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ diff --git a/Ports/diffutils/patches/fix-getdtablesize.patch b/Ports/diffutils/patches/fix-getdtablesize.patch deleted file mode 100644 index ead594a4c26..00000000000 --- a/Ports/diffutils/patches/fix-getdtablesize.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur diffutils-3.5/lib/getdtablesize.c diffutils-3.5.serenity/lib/getdtablesize.c ---- diffutils-3.5/lib/getdtablesize.c 2021-04-11 06:54:25.712284497 +0200 -+++ diffutils-3.5.serenity/lib/getdtablesize.c 2021-04-11 06:52:52.543810671 +0200 -@@ -86,6 +86,7 @@ - - #else - -+#ifndef __serenity__ - # include - # include - -@@ -117,5 +118,6 @@ - - return INT_MAX; - } -+#endif - - #endif diff --git a/Ports/diffutils/patches/fix-intprops.patch b/Ports/diffutils/patches/fix-intprops.patch deleted file mode 100644 index b364571e04f..00000000000 --- a/Ports/diffutils/patches/fix-intprops.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- diffutils-3.5/lib/intprops.h.orig Sat Jan 25 19:35:59 2020 -+++ diffutils-3.5/lib/intprops.h Sat Jan 25 19:36:23 2020 -@@ -230,11 +230,11 @@ - (e.g., A and B) have the same type as MIN and MAX. Instead, they assume - that the result (e.g., A + B) has that type. */ - #if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL --# define _GL_ADD_OVERFLOW(a, b, min, max) -+# define _GL_ADD_OVERFLOW(a, b, min, max) \ - __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0) --# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) -+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ - __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0) --# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) -+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ - __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0) - #else - # define _GL_ADD_OVERFLOW(a, b, min, max) \