Update DB_File to CPAN version 1.829

  [DELTA]

  1.829 7 July 2013

   * make realclean: removing all files
     RT #68214

   * Documented the issue where the error below

        BDB0588 At least one secondary cursor must be specified to DB->join

   * DB_File installs to wrong place for CPAN version
     RT #70420
     Makefile.PL prevents INSTALLDIRS on command line.
     RT #68287: Makefile.PL prevents INSTALLDIRS on command line.

   * typo fix
     RT #85335

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 959606b..edd900c 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -492,7 +492,7 @@ use File::Glob qw(:case);
 
     'DB_File' => {
         'MAINTAINER'   => 'pmqs',
 
     'DB_File' => {
         'MAINTAINER'   => 'pmqs',

-        'DISTRIBUTION' => 'PMQS/DB_File-1.828.tar.gz',
+        'DISTRIBUTION' => 'PMQS/DB_File-1.829.tar.gz',

         'FILES'        => q[cpan/DB_File],
         'EXCLUDED'     => [
             qr{^patches/},
         'FILES'        => q[cpan/DB_File],
         'EXCLUDED'     => [
             qr{^patches/},

diff --git a/cpan/DB_File/Changes b/cpan/DB_File/Changes
index c76b08e..2af1e5b 100644 (file)
--- a/cpan/DB_File/Changes
+++ b/cpan/DB_File/Changes
@@ -1,3 +1,20 @@
+1.829 7 July 2013
+
+   * make realclean: removing all files
+     RT #68214
+
+   * Documented the issue where the error below 
+
+        BDB0588 At least one secondary cursor must be specified to DB->join
+
+   * DB_File installs to wrong place for CPAN version
+     RT #70420
+     Makefile.PL prevents INSTALLDIRS on command line.
+     RT #68287: Makefile.PL prevents INSTALLDIRS on command line.
+
+   * typo fix
+     RT #85335
+

 1.828 7 May 2013
 
    * Minor change to build with Berkeley DB 6.x
 1.828 7 May 2013
 
    * Minor change to build with Berkeley DB 6.x


@@ -5,17 +22,17 @@
 1.827 25 Jan 2012
 
    * DB_File.pm - Don't use "@_" construct
 1.827 25 Jan 2012
 
    * DB_File.pm - Don't use "@_" construct

-     [RT ##79287]
+     [RT #79287]

 
 1.826 25 Jan 2012
 
    * t/db-btree.t - fix use of "length @array"
 
 1.826 25 Jan 2012
 
    * t/db-btree.t - fix use of "length @array"

-     [RT ##74336]
+     [RT #74336]

 
 1.825 24 Jan 2012
 
    * t/db-btree.t - fix use of "length @array"
 
 1.825 24 Jan 2012
 
    * t/db-btree.t - fix use of "length @array"

-     [RT ##74336]
+     [RT #74336]

 
 1.824 6 Aug 2011
 
 
 1.824 6 Aug 2011
 


@@ -30,7 +47,7 @@
 1.822 12 March 2011
 
    * Link rot
 1.822 12 March 2011
 
    * Link rot

-     [rt.cpan.org #69739] 
+     [rt.cpan.org #68739] 

 
 1.822 12 March 2011
 
 
 1.822 12 March 2011
 

diff --git a/cpan/DB_File/DB_File.pm b/cpan/DB_File/DB_File.pm
index 2828770..67083d8 100644 (file)
--- a/cpan/DB_File/DB_File.pm
+++ b/cpan/DB_File/DB_File.pm
@@ -163,7 +163,7 @@ our ($db_version, $use_XSLoader, $splice_end_array_no_length, $splice_end_array,
 use Carp;
 
 
 use Carp;
 
 

-$VERSION = "1.828" ;
+$VERSION = "1.829" ;

 $VERSION = eval $VERSION; # needed for dev releases
 
 {
 $VERSION = eval $VERSION; # needed for dev releases
 
 {


@@ -2285,7 +2285,7 @@ Although B<DB_File> is covered by the Perl license, the library it
 makes use of, namely Berkeley DB, is not. Berkeley DB has its own
 copyright and its own license. Please take the time to read it.
 
 makes use of, namely Berkeley DB, is not. Berkeley DB has its own
 copyright and its own license. Please take the time to read it.
 

-Here are are few words taken from the Berkeley DB FAQ (at
+Here are a few words taken from the Berkeley DB FAQ (at

 F<http://www.oracle.com/technology/products/berkeley-db/db/index.html>) regarding the license:
 
     Do I have to license DB to use it in Perl scripts? 
 F<http://www.oracle.com/technology/products/berkeley-db/db/index.html>) regarding the license:
 
     Do I have to license DB to use it in Perl scripts? 

diff --git a/cpan/DB_File/DB_File.xs b/cpan/DB_File/DB_File.xs
index d7958fe..5452917 100644 (file)
--- a/cpan/DB_File/DB_File.xs
+++ b/cpan/DB_File/DB_File.xs
@@ -140,6 +140,16 @@
 #ifdef COMPAT185
 #    include <db_185.h>
 #else
 #ifdef COMPAT185
 #    include <db_185.h>
 #else

+
+/* Uncomment one of the lines below */
+/* See the section "At least one secondary cursor must be specified to DB->join"
+   in the README file for the circumstances where you need to uncomment one
+   of the two lines below.
+*/
+
+/* #define time_t __time64_t */
+/* #define time_t __time32_t */
+

 #    include <db.h>
 #endif
 
 #    include <db.h>
 #endif
 


@@ -1541,6 +1551,7 @@ db_DoTie_(isHASH, dbtype, name=undef, flags=O_CREAT|O_RDWR, mode=0666, type=DB_H
                sv = ST(5) ;
 
            RETVAL = ParseOpenInfo(aTHX_ isHASH, name, flags, mode, sv) ;
                sv = ST(5) ;
 
            RETVAL = ParseOpenInfo(aTHX_ isHASH, name, flags, mode, sv) ;

+           Trace(("db_DoTie_ %p\n", RETVAL));

            if (RETVAL->dbp == NULL) {
                Safefree(RETVAL);
                RETVAL = NULL ;
            if (RETVAL->dbp == NULL) {
                Safefree(RETVAL);
                RETVAL = NULL ;

diff --git a/cpan/DB_File/Makefile.PL b/cpan/DB_File/Makefile.PL
index a586a04..1beef32 100644 (file)
--- a/cpan/DB_File/Makefile.PL
+++ b/cpan/DB_File/Makefile.PL
@@ -61,12 +61,15 @@ WriteMakefile(
         : ()
     ),
     
         : ()
     ),
     

+    ($] < 5.008 || $] > 5.011) 
+        ? (INSTALLDIRS => 'site') 
+        : (INSTALLDIRS => 'perl'),

 
        #OPTIMIZE       => '-g',
        'depend'        => { 'Makefile'          => 'config.in',
                              'version$(OBJ_EXT)' => 'version.c'},
 
        #OPTIMIZE       => '-g',
        'depend'        => { 'Makefile'          => 'config.in',
                              'version$(OBJ_EXT)' => 'version.c'},

-       'clean'         => { FILES => 'constants.h constants.xs' },
-       'macro'         => { INSTALLDIRS => 'perl', my_files => "@files" },
+       'clean'         => { FILES => 'constants.h constants.xs DB_File.pm.bak t/db-btree.t.bak t/db-hash.t.bak t/db-recno.t.bak t/pod.t.bak' },
+       'macro'         => { my_files => "@files" },

         'dist'          => { COMPRESS => 'gzip', SUFFIX => 'gz',
                             DIST_DEFAULT => 'MyDoubleCheck tardist'},    
        );
         'dist'          => { COMPRESS => 'gzip', SUFFIX => 'gz',
                             DIST_DEFAULT => 'MyDoubleCheck tardist'},    
        );