diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 31f145bd6..4f894819a 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,7 +1,6 @@ COMMENT= GNU Bourne Again Shell -DISTNAME= bash-5.2.21 -PKGNAME= bash-5.2.26 +DISTNAME= bash-5.2.37 CATEGORIES= shells HOMEPAGE= https://www.gnu.org/software/bash/ @@ -13,7 +12,7 @@ PERMIT_PACKAGE= Yes SITES= ${SITE_GNU:=bash/} SITES.p= ${SITE_GNU:=bash/bash-5.2-patches/} DIST_SUBDIR= bash -.for i in 022 023 024 025 026 +.for i in PATCHFILES.p += bash52-$i .endfor diff --git a/shells/bash/distinfo b/shells/bash/distinfo index 34d5ba607..4a7c85c6e 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1,12 +1,2 @@ -SHA256 (bash/bash-5.2.21.tar.gz) = yOMb3Fm2mq/8WzZQmQW6Ply7EnRwkdJ7S5d/B4Vg1bg= -SHA256 (bash/bash52-022) = eLUjCklZTsMIEectzQ9W0QiXEOx4KGIQItCFB6pX5HA= -SHA256 (bash/bash52-023) = r5BVAuIQbIUQuiCFqitW5kgw/A/fbuZ+u0WawRaW3NM= -SHA256 (bash/bash52-024) = lxU0SQEX6wXZfX/YH1+dja+Se01YEjGET/rkhWUbAsM= -SHA256 (bash/bash52-025) = UTj0h+fPcaYyPcgdIkGZBvFTW4mDXML/aIR+GjVhMHU= -SHA256 (bash/bash52-026) = lu4fVJqgtTBSHja9wLp2YWAs+u5An3AjysdE3UKFLqw= -SIZE (bash/bash-5.2.21.tar.gz) = 10952391 -SIZE (bash/bash52-022) = 1305 -SIZE (bash/bash52-023) = 1817 -SIZE (bash/bash52-024) = 2298 -SIZE (bash/bash52-025) = 1454 -SIZE (bash/bash52-026) = 1372 +SHA256 (bash/bash-5.2.37.tar.gz) = lZmyLs0dV4etfTt78MWfMSszltHigRdd0fikAU2mIf8= +SIZE (bash/bash-5.2.37.tar.gz) = 11128314 diff --git a/shells/bash/patches/patch-configure b/shells/bash/patches/patch-configure index b1f708c60..dea3a4981 100644 --- a/shells/bash/patches/patch-configure +++ b/shells/bash/patches/patch-configure @@ -1,11 +1,29 @@ Index: configure --- configure.orig +++ configure +@@ -12289,7 +12289,7 @@ else $as_nop + if test "$cross_compiling" = yes + then : + case "$host_os" in +- openbsd*) gt_cv_locale_fake="guessing yes" ;; ++ openbsd*|secbsd*) gt_cv_locale_fake="guessing yes" ;; + *) gt_cv_locale_fake="guessing no" ;; + esac + +@@ -21728,7 +21728,7 @@ linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loa + *) printf "%s\n" "#define PGRP_PIPE 1" >>confdefs.h + ;; + esac ;; +-netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; ++netbsd*|openbsd*|secbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; + freebsd*|midnightbsd*) LOCAL_CFLAGS='-DHEREDOC_PIPESIZE=4096' ;; + *qnx[67]*) LOCAL_LIBS="-lncurses" ;; + *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; @@ -21753,6 +21753,7 @@ freebsd[3-9]*) fi ;; freebsdelf*) LOCAL_LDFLAGS=-rdynamic ;; # allow dynamic loading dragonfly*) LOCAL_LDFLAGS=-rdynamic ;; # allow dynamic loading -+openbsd*) LOCAL_LDFLAGS=-rdynamic ;; # allow dynamic loading ++openbsd*|secbsd*) LOCAL_LDFLAGS=-rdynamic ;; # allow dynamic loading midnightbsd*) LOCAL_LDFLAGS=-rdynamic ;; # allow dynamic loading esac