mirror of
https://github.com/SerenityOS/serenity
synced 2024-09-06 17:06:31 +00:00
Ports: Update diffutils to version 3.7
This commit is contained in:
parent
10e8b99038
commit
ed62fc9a43
|
@ -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/ |
|
| [`curl`](curl/) | curl | 7.77.0 | https://curl.se/ |
|
||||||
| [`dash`](dash/) | DASH | 0.5.10.2 | http://gondor.apana.org.au/~herbert/dash |
|
| [`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/ |
|
| [`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 |
|
| [`dmidecode`](dmidecode/) | dmidecode | 3.3 | https://github.com/mirror/dmidecode |
|
||||||
| [`doom`](doom/) | DOOM | | https://github.com/SerenityOS/SerenityDOOM |
|
| [`doom`](doom/) | DOOM | | https://github.com/SerenityOS/SerenityDOOM |
|
||||||
| [`dropbear`](dropbear/) | Dropbear SSH | 2019.78 | https://dropbear.nl/mirror/dropbear.html |
|
| [`dropbear`](dropbear/) | Dropbear SSH | 2019.78 | https://dropbear.nl/mirror/dropbear.html |
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
#!/usr/bin/env -S bash ../.port_include.sh
|
#!/usr/bin/env -S bash ../.port_include.sh
|
||||||
port=diffutils
|
port=diffutils
|
||||||
version=3.5
|
version=3.7
|
||||||
files="https://ftpmirror.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz diffutils-${version}.tar.xz
|
files="https://ftpmirror.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz diffutils-${version}.tar.xz b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26"
|
||||||
https://ftpmirror.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz.sig diffutils-${version}.tar.xz.sig
|
auth_type=sha256
|
||||||
https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
|
|
||||||
useconfigure=true
|
useconfigure=true
|
||||||
auth_type="sig"
|
depends="libiconv"
|
||||||
auth_opts="--keyring ./gnu-keyring.gpg diffutils-${version}.tar.xz.sig"
|
|
||||||
|
|
11
Ports/diffutils/patches/config.sub.patch
Normal file
11
Ports/diffutils/patches/config.sub.patch
Normal file
|
@ -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* \
|
|
@ -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* \
|
|
|
@ -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 <limits.h>
|
|
||||||
# include <sys/resource.h>
|
|
||||||
|
|
||||||
@@ -117,5 +118,6 @@
|
|
||||||
|
|
||||||
return INT_MAX;
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -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) \
|
|
Loading…
Reference in a new issue