r35076 - in /trunk/libdbix-password-perl: Changes MANIFEST META.yml Makefile.PL Password.pm Password.pm-orig README VERSION debian/changelog debian/patches/02-config-file.patch
roam-guest at users.alioth.debian.org
roam-guest at users.alioth.debian.org
Sat May 9 12:32:31 UTC 2009
Author: roam-guest
Date: Sat May 9 12:32:26 2009
New Revision: 35076
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=35076
Log:
New upstream release, DBIx-Password-1.9.
Refresh the config file patch.
Added:
trunk/libdbix-password-perl/META.yml
- copied unchanged from r35075, branches/upstream/libdbix-password-perl/current/META.yml
Modified:
trunk/libdbix-password-perl/Changes
trunk/libdbix-password-perl/MANIFEST
trunk/libdbix-password-perl/Makefile.PL
trunk/libdbix-password-perl/Password.pm
trunk/libdbix-password-perl/Password.pm-orig
trunk/libdbix-password-perl/README
trunk/libdbix-password-perl/VERSION
trunk/libdbix-password-perl/debian/changelog
trunk/libdbix-password-perl/debian/patches/02-config-file.patch
Modified: trunk/libdbix-password-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-password-perl/Changes?rev=35076&op=diff
==============================================================================
--- trunk/libdbix-password-perl/Changes (original)
+++ trunk/libdbix-password-perl/Changes Sat May 9 12:32:26 2009
@@ -1,4 +1,10 @@
Revision history for Perl extension DBIx::Password.
+
+1.9 Fri May 16 15:02:12 PDT 2008
+ - Added getVirtualUser for Jamie
+
+1.8 Tue Dec 19 15:29:39 PST 2006
+ - Added more undef around failures for connections
1.7 Wed Dec 20 13:45:29 PST 2000
-Returns undef if DBI connect fails (never has
Modified: trunk/libdbix-password-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-password-perl/MANIFEST?rev=35076&op=diff
==============================================================================
--- trunk/libdbix-password-perl/MANIFEST (original)
+++ trunk/libdbix-password-perl/MANIFEST Sat May 9 12:32:26 2009
@@ -7,3 +7,4 @@
LICENSE
README
VERSION
+META.yml Module meta-data (added by MakeMaker)
Modified: trunk/libdbix-password-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-password-perl/Makefile.PL?rev=35076&op=diff
==============================================================================
--- trunk/libdbix-password-perl/Makefile.PL (original)
+++ trunk/libdbix-password-perl/Makefile.PL Sat May 9 12:32:26 2009
@@ -150,12 +150,7 @@
my $database = getLine();
print "What is the name of the machine that the database is on?\n";
my $hostname = getLine();
- my $connect;
- if ($hostname) {
- $connect = "DBI:$driver:dbname=$database;host=$hostname";
- } else {
- $connect = "DBI:$driver:dbname=$database";
- }
+ my $connect = "DBI:$driver:dbname=$database;host=$hostname";
print "Is the database on any special port(you should probably just hit return)?\n";
my $port = getLine();
$connect .= ";port=$port" if $port;
Modified: trunk/libdbix-password-perl/Password.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-password-perl/Password.pm?rev=35076&op=diff
==============================================================================
--- trunk/libdbix-password-perl/Password.pm (original)
+++ trunk/libdbix-password-perl/Password.pm Sat May 9 12:32:26 2009
@@ -3,20 +3,9 @@
use DBI();
@DBIx::Password::ISA = qw ( DBI::db );
-($DBIx::Password::VERSION) = ' $Revision: 1.8 $ ' =~ /\$Revision:\s+([^\s]+)/;
+($DBIx::Password::VERSION) = ' $Revision: 1.9 $ ' =~ /\$Revision:\s+([^\s]+)/;
-my $virtual1 = {
- 'slash' => {
- 'username' => '',
- 'password' => '',
- 'port' => '',
- 'database' => 'sdf',
- 'attributes' => {},
- 'connect' => 'DBI:mysql:database=sdf;host=asf',
- 'driver' => 'mysql',
- 'host' => 'asf'
- }
- };
+my $virtual1 = {};
my %driver_cache;
@@ -26,13 +15,15 @@
return undef unless $virtual1->{$user};
my $self;
my $virtual = $virtual1->{$user};
- return unless $virtual;
+ return undef unless $virtual;
$self = DBI->connect($virtual->{connect}
, $virtual->{'username'}
, $virtual->{'password'}
, $virtual->{'attributes'}
);
+ return undef unless $self;
+
bless $self, $class;
$driver_cache{$self} = $user;
return $self;
@@ -43,13 +34,15 @@
return undef unless $virtual1->{$user};
my $self;
my $virtual = $virtual1->{$user};
+ return undef unless $virtual;
$self = DBI->connect_cached($virtual->{connect}
, $virtual->{'username'}
, $virtual->{'password'}
, $virtual->{'attributes'}
);
- return unless $self;
+ return undef unless $self;
+
bless $self, $class;
$driver_cache{$self} = $user;
return $self;
@@ -69,15 +62,17 @@
sub checkVirtualUser {
my ($user) = @_;
- return 1
- if $virtual1->{$user};
+ return $virtual1->{$user} ? 1 : 0;
+}
- return 0;
+sub getVirtualUser {
+ my ($user) = @_;
+ return $virtual1->{$user} || undef;
}
sub DESTROY {
- my ($self) = @_;
- $self->SUPER::DESTROY;
+ my ($self) = @_;
+ $self->SUPER::DESTROY;
}
1;
@@ -148,7 +143,7 @@
=head1 HOME
-To find out more information look at: http://software.tangent.org/projects.pl?view=DBIxPassword
+To find out more information look at: http://www.tangent.org/DBIx-Password/
=head1 AUTHOR
Modified: trunk/libdbix-password-perl/Password.pm-orig
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-password-perl/Password.pm-orig?rev=35076&op=diff
==============================================================================
--- trunk/libdbix-password-perl/Password.pm-orig (original)
+++ trunk/libdbix-password-perl/Password.pm-orig Sat May 9 12:32:26 2009
@@ -3,7 +3,7 @@
use DBI();
@DBIx::Password::ISA = qw ( DBI::db );
-($DBIx::Password::VERSION) = ' $Revision: 1.8 $ ' =~ /\$Revision:\s+([^\s]+)/;
+($DBIx::Password::VERSION) = ' $Revision: 1.9 $ ' =~ /\$Revision:\s+([^\s]+)/;
#PASSWORD_INSERT
@@ -14,13 +14,15 @@
return undef unless $virtual1->{$user};
my $self;
my $virtual = $virtual1->{$user};
- return unless $virtual;
+ return undef unless $virtual;
$self = DBI->connect($virtual->{connect}
, $virtual->{'username'}
, $virtual->{'password'}
, $virtual->{'attributes'}
);
+ return undef unless $self;
+
bless $self, $class;
$driver_cache{$self} = $user;
return $self;
@@ -31,13 +33,15 @@
return undef unless $virtual1->{$user};
my $self;
my $virtual = $virtual1->{$user};
+ return undef unless $virtual;
$self = DBI->connect_cached($virtual->{connect}
, $virtual->{'username'}
, $virtual->{'password'}
, $virtual->{'attributes'}
);
- return unless $self;
+ return undef unless $self;
+
bless $self, $class;
$driver_cache{$self} = $user;
return $self;
@@ -57,15 +61,17 @@
sub checkVirtualUser {
my ($user) = @_;
- return 1
- if $virtual1->{$user};
+ return $virtual1->{$user} ? 1 : 0;
+}
- return 0;
+sub getVirtualUser {
+ my ($user) = @_;
+ return $virtual1->{$user} || undef;
}
sub DESTROY {
- my ($self) = @_;
- $self->SUPER::DESTROY;
+ my ($self) = @_;
+ $self->SUPER::DESTROY;
}
1;
@@ -136,7 +142,7 @@
=head1 HOME
-To find out more information look at: http://software.tangent.org/projects.pl?view=DBIxPassword
+To find out more information look at: http://www.tangent.org/DBIx-Password/
=head1 AUTHOR
Modified: trunk/libdbix-password-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-password-perl/README?rev=35076&op=diff
==============================================================================
--- trunk/libdbix-password-perl/README (original)
+++ trunk/libdbix-password-perl/README Sat May 9 12:32:26 2009
@@ -59,7 +59,7 @@
HOME
To find out more information look at:
- http://software.tangent.org/projects.pl?view=DBIxPassword
+ http://www.tangent.org/DBIx-Password/
AUTHOR
Brian Aker, brian at tangent.org
Modified: trunk/libdbix-password-perl/VERSION
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-password-perl/VERSION?rev=35076&op=diff
==============================================================================
--- trunk/libdbix-password-perl/VERSION (original)
+++ trunk/libdbix-password-perl/VERSION Sat May 9 12:32:26 2009
@@ -1,1 +1,1 @@
-1.8
+1.9
Modified: trunk/libdbix-password-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-password-perl/debian/changelog?rev=35076&op=diff
==============================================================================
--- trunk/libdbix-password-perl/debian/changelog (original)
+++ trunk/libdbix-password-perl/debian/changelog Sat May 9 12:32:26 2009
@@ -1,4 +1,4 @@
-libdbix-password-perl (1.8-11) UNRELEASED; urgency=low
+libdbix-password-perl (1.9-1) UNRELEASED; urgency=low
* Adopt into the Debian Perl Group. Closes: #503531
* Use quilt for patch management.
@@ -16,6 +16,7 @@
* Bump Standards-Version to 3.8.1:
- add the README.source file to document the use of quilt
- add the Homepage control field
+ * New upstream release.
-- Peter Pentchev <roam at ringlet.net> Sat, 09 May 2009 12:54:32 +0300
Modified: trunk/libdbix-password-perl/debian/patches/02-config-file.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-password-perl/debian/patches/02-config-file.patch?rev=35076&op=diff
==============================================================================
--- trunk/libdbix-password-perl/debian/patches/02-config-file.patch (original)
+++ trunk/libdbix-password-perl/debian/patches/02-config-file.patch Sat May 9 12:32:26 2009
@@ -3,23 +3,9 @@
--- a/Password.pm
+++ b/Password.pm
-@@ -5,19 +5,49 @@
- @DBIx::Password::ISA = qw ( DBI::db );
- ($DBIx::Password::VERSION) = ' $Revision: 1.8 $ ' =~ /\$Revision:\s+([^\s]+)/;
+@@ -7,6 +7,47 @@
--my $virtual1 = {
-- 'slash' => {
-- 'username' => '',
-- 'password' => '',
-- 'port' => '',
-- 'database' => 'sdf',
-- 'attributes' => {},
-- 'connect' => 'DBI:mysql:database=sdf;host=asf',
-- 'driver' => 'mysql',
-- 'host' => 'asf'
-- }
-- };
-+my $virtual1 = {};
+ my $virtual1 = {};
+#We want to end up with such a structure:
+#my $virtual1 = {
@@ -65,7 +51,7 @@
my %driver_cache;
-@@ -99,11 +129,11 @@
+@@ -94,11 +135,11 @@
Don't you hate keeping track of database passwords and such throughout
your scripts? How about the problem of changing those passwords
@@ -81,7 +67,7 @@
You can add as many as you like.
I would recommend that if you are only using this with
-@@ -132,20 +162,6 @@
+@@ -127,20 +168,6 @@
Hope you enjoy it.
@@ -101,7 +87,7 @@
-
=head1 HOME
- To find out more information look at: http://software.tangent.org/projects.pl?view=DBIxPassword
+ To find out more information look at: http://www.tangent.org/DBIx-Password/
--- a/README
+++ b/README
@@ -14,11 +14,10 @@
More information about the Pkg-perl-cvs-commits
mailing list