diff -pru gdbm-1.9/ChangeLog gdbm-1.9.1/ChangeLog --- gdbm-1.9/ChangeLog 2011-08-12 18:08:43.000000000 +0300 +++ gdbm-1.9.1/ChangeLog 2011-08-13 07:25:29.000000000 +0300 @@ -1,3 +1,16 @@ +2011-08-13 Sergey Poznyakoff + + * NEWS, configure.ac: Version 1.9.1 + +2011-08-12 Sergey Poznyakoff + + Bugfixes (pointed out by Matthew Burgess + ). + + * src/gdbmopen.c: Fix a typo. + * tests/Makefile.am ($(srcdir)/package.m4): Fix improper + dependency. + 2011-08-11 Sergey Poznyakoff Release 1.9 diff -pru gdbm-1.9/NEWS gdbm-1.9.1/NEWS --- gdbm-1.9/NEWS 2011-08-12 18:08:01.000000000 +0300 +++ gdbm-1.9.1/NEWS 2011-08-13 07:23:34.000000000 +0300 @@ -1,9 +1,17 @@ -GNU dbm NEWS -- history of user-visible changes. 2011-08-12 +GNU dbm NEWS -- history of user-visible changes. 2011-08-13 Copyright (C) 1990-2011 Free Software Foundation, Inc. See the end of file for copying conditions. Please send gdbm bug reports to . +Version 1.9.1 + +* Bugfix + +Improperly used preprocessor directive caused compilation failure +when using gcc 4.4.4 or newer. + + Version 1.9, 2011-08-12 * Use of mmap diff -pru gdbm-1.9/configure gdbm-1.9.1/configure --- gdbm-1.9/configure 2011-08-11 23:03:30.000000000 +0300 +++ gdbm-1.9.1/configure 2011-08-13 07:16:16.000000000 +0300 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for gdbm 1.9. +# Generated by GNU Autoconf 2.63 for gdbm 1.9.1. # # Report bugs to . # @@ -616,8 +616,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='gdbm' PACKAGE_TARNAME='gdbm' -PACKAGE_VERSION='1.9' -PACKAGE_STRING='gdbm 1.9' +PACKAGE_VERSION='1.9.1' +PACKAGE_STRING='gdbm 1.9.1' PACKAGE_BUGREPORT='bug-gdbm@gnu.org' ac_unique_file="src/gdbmdefs.h" @@ -1357,7 +1357,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gdbm 1.9 to adapt to many kinds of systems. +\`configure' configures gdbm 1.9.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1427,7 +1427,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gdbm 1.9:";; + short | recursive ) echo "Configuration of gdbm 1.9.1:";; esac cat <<\_ACEOF @@ -1543,7 +1543,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gdbm configure 1.9 +gdbm configure 1.9.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1557,7 +1557,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gdbm $as_me 1.9, which was +It was created by gdbm $as_me 1.9.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2423,7 +2423,7 @@ fi # Define the identity of the package. PACKAGE='gdbm' - VERSION='1.9' + VERSION='1.9.1' cat >>confdefs.h <<_ACEOF @@ -2482,7 +2482,7 @@ GDBM_VERSION_MAJOR=1 GDBM_VERSION_MINOR=9 -GDBM_VERSION_PATCH=0 +GDBM_VERSION_PATCH=1 # Check whether --enable-memory-mapped-io was given. @@ -13852,7 +13852,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gdbm $as_me 1.9, which was +This file was extended by gdbm $as_me 1.9.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13915,7 +13915,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -gdbm config.status 1.9 +gdbm config.status 1.9.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -pru gdbm-1.9/configure.ac gdbm-1.9.1/configure.ac --- gdbm-1.9/configure.ac 2011-08-11 23:02:14.000000000 +0300 +++ gdbm-1.9.1/configure.ac 2011-08-13 06:51:50.000000000 +0300 @@ -16,7 +16,7 @@ m4_define([_GDBM_VERSION_MAJOR], 1) m4_define([_GDBM_VERSION_MINOR], 9) -dnl m4_define([_GDBM_VERSION_PATCH], 0) +m4_define([_GDBM_VERSION_PATCH], 1) AC_INIT([gdbm], [_GDBM_VERSION_MAJOR._GDBM_VERSION_MINOR[]m4_ifdef([_GDBM_VERSION_PATCH],._GDBM_VERSION_PATCH)], diff -pru gdbm-1.9/doc/gdbm.info gdbm-1.9.1/doc/gdbm.info --- gdbm-1.9/doc/gdbm.info 2011-08-11 19:19:05.000000000 +0300 +++ gdbm-1.9.1/doc/gdbm.info 2011-08-13 06:52:44.000000000 +0300 @@ -29,9 +29,10 @@ The GNU database manager. ************************* GNU `dbm' is a library of functions implementing a hashed database on a -disk file. This manual documents GNU `dbm' Version 1.9 (`gdbm'). The -software was originally written by Philip A. Nelson. This document -was originally written by Pierre Gaumond from texts written by Phil. +disk file. This manual documents GNU `dbm' Version 1.9.1 (`gdbm'). +The software was originally written by Philip A. Nelson. This +document was originally written by Pierre Gaumond from texts written by +Phil. * Menu: @@ -2166,37 +2167,37 @@ Index  Tag Table: Node: Top969 -Node: Copying2860 -Node: Intro4643 -Node: List6063 -Node: Open7012 -Node: Close10322 -Node: Store10776 -Node: Fetch12752 -Node: Delete13974 -Node: Sequential14740 -Node: Reorganization17731 -Node: Sync18740 -Node: Flat files19830 -Node: Errors22432 -Node: Options22996 -Node: Locking28723 -Node: testgdbm29316 -Node: invocation30290 -Node: shell30852 -Ref: pager32459 -Ref: nul-termination32824 -Ref: testgdbm export33286 -Ref: testgdbm import33670 -Node: gdbmexport36107 -Node: Variables37366 -Node: Error codes39797 -Node: Compatibility43634 -Node: ndbm45208 -Node: dbm49898 -Node: Bugs52558 -Node: Resources53913 -Node: GNU Free Documentation License54627 -Node: Index79799 +Node: Copying2861 +Node: Intro4644 +Node: List6064 +Node: Open7013 +Node: Close10323 +Node: Store10777 +Node: Fetch12753 +Node: Delete13975 +Node: Sequential14741 +Node: Reorganization17732 +Node: Sync18741 +Node: Flat files19831 +Node: Errors22433 +Node: Options22997 +Node: Locking28724 +Node: testgdbm29317 +Node: invocation30291 +Node: shell30853 +Ref: pager32460 +Ref: nul-termination32825 +Ref: testgdbm export33287 +Ref: testgdbm import33671 +Node: gdbmexport36108 +Node: Variables37367 +Node: Error codes39798 +Node: Compatibility43635 +Node: ndbm45209 +Node: dbm49899 +Node: Bugs52559 +Node: Resources53914 +Node: GNU Free Documentation License54628 +Node: Index79800  End Tag Table diff -pru gdbm-1.9/doc/stamp-vti gdbm-1.9.1/doc/stamp-vti --- gdbm-1.9/doc/stamp-vti 2011-08-11 23:04:22.000000000 +0300 +++ gdbm-1.9.1/doc/stamp-vti 2011-08-13 07:16:37.000000000 +0300 @@ -1,4 +1,4 @@ @set UPDATED 11 August 2011 @set UPDATED-MONTH August 2011 -@set EDITION 1.9 -@set VERSION 1.9 +@set EDITION 1.9.1 +@set VERSION 1.9.1 diff -pru gdbm-1.9/doc/version.texi gdbm-1.9.1/doc/version.texi --- gdbm-1.9/doc/version.texi 2011-08-11 00:46:26.000000000 +0300 +++ gdbm-1.9.1/doc/version.texi 2011-08-13 06:52:44.000000000 +0300 @@ -1,4 +1,4 @@ @set UPDATED 11 August 2011 @set UPDATED-MONTH August 2011 -@set EDITION 1.9 -@set VERSION 1.9 +@set EDITION 1.9.1 +@set VERSION 1.9.1 diff -pru gdbm-1.9/src/gdbm.h gdbm-1.9.1/src/gdbm.h --- gdbm-1.9/src/gdbm.h 2011-08-11 23:04:10.000000000 +0300 +++ gdbm-1.9.1/src/gdbm.h 2011-08-13 07:16:36.000000000 +0300 @@ -86,7 +86,7 @@ extern const char *gdbm_version; #define GDBM_VERSION_MAJOR 1 #define GDBM_VERSION_MINOR 9 -#define GDBM_VERSION_PATCH 0 +#define GDBM_VERSION_PATCH 1 extern int const gdbm_version_number[3]; diff -pru gdbm-1.9/src/gdbmopen.c gdbm-1.9.1/src/gdbmopen.c --- gdbm-1.9/src/gdbmopen.c 2011-08-11 01:52:24.000000000 +0300 +++ gdbm-1.9.1/src/gdbmopen.c 2011-08-12 23:22:52.000000000 +0300 @@ -27,7 +27,7 @@ #define GDBM_MAGIC GDBM_MAGIC32 #elif SIZEOF_OFF_T == 8 #define GDBM_MAGIC GDBM_MAGIC64 -#elif +#else #error "Unsupported off_t size, contact GDBM maintainer. What crazy system is this?!?" #endif diff -pru gdbm-1.9/src/version.c gdbm-1.9.1/src/version.c --- gdbm-1.9/src/version.c 2011-08-12 18:17:30.000000000 +0300 +++ gdbm-1.9.1/src/version.c 2011-08-13 18:13:49.000000000 +0300 @@ -24,7 +24,7 @@ The DIST_DATE magic below is replaced by the actual date when making the distdir. */ const char * gdbm_version = "GDBM version " PACKAGE_VERSION ". " -"12/08/2011" +"13/08/2011" #if defined(__STDC__) && defined(__DATE__) && defined(__TIME__) " (built " __DATE__ " " __TIME__ ")" #endif diff -pru gdbm-1.9/tests/Makefile.am gdbm-1.9.1/tests/Makefile.am --- gdbm-1.9/tests/Makefile.am 2011-08-11 18:46:50.000000000 +0300 +++ gdbm-1.9.1/tests/Makefile.am 2011-08-12 22:51:08.000000000 +0300 @@ -27,7 +27,7 @@ MAINTAINERCLEANFILES = Makefile.in $(TES ## package.m4. ## ## ------------ ## -$(srcdir)/package.m4: $(top_srcdir)/configure.ac $(srcdir)/Makefile +$(srcdir)/package.m4: $(top_srcdir)/configure.ac $(srcdir)/Makefile.am $(AM_V_GEN){ \ echo '# Signature of the current package.'; \ echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \ diff -pru gdbm-1.9/tests/Makefile.in gdbm-1.9.1/tests/Makefile.in --- gdbm-1.9/tests/Makefile.in 2011-08-11 23:03:37.000000000 +0300 +++ gdbm-1.9.1/tests/Makefile.in 2011-08-13 07:16:22.000000000 +0300 @@ -634,7 +634,7 @@ uninstall-am: tags uninstall uninstall-am -$(srcdir)/package.m4: $(top_srcdir)/configure.ac $(srcdir)/Makefile +$(srcdir)/package.m4: $(top_srcdir)/configure.ac $(srcdir)/Makefile.am $(AM_V_GEN){ \ echo '# Signature of the current package.'; \ echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \ diff -pru gdbm-1.9/tests/package.m4 gdbm-1.9.1/tests/package.m4 --- gdbm-1.9/tests/package.m4 2011-08-11 23:47:57.000000000 +0300 +++ gdbm-1.9.1/tests/package.m4 2011-08-13 06:52:45.000000000 +0300 @@ -1,9 +1,9 @@ # Signature of the current package. m4_define([AT_PACKAGE_NAME], [gdbm]) m4_define([AT_PACKAGE_TARNAME], [gdbm]) -m4_define([AT_PACKAGE_VERSION], [1.9]) +m4_define([AT_PACKAGE_VERSION], [1.9.1]) m4_define([AT_PACKAGE_VERSION_MAJOR], [1]) m4_define([AT_PACKAGE_VERSION_MINOR], [9]) -m4_define([AT_PACKAGE_VERSION_PATCH], [0]) -m4_define([AT_PACKAGE_STRING], [gdbm 1.9]) +m4_define([AT_PACKAGE_VERSION_PATCH], [1]) +m4_define([AT_PACKAGE_STRING], [gdbm 1.9.1]) m4_define([AT_PACKAGE_BUGREPORT], [bug-gdbm@gnu.org]) diff -pru gdbm-1.9/tests/testsuite gdbm-1.9.1/tests/testsuite --- gdbm-1.9/tests/testsuite 2011-08-11 23:47:58.000000000 +0300 +++ gdbm-1.9.1/tests/testsuite 2011-08-13 06:52:46.000000000 +0300 @@ -890,7 +890,7 @@ fi # List of tests. if $at_list_p; then cat <<_ATEOF || at_write_fail=1 -gdbm 1.9 test suite test groups: +gdbm 1.9.1 test suite test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -919,7 +919,7 @@ _ATEOF exit $at_write_fail fi if $at_version_p; then - $as_echo "$as_me (gdbm 1.9)" && + $as_echo "$as_me (gdbm 1.9.1)" && cat <<\_ACEOF || at_write_fail=1 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 @@ -1110,15 +1110,15 @@ exec 5>>"$at_suite_log" # Banners and logs. cat <<\_ASBOX -## -------------------- ## -## gdbm 1.9 test suite. ## -## -------------------- ## +## ---------------------- ## +## gdbm 1.9.1 test suite. ## +## ---------------------- ## _ASBOX { cat <<\_ASBOX -## -------------------- ## -## gdbm 1.9 test suite. ## -## -------------------- ## +## ---------------------- ## +## gdbm 1.9.1 test suite. ## +## ---------------------- ## _ASBOX echo @@ -1849,7 +1849,7 @@ _ASBOX $as_echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help: To: - Subject: [gdbm 1.9] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} + Subject: [gdbm 1.9.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} " if test $at_debug_p = false; then echo @@ -1891,8 +1891,8 @@ fi at_status=$? at_failed=false at_func_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "1.9.0 -1.9.0 +echo >>"$at_stdout"; $as_echo "1.9.1 +1.9.1 " | \ $at_diff - "$at_stdout" || at_failed=: at_func_check_status 0 $at_status "$at_srcdir/version.at:19"