Commit fb85dbe0 authored by Xavier Guimard's avatar Xavier Guimard

Import Debian patch (closes: #LEMONLDAP-1003)

git-svn-id: svn://svn.forge.objectweb.org/svnroot/lemonldap/branches/lemonldap-ng_version_1_4-bugfixes@5149 1dbb9719-a921-0410-b57f-c3a383c2c641
parent 6d36e33a
Description: Replace Mouse by Moose
Using Mouse under ModPerl::Registry provides a 'No package name defined'
error. This patch replace Mouse by Moose to avoid it.
Author: Xavier Guimard <x.guimard@free.fr>
Bug-Debian: https://bugs.debian.org/823217
Forwarded: https://jira.ow2.org/browse/LEMONLDAP-1003
Last-Update: 2016-05-02
--- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Captcha.pm
+++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Captcha.pm
@@ -10,7 +10,7 @@
use strict;
use Lemonldap::NG::Common::Session;
-use Mouse;
+use Moose;
use Digest::MD5 qw(md5_hex);
has 'storageModule' => (
@@ -117,6 +117,6 @@
return 0;
}
-no Mouse;
+no Moose;
1;
--- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Attributes.pm
+++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Attributes.pm
@@ -6,7 +6,7 @@
package Lemonldap::NG::Common::Conf::Attributes;
-use Mouse;
+use Moose;
our $VERSION = 1.4.6;
@@ -1539,6 +1539,6 @@
## Z
-no Mouse;
+no Moose;
1;
--- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/SubAttributes.pm
+++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/SubAttributes.pm
@@ -6,7 +6,7 @@
package Lemonldap::NG::Common::Conf::SubAttributes;
-use Mouse;
+use Moose;
our $VERSION = 1.4.1;
@@ -292,6 +292,6 @@
documentation => 'Redirection port for a virtual host',
);
-no Mouse;
+no Moose;
1;
--- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Session.pm
+++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Session.pm
@@ -8,7 +8,7 @@
our $VERSION = 1.4.1;
-use Mouse;
+use Moose;
use Lemonldap::NG::Common::Apache::Session;
has 'id' => (
@@ -203,6 +203,6 @@
return $self->update( { '_session_id' => $self->id } );
}
-no Mouse;
+no Moose;
1;
--- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Initialization/GlobalInit.pm
+++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Initialization/GlobalInit.pm
@@ -6,7 +6,7 @@
use constant UNPROTECT => 1;
use constant SKIP => 2;
-use Mouse;
+use Moose;
use Lemonldap::NG::Handler::Main::Jail;
use Lemonldap::NG::Handler::Main::Logger;
--- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Initialization/LocalInit.pm
+++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Initialization/LocalInit.pm
@@ -13,14 +13,14 @@
# globalInit().
package Lemonldap::NG::Handler::Initialization::LocalInit;
-use Mouse;
+use Moose;
use Lemonldap::NG::Handler::SharedConf; # Needed to get VERSION
use Lemonldap::NG::Handler::Main::Logger;
our $VERSION = '1.4.6';
-# Mouse attributes
+# Moose attributes
##################
# default attributes from constructor
@@ -94,7 +94,7 @@
}
}
-# Mouse methods
+# Moose methods
###############
## @imethod void localInit(hashRef args)
--- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Jail.pm
+++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Jail.pm
@@ -5,7 +5,7 @@
use Safe;
use Lemonldap::NG::Common::Safelib; #link protected safe Safe object
use constant SAFEWRAP => ( Safe->can("wrap_code_ref") ? 1 : 0 );
-use Mouse;
+use Moose;
use Lemonldap::NG::Handler::Main::Logger;
has customFunctions => ( is => 'rw', isa => 'Maybe[Str]' );
--- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/SharedConf.pm
+++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/SharedConf.pm
@@ -26,7 +26,7 @@
use Cache::Cache qw($EXPIRES_NEVER);
use Lemonldap::NG::Handler::Main::Logger;
-use Mouse;
+use Moose;
extends qw(Lemonldap::NG::Handler::Main); # Lemonldap::NG::Handler::Vhost
comment-Apache2.4-configuration.patch
replace-mouse-by-moose.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment