Import of pkgsrc-2015Q1

shells/bash/Makefile

@@ -1,15 +1,21 @@
-# $NetBSD: Makefile,v 1.61 2014/03/12 10:08:46 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2015/03/08 01:38:35 tnn Exp $
 
 BASH_VERSION=		4.3
+BASH_PATCHLEVEL=	030
 
 DISTNAME=	bash-${BASH_VERSION}
-#PKGNAME=	bash-${BASH_VERSION}.${BASH_PATCHLEVEL}
+PKGNAME=	bash-${BASH_VERSION}.${BASH_PATCHLEVEL}
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU:=bash/} \
 		ftp://ftp.cwru.edu/pub/bash/
 
-#PATCH_SITES=	${MASTER_SITES:=bash-4.0-patches/}
-#PATCHFILES+=	bash40-001 bash40-002 bash40-003 bash40-004 bash40-005
+PATCH_SITES=	${MASTER_SITES:=bash-4.3-patches/}
+PATCHFILES+=	bash43-001 bash43-002 bash43-003 bash43-004 bash43-005
+PATCHFILES+=	bash43-006 bash43-007 bash43-008 bash43-009 bash43-010
+PATCHFILES+=	bash43-011 bash43-012 bash43-013 bash43-014 bash43-015
+PATCHFILES+=	bash43-016 bash43-017 bash43-018 bash43-019 bash43-020
+PATCHFILES+=	bash43-021 bash43-022 bash43-023 bash43-024 bash43-025
+PATCHFILES+=	bash43-026 bash43-027 bash43-028 bash43-029 bash43-030
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/bash/bash.html
@@ -18,8 +24,6 @@ LICENSE=	gnu-gpl-v3
 
 CONFLICTS=	static-bash-[0-9]*
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 USE_TOOLS+=		makeinfo bison
 USE_PKGLOCALEDIR=	yes
 TEXINFO_REQD=		4.1
@@ -27,7 +31,6 @@ GNU_CONFIGURE=		yes
 MAKE_ENV+=		INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
 CONFIGURE_ARGS=		LOCAL_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:M*:Q}
 CPPFLAGS+=		-DDEFAULT_PATH_VALUE="\"/usr/bin:/bin:${LOCALBASE}/bin:/usr/local/bin\""
-MAKE_JOBS_SAFE=		no
 TEST_TARGET=		test
 
 INFO_FILES=		YES # PLIST
@@ -97,6 +100,9 @@ CONFIGURE_ENV+=		bash_cv_func_ctype_nonascii=yes
 CONFIGURE_ENV+=		bash_cv_wexitstatus_offset=8
 .endif
 
+pre-configure:
+	${RM} -f ${WRKSRC}/y.tab.c
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1

shells/bash/distinfo

@@ -1,9 +1,103 @@
-$NetBSD: distinfo,v 1.29 2014/03/12 10:08:46 wiz Exp $
+$NetBSD: distinfo,v 1.40 2015/03/07 22:40:48 rodent Exp $
 
 SHA1 (bash-4.3.tar.gz) = 45ac3c5727e7262334f4dfadecdf601b39434e84
 RMD160 (bash-4.3.tar.gz) = cd21a9f51ea7780994d4e2c9c7d16d5eb000f845
 Size (bash-4.3.tar.gz) = 7955839 bytes
-SHA1 (patch-af) = dfd1d1be3d822cfc3ae0fd21bb2bbd3e35b11f0d
-SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48
-SHA1 (patch-aj) = 8b3c52c2aee9cf53ee5a9ce64ead243d0970305e
-SHA1 (patch-builtins_ulimit.def) = d4cb59bedc6a6199f9a99a3530c99374e428baeb
+SHA1 (bash43-001) = d67ffd6833b30fd41f429205953714a184caa03b
+RMD160 (bash43-001) = 6fc9c8c814602c60f6cda0965848dc19a2601a62
+Size (bash43-001) = 1617 bytes
+SHA1 (bash43-002) = 0c1d486387e5f3bea6a97b317de54f9c3de71c7c
+RMD160 (bash43-002) = eecdd1863f8cb8f6ae6055d88b5ea811f5cc5674
+Size (bash43-002) = 1594 bytes
+SHA1 (bash43-003) = 024d9a6dc6822bb5424f83478b495de29883fb3c
+RMD160 (bash43-003) = 957f27933224699fff6c508be93ac9b378af174d
+Size (bash43-003) = 1465 bytes
+SHA1 (bash43-004) = ece4a6450842a5c13048b86ce1746576f1df7ccd
+RMD160 (bash43-004) = edeef6ffee97759db6a834fcafb14661321efa1b
+Size (bash43-004) = 1534 bytes
+SHA1 (bash43-005) = e7745508829892e3627cef63e56299d584689e07
+RMD160 (bash43-005) = 11aad94b8fbd1f88052741de8e09386e711c2fb7
+Size (bash43-005) = 2636 bytes
+SHA1 (bash43-006) = df3e72bbca83bcac4513b3574d03ab25ac501928
+RMD160 (bash43-006) = 21ae70170ae4338d0fdf177dd3cf90d8b638db86
+Size (bash43-006) = 1445 bytes
+SHA1 (bash43-007) = 1394ecd50212d1bc192db5fbfbf08b996d2582a3
+RMD160 (bash43-007) = 0e15af3ff9bdf7a348ecb45698ec79b4f9d84504
+Size (bash43-007) = 1331 bytes
+SHA1 (bash43-008) = 482f9583f1a3a83256ded3c745cc3b98ccc9b3ea
+RMD160 (bash43-008) = 1cfaef93a75c6315711e0b81c56f84da9a6fe577
+Size (bash43-008) = 4575 bytes
+SHA1 (bash43-009) = 1909cd7f214f4ebedc60bf022132dd4e1284e65b
+RMD160 (bash43-009) = 1d64cf44aa6d732988f52dd02aadbddb54aa3e81
+Size (bash43-009) = 2413 bytes
+SHA1 (bash43-010) = d932228b23e795030132dc8eeea04d9919c90aa7
+RMD160 (bash43-010) = 8b8ce230d0635e982d7beaf8578d63568895a5d6
+Size (bash43-010) = 5357 bytes
+SHA1 (bash43-011) = c53032a18e6491c91117aff5a330620ed8db0f38
+RMD160 (bash43-011) = 7b94ad9f7cb92b6dc072451fbdf0754d676f4a71
+Size (bash43-011) = 1533 bytes
+SHA1 (bash43-012) = 49b8865ca31df4ab0c270500fd12b9e06697272d
+RMD160 (bash43-012) = 42da2ec9e6585314ed4ed6ba361d270e6eb9cdcb
+Size (bash43-012) = 1365 bytes
+SHA1 (bash43-013) = 7c8a4bf8b556504ae9bbf0435b4a505de230e4e1
+RMD160 (bash43-013) = c0c2a1680c301f50d24e3f0184289b1c1ee0e947
+Size (bash43-013) = 2151 bytes
+SHA1 (bash43-014) = 582c8aa707e05b4423df982ee2ed3034f71673bc
+RMD160 (bash43-014) = ee39820ed5a94b00d4e233f0e0223671f55a2c8e
+Size (bash43-014) = 3533 bytes
+SHA1 (bash43-015) = 90969e367c9aaf8127ea61b9c23131eb9d9712fc
+RMD160 (bash43-015) = 7c4d91841ca9d0ca594a149cb391db65d1701c96
+Size (bash43-015) = 1894 bytes
+SHA1 (bash43-016) = 9bbe955e8b332c468e7c5704ea9143cbeb87752d
+RMD160 (bash43-016) = 53ef75be07a9c73297018251a51d1375ff4d5ffc
+Size (bash43-016) = 3674 bytes
+SHA1 (bash43-017) = 20be46bb4714ec53e2a961a8b48ccf6289991cba
+RMD160 (bash43-017) = 580c01692c5d7e91196d56eac345ee4aadcdbce9
+Size (bash43-017) = 1565 bytes
+SHA1 (bash43-018) = 4f4033a4d40463804ead6f87bfa734acb3df9fbe
+RMD160 (bash43-018) = a779bbfebc72b1a0c7e15284efc658b298618050
+Size (bash43-018) = 1315 bytes
+SHA1 (bash43-019) = 2cfd59869d2cfdee1f77560d7e9fd12f305725b8
+RMD160 (bash43-019) = d5f610fd7f10268efd7fc84d7a6d0c6c6f9836ab
+Size (bash43-019) = 2610 bytes
+SHA1 (bash43-020) = a3ed65d860788cb8eaa761a77a0abe7b5cbd9240
+RMD160 (bash43-020) = 4e59ef2dbbcbd0de85f04dd08fe8bcdde387a4d6
+Size (bash43-020) = 2777 bytes
+SHA1 (bash43-021) = 9786720bd7fc72280ff6d61476c83e39ed8213aa
+RMD160 (bash43-021) = b8931b1dda5e03cbae43b32a814503a8ef2a02d4
+Size (bash43-021) = 1623 bytes
+SHA1 (bash43-022) = 7c67c4277eb024d17051aabaa750b6cc388d173e
+RMD160 (bash43-022) = 8e17f783ba2535d3f7b1cc320d6c9a8639de4964
+Size (bash43-022) = 1782 bytes
+SHA1 (bash43-023) = 5fe81781847c5bad848b790d3c2c0e3df19e8719
+RMD160 (bash43-023) = 86e0fe2326a81b7182f52cd3cd7da087a52ea962
+Size (bash43-023) = 3414 bytes
+SHA1 (bash43-024) = 875accb818ebecdb77a2fc3dc6167056ea1ce347
+RMD160 (bash43-024) = a1fd34a95f55b37b065e824b494f3a35c4eb4361
+Size (bash43-024) = 1909 bytes
+SHA1 (bash43-025) = 484d85e54547a18f9702284c55145e34e74768d1
+RMD160 (bash43-025) = 9fd51a95756fcaf9b57cab9c29d6e3f6e3b900fe
+Size (bash43-025) = 3940 bytes
+SHA1 (bash43-026) = ddfe741f358fb6ff0182d7d1eb6b36aabe0598b7
+RMD160 (bash43-026) = bec0d5846a592fee0b62b02713b8d9c908c02edb
+Size (bash43-026) = 1575 bytes
+SHA1 (bash43-027) = d934917a67e353dc645a2af0e10ce0ecc2aa9282
+RMD160 (bash43-027) = 0203d8d9bd3c07c9763211f2f2c8c3410ab79af9
+Size (bash43-027) = 6889 bytes
+SHA1 (bash43-028) = 1e05d95e4abd32b631d991fa374d030c1651645d
+RMD160 (bash43-028) = 47869ab7b3174732ad3c2ccb138a23348e84e22e
+Size (bash43-028) = 69606 bytes
+SHA1 (bash43-029) = 883ae5901a45940d04136b0beae491238d50f70b
+RMD160 (bash43-029) = 1103874024539f44b40e14058e4f7be3ed4b8b0e
+Size (bash43-029) = 1824 bytes
+SHA1 (bash43-030) = ad1e978c051ef58584343ad24f165e614ed2a184
+RMD160 (bash43-030) = 9634eb9f937b10507fb5b750633b0d7ea17c3456
+Size (bash43-030) = 63206 bytes
+SHA1 (patch-af) = 31cb0d8af1e9e83bf1cc9094475c710792ca2a1c
+SHA1 (patch-ag) = 61573c7b068b1e9df886655efb3d89c89643f25e
+SHA1 (patch-aj) = 2e4c15afd9b50d44967ee8e1f85bdc908c0eeeb0
+SHA1 (patch-builtins_ulimit.def) = 2106ed5b76f8bccb8d82f9ada70b336675bf6672
+SHA1 (patch-configure) = c4e1ab53a1ee85f3e6121047f0aca8ceb85e6e5d
+SHA1 (patch-lib_readline_colors.c) = f2f47e7aa0b5c1e999368109de10f80e39fd4438
+SHA1 (patch-shell.c) = daa07914d4c318cd72463f80344f4f7c364809cd
+SHA1 (patch-variables.c) = d300318230e5d2c31b15bc0ee8d8416a6b6e8ee1

shells/bash/patches/patch-af

@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2011/03/12 15:26:45 wiz Exp $
+$NetBSD: patch-af,v 1.7 2015/03/07 22:40:48 rodent Exp $
 
---- builtins/printf.def.orig	2010-11-23 15:02:55.000000000 +0000
+--- builtins/printf.def.orig	2014-01-03 15:35:33.000000000 +0000
 +++ builtins/printf.def
-@@ -90,6 +90,11 @@ $END
+@@ -95,6 +95,11 @@ $END
  #  undef PRIdMAX
  #endif
  
@@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.6 2011/03/12 15:26:45 wiz Exp $
  #if !defined (PRIdMAX)
  #  if HAVE_LONG_LONG
  #    define PRIdMAX	"lld"
-@@ -97,6 +102,13 @@ $END
+@@ -102,6 +107,13 @@ $END
  #    define PRIdMAX	"ld"
  #  endif
  #endif
@@ -28,7 +28,7 @@ $NetBSD: patch-af,v 1.6 2011/03/12 15:26:45 wiz Exp $
  
  #if !defined (errno)
  extern int errno;
-@@ -571,7 +583,11 @@ printf_builtin (list)
+@@ -594,7 +606,11 @@ printf_builtin (list)
  		p = pp = getintmax ();
  		if (p != pp)
  		  {
@@ -40,7 +40,7 @@ $NetBSD: patch-af,v 1.6 2011/03/12 15:26:45 wiz Exp $
  		    PF (f, pp);
  		  }
  		else
-@@ -598,7 +614,11 @@ printf_builtin (list)
+@@ -621,7 +637,11 @@ printf_builtin (list)
  		p = pp = getuintmax ();
  		if (p != pp)
  		  {

shells/bash/patches/patch-ag

@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.2 2005/12/31 00:02:28 wiz Exp $
+$NetBSD: patch-ag,v 1.3 2015/03/07 22:40:48 rodent Exp $
 
---- builtins/psize.c.orig	2005-07-07 14:21:32.000000000 +0200
+--- builtins/psize.c.orig	2008-08-14 19:56:53.000000000 +0000
 +++ builtins/psize.c
 @@ -41,10 +41,6 @@
  #include "../general.h"

shells/bash/patches/patch-aj

@@ -1,11 +1,11 @@
-$NetBSD: patch-aj,v 1.1 2011/02/20 14:22:15 wiz Exp $
+$NetBSD: patch-aj,v 1.2 2015/03/07 22:40:48 rodent Exp $
 
 This patch fixes the build on MirBSD and OpenBSD, where LIBINTL and
 LIBICONV are incorrectly set.
 
---- Makefile.in.orig	Wed Dec 30 18:05:16 2009
+--- Makefile.in.orig	2014-01-25 21:27:30.000000000 +0000
 +++ Makefile.in
-@@ -341,7 +341,7 @@ INTL_LIBDIR = $(dot)/$(LIBSUBDIR)/intl
+@@ -353,7 +353,7 @@ INTL_LIBDIR = $(dot)/$(LIBSUBDIR)/intl
  INTL_ABSSRC = ${topdir}/$(INTL_LIB)
  INTL_BUILDDIR = ${LIBBUILD}/intl
  
@@ -14,7 +14,7 @@ LIBICONV are incorrectly set.
  INTL_LIBRARY = $(INTL_LIBDIR)/libintl.a
  INTL_DEP = @INTL_DEP@
  INTL_INC = @INTL_INC@
-@@ -349,7 +349,7 @@ INTL_INC = @INTL_INC@
+@@ -361,7 +361,7 @@ INTL_INC = @INTL_INC@
  LIBINTL_H = @LIBINTL_H@
  
  # libiconv

shells/bash/patches/patch-builtins_ulimit.def

@@ -1,10 +1,10 @@
-$NetBSD: patch-builtins_ulimit.def,v 1.1 2013/06/09 18:12:14 bsiegert Exp $
+$NetBSD: patch-builtins_ulimit.def,v 1.2 2015/03/07 22:40:48 rodent Exp $
 
 Add support for the "number of threads" ulimit that appeared
 in NetBSD 6.99.x.
---- builtins/ulimit.def.orig	2013-06-09 17:33:51.000000000 +0000
+--- builtins/ulimit.def.orig	2013-11-01 01:46:06.000000000 +0000
 +++ builtins/ulimit.def
-@@ -140,6 +140,10 @@ extern int errno;
+@@ -143,6 +143,10 @@ extern int errno;
  #  define RLIMIT_FILESIZE	256
  #endif
  

shells/bash/patches/patch-configure

@@ -0,0 +1,25 @@
+$NetBSD: patch-configure,v 1.2 2015/03/07 22:40:48 rodent Exp $
+
+Use -Wl,-R instead of just -R to avoid breaking the build on FreeBSD.
+From Dennis Lindroos in PR 49375.
+
+--- configure.orig	2014-02-11 15:38:00.000000000 +0000
++++ configure
+@@ -8047,7 +8047,7 @@ fi
+   fi
+   if test "X$ltrpathdirs" != "X"; then
+             for found_dir in $ltrpathdirs; do
+-      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
++      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-Wl,-R$found_dir"
+     done
+   fi
+ 
+@@ -8837,7 +8837,7 @@ fi
+   fi
+   if test "X$ltrpathdirs" != "X"; then
+             for found_dir in $ltrpathdirs; do
+-      LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
++      LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-Wl,-R$found_dir"
+     done
+   fi
+ 

shells/bash/patches/patch-lib_readline_colors.c

@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_readline_colors.c,v 1.1 2014/07/17 12:49:15 ryoon Exp $
+
+* SCO OpenServer 5.0.7/3.2 has no S_ISSOCK.
+
+--- lib/readline/colors.c.orig	2013-03-20 15:19:08.000000000 +0000
++++ lib/readline/colors.c
+@@ -187,8 +187,10 @@ _rl_print_color_indicator (char *f)
+                 ? C_ORPHAN : C_LINK);
+       else if (S_ISFIFO (mode))
+         colored_filetype = C_FIFO;
++#if defined(S_ISSOCK)
+       else if (S_ISSOCK (mode))
+         colored_filetype = C_SOCK;
++#endif
+       else if (S_ISBLK (mode))
+         colored_filetype = C_BLK;
+       else if (S_ISCHR (mode))

shells/bash/patches/patch-shell.c

@@ -0,0 +1,22 @@
+$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 },

shells/bash/patches/patch-variables.c

@@ -0,0 +1,23 @@
+$NetBSD: patch-variables.c,v 1.3 2015/03/07 22:40:48 rodent Exp $
+
+Only read functions from environment if flag is set.
+
+--- variables.c.orig	2015-03-07 22:36:12.000000000 +0000
++++ variables.c
+@@ -110,6 +110,7 @@ extern time_t shell_start_time;
+ extern int assigning_in_environment;
+ extern int executing_builtin;
+ extern int funcnest_max;
++extern int import_functions;
+ 
+ #if defined (READLINE)
+ extern int no_line_editing;
+@@ -354,7 +355,7 @@ initialize_shell_variables (env, privmod
+ 
+       /* 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))