summaryrefslogtreecommitdiff
path: root/shells/bash
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2010-04-15 12:49:41 +0000
committerjoerg <joerg@pkgsrc.org>2010-04-15 12:49:41 +0000
commit13819d2729ffbf1d4538cfc7bc06cb774bb701c6 (patch)
tree6bc5e3165ca8f8b7bc5301fa25139228f1f234e2 /shells/bash
parenta12b1db995e6c858ba1822be6dfde9a9de7eb80d (diff)
downloadpkgsrc-13819d2729ffbf1d4538cfc7bc06cb774bb701c6.tar.gz
Allow building on systems without vsnprintf.
Diffstat (limited to 'shells/bash')
-rw-r--r--shells/bash/distinfo4
-rw-r--r--shells/bash/patches/patch-af21
2 files changed, 17 insertions, 8 deletions
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index 2e4afc5a7b5..ca1476ec458 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2010/02/09 12:31:19 wiz Exp $
+$NetBSD: distinfo,v 1.21 2010/04/15 12:49:41 joerg Exp $
SHA1 (bash-4.1.tar.gz) = 3bd1ec9c66f3689f6b3495bdaaf9077b2e5dc150
RMD160 (bash-4.1.tar.gz) = 554c7ecb4a63da431768caed1f958c06b8fa7207
Size (bash-4.1.tar.gz) = 6598300 bytes
SHA1 (patch-aa) = 24fefdd101926d89b4b9faea1ca74a34bdd5b99f
-SHA1 (patch-af) = 34833c0628a60b5200a9559581c617d878eb62a8
+SHA1 (patch-af) = 769ca529b3a755faa70f517988722276088859b7
SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48
diff --git a/shells/bash/patches/patch-af b/shells/bash/patches/patch-af
index a50bf91416a..4249a880b5d 100644
--- a/shells/bash/patches/patch-af
+++ b/shells/bash/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2007/09/18 21:20:12 wiz Exp $
+$NetBSD: patch-af,v 1.5 2010/04/15 12:49:41 joerg Exp $
---- builtins/printf.def.orig 2007-09-18 15:24:09.000000000 +0000
+--- builtins/printf.def.orig 2009-11-20 20:31:23.000000000 +0000
+++ builtins/printf.def
-@@ -74,6 +74,11 @@ $END
+@@ -85,6 +85,11 @@ $END
# undef PRIdMAX
#endif
@@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.4 2007/09/18 21:20:12 wiz Exp $
#if !defined (PRIdMAX)
# if HAVE_LONG_LONG
# define PRIdMAX "lld"
-@@ -81,6 +86,13 @@ $END
+@@ -92,6 +97,13 @@ $END
# define PRIdMAX "ld"
# endif
#endif
@@ -28,7 +28,16 @@ $NetBSD: patch-af,v 1.4 2007/09/18 21:20:12 wiz Exp $
#if !defined (errno)
extern int errno;
-@@ -466,7 +478,11 @@ printf_builtin (list)
+@@ -172,7 +184,7 @@ extern int asprintf __P((char **, const
+ #endif
+
+ #if !HAVE_VSNPRINTF
+-extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
++extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0)));
+ #endif
+
+ static void printf_erange __P((char *));
+@@ -487,7 +499,11 @@ printf_builtin (list)
p = pp = getintmax ();
if (p != pp)
{
@@ -40,7 +49,7 @@ $NetBSD: patch-af,v 1.4 2007/09/18 21:20:12 wiz Exp $
PF (f, pp);
}
else
-@@ -493,7 +509,11 @@ printf_builtin (list)
+@@ -514,7 +530,11 @@ printf_builtin (list)
p = pp = getuintmax ();
if (p != pp)
{