[mingw-gdbm] Update to 1.11
Erik van Pienbroek
epienbro at fedoraproject.org
Thu Jan 1 22:13:39 UTC 2015
commit bb79be204c8f521ee1322c6bebedac571c236f00
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Thu Jan 1 23:13:44 2015 +0100
Update to 1.11
.gitignore | 1 +
gdbm-win32-support.patch | 245 ++++++++++++++++++++++++++++++++++++++++------
mingw-gdbm.spec | 17 +++-
sources | 2 +-
4 files changed, 228 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 63cd1b6..5c4ebdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
gdbm-1.8.0.tar.gz
/gdbm-1.10.tar.gz
+/gdbm-1.11.tar.gz
diff --git a/gdbm-win32-support.patch b/gdbm-win32-support.patch
index bc0d510..d3ed942 100644
--- a/gdbm-win32-support.patch
+++ b/gdbm-win32-support.patch
@@ -16,7 +16,7 @@
AC_CONFIG_FILES([tests/Makefile tests/atlocal po/Makefile.in])
--- src/Makefile.am.orig 2012-11-21 22:27:53.410325014 +0100
+++ src/Makefile.am 2012-11-21 22:33:13.957634294 +0100
-@@ -60,7 +60,10 @@
+@@ -65,7 +65,10 @@
update.c\
version.c
@@ -26,8 +26,8 @@
+libgdbm_la_LDFLAGS += -lws2_32
+endif
- # Programs
- bin_PROGRAMS = testgdbm
+ noinst_LIBRARIES = libgdbmapp.a
+
--- src/update.c.orig 2012-11-21 22:25:32.667991693 +0100
+++ src/update.c 2012-11-21 22:27:07.567564969 +0100
@@ -39,8 +39,10 @@
@@ -91,21 +91,6 @@
/* Close the file and free all malloced memory. */
#if HAVE_MMAP
---- src/flatfile.c.orig 2012-11-21 22:24:10.761635975 +0100
-+++ src/flatfile.c 2012-11-21 22:25:17.785745935 +0100
-@@ -20,7 +20,12 @@
-
- /* Include system configuration before all else. */
- # include "autoconf.h"
-+
-+#ifdef WIN32
-+# include <winsock2.h>
-+#else
- # include <arpa/inet.h>
-+#endif
-
- # include "gdbmdefs.h"
- # include "gdbm.h"
--- src/gdbmreorg.c.orig 2012-11-21 22:30:26.776863411 +0100
+++ src/gdbmreorg.c 2012-11-21 22:30:37.976049148 +0100
@@ -207,8 +207,10 @@
@@ -119,25 +104,223 @@
/* Force the right stuff for a correct bucket cache. */
dbf->cache_entry = &dbf->bucket_cache[0];
---- src/testgdbm.c.orig 2012-11-21 22:26:25.044859194 +0100
-+++ src/testgdbm.c 2012-11-21 22:27:24.536844574 +0100
-@@ -27,7 +27,9 @@
+--- src/gdbmdump.c.orig 2015-01-01 22:10:46.464030280 +0100
++++ src/gdbmdump.c 2015-01-01 22:11:29.762727347 +0100
+@@ -17,8 +17,6 @@
+ # include "autoconf.h"
+ # include "gdbmdefs.h"
+ # include "gdbm.h"
+-# include <pwd.h>
+-# include <grp.h>
+ # include <time.h>
+
+ static int
+@@ -56,8 +54,6 @@
+ time_t t;
+ int fd;
+ struct stat st;
+- struct passwd *pw;
+- struct group *gr;
+ datum key;
+ size_t count = 0;
+ unsigned char *buffer = NULL;
+@@ -76,13 +72,7 @@
+
+ fprintf (fp, "#:file=%s\n", dbf->name);
+ fprintf (fp, "#:uid=%lu,", (unsigned long) st.st_uid);
+- pw = getpwuid (st.st_uid);
+- if (pw)
+- fprintf (fp, "user=%s,", pw->pw_name);
+ fprintf (fp, "gid=%lu,", (unsigned long) st.st_gid);
+- gr = getgrgid (st.st_gid);
+- if (gr)
+- fprintf (fp, "group=%s,", gr->gr_name);
+ fprintf (fp, "mode=%03o\n", st.st_mode & 0777);
+ fprintf (fp, "# End of header\n");
+
+--- src/gdbmexp.c.orig 2015-01-01 22:37:11.643551174 +0100
++++ src/gdbmexp.c 2015-01-01 22:37:18.896668075 +0100
+@@ -18,7 +18,7 @@
+
+ /* Include system configuration before all else. */
+ # include "autoconf.h"
+-# include <arpa/inet.h>
++# include <winsock2.h>
+
+ # include "gdbmdefs.h"
+ # include "gdbm.h"
+--- src/gdbmload.c.windows 2013-12-25 10:52:42.000000000 +0100
++++ src/gdbmload.c 2015-01-01 22:47:10.027195405 +0100
+@@ -18,8 +18,6 @@
+ # include "gdbmdefs.h"
+ # include "gdbm.h"
+ # include <sys/types.h>
+-# include <pwd.h>
+-# include <grp.h>
+
+ struct datbuf
+ {
+@@ -288,14 +286,13 @@
+ _set_gdbm_meta_info (GDBM_FILE dbf, char *param, int meta_mask)
+ {
+ unsigned long n;
+- uid_t owner_uid;
+- uid_t owner_gid;
+ mode_t mode;
+ int meta_flags = 0;
+ const char *p;
+ char *end;
+ int rc = 0;
+
++#if 0
+ if (!(meta_mask & GDBM_META_MASK_OWNER))
+ {
+ p = getparm (param, "user");
+@@ -341,6 +338,7 @@
+ }
+ }
+ }
++#endif
+
+ if (!(meta_mask & GDBM_META_MASK_MODE))
+ {
+@@ -357,6 +355,7 @@
+ }
+ }
+
++#if 0
+ if (meta_flags)
+ {
+ int fd = gdbm_fdesc (dbf);
+@@ -383,6 +382,7 @@
+ rc = 1;
+ }
+ }
++#endif
+ return rc;
+ }
+
+--- src/gdbmimp.c.orig 2015-01-01 22:47:52.994887921 +0100
++++ src/gdbmimp.c 2015-01-01 22:47:58.755980773 +0100
+@@ -17,7 +17,7 @@
+ along with GDBM. If not, see <http://www.gnu.org/licenses/>. */
+
+ # include "autoconf.h"
+-# include <arpa/inet.h>
++# include <winsock2.h>
+
+ # include "gdbmdefs.h"
+ # include "gdbm.h"
+--- src/gdbmtool.c.orig 2015-01-01 22:50:36.615525016 +0100
++++ src/gdbmtool.c 2015-01-01 22:50:59.346891381 +0100
+@@ -22,8 +22,6 @@
#include <errno.h>
#include <ctype.h>
#include <signal.h>
-+#ifndef WIN32
- #include <sys/ioctl.h>
-+#endif
+-#include <pwd.h>
+-#include <sys/ioctl.h>
#ifdef HAVE_SYS_TERMIOS_H
# include <sys/termios.h>
#endif
-@@ -1126,7 +1128,9 @@
- -1)
- error (2, _("gdbm_setopt failed: %s"), gdbm_strerror (gdbm_errno));
+@@ -1497,6 +1495,7 @@
+ if (setsource (GDBMTOOLRC, 0) == 0)
+ yyparse ();
+ }
++#if 0
+ else
+ {
+ char *fname;
+@@ -1519,6 +1518,7 @@
+ }
+ free (fname);
+ }
++#endif
+ }
+
+ int
+@@ -1620,8 +1620,6 @@
+ if (argc == 1)
+ file_name = argv[0];
+
+- signal (SIGPIPE, SIG_IGN);
+-
+ memset (¶m, 0, sizeof (param));
+ argmax = 0;
+
+--- src/util.c.orig 2015-01-01 23:01:56.323492992 +0100
++++ src/util.c 2015-01-01 23:02:01.910583185 +0100
+@@ -16,7 +16,6 @@
+ along with GDBM. If not, see <http://www.gnu.org/licenses/>. */
+
+ #include "gdbmtool.h"
+-#include <pwd.h>
-+#ifndef WIN32
- signal (SIGPIPE, SIG_IGN);
+ char *
+ mkfilename (const char *dir, const char *file, const char *suf)
+@@ -45,6 +44,7 @@
+ char *
+ tildexpand (char *s)
+ {
++#if 0
+ if (s[0] == '~')
+ {
+ char *p = s + 1;
+@@ -65,6 +65,7 @@
+ if (pw)
+ return mkfilename (pw->pw_dir, p + len + 1, NULL);
+ }
++#endif
+ return estrdup (s);
+ }
+
+--- src/gdbm_load.c.orig 2015-01-01 23:04:32.733017885 +0100
++++ src/gdbm_load.c 2015-01-01 23:05:01.929489199 +0100
+@@ -18,16 +18,12 @@
+ # include "gdbm.h"
+ # include "gdbmapp.h"
+ # include "gdbmdefs.h"
+-# include <pwd.h>
+-# include <grp.h>
+
+ int replace = 0;
+ int meta_mask = 0;
+ int no_meta_option;
+
+ int mode;
+-uid_t owner_uid;
+-gid_t owner_gid;
+
+ char *parseopt_program_doc = "load a GDBM database from a file";
+ char *parseopt_program_args = "FILE [DB_FILE]";
+@@ -45,6 +44,7 @@
+ static int
+ set_meta_info (GDBM_FILE dbf)
+ {
++#if 0
+ if (meta_mask)
+ {
+ int fd = gdbm_fdesc (dbf);
+@@ -63,6 +63,7 @@
+ return 1;
+ }
+ }
+#endif
+ return 0;
+ }
- /* Welcome message. */
- if (interactive)
+@@ -139,6 +137,7 @@
+ }
+ break;
+
++#if 0
+ case 'u':
+ {
+ size_t len;
+@@ -198,6 +197,7 @@
+ meta_mask |= GDBM_META_MASK_OWNER;
+ }
+ break;
++#endif
+
+ case 'r':
+ replace = 1;
diff --git a/mingw-gdbm.spec b/mingw-gdbm.spec
index 41c3727..d807292 100644
--- a/mingw-gdbm.spec
+++ b/mingw-gdbm.spec
@@ -1,8 +1,8 @@
%{?mingw_package_header}
Name: mingw-gdbm
-Version: 1.10
-Release: 5%{?dist}
+Version: 1.11
+Release: 1%{?dist}
Summary: MinGW port of GNU database routines
License: GPLv3+
@@ -107,7 +107,7 @@ autoreconf --install --force
%build
%mingw_configure
-%mingw_make %{?_smp_mflags}
+%mingw_make %{?_smp_mflags} V=1
%install
@@ -142,7 +142,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%files -n mingw32-gdbm -f mingw32-gdbm.lang
%{mingw32_bindir}/libgdbm-4.dll
-%{mingw32_bindir}/testgdbm.exe
+%{mingw32_bindir}/gdbm_dump.exe
+%{mingw32_bindir}/gdbm_load.exe
+%{mingw32_bindir}/gdbmtool.exe
%{mingw32_includedir}/gdbm.h
%{mingw32_includedir}/gdbm/
%{mingw32_libdir}/libgdbm.dll.a
@@ -152,7 +154,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%files -n mingw64-gdbm -f mingw64-gdbm.lang
%{mingw64_bindir}/libgdbm-4.dll
-%{mingw64_bindir}/testgdbm.exe
+%{mingw64_bindir}/gdbm_dump.exe
+%{mingw64_bindir}/gdbm_load.exe
+%{mingw64_bindir}/gdbmtool.exe
%{mingw64_includedir}/gdbm.h
%{mingw64_includedir}/gdbm/
%{mingw64_libdir}/libgdbm.dll.a
@@ -162,6 +166,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
+* Thu Jan 1 2015 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.11-1
+- Update to 1.11
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 26dd0f9..bb11801 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-88770493c2559dc80b561293e39d3570 gdbm-1.10.tar.gz
+72c832680cf0999caedbe5b265c8c1bd gdbm-1.11.tar.gz
More information about the scm-commits
mailing list