Imported from /home/lorry/working-area/delta_berkeleydb/db-6.1.23.tar.gz.HEADdb-6.1.23master

9 files changed, 112 insertions, 39 deletions

diff --git a/lang/perl/DB_File/Changes b/lang/perl/DB_File/Changes
index f527911f..c76b08e3 100644
--- a/lang/perl/DB_File/Changes
+++ b/lang/perl/DB_File/Changes
@@ -1,3 +1,22 @@
+1.828 7 May 2013
+
+   * Minor change to build with Berkeley DB 6.x
+
+1.827 25 Jan 2012
+
+   * DB_File.pm - Don't use "@_" construct
+     [RT ##79287]
+
+1.826 25 Jan 2012
+
+   * t/db-btree.t - fix use of "length @array"
+     [RT ##74336]
+
+1.825 24 Jan 2012
+
+   * t/db-btree.t - fix use of "length @array"
+     [RT ##74336]
+
 1.824 6 Aug 2011
 
    * Amendments to tests to work in blead
diff --git a/lang/perl/DB_File/DB_File.pm b/lang/perl/DB_File/DB_File.pm
index d7fba44e..9c225ae1 100644
--- a/lang/perl/DB_File/DB_File.pm
+++ b/lang/perl/DB_File/DB_File.pm
@@ -1,10 +1,8 @@
 # DB_File.pm -- Perl 5 interface to Berkeley DB 
 #
-# written by Paul Marquess (pmqs@cpan.org)
-# last modified 28th October 2007
-# version 1.818
+# Written by Paul Marquess (pmqs@cpan.org)
 #
-#     Copyright (c) 1995-2009 Paul Marquess. All rights reserved.
+#     Copyright (c) 1995-2014 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,17 +163,17 @@ our ($db_version, $use_XSLoader, $splice_end_array_no_length, $splice_end_array,
 use Carp;
 
 
-$VERSION = "1.824" ;
+$VERSION = "1.828" ;
 $VERSION = eval $VERSION; # needed for dev releases
 
 {
-    local $SIG{__WARN__} = sub {$splice_end_array_no_length = "@_";};
+    local $SIG{__WARN__} = sub {$splice_end_array_no_length = join(" ",@_);};
     my @a =(1); splice(@a, 3);
     $splice_end_array_no_length = 
         ($splice_end_array_no_length =~ /^splice\(\) offset past end of array at /);
 }      
 {
-    local $SIG{__WARN__} = sub {$splice_end_array = "@_";};
+    local $SIG{__WARN__} = sub {$splice_end_array = join(" ", @_);};
     my @a =(1); splice(@a, 3, 1);
     $splice_end_array = 
         ($splice_end_array =~ /^splice\(\) offset past end of array at /);
@@ -2279,7 +2277,7 @@ archive in F<src/misc/db.1.85.tar.gz>.
 
 =head1 COPYRIGHT
 
-Copyright (c) 1995-2007 Paul Marquess. All rights reserved. This program
+Copyright (c) 1995-2012 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/lang/perl/DB_File/DB_File.xs b/lang/perl/DB_File/DB_File.xs
index e61dc134..c0aecf97 100644
--- a/lang/perl/DB_File/DB_File.xs
+++ b/lang/perl/DB_File/DB_File.xs
@@ -2,13 +2,11 @@
 
  DB_File.xs -- Perl 5 interface to Berkeley DB 
 
- written by Paul Marquess <pmqs@cpan.org>
- last modified 4th February 2007
- version 1.818
+ Written by Paul Marquess <pmqs@cpan.org>
 
  All comments/suggestions/problems are welcome
 
-     Copyright (c) 1995-2009 Paul Marquess. All rights reserved.
+     Copyright (c) 1995-2014 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.
 
@@ -208,6 +206,10 @@
 #    define AT_LEAST_DB_4_3
 #endif
 
+#if DB_VERSION_MAJOR >= 6 
+#    define AT_LEAST_DB_6_0
+#endif
+
 #ifdef AT_LEAST_DB_3_3
 #   define WANT_ERROR
 #endif
@@ -536,6 +538,19 @@ tidyUp(DB_File db)
 
 
 static int
+
+#ifdef AT_LEAST_DB_6_0
+#ifdef CAN_PROTOTYPE
+btree_compare(DB * db, const DBT *key1, const DBT *key2, size_t* locp)
+#else
+btree_compare(db, key1, key2, locp)
+DB * db ;
+const DBT * key1 ;
+const DBT * key2 ;
+size_t* locp;
+#endif /* CAN_PROTOTYPE */
+
+#else /* Berkeley DB < 6.0 */
 #ifdef AT_LEAST_DB_3_2
 
 #ifdef CAN_PROTOTYPE
@@ -558,6 +573,7 @@ const DBT * key2 ;
 #endif
 
 #endif
+#endif
 
 {
 #ifdef dTHX
diff --git a/lang/perl/DB_File/MANIFEST b/lang/perl/DB_File/MANIFEST
index 20b3973a..e460e81e 100644
--- a/lang/perl/DB_File/MANIFEST
+++ b/lang/perl/DB_File/MANIFEST
@@ -30,3 +30,4 @@ t/pod.t
 typemap
 version.c
 META.yml                                 Module meta-data (added by MakeMaker)
+META.json                                Module JSON meta-data (added by MakeMaker)
diff --git a/lang/perl/DB_File/META.json b/lang/perl/DB_File/META.json
new file mode 100644
index 00000000..f519dd0b
--- /dev/null
+++ b/lang/perl/DB_File/META.json
@@ -0,0 +1,39 @@
+{
+   "abstract" : "Perl5 access to Berkeley DB version 1.x",
+   "author" : [
+      "Paul Marquess <pmqs@cpan.org>"
+   ],
+   "dynamic_config" : 1,
+   "generated_by" : "ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120630",
+   "license" : [
+      "perl_5"
+   ],
+   "meta-spec" : {
+      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+      "version" : "2"
+   },
+   "name" : "DB_File",
+   "no_index" : {
+      "directory" : [
+         "t",
+         "inc"
+      ]
+   },
+   "prereqs" : {
+      "build" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "configure" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "runtime" : {
+         "requires" : {}
+      }
+   },
+   "release_status" : "stable",
+   "version" : "1.828"
+}
diff --git a/lang/perl/DB_File/META.yml b/lang/perl/DB_File/META.yml
index 2981b68b..341aba44 100644
--- a/lang/perl/DB_File/META.yml
+++ b/lang/perl/DB_File/META.yml
@@ -1,21 +1,21 @@
---- #YAML:1.0
-name:               DB_File
-version:            1.824
-abstract:           Perl5 access to Berkeley DB version 1.x
+---
+abstract: 'Perl5 access to Berkeley DB version 1.x'
 author:
-    - Paul Marquess <pmqs@cpan.org>
-license:            perl
-distribution_type:  module
-configure_requires:
-    ExtUtils::MakeMaker:  0
+  - 'Paul Marquess <pmqs@cpan.org>'
 build_requires:
-    ExtUtils::MakeMaker:  0
-requires:  {}
-no_index:
-    directory:
-        - t
-        - inc
-generated_by:       ExtUtils::MakeMaker version 6.54
+  ExtUtils::MakeMaker: 0
+configure_requires:
+  ExtUtils::MakeMaker: 0
+dynamic_config: 1
+generated_by: 'ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120630'
+license: perl
 meta-spec:
-    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
-    version:  1.4
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: 1.4
+name: DB_File
+no_index:
+  directory:
+    - t
+    - inc
+requires: {}
+version: 1.828
diff --git a/lang/perl/DB_File/README b/lang/perl/DB_File/README
index 719b96e1..813cc893 100644
--- a/lang/perl/DB_File/README
+++ b/lang/perl/DB_File/README
@@ -1,10 +1,10 @@
                                   DB_File
 
-                               Version 1.824
+                               Version 1.828
 
-                              6th August 2011
+                               7th May 2013
 
-     Copyright (c) 1995-2011 Paul Marquess. All rights reserved. This
+     Copyright (c) 1995-2014 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.
 
@@ -22,11 +22,11 @@ DESCRIPTION
 
 DB_File is a module which allows Perl programs to make use of the
 facilities provided by Berkeley DB version 1. (DB_File can be built
-version 2, 3 or 4 of Berkeley DB, but it will only support the 1.x
-features),
+version 2, or greater, of Berkeley DB, but it will only support the 1.x
+features).
 
 If you want to make use of the new features available in Berkeley DB
-2.x, 3.x or 4.x, use the Perl module BerkeleyDB instead.
+2.x, or greater, use the Perl module BerkeleyDB instead.
 
 Berkeley DB is a C library which provides a consistent interface to a
 number of database formats. DB_File provides an interface to all three
diff --git a/lang/perl/DB_File/dbinfo b/lang/perl/DB_File/dbinfo
index b8cd65a9..e8abc974 100644
--- a/lang/perl/DB_File/dbinfo
+++ b/lang/perl/DB_File/dbinfo
@@ -7,7 +7,7 @@
 # Version: 	1.06 
 # Date		27th March 2008
 #
-#     Copyright (c) 1998-2008 Paul Marquess. All rights reserved.
+#     Copyright (c) 1998-2012 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/lang/perl/DB_File/t/db-btree.t b/lang/perl/DB_File/t/db-btree.t
index 29c70a17..fb89a408 100644
--- a/lang/perl/DB_File/t/db-btree.t
+++ b/lang/perl/DB_File/t/db-btree.t
@@ -566,9 +566,9 @@ sub ArrayCompare
  
     return 0 if @$a != @$b ;
  
-    foreach (1 .. length @$a)
+    foreach (0 .. @$a - 1)
     {
-        return 0 unless $$a[$_] eq $$b[$_] ;
+        return 0 unless $$a[$_] eq $$b[$_];
     }
  
     1 ;