diff options
| -rw-r--r-- | databases/p5-DBI-137/Makefile | 6 | ||||
| -rw-r--r-- | databases/p5-DBI-137/files/patch-CAN-2005-0077 | 47 |
2 files changed, 52 insertions, 1 deletions
diff --git a/databases/p5-DBI-137/Makefile b/databases/p5-DBI-137/Makefile index 99f344241878..de5a236c0eca 100644 --- a/databases/p5-DBI-137/Makefile +++ b/databases/p5-DBI-137/Makefile @@ -7,12 +7,13 @@ PORTNAME= DBI PORTVERSION= 1.37 +PORTREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= DBI PKGNAMEPREFIX= p5- -MAINTAINER= ports@FreeBSD.org +MAINTAINER= perl@FreeBSD.org COMMENT= The perl5 Database Interface. Required for DBD::* modules .if defined(WITH_PROXY) @@ -52,4 +53,7 @@ pre-everything:: @sleep 1 .endif +post-patch: + @${RM} -f ${WRKSRC}/lib/DBI/ProxyServer.pm.orig + .include <bsd.port.mk> diff --git a/databases/p5-DBI-137/files/patch-CAN-2005-0077 b/databases/p5-DBI-137/files/patch-CAN-2005-0077 new file mode 100644 index 000000000000..d89724b3712d --- /dev/null +++ b/databases/p5-DBI-137/files/patch-CAN-2005-0077 @@ -0,0 +1,47 @@ +--- lib/DBI/ProxyServer.pm.orig Wed May 10 11:41:53 2006 ++++ lib/DBI/ProxyServer.pm Wed May 10 11:48:29 2006 +@@ -33,13 +33,6 @@ require Config; + 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"; +- +- + ############################################################################ + # + # Constants +@@ -109,7 +102,9 @@ my %DEFAULT_SERVER_OPTIONS; + } else { + $o->{'mode'} = 'single'; + } +- $o->{'pidfile'} = $defaultPidFile; ++ # No pidfile by default, configuration must provide one if needed ++ # (see CAN-2005-0077) ++ $o->{'pidfile'} = 'none'; + $o->{'user'} = undef; + }; + +@@ -520,7 +515,7 @@ mode with "--mode=single". + =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>) + +--- dbiproxy.PL.orig Wed May 10 11:49:19 2006 ++++ dbiproxy.PL Wed May 10 11:49:44 2006 +@@ -146,7 +146,7 @@ mode with "--mode=single". + =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> + |