mingw-w64-gdbm: update to 1.18.1

3 files changed, 20 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bbbbc2435d8c..34fcc9a2610d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-gdbm
 	pkgdesc = GNU database library (mingw-w64)
-	pkgver = 1.18
+	pkgver = 1.18.1
 	pkgrel = 1
 	url = http://www.gnu.org/software/gdbm/gdbm.html
 	arch = any
@@ -12,12 +12,12 @@ pkgbase = mingw-w64-gdbm
 	options = staticlibs
 	options = !buildflags
 	options = !strip
-	source = https://ftp.gnu.org/gnu/gdbm/gdbm-1.18.tar.gz
-	source = https://ftp.gnu.org/gnu/gdbm/gdbm-1.18.tar.gz.sig
+	source = https://ftp.gnu.org/gnu/gdbm/gdbm-1.18.1.tar.gz
+	source = https://ftp.gnu.org/gnu/gdbm/gdbm-1.18.1.tar.gz.sig
 	source = gdbm-1.15-win32.patch
-	sha256sums = b8822cb4769e2d759c828c06f196614936c88c141c3132b18252fe25c2b635ce
+	sha256sums = 86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc
 	sha256sums = SKIP
-	sha256sums = 4eeb6cb44c43f740e1908604aed5f219ac395d02dddf1c5371ac9511ca8223db
+	sha256sums = f6398a1a00839bed53565b6fae857a94ee6d12aaccd2a1e87b35203994a6ecd0
 
 pkgname = mingw-w64-gdbm
 
diff --git a/PKGBUILD b/PKGBUILD
index 70dde5ee9a6e..dc649cfef124 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: xantares <xantares09 at hotmail dot com>
 
 pkgname=mingw-w64-gdbm
-pkgver=1.18
+pkgver=1.18.1
 pkgrel=1
 pkgdesc="GNU database library (mingw-w64)"
 url="http://www.gnu.org/software/gdbm/gdbm.html"
@@ -14,9 +14,9 @@ makedepends=('mingw-w64-configure')
 options=('staticlibs' '!buildflags' '!strip')
 source=("https://ftp.gnu.org/gnu/gdbm/gdbm-${pkgver}.tar.gz"{,.sig}
         'gdbm-1.15-win32.patch')
-sha256sums=('b8822cb4769e2d759c828c06f196614936c88c141c3132b18252fe25c2b635ce'
+sha256sums=('86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc'
             'SKIP'
-            '4eeb6cb44c43f740e1908604aed5f219ac395d02dddf1c5371ac9511ca8223db')
+            'f6398a1a00839bed53565b6fae857a94ee6d12aaccd2a1e87b35203994a6ecd0')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
diff --git a/gdbm-1.15-win32.patch b/gdbm-1.15-win32.patch
index 2fae94c6529e..8057b48f675e 100644
--- a/gdbm-1.15-win32.patch
+++ b/gdbm-1.15-win32.patch
@@ -63,7 +63,7 @@ diff -urN gdbm-1.15_orig/compat/dbmopen.c gdbm-1.15/compat/dbmopen.c
  		  if ((mode & GDBM_OPENMASK) == GDBM_READER)
  		    /* Ok, try to cope with it. */
  		    return pagfd;
- 		  else
+ 		  else if (errno != ENOENT)
  		    {
 -		      gdbm_set_errno (NULL, GDBM_FILE_OPEN_ERROR, TRUE); 
 +		      gdbm_set_errno (NULL, GDBM_FILE_OPEN_ERROR, TRUE);
@@ -458,6 +458,15 @@ diff -urN gdbm-1.15_orig/src/gdbmopen.c gdbm-1.15/src/gdbmopen.c
  			int *ret_dir_size, int *ret_dir_bits)
  {
    /* Create the initial hash table directory.  */
+@@ -224,7 +224,7 @@
+   return ftruncate (dbf->desc, 0);
+ #else
+   int fd;
+-  fd = open (dbf->name, O_RDWR|O_TRUNC, mode);
++  fd = open (dbf->name, O_RDWR|O_TRUNC|O_BINARY, mode);
+   if (fd == -1)
+     return -1;
+   return close (fd);
 @@ -355,8 +355,7 @@
  	      if (!(flags & GDBM_CLOERROR))
  		dbf->desc = -1;
@@ -802,7 +811,7 @@ diff -urN gdbm-1.15_orig/src/systems.h gdbm-1.15/src/systems.h
  /* Include all system headers first. */
 +#ifdef _WIN32
 +# undef _WIN32_WINNT
-+# define _WIN32_WINNT 0x0501
++# define _WIN32_WINNT 0x0601
 +# include <windows.h>
 +#endif
  #include <sys/types.h>
@@ -819,15 +828,7 @@ diff -urN gdbm-1.15_orig/src/systems.h gdbm-1.15/src/systems.h
  /* Default block size.  Some systems do not have blocksize in their
     stat record. This code uses the BSD blocksize from stat. */
  
-@@ -56,11 +65,14 @@
- #if HAVE_FTRUNCATE
- # define TRUNCATE(dbf) ftruncate (dbf->desc, 0)
- #else
--# define TRUNCATE(dbf) close( open (dbf->name, O_RDWR|O_TRUNC, mode));
-+# define TRUNCATE(dbf) close( open (dbf->name, O_RDWR|O_TRUNC|O_BINARY, mode));
- #endif
- 
- #ifndef STDERR_FILENO
+@@ -62,4 +62,7 @@
  # define STDERR_FILENO 2
  #endif