[arch-commits] Commit in mingw-w64-crt/trunk (4 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Thu Feb 13 09:36:24 UTC 2014
Date: Thursday, February 13, 2014 @ 10:36:24
Author: spupykin
Revision: 105662
upgpkg: mingw-w64-crt 3.1.0-2
upd
Added:
mingw-w64-crt/trunk/0001-Add-_gmtime32-and-_localtime32-to-lib64-msvcrt.def.patch
mingw-w64-crt/trunk/0001-Add-secapi-wrapper-for-sprintf_s.patch
mingw-w64-crt/trunk/0002-Remove-rand_s-and-vsprintf_s-from-msvcrt.def.in.patch
Modified:
mingw-w64-crt/trunk/PKGBUILD
---------------------------------------------------------------+
0001-Add-_gmtime32-and-_localtime32-to-lib64-msvcrt.def.patch | 34 +
0001-Add-secapi-wrapper-for-sprintf_s.patch | 208 ++++++++++
0002-Remove-rand_s-and-vsprintf_s-from-msvcrt.def.in.patch | 50 ++
PKGBUILD | 19
4 files changed, 308 insertions(+), 3 deletions(-)
Added: 0001-Add-_gmtime32-and-_localtime32-to-lib64-msvcrt.def.patch
===================================================================
--- 0001-Add-_gmtime32-and-_localtime32-to-lib64-msvcrt.def.patch (rev 0)
+++ 0001-Add-_gmtime32-and-_localtime32-to-lib64-msvcrt.def.patch 2014-02-13 09:36:24 UTC (rev 105662)
@@ -0,0 +1,34 @@
+>From ec2ee6e10e3bcdf00c2e93eed427cc8c2b626cac Mon Sep 17 00:00:00 2001
+From: Erik van Pienbroek <epienbro at fedoraproject.org>
+Date: Sun, 19 Jan 2014 17:11:40 +0100
+Subject: [PATCH 1/2] Add _gmtime32 and _localtime32 to lib64/msvcrt.def
+
+These symbols are required by the secapi wrappers
+_gmtime32_s and _localtime32_s
+---
+ mingw-w64-crt/lib64/msvcrt.def.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/mingw-w64-crt/lib64/msvcrt.def.in b/mingw-w64-crt/lib64/msvcrt.def.in
+index ed81eff..a0d3647 100644
+--- a/mingw-w64-crt/lib64/msvcrt.def.in
++++ b/mingw-w64-crt/lib64/msvcrt.def.in
+@@ -356,6 +356,7 @@ _getw
+ _getwch
+ _getwche
+ _getws
++_gmtime32
+ ; _gmtime32_s replaced by emu
+ _gmtime64
+ ; _gmtime64_s replaced by emu
+@@ -471,6 +472,7 @@ _lfind
+ _loaddll
+ _lfind_s
+ _local_unwind
++_localtime32
+ ; _localtime32_s replaced by emu
+ _localtime64
+ ; _localtime64_s replaced by emu
+--
+1.8.4.2
+
Added: 0001-Add-secapi-wrapper-for-sprintf_s.patch
===================================================================
--- 0001-Add-secapi-wrapper-for-sprintf_s.patch (rev 0)
+++ 0001-Add-secapi-wrapper-for-sprintf_s.patch 2014-02-13 09:36:24 UTC (rev 105662)
@@ -0,0 +1,208 @@
+>From dca6ecb46f9b3f2d5652bf27208ac4ecdae1a652 Mon Sep 17 00:00:00 2001
+From: Erik van Pienbroek <epienbro at fedoraproject.org>
+Date: Sun, 26 Jan 2014 20:15:44 +0100
+Subject: [PATCH] Add secapi wrapper for sprintf_s
+
+---
+ mingw-w64-crt/Makefile.am | 1 +
+ mingw-w64-crt/Makefile.in | 45 +++++++++++++++++++++++++++++++++++----
+ mingw-w64-crt/lib32/msvcrt.def.in | 2 +-
+ mingw-w64-crt/lib64/msvcrt.def.in | 2 +-
+ mingw-w64-crt/secapi/sprintf_s.c | 21 ++++++++++++++++++
+ 5 files changed, 65 insertions(+), 6 deletions(-)
+ create mode 100644 mingw-w64-crt/secapi/sprintf_s.c
+
+diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
+index ea384ac..bdca4fa 100644
+--- a/mingw-w64-crt/Makefile.am
++++ b/mingw-w64-crt/Makefile.am
+@@ -180,6 +180,7 @@ src_msvcrt=\
+ secapi/asctime_s.c \
+ secapi/memcpy_s.c \
+ secapi/rand_s.c \
++ secapi/sprintf_s.c \
+ secapi/vsprintf_s.c \
+ secapi/wmemcpy_s.c
+
+diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in
+index 6669467..4c0c1cb 100644
+--- a/mingw-w64-crt/Makefile.in
++++ b/mingw-w64-crt/Makefile.in
+@@ -1081,8 +1081,8 @@ am__lib32_libmsvcrt_a_SOURCES_DIST = mis
+ secapi/_waccess_s.c secapi/_wasctime_s.c secapi/_wctime32_s.c \
+ secapi/_wctime64_s.c secapi/_wstrtime_s.c secapi/_wmktemp_s.c \
+ secapi/_wstrdate_s.c secapi/asctime_s.c secapi/memcpy_s.c \
+- secapi/rand_s.c secapi/vsprintf_s.c secapi/wmemcpy_s.c \
+- misc/lc_locale_func.c lib32/msvcrt.def.in
++ secapi/rand_s.c secapi/sprintf_s.c secapi/vsprintf_s.c \
++ secapi/wmemcpy_s.c misc/lc_locale_func.c lib32/msvcrt.def.in
+ am__objects_19 = \
+ misc/lib32_libmsvcrt_a-invalid_parameter_handler.$(OBJEXT) \
+ misc/lib32_libmsvcrt_a-output_format.$(OBJEXT) \
+@@ -1151,6 +1151,7 @@ am__objects_20 = \
+ secapi/lib32_libmsvcrt_a-asctime_s.$(OBJEXT) \
+ secapi/lib32_libmsvcrt_a-memcpy_s.$(OBJEXT) \
+ secapi/lib32_libmsvcrt_a-rand_s.$(OBJEXT) \
++ secapi/lib32_libmsvcrt_a-sprintf_s.$(OBJEXT) \
+ secapi/lib32_libmsvcrt_a-vsprintf_s.$(OBJEXT) \
+ secapi/lib32_libmsvcrt_a-wmemcpy_s.$(OBJEXT)
+ am__objects_21 = $(am__objects_20) \
+@@ -2182,8 +2182,8 @@ am__lib64_libmsvcrt_a_SOURCES_DIST = mis
+ secapi/_waccess_s.c secapi/_wasctime_s.c secapi/_wctime32_s.c \
+ secapi/_wctime64_s.c secapi/_wstrtime_s.c secapi/_wmktemp_s.c \
+ secapi/_wstrdate_s.c secapi/asctime_s.c secapi/memcpy_s.c \
+- secapi/rand_s.c secapi/vsprintf_s.c secapi/wmemcpy_s.c \
+- lib64/msvcrt.def.in
++ secapi/rand_s.c secapi/sprintf_s.c secapi/vsprintf_s.c \
++ secapi/wmemcpy_s.c lib64/msvcrt.def.in
+ am__objects_50 = \
+ misc/lib64_libmsvcrt_a-invalid_parameter_handler.$(OBJEXT) \
+ misc/lib64_libmsvcrt_a-output_format.$(OBJEXT) \
+@@ -2283,6 +2284,7 @@ am__objects_52 = \
+ secapi/lib64_libmsvcrt_a-asctime_s.$(OBJEXT) \
+ secapi/lib64_libmsvcrt_a-memcpy_s.$(OBJEXT) \
+ secapi/lib64_libmsvcrt_a-rand_s.$(OBJEXT) \
++ secapi/lib64_libmsvcrt_a-sprintf_s.$(OBJEXT) \
+ secapi/lib64_libmsvcrt_a-vsprintf_s.$(OBJEXT) \
+ secapi/lib64_libmsvcrt_a-wmemcpy_s.$(OBJEXT)
+ @LIB64_TRUE@@W32API_FALSE at am_lib64_libmsvcrt_a_OBJECTS = \
+@@ -3905,6 +3907,7 @@ src_msvcrt = \
+ secapi/asctime_s.c \
+ secapi/memcpy_s.c \
+ secapi/rand_s.c \
++ secapi/sprintf_s.c \
+ secapi/vsprintf_s.c \
+ secapi/wmemcpy_s.c
+
+@@ -7039,6 +7042,8 @@ secapi/lib32_libmsvcrt_a-memcpy_s.$(OBJEXT): secapi/$(am__dirstamp) \
+ secapi/$(DEPDIR)/$(am__dirstamp)
+ secapi/lib32_libmsvcrt_a-rand_s.$(OBJEXT): secapi/$(am__dirstamp) \
+ secapi/$(DEPDIR)/$(am__dirstamp)
++secapi/lib32_libmsvcrt_a-sprintf_s.$(OBJEXT): secapi/$(am__dirstamp) \
++ secapi/$(DEPDIR)/$(am__dirstamp)
+ secapi/lib32_libmsvcrt_a-vsprintf_s.$(OBJEXT): secapi/$(am__dirstamp) \
+ secapi/$(DEPDIR)/$(am__dirstamp)
+ secapi/lib32_libmsvcrt_a-wmemcpy_s.$(OBJEXT): secapi/$(am__dirstamp) \
+@@ -8635,6 +8640,8 @@ secapi/lib64_libmsvcrt_a-memcpy_s.$(OBJEXT): secapi/$(am__dirstamp) \
+ secapi/$(DEPDIR)/$(am__dirstamp)
+ secapi/lib64_libmsvcrt_a-rand_s.$(OBJEXT): secapi/$(am__dirstamp) \
+ secapi/$(DEPDIR)/$(am__dirstamp)
++secapi/lib64_libmsvcrt_a-sprintf_s.$(OBJEXT): secapi/$(am__dirstamp) \
++ secapi/$(DEPDIR)/$(am__dirstamp)
+ secapi/lib64_libmsvcrt_a-vsprintf_s.$(OBJEXT): secapi/$(am__dirstamp) \
+ secapi/$(DEPDIR)/$(am__dirstamp)
+ secapi/lib64_libmsvcrt_a-wmemcpy_s.$(OBJEXT): secapi/$(am__dirstamp) \
+@@ -11012,6 +11019,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at secapi/$(DEPDIR)/lib32_libmsvcrt_a-asctime_s.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at secapi/$(DEPDIR)/lib32_libmsvcrt_a-memcpy_s.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at secapi/$(DEPDIR)/lib32_libmsvcrt_a-rand_s.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at secapi/$(DEPDIR)/lib32_libmsvcrt_a-sprintf_s.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at secapi/$(DEPDIR)/lib32_libmsvcrt_a-vsprintf_s.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at secapi/$(DEPDIR)/lib32_libmsvcrt_a-wmemcpy_s.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at secapi/$(DEPDIR)/lib64_libmsvcrt_a-_access_s.Po at am__quote@
+@@ -11046,6 +11054,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at secapi/$(DEPDIR)/lib64_libmsvcrt_a-asctime_s.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at secapi/$(DEPDIR)/lib64_libmsvcrt_a-memcpy_s.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at secapi/$(DEPDIR)/lib64_libmsvcrt_a-rand_s.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at secapi/$(DEPDIR)/lib64_libmsvcrt_a-sprintf_s.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at secapi/$(DEPDIR)/lib64_libmsvcrt_a-vsprintf_s.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at secapi/$(DEPDIR)/lib64_libmsvcrt_a-wmemcpy_s.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at stdio/$(DEPDIR)/lib32_libmingwex_a-_Exit.Po at am__quote@
+@@ -20360,6 +20369,20 @@ secapi/lib32_libmsvcrt_a-rand_s.obj: secapi/rand_s.c
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib32_libmsvcrt_a-rand_s.obj `if test -f 'secapi/rand_s.c'; then $(CYGPATH_W) 'secapi/rand_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/rand_s.c'; fi`
+
++secapi/lib32_libmsvcrt_a-sprintf_s.o: secapi/sprintf_s.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib32_libmsvcrt_a-sprintf_s.o -MD -MP -MF secapi/$(DEPDIR)/lib32_libmsvcrt_a-sprintf_s.Tpo -c -o secapi/lib32_libmsvcrt_a-sprintf_s.o `test -f 'secapi/sprintf_s.c' || echo '$(srcdir)/'`secapi/sprintf_s.c
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) secapi/$(DEPDIR)/lib32_libmsvcrt_a-sprintf_s.Tpo secapi/$(DEPDIR)/lib32_libmsvcrt_a-sprintf_s.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='secapi/sprintf_s.c' object='secapi/lib32_libmsvcrt_a-sprintf_s.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib32_libmsvcrt_a-sprintf_s.o `test -f 'secapi/sprintf_s.c' || echo '$(srcdir)/'`secapi/sprintf_s.c
++
++secapi/lib32_libmsvcrt_a-sprintf_s.obj: secapi/sprintf_s.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib32_libmsvcrt_a-sprintf_s.obj -MD -MP -MF secapi/$(DEPDIR)/lib32_libmsvcrt_a-sprintf_s.Tpo -c -o secapi/lib32_libmsvcrt_a-sprintf_s.obj `if test -f 'secapi/sprintf_s.c'; then $(CYGPATH_W) 'secapi/sprintf_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/sprintf_s.c'; fi`
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) secapi/$(DEPDIR)/lib32_libmsvcrt_a-sprintf_s.Tpo secapi/$(DEPDIR)/lib32_libmsvcrt_a-sprintf_s.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='secapi/sprintf_s.c' object='secapi/lib32_libmsvcrt_a-sprintf_s.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib32_libmsvcrt_a-sprintf_s.obj `if test -f 'secapi/sprintf_s.c'; then $(CYGPATH_W) 'secapi/sprintf_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/sprintf_s.c'; fi`
++
+ secapi/lib32_libmsvcrt_a-vsprintf_s.o: secapi/vsprintf_s.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib32_libmsvcrt_a-vsprintf_s.o -MD -MP -MF secapi/$(DEPDIR)/lib32_libmsvcrt_a-vsprintf_s.Tpo -c -o secapi/lib32_libmsvcrt_a-vsprintf_s.o `test -f 'secapi/vsprintf_s.c' || echo '$(srcdir)/'`secapi/vsprintf_s.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) secapi/$(DEPDIR)/lib32_libmsvcrt_a-vsprintf_s.Tpo secapi/$(DEPDIR)/lib32_libmsvcrt_a-vsprintf_s.Po
+@@ -29432,6 +29455,20 @@ secapi/lib64_libmsvcrt_a-rand_s.obj: secapi/rand_s.c
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib64_libmsvcrt_a-rand_s.obj `if test -f 'secapi/rand_s.c'; then $(CYGPATH_W) 'secapi/rand_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/rand_s.c'; fi`
+
++secapi/lib64_libmsvcrt_a-sprintf_s.o: secapi/sprintf_s.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib64_libmsvcrt_a-sprintf_s.o -MD -MP -MF secapi/$(DEPDIR)/lib64_libmsvcrt_a-sprintf_s.Tpo -c -o secapi/lib64_libmsvcrt_a-sprintf_s.o `test -f 'secapi/sprintf_s.c' || echo '$(srcdir)/'`secapi/sprintf_s.c
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) secapi/$(DEPDIR)/lib64_libmsvcrt_a-sprintf_s.Tpo secapi/$(DEPDIR)/lib64_libmsvcrt_a-sprintf_s.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='secapi/sprintf_s.c' object='secapi/lib64_libmsvcrt_a-sprintf_s.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib64_libmsvcrt_a-sprintf_s.o `test -f 'secapi/sprintf_s.c' || echo '$(srcdir)/'`secapi/sprintf_s.c
++
++secapi/lib64_libmsvcrt_a-sprintf_s.obj: secapi/sprintf_s.c
++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib64_libmsvcrt_a-sprintf_s.obj -MD -MP -MF secapi/$(DEPDIR)/lib64_libmsvcrt_a-sprintf_s.Tpo -c -o secapi/lib64_libmsvcrt_a-sprintf_s.obj `if test -f 'secapi/sprintf_s.c'; then $(CYGPATH_W) 'secapi/sprintf_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/sprintf_s.c'; fi`
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) secapi/$(DEPDIR)/lib64_libmsvcrt_a-sprintf_s.Tpo secapi/$(DEPDIR)/lib64_libmsvcrt_a-sprintf_s.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='secapi/sprintf_s.c' object='secapi/lib64_libmsvcrt_a-sprintf_s.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib64_libmsvcrt_a-sprintf_s.obj `if test -f 'secapi/sprintf_s.c'; then $(CYGPATH_W) 'secapi/sprintf_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/sprintf_s.c'; fi`
++
+ secapi/lib64_libmsvcrt_a-vsprintf_s.o: secapi/vsprintf_s.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib64_libmsvcrt_a-vsprintf_s.o -MD -MP -MF secapi/$(DEPDIR)/lib64_libmsvcrt_a-vsprintf_s.Tpo -c -o secapi/lib64_libmsvcrt_a-vsprintf_s.o `test -f 'secapi/vsprintf_s.c' || echo '$(srcdir)/'`secapi/vsprintf_s.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) secapi/$(DEPDIR)/lib64_libmsvcrt_a-vsprintf_s.Tpo secapi/$(DEPDIR)/lib64_libmsvcrt_a-vsprintf_s.Po
+diff --git a/mingw-w64-crt/lib32/msvcrt.def.in b/mingw-w64-crt/lib32/msvcrt.def.in
+index 3455447..f32ecaf 100644
+--- a/mingw-w64-crt/lib32/msvcrt.def.in
++++ b/mingw-w64-crt/lib32/msvcrt.def.in
+@@ -1198,7 +1198,7 @@ memmove_s
+ printf_s
+ qsort_s
+ scanf_s
+-sprintf_s
++; sprintf_s replaced by emu
+ sscanf_s
+ strcat_s
+ strcpy_s
+diff --git a/mingw-w64-crt/lib64/msvcrt.def.in b/mingw-w64-crt/lib64/msvcrt.def.in
+index ceff01e..7a442ce 100644
+--- a/mingw-w64-crt/lib64/msvcrt.def.in
++++ b/mingw-w64-crt/lib64/msvcrt.def.in
+@@ -1177,7 +1177,7 @@ sin
+ sinh
+ ;sinhf
+ sprintf
+-sprintf_s
++; sprintf_s replaced by emu
+ sqrt DATA
+ sqrtf DATA
+ srand
+diff --git a/mingw-w64-crt/secapi/sprintf_s.c b/mingw-w64-crt/secapi/sprintf_s.c
+new file mode 100644
+index 0000000..8c60797
+--- /dev/null
++++ b/mingw-w64-crt/secapi/sprintf_s.c
+@@ -0,0 +1,21 @@
++#include <windows.h>
++#include <malloc.h>
++#include <errno.h>
++#include <msvcrt.h>
++
++int __cdecl sprintf_s (char *, size_t, const char *, ...);
++int __cdecl vsprintf_s (char *, size_t, const char *, va_list);
++
++int __cdecl (*__MINGW_IMP_SYMBOL(sprintf_s))(char *, size_t, const char *,...) = sprintf_s;
++
++int __cdecl
++sprintf_s (char *_DstBuf, size_t _Size, const char *_Format, ...)
++{
++ va_list argp;
++ int r;
++
++ va_start (argp, _Format);
++ r = vsprintf_s (_DstBuf, _Size, _Format, argp);
++ va_end (argp);
++ return r;
++}
+--
+1.8.5.3
+
Added: 0002-Remove-rand_s-and-vsprintf_s-from-msvcrt.def.in.patch
===================================================================
--- 0002-Remove-rand_s-and-vsprintf_s-from-msvcrt.def.in.patch (rev 0)
+++ 0002-Remove-rand_s-and-vsprintf_s-from-msvcrt.def.in.patch 2014-02-13 09:36:24 UTC (rev 105662)
@@ -0,0 +1,50 @@
+>From 2dac1e1583fa2d0f142a048e275845e829883777 Mon Sep 17 00:00:00 2001
+From: Erik van Pienbroek <epienbro at fedoraproject.org>
+Date: Sun, 19 Jan 2014 17:28:12 +0100
+Subject: [PATCH 2/2] Remove rand_s and vsprintf_s from msvcrt.def.in
+
+These symbols are implemented in the secapi wrappers so they
+shouldn't be part of the msvcrt.def.in files any more
+---
+ mingw-w64-crt/lib32/msvcrt.def.in | 2 +-
+ mingw-w64-crt/lib64/msvcrt.def.in | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mingw-w64-crt/lib32/msvcrt.def.in b/mingw-w64-crt/lib32/msvcrt.def.in
+index 6c2c3cf..3455447 100644
+--- a/mingw-w64-crt/lib32/msvcrt.def.in
++++ b/mingw-w64-crt/lib32/msvcrt.def.in
+@@ -1218,7 +1218,7 @@ vsnprintf == _vsnprintf
+ snprintf == _snprintf
+ snwprintf == _snwprintf
+ vsnwprintf == _vsnwprintf
+-vsprintf_s
++; vsprintf_s replaced by emu
+ vswprintf_s
+ vwprintf_s
+ wcrtomb_s
+diff --git a/mingw-w64-crt/lib64/msvcrt.def.in b/mingw-w64-crt/lib64/msvcrt.def.in
+index a0d3647..ceff01e 100644
+--- a/mingw-w64-crt/lib64/msvcrt.def.in
++++ b/mingw-w64-crt/lib64/msvcrt.def.in
+@@ -1160,7 +1160,7 @@ qsort
+ qsort_s
+ raise
+ rand
+-rand_s
++; rand_s replaced by emu
+ realloc
+ remove
+ rename
+@@ -1239,7 +1239,7 @@ vprintf_s
+ vsnprintf == _vsnprintf
+ snprintf == _snprintf
+ vsprintf
+-vsprintf_s
++; vsprintf_s replaced by emu
+ vswprintf
+ vswprintf_s
+ vwprintf
+--
+1.8.4.2
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-02-13 09:27:04 UTC (rev 105661)
+++ PKGBUILD 2014-02-13 09:36:24 UTC (rev 105662)
@@ -6,7 +6,7 @@
pkgname=mingw-w64-crt
pkgver=3.1.0
-pkgrel=1
+pkgrel=2
pkgdesc='MinGW-w64 CRT for Windows'
arch=('any')
url='http://mingw-w64.sourceforge.net'
@@ -14,9 +14,22 @@
groups=('mingw-w64-toolchain' 'mingw-w64')
makedepends=('mingw-w64-gcc-base' 'mingw-w64-binutils' 'mingw-w64-headers')
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
-source=(http://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${pkgver}.tar.bz2)
-md5sums=('df0e7657f46cbd59ed9cbe2a50c66e15')
+source=(http://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${pkgver}.tar.bz2
+ 0001-Add-_gmtime32-and-_localtime32-to-lib64-msvcrt.def.patch
+ 0001-Add-secapi-wrapper-for-sprintf_s.patch
+ 0002-Remove-rand_s-and-vsprintf_s-from-msvcrt.def.in.patch)
+md5sums=('df0e7657f46cbd59ed9cbe2a50c66e15'
+ 'a6df990508d09dae874778a7863a796d'
+ 'b116e994bfce8e3fc54e71219d5ad409'
+ '0a91be4a5ee7154c6faa35e5078f29cf')
+prepare() {
+ cd ${srcdir}/mingw-w64-v${pkgver}
+ patch -p1 < ${srcdir}/0001-Add-secapi-wrapper-for-sprintf_s.patch
+ patch -p1 < ${srcdir}/0001-Add-_gmtime32-and-_localtime32-to-lib64-msvcrt.def.patch
+ patch -p1 < ${srcdir}/0002-Remove-rand_s-and-vsprintf_s-from-msvcrt.def.in.patch
+}
+
build() {
cd ${srcdir}
for _target in ${_targets}; do
More information about the arch-commits
mailing list