r70303 - in /branches/upstream/libconfig-model-openssh-perl/current: ./ lib/Config/Model/ lib/Config/Model/Backend/ lib/Config/Model/Backend/OpenSsh/ t/

ddumont-guest at users.alioth.debian.org ddumont-guest at users.alioth.debian.org
Thu Mar 3 13:47:53 UTC 2011


Author: ddumont-guest
Date: Thu Mar  3 13:47:39 2011
New Revision: 70303

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=70303
Log:
[svn-upgrade] new version libconfig-model-openssh-perl (1.214)

Modified:
    branches/upstream/libconfig-model-openssh-perl/current/Build.PL
    branches/upstream/libconfig-model-openssh-perl/current/ChangeLog
    branches/upstream/libconfig-model-openssh-perl/current/META.yml
    branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/Backend/OpenSsh.pm
    branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/Backend/OpenSsh/Ssh.pm
    branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/Backend/OpenSsh/Sshd.pm
    branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/OpenSsh.pm
    branches/upstream/libconfig-model-openssh-perl/current/t/ssh_config.t

Modified: branches/upstream/libconfig-model-openssh-perl/current/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-openssh-perl/current/Build.PL?rev=70303&op=diff
==============================================================================
--- branches/upstream/libconfig-model-openssh-perl/current/Build.PL (original)
+++ branches/upstream/libconfig-model-openssh-perl/current/Build.PL Thu Mar  3 13:47:39 2011
@@ -34,17 +34,19 @@
 
 require 5.008;
 
+my %model_files = map { ($_, $_ ) } glob("lib/Config/Model/*.d/*") ;
+
 my $build = Module::Build->new
   (
    module_name   => 'Config::Model::OpenSsh',
    license       => 'lgpl',
    dist_author   => "Dominique Dumont (ddumont at cpan dot org)",
    dist_abstract => "OpenSsh configuration files graphical editor",
-
+   model_files => \%model_files ,
+ 
   'build_requires' => {
     'Module::Build' => '0.3601',
-    'Test::More' => '0',
-    'Test::Warn' => '0.11'
+    'Test::More' => '0'
   },
   'configure_requires' => {
     'Module::Build' => '0.3601'
@@ -71,4 +73,6 @@
 
 
 $build->add_build_element('pl');
+$build->add_build_element('model'); # see model_files above
+
 $build->create_build_script;

Modified: branches/upstream/libconfig-model-openssh-perl/current/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-openssh-perl/current/ChangeLog?rev=70303&op=diff
==============================================================================
--- branches/upstream/libconfig-model-openssh-perl/current/ChangeLog (original)
+++ branches/upstream/libconfig-model-openssh-perl/current/ChangeLog Thu Mar  3 13:47:39 2011
@@ -1,3 +1,8 @@
+2011-03-03  Dominique Dumont  <domi.dumont at free.fr> v 1.214
+
+        * Fixed Build.PL to install files from lib/.../system.d/
+        * Fixed Ssh backend to write Host pattern annotations/comments
+
 2011-02-28  Dominique Dumont  <domi.dumont at free.fr> v 1.213
 
 	* Fixed MANIFEST.SKIP to remove cruft shipped by Dist::Zilla. As

Modified: branches/upstream/libconfig-model-openssh-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-openssh-perl/current/META.yml?rev=70303&op=diff
==============================================================================
--- branches/upstream/libconfig-model-openssh-perl/current/META.yml (original)
+++ branches/upstream/libconfig-model-openssh-perl/current/META.yml Thu Mar  3 13:47:39 2011
@@ -5,7 +5,6 @@
 build_requires:
   Module::Build: 0.3601
   Test::More: 0
-  Test::Warn: 0.11
 configure_requires:
   Module::Build: 0.3601
 dynamic_config: 0
@@ -22,4 +21,4 @@
 requires:
   Config::Model: 1.234
   Log::Log4perl: 1.11
-version: 1.213
+version: 1.214

Modified: branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/Backend/OpenSsh.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/Backend/OpenSsh.pm?rev=70303&op=diff
==============================================================================
--- branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/Backend/OpenSsh.pm (original)
+++ branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/Backend/OpenSsh.pm Thu Mar  3 13:47:39 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Backend::OpenSsh ;
 BEGIN {
-  $Config::Model::Backend::OpenSsh::VERSION = '1.213';
+  $Config::Model::Backend::OpenSsh::VERSION = '1.214';
 }
 
 use Moose ;

Modified: branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/Backend/OpenSsh/Ssh.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/Backend/OpenSsh/Ssh.pm?rev=70303&op=diff
==============================================================================
--- branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/Backend/OpenSsh/Ssh.pm (original)
+++ branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/Backend/OpenSsh/Ssh.pm Thu Mar  3 13:47:39 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Backend::OpenSsh::Ssh ;
 BEGIN {
-  $Config::Model::Backend::OpenSsh::Ssh::VERSION = '1.213';
+  $Config::Model::Backend::OpenSsh::Ssh::VERSION = '1.214';
 }
 
 use Moose ;
@@ -165,13 +165,14 @@
 
     foreach my $pattern ( $host_elt->get_all_indexes) {
 	my $block_elt = $host_elt->fetch_with_id($pattern) ;
+        $logger->debug("write_all_host_block on ".$block_elt->location." mode $mode");
 	my $block_data = $self->write_node_content($block_elt,'custom') ;
 
 	# write data only if custom pattern or custom data is found this
 	# is necessary to avoid writing data from /etc/ssh/ssh_config that
 	# were entered as 'preset' data
 	if ($block_data) {
-	    $result .= $self->write_line(Host => $pattern, $host_elt->annotation);
+	    $result .= $self->write_line(Host => $pattern, $block_elt->annotation);
 	    $result .= "$block_data\n" ;
 	}
     }

Modified: branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/Backend/OpenSsh/Sshd.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/Backend/OpenSsh/Sshd.pm?rev=70303&op=diff
==============================================================================
--- branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/Backend/OpenSsh/Sshd.pm (original)
+++ branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/Backend/OpenSsh/Sshd.pm Thu Mar  3 13:47:39 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Backend::OpenSsh::Sshd ;
 BEGIN {
-  $Config::Model::Backend::OpenSsh::Sshd::VERSION = '1.213';
+  $Config::Model::Backend::OpenSsh::Sshd::VERSION = '1.214';
 }
 
 use Moose ;

Modified: branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/OpenSsh.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/OpenSsh.pm?rev=70303&op=diff
==============================================================================
--- branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/OpenSsh.pm (original)
+++ branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/OpenSsh.pm Thu Mar  3 13:47:39 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::OpenSsh ;
 BEGIN {
-  $Config::Model::OpenSsh::VERSION = '1.213';
+  $Config::Model::OpenSsh::VERSION = '1.214';
 }
 
 1;

Modified: branches/upstream/libconfig-model-openssh-perl/current/t/ssh_config.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-openssh-perl/current/t/ssh_config.t?rev=70303&op=diff
==============================================================================
--- branches/upstream/libconfig-model-openssh-perl/current/t/ssh_config.t (original)
+++ branches/upstream/libconfig-model-openssh-perl/current/t/ssh_config.t Thu Mar  3 13:47:39 2011
@@ -177,6 +177,8 @@
     GSSAPIAuthentication yes
     GSSAPIDelegateCredentials no
 
+# foo bar big
+# comment
 Host foo.*,*.bar
     # for and bar have X11
     ForwardX11 yes




More information about the Pkg-perl-cvs-commits mailing list