Commit 132de79b authored by Xavier Guimard's avatar Xavier Guimard

Merge 1.9.1 changes

parent 6bd696aa
......@@ -14,6 +14,7 @@ Build-Depends-Indep: libapache-session-perl,
libclone-perl,
libconfig-inifiles-perl,
libconvert-pem-perl,
libcrypt-openssl-bignum-perl,
libcrypt-openssl-rsa-perl,
libcrypt-openssl-x509-perl,
libcrypt-rijndael-perl,
......@@ -254,6 +255,7 @@ Depends: ${misc:Depends},
libhtml-template-perl,
liblemonldap-ng-common-perl (= ${binary:Version}),
libmime-lite-perl,
libcrypt-openssl-bignum-perl,
libnet-ldap-perl,
libregexp-assemble-perl,
libstring-random-perl,
......
......@@ -33,6 +33,7 @@ requires:
CGI: '3.08'
Cache::Cache: '0'
Config::IniFiles: '0'
Crypt::OpenSSL::Bignum: '0'
Crypt::OpenSSL::RSA: '0'
Crypt::OpenSSL::X509: '0'
Crypt::Rijndael: '0'
......
use 5.008;
use 5.014;
use ExtUtils::MakeMaker;
# See lib/ExtUtils/MakeMaker.pm for details of how to influence
......@@ -41,21 +41,22 @@ WriteMakefile(
},
},
PREREQ_PM => {
'Apache::Session' => 0,
'Cache::Cache' => 0,
'CGI' => 3.08,
'Crypt::OpenSSL::RSA' => 0,
'Crypt::OpenSSL::X509' => 0,
'Crypt::Rijndael' => 0,
'Config::IniFiles' => 0,
'DBI' => 0,
'Digest::SHA' => 0,
'File::Basename' => 0,
'JSON' => 0,
'Mouse' => 0,
'Net::CIDR::Lite' => 0,
'SOAP::Lite' => 0,
'Storable' => 0,
'Apache::Session' => 0,
'Cache::Cache' => 0,
'CGI' => 3.08,
'Crypt::OpenSSL::Bignum' => 0,
'Crypt::OpenSSL::RSA' => 0,
'Crypt::OpenSSL::X509' => 0,
'Crypt::Rijndael' => 0,
'Config::IniFiles' => 0,
'DBI' => 0,
'Digest::SHA' => 0,
'File::Basename' => 0,
'JSON' => 0,
'Mouse' => 0,
'Net::CIDR::Lite' => 0,
'SOAP::Lite' => 0,
'Storable' => 0,
}, # e.g., Module::Name => 1.1
#EXE_FILES => [ 'scripts/convertConfig', ],
(
......
......@@ -202,10 +202,8 @@ sub getConf {
}
# Some parameters expect key name (example), not variable ($example)
foreach (qw/whatToTrace/) {
if ( defined $r->{$_} ) {
$r->{$_} =~ s/^\$//;
}
if ( defined $r->{whatToTrace} ) {
$r->{whatToTrace} =~ s/^\$//;
}
# Store modified configuration in cache
......
use 5.008;
use 5.014;
use ExtUtils::MakeMaker;
# See lib/ExtUtils/MakeMaker.pm for details of how to influence
......
use 5.008;
use 5.014;
use ExtUtils::MakeMaker;
# See lib/ExtUtils/MakeMaker.pm for details of how to influence
......
use 5.008;
use 5.014;
use ExtUtils::MakeMaker;
# See lib/ExtUtils/MakeMaker.pm for details of how to influence
......
......@@ -91,6 +91,7 @@ BuildRequires: perl(HTML::Template)
BuildRequires: perl(JSON)
BuildRequires: perl(Config::IniFiles)
BuildRequires: perl(Convert::PEM)
BuildRequires: perl(Crypt::OpenSSL::Bignum)
BuildRequires: perl(Crypt::OpenSSL::RSA)
BuildRequires: perl(Crypt::OpenSSL::X509)
BuildRequires: perl(Class::Inspector)
......@@ -104,7 +105,7 @@ BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Env)
BuildRequires: systemd
%else
BuildRequires: perl-Regexp-Assemble, perl-Regexp-Common, perl-Authen-Captcha, perl-Cache-Cache, perl-Apache-Session, perl-LDAP, perl-CGI-Session, perl-IO-String, perl-MIME-Lite, perl-SOAP-Lite, perl-XML-Simple, perl-XML-LibXSLT, perl-String-Random, perl-Email-Date-Format, perl-Crypt-Rijndael, perl-HTML-Template, perl-JSON, perl-Config-IniFiles, perl-Crypt-OpenSSL-RSA, perl-Crypt-OpenSSL-X509, perl-Class-Inspector, perl-Test-MockObject, perl-Clone, perl-Net-CIDR-Lite, perl-Unicode-String, perl-Mouse, perl-Digest-SHA, perl-ExtUtims-MakeMaker, perl-Env, systemd
BuildRequires: perl-Regexp-Assemble, perl-Regexp-Common, perl-Authen-Captcha, perl-Cache-Cache, perl-Apache-Session, perl-LDAP, perl-CGI-Session, perl-IO-String, perl-MIME-Lite, perl-SOAP-Lite, perl-XML-Simple, perl-XML-LibXSLT, perl-String-Random, perl-Email-Date-Format, perl-Crypt-Rijndael, perl-HTML-Template, perl-JSON, perl-Config-IniFiles, perl-Crypt-OpenSSL-Bignum, perl-Crypt-OpenSSL-RSA, perl-Crypt-OpenSSL-X509, perl-Class-Inspector, perl-Test-MockObject, perl-Clone, perl-Net-CIDR-Lite, perl-Unicode-String, perl-Mouse, perl-Digest-SHA, perl-ExtUtims-MakeMaker, perl-Env, systemd
%endif
%if 0%{?rhl}%{?rhel}%{?fedora}
......
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