Apply Debian DSA-658 fix for CAN-2005-0077:

- do not create a PID file by default

http://www.debian.org/security/2005/dsa-658

4 files changed, 54 insertions, 3 deletions

diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index de376e339be..815dc5410d3 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2004/12/20 11:30:57 grant Exp $
+# $NetBSD: Makefile,v 1.28 2005/01/29 18:30:47 kim Exp $
 #
 
 DISTNAME=	DBI-1.46
 PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5dbi
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBD/}
 
diff --git a/databases/p5-DBI/distinfo b/databases/p5-DBI/distinfo
index c04bb07f12d..ef87b15f393 100644
--- a/databases/p5-DBI/distinfo
+++ b/databases/p5-DBI/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.13 2004/12/05 17:16:47 he Exp $
+$NetBSD: distinfo,v 1.14 2005/01/29 18:30:47 kim Exp $
 
 SHA1 (DBI-1.46.tar.gz) = 47867153d057ce6668c2cbcf0a69b45b0967401d
 Size (DBI-1.46.tar.gz) = 372350 bytes
+SHA1 (patch-aa) = c8b31125bd92e789d25577a57a3959e440fb69e3
+SHA1 (patch-ab) = a4b49751563a5b4fed68fe5a6eb578952cc40687
diff --git a/databases/p5-DBI/patches/patch-aa b/databases/p5-DBI/patches/patch-aa
new file mode 100644
index 00000000000..798a9b8e310
--- /dev/null
+++ b/databases/p5-DBI/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/01/29 18:30:47 kim Exp $
+
+--- dbiproxy.PL.orig	2004-02-02 08:04:42.000000000 -0500
++++ dbiproxy.PL	2005-01-29 13:24:49.000000000 -0500
+@@ -146,7 +146,7 @@
+ =item B<--pidfile=file>
+ 
+ (UNIX only) If this option is present, a PID file will be created at the
+-given location.
++given location. Default is do not create a pidfile.
+ 
+ =item B<--user=uid>
+ 
diff --git a/databases/p5-DBI/patches/patch-ab b/databases/p5-DBI/patches/patch-ab
new file mode 100644
index 00000000000..74d3a200d05
--- /dev/null
+++ b/databases/p5-DBI/patches/patch-ab
@@ -0,0 +1,36 @@
+$NetBSD: patch-ab,v 1.1 2005/01/29 18:30:47 kim Exp $
+
+--- lib/DBI/ProxyServer.pm.orig	2003-05-14 07:10:55.000000000 -0400
++++ lib/DBI/ProxyServer.pm	2005-01-29 13:24:49.000000000 -0500
+@@ -33,12 +33,6 @@
+ package DBI::ProxyServer;
+ 
+ 
+-my $haveFileSpec = eval { require File::Spec };
+-my $tmpDir = $haveFileSpec ? File::Spec->tmpdir() :
+-    ($ENV{'TMP'} || $ENV{'TEMP'} || '/tmp');
+-my $defaultPidFile = $haveFileSpec ?
+-    File::Spec->catdir($tmpDir, "dbiproxy.pid") : "/tmp/dbiproxy.pid";
+-
+ 
+ ############################################################################
+ #
+@@ -109,7 +103,8 @@
+     } else {
+ 	$o->{'mode'} = 'single';
+     }
+-    $o->{'pidfile'}    = $defaultPidFile;
++    # No pidfile by default, configuration must provide one if needed
++    $o->{'pidfile'}    = 'none';
+     $o->{'user'}       = undef;
+ };
+ 
+@@ -520,7 +515,7 @@
+ =item I<pidfile> (B<--pidfile=file>)
+ 
+ (UNIX only) If this option is present, a PID file will be created at the
+-given location.
++given location. Default is do not create a pidfile.
+ 
+ =item I<user> (B<--user=uid>)
+