diff options
| -rw-r--r-- | shells/bash/Makefile | 4 | ||||
| -rw-r--r-- | shells/bash/distinfo | 8 | ||||
| -rw-r--r-- | shells/bash/patches/patch-af | 4 | ||||
| -rw-r--r-- | shells/bash/patches/patch-ag | 4 | ||||
| -rw-r--r-- | shells/bash/patches/patch-builtins_ulimit.def | 3 |
5 files changed, 14 insertions, 9 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index dad21006e66..2e6130c77b9 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2015/06/07 05:49:28 ryoon Exp $ +# $NetBSD: Makefile,v 1.76 2016/06/11 12:54:24 rillig Exp $ BASH_VERSION= 4.3 BASH_PATCHLEVEL= 039 @@ -65,7 +65,7 @@ PKG_SUPPORTED_OPTIONS= static ## Static link ## .if !empty(PKG_OPTIONS:Mstatic) -CONFIGURE_ARGS+= --enable-static-link +CONFIGURE_ARGS+= --enable-static-link BUILDLINK_DEPMETHOD.gettext= build BUILDLINK_DEPMETHOD.readline= build .endif diff --git a/shells/bash/distinfo b/shells/bash/distinfo index 57b5c4b8492..35e101fb698 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.42 2015/11/02 23:00:34 agc Exp $ +$NetBSD: distinfo,v 1.43 2016/06/11 12:54:24 rillig Exp $ SHA1 (bash-4.3.tar.gz) = 45ac3c5727e7262334f4dfadecdf601b39434e84 RMD160 (bash-4.3.tar.gz) = cd21a9f51ea7780994d4e2c9c7d16d5eb000f845 @@ -160,10 +160,10 @@ SHA1 (bash43-039) = 45ac5c1cb035a74c6ff871a506437f1607c38e94 RMD160 (bash43-039) = 50a2c9c3271242ab8d38b4e7b258c4ad631026d8 SHA512 (bash43-039) = f9745a05bfbbe39f8e5af3865de3a32391d7ff291289977e23340c79a3783b4fad15bdcf8ce62478916b43fe18501c4d7c65cd54d3c20e8bb889919df48a9a19 Size (bash43-039) = 1531 bytes -SHA1 (patch-af) = 31cb0d8af1e9e83bf1cc9094475c710792ca2a1c -SHA1 (patch-ag) = 61573c7b068b1e9df886655efb3d89c89643f25e +SHA1 (patch-af) = e26e3209902247263884cfebc11a2f7e43245062 +SHA1 (patch-ag) = cd3b151e3bb045d2bb609c0a03d7d3df2c871f47 SHA1 (patch-aj) = 2e4c15afd9b50d44967ee8e1f85bdc908c0eeeb0 -SHA1 (patch-builtins_ulimit.def) = 2106ed5b76f8bccb8d82f9ada70b336675bf6672 +SHA1 (patch-builtins_ulimit.def) = 1390069344607204eb3abbd6ddeb148ff590c55e SHA1 (patch-configure) = c4e1ab53a1ee85f3e6121047f0aca8ceb85e6e5d SHA1 (patch-lib_readline_colors.c) = f2f47e7aa0b5c1e999368109de10f80e39fd4438 SHA1 (patch-shell.c) = daa07914d4c318cd72463f80344f4f7c364809cd diff --git a/shells/bash/patches/patch-af b/shells/bash/patches/patch-af index 5d6b5736377..6b1f96fe96d 100644 --- a/shells/bash/patches/patch-af +++ b/shells/bash/patches/patch-af @@ -1,4 +1,6 @@ -$NetBSD: patch-af,v 1.7 2015/03/07 22:40:48 rodent Exp $ +$NetBSD: patch-af,v 1.8 2016/06/11 12:54:24 rillig Exp $ + +Fixes PRIdMAX and PRIuMAX on AIX < 5.1. --- builtins/printf.def.orig 2014-01-03 15:35:33.000000000 +0000 +++ builtins/printf.def diff --git a/shells/bash/patches/patch-ag b/shells/bash/patches/patch-ag index 0e923f8624f..c43af22d131 100644 --- a/shells/bash/patches/patch-ag +++ b/shells/bash/patches/patch-ag @@ -1,4 +1,6 @@ -$NetBSD: patch-ag,v 1.3 2015/03/07 22:40:48 rodent Exp $ +$NetBSD: patch-ag,v 1.4 2016/06/11 12:54:24 rillig Exp $ + +Use the definition of errno from <errno.h>. --- builtins/psize.c.orig 2008-08-14 19:56:53.000000000 +0000 +++ builtins/psize.c diff --git a/shells/bash/patches/patch-builtins_ulimit.def b/shells/bash/patches/patch-builtins_ulimit.def index f25a2c898c1..86e5273cb79 100644 --- a/shells/bash/patches/patch-builtins_ulimit.def +++ b/shells/bash/patches/patch-builtins_ulimit.def @@ -1,7 +1,8 @@ -$NetBSD: patch-builtins_ulimit.def,v 1.2 2015/03/07 22:40:48 rodent Exp $ +$NetBSD: patch-builtins_ulimit.def,v 1.3 2016/06/11 12:54:24 rillig Exp $ Add support for the "number of threads" ulimit that appeared in NetBSD 6.99.x. + --- builtins/ulimit.def.orig 2013-11-01 01:46:06.000000000 +0000 +++ builtins/ulimit.def @@ -143,6 +143,10 @@ extern int errno; |