summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Bertalan <dani@danielbertalan.dev>2022-01-10 17:25:38 +0100
committerLinus Groh <mail@linusgroh.de>2022-01-10 23:03:24 +0100
commit78fa430ca15f286f57a965cd5652b64fb2b86170 (patch)
tree34be9727e13a691f97cf981ae1e1448ae1bd9d09
parentd099527dbb60059091cdf4bb9f237f4c7ede444b (diff)
downloadserenity-78fa430ca15f286f57a965cd5652b64fb2b86170.zip
Ports: Update bash port to version 5.1.16
The `remove-conflicting-declaration-in-glob` patch seems to not be needed anymore.
-rw-r--r--Ports/AvailablePorts.md2
-rwxr-xr-xPorts/bash/package.sh4
-rw-r--r--Ports/bash/patches/remove-conflicting-declaration-in-glob.patch11
3 files changed, 3 insertions, 14 deletions
diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index 9314ab137c..4f5e84a3c7 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -6,7 +6,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
|----------------------------------------|-----------------------------------------------------------------|--------------------------|--------------------------------------------------------------------------------|
| [`Another-World`](Another-World/) | Another World Bytecode Interpreter | | https://github.com/fabiensanglard/Another-World-Bytecode-Interpreter |
| [`angband`](angband/) | Angband | 4.2.3 | https://rephial.org |
-| [`bash`](bash/) | GNU Bash | 5.1.8 | https://www.gnu.org/software/bash/ |
+| [`bash`](bash/) | GNU Bash | 5.1.16 | https://www.gnu.org/software/bash/ |
| [`bass`](bass/) | Beneath a Steel Sky | cd-1.2 | https://www.scummvm.org/games |
| [`bc`](bc/) | bc | 5.1.1 | https://github.com/gavinhoward/bc |
| [`binutils`](binutils/) | GNU Binutils | 2.37 | https://www.gnu.org/software/binutils/ |
diff --git a/Ports/bash/package.sh b/Ports/bash/package.sh
index 33b0a081c4..da7b3e8f2b 100755
--- a/Ports/bash/package.sh
+++ b/Ports/bash/package.sh
@@ -1,9 +1,9 @@
#!/usr/bin/env -S bash ../.port_include.sh
port=bash
-version=5.1.8
+version=5.1.16
useconfigure=true
configopts=("--disable-nls" "--without-bash-malloc")
-files="https://ftpmirror.gnu.org/gnu/bash/bash-${version}.tar.gz bash-${version}.tar.gz 0cfb5c9bb1a29f800a97bd242d19511c997a1013815b805e0fdd32214113d6be"
+files="https://ftpmirror.gnu.org/gnu/bash/bash-${version}.tar.gz bash-${version}.tar.gz 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558"
auth_type="sha256"
build() {
diff --git a/Ports/bash/patches/remove-conflicting-declaration-in-glob.patch b/Ports/bash/patches/remove-conflicting-declaration-in-glob.patch
deleted file mode 100644
index 1543a73565..0000000000
--- a/Ports/bash/patches/remove-conflicting-declaration-in-glob.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bash-5.1.8.serenity/lib/glob/glob.c 2020-10-30 18:49:00.000000000 +0000
-+++ bash-5.1.8/lib/glob/glob.c 2021-07-29 17:11:22.146328629 +0100
-@@ -122,7 +122,7 @@
- #else
- # define dequote_pathname udequote_pathname
- #endif
--static void dequote_pathname PARAMS((char *));
-+//static void dequote_pathname PARAMS((char *));
- static int glob_testdir PARAMS((char *, int));
- static char **glob_dir_to_array PARAMS((char *, char **, int));
-