rpms/perl-DBI/FC-3 perl-DBI-tmpfix.patch, NONE, 1.1 perl-DBI.spec, 1.13, 1.14

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/perl-DBI/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv15037/FC-3

Modified Files:
	perl-DBI.spec 
Added Files:
	perl-DBI-tmpfix.patch 
Log Message:
auto-import perl-DBI-1.40-6.fc3 on branch FC-3 from perl-DBI-1.40-6.fc3.src.rpm

perl-DBI-tmpfix.patch:
 dbiproxy.PL            |    2 +-
 lib/DBI/ProxyServer.pm |   11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

--- NEW FILE perl-DBI-tmpfix.patch ---
--- libdbi-perl-1.21.orig/lib/DBI/ProxyServer.pm
+++ libdbi-perl-1.21/lib/DBI/ProxyServer.pm
@@ -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";
-
 
 ############################################################################
 #
@@ -107,7 +101,8 @@
     } else {
 	$o->{'mode'} = 'single';
     }
-    $o->{'pidfile'}    = $defaultPidFile;
+    # No pidfile by default, configuration must provide one if needed
+    $o->{'pidfile'}    = 'none';
     $o->{'user'}       = undef;
 };
 
@@ -491,7 +486,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>)
 
only in patch2:
unchanged:
--- libdbi-perl-1.21.orig/dbiproxy.PL
+++ libdbi-perl-1.21/dbiproxy.PL
@@ -143,7 +143,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>
 


Index: perl-DBI.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/FC-3/perl-DBI.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-DBI.spec	9 Sep 2004 10:09:29 -0000	1.13
+++ perl-DBI.spec	4 Sep 2005 09:45:52 -0000	1.14
@@ -3,13 +3,14 @@
 Summary: A database access API for perl
 Name: perl-DBI
 Version: 1.40
-Release: 5
+Release: 6.fc3
 URL: http://dbi.perl.org/
 License: Artistic
 Group: Applications/Databases
 Source: DBI-%{version}.tar.gz
 Source2: filter-requires-dbi.sh
 Patch0: perl-DBI-1.37-prever.patch
+Patch1: perl-DBI-tmpfix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: perl >= 5.6.1
 BuildRequires: perl-Time-HiRes
@@ -27,6 +28,7 @@
 %prep
 %setup -q -n DBI-%{version} 
 %patch0 -p1
+%patch1 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL  PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor
@@ -41,7 +43,7 @@
 
 [ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
 
-find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
+find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist -o -name '*.orig' \) -exec rm -fv {} \;
 
 find $RPM_BUILD_ROOT/usr -type f -print | \
         sed "s@^$RPM_BUILD_ROOT@@g" | \
@@ -59,6 +61,12 @@
 
 
 %changelog
+* Mon Jan 24 2005 Chip Turner <cturner at redhat.com> - 1.40-7
+- remove .orig left by patches
+
+* Mon Jan 24 2005 Chip Turner <cturner at redhat.com> 1.40-7
+- bugzilla: 145577, fix tempfile vulnerability
+
 * Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
 - rebuilt