bash: Rebuild and cleanup

Signed-off-by: Reilly Brogan <[email protected]>

b/bash/manifest.x86_64.jsonc

@@ -4,7 +4,7 @@
 	"packages": {
 		"bash": {
 			"build-depends": [
-				"bison",
+				"binary(bison)",
 				"pkgconfig(ncursesw)",
 				"pkgconfig(readline)"
 			],
@@ -17,8 +17,6 @@
 				"/usr/bin/bash",
 				"/usr/bin/bashbug",
 				"/usr/bin/sh",
-				"/usr/lib/bash/Makefile.inc",
-				"/usr/lib/bash/Makefile.sample",
 				"/usr/lib/bash/accept",
 				"/usr/lib/bash/basename",
 				"/usr/lib/bash/csv",
@@ -112,7 +110,8 @@
 				"/usr/share/locale/zh_CN/LC_MESSAGES/bash.mo",
 				"/usr/share/locale/zh_TW/LC_MESSAGES/bash.mo",
 				"/usr/share/man/man1/bash.1",
-				"/usr/share/man/man1/bashbug.1"
+				"/usr/share/man/man1/bashbug.1",
+				"/usr/share/man/man1/sh.1"
 			],
 			"name": "bash",
 			"provides": [
@@ -123,7 +122,7 @@
 		},
 		"bash-devel": {
 			"build-depends": [
-				"bison",
+				"binary(bison)",
 				"pkgconfig(ncursesw)",
 				"pkgconfig(readline)"
 			],
@@ -199,6 +198,6 @@
 		}
 	},
 	"source-name": "bash",
-	"source-release": "20",
+	"source-release": "21",
 	"source-version": "5.2.37"
 }

b/bash/stone.yaml

@@ -5,7 +5,7 @@
 #
 name        : bash
 version     : 5.2.37
-release     : 20
+release     : 21
 homepage    : http://www.gnu.org/software/bash/bash.html
 upstreams   :
     - https://ftp.gnu.org/gnu/bash/bash-5.2.37.tar.gz : 9599b22ecd1d5787ad7d3b7bf0c59f312b3396d1e281175dd1f8a4014da621ff
@@ -20,19 +20,22 @@ description : |
 license     :
     - GPL-3.0-or-later
 builddeps   :
+    - binary(bison)
     - pkgconfig(ncursesw)
     - pkgconfig(readline)
-    - bison
 setup       : |
     %patch %(pkgdir)/stateless.patch
 
+    export CFLAGS="$CFLAGS -DRECYCLES_PIDS -DSYSLOG_HISTORY -DSYSLOG_SHOPT=0"
+
     # often hangs
     rm tests/run-jobs
 
     %configure \
         --without-bash-malloc \
         --with-installed-readline \
-        --with-ncurses \
+        --with-curses \
+        --enable-history \
         --enable-readline \
         --enable-nls
 build       : |
@@ -44,7 +47,12 @@ install     : |
     %install_file %(pkgdir)/serpent-stateless-shell-conf.sh %(installroot)%(vendordir)%(sysconfdir)/serpent-stateless-shell-conf.sh
     %install_file %(pkgdir)/40-prompt.sh %(installroot)%(vendordir)%(sysconfdir)/profile.d/40-prompt.sh
     %install_file %(pkgdir)/41-alias.sh %(installroot)%(vendordir)%(sysconfdir)/profile.d/41-alias.sh
-    ln -svf bash "%(installroot)/usr/bin/sh"
+
+    ln -svf bash "%(installroot)%(bindir)/sh"
+    ln -sv bash.1 "%(installroot)%(mandir)/man1/sh.1"
+
+    # These are useless
+    rm -rfv %(installroot)%(libdir)/bash/Makefile.*
 check       : |
     %make check
 workload    : |