[csw-devel] SF.net SVN: gar:[7905] csw/mgar/pkg/bash/trunk

[chninkel at users.sourceforge.net]

Revision: 7905
          http://gar.svn.sourceforge.net/gar/?rev=7905&view=rev
Author:   chninkel
Date:     2010-01-07 16:10:39 +0000 (Thu, 07 Jan 2010)

Log Message:
-----------
bash: updated vsnprintf.patch following upstream advice

Modified Paths:
--------------
    csw/mgar/pkg/bash/trunk/Makefile
    csw/mgar/pkg/bash/trunk/checksums
    csw/mgar/pkg/bash/trunk/files/changelog.CSW
    csw/mgar/pkg/bash/trunk/files/vsnprintf.patch

Modified: csw/mgar/pkg/bash/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bash/trunk/Makefile	2010-01-07 16:07:24 UTC (rev 7904)
+++ csw/mgar/pkg/bash/trunk/Makefile	2010-01-07 16:10:39 UTC (rev 7905)
@@ -67,7 +67,7 @@
 # opencsw bash use /etc/bash.bashrc and /etc/bash.bash_logout files
 PATCHFILES += use_system_bashrc_and_logout.patch
 
-# Temporary fix for vsnprintf definition clash
+# Temporary fix for vsnprintf definition 
 PATCHFILES += vsnprintf.patch
 
 ##### Build and installation information #####

Modified: csw/mgar/pkg/bash/trunk/checksums
===================================================================
--- csw/mgar/pkg/bash/trunk/checksums	2010-01-07 16:07:24 UTC (rev 7904)
+++ csw/mgar/pkg/bash/trunk/checksums	2010-01-07 16:10:39 UTC (rev 7905)
@@ -1,6 +1,6 @@
 f93b41b44ce6b023df65b72f00386ac5  CSWbash.prototype
 9800d8724815fd84994d9be65ab5e7b8  bash-4.1.tar.gz
-8b104a3cddca41849186af53c8602eef  changelog.CSW
+c2f23fbca9f119574b933d4f335a838d  changelog.CSW
 60956e6be20f69dafbb06fcc83bab88e  shells
 29607316cff22f7427322d8f190cbadf  use_system_bashrc_and_logout.patch
-f2876ca41b05f236621abddc713af3e7  vsnprintf.patch
+44859f2b196b79f037134d32c4ee79ea  vsnprintf.patch

Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/bash/trunk/files/changelog.CSW	2010-01-07 16:07:24 UTC (rev 7904)
+++ csw/mgar/pkg/bash/trunk/files/changelog.CSW	2010-01-07 16:10:39 UTC (rev 7905)
@@ -1,6 +1,7 @@
-bash (4.1,REV=2010.01.02) unstable
+bash (4.1,REV=2010.01.07) unstable
 
   * New upstream release.
+  * Added patch vsnprintf.patch to fix bash vsnprintf declaration.
 
  -- Yann Rouillard <yann at opencsw.org>  Sat, 02 Jan 2010 14:12:18 +0100
 

Modified: csw/mgar/pkg/bash/trunk/files/vsnprintf.patch
===================================================================
--- csw/mgar/pkg/bash/trunk/files/vsnprintf.patch	2010-01-07 16:07:24 UTC (rev 7904)
+++ csw/mgar/pkg/bash/trunk/files/vsnprintf.patch	2010-01-07 16:10:39 UTC (rev 7905)
@@ -1,47 +1,15 @@
-diff --speed-large-files -Nur builtins/printf.def builtins/printf.def
---- builtins/printf.def	2010-01-06 15:15:00.498275417 +0100
-+++ builtins/printf.def	2010-01-06 15:13:39.646642489 +0100
-@@ -172,7 +172,9 @@
- #endif
- 
- #if !HAVE_VSNPRINTF
--extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
-+extern int bash_vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
-+#else
-+#  define bash_vsnprintf vsnprintf
- #endif
- 
- static void printf_erange __P((char *));
-@@ -885,7 +887,7 @@
-   int blen;
- 
-   SH_VA_START (args, format);
--  blen = vsnprintf (vbuf + vblen, vbsize - vblen, format, args);
-+  blen = bash_vsnprintf (vbuf + vblen, vbsize - vblen, format, args);
-   va_end (args);
- 
-   nlen = vblen + blen + 1;
-@@ -894,7 +896,7 @@
-       vbsize = ((nlen + 63) >> 6) << 6;
-       vbuf = (char *)xrealloc (vbuf, vbsize);
-       SH_VA_START (args, format);
--      blen = vsnprintf (vbuf + vblen, vbsize - vblen, format, args);
-+      blen = bash_vsnprintf (vbuf + vblen, vbsize - vblen, format, args);
-       va_end (args);
-     }
- 
-diff --speed-large-files -Nur lib/sh/snprintf.c lib/sh/snprintf.c
---- lib/sh/snprintf.c	2010-01-06 15:14:47.740952207 +0100
-+++ lib/sh/snprintf.c	2010-01-06 15:14:25.727971179 +0100
-@@ -1655,9 +1655,9 @@
- 
- int
- #if defined (__STDC__)
--vsnprintf(char *string, size_t length, const char *format, va_list args)
-+bash_vsnprintf(char *string, size_t length, const char *format, va_list args)
- #else
--vsnprintf(string, length, format, args)
-+bash_vsnprintf(string, length, format, args)
-      char *string;
-      size_t length;
-      const char *format;
+*** ../bash-4.1/builtins/printf.def	2009-11-20 15:31:23.000000000 -0500
+--- builtins/printf.def	2010-01-07 08:50:06.000000000 -0500
+***************
+*** 173,177 ****
+  
+  #if !HAVE_VSNPRINTF
+! extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
+  #endif
+  
+--- 173,177 ----
+  
+  #if !HAVE_VSNPRINTF
+! extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0)));
+  #endif
+  


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.