Merge branch 'master' of gitlab.ow2.org:lemonldap-ng/lemonldap-ng

_example/conf/lmConf-1.json

@@ -86,7 +86,7 @@
    "authentication" : "Demo",
    "cfgAuthor" : "The LemonLDAP::NG team",
    "cfgNum" : 1,
-   "cfgVersion" : "2.0.1",
+   "cfgVersion" : "2.0.2",
    "cookieName" : "lemonldap",
    "demoExportedVars" : {
       "cn" : "cn",

lemonldap-ng-common/META.json

@@ -4,13 +4,13 @@
       "Xavier Guimard <x.guimard@free.fr>, Clément Oudot <clement@oodo.net>"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010",
+   "generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010",
    "license" : [
       "open_source"
    ],
    "meta-spec" : {
       "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-      "version" : "2"
+      "version" : 2
    },
    "name" : "Lemonldap-NG-Common",
    "no_index" : {
@@ -69,6 +69,6 @@
       ],
       "x_MailingList" : "mailto:lemonldap-ng-dev@ow2.org"
    },
-   "version" : "v2.0.1",
-   "x_serialization_backend" : "JSON::PP version 2.27400_02"
+   "version" : "v2.0.2",
+   "x_serialization_backend" : "JSON::PP version 2.97001"
 }

lemonldap-ng-common/META.yml

@@ -9,7 +9,7 @@ build_requires:
 configure_requires:
   ExtUtils::MakeMaker: '0'
 dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010'
+generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010'
 license: open_source
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -47,5 +47,5 @@ resources:
   X_twitter: https://twitter.com/lemonldapng
   homepage: http://lemonldap-ng.org/
   license: http://opensource.org/licenses/GPL-2.0
-version: v2.0.1
+version: v2.0.2
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

lemonldap-ng-common/lib/Lemonldap/NG/Common.pm

 package Lemonldap::NG::Common;
 
-our $VERSION = '2.0.1';
+our $VERSION = '2.0.2';
 
 1;
 __END__

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Constants.pm

@@ -5,7 +5,7 @@ use strict;
 use Exporter 'import';
 use base qw(Exporter);
 
-our $VERSION = '2.0.1';
+our $VERSION = '2.0.2';
 
 # CONSTANTS
 

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm

 # This file is generated by Lemonldap::NG::Manager::Build. Don't modify it by hand
 package Lemonldap::NG::Common::Conf::DefaultValues;
 
-our $VERSION = '2.0.1';
+our $VERSION = '2.0.2';
 
 sub defaultValues {
     return {

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/ReConstants.pm

@@ -5,7 +5,7 @@ use strict;
 use Exporter 'import';
 use base qw(Exporter);
 
-our $VERSION = '2.0.1';
+our $VERSION = '2.0.2';
 
 our %EXPORT_TAGS = ( 'all' => [qw($simpleHashKeys $doubleHashKeys $specialNodeKeys $casAppMetaDataNodeKeys $casSrvMetaDataNodeKeys $oidcOPMetaDataNodeKeys $oidcRPMetaDataNodeKeys $samlIDPMetaDataNodeKeys $samlSPMetaDataNodeKeys $virtualHostKeys $specialNodeHash $authParameters $issuerParameters $samlServiceParameters $oidcServiceParameters $casServiceParameters)] );
 our @EXPORT_OK   = ( @{ $EXPORT_TAGS{'all'} } );

lemonldap-ng-handler/META.json

@@ -4,13 +4,13 @@
       "Xavier Guimard <x.guimard@free.fr>, Clément Oudot <clement@oodo.net>"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010",
+   "generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010",
    "license" : [
       "open_source"
    ],
    "meta-spec" : {
       "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-      "version" : "2"
+      "version" : 2
    },
    "name" : "Lemonldap-NG-Handler",
    "no_index" : {
@@ -43,7 +43,7 @@
          },
          "requires" : {
             "LWP::UserAgent" : "0",
-            "Lemonldap::NG::Common" : "v2.0.1",
+            "Lemonldap::NG::Common" : "v2.0.2",
             "Mouse" : "0",
             "URI" : "0"
          }
@@ -58,6 +58,6 @@
       ],
       "x_MailingList" : "mailto:lemonldap-ng-dev@ow2.org"
    },
-   "version" : "v2.0.1",
-   "x_serialization_backend" : "JSON::PP version 2.27400_02"
+   "version" : "v2.0.2",
+   "x_serialization_backend" : "JSON::PP version 2.97001"
 }

lemonldap-ng-handler/META.yml

@@ -11,7 +11,7 @@ build_requires:
 configure_requires:
   ExtUtils::MakeMaker: '0'
 dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010'
+generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010'
 license: open_source
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -28,7 +28,7 @@ recommends:
   SOAP::Lite: '0'
 requires:
   LWP::UserAgent: '0'
-  Lemonldap::NG::Common: v2.0.1
+  Lemonldap::NG::Common: v2.0.2
   Mouse: '0'
   URI: '0'
 resources:
@@ -36,5 +36,5 @@ resources:
   X_twitter: https://twitter.com/lemonldapng
   homepage: http://lemonldap-ng.org/
   license: http://opensource.org/licenses/GPL-2.0
-version: v2.0.1
+version: v2.0.2
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

lemonldap-ng-handler/Makefile.PL

@@ -39,7 +39,7 @@ WriteMakefile(
         },
     },
     PREREQ_PM => {
-        'Lemonldap::NG::Common' => '2.0.1',
+        'Lemonldap::NG::Common' => '2.0.2',
         'LWP::UserAgent'        => 0,
         'Mouse'                 => 0,
         'URI'                   => 0,

lemonldap-ng-handler/lib/Lemonldap/NG/Handler.pm

@@ -3,7 +3,7 @@ package Lemonldap::NG::Handler;
 print STDERR
 "Use the appropriate handler. For Apache, use Lemonldap::NG::Handler::ApacheMP2";
 
-our $VERSION = '2.0.1';
+our $VERSION = '2.0.2';
 
 1;
 

lemonldap-ng-manager/META.json

@@ -4,13 +4,13 @@
       "Xavier Guimard <x.guimard@free.fr>, Clément Oudot <clement@oodo.net>"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010",
+   "generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010",
    "license" : [
       "open_source"
    ],
    "meta-spec" : {
       "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-      "version" : "2"
+      "version" : 2
    },
    "name" : "Lemonldap-NG-Manager",
    "no_index" : {
@@ -40,8 +40,8 @@
             "Convert::PEM" : "0",
             "Crypt::OpenSSL::RSA" : "0",
             "LWP::UserAgent" : "0",
-            "Lemonldap::NG::Common" : "v2.0.1",
-            "Lemonldap::NG::Handler" : "v2.0.1"
+            "Lemonldap::NG::Common" : "v2.0.2",
+            "Lemonldap::NG::Handler" : "v2.0.2"
          }
       }
    },
@@ -54,6 +54,6 @@
       ],
       "x_MailingList" : "mailto:lemonldap-ng-dev@ow2.org"
    },
-   "version" : "v2.0.1",
-   "x_serialization_backend" : "JSON::PP version 2.27400_02"
+   "version" : "v2.0.2",
+   "x_serialization_backend" : "JSON::PP version 2.97001"
 }

lemonldap-ng-manager/META.yml

@@ -9,7 +9,7 @@ build_requires:
 configure_requires:
   ExtUtils::MakeMaker: '0'
 dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010'
+generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010'
 license: open_source
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -25,12 +25,12 @@ requires:
   Convert::PEM: '0'
   Crypt::OpenSSL::RSA: '0'
   LWP::UserAgent: '0'
-  Lemonldap::NG::Common: v2.0.1
-  Lemonldap::NG::Handler: v2.0.1
+  Lemonldap::NG::Common: v2.0.2
+  Lemonldap::NG::Handler: v2.0.2
 resources:
   MailingList: mailto:lemonldap-ng-dev@ow2.org
   X_twitter: https://twitter.com/lemonldapng
   homepage: http://lemonldap-ng.org/
   license: http://opensource.org/licenses/GPL-2.0
-version: v2.0.1
+version: v2.0.2
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

lemonldap-ng-manager/Makefile.PL

@@ -35,8 +35,8 @@ WriteMakefile(
     PREREQ_PM => {
         'Convert::PEM'           => 0,
         'Crypt::OpenSSL::RSA'    => 0,
-        'Lemonldap::NG::Common'  => '2.0.1',
-        'Lemonldap::NG::Handler' => '2.0.1',
+        'Lemonldap::NG::Common'  => '2.0.2',
+        'Lemonldap::NG::Handler' => '2.0.2',
         'LWP::UserAgent'         => 0,
     },    # e.g., Module::Name => 1.1
     (

lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm

@@ -17,7 +17,7 @@ use JSON;
 use Lemonldap::NG::Common::Conf::Constants;
 use Lemonldap::NG::Common::PSGI::Constants;
 
-our $VERSION = '2.0.1';
+our $VERSION = '2.0.2';
 
 extends 'Lemonldap::NG::Common::Conf::AccessLib',
   'Lemonldap::NG::Handler::PSGI::Router';

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm

 # This file is generated by Lemonldap::NG::Manager::Build. Don't modify it by hand
 package Lemonldap::NG::Manager::Attributes;
 
-our $VERSION = '2.0.1';
+our $VERSION = '2.0.2';
 
 sub types {
     return {

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm

@@ -6,7 +6,7 @@
 
 package Lemonldap::NG::Manager::Build::Attributes;
 
-our $VERSION = '2.0.1';
+our $VERSION = '2.0.2';
 use strict;
 use Regexp::Common qw/URI/;
 

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Cli.pm

@@ -5,7 +5,7 @@ use Mouse;
 use Data::Dumper;
 use Lemonldap::NG::Common::Conf::ReConstants;
 
-our $VERSION = '2.0.0';
+our $VERSION = '2.0.2';
 $Data::Dumper::Useperl = 1;
 
 extends('Lemonldap::NG::Manager::Cli::Lib');

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm

@@ -19,7 +19,7 @@ use feature 'state';
 
 extends 'Lemonldap::NG::Common::Conf::RESTServer';
 
-our $VERSION = '2.0.0';
+our $VERSION = '2.0.2';
 
 #############################
 # I. INITIALIZATION METHODS #

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm

@@ -25,7 +25,7 @@ use JSON 'to_json';
 use Lemonldap::NG::Common::Conf::ReConstants;
 use Lemonldap::NG::Manager::Attributes;
 
-our $VERSION = '2.0.0';
+our $VERSION = '2.0.2';
 
 extends 'Lemonldap::NG::Common::Conf::Compact';
 

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm

@@ -3,7 +3,7 @@ package Lemonldap::NG::Manager::Conf::Tests;
 use utf8;
 use Lemonldap::NG::Common::Regexp;
 
-our $VERSION = '2.0.1';
+our $VERSION = '2.0.2';
 
 ## @method hashref tests(hashref conf)
 # Return a hash ref where keys are the names of the tests and values

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm

@@ -66,7 +66,7 @@ sub zeroConf {
                         'uri'         => 'http://lemonldap-ng.org/',
                         'display'     => 'on',
                         'logo'        => 'network.png',
-                        'name'        => 'Offical Website'
+                        'name'        => 'Official Website'
                     },
                     'type' => 'application'
                 },

lemonldap-ng-manager/t/conf/lmConf-1.json

@@ -75,7 +75,7 @@
           "description": "Official LemonLDAP::NG Website",
           "display": "on",
           "logo": "network.png",
-          "name": "Offical Website",
+          "name": "Official Website",
           "uri": "http://lemonldap-ng.org/"
         },
         "type": "application"

lemonldap-ng-manager/t/jsonfiles/02-base-tree-all-nodes-opened.json

@@ -126,7 +126,7 @@
             "id": "applicationList/0008-cat/0009-app",
             "type": "menuApp"
           }, {
-            "title": "Offical Website",
+            "title": "Official Website",
             "type": "menuApp",
             "id": "applicationList/0008-cat/0010-app",
             "data": {

lemonldap-ng-manager/t/jsonfiles/11-modified-with-confirmation.json

@@ -136,7 +136,7 @@
             "id": "applicationList/0008-cat/0009-app",
             "type": "menuApp"
           }, {
-            "title": "Offical Website",
+            "title": "Official Website",
             "type": "menuApp",
             "id": "applicationList/0008-cat/0010-app",
             "data": {

lemonldap-ng-manager/t/jsonfiles/12-modified.json

@@ -136,7 +136,7 @@
             "id": "applicationList/0008-cat/0009-app",
             "type": "menuApp"
           }, {
-            "title": "Offical Website",
+            "title": "Official Website",
             "type": "menuApp",
             "id": "applicationList/0008-cat/0010-app",
             "data": {

lemonldap-ng-manager/t/jsonfiles/14-bad.json

@@ -126,7 +126,7 @@
             "id": "applicationList/0008-cat/0009-app",
             "type": "menuApp"
           }, {
-            "title": "Offical Website",
+            "title": "Official Website",
             "type": "menuApp",
             "id": "applicationList/0008-cat/0010-app",
             "data": {

lemonldap-ng-portal/META.json

@@ -4,13 +4,13 @@
       "Xavier Guimard <x.guimard@free.fr>, Clément Oudot <clement@oodo.net>"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010",
+   "generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010",
    "license" : [
       "open_source"
    ],
    "meta-spec" : {
       "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-      "version" : "2"
+      "version" : 2
    },
    "name" : "Lemonldap-NG-Portal",
    "no_index" : {
@@ -45,6 +45,7 @@
             "GD::SecurityImage" : "0",
             "Glib" : "0",
             "HTTP::Message" : "0",
+            "IPC::Run" : "0",
             "Image::Magick" : "0",
             "LWP::Protocol::https" : "0",
             "LWP::UserAgent" : "0",
@@ -62,7 +63,7 @@
          },
          "requires" : {
             "Clone" : "0",
-            "Lemonldap::NG::Handler" : "v2.0.1",
+            "Lemonldap::NG::Handler" : "v2.0.2",
             "Regexp::Assemble" : "0"
          }
       }
@@ -76,6 +77,6 @@
       ],
       "x_MailingList" : "mailto:lemonldap-ng-dev@ow2.org"
    },
-   "version" : "v2.0.1",
-   "x_serialization_backend" : "JSON::PP version 2.27400_02"
+   "version" : "v2.0.2",
+   "x_serialization_backend" : "JSON::PP version 2.97001"
 }

lemonldap-ng-portal/META.yml

@@ -14,7 +14,7 @@ build_requires:
 configure_requires:
   ExtUtils::MakeMaker: '0'
 dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010'
+generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010'
 license: open_source
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -31,6 +31,7 @@ recommends:
   GD::SecurityImage: '0'
   Glib: '0'
   HTTP::Message: '0'
+  IPC::Run: '0'
   Image::Magick: '0'
   LWP::Protocol::https: '0'
   LWP::UserAgent: '0'
@@ -47,12 +48,12 @@ recommends:
   Web::ID: '0'
 requires:
   Clone: '0'
-  Lemonldap::NG::Handler: v2.0.1
+  Lemonldap::NG::Handler: v2.0.2
   Regexp::Assemble: '0'
 resources:
   MailingList: mailto:lemonldap-ng-dev@ow2.org
   X_twitter: https://twitter.com/lemonldapng
   homepage: http://lemonldap-ng.org/
   license: http://opensource.org/licenses/GPL-2.0
-version: v2.0.1
+version: v2.0.2
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

lemonldap-ng-portal/Makefile.PL

@@ -59,7 +59,7 @@ WriteMakefile(
     },
     PREREQ_PM => {
         'Clone'                  => 0,
-        'Lemonldap::NG::Handler' => '2.0.1',
+        'Lemonldap::NG::Handler' => '2.0.2',
         'Regexp::Assemble'       => 0,
     },
     (

lemonldap-ng-portal/lib/Lemonldap/NG/Portal.pm

 # Alias for Lemonldap::NG::Portal::Main
 package Lemonldap::NG::Portal;
 
-our $VERSION = '2.0.1';
+our $VERSION = '2.0.2';
 use Lemonldap::NG::Portal::Main;
 use base 'Lemonldap::NG::Portal::Main';
 

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/GPG.pm

@@ -13,7 +13,7 @@ use Lemonldap::NG::Portal::Main::Constants qw(
     PE_OK
 );
 
-our $VERSION = '2.0.1';
+our $VERSION = '2.0.2';
 
 extends 'Lemonldap::NG::Portal::Auth::_WebForm';
 

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm

@@ -2,7 +2,7 @@
 # Display functions for LemonLDAP::NG Portal
 package Lemonldap::NG::Portal::Main::Display;
 
-our $VERSION = '2.0.1';
+our $VERSION = '2.0.2';
 
 package Lemonldap::NG::Portal::Main;
 use strict;

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Init.pm

@@ -8,7 +8,7 @@
 #                  of lemonldap-ng.ini) and underlying handler configuration
 package Lemonldap::NG::Portal::Main::Init;
 
-our $VERSION = '2.0.1';
+our $VERSION = '2.0.2';
 
 package Lemonldap::NG::Portal::Main;
 

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Plugin.pm

@@ -6,7 +6,7 @@ use strict;
 use Mouse;
 use HTML::Template;
 
-our $VERSION = '2.0.0';
+our $VERSION = '2.0.2';
 
 extends 'Lemonldap::NG::Common::Module';
 

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Process.pm

 package Lemonldap::NG::Portal::Main::Process;
 
-our $VERSION = '2.0.0';
+our $VERSION = '2.0.2';
 
 package Lemonldap::NG::Portal::Main;
 

rpm/lemonldap-ng.spec

@@ -49,7 +49,7 @@
 # Main package
 #==============================================================================
 Name:           lemonldap-ng
-Version:        2.0.1
+Version:        2.0.2
 Release:        %{?pre_release:0.}1%{?pre_release:.%{pre_release}}%{?dist}
 Summary:        LemonLDAP-NG WebSSO
 License:        GPLv2+

scripts/generate-changelog.pl

@@ -12,7 +12,7 @@
 use LWP::UserAgent;
 use JSON;
 
-my $milestone = '2.0.1';
+my $milestone = '2.0.2';
 my @cat = ( 'Bug', 'New feature', 'Improvement' );
 
 open F, "$ENV{HOME}/.ow2-token" or die "Unable to get OW2 token ($!)";