diff options
| -rwxr-xr-x | Meta/lint-ports.py | 1 | ||||
| -rw-r--r-- | Ports/AvailablePorts.md | 2 | ||||
| -rwxr-xr-x | Ports/diffutils/package.sh | 4 | ||||
| -rw-r--r-- | Ports/diffutils/patches/fnmatch.patch | 14 |
4 files changed, 3 insertions, 18 deletions
diff --git a/Meta/lint-ports.py b/Meta/lint-ports.py index ae23369c7e..18d71f323d 100755 --- a/Meta/lint-ports.py +++ b/Meta/lint-ports.py @@ -37,7 +37,6 @@ PORTS_MISSING_DESCRIPTIONS = { 'c-ray', 'curl', 'dash', - 'diffutils', 'dosbox-staging', 'dropbear', 'ed', diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 62801f5085..61a24f1481 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -31,7 +31,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^ | [`curl`](curl/) | curl | 7.82.0 | https://curl.se/ | | [`dash`](dash/) | DASH | 0.5.10.2 | http://gondor.apana.org.au/~herbert/dash | | [`dialog`](dialog/) | Dialog | 1.3-20220117 | https://invisible-island.net/dialog/ | -| [`diffutils`](diffutils/) | GNU Diffutils | 3.7 | https://www.gnu.org/software/diffutils/ | +| [`diffutils`](diffutils/) | GNU Diffutils | 3.8 | https://www.gnu.org/software/diffutils/ | | [`dmidecode`](dmidecode/) | dmidecode | 3.3 | https://github.com/mirror/dmidecode | | [`doom`](doom/) | DOOM | | https://github.com/SerenityOS/SerenityDOOM | | [`dos2unix`](dos2unix/) | dos2unix | 7.4.2 | https://waterlan.home.xs4all.nl/dos2unix.html | diff --git a/Ports/diffutils/package.sh b/Ports/diffutils/package.sh index bd84278263..c8e5230bbf 100755 --- a/Ports/diffutils/package.sh +++ b/Ports/diffutils/package.sh @@ -1,7 +1,7 @@ #!/usr/bin/env -S bash ../.port_include.sh port=diffutils -version=3.7 -files="https://ftpmirror.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz diffutils-${version}.tar.xz b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26" +version=3.8 +files="https://ftpmirror.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz diffutils-${version}.tar.xz a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec" auth_type=sha256 useconfigure=true use_fresh_config_sub=true diff --git a/Ports/diffutils/patches/fnmatch.patch b/Ports/diffutils/patches/fnmatch.patch deleted file mode 100644 index 711781a318..0000000000 --- a/Ports/diffutils/patches/fnmatch.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur gettext-0.21/gettext-tools/gnulib-lib/fnmatch_loop.c gettext-0.21.serenity/gettext-tools/gnulib-lib/fnmatch_loop.c ---- diffutils-3.7/lib/fnmatch_loop.c 2020-06-26 21:57:10.000000000 +0200 -+++ diffutils-3.7.serenity/lib/fnmatch_loop.c 2021-05-08 05:06:59.944736766 +0200 -@@ -19,6 +19,10 @@ - - /* Match STRING against the file name pattern PATTERN, returning zero if - it matches, nonzero if not. */ -+#ifdef __serenity__ -+# define FNM_EXTMATCH 9000 -+#endif -+ - static int EXT (INT opt, const CHAR *pattern, const CHAR *string, - const CHAR *string_end, bool no_leading_period, int flags) - internal_function; |