Change 33585 by [EMAIL PROTECTED] on 2008/03/28 12:42:41
Integrate:
[ 32883]
Silence new warning grep in void context warning in various modules and
test files, also silence a warning that came from a previous 'dev' version
number bump.
[ 32884]
dev version numbers, xs and warnings dont play together nicely, so use
MM->parse_version() to smooth over the cracks....
[ 33583]
Subject: [PATCH] DB_File 1.817
From: "Paul Marquess" <[EMAIL PROTECTED]>
Date: Thu, 27 Mar 2008 11:12:22 -0000
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.10/perl/ext/DB_File/Changes#2 integrate
... //depot/maint-5.10/perl/ext/DB_File/DB_File.pm#2 integrate
... //depot/maint-5.10/perl/ext/DB_File/DB_File.xs#2 integrate
... //depot/maint-5.10/perl/ext/DB_File/Makefile.PL#2 integrate
... //depot/maint-5.10/perl/ext/DB_File/dbinfo#2 integrate
... //depot/maint-5.10/perl/ext/DB_File/t/db-btree.t#2 integrate
... //depot/maint-5.10/perl/ext/DB_File/t/db-hash.t#2 integrate
... //depot/maint-5.10/perl/ext/DB_File/t/db-recno.t#2 integrate
... //depot/maint-5.10/perl/ext/DB_File/version.c#2 integrate
Differences ...
==== //depot/maint-5.10/perl/ext/DB_File/Changes#2 (text) ====
Index: perl/ext/DB_File/Changes
--- perl/ext/DB_File/Changes#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/ext/DB_File/Changes 2008-03-28 05:42:41.000000000 -0700
@@ -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]
==== //depot/maint-5.10/perl/ext/DB_File/DB_File.pm#2 (text) ====
Index: perl/ext/DB_File/DB_File.pm
--- perl/ext/DB_File/DB_File.pm#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/ext/DB_File/DB_File.pm 2008-03-28 05:42:41.000000000 -0700
@@ -2,9 +2,9 @@
#
# written by Paul Marquess ([EMAIL PROTECTED])
# 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,7 +165,8 @@
use Carp;
-$VERSION = "1.816_1" ;
+$VERSION = "1.817" ;
+$VERSION = eval $VERSION; # needed for dev releases
{
local $SIG{__WARN__} = sub {$splice_end_array = "@_";};
==== //depot/maint-5.10/perl/ext/DB_File/DB_File.xs#2 (text) ====
Index: perl/ext/DB_File/DB_File.xs
--- perl/ext/DB_File/DB_File.xs#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/ext/DB_File/DB_File.xs 2008-03-28 05:42:41.000000000 -0700
@@ -4,11 +4,11 @@
written by Paul Marquess <[EMAIL PROTECTED]>
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.
==== //depot/maint-5.10/perl/ext/DB_File/Makefile.PL#2 (text) ====
Index: perl/ext/DB_File/Makefile.PL
--- perl/ext/DB_File/Makefile.PL#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/ext/DB_File/Makefile.PL 2008-03-28 05:42:41.000000000 -0700
@@ -22,6 +22,7 @@
XSPROTOARG => '-noprototypes',
DEFINE => $OS2 || "",
INC => ($^O eq "MacOS" ? "-i ::::db:include" : ""),
+ XS_VERSION => eval MM->parse_version('DB_File.pm'),
((ExtUtils::MakeMaker->VERSION() gt '6.30')
? ('LICENSE' => 'perl')
: ()
==== //depot/maint-5.10/perl/ext/DB_File/dbinfo#2 (text) ====
Index: perl/ext/DB_File/dbinfo
--- perl/ext/DB_File/dbinfo#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/ext/DB_File/dbinfo 2008-03-28 05:42:41.000000000 -0700
@@ -4,10 +4,10 @@
# a database file
#
# Author: Paul Marquess <[EMAIL PROTECTED]>
-# 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 @@
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 @@
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 @@
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"],
==== //depot/maint-5.10/perl/ext/DB_File/t/db-btree.t#2 (xtext) ====
Index: perl/ext/DB_File/t/db-btree.t
--- perl/ext/DB_File/t/db-btree.t#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/ext/DB_File/t/db-btree.t 2008-03-28 05:42:41.000000000 -0700
@@ -1472,7 +1472,7 @@
$h{"fred"} = "joe" ;
ok(173, $h{"fred"} eq "joe");
- eval { grep { $h{$_} } (1, 2, 3) };
+ eval { my @r= grep { $h{$_} } (1, 2, 3) };
ok (174, ! $@);
@@ -1488,7 +1488,7 @@
ok(176, $db->FIRSTKEY() eq "fred") ;
- eval { grep { $h{$_} } (1, 2, 3) };
+ eval { my @r= grep { $h{$_} } (1, 2, 3) };
ok (177, ! $@);
undef $db ;
==== //depot/maint-5.10/perl/ext/DB_File/t/db-hash.t#2 (xtext) ====
Index: perl/ext/DB_File/t/db-hash.t
--- perl/ext/DB_File/t/db-hash.t#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/ext/DB_File/t/db-hash.t 2008-03-28 05:42:41.000000000 -0700
@@ -970,7 +970,7 @@
$h{"fred"} = "joe" ;
ok(137, $h{"fred"} eq "joe");
- eval { grep { $h{$_} } (1, 2, 3) };
+ eval { my @r= grep { $h{$_} } (1, 2, 3) };
ok (138, ! $@);
@@ -986,7 +986,7 @@
ok(140, $db->FIRSTKEY() eq "fred") ;
- eval { grep { $h{$_} } (1, 2, 3) };
+ eval { my @r= grep { $h{$_} } (1, 2, 3) };
ok (141, ! $@);
undef $db ;
==== //depot/maint-5.10/perl/ext/DB_File/t/db-recno.t#2 (xtext) ====
Index: perl/ext/DB_File/t/db-recno.t
--- perl/ext/DB_File/t/db-recno.t#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/ext/DB_File/t/db-recno.t 2008-03-28 05:42:41.000000000 -0700
@@ -994,7 +994,7 @@
$h[0] = "joe" ;
ok(155, $h[0] eq "joe");
- eval { grep { $h[$_] } (1, 2, 3) };
+ eval { my @r= grep { $h[$_] } (1, 2, 3) };
ok (156, ! $@);
@@ -1008,7 +1008,7 @@
ok(157, $h[1] eq "joe");
- eval { grep { $h[$_] } (1, 2, 3) };
+ eval { my @r= grep { $h[$_] } (1, 2, 3) };
ok (158, ! $@);
undef $db ;
==== //depot/maint-5.10/perl/ext/DB_File/version.c#2 (text) ====
Index: perl/ext/DB_File/version.c
--- perl/ext/DB_File/version.c#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/ext/DB_File/version.c 2008-03-28 05:42:41.000000000 -0700
@@ -49,9 +49,10 @@
(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) ;
End of Patch.
