From ce8d1e137dccc12b7c9c0bea1eede773f6e1dacb Mon Sep 17 00:00:00 2001 From: rodent Date: Sat, 7 Mar 2015 22:40:48 +0000 Subject: Apply patch to patch in PR 49375. Defuzz patches. --- shells/bash/distinfo | 16 ++++++++-------- shells/bash/patches/patch-af | 12 ++++++------ shells/bash/patches/patch-ag | 4 ++-- shells/bash/patches/patch-aj | 8 ++++---- shells/bash/patches/patch-builtins_ulimit.def | 6 +++--- shells/bash/patches/patch-configure | 13 +++++++++++-- shells/bash/patches/patch-shell.c | 10 +++++----- shells/bash/patches/patch-variables.c | 4 ++-- 8 files changed, 41 insertions(+), 32 deletions(-) (limited to 'shells') diff --git a/shells/bash/distinfo b/shells/bash/distinfo index 5c30f0bbc2c..aaeef67d708 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.39 2014/11/23 00:43:57 dholland 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 @@ -93,11 +93,11 @@ Size (bash43-029) = 1824 bytes SHA1 (bash43-030) = ad1e978c051ef58584343ad24f165e614ed2a184 RMD160 (bash43-030) = 9634eb9f937b10507fb5b750633b0d7ea17c3456 Size (bash43-030) = 63206 bytes -SHA1 (patch-af) = dfd1d1be3d822cfc3ae0fd21bb2bbd3e35b11f0d -SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48 -SHA1 (patch-aj) = 8b3c52c2aee9cf53ee5a9ce64ead243d0970305e -SHA1 (patch-builtins_ulimit.def) = d4cb59bedc6a6199f9a99a3530c99374e428baeb -SHA1 (patch-configure) = ae72a864325761bfbdde85761fd849e49968dff0 +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) = 08e55c3fa57a9e8eb6366c4eba91aa70f487acb2 -SHA1 (patch-variables.c) = 55472b2c79451cd1bc7bd4bf097c9b697f95f521 +SHA1 (patch-shell.c) = daa07914d4c318cd72463f80344f4f7c364809cd +SHA1 (patch-variables.c) = d300318230e5d2c31b15bc0ee8d8416a6b6e8ee1 diff --git a/shells/bash/patches/patch-af b/shells/bash/patches/patch-af index e4a07a1b5e8..5d6b5736377 100644 --- a/shells/bash/patches/patch-af +++ b/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) { diff --git a/shells/bash/patches/patch-ag b/shells/bash/patches/patch-ag index ecfb34e189b..0e923f8624f 100644 --- a/shells/bash/patches/patch-ag +++ b/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" diff --git a/shells/bash/patches/patch-aj b/shells/bash/patches/patch-aj index 4dfb708f43e..cb72fb94bfc 100644 --- a/shells/bash/patches/patch-aj +++ b/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 diff --git a/shells/bash/patches/patch-builtins_ulimit.def b/shells/bash/patches/patch-builtins_ulimit.def index 6b383eb1b12..f25a2c898c1 100644 --- a/shells/bash/patches/patch-builtins_ulimit.def +++ b/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 diff --git a/shells/bash/patches/patch-configure b/shells/bash/patches/patch-configure index 6daa9123224..adce8b0cdf9 100644 --- a/shells/bash/patches/patch-configure +++ b/shells/bash/patches/patch-configure @@ -1,10 +1,19 @@ -$NetBSD: patch-configure,v 1.1 2014/11/23 00:43:57 dholland Exp $ +$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~ 2014-02-11 15:38:00.000000000 +0000 +--- 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 diff --git a/shells/bash/patches/patch-shell.c b/shells/bash/patches/patch-shell.c index 7f37c86d4fe..224835d745e 100644 --- a/shells/bash/patches/patch-shell.c +++ b/shells/bash/patches/patch-shell.c @@ -1,10 +1,10 @@ -$NetBSD: patch-shell.c,v 1.1 2014/09/25 20:28:32 christos Exp $ +$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.christos 2014-01-14 08:04:32.000000000 -0500 -+++ shell.c 2014-09-25 16:11:51.000000000 -0400 -@@ -229,6 +229,7 @@ +--- 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 @@ -12,7 +12,7 @@ Add flag to disable importing of function unless explicitly enabled /* Some long-winded argument names. These are obviously new. */ #define Int 1 -@@ -248,6 +249,7 @@ +@@ -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 }, diff --git a/shells/bash/patches/patch-variables.c b/shells/bash/patches/patch-variables.c index a373f6eeb16..8d77c5a0b8f 100644 --- a/shells/bash/patches/patch-variables.c +++ b/shells/bash/patches/patch-variables.c @@ -1,8 +1,8 @@ -$NetBSD: patch-variables.c,v 1.2 2014/09/29 12:08:12 wiz Exp $ +$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 2014-09-29 12:04:58.000000000 +0000 +--- 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; -- cgit v1.2.3