DB_File 1.817

From: "Paul Marquess" <Paul.Marquess@ntlworld.com>
Message-ID: <051d01c88ffb$6f662eb0$6901a8c0@myopwv.com>

p4raw-id: //depot/perl@33583

5 files changed, 40 insertions, 18 deletions

diff --git a/ext/DB_File/Changes b/ext/DB_File/Changes
index bb19ff2243..bfa933896f 100644
--- a/ext/DB_File/Changes
+++ b/ext/DB_File/Changes
@@ -1,9 +1,26 @@
 
 
+1.817 27 March 2008
+
+   * Updated dbinfo
+
+   * Applied core patch 32299 - Re-apply change #30562
+
+   * Applied core patch 32208
+
+   * Applied core patch 32884 - use MM->parse_version() in Makefile.PL
+
+   * Applied core patch 32883 -  Silence new warning grep in void context warning
+
+   * Applied core patch 32704 to remove use of PL_na in typemap
+
+   * Applied core patch 30562 to fix a build issue on OSF
+
 1.816 28 October 2007
 
    * Clarified the warning about building with a different version of
      Berkeley DB that is used at runtime.
+
    * Also made the boot version check less strict.
      [rt.cpan.org #30013]
 
diff --git a/ext/DB_File/DB_File.pm b/ext/DB_File/DB_File.pm
index 7bd2b2bcdf..58c34eff83 100644
--- a/ext/DB_File/DB_File.pm
+++ b/ext/DB_File/DB_File.pm
@@ -2,9 +2,9 @@
 #
 # written by Paul Marquess (pmqs@cpan.org)
 # last modified 28th October 2007
-# version 1.816
+# version 1.817
 #
-#     Copyright (c) 1995-2007 Paul Marquess. All rights reserved.
+#     Copyright (c) 1995-2008 Paul Marquess. All rights reserved.
 #     This program is free software; you can redistribute it and/or
 #     modify it under the same terms as Perl itself.
 
@@ -165,8 +165,8 @@ our ($db_version, $use_XSLoader, $splice_end_array, $Error);
 use Carp;
 
 
-$VERSION = "1.816_2" ;
-$VERSION = eval $VERSION; # needed for dev releases 
+$VERSION = "1.817" ;
+$VERSION = eval $VERSION; # needed for dev releases
 
 {
     local $SIG{__WARN__} = sub {$splice_end_array = "@_";};
diff --git a/ext/DB_File/DB_File.xs b/ext/DB_File/DB_File.xs
index 6c88a76144..8f16257a71 100644
--- a/ext/DB_File/DB_File.xs
+++ b/ext/DB_File/DB_File.xs
@@ -4,11 +4,11 @@
 
  written by Paul Marquess <pmqs@cpan.org>
  last modified 4th February 2007
- version 1.815
+ version 1.817
 
  All comments/suggestions/problems are welcome
 
-     Copyright (c) 1995-2005 Paul Marquess. All rights reserved.
+     Copyright (c) 1995-2008 Paul Marquess. All rights reserved.
      This program is free software; you can redistribute it and/or
      modify it under the same terms as Perl itself.
 
diff --git a/ext/DB_File/dbinfo b/ext/DB_File/dbinfo
index 421d36c626..87c4918afe 100644
--- a/ext/DB_File/dbinfo
+++ b/ext/DB_File/dbinfo
@@ -4,10 +4,10 @@
 #			  a database file
 #
 # Author:	Paul Marquess  <Paul.Marquess@btinternet.com>
-# Version: 	1.05 
-# Date		1sh November 2003
+# Version: 	1.06 
+# Date		27th MArch 2008
 #
-#     Copyright (c) 1998-2003 Paul Marquess. All rights reserved.
+#     Copyright (c) 1998-2008 Paul Marquess. All rights reserved.
 #     This program is free software; you can redistribute it and/or
 #     modify it under the same terms as Perl itself.
 
@@ -18,9 +18,10 @@ use strict ;
 
 my %Data =
 	(
-	0x053162 =>	{
+	0x053162 =>	# DB_BTREEMAGIC
+            {
 			  Type 	   => "Btree",
-			  Versions => 
+			  Versions => # DB_BTREEVERSION
 				{
 				  1	=> [0, "Unknown (older than 1.71)"],
 				  2	=> [0, "Unknown (older than 1.71)"],
@@ -33,9 +34,10 @@ my %Data =
 				  9	=> [1, "4.1.x or greater"],
 				}
 			},
-	0x061561 => 	{
+	0x061561 => 	# DB_HASHMAGIC
+            {
 			  Type     => "Hash",
-			  Versions =>
+			  Versions => # DB_HASHVERSION
 				{
 				  1	=> [0, "Unknown (older than 1.71)"],
         			  2     => [0, "1.71 -> 1.85"],
@@ -45,11 +47,13 @@ my %Data =
         			  6     => [0, "3.0.x"],
 				  7	=> [0, "3.1.x -> 4.0.x"],
 				  8	=> [1, "4.1.x or greater"],
+				  9	=> [1, "4.6.x or greater"],
 				}
 			},
-	0x042253 => 	{
+	0x042253 => 	# DB_QAMMAGIC
+            {
 			  Type     => "Queue",
-			  Versions =>
+			  Versions => # DB_QAMVERSION
 				{
 				  1	=> [0, "3.0.x"],
 				  2	=> [0, "3.1.x"],
diff --git a/ext/DB_File/version.c b/ext/DB_File/version.c
index 03b17c18e6..47158d3368 100644
--- a/ext/DB_File/version.c
+++ b/ext/DB_File/version.c
@@ -49,9 +49,10 @@ __getBerkeleyDBInfo()
     (void)db_version(&Major, &Minor, &Patch) ;
 
     /* Check that the versions of db.h and libdb.a are the same */
-    if (Major != DB_VERSION_MAJOR || Minor != DB_VERSION_MINOR 
-		|| Patch != DB_VERSION_PATCH)
-	croak("\nDB_File needs compatible versions of libdb & db.h\n\tyou have db.h version %d.%d.%d and libdb version %d.%d.%d\n",  
+    if (Major != DB_VERSION_MAJOR || Minor != DB_VERSION_MINOR )
+		/* || Patch != DB_VERSION_PATCH) */
+
+	croak("\nDB_File was build with libdb version %d.%d.%d,\nbut you are attempting to run it with libdb version %d.%d.%d\n",
 		DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH, 
 		Major, Minor, Patch) ;