[arch-commits] Commit in mingw-w64-crt/trunk (6 files)
Sergej Pupykin
spupykin at archlinux.org
Mon Sep 1 17:20:11 UTC 2014
Date: Monday, September 1, 2014 @ 19:20:10
Author: spupykin
Revision: 118154
upgpkg: mingw-w64-crt 3.2.0-1
upd
Modified:
mingw-w64-crt/trunk/PKGBUILD
Deleted:
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
mingw-w64-crt/trunk/0004-secapi-wrapper.patch
mingw-w64-crt/trunk/0005-regenerate-automake.patch
---------------------------------------------------------------+
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 --
0004-secapi-wrapper.patch | 111 -----
0005-regenerate-automake.patch | 180 --------
PKGBUILD | 26 -
6 files changed, 5 insertions(+), 604 deletions(-)
Deleted: 0001-Add-_gmtime32-and-_localtime32-to-lib64-msvcrt.def.patch
===================================================================
--- 0001-Add-_gmtime32-and-_localtime32-to-lib64-msvcrt.def.patch 2014-09-01 17:07:33 UTC (rev 118153)
+++ 0001-Add-_gmtime32-and-_localtime32-to-lib64-msvcrt.def.patch 2014-09-01 17:20:10 UTC (rev 118154)
@@ -1,34 +0,0 @@
->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
-
Deleted: 0001-Add-secapi-wrapper-for-sprintf_s.patch
===================================================================
--- 0001-Add-secapi-wrapper-for-sprintf_s.patch 2014-09-01 17:07:33 UTC (rev 118153)
+++ 0001-Add-secapi-wrapper-for-sprintf_s.patch 2014-09-01 17:20:10 UTC (rev 118154)
@@ -1,208 +0,0 @@
->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
-
Deleted: 0002-Remove-rand_s-and-vsprintf_s-from-msvcrt.def.in.patch
===================================================================
--- 0002-Remove-rand_s-and-vsprintf_s-from-msvcrt.def.in.patch 2014-09-01 17:07:33 UTC (rev 118153)
+++ 0002-Remove-rand_s-and-vsprintf_s-from-msvcrt.def.in.patch 2014-09-01 17:20:10 UTC (rev 118154)
@@ -1,50 +0,0 @@
->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
-
Deleted: 0004-secapi-wrapper.patch
===================================================================
--- 0004-secapi-wrapper.patch 2014-09-01 17:07:33 UTC (rev 118153)
+++ 0004-secapi-wrapper.patch 2014-09-01 17:20:10 UTC (rev 118154)
@@ -1,111 +0,0 @@
-commit 81caa6f48281a0bd9376d561fb688994f771e3c3
-Author: Jonathan Yong <10walls at gmail.com>
-Date: Mon May 26 06:55:32 2014 +0800
-
- Add secapi wrapper for strerror_s
-
- git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@6559 4407c894-4637-0410-b4f5-ada5f102cad1
- (cherry picked from commit d710b9af4038a2c2ff7871cd6181a24a6d5c7e37)
-
- Conflicts:
-
- mingw-w64-crt/Makefile.am
- mingw-w64-crt/Makefile.in
-
-diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
---- a/mingw-w64-crt/Makefile.am
-+++ b/mingw-w64-crt/Makefile.am
-@@ -150,6 +150,7 @@
- secapi/asctime_s.c \
- secapi/memcpy_s.c \
- secapi/rand_s.c \
-+ secapi/strerror_s.c \
- secapi/sprintf_s.c \
- secapi/vsprintf_s.c \
- secapi/wmemcpy_s.c
-diff --git a/mingw-w64-crt/lib32/msvcrt.def.in b/mingw-w64-crt/lib32/msvcrt.def.in
-index 6c2c3cf..cf55dd7 100644
---- a/mingw-w64-crt/lib32/msvcrt.def.in
-+++ b/mingw-w64-crt/lib32/msvcrt.def.in
-@@ -1202,7 +1202,7 @@ sprintf_s
- sscanf_s
- strcat_s
- strcpy_s
--strerror_s
-+; strerror_s replaced by emu
- strncat_s
- strncpy_s
- ; strnlen replaced by emu
-diff --git a/mingw-w64-crt/lib64/msvcrt.def.in b/mingw-w64-crt/lib64/msvcrt.def.in
-index ed81eff..efadb80 100644
---- a/mingw-w64-crt/lib64/msvcrt.def.in
-+++ b/mingw-w64-crt/lib64/msvcrt.def.in
-@@ -1190,7 +1190,7 @@ strcpy
- strcpy_s
- strcspn
- strerror
--strerror_s
-+; strerror_s replaced by emu
- strftime
- strlen
- strncat
-diff --git a/mingw-w64-crt/secapi/strerror_s.c b/mingw-w64-crt/secapi/strerror_s.c
-new file mode 100644
-index 0000000..714ad9b
---- /dev/null
-+++ b/mingw-w64-crt/secapi/strerror_s.c
-@@ -0,0 +1,54 @@
-+#include <windows.h>
-+#include <malloc.h>
-+#include <errno.h>
-+#include <msvcrt.h>
-+
-+char * __cdecl strerror (int);
-+errno_t __cdecl strerror_s (char *, size_t, int);
-+int __cdecl sprintf_s (char *, size_t, const char *, ...);
-+static errno_t __cdecl _int_strerror_s (char *, size_t, int);
-+static errno_t __cdecl _stub (char *, size_t, int);
-+
-+errno_t __cdecl (*__MINGW_IMP_SYMBOL(strerror_s))(char *, size_t, int) = _stub;
-+
-+static errno_t __cdecl
-+_stub (char *buffer, size_t numberOfElements, int errnum)
-+{
-+ errno_t __cdecl (*f)(char *, size_t, int) = __MINGW_IMP_SYMBOL(strerror_s);
-+
-+ if (f == _stub)
-+ {
-+ f = (errno_t __cdecl (*)(char *, size_t, int))
-+ GetProcAddress (__mingw_get_msvcrt_handle (), "strerror_s");
-+ if (!f)
-+ f = _int_strerror_s;
-+ __MINGW_IMP_SYMBOL(strerror_s) = f;
-+ }
-+ return (*f)(buffer, numberOfElements, errnum);
-+}
-+
-+errno_t __cdecl
-+strerror_s (char *buffer, size_t numberOfElements, int errnum)
-+{
-+ return _stub (buffer, numberOfElements, errnum);
-+}
-+
-+static errno_t __cdecl
-+_int_strerror_s (char *buffer, size_t numberOfElements, int errnum)
-+{
-+ char *errmsg = strerror(errnum);
-+
-+ if (!errmsg || !buffer || numberOfElements == 0)
-+ {
-+ errno = EINVAL;
-+ return EINVAL;
-+ }
-+
-+ if (sprintf_s(buffer, numberOfElements, "%s", errmsg) == -1)
-+ {
-+ errno = EINVAL;
-+ return EINVAL;
-+ }
-+
-+ return 0;
-+}
Deleted: 0005-regenerate-automake.patch
===================================================================
--- 0005-regenerate-automake.patch 2014-09-01 17:07:33 UTC (rev 118153)
+++ 0005-regenerate-automake.patch 2014-09-01 17:20:10 UTC (rev 118154)
@@ -1,180 +0,0 @@
-commit b86c5335d9ef3381283fe60d18e6b18b594d5d41
-Author: Jonathan Yong <10walls at gmail.com>
-Date: Mon May 26 06:59:21 2014 +0800
-
- Regenerate automake
-
- Regenerate changes from last commit
-
-diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in
-index 14e2777..4c7c2df 100644
---- a/mingw-w64-crt/Makefile.in
-+++ b/mingw-w64-crt/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.14 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -1081,8 +1081,8 @@ am__lib32_libmsvcrt_a_SOURCES_DIST = misc/invalid_parameter_handler.c \
- 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/strerror_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) \
-@@ -1118,6 +1118,7 @@ am__objects_19 = \
- 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-strerror_s.$(OBJEXT) \
- secapi/lib32_libmsvcrt_a-vsprintf_s.$(OBJEXT) \
- secapi/lib32_libmsvcrt_a-wmemcpy_s.$(OBJEXT)
- am__objects_20 = $(am__objects_19) \
-@@ -2181,8 +2182,8 @@ am__lib64_libmsvcrt_a_SOURCES_DIST = misc/invalid_parameter_handler.c \
- 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/strerror_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) \
-@@ -2218,6 +2219,7 @@ am__objects_50 = \
- 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-strerror_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 = \
-@@ -3820,6 +3822,7 @@ src_msvcrt = \
- secapi/asctime_s.c \
- secapi/memcpy_s.c \
- secapi/rand_s.c \
-+ secapi/strerror_s.c \
- secapi/vsprintf_s.c \
- secapi/wmemcpy_s.c
-
-@@ -6738,6 +6741,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-strerror_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) \
-@@ -8310,6 +8315,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-strerror_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) \
-@@ -10662,6 +10669,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-strerror_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@
-@@ -10696,6 +10704,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-strerror_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@
-@@ -19842,6 +19851,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-strerror_s.o: secapi/strerror_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-strerror_s.o -MD -MP -MF secapi/$(DEPDIR)/lib32_libmsvcrt_a-strerror_s.Tpo -c -o secapi/lib32_libmsvcrt_a-strerror_s.o `test -f 'secapi/strerror_s.c' || echo '$(srcdir)/'`secapi/strerror_s.c
-+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) secapi/$(DEPDIR)/lib32_libmsvcrt_a-strerror_s.Tpo secapi/$(DEPDIR)/lib32_libmsvcrt_a-strerror_s.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='secapi/strerror_s.c' object='secapi/lib32_libmsvcrt_a-strerror_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-strerror_s.o `test -f 'secapi/strerror_s.c' || echo '$(srcdir)/'`secapi/strerror_s.c
-+
-+secapi/lib32_libmsvcrt_a-strerror_s.obj: secapi/strerror_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-strerror_s.obj -MD -MP -MF secapi/$(DEPDIR)/lib32_libmsvcrt_a-strerror_s.Tpo -c -o secapi/lib32_libmsvcrt_a-strerror_s.obj `if test -f 'secapi/strerror_s.c'; then $(CYGPATH_W) 'secapi/strerror_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/strerror_s.c'; fi`
-+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) secapi/$(DEPDIR)/lib32_libmsvcrt_a-strerror_s.Tpo secapi/$(DEPDIR)/lib32_libmsvcrt_a-strerror_s.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='secapi/strerror_s.c' object='secapi/lib32_libmsvcrt_a-strerror_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-strerror_s.obj `if test -f 'secapi/strerror_s.c'; then $(CYGPATH_W) 'secapi/strerror_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/strerror_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
-@@ -28746,6 +28769,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-strerror_s.o: secapi/strerror_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-strerror_s.o -MD -MP -MF secapi/$(DEPDIR)/lib64_libmsvcrt_a-strerror_s.Tpo -c -o secapi/lib64_libmsvcrt_a-strerror_s.o `test -f 'secapi/strerror_s.c' || echo '$(srcdir)/'`secapi/strerror_s.c
-+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) secapi/$(DEPDIR)/lib64_libmsvcrt_a-strerror_s.Tpo secapi/$(DEPDIR)/lib64_libmsvcrt_a-strerror_s.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='secapi/strerror_s.c' object='secapi/lib64_libmsvcrt_a-strerror_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-strerror_s.o `test -f 'secapi/strerror_s.c' || echo '$(srcdir)/'`secapi/strerror_s.c
-+
-+secapi/lib64_libmsvcrt_a-strerror_s.obj: secapi/strerror_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-strerror_s.obj -MD -MP -MF secapi/$(DEPDIR)/lib64_libmsvcrt_a-strerror_s.Tpo -c -o secapi/lib64_libmsvcrt_a-strerror_s.obj `if test -f 'secapi/strerror_s.c'; then $(CYGPATH_W) 'secapi/strerror_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/strerror_s.c'; fi`
-+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) secapi/$(DEPDIR)/lib64_libmsvcrt_a-strerror_s.Tpo secapi/$(DEPDIR)/lib64_libmsvcrt_a-strerror_s.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='secapi/strerror_s.c' object='secapi/lib64_libmsvcrt_a-strerror_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-strerror_s.obj `if test -f 'secapi/strerror_s.c'; then $(CYGPATH_W) 'secapi/strerror_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/strerror_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
-@@ -33490,9 +33527,10 @@ distcheck: dist
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
-- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+ && ../configure \
- $(AM_DISTCHECK_CONFIGURE_FLAGS) \
- $(DISTCHECK_CONFIGURE_FLAGS) \
-+ --srcdir=.. --prefix="$$dc_install_base" \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
-diff --git a/mingw-w64-crt/aclocal.m4 b/mingw-w64-crt/aclocal.m4
-index ad01e78..e50a8eb 100644
---- a/mingw-w64-crt/aclocal.m4
-+++ b/mingw-w64-crt/aclocal.m4
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.14 -*- Autoconf -*-
-+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
-
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
-
-@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.14'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.14], [],
-+m4_if([$1], [1.14.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.14])dnl
-+[AM_AUTOMAKE_VERSION([1.14.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-09-01 17:07:33 UTC (rev 118153)
+++ PKGBUILD 2014-09-01 17:20:10 UTC (rev 118154)
@@ -5,8 +5,8 @@
_targets="i686-w64-mingw32 x86_64-w64-mingw32"
pkgname=mingw-w64-crt
-pkgver=3.1.0
-pkgrel=3
+pkgver=3.2.0
+pkgrel=1
pkgdesc='MinGW-w64 CRT for Windows'
arch=('any')
url='http://mingw-w64.sourceforge.net'
@@ -14,27 +14,11 @@
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
- 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
- 0004-secapi-wrapper.patch
- 0005-regenerate-automake.patch)
-md5sums=('df0e7657f46cbd59ed9cbe2a50c66e15'
- 'a6df990508d09dae874778a7863a796d'
- 'b116e994bfce8e3fc54e71219d5ad409'
- '0a91be4a5ee7154c6faa35e5078f29cf'
- '093d252061d90f7a2a9f5252e74e5d06'
- '2e1c1b73e5291b6f453d205259282b04')
+source=(http://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${pkgver}.tar.bz2)
+md5sums=('cae9125a531f346afb49c4efea391c53')
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
- patch -p1 < ${srcdir}/0004-secapi-wrapper.patch
-# patch -p1 < ${srcdir}/0005-regenerate-automake.patch
- cd mingw-w64-crt
+ cd ${srcdir}/mingw-w64-v${pkgver}/mingw-w64-crt
aclocal
automake
}
More information about the arch-commits
mailing list