From 65978042179952c031f7c45e61f3202fb9396dbf Mon Sep 17 00:00:00 2001 From: "git@daemon.de" Date: Thu, 12 Feb 2015 15:18:18 +0100 Subject: [PATCH] re-licensed to artistic2 --- CHANGELOG | 4 ++++ Makefile.PL | 9 +++++---- README | 13 ++++++++----- lib/Crypt/PWSafe3.pm | 19 ++++++++++--------- lib/Crypt/PWSafe3/Field.pm | 17 +++++++++-------- lib/Crypt/PWSafe3/HeaderField.pm | 18 ++++++++++-------- lib/Crypt/PWSafe3/PasswordPolicy.pm | 16 +++++++++------- lib/Crypt/PWSafe3/Record.pm | 16 +++++++++------- lib/Crypt/PWSafe3/SHA256.pm | 17 +++++++++-------- t/run.t | 7 +++++-- 10 files changed, 78 insertions(+), 58 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 97bb0e2..575fd25 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +1.16 + re-licensed from artistic1 to artistic2 in order to be + compatible to fedora packaging. no code changes otherwise + 1.15 fixed github#8, using File::Temp instead of self baked File::Spec. diff --git a/Makefile.PL b/Makefile.PL index 58cef58..86351d8 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,7 +1,8 @@ # -# Copyright (c) 2011-2015 T.Linden . -# All Rights Reserved. Std. disclaimer applies. -# Artistic License, same as perl itself. Have fun. +# Copyright (c) 2011-2015 T.v.Dein . +# +# Licensed under the terms of the Artistic License 2.0 +# see: http://www.perlfoundation.org/artistic_license_2_0 # require 5.004; @@ -32,7 +33,7 @@ WriteMakefile( 'Shell' => 0.5, 'File::Temp' => 0, }, - 'AUTHOR' => 'Thomas Linden ', + 'AUTHOR' => 'T.v.Dein ', 'clean' => { FILES => 't/*.out *~ */*~ */*/*~ */*/*/*~' }, diff --git a/README b/README index 3fcde00..1dc520d 100644 --- a/README +++ b/README @@ -32,10 +32,13 @@ INSTALLATION COPYRIGHT Crypt::PWSafe3 - Copyright (c) 2011-2012 by T. Linden + Copyright (c) 2011-2015 by T.v.Dein - This library is free software; you can redistribute it - and/or modify it under the same terms as Perl itself. +LICENSE + + This program is free software; you can redistribute it + and/or modify it under the same terms of the Artistic + License 2.0, see: L HOMEPAGE @@ -45,9 +48,9 @@ HOMEPAGE AUTHOR - T. Linden + T.v.Dein VERSION - 1.15 + 1.16 diff --git a/lib/Crypt/PWSafe3.pm b/lib/Crypt/PWSafe3.pm index 944182a..5a0f115 100644 --- a/lib/Crypt/PWSafe3.pm +++ b/lib/Crypt/PWSafe3.pm @@ -1,7 +1,8 @@ # -# Copyright (c) 2011-2015 T.Linden . -# All Rights Reserved. Std. disclaimer applies. -# Artistic License, same as perl itself. Have fun. +# Copyright (c) 2011-2015 T.v.Dein . +# +# Licensed under the terms of the Artistic License 2.0 +# see: http://www.perlfoundation.org/artistic_license_2_0 # # Implements: # http://passwordsafe.svn.sourceforge.net/viewvc/passwordsafe/trunk/pwsafe/pwsafe/docs/formatV3.txt?revision=2139 @@ -28,7 +29,7 @@ use Data::Dumper; use Exporter (); use vars qw(@ISA @EXPORT); -$Crypt::PWSafe3::VERSION = '1.15'; +$Crypt::PWSafe3::VERSION = '1.16'; use Crypt::PWSafe3::Field; use Crypt::PWSafe3::HeaderField; @@ -929,7 +930,7 @@ how to create new ones =head1 AUTHOR -T. Linden +T.v.Dein =head1 BUGS @@ -959,17 +960,17 @@ in this module are his ideas ported to perl. =head1 COPYRIGHT -Copyright (c) 2011-2015 by T.Linden . -All rights reserved. +Copyright (c) 2011-2015 by T.v.Dein . =head1 LICENSE This program is free software; you can redistribute it -and/or modify it under the same terms as Perl itself. +and/or modify it under the same terms of the Artistic +License 2.0, see: L =head1 VERSION -Crypt::PWSafe3 Version 1.15. +Crypt::PWSafe3 Version 1.16. =cut diff --git a/lib/Crypt/PWSafe3/Field.pm b/lib/Crypt/PWSafe3/Field.pm index 7996d6e..feb16ba 100644 --- a/lib/Crypt/PWSafe3/Field.pm +++ b/lib/Crypt/PWSafe3/Field.pm @@ -1,7 +1,8 @@ # -# Copyright (c) 2011-2015 T.Linden . -# All Rights Reserved. Std. disclaimer applies. -# Artistic License, same as perl itself. Have fun. +# Copyright (c) 2011-2015 T.v.Dein . +# +# Licensed under the terms of the Artistic License 2.0 +# see: http://www.perlfoundation.org/artistic_license_2_0 # package Crypt::PWSafe3::Field; @@ -12,7 +13,7 @@ use Exporter (); use vars qw(@ISA @EXPORT); use utf8; -$Crypt::PWSafe3::Field::VERSION = '1.04'; +$Crypt::PWSafe3::Field::VERSION = '1.05'; %Crypt::PWSafe3::Field::map2type = ( uuid => 0x01, @@ -171,18 +172,18 @@ L =head1 AUTHOR -T. Linden +T.v.Dein =head1 COPYRIGHT -Copyright (c) 2011-2015 by T.Linden . +Copyright (c) 2011-2015 by T.v.Dein . All rights reserved. =head1 LICENSE This program is free software; you can redistribute it -and/or modify it under the same terms as Perl itself. - +and/or modify it under the same terms of the Artistic +License 2.0, see: L =cut diff --git a/lib/Crypt/PWSafe3/HeaderField.pm b/lib/Crypt/PWSafe3/HeaderField.pm index 8861b8f..38ebb9f 100644 --- a/lib/Crypt/PWSafe3/HeaderField.pm +++ b/lib/Crypt/PWSafe3/HeaderField.pm @@ -1,7 +1,9 @@ # -# Copyright (c) 2011-2015 T.Linden . -# All Rights Reserved. Std. disclaimer applies. -# Artistic License, same as perl itself. Have fun. +# Copyright (c) 2011-2015 T.v.Dein . +# +# Licensed under the terms of the Artistic License 2.0 +# see: http://www.perlfoundation.org/artistic_license_2_0 +# # package Crypt::PWSafe3::HeaderField; @@ -11,7 +13,7 @@ use Exporter (); use vars qw(@ISA @EXPORT); use utf8; -$Crypt::PWSafe3::HeaderField::VERSION = '1.03'; +$Crypt::PWSafe3::HeaderField::VERSION = '1.04'; %Crypt::PWSafe3::HeaderField::map2name = ( 0x00 => "version", @@ -196,18 +198,18 @@ L =head1 AUTHOR -T. Linden +T.v.Dein =head1 COPYRIGHT -Copyright (c) 2011-2015 by T.Linden . +Copyright (c) 2011-2015 by T.v.Dein . All rights reserved. =head1 LICENSE This program is free software; you can redistribute it -and/or modify it under the same terms as Perl itself. - +and/or modify it under the same terms of the Artistic +License 2.0, see: L =cut diff --git a/lib/Crypt/PWSafe3/PasswordPolicy.pm b/lib/Crypt/PWSafe3/PasswordPolicy.pm index e5a066d..a5c747a 100644 --- a/lib/Crypt/PWSafe3/PasswordPolicy.pm +++ b/lib/Crypt/PWSafe3/PasswordPolicy.pm @@ -1,7 +1,8 @@ # -# Copyright (c) 2011-2015 T.Linden . -# All Rights Reserved. Std. disclaimer applies. -# Artistic License, same as perl itself. Have fun. +# Copyright (c) 2011-2015 T.v.Dein . +# +# Licensed under the terms of the Artistic License 2.0 +# see: http://www.perlfoundation.org/artistic_license_2_0 # package Crypt::PWSafe3::PasswordPolicy; @@ -12,7 +13,7 @@ use Exporter (); use vars qw(@ISA @EXPORT); use utf8; -$Crypt::PWSafe3::PasswordPolicy::VERSION = '1.00'; +$Crypt::PWSafe3::PasswordPolicy::VERSION = '1.01'; my %flagbits = ( UseLowercase => 0x8000, @@ -191,17 +192,18 @@ L =head1 AUTHOR -T. Linden +T.v.Dein =head1 COPYRIGHT -Copyright (c) 2011-2015 by T.Linden . +Copyright (c) 2011-2015 by T.v.Dein . All rights reserved. =head1 LICENSE This program is free software; you can redistribute it -and/or modify it under the same terms as Perl itself. +and/or modify it under the same terms of the Artistic +License 2.0, see: L =cut diff --git a/lib/Crypt/PWSafe3/Record.pm b/lib/Crypt/PWSafe3/Record.pm index 961bca4..8a5e0b8 100644 --- a/lib/Crypt/PWSafe3/Record.pm +++ b/lib/Crypt/PWSafe3/Record.pm @@ -1,7 +1,8 @@ # -# Copyright (c) 2011-2015 T.Linden . -# All Rights Reserved. Std. disclaimer applies. -# Artistic License, same as perl itself. Have fun. +# Copyright (c) 2011-2015 T.v.Dein . +# +# Licensed under the terms of the Artistic License 2.0 +# see: http://www.perlfoundation.org/artistic_license_2_0 # package Crypt::PWSafe3::Record; @@ -14,7 +15,7 @@ my %map2type = %Crypt::PWSafe3::Field::map2type; my %map2name = %Crypt::PWSafe3::Field::map2name; -$Crypt::PWSafe3::Record::VERSION = '1.07'; +$Crypt::PWSafe3::Record::VERSION = '1.08'; foreach my $field (keys %map2type ) { eval qq( @@ -326,17 +327,18 @@ L =head1 AUTHOR -T. Linden +T.v.Dein =head1 COPYRIGHT -Copyright (c) 2011-2015 by T.Linden . +Copyright (c) 2011-2015 by T.v.Dein . All rights reserved. =head1 LICENSE This program is free software; you can redistribute it -and/or modify it under the same terms as Perl itself. +and/or modify it under the same terms of the Artistic +License 2.0, see: L =cut diff --git a/lib/Crypt/PWSafe3/SHA256.pm b/lib/Crypt/PWSafe3/SHA256.pm index 0e8a995..50c71d0 100644 --- a/lib/Crypt/PWSafe3/SHA256.pm +++ b/lib/Crypt/PWSafe3/SHA256.pm @@ -1,13 +1,14 @@ # -# Copyright (c) 2011-2015 T.Linden . -# All Rights Reserved. Std. disclaimer applies. -# Artistic License, same as perl itself. Have fun. +# Copyright (c) 2011-2015 T.v.Dein . +# +# Licensed under the terms of the Artistic License 2.0 +# see: http://www.perlfoundation.org/artistic_license_2_0 # # helper class to provide SHA-256 to HMAC class package Crypt::PWSafe3::SHA256; -$Crypt::PWSafe3::SHA256::VERSION = '1.01'; +$Crypt::PWSafe3::SHA256::VERSION = '1.02'; use Digest::SHA; @@ -38,7 +39,7 @@ instead. =head1 AUTHOR -T. Linden +T.v.Dein =head1 SEE ALSO @@ -48,13 +49,13 @@ L =head1 COPYRIGHT -Copyright (c) 2011-2015 by T.Linden . -All rights reserved. +Copyright (c) 2011-2015 by T.v.Dein . =head1 LICENSE This program is free software; you can redistribute it -and/or modify it under the same terms as Perl itself. +and/or modify it under the same terms of the Artistic +License 2.0, see: L =cut diff --git a/t/run.t b/t/run.t index 5eb2d99..012e7bb 100644 --- a/t/run.t +++ b/t/run.t @@ -1,12 +1,15 @@ #!perl -T # -# testscript for Crypt::PWSafe3 Classes by Thomas Linden +# testscript for Crypt::PWSafe3 Classes by T.v.Dein # # needs to be invoked using the command "make test" from # the Crypt::PWSafe3 source directory. # # Under normal circumstances every test should succeed. - +# +# Licensed under the terms of the Artistic License 2.0 +# see: http://www.perlfoundation.org/artistic_license_2_0 +# use Data::Dumper; #use Test::More tests => 57;