[pkgsrc/trunk]: pkgsrc/databases/gdbm gdbm: update to 1.22.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cdcb1f240724
branches:  trunk
changeset: 768790:cdcb1f240724
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Nov 01 18:37:05 2021 +0000

description:
gdbm: update to 1.22.

Version 1.22

* Fix file header validation

* Fix key verification in sequential access

* Fix testing with DejaGNU 1.6.3

* Fix stack overflow in print_usage

* Fix a leak of avail entry on pushing a new avail block

The leak would occur if the original avail table had odd number of entries.

* New gdbmtool variables: errorexit, errormask, trace, timing

"Errorexit" and "errormask" control which GDBM errors would cause the
program termination and emitting a diagnostic message,
correspondingly.  Both variables are comma-delimited lists of error
codes.

The "trace" variable enables tracing of the gdbmtool commands.

The "timing" variable, when set, instructs gdbmtool to print time
spent in each command it runs.

* New gdbmtool options: -t (--trace), and -T (--timing)

diffstat:

 databases/gdbm/Makefile.common               |   6 ++-
 databases/gdbm/distinfo                      |  12 ++----
 databases/gdbm/patches/patch-configure       |  36 ----------------------
 databases/gdbm/patches/patch-src_gdbmshell.c |  19 -----------
 databases/gdbm/patches/patch-src_gdbmsync.c  |  45 ----------------------------
 databases/gdbm/patches/patch-src_systems.h   |  21 -------------
 6 files changed, 8 insertions(+), 131 deletions(-)

diffs (176 lines):

diff -r aa2a21d0186d -r cdcb1f240724 databases/gdbm/Makefile.common
--- a/databases/gdbm/Makefile.common    Mon Nov 01 18:14:31 2021 +0000
+++ b/databases/gdbm/Makefile.common    Mon Nov 01 18:37:05 2021 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.11 2021/09/12 09:12:34 wiz Exp $
+# $NetBSD: Makefile.common,v 1.12 2021/11/01 18:37:05 wiz Exp $
 #
 # used by databases/gdbm/Makefile
 # used by databases/gdbm_compat/Makefile
 
-DISTNAME=      gdbm-1.21
+DISTNAME=      gdbm-1.22
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_GNU:=gdbm/}
 
@@ -17,3 +17,5 @@
 
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
+
+TEST_TARGET=           check
diff -r aa2a21d0186d -r cdcb1f240724 databases/gdbm/distinfo
--- a/databases/gdbm/distinfo   Mon Nov 01 18:14:31 2021 +0000
+++ b/databases/gdbm/distinfo   Mon Nov 01 18:37:05 2021 +0000
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.21 2021/10/26 10:09:17 nia Exp $
+$NetBSD: distinfo,v 1.22 2021/11/01 18:37:05 wiz Exp $
 
-BLAKE2s (gdbm-1.21.tar.gz) = cb0a447c942e3549cd01d7822ab49973d72e3a1f7cd957dcc8577c83be064d08
-SHA512 (gdbm-1.21.tar.gz) = b2a31802d1af9f97b24d3dd01cb048bab4a8e748297f1b70851c0342400dde4281242b7f80bd92a36035e22398d240d131b550ab444ee838a077522a6921fa43
-Size (gdbm-1.21.tar.gz) = 1005982 bytes
-SHA1 (patch-configure) = 0ae6c9280f911a524a3a2043df1e24588bd93a63
+BLAKE2s (gdbm-1.22.tar.gz) = c7562c7d917b7144d139e6746a7db3c3a57e83c6b4e8afa3b2868770025aa80c
+SHA512 (gdbm-1.22.tar.gz) = 67461fc4f41e825d0134175ff99c913ccb4aa7ea3d0f64f32bdedbc7677b3ecabd2c525ac6b2ee47a9561e002e4224e492b72088d57bb4862a1f8c089521ec51
+Size (gdbm-1.22.tar.gz) = 1090100 bytes
 SHA1 (patch-src_Makefile.in) = 52b47f3dcd381143d1cdae40f1972bd989dcce1f
-SHA1 (patch-src_gdbmshell.c) = 56e8d69db9cab2a2e4846d9adec908596dd1f6a0
-SHA1 (patch-src_gdbmsync.c) = b57595f11838faabe5accda79fb62207c021a052
-SHA1 (patch-src_systems.h) = dc4132ae62c6b4f050dcf3d4c30552af087b310b
diff -r aa2a21d0186d -r cdcb1f240724 databases/gdbm/patches/patch-configure
--- a/databases/gdbm/patches/patch-configure    Mon Nov 01 18:14:31 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2021/09/14 13:32:50 schmonz Exp $
-
-Apply upstream patch 32517af7 to check for st_mtim in struct stat.
-Fixes macOS build.
-
---- configure.orig     2021-09-02 12:47:45.000000000 +0000
-+++ configure
-@@ -15451,6 +15451,28 @@ _ACEOF
- 
- 
- fi
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim" "ac_cv_member_struct_stat_st_mtim" "#include <sys/types.h>
-+                #include <sys/stat.h>
-+"
-+if test "x$ac_cv_member_struct_stat_st_mtim" = xyes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_MTIM 1
-+_ACEOF
-+
-+
-+fi
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimespec" "ac_cv_member_struct_stat_st_mtimespec" "#include <sys/types.h>
-+                #include <sys/stat.h>
-+"
-+if test "x$ac_cv_member_struct_stat_st_mtimespec" = xyes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_MTIMESPEC 1
-+_ACEOF
-+
-+
-+fi
- 
- 
-  if test "$want_compat" = yes; then
diff -r aa2a21d0186d -r cdcb1f240724 databases/gdbm/patches/patch-src_gdbmshell.c
--- a/databases/gdbm/patches/patch-src_gdbmshell.c      Mon Nov 01 18:14:31 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_gdbmshell.c,v 1.1 2021/09/14 13:32:50 schmonz Exp $
-
-Apply upstream patch 32517af7 to check for st_mtim in struct stat.
-Fixes macOS build.
-
---- src/gdbmshell.c.orig       2021-09-02 12:39:55.000000000 +0000
-+++ src/gdbmshell.c
-@@ -1010,7 +1010,11 @@ print_snapshot (char const *snapname, FI
-       fprintf (fp, "%s: ", snapname);
-       fprintf (fp, "%03o %s ", st.st_mode & 0777,
-              decode_mode (st.st_mode, buf));
-+#if HAVE_STRUCT_STAT_ST_MTIM
-       fprintf (fp, "%ld.%09ld", st.st_mtim.tv_sec, st.st_mtim.tv_nsec);
-+#else
-+      fprintf (fp, "%ld [%s]", st.st_mtime, _("insufficient precision"));
-+#endif
-       if (S_ISREG (st.st_mode))
-       {
-         GDBM_FILE dbf;
diff -r aa2a21d0186d -r cdcb1f240724 databases/gdbm/patches/patch-src_gdbmsync.c
--- a/databases/gdbm/patches/patch-src_gdbmsync.c       Mon Nov 01 18:14:31 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-$NetBSD: patch-src_gdbmsync.c,v 1.1 2021/09/14 13:32:50 schmonz Exp $
-
-Apply upstream patch 32517af7 to check for st_mtim in struct stat.
-Fixes macOS build.
-
---- src/gdbmsync.c.orig        2021-08-10 12:13:24.000000000 +0000
-+++ src/gdbmsync.c
-@@ -220,16 +220,23 @@ gdbm_failure_atomic (GDBM_FILE dbf, cons
- }
- 
- static inline int
--timespec_cmp (struct timespec const *a, struct timespec const *b)
-+timespec_cmp (struct stat const *a, struct stat const *b)
- {
--  if (a->tv_sec < b->tv_sec)
-+#if HAVE_STRUCT_STAT_ST_MTIM
-+  if (a->st_mtim.tv_sec < b->st_mtim.tv_sec)
-     return -1;
--  if (a->tv_sec > b->tv_sec)
-+  if (a->st_mtim.tv_sec > b->st_mtim.tv_sec)
-     return 1;
--  if (a->tv_nsec < b->tv_nsec)
-+  if (a->st_mtim.tv_nsec < b->st_mtim.tv_nsec)
-     return -1;
--  if (a->tv_nsec > b->tv_nsec)
-+  if (a->st_mtim.tv_nsec > b->st_mtim.tv_nsec)
-     return 1;
-+#else
-+  if (a->st_mtime < b->st_mtime)
-+    return -1;
-+  if (a->st_mtime > b->st_mtime)
-+    return 1;
-+#endif  
-   return 0;
- }
- 
-@@ -374,7 +381,7 @@ gdbm_latest_snapshot (const char *even, 
-          * Select the newer snapshot, i.e. the one whose mtime
-          * is greater than the other's
-          */
--        switch (timespec_cmp (&st_even.st_mtim, &st_odd.st_mtim))
-+        switch (timespec_cmp (&st_even, &st_odd))
-           {
-           case -1:
-             *ret = odd;
diff -r aa2a21d0186d -r cdcb1f240724 databases/gdbm/patches/patch-src_systems.h
--- a/databases/gdbm/patches/patch-src_systems.h        Mon Nov 01 18:14:31 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_systems.h,v 1.1 2021/09/14 13:32:50 schmonz Exp $
-
-Apply upstream patch 32517af7 to check for st_mtim in struct stat.
-Fixes macOS build.
-
---- src/systems.h.orig 2021-08-10 12:13:24.000000000 +0000
-+++ src/systems.h
-@@ -52,6 +52,13 @@
- # define STATBLKSIZE(st) 1024
- #endif
- 
-+#if ! HAVE_STRUCT_STAT_ST_MTIM
-+# if HAVE_STRUCT_STAT_ST_MTIMESPEC
-+#   define st_mtim st_mtimespec
-+#   define HAVE_STRUCT_STAT_ST_MTIM 1
-+# endif
-+#endif
-+
- #ifndef STDERR_FILENO
- # define STDERR_FILENO 2
- #endif