Update DB_File to 1.815 (resolves bz 303701)
This commit is contained in:
Tom Callaway
parent
1b1e488e70
commit
218a272b6e
|
|
@ -0,0 +1,110 @@
|
|||
diff -up perl-5.8.8/ext/DB_File/Changes.BAD perl-5.8.8/ext/DB_File/Changes
|
||||
--- perl-5.8.8/ext/DB_File/Changes.BAD 2007-10-01 12:31:56.000000000 -0400
|
||||
+++ perl-5.8.8/ext/DB_File/Changes 2007-10-01 12:32:19.000000000 -0400
|
||||
@@ -1,5 +1,12 @@
|
||||
|
||||
|
||||
+1.815 4 February 2007
|
||||
+
|
||||
+ * A few casting cleanups for building with C++ from Steve Peters.
|
||||
+
|
||||
+ * Fixed problem with recno which happened if you changed directory after
|
||||
+ opening the database. Problem reported by Andrew Pam.
|
||||
+
|
||||
1.814 11 November 2005
|
||||
|
||||
* Fix from Dominic Dunlop to tidy up an OS-X specific warning in
|
||||
diff -up perl-5.8.8/ext/DB_File/DB_File.pm.BAD perl-5.8.8/ext/DB_File/DB_File.pm
|
||||
--- perl-5.8.8/ext/DB_File/DB_File.pm.BAD 2007-10-01 12:32:36.000000000 -0400
|
||||
+++ perl-5.8.8/ext/DB_File/DB_File.pm 2007-10-01 12:33:41.000000000 -0400
|
||||
@@ -1,10 +1,10 @@
|
||||
# DB_File.pm -- Perl 5 interface to Berkeley DB
|
||||
#
|
||||
# written by Paul Marquess (pmqs@cpan.org)
|
||||
-# last modified 11th November 2005
|
||||
-# version 1.814
|
||||
+# last modified 4th February 2007
|
||||
+# version 1.815
|
||||
#
|
||||
-# Copyright (c) 1995-2005 Paul Marquess. All rights reserved.
|
||||
+# Copyright (c) 1995-2007 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,7 @@ our ($db_version, $use_XSLoader, $splice
|
||||
use Carp;
|
||||
|
||||
|
||||
-$VERSION = "1.814" ;
|
||||
+$VERSION = "1.815" ;
|
||||
|
||||
{
|
||||
local $SIG{__WARN__} = sub {$splice_end_array = "@_";};
|
||||
@@ -260,6 +260,10 @@ sub tie_hash_or_array
|
||||
my (@arg) = @_ ;
|
||||
my $tieHASH = ( (caller(1))[3] =~ /TIEHASH/ ) ;
|
||||
|
||||
+ use File::Spec;
|
||||
+ $arg[1] = File::Spec->rel2abs($arg[1])
|
||||
+ if defined $arg[1] ;
|
||||
+
|
||||
$arg[4] = tied %{ $arg[4] }
|
||||
if @arg >= 5 && ref $arg[4] && $arg[4] =~ /=HASH/ && tied %{ $arg[4] } ;
|
||||
|
||||
diff -up perl-5.8.8/ext/DB_File/DB_File.xs.BAD perl-5.8.8/ext/DB_File/DB_File.xs
|
||||
--- perl-5.8.8/ext/DB_File/DB_File.xs.BAD 2007-10-01 12:33:52.000000000 -0400
|
||||
+++ perl-5.8.8/ext/DB_File/DB_File.xs 2007-10-01 12:35:50.000000000 -0400
|
||||
@@ -3,8 +3,8 @@
|
||||
DB_File.xs -- Perl 5 interface to Berkeley DB
|
||||
|
||||
written by Paul Marquess <pmqs@cpan.org>
|
||||
- last modified 11th November 2005
|
||||
- version 1.814
|
||||
+ last modified 4th February 2007
|
||||
+ version 1.815
|
||||
|
||||
All comments/suggestions/problems are welcome
|
||||
|
||||
@@ -114,6 +114,7 @@
|
||||
1.812 - no change
|
||||
1.813 - no change
|
||||
1.814 - no change
|
||||
+ 1.814 - C++ casting fixes
|
||||
|
||||
*/
|
||||
|
||||
@@ -410,12 +411,12 @@ typedef struct {
|
||||
typedef DB_File_type * DB_File ;
|
||||
typedef DBT DBTKEY ;
|
||||
|
||||
-#define my_sv_setpvn(sv, d, s) sv_setpvn(sv, (s ? d : (void*)""), s)
|
||||
+#define my_sv_setpvn(sv, d, s) sv_setpvn(sv, (s ? d : (const char *)""), s)
|
||||
|
||||
#define OutputValue(arg, name) \
|
||||
{ if (RETVAL == 0) { \
|
||||
SvGETMAGIC(arg) ; \
|
||||
- my_sv_setpvn(arg, name.data, name.size) ; \
|
||||
+ my_sv_setpvn(arg, (const char *)name.data, name.size) ; \
|
||||
TAINT; \
|
||||
SvTAINTED_on(arg); \
|
||||
SvUTF8_off(arg); \
|
||||
@@ -428,7 +429,7 @@ typedef DBT DBTKEY ;
|
||||
{ \
|
||||
SvGETMAGIC(arg) ; \
|
||||
if (db->type != DB_RECNO) { \
|
||||
- my_sv_setpvn(arg, name.data, name.size); \
|
||||
+ my_sv_setpvn(arg, (const char *)name.data, name.size); \
|
||||
} \
|
||||
else \
|
||||
sv_setiv(arg, (I32)*(I32*)name.data - 1); \
|
||||
@@ -597,8 +598,8 @@ const DBT * key2 ;
|
||||
|
||||
PUSHMARK(SP) ;
|
||||
EXTEND(SP,2) ;
|
||||
- PUSHs(sv_2mortal(newSVpvn(data1,key1->size)));
|
||||
- PUSHs(sv_2mortal(newSVpvn(data2,key2->size)));
|
||||
+ PUSHs(sv_2mortal(newSVpvn((const char*)data1,key1->size)));
|
||||
+ PUSHs(sv_2mortal(newSVpvn((const char*)data2,key2->size)));
|
||||
PUTBACK ;
|
||||
|
||||
count = perl_call_sv(CurrentDB->compare, G_SCALAR);
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
Name: perl
|
||||
Version: %{perl_version}
|
||||
Release: 27%{?dist}
|
||||
Release: 28%{?dist}
|
||||
Epoch: %{perl_epoch}
|
||||
Summary: The Perl programming language
|
||||
Group: Development/Languages
|
||||
|
|
@ -119,6 +119,8 @@ Patch39: perl-5.8.8-disable_test_hosts.patch
|
|||
#Patch39: perl-5.8.8-bz204679.patch
|
||||
Patch40: perl-5.8.8-U28775.patch
|
||||
Patch41: perl-5.8.8-bz247386-file-spec-cwd.patch
|
||||
# Update DB_File to 1.815
|
||||
Patch42: perl-5.8.8-DB_File-1.815.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: tcsh, dos2unix, man, groff
|
||||
|
|
@ -379,6 +381,7 @@ upstream tarball from perl.org.
|
|||
%patch39 -p1
|
||||
%patch40 -p1
|
||||
%patch41 -p1
|
||||
%patch42 -p1
|
||||
#
|
||||
# Candidates for doc recoding (need case by case review):
|
||||
# find . -name "*.pod" -o -name "README*" -o -name "*.pm" | xargs file -i | grep charset= | grep -v '\(us-ascii\|utf-8\)'
|
||||
|
|
@ -775,6 +778,9 @@ make test
|
|||
# Nothing. Nada. Zilch. Zarro. Uh uh. Nope. Sorry.
|
||||
|
||||
%changelog
|
||||
* Mon Oct 1 2007 Tom "spot" Callaway <tcallawa@redhat.com> - 4:5.8.8-28
|
||||
- update DB_File to 1.815
|
||||
|
||||
* Fri Aug 24 2007 Stepan Kasal <skasal@redhat.com> - 4:5.8.8-27
|
||||
- Add back the filtering of depends, it _is_ needed; make it more robust.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue