r65810 - in /branches/upstream/libconfig-model-backend-augeas-perl/current: Build.PL ChangeLog META.yml augeas-box/etc/ssh/sshd_config lib/Config/Model/Backend/Augeas.pm t/augeas_backend.t t/test_model.pl
ddumont-guest at users.alioth.debian.org
ddumont-guest at users.alioth.debian.org
Mon Dec 13 13:01:11 UTC 2010
Author: ddumont-guest
Date: Mon Dec 13 13:00:45 2010
New Revision: 65810
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=65810
Log:
[svn-upgrade] new version libconfig-model-backend-augeas-perl (0.108)
Modified:
branches/upstream/libconfig-model-backend-augeas-perl/current/Build.PL
branches/upstream/libconfig-model-backend-augeas-perl/current/ChangeLog
branches/upstream/libconfig-model-backend-augeas-perl/current/META.yml
branches/upstream/libconfig-model-backend-augeas-perl/current/augeas-box/etc/ssh/sshd_config
branches/upstream/libconfig-model-backend-augeas-perl/current/lib/Config/Model/Backend/Augeas.pm
branches/upstream/libconfig-model-backend-augeas-perl/current/t/augeas_backend.t
branches/upstream/libconfig-model-backend-augeas-perl/current/t/test_model.pl
Modified: branches/upstream/libconfig-model-backend-augeas-perl/current/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-backend-augeas-perl/current/Build.PL?rev=65810&op=diff
==============================================================================
--- branches/upstream/libconfig-model-backend-augeas-perl/current/Build.PL (original)
+++ branches/upstream/libconfig-model-backend-augeas-perl/current/Build.PL Mon Dec 13 13:00:45 2010
@@ -1,8 +1,8 @@
-# $Author: ddumont $
-# $Date: 2009-05-28 13:51:31 +0200 (jeu 28 mai 2009) $
-# $Revision: 963 $
+# $Author$
+# $Date$
+# $Revision$
-# Copyright (c) 2008 Dominique Dumont.
+# Copyright (c) 2008-2010 Dominique Dumont.
#
# This file is part of Config-Model-Backend-Augead.
#
@@ -41,7 +41,7 @@
'Log::Log4perl' => '1.11', # for TRACE log level
'Exception::Class' => 0,
'Config::Augeas' => '0.303',
- 'Config::Model' => '0.636',
+ 'Config::Model' => '1.207',
},
build_requires => {
'Test::More' => 0,
Modified: branches/upstream/libconfig-model-backend-augeas-perl/current/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-backend-augeas-perl/current/ChangeLog?rev=65810&op=diff
==============================================================================
--- branches/upstream/libconfig-model-backend-augeas-perl/current/ChangeLog (original)
+++ branches/upstream/libconfig-model-backend-augeas-perl/current/ChangeLog Mon Dec 13 13:00:45 2010
@@ -1,9 +1,14 @@
-2009-05-29 Dominique Dumont <dominique.dumont at hp.com> v0.107 (unreleased)
+2010-12-13 Dominique Dumont <dominique.dumont at hp.com> v0.108
+
+ * updated tests to work with Config::Model 1.207
+ * C::M::B::Augeas: synopsis is now a model snippet
+
+2009-05-29 Dominique Dumont <dominique.dumont at hp.com> v0.107
* lib/Config/Model/Backend/Augeas.pm (all): Use Log::Log4perl for
trace with Data::Read and Data::Write categories
-2009-05-28 Dominique Dumont <dominique.dumont at hp.com>
+2009-05-28 Dominique Dumont <dominique.dumont at hp.com>
* lib/Config/Model/Backend/Augeas.pm: replaced obsolete
config_file parameter with file (Config::Model 0.636)
Modified: branches/upstream/libconfig-model-backend-augeas-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-backend-augeas-perl/current/META.yml?rev=65810&op=diff
==============================================================================
--- branches/upstream/libconfig-model-backend-augeas-perl/current/META.yml (original)
+++ branches/upstream/libconfig-model-backend-augeas-perl/current/META.yml Mon Dec 13 13:00:45 2010
@@ -1,26 +1,28 @@
---
-name: Config-Model-Backend-Augeas
-version: 0.107
+abstract: 'Read and write configuration data through Augeas'
author:
- - Dominique Dumont (ddumont at cpan dot org)
-abstract: Read and write configuration data through Augeas
-license: lgpl
-resources:
- license: http://opensource.org/licenses/lgpl-license.php
-requires:
- Config::Augeas: 0.303
- Config::Model: 0.636
- Exception::Class: 0
- Log::Log4perl: 1.11
+ - 'Dominique Dumont (ddumont at cpan dot org)'
build_requires:
Test::Exception: 0
Test::More: 0
Test::Warn: 0.11
+configure_requires:
+ Module::Build: 0.36
+generated_by: 'Module::Build version 0.3607'
+license: lgpl
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
+name: Config-Model-Backend-Augeas
provides:
Config::Model::Backend::Augeas:
file: lib/Config/Model/Backend/Augeas.pm
- version: 0.107
-generated_by: Module::Build version 0.33
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
+ version: 0.108
+requires:
+ Config::Augeas: 0.303
+ Config::Model: 1.207
+ Exception::Class: 0
+ Log::Log4perl: 1.11
+resources:
+ license: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+version: 0.108
Modified: branches/upstream/libconfig-model-backend-augeas-perl/current/augeas-box/etc/ssh/sshd_config
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-backend-augeas-perl/current/augeas-box/etc/ssh/sshd_config?rev=65810&op=diff
==============================================================================
--- branches/upstream/libconfig-model-backend-augeas-perl/current/augeas-box/etc/ssh/sshd_config (original)
+++ branches/upstream/libconfig-model-backend-augeas-perl/current/augeas-box/etc/ssh/sshd_config Mon Dec 13 13:00:45 2010
@@ -20,6 +20,9 @@
AllowUsers foo bar at 192.168.0.*
+# test checklist
+Ciphers arcfour256,aes192-cbc,aes192-ctr,aes256-cbc,aes256-ctr
+
# Match parsing block is broken and depend on resolution of
# https://fedorahosted.org/augeas/ticket/7
@@ -33,3 +36,4 @@
# some comment
Match User bush Group pres.* Host white.house.*
Banner /etc/welcome.txt
+
Modified: branches/upstream/libconfig-model-backend-augeas-perl/current/lib/Config/Model/Backend/Augeas.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-backend-augeas-perl/current/lib/Config/Model/Backend/Augeas.pm?rev=65810&op=diff
==============================================================================
--- branches/upstream/libconfig-model-backend-augeas-perl/current/lib/Config/Model/Backend/Augeas.pm (original)
+++ branches/upstream/libconfig-model-backend-augeas-perl/current/lib/Config/Model/Backend/Augeas.pm Mon Dec 13 13:00:45 2010
@@ -1,8 +1,4 @@
-# $Author: ddumont $
-# $Date: 2009-05-29 14:40:50 +0200 (ven 29 mai 2009) $
-# $Revision: 965 $
-
-# Copyright (c) 2008-2009 Dominique Dumont.
+# Copyright (c) 2008-2010 Dominique Dumont.
#
# This file is part of Config-Model-Backend-Augeas.
#
@@ -33,7 +29,7 @@
eval { require Config::Augeas ;} ;
$has_augeas = 0 if $@ ;
-our $VERSION = '0.107';
+our $VERSION = '0.108';
=head1 NAME
@@ -41,9 +37,8 @@
=head1 SYNOPSIS
- # use with Augeas
- $model->create_config_class
- (
+ # model specification with augeas backend
+ {
config_class_name => 'OpenSsh::Sshd',
# try Augeas and fall-back with custom method
@@ -60,7 +55,7 @@
element => ...
- ) ;
+ }
=head1 DESCRIPTION
@@ -783,7 +778,7 @@
=head1 COPYRIGHT
-Copyright (C) 2008-2009 by Dominique Dumont
+Copyright (C) 2008-2010 by Dominique Dumont
=head1 LICENSE
Modified: branches/upstream/libconfig-model-backend-augeas-perl/current/t/augeas_backend.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-backend-augeas-perl/current/t/augeas_backend.t?rev=65810&op=diff
==============================================================================
--- branches/upstream/libconfig-model-backend-augeas-perl/current/t/augeas_backend.t (original)
+++ branches/upstream/libconfig-model-backend-augeas-perl/current/t/augeas_backend.t Mon Dec 13 13:00:45 2010
@@ -1,7 +1,7 @@
# -*- cperl -*-
# $Author: ddumont $
# $Date: 2008-07-04 16:14:06 +0200 (Fri, 04 Jul 2008) $
-# $Revision: 971 $
+# $Revision$
# test augeas backend
@@ -129,8 +129,6 @@
is_deeply([<AUG>],\@expect,"check content of $aug_file after deletion of goner") ;
close AUG;
-
-
$augeas_obj->print('/') if $trace;
my $have_pkg_config = `pkg-config --version` || '';
@@ -169,8 +167,8 @@
#my @aug_content = $ssh_augeas_obj->match("/files/etc/ssh/sshd_config/*") ;
#print join("\n", at aug_content) ;
-$expect = "AcceptEnv=LC_PAPER,LC_NAME,LC_ADDRESS,LC_TELEPHONE,LC_MEASUREMENT,LC_IDENTIFICATION,LC_ALL
-AllowUsers=foo,bar\@192.168.0.*
+$expect = qq(AcceptEnv=LC_PAPER,LC_NAME,LC_ADDRESS,LC_TELEPHONE,LC_MEASUREMENT,LC_IDENTIFICATION,LC_ALL
+AllowUsers=foo,"bar\@192.168.0.*"
HostbasedAuthentication=no
HostKey=/etc/ssh/ssh_host_key,/etc/ssh/ssh_host_rsa_key,/etc/ssh/ssh_host_dsa_key
Subsystem:rftp=/usr/lib/openssh/rftp-server
@@ -184,17 +182,18 @@
Match:1
Condition
User=Chirac
- Group=pres.* -
+ Group="pres.*" -
Settings
Banner=/etc/bienvenue1.txt - -
Match:2
Condition
User=bush
- Group=pres.*
- Host=white.house.* -
+ Group="pres.*"
+ Host="white.house.*" -
Settings
- Banner=/etc/welcome.txt - - -
-";
+ Banner=/etc/welcome.txt - -
+Ciphers=arcfour256,aes192-cbc,aes192-ctr,aes256-cbc,aes256-ctr -
+);
$dump = $sshd_root->dump_tree ;
print $dump if $trace ;
@@ -228,10 +227,16 @@
$sshd_root->load("Match~1") ;
-$i_sshd->write_back ;
-
-my @lines = splice @mod,30,4 ;
-push @mod, @lines[2,3] ;
+$dump = $sshd_root->dump_tree ;
+print $dump if $trace ;
+$i_sshd->write_back ;
+
+my $i=0;
+print "mod--\n",map { $i++ . ': '. $_} @mod,"---\n" if $trace ;
+
+my @lines = splice @mod,37,2 ;
+splice @mod, 33,2, @lines ;
+pop @mod ;
open(AUG,$aug_sshd_file) || die "Can't open $aug_sshd_file:$!";
is_deeply([<AUG>],\@mod,"check content of $aug_sshd_file after Match~1") ;
@@ -255,7 +260,9 @@
$i_sshd->write_back ;
-splice @mod,35,0,"AllowTcpForwarding yes\n";
+$i=0;
+print "mod--\n",map { $i++ . ': '. $_} @mod,"---\n" if $trace ;
+splice @mod,38,0,"AllowTcpForwarding yes\n";
open(AUG,$aug_sshd_file) || die "Can't open $aug_sshd_file:$!";
is_deeply([<AUG>],\@mod,"check content of $aug_sshd_file after Match:2 AllowTcpForwarding=yes") ;
Modified: branches/upstream/libconfig-model-backend-augeas-perl/current/t/test_model.pl
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-backend-augeas-perl/current/t/test_model.pl?rev=65810&op=diff
==============================================================================
--- branches/upstream/libconfig-model-backend-augeas-perl/current/t/test_model.pl (original)
+++ branches/upstream/libconfig-model-backend-augeas-perl/current/t/test_model.pl Mon Dec 13 13:00:45 2010
@@ -116,6 +116,25 @@
},
'type' => 'list',
},
+ 'Ciphers',
+ {
+ 'experience' => 'master',
+ 'upstream_default_list' => [
+ 'aes256-cbc',
+ 'aes256-ctr',
+ 'arcfour256'
+ ],
+ ordered => 1,
+ 'type' => 'check_list',
+ 'description' => 'Specifies the ciphers allowed for protocol version 2. By default, all ciphers are allowed.',
+ 'choice' => [
+ 'arcfour256',
+ 'aes192-cbc',
+ 'aes192-ctr',
+ 'aes256-cbc',
+ 'aes256-ctr'
+ ]
+ },
]
);
More information about the Pkg-perl-cvs-commits
mailing list