- update to 1.48

3 files changed, 13 insertions, 56 deletions

diff --git a/databases/p5-DBD-Pg/files/patch-06bytea.t b/databases/p5-DBD-Pg/files/patch-06bytea.t
deleted file mode 100644
index 3a02b028fa50..000000000000
--- a/databases/p5-DBD-Pg/files/patch-06bytea.t
+++ /dev/null
@@ -1,34 +0,0 @@
---- t/06bytea.t.orig	Sun Mar 20 10:47:38 2005
-+++ t/06bytea.t	Thu Aug  4 22:34:26 2005
-@@ -9,7 +9,7 @@
- $|=1;
- 
- if (defined $ENV{DBI_DSN}) {
--	plan tests => 3;
-+	plan tests => 6;
- } else {
- 	plan skip_all => 'Cannot run test unless DBI_DSN is defined. See the README file';
- }
-@@ -22,12 +22,21 @@
- 
- $sth = $dbh->prepare(qq{INSERT INTO dbd_pg_test (id,bytetest) VALUES (?,?)});
- $sth->bind_param(2, undef, { pg_type => DBD::Pg::PG_BYTEA });
--$sth->execute(400, "a\0b");
-+ok($sth->execute(400, "a\0b", 'execute 401');
-+ok($sth->execute(401, '\''), 'execute 401');
-+ok($sth->execute(402, '\''), 'execute 402');
-+
-+
- $sth = $dbh->prepare(qq{SELECT bytetest FROM dbd_pg_test WHERE id=?});
- $sth->execute(400);
- 
- my $byte = $sth->fetchall_arrayref()->[0][0];
- ok($byte eq "a\0b", "text from BYTEA column looks corect");
-+
-+$sth->execute(402);
-+$byte = $sth->fetchall_arrayref()->[0][0];
-+is($byte, '\'', 'text from BYTEA column with quote');
-+
- $sth->finish();
- 
- $dbh->rollback();
diff --git a/databases/p5-DBD-Pg/files/patch-Makefile.PL b/databases/p5-DBD-Pg/files/patch-Makefile.PL
index 082486aaf7c5..fe6c53911ab1 100644
--- a/databases/p5-DBD-Pg/files/patch-Makefile.PL
+++ b/databases/p5-DBD-Pg/files/patch-Makefile.PL
@@ -1,13 +1,15 @@
---- Makefile.PL.orig	Sat May 21 16:43:17 2005
-+++ Makefile.PL	Mon May 23 13:32:05 2005
-@@ -85,13 +85,13 @@
+--- Makefile.PL.orig	Thu Apr 20 19:25:49 2006
++++ Makefile.PL	Thu Apr 20 19:26:54 2006
+@@ -96,7 +96,7 @@
    }
  }
  
--my $comp_opts = $Config{q{ccflags}} . " -DPGLIBVERSION=$serverversion";
-+my $comp_opts = " -DPGLIBVERSION=$serverversion";
+-my $comp_opts = $Config{q{ccflags}} . " -DPGLIBVERSION=$serverversion -DPGDEFPORT=$defaultport";
++my $comp_opts = " -DPGLIBVERSION=$serverversion -DPGDEFPORT=$defaultport";
  
- my %opts = 
+ if ($ENV{DBDPG_GCCDEBUG}) {
+ 	warn "Enabling many compiler options\n";
+@@ -120,7 +120,7 @@
  	(
  	 NAME           => 'DBD::Pg',
  	 VERSION_FROM   => 'Pg.pm',
@@ -16,11 +18,11 @@
  	 OBJECT         => "Pg\$(OBJ_EXT) dbdimp\$(OBJ_EXT) quote\$(OBJ_EXT) types\$(OBJ_EXT)",
  	 LIBS           => ["-L$POSTGRES_LIB -lpq"],
  	 AUTHOR         => 'http://gborg.postgresql.org/project/dbdpg/',
-@@ -99,7 +99,6 @@
- 	 PREREQ_PM      => { 'Test::Simple' => '0.17',  # Need Test::More.
- 											 'Test::Harness' => '2.03', # Need TODO tests.
- 									 },
+@@ -130,7 +130,6 @@
+ 						'Test::Simple' => '0.30',
+ 						'Test::Harness' => '2.03',
+ 					   },
 -	 CCFLAGS        => $comp_opts,
  	 PERL_MALLOC_OK => 1,
  	 NEEDS_LINKING  => 1,
- 	 clean          => { FILES => 'trace' },
+ 	 clean          => { FILES => 'trace Pg.xsi' },
diff --git a/databases/p5-DBD-Pg/files/patch-quote.c b/databases/p5-DBD-Pg/files/patch-quote.c
deleted file mode 100644
index 0ffbf3bd2f33..000000000000
--- a/databases/p5-DBD-Pg/files/patch-quote.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- quote.c.orig	Wed May 25 04:14:24 2005
-+++ quote.c	Thu Aug  4 22:34:26 2005
-@@ -307,7 +307,7 @@
-  	dest = result;
- 	
- 	Copy("'", dest++, 1, char);
--	strncpy(dest,intermead,strlen(intermead));
-+	strncpy(dest,intermead,strlen(intermead)+1);
- 	strcat(dest,"\'");
- 	
- #if PGLIBVERSION >= 70400