Sat Sep 27 03:00:06 2014 UTC ()
bring bash2 up to speed since people don't seem to think it can be removed.


(christos)
diff -r1.84 -r1.85 pkgsrc/shells/bash2/Makefile
diff -r1.15 -r1.16 pkgsrc/shells/bash2/distinfo
diff -r0 -r1.1 pkgsrc/shells/bash2/patches/patch-shell.c
diff -r0 -r1.1 pkgsrc/shells/bash2/patches/patch-variables.c
cvs diff -r1.84 -r1.85 pkgsrc/shells/bash2/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/bash2/Makefile 2013/07/15 02:02:28 1.84
+++ pkgsrc/shells/bash2/Makefile 2014/09/27 03:00:06 1.85
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.84 2013/07/15 02:02:28 ryoon Exp $ 1# $NetBSD: Makefile,v 1.85 2014/09/27 03:00:06 christos Exp $
2# 2#
3 3
4DISTNAME= bash-2.05b 4DISTNAME= bash-2.05b
5PKGNAME= bash-2.05.2.7 5PKGNAME= bash-2.05.2.9
6PKGREVISION= 11 6PKGREVISION= 1
7CATEGORIES= shells 7CATEGORIES= shells
8MASTER_SITES= ${MASTER_SITE_GNU:=bash/} \ 8MASTER_SITES= ${MASTER_SITE_GNU:=bash/} \
9 ftp://ftp.cwru.edu/pub/bash/ 9 ftp://ftp.cwru.edu/pub/bash/
10 10
11PATCH_SITES= ${MASTER_SITES:=bash-2.05b-patches/} 11PATCH_SITES= ${MASTER_SITES:=bash-2.05b-patches/}
12PATCHFILES= bash205b-001 bash205b-002 bash205b-003 bash205b-004 \ 12PATCHFILES= bash205b-001 bash205b-002 bash205b-003 bash205b-004 \
13 bash205b-005 bash205b-006 bash205b-007 13 bash205b-005 bash205b-006 bash205b-007 bash205b-008 \
 14 bash205b-009
14 15
15MAINTAINER= pkgsrc-users@NetBSD.org 16MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= http://www.gnu.org/software/bash/bash.html 17HOMEPAGE= http://www.gnu.org/software/bash/bash.html
17COMMENT= The GNU Bourne Again Shell (version 2) 18COMMENT= The GNU Bourne Again Shell (version 2)
18 19
19CONFLICTS= static-bash-[0-9]* 20CONFLICTS= static-bash-[0-9]*
20 21
21PKG_INSTALLATION_TYPES= overwrite pkgviews 22PKG_INSTALLATION_TYPES= overwrite pkgviews
22 23
23GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
24CONFIGURE_ARGS+= --with-installed-readline 25CONFIGURE_ARGS+= --with-installed-readline
25MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} 26MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
26CPPFLAGS+= -DDEFAULT_PATH_VALUE="\"/usr/bin:/bin:${LOCALBASE}/bin:/usr/local/bin\"" 27CPPFLAGS+= -DDEFAULT_PATH_VALUE="\"/usr/bin:/bin:${LOCALBASE}/bin:/usr/local/bin\""
cvs diff -r1.15 -r1.16 pkgsrc/shells/bash2/distinfo (expand / switch to unified diff)

--- pkgsrc/shells/bash2/distinfo 2005/12/19 00:28:02 1.15
+++ pkgsrc/shells/bash2/distinfo 2014/09/27 03:00:06 1.16
@@ -1,37 +1,45 @@ @@ -1,37 +1,45 @@
1$NetBSD: distinfo,v 1.15 2005/12/19 00:28:02 joerg Exp $ 1$NetBSD: distinfo,v 1.16 2014/09/27 03:00:06 christos Exp $
2 2
3SHA1 (bash-2.05b.tar.gz) = b3e158877f94e66ec1c8ef604e994851ee388b09 3SHA1 (bash-2.05b.tar.gz) = b3e158877f94e66ec1c8ef604e994851ee388b09
4RMD160 (bash-2.05b.tar.gz) = d9826db03c5d38e6175af5b3ef0bc07fafa14add 4RMD160 (bash-2.05b.tar.gz) = d9826db03c5d38e6175af5b3ef0bc07fafa14add
5Size (bash-2.05b.tar.gz) = 1956216 bytes 5Size (bash-2.05b.tar.gz) = 1956216 bytes
6SHA1 (bash205b-001) = 047a43ba12320f024b37c4a2ea0e53ca0f7e274c 6SHA1 (bash205b-001) = 047a43ba12320f024b37c4a2ea0e53ca0f7e274c
7RMD160 (bash205b-001) = c5f2a1e58ef22689440936cda04e43d3b8c482ed 7RMD160 (bash205b-001) = c5f2a1e58ef22689440936cda04e43d3b8c482ed
8Size (bash205b-001) = 1132 bytes 8Size (bash205b-001) = 1132 bytes
9SHA1 (bash205b-002) = c2809872dbe8e30cd7dd4011af4cf53e03df6c21 9SHA1 (bash205b-002) = c2809872dbe8e30cd7dd4011af4cf53e03df6c21
10RMD160 (bash205b-002) = 6ba57c79aae23fafe5209b6d3f2fabcaad8b391f 10RMD160 (bash205b-002) = 6ba57c79aae23fafe5209b6d3f2fabcaad8b391f
11Size (bash205b-002) = 755 bytes 11Size (bash205b-002) = 755 bytes
12SHA1 (bash205b-003) = f050ea2c9fc1c8e809264e44266c8130587d881b 12SHA1 (bash205b-003) = f050ea2c9fc1c8e809264e44266c8130587d881b
13RMD160 (bash205b-003) = 1e52a102f29d9b08fcd04b8c3affe106b9bc47ad 13RMD160 (bash205b-003) = 1e52a102f29d9b08fcd04b8c3affe106b9bc47ad
14Size (bash205b-003) = 2356 bytes 14Size (bash205b-003) = 2356 bytes
15SHA1 (bash205b-004) = f7a69347cdf4e2e330ec6f3220ced263925022af 15SHA1 (bash205b-004) = f7a69347cdf4e2e330ec6f3220ced263925022af
16RMD160 (bash205b-004) = d08341477b97f76d50920240f363ead469f157c3 16RMD160 (bash205b-004) = d08341477b97f76d50920240f363ead469f157c3
17Size (bash205b-004) = 1110 bytes 17Size (bash205b-004) = 1110 bytes
18SHA1 (bash205b-005) = 13138677a4eb1e610a6cda9bff2a9d71da5cdb4d 18SHA1 (bash205b-005) = 13138677a4eb1e610a6cda9bff2a9d71da5cdb4d
19RMD160 (bash205b-005) = 988725e6b9c7d73d8e57cbc0237582a01d5510c8 19RMD160 (bash205b-005) = 988725e6b9c7d73d8e57cbc0237582a01d5510c8
20Size (bash205b-005) = 2217 bytes 20Size (bash205b-005) = 2217 bytes
21SHA1 (bash205b-006) = 230aea5af21c0f895f7cf8290774ad7ce2cd7c08 21SHA1 (bash205b-006) = 230aea5af21c0f895f7cf8290774ad7ce2cd7c08
22RMD160 (bash205b-006) = 608cbfcae98e9041fc38fa27429ca077da400920 22RMD160 (bash205b-006) = 608cbfcae98e9041fc38fa27429ca077da400920
23Size (bash205b-006) = 3155 bytes 23Size (bash205b-006) = 3155 bytes
24SHA1 (bash205b-007) = 758301e500c23779da9236c5cd3f6612d29d5f7b 24SHA1 (bash205b-007) = 758301e500c23779da9236c5cd3f6612d29d5f7b
25RMD160 (bash205b-007) = 78c333ebfd8958d7c39b14620dddddbe78310f4f 25RMD160 (bash205b-007) = 78c333ebfd8958d7c39b14620dddddbe78310f4f
26Size (bash205b-007) = 1072 bytes 26Size (bash205b-007) = 1072 bytes
 27SHA1 (bash205b-008) = c5376d02ae4e93544d8e5fe14c3714fb2d5cde8e
 28RMD160 (bash205b-008) = 0f9cf3f990d58973ad8f1a15e5c9e506e1fe18fd
 29Size (bash205b-008) = 2824 bytes
 30SHA1 (bash205b-009) = 360353009fc018be5d5b61699b71c84ebf2f1d2d
 31RMD160 (bash205b-009) = 55fe8fcdaea560f3b1834e17166c2bbff04eaa18
 32Size (bash205b-009) = 713 bytes
27SHA1 (patch-aa) = f6f5eb9b70e609164b35c57de70a1c404c7f52ba 33SHA1 (patch-aa) = f6f5eb9b70e609164b35c57de70a1c404c7f52ba
28SHA1 (patch-ab) = 1a2fc87648b7e73a4987454bb249149ae15bed93 34SHA1 (patch-ab) = 1a2fc87648b7e73a4987454bb249149ae15bed93
29SHA1 (patch-ac) = 7f68d80de74a887fe0c3f42e9fb5d7e6ad311c30 35SHA1 (patch-ac) = 7f68d80de74a887fe0c3f42e9fb5d7e6ad311c30
30SHA1 (patch-ad) = 037f0b153c139cf5f6ea70245b99103200315cf8 36SHA1 (patch-ad) = 037f0b153c139cf5f6ea70245b99103200315cf8
31SHA1 (patch-ae) = c0e5564d5e57a04d8458e67fb391df0d890e6f38 37SHA1 (patch-ae) = c0e5564d5e57a04d8458e67fb391df0d890e6f38
32SHA1 (patch-af) = 7f9cca6100fa6b24c1fb0d30958b2743679e46ee 38SHA1 (patch-af) = 7f9cca6100fa6b24c1fb0d30958b2743679e46ee
33SHA1 (patch-ag) = 0baab486f57f6f4eaedc376223aecde0e6dd5c0f 39SHA1 (patch-ag) = 0baab486f57f6f4eaedc376223aecde0e6dd5c0f
34SHA1 (patch-ah) = 00732b402fc0479e153d3f5b24ea8151a3d42dc0 40SHA1 (patch-ah) = 00732b402fc0479e153d3f5b24ea8151a3d42dc0
35SHA1 (patch-ai) = db34e25bef3572d2bf198216e8c2aebb98362925 41SHA1 (patch-ai) = db34e25bef3572d2bf198216e8c2aebb98362925
36SHA1 (patch-aj) = c5c541a5e3c06127ccbc8a560e3ea97fbf77ef4f 42SHA1 (patch-aj) = c5c541a5e3c06127ccbc8a560e3ea97fbf77ef4f
37SHA1 (patch-ak) = b76eadbf6ced8c1b98454eb3579345ff8739ccb5 43SHA1 (patch-ak) = b76eadbf6ced8c1b98454eb3579345ff8739ccb5
 44SHA1 (patch-shell.c) = 151446e30fcaa395cd326552e72d1810d5f01671
 45SHA1 (patch-variables.c) = 70673aa09d423b1393d2607d3c9bf6704180ae85
File Added: pkgsrc/shells/bash2/patches/patch-shell.c
$NetBSD: patch-shell.c,v 1.1 2014/09/27 03:00:06 christos Exp $

Add flag to disable importing of function unless explicitly enabled

--- shell.c.orig	2002-07-01 11:27:11.000000000 -0400
+++ shell.c	2014-09-26 22:52:27.000000000 -0400
@@ -197,6 +197,7 @@
 int dump_translatable_strings;	/* Dump strings in $"...", don't execute. */
 int dump_po_strings;		/* Dump strings in $"..." in po format */
 int wordexp_only = 0;		/* Do word expansion only */
+int import_functions = 0;	/* Import functions from environment */
 
 /* Some long-winded argument names.  These are obviously new. */
 #define Int 1
@@ -213,6 +214,7 @@
   { "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 },
File Added: pkgsrc/shells/bash2/patches/patch-variables.c
$NetBSD: patch-variables.c,v 1.1 2014/09/27 03:00:06 christos Exp $

Only read functions from environment if flag is set.

--- variables.c.orig	2014-09-26 22:45:02.000000000 -0400
+++ variables.c	2014-09-26 22:54:31.000000000 -0400
@@ -82,6 +82,7 @@
 extern SHELL_VAR *this_shell_function;
 extern char *this_command_name;
 extern time_t shell_start_time;
+extern int import_functions;
 
 /* The list of shell variables that the user has created at the global
    scope, or that came from the environment. */
@@ -260,7 +261,7 @@
 
       /* If exported function, define it now.  Don't import functions from
 	 the environment in privileged mode. */
-      if (privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4))
+      if (import_functions && privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4))
 	{
 	  string_length = strlen (string);
 	  temp_string = (char *)xmalloc (3 + string_length + char_index);