diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 01ccee28b770..06fc5721af1d 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,129 +1,128 @@ PORTNAME= bash -PATCHLEVEL= 26 +PATCHLEVEL= 32 PORTVERSION= 5.2.${PATCHLEVEL:S/^0//g} -PORTREVISION= 1 CATEGORIES= shells MASTER_SITES= GNU DISTNAME= ${PORTNAME}-${PORTVERSION:R} DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES= GNU/${PORTNAME}/${DISTNAME}-patches/ PATCHFILES!= /usr/bin/jot -s " " -w \ ${PORTNAME}${PORTVERSION:R:S/.//g}-%03d \ ${PATCHLEVEL} 1 ${PATCHLEVEL} MAINTAINER= ehaupt@FreeBSD.org COMMENT= GNU Project's Bourne Again SHell WWW= https://www.gnu.org/software/bash/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING USES= bison cpe iconv localbase pathfix CPE_VENDOR= gnu GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-bash-malloc \ --disable-rpath \ --enable-disabled-builtins \ --with-libiconv-prefix=${ICONV_PREFIX} MAKE_ARGS+= TERMCAP_LIB=-ltinfow INFO= bash PORTDOCS= FAQ INTRO CHANGES COMPAT NEWS POSIX RBASH README \ bash.html bashref.html OPTIONS_DEFINE= FDESCFS PORTS_READLINE HELP NLS STATIC SYSBASHRC \ SYSLOG DOCS OPTIONS_DEFAULT= HELP PORTS_READLINE OPTIONS_SUB= yes FDESCFS_DESC= Enable use of /dev/fd HELP_DESC= Enable builtin help PORTS_READLINE_DESC= libreadline from ports instead of bundled one SYSBASHRC_DESC= Enable system-wide rc files FDESCFS_CONFIGURE_ENV_OFF= bash_cv_dev_fd=absent FDESCFS_SUB_FILES= pkg-message HELP_CONFIGURE_ENABLE= help-builtin NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls PORTS_READLINE_BUILD_DEPENDS= readline>=8.2:devel/readline PORTS_READLINE_USES= readline PORTS_READLINE_CONFIGURE_WITH= installed-readline .if empty(PKGNAMESUFFIX) CONFLICTS+= bash-static bash52-static .else CONFLICTS+= bash bash52 .endif CONFLICTS+= bashc .include .if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:tl} != "no") CONFIGURE_ARGS+= --enable-static-link LLD_UNSAFE= yes .else CONFIGURE_ARGS+= --disable-static-link # Bash symbols must be exported in order to link runtime plugins, i.e., # "enable -f". (Plugins are not supported for bash-static.) LDFLAGS+= -Wl,-export-dynamic .endif STANDARD_PATH= /sbin:/bin:/usr/sbin:/usr/bin CPPFLAGS+= -DDEFAULT_PATH_VALUE='\"${STANDARD_PATH}:${LOCALBASE}/sbin:${LOCALBASE}/bin\"' \ -DSTANDARD_UTILS_PATH='\"${STANDARD_PATH}\"' post-patch: # Ensure y.tab.c is regenerated ${TOUCH} ${WRKSRC}/parse.y ${RM} ${WRKSRC}/y.tab.c @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/doc/bash.1 .if ${PORT_OPTIONS:MSYSLOG} @${REINPLACE_CMD} \ -e "s|/\*.*#define SYSLOG_HISTORY .*\*/|#define SYSLOG_HISTORY|g" \ -e "s|/\*.*#define SYSLOG_SHOPT .*\*/|#define SYSLOG_SHOPT 1|g" \ ${WRKSRC}/config-top.h .endif @${REINPLACE_CMD} -e "s|\(/etc/profile\)|${LOCALBASE}\1|" \ ${WRKSRC}/pathnames.h.in @${REINPLACE_CMD} -e "s|/etc/[iI]nputrc|${LOCALBASE}/etc/inputrc|g" \ ${WRKSRC}/doc/*.info ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.1 \ ${WRKSRC}/lib/readline/rlconf.h post-patch-SYSBASHRC-on: @${REINPLACE_CMD} \ -e "s|.*\(#define SYS_BASH.*\)\(/etc/.*\"\).*|\1${PREFIX}\2|" \ ${WRKSRC}/config-top.h pre-build: @${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build post-install: ${LN} -sf bash ${STAGEDIR}${PREFIX}/bin/rbash @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/FAQ \ ${WRKSRC}/doc/INTRO ${STAGEDIR}${DOCSDIR} for d in ${PORTDOCS:NFAQ:NINTRO:N*html}; do \ ${INSTALL_DATA} ${WRKSRC}/$${d} ${STAGEDIR}${DOCSDIR}; \ done regress: build cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} test ckp: ${MAKE} -DPATCH_DEBUG clean patch # requires ftp/ncftp3 cklatest: @${ECHO} -n "Currently at: " @${MAKE} -V PATCHLEVEL -ncftpls \ ${PATCH_SITES:Mftp*:Ox:[1]} \ | fgrep -v .sig | ${SORT} | ${TAIL} .include diff --git a/shells/bash/distinfo b/shells/bash/distinfo index 29c46ec43b35..fa267ba77b7d 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1,55 +1,67 @@ -TIMESTAMP = 1705223560 +TIMESTAMP = 1722495853 SHA256 (bash/bash-5.2.tar.gz) = a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb SIZE (bash/bash-5.2.tar.gz) = 10950833 SHA256 (bash/bash52-001) = f42f2fee923bc2209f406a1892772121c467f44533bedfe00a176139da5d310a SIZE (bash/bash52-001) = 1381 SHA256 (bash/bash52-002) = 45cc5e1b876550eee96f95bffb36c41b6cb7c07d33f671db5634405cd00fd7b8 SIZE (bash/bash52-002) = 1328 SHA256 (bash/bash52-003) = 6a090cdbd334306fceacd0e4a1b9e0b0678efdbbdedbd1f5842035990c8abaff SIZE (bash/bash52-003) = 2157 SHA256 (bash/bash52-004) = 38827724bba908cf5721bd8d4e595d80f02c05c35f3dd7dbc4cd3c5678a42512 SIZE (bash/bash52-004) = 2016 SHA256 (bash/bash52-005) = ece0eb544368b3b4359fb8464caa9d89c7a6743c8ed070be1c7d599c3675d357 SIZE (bash/bash52-005) = 1515 SHA256 (bash/bash52-006) = d1e0566a257d149a0d99d450ce2885123f9995e9c01d0a5ef6df7044a72a468c SIZE (bash/bash52-006) = 8790 SHA256 (bash/bash52-007) = 2500a3fc21cb08133f06648a017cebfa27f30ea19c8cbe8dfefdf16227cfd490 SIZE (bash/bash52-007) = 9072 SHA256 (bash/bash52-008) = 6b4bd92fd0099d1bab436b941875e99e0cb3c320997587182d6267af1844b1e8 SIZE (bash/bash52-008) = 1771 SHA256 (bash/bash52-009) = f95a817882eaeb0cb78bce82859a86bbb297a308ced730ebe449cd504211d3cd SIZE (bash/bash52-009) = 1316 SHA256 (bash/bash52-010) = c7705e029f752507310ecd7270aef437e8043a9959e4d0c6065a82517996c1cd SIZE (bash/bash52-010) = 2045 SHA256 (bash/bash52-011) = 831b5f25bf3e88625f3ab315043be7498907c551f86041fa3b914123d79eb6f4 SIZE (bash/bash52-011) = 1229 SHA256 (bash/bash52-012) = 2fb107ce1fb8e93f36997c8b0b2743fc1ca98a454c7cc5a3fcabec533f67d42c SIZE (bash/bash52-012) = 9107 SHA256 (bash/bash52-013) = 094b4fd81bc488a26febba5d799689b64d52a5505b63e8ee854f48d356bc7ce6 SIZE (bash/bash52-013) = 1503 SHA256 (bash/bash52-014) = 3ef9246f2906ef1e487a0a3f4c647ae1c289cbd8459caa7db5ce118ef136e624 SIZE (bash/bash52-014) = 3245 SHA256 (bash/bash52-015) = ef73905169db67399a728e238a9413e0d689462cb9b72ab17a05dba51221358a SIZE (bash/bash52-015) = 8088 SHA256 (bash/bash52-016) = 155853bc5bd10e40a9bea369fb6f50a203a7d0358e9e32321be0d9fa21585915 SIZE (bash/bash52-016) = 1225 SHA256 (bash/bash52-017) = 1c48cecbc9b7b4217990580203b7e1de19c4979d0bd2c0e310167df748df2c89 SIZE (bash/bash52-017) = 1396 SHA256 (bash/bash52-018) = 4641dd49dd923b454dd0a346277907090410f5d60a29a2de3b82c98e49aaaa80 SIZE (bash/bash52-018) = 151467 SHA256 (bash/bash52-019) = 325c26860ad4bba8558356c4ab914ac57e7b415dac6f5aae86b9b05ccb7ed282 SIZE (bash/bash52-019) = 2548 SHA256 (bash/bash52-020) = b6fc252aeb95ce67c9b017d29d81e8a5e285db4bf20d4ec8cdca35892be5c01d SIZE (bash/bash52-020) = 1459 SHA256 (bash/bash52-021) = 8334b88117ad047598f23581aeb0c66c0248cdd77abc3b4e259133aa307650cd SIZE (bash/bash52-021) = 1890 SHA256 (bash/bash52-022) = 78b5230a49594ec30811e72dcd0f56d1089710ec7828621022d08507aa57e470 SIZE (bash/bash52-022) = 1305 SHA256 (bash/bash52-023) = af905502e2106c8510ba2085aa2b56e64830fc0fdf6ee67ebb459ac11696dcd3 SIZE (bash/bash52-023) = 1817 SHA256 (bash/bash52-024) = 971534490117eb05d97d7fd81f5f9d8daf927b4d581231844ffae485651b02c3 SIZE (bash/bash52-024) = 2298 SHA256 (bash/bash52-025) = 5138f487e7cf71a6323dc81d22419906f1535b89835cc2ff68847e1a35613075 SIZE (bash/bash52-025) = 1454 SHA256 (bash/bash52-026) = 96ee1f549aa0b530521e36bdc0ba7661602cfaee409f7023cac744dd42852eac SIZE (bash/bash52-026) = 1372 +SHA256 (bash/bash52-027) = e12a890a2e4f0d9c6ec1ce65b73da4fe116c8e4209bac8ac9dc4cd96f486ab39 +SIZE (bash/bash52-027) = 1881 +SHA256 (bash/bash52-028) = 6042780ba2893daca4a3f0f9b65728592cd7bb6d4cebe073855a6aad4d63aac1 +SIZE (bash/bash52-028) = 1571 +SHA256 (bash/bash52-029) = 125cacb37e625471924b3ee06c54cb1bf21b3b7fe0e569d24a681b0ec4a29987 +SIZE (bash/bash52-029) = 3619 +SHA256 (bash/bash52-030) = c3ff73230e123acdb5ac216921a386df8f74340459533d776d02811a1f76698f +SIZE (bash/bash52-030) = 4111 +SHA256 (bash/bash52-031) = c2d1b7be2df771126105020af7fafa00fffd4deff4a4e45d60fc6a235bcba795 +SIZE (bash/bash52-031) = 1159 +SHA256 (bash/bash52-032) = 7b9c77daeca93ff711781d7537234166e83ed9835ce1ee7dcd5742319c372a16 +SIZE (bash/bash52-032) = 1529 diff --git a/shells/bash/files/patch-config-top.h b/shells/bash/files/patch-config-top.h index 3d458d2c12e4..db9f68e9dfc4 100644 --- a/shells/bash/files/patch-config-top.h +++ b/shells/bash/files/patch-config-top.h @@ -1,11 +1,11 @@ ---- config-top.h.orig 2021-11-05 13:11:12 UTC -+++ config-top.h +--- config-top.h.orig 2021-11-05 14:11:12 UTC ++++ config-top.h 2024-08-01 09:10:04 UTC @@ -84,7 +84,7 @@ #endif /* Default primary and secondary prompt strings. */ -#define PPROMPT "\\s-\\v\\$ " +#define PPROMPT "[\\u@\\h \\w]\\$ " #define SPROMPT "> " /* Undefine this if you don't want the ksh-compatible behavior of reprinting diff --git a/shells/bash/files/patch-configure b/shells/bash/files/patch-configure deleted file mode 100644 index 0ca11a5d826f..000000000000 --- a/shells/bash/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2022-09-23 14:13:22 UTC -+++ configure -@@ -20443,7 +20443,7 @@ fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bash_cv_func_strtoimax" >&5 - printf "%s\n" "$bash_cv_func_strtoimax" >&6; } --if test $bash_cv_func_strtoimax = yes; then -+if test $bash_cv_func_strtoimax = no ; then - case " $LIBOBJS " in - *" strtoimax.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strtoimax.$ac_objext" diff --git a/shells/bash/files/patch-m4_strtoimax.m4 b/shells/bash/files/patch-m4_strtoimax.m4 deleted file mode 100644 index 3c047bd97654..000000000000 --- a/shells/bash/files/patch-m4_strtoimax.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- m4/strtoimax.m4.orig 2022-04-11 20:31:52 UTC -+++ m4/strtoimax.m4 -@@ -29,7 +29,7 @@ AC_CACHE_VAL(bash_cv_func_strtoimax, - fi - ]) - AC_MSG_RESULT($bash_cv_func_strtoimax) --if test $bash_cv_func_strtoimax = yes; then -+if test $bash_cv_func_strtoimax = no; then - AC_LIBOBJ(strtoimax) - fi - ])