r33566 - in /branches/upstream/libconfig-model-openssh-perl/current: ChangeLog META.yml TODO lib/Config/Model/OpenSsh.pm

[ddumont-guest at users.alioth.debian.org]

Author: ddumont-guest
Date: Sun Apr 19 12:45:11 2009
New Revision: 33566

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

Modified:
    branches/upstream/libconfig-model-openssh-perl/current/ChangeLog
    branches/upstream/libconfig-model-openssh-perl/current/META.yml
    branches/upstream/libconfig-model-openssh-perl/current/TODO
    branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/OpenSsh.pm

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=33566&op=diff
==============================================================================
--- branches/upstream/libconfig-model-openssh-perl/current/ChangeLog (original)
+++ branches/upstream/libconfig-model-openssh-perl/current/ChangeLog Sun Apr 19 12:45:11 2009
@@ -1,3 +1,8 @@
+2009-04-11  Dominique Dumont  <domi.dumont at free.fr> v1.205
+
+	* lib/Config/Model/OpenSsh.pm (read_ssh_file): fix bug that breaks
+	with Config::Model 0.635
+
 2009-03-09  Dominique Dumont  <dominique.dumont at hp.com> v1.204
 
 	* t/ssh_config.t: Removed unused options that broke with

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=33566&op=diff
==============================================================================
--- branches/upstream/libconfig-model-openssh-perl/current/META.yml (original)
+++ branches/upstream/libconfig-model-openssh-perl/current/META.yml Sun Apr 19 12:45:11 2009
@@ -1,6 +1,6 @@
 ---
 name: Config-Model-OpenSsh
-version: 1.204
+version: 1.205
 author:
   - Dominique Dumont (ddumont at cpan dot org)
 abstract: OpenSsh configuration files editor
@@ -18,7 +18,7 @@
 provides:
   Config::Model::OpenSsh:
     file: lib/Config/Model/OpenSsh.pm
-    version: 1.204
+    version: 1.205
 generated_by: Module::Build version 0.3
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.2.html

Modified: branches/upstream/libconfig-model-openssh-perl/current/TODO
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-openssh-perl/current/TODO?rev=33566&op=diff
==============================================================================
--- branches/upstream/libconfig-model-openssh-perl/current/TODO (original)
+++ branches/upstream/libconfig-model-openssh-perl/current/TODO Sun Apr 19 12:45:11 2009
@@ -1,7 +1,3 @@
 
-* Create config model from sshd_config
+* Maybe separate OpenSsh client and server into 2 Perl distributions.
 
-* Create config-edit-ssh command line
-
-* Modify OpenSsh.pm to read/write ssh config files (see comments in there)
-

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=33566&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 Sun Apr 19 12:45:11 2009
@@ -34,7 +34,7 @@
 use Parse::RecDescent ;
 use vars qw($VERSION $grammar $parser)  ;
 
-$VERSION = '1.204' ;
+$VERSION = '1.205' ;
 
 
 my $logger = Log::Log4perl::get_logger(__PACKAGE__);
@@ -105,7 +105,7 @@
 =cut 
 
 sub sshd_read {
-    read_ssh_file( file => 'sshd_config', @_ ) ;
+    read_ssh_file( @_,  file => 'sshd_config',) ;
 }
 
 # for ssh_read:
@@ -133,13 +133,13 @@
 
     $instance -> preset_start if $is_user ; # regular user
 
-    my $ret = read_ssh_file(file => 'ssh_config', @_) ;
+    my $ret = read_ssh_file( @_, file => 'ssh_config' ) ;
 
     $instance -> preset_stop if $is_user ;
 
     if ( $is_user) {
 	# don't croak if user config file is missing
-	 read_ssh_file(file => 'config', @_, 
+	 read_ssh_file( @_ , file => 'config',
 		       config_dir => $home_dir.'/.ssh') ;
     }