mirror of
https://github.com/termux-pacman/termux-packages.git
synced 2026-01-28 05:32:35 +00:00
bump(main/bash): 5.3
This commit is contained in:
termux-pacman-bot
@@ -2,21 +2,20 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/bash/
|
||||
TERMUX_PKG_DESCRIPTION="A sh-compatible shell that incorporates useful features from the Korn shell (ksh) and C shell (csh)"
|
||||
TERMUX_PKG_LICENSE="GPL-3.0"
|
||||
TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000"
|
||||
_MAIN_VERSION=5.2
|
||||
_PATCH_VERSION=37
|
||||
TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION}
|
||||
TERMUX_PKG_REVISION=2
|
||||
_MAIN_VERSION=5.3
|
||||
_PATCH_VERSION=0
|
||||
TERMUX_PKG_VERSION=${_MAIN_VERSION} # .${_PATCH_VERSION}
|
||||
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/bash/bash-${_MAIN_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb
|
||||
TERMUX_PKG_SHA256=62dd49c44c399ed1b3f7f731e87a782334d834f08e098a35f2c87547d5dbb269
|
||||
TERMUX_PKG_AUTO_UPDATE=false
|
||||
TERMUX_PKG_DEPENDS="libandroid-support, libiconv, readline (>= 8.0), termux-tools"
|
||||
TERMUX_PKG_DEPENDS="libandroid-support, libiconv, readline (>= 8.3), termux-tools"
|
||||
TERMUX_PKG_RECOMMENDS="command-not-found, bash-completion"
|
||||
TERMUX_PKG_BREAKS="bash-dev"
|
||||
TERMUX_PKG_REPLACES="bash-dev"
|
||||
TERMUX_PKG_ESSENTIAL=true
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-multibyte --without-bash-malloc --with-installed-readline"
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-multibyte --without-bash-malloc --with-installed-readline --enable-progcomp"
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" bash_cv_job_control_missing=present"
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" bash_cv_sys_siglist=yes"
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" bash_cv_func_sigsetjmp=present"
|
||||
@@ -37,64 +36,29 @@ TERMUX_PKG_CONFFILES="etc/bash.bashrc etc/profile"
|
||||
TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1/bashbug.1 bin/bashbug"
|
||||
|
||||
termux_step_pre_configure() {
|
||||
declare -A PATCH_CHECKSUMS
|
||||
(( _PATCH_VERSION == 0 )) && return
|
||||
local PATCH_NUM PATCHFILE
|
||||
local -A PATCH_CHECKSUMS=()
|
||||
|
||||
PATCH_CHECKSUMS[001]=f42f2fee923bc2209f406a1892772121c467f44533bedfe00a176139da5d310a
|
||||
PATCH_CHECKSUMS[002]=45cc5e1b876550eee96f95bffb36c41b6cb7c07d33f671db5634405cd00fd7b8
|
||||
PATCH_CHECKSUMS[003]=6a090cdbd334306fceacd0e4a1b9e0b0678efdbbdedbd1f5842035990c8abaff
|
||||
PATCH_CHECKSUMS[004]=38827724bba908cf5721bd8d4e595d80f02c05c35f3dd7dbc4cd3c5678a42512
|
||||
PATCH_CHECKSUMS[005]=ece0eb544368b3b4359fb8464caa9d89c7a6743c8ed070be1c7d599c3675d357
|
||||
PATCH_CHECKSUMS[006]=d1e0566a257d149a0d99d450ce2885123f9995e9c01d0a5ef6df7044a72a468c
|
||||
PATCH_CHECKSUMS[007]=2500a3fc21cb08133f06648a017cebfa27f30ea19c8cbe8dfefdf16227cfd490
|
||||
PATCH_CHECKSUMS[008]=6b4bd92fd0099d1bab436b941875e99e0cb3c320997587182d6267af1844b1e8
|
||||
PATCH_CHECKSUMS[009]=f95a817882eaeb0cb78bce82859a86bbb297a308ced730ebe449cd504211d3cd
|
||||
PATCH_CHECKSUMS[010]=c7705e029f752507310ecd7270aef437e8043a9959e4d0c6065a82517996c1cd
|
||||
PATCH_CHECKSUMS[011]=831b5f25bf3e88625f3ab315043be7498907c551f86041fa3b914123d79eb6f4
|
||||
PATCH_CHECKSUMS[012]=2fb107ce1fb8e93f36997c8b0b2743fc1ca98a454c7cc5a3fcabec533f67d42c
|
||||
PATCH_CHECKSUMS[013]=094b4fd81bc488a26febba5d799689b64d52a5505b63e8ee854f48d356bc7ce6
|
||||
PATCH_CHECKSUMS[014]=3ef9246f2906ef1e487a0a3f4c647ae1c289cbd8459caa7db5ce118ef136e624
|
||||
PATCH_CHECKSUMS[015]=ef73905169db67399a728e238a9413e0d689462cb9b72ab17a05dba51221358a
|
||||
PATCH_CHECKSUMS[016]=155853bc5bd10e40a9bea369fb6f50a203a7d0358e9e32321be0d9fa21585915
|
||||
PATCH_CHECKSUMS[017]=1c48cecbc9b7b4217990580203b7e1de19c4979d0bd2c0e310167df748df2c89
|
||||
PATCH_CHECKSUMS[018]=4641dd49dd923b454dd0a346277907090410f5d60a29a2de3b82c98e49aaaa80
|
||||
PATCH_CHECKSUMS[019]=325c26860ad4bba8558356c4ab914ac57e7b415dac6f5aae86b9b05ccb7ed282
|
||||
PATCH_CHECKSUMS[020]=b6fc252aeb95ce67c9b017d29d81e8a5e285db4bf20d4ec8cdca35892be5c01d
|
||||
PATCH_CHECKSUMS[021]=8334b88117ad047598f23581aeb0c66c0248cdd77abc3b4e259133aa307650cd
|
||||
PATCH_CHECKSUMS[022]=78b5230a49594ec30811e72dcd0f56d1089710ec7828621022d08507aa57e470
|
||||
PATCH_CHECKSUMS[023]=af905502e2106c8510ba2085aa2b56e64830fc0fdf6ee67ebb459ac11696dcd3
|
||||
PATCH_CHECKSUMS[024]=971534490117eb05d97d7fd81f5f9d8daf927b4d581231844ffae485651b02c3
|
||||
PATCH_CHECKSUMS[025]=5138f487e7cf71a6323dc81d22419906f1535b89835cc2ff68847e1a35613075
|
||||
PATCH_CHECKSUMS[026]=96ee1f549aa0b530521e36bdc0ba7661602cfaee409f7023cac744dd42852eac
|
||||
PATCH_CHECKSUMS[027]=e12a890a2e4f0d9c6ec1ce65b73da4fe116c8e4209bac8ac9dc4cd96f486ab39
|
||||
PATCH_CHECKSUMS[028]=6042780ba2893daca4a3f0f9b65728592cd7bb6d4cebe073855a6aad4d63aac1
|
||||
PATCH_CHECKSUMS[029]=125cacb37e625471924b3ee06c54cb1bf21b3b7fe0e569d24a681b0ec4a29987
|
||||
PATCH_CHECKSUMS[030]=c3ff73230e123acdb5ac216921a386df8f74340459533d776d02811a1f76698f
|
||||
PATCH_CHECKSUMS[031]=c2d1b7be2df771126105020af7fafa00fffd4deff4a4e45d60fc6a235bcba795
|
||||
PATCH_CHECKSUMS[032]=7b9c77daeca93ff711781d7537234166e83ed9835ce1ee7dcd5742319c372a16
|
||||
PATCH_CHECKSUMS[033]=013ec6cc10ad98060a7c34ed5c11187bcc5bf4510f32de0d545db89a9a52a2e2
|
||||
PATCH_CHECKSUMS[034]=899fbb3b338048fe52a9c8252bf65ef1194cdff4f7a3fb3316f5f2396143232e
|
||||
PATCH_CHECKSUMS[035]=821a0a47fa692bb0a39482728b1b396bf951e2912768fea6f3026c813c1913e5
|
||||
PATCH_CHECKSUMS[036]=15c93f4936a5e5b88301f3ede767a23d3dd19635af2f3a91fb4cc0e560ca9057
|
||||
PATCH_CHECKSUMS[037]=8a2c1c3b5125d9ae5b47882f7d2ddf9648805f8c67c13aa5ea7efeac475cda94
|
||||
# PATCH_CHECKSUMS[001]=
|
||||
|
||||
for PATCH_NUM in $(seq -f '%03g' ${_PATCH_VERSION}); do
|
||||
for PATCH_NUM in $(seq -f '%03g' "${_PATCH_VERSION}"); do
|
||||
PATCHFILE=$TERMUX_PKG_CACHEDIR/bash_patch_${PATCH_NUM}.patch
|
||||
termux_download \
|
||||
"https://mirrors.kernel.org/gnu/bash/bash-${_MAIN_VERSION}-patches/bash${_MAIN_VERSION/./}-$PATCH_NUM" \
|
||||
$PATCHFILE \
|
||||
${PATCH_CHECKSUMS[$PATCH_NUM]}
|
||||
patch -p0 -i $PATCHFILE
|
||||
"$PATCHFILE" \
|
||||
"${PATCH_CHECKSUMS[$PATCH_NUM]}"
|
||||
patch -p0 -i "$PATCHFILE"
|
||||
done
|
||||
unset PATCH_CHECKSUMS PATCHFILE PATCH_NUM
|
||||
}
|
||||
|
||||
termux_step_post_make_install() {
|
||||
sed -e "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|g" \
|
||||
-e "s|@TERMUX_HOME@|$TERMUX_ANDROID_HOME|g" \
|
||||
$TERMUX_PKG_BUILDER_DIR/etc-profile > $TERMUX_PREFIX/etc/profile
|
||||
"$TERMUX_PKG_BUILDER_DIR/etc-profile" > "$TERMUX_PREFIX/etc/profile"
|
||||
|
||||
# /etc/bash.bashrc - System-wide .bashrc file for interactive shells. (config-top.h in bash source, patched to enable):
|
||||
sed -e "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|g" \
|
||||
-e "s|@TERMUX_HOME@|$TERMUX_ANDROID_HOME|g" \
|
||||
$TERMUX_PKG_BUILDER_DIR/etc-bash.bashrc > $TERMUX_PREFIX/etc/bash.bashrc
|
||||
"$TERMUX_PKG_BUILDER_DIR/etc-bash.bashrc" > "$TERMUX_PREFIX/etc/bash.bashrc"
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
diff -uNr bash-5.0/config-top.h bash-5.0.mod/config-top.h
|
||||
--- bash-5.0/config-top.h 2018-10-12 22:35:23.000000000 +0300
|
||||
+++ bash-5.0.mod/config-top.h 2019-02-20 14:15:53.266802311 +0200
|
||||
@@ -63,7 +63,7 @@
|
||||
diff --git a/config-top.h b/config-top.h
|
||||
index c47ab01b..5b84833e 100644
|
||||
--- a/config-top.h
|
||||
+++ b/config-top.h
|
||||
@@ -58,7 +58,7 @@
|
||||
/* The default value of the PATH variable. */
|
||||
#ifndef DEFAULT_PATH_VALUE
|
||||
#define DEFAULT_PATH_VALUE \
|
||||
@@ -10,16 +11,16 @@ diff -uNr bash-5.0/config-top.h bash-5.0.mod/config-top.h
|
||||
#endif
|
||||
|
||||
/* If you want to unconditionally set a value for PATH in every restricted
|
||||
@@ -74,7 +74,7 @@
|
||||
@@ -69,7 +69,7 @@
|
||||
the Posix.2 confstr () function, or CS_PATH define are not present. */
|
||||
#ifndef STANDARD_UTILS_PATH
|
||||
#define STANDARD_UTILS_PATH \
|
||||
- "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
|
||||
- "/bin:/usr/bin:/sbin:/usr/sbin"
|
||||
+ "@TERMUX_PREFIX@/bin"
|
||||
#endif
|
||||
|
||||
/* Default primary and secondary prompt strings. */
|
||||
@@ -91,7 +91,7 @@
|
||||
/* The default path for enable -f */
|
||||
@@ -92,7 +92,7 @@
|
||||
#define DEFAULT_BASHRC "~/.bashrc"
|
||||
|
||||
/* System-wide .bashrc file for interactive shells. */
|
||||
|
||||
@@ -19,10 +19,11 @@ PROMPT_DIRTRIM=2
|
||||
# Handles nonexistent commands.
|
||||
# If user has entered command which invokes non-available
|
||||
# utility, command-not-found will give a package suggestions.
|
||||
if [ -x @TERMUX_PREFIX@/libexec/termux/command-not-found ]; then
|
||||
if [ -x "@TERMUX_PREFIX@/libexec/termux/command-not-found" ]; then
|
||||
command_not_found_handle() {
|
||||
@TERMUX_PREFIX@/libexec/termux/command-not-found "$1"
|
||||
"@TERMUX_PREFIX@"/libexec/termux/command-not-found "$1"
|
||||
}
|
||||
fi
|
||||
|
||||
[ -r @TERMUX_PREFIX@/share/bash-completion/bash_completion ] && . @TERMUX_PREFIX@/share/bash-completion/bash_completion
|
||||
# vim: set noet ft=bash tw=4 sw=4 ff=unix
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
diff -uNr bash-5.0/lib/readline/complete.c bash-5.0.mod/lib/readline/complete.c
|
||||
--- bash-5.0/lib/readline/complete.c 2017-07-05 02:43:20.000000000 +0300
|
||||
+++ bash-5.0.mod/lib/readline/complete.c 2019-02-20 14:15:49.683440481 +0200
|
||||
@@ -2231,7 +2231,7 @@
|
||||
diff --git a/lib/readline/complete.c b/lib/readline/complete.c
|
||||
index 9abdedef..b781de2d 100644
|
||||
--- a/lib/readline/complete.c
|
||||
+++ b/lib/readline/complete.c
|
||||
@@ -2376,7 +2376,7 @@ rl_completion_matches (const char *text, rl_compentry_func_t *entry_function)
|
||||
char *
|
||||
rl_username_completion_function (const char *text, int state)
|
||||
{
|
||||
-#if defined (__WIN32__) || defined (__OPENNT)
|
||||
+#if defined (__WIN32__) || defined (__OPENNT) || defined (__ANDROID__)
|
||||
-#if defined (_WIN32) || defined (__OPENNT) || !defined (HAVE_GETPWENT)
|
||||
+#if defined (_WIN32) || defined (__OPENNT) || !defined (HAVE_GETPWENT) || defined (__ANDROID__)
|
||||
return (char *)NULL;
|
||||
#else /* !__WIN32__ && !__OPENNT) */
|
||||
#else /* !_WIN32 && !__OPENNT) && HAVE_GETPWENT */
|
||||
static char *username = (char *)NULL;
|
||||
|
||||
Reference in New Issue
Block a user