[pkgsrc/pkgsrc-2004Q4]: pkgsrc/databases/p5-DBI Pullup ticket 265 - requested...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d16fc3545be2
branches:  pkgsrc-2004Q4
changeset: 485874:d16fc3545be2
user:      salo <salo%pkgsrc.org@localhost>
date:      Thu Feb 03 23:10:06 2005 +0000

description:
Pullup ticket 265 - requested by Kimmo Suominen
security fix for p5-DBI

Revisions pulled up:
- pkgsrc/databases/p5-DBI/Makefile         1.28
- pkgsrc/databases/p5-DBI/distinfo         1.14
- pkgsrc/databases/p5-DBI/patches/patch-aa 1.1
- pkgsrc/databases/p5-DBI/patches/patch-ab 1.1

   Module Name:         pkgsrc
   Committed By:        kim
   Date:                Sat Jan 29 18:30:47 UTC 2005

   Modified Files:
        pkgsrc/databases/p5-DBI: Makefile distinfo
   Added Files:
        pkgsrc/databases/p5-DBI/patches: patch-aa patch-ab

   Log Message:
   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

diffstat:

 databases/p5-DBI/Makefile         |   4 ++--
 databases/p5-DBI/distinfo         |   4 +++-
 databases/p5-DBI/patches/patch-aa |  13 +++++++++++++
 databases/p5-DBI/patches/patch-ab |  36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 3 deletions(-)

diffs (84 lines):

diff -r a0a28c1e82bb -r d16fc3545be2 databases/p5-DBI/Makefile
--- a/databases/p5-DBI/Makefile Thu Feb 03 12:20:59 2005 +0000
+++ b/databases/p5-DBI/Makefile Thu Feb 03 23:10:06 2005 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2004/12/20 11:30:57 grant Exp $
+# $NetBSD: Makefile,v 1.27.2.1 2005/02/03 23:10:06 salo 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 -r a0a28c1e82bb -r d16fc3545be2 databases/p5-DBI/distinfo
--- a/databases/p5-DBI/distinfo Thu Feb 03 12:20:59 2005 +0000
+++ b/databases/p5-DBI/distinfo Thu Feb 03 23:10:06 2005 +0000
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.13 2004/12/05 17:16:47 he Exp $
+$NetBSD: distinfo,v 1.13.2.1 2005/02/03 23:10:06 salo 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 -r a0a28c1e82bb -r d16fc3545be2 databases/p5-DBI/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/p5-DBI/patches/patch-aa Thu Feb 03 23:10:06 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.2.2 2005/02/03 23:10:06 salo 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 -r a0a28c1e82bb -r d16fc3545be2 databases/p5-DBI/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/p5-DBI/patches/patch-ab Thu Feb 03 23:10:06 2005 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-ab,v 1.1.2.2 2005/02/03 23:10:06 salo 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>)
+