diff options
author | jperkin <jperkin@pkgsrc.org> | 2021-07-21 10:24:16 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2021-07-21 10:24:16 +0000 |
commit | 4af3928b08871665ef5d8e754103bb634c08be0b (patch) | |
tree | c93176bd95847d16b0e2bfb22366221dfb36c140 | |
parent | ae7506e96f5fe4cb25c6e848c39caadd8608b975 (diff) | |
download | pkgsrc-4af3928b08871665ef5d8e754103bb634c08be0b.tar.gz |
bash: Remove attempted workaround for Shellshock.
Releases of bash since then have correctly resolved the issue, and this
undocumented and non-standard option just results in software being broken out
of the box with a configuration different to other OS. Bump PKGREVISION.
-rw-r--r-- | shells/bash/Makefile | 4 | ||||
-rw-r--r-- | shells/bash/distinfo | 4 | ||||
-rw-r--r-- | shells/bash/patches/patch-shell.c | 22 | ||||
-rw-r--r-- | shells/bash/patches/patch-variables.c | 23 |
4 files changed, 3 insertions, 50 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index afe2e6fb076..e23e5227048 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.100 2021/06/16 12:30:04 jperkin Exp $ +# $NetBSD: Makefile,v 1.101 2021/07/21 10:24:16 jperkin Exp $ BASH_VERSION= 5.1 BASH_PATCHLEVEL= 8 -PKGREVISION= 2 +PKGREVISION= 3 DISTNAME= bash-${BASH_VERSION} PKGNAME= bash-${BASH_VERSION}.${BASH_PATCHLEVEL} diff --git a/shells/bash/distinfo b/shells/bash/distinfo index d4fb894b525..19cd581fb89 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.64 2021/05/17 22:10:43 kre Exp $ +$NetBSD: distinfo,v 1.65 2021/07/21 10:24:16 jperkin Exp $ SHA1 (bash-5.1.tar.gz) = 063019501ef1f30fad99d2b735a7ae2ce1d11423 RMD160 (bash-5.1.tar.gz) = 3b968e29e3867e201a781c4dc28f71120dbaeed8 @@ -44,6 +44,4 @@ SHA1 (patch-builtins_wait.def) = 777ed0528fbd66ea20b039a2ab33ce89221c7312 SHA1 (patch-configure) = c4e1ab53a1ee85f3e6121047f0aca8ceb85e6e5d SHA1 (patch-examples_loadables_fdflags.c) = dce409c76b7d6c838eb25c3ccc7a89ee57ca69b8 SHA1 (patch-lib_malloc_malloc.c) = fc22c2bb45490c57782d34d62336d168875c3609 -SHA1 (patch-shell.c) = daa07914d4c318cd72463f80344f4f7c364809cd SHA1 (patch-support_shobj-conf) = 8750c104549ea8a4a722bd21a684a9fe13e05fe5 -SHA1 (patch-variables.c) = 6a60c2f7011f952d7804e0614ebdb2575973a4a7 diff --git a/shells/bash/patches/patch-shell.c b/shells/bash/patches/patch-shell.c deleted file mode 100644 index 224835d745e..00000000000 --- a/shells/bash/patches/patch-shell.c +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-shell.c,v 1.2 2015/03/07 22:40:48 rodent Exp $ - -Add flag to disable importing of function unless explicitly enabled - ---- shell.c.orig 2014-01-14 13:04:32.000000000 +0000 -+++ shell.c -@@ -229,6 +229,7 @@ int posixly_correct = 1; /* Non-zero mea - #else - int posixly_correct = 0; /* Non-zero means posix.2 superset. */ - #endif -+int import_functions = 0; /* Import functions from environment */ - - /* Some long-winded argument names. These are obviously new. */ - #define Int 1 -@@ -248,6 +249,7 @@ static const struct { - { "help", Int, &want_initial_help, (char **)0x0 }, - { "init-file", Charp, (int *)0x0, &bashrc_file }, - { "login", Int, &make_login_shell, (char **)0x0 }, -+ { "import-functions", Int, &import_functions, (char **)0x0 }, - { "noediting", Int, &no_line_editing, (char **)0x0 }, - { "noprofile", Int, &no_profile, (char **)0x0 }, - { "norc", Int, &no_rc, (char **)0x0 }, diff --git a/shells/bash/patches/patch-variables.c b/shells/bash/patches/patch-variables.c deleted file mode 100644 index 62f33f9587c..00000000000 --- a/shells/bash/patches/patch-variables.c +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-variables.c,v 1.6 2021/01/04 10:39:23 wiz Exp $ - -Only read functions from environment if flag is set. - ---- variables.c.orig 2020-09-07 20:41:51.000000000 +0000 -+++ variables.c -@@ -97,6 +97,7 @@ - #define FV_NODYNAMIC 0x04 - - extern char **environ; -+extern int import_functions; - - /* Variables used here and defined in other files. */ - extern time_t shell_start_time; -@@ -377,7 +378,7 @@ initialize_shell_variables (env, privmod - #if defined (FUNCTION_IMPORT) - /* If exported function, define it now. Don't import functions from - the environment in privileged mode. */ -- if (privmode == 0 && read_but_dont_execute == 0 && -+ if (import_functions && privmode == 0 && read_but_dont_execute == 0 && - STREQN (BASHFUNC_PREFIX, name, BASHFUNC_PREFLEN) && - STREQ (BASHFUNC_SUFFIX, name + char_index - BASHFUNC_SUFFLEN) && - STREQN ("() {", string, 4)) |