dani
/
lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dependency to XML::Simple (#1491)

This commit is contained in:
Maxime Besson 2019-09-04 15:40:10 +02:00
parent 01edf42017
commit 285ea93a65
25 changed files with 20 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
INSTALL
View File

@ -31,12 +31,12 @@ package for Debian works fine).
Perl modules:
Apache::Session, Net::LDAP, MIME::Base64, CGI, LWP::UserAgent, Cache::Cache,
DBI, XML::Simple, SOAP::Lite, HTML::Template, XML::LibXML, XML::LibXSLT
DBI, SOAP::Lite, HTML::Template, XML::LibXML, XML::LibXSLT
With Debian:
apt-get install libapache-session-perl libnet-ldap-perl libcache-cache-perl \
libdbi-perl perl-modules libwww-perl libcache-cache-perl \
libxml-simple-perl libhtml-template-perl libsoap-lite-perl \
libhtml-template-perl libsoap-lite-perl \
libxml-libxml-perl libxml-libxslt-perl
1.2 - BUILDING
@ -129,17 +129,17 @@ to access to configuration.
Manager:
--------
Apache::Session, MIME::Base64, CGI, LWP::UserAgent, DBI, XML::Simple,
Apache::Session, MIME::Base64, CGI, LWP::UserAgent, DBI,
SOAP::Lite, XML::LibXML, XML::LibXSLT, Lemonldap::NG::Common
With Debian:
apt-get install perl-modules libxml-simple-perl libdbi-perl libwww-perl
apt-get install perl-modules libdbi-perl libwww-perl
# If you want to use SOAP
apt-get install libsoap-lite-perl
Portal:
-------
Apache::Session, Net::LDAP, MIME::Base64, CGI, Cache::Cache, DBI, XML::Simple,
Apache::Session, Net::LDAP, MIME::Base64, CGI, Cache::Cache, DBI,
SOAP::Lite, HTML::Template, XML::LibXML, Lemonldap::NG::Common
With Debian:
@ -148,7 +148,7 @@ With Debian:
Handler:
--------
Apache::Session, MIME::Base64, CGI, LWP::UserAgent, Cache::Cache, DBI,
XML::Simple, SOAP::Lite, Lemonldap::NG::Common
SOAP::Lite, Lemonldap::NG::Common
With Debian:
apt-get install libapache-session-perl libwww-perl libcache-cache-perl

7
debian/control vendored
View File

@ -52,7 +52,6 @@ Build-Depends-Indep: libapache-session-perl <!nocheck>,
libwww-perl <!nocheck>,
libxml-libxml-perl <!nocheck>,
libxml-libxslt-perl <!nocheck>,
libxml-simple-perl <!nocheck>,
python3-sphinx,
python3-sphinx-rtd-theme,
perl
@ -223,8 +222,7 @@ Recommends: libapache-session-browseable-perl,
Suggests: libconvert-base32-perl,
libnet-ldap-perl,
libsoap-lite-perl,
libxml-libxml-perl,
libxml-simple-perl
libxml-libxml-perl
Conflicts: liblemonldap-ng-cli-perl
Description: Lemonldap::NG common files
Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
@ -251,8 +249,7 @@ Depends: ${misc:Depends},
lemonldap-ng-fastcgi-server (= ${binary:Version}) | lemonldap-ng-uwsgi-app (= ${binary:Version}) | apache2 | httpd-cgi
Recommends: lemonldap-ng-doc (= ${binary:Version}),
libxml-libxml-perl,
libxml-libxslt-perl,
libxml-simple-perl
libxml-libxslt-perl
Suggests: libclone-perl,
libregexp-assemble-perl
Pre-Depends: debconf

2
doc/sources/admin/contribute.rst
View File

@ -128,7 +128,7 @@ Install dependencies
::
aptitude install libapache-session-perl libcache-cache-perl libclone-perl libconfig-inifiles-perl libconvert-pem-perl libcrypt-openssl-bignum-perl libcrypt-openssl-rsa-perl libcrypt-openssl-x509-perl libcrypt-rijndael-perl libdbi-perl libdigest-hmac-perl libemail-sender-perl libgd-securityimage-perl libhtml-template-perl libio-string-perl libjson-perl libmime-tools-perl libmouse-perl libnet-ldap-perl libplack-perl libregexp-assemble-perl libregexp-common-perl libsoap-lite-perl libstring-random-perl libtext-unidecode-perl libunicode-string-perl liburi-perl libwww-perl libxml-simple-perl libxml-libxslt-perl libcrypt-urandom-perl libconvert-base32-perl cpanminus
aptitude install libapache-session-perl libcache-cache-perl libclone-perl libconfig-inifiles-perl libconvert-pem-perl libcrypt-openssl-bignum-perl libcrypt-openssl-rsa-perl libcrypt-openssl-x509-perl libcrypt-rijndael-perl libdbi-perl libdigest-hmac-perl libemail-sender-perl libgd-securityimage-perl libhtml-template-perl libio-string-perl libjson-perl libmime-tools-perl libmouse-perl libnet-ldap-perl libplack-perl libregexp-assemble-perl libregexp-common-perl libsoap-lite-perl libstring-random-perl libtext-unidecode-perl libunicode-string-perl liburi-perl libwww-perl libxml-libxslt-perl libcrypt-urandom-perl libconvert-base32-perl cpanminus
aptitude install apache2 libapache2-mod-fcgid libapache2-mod-perl2 # install Apache
aptitude install nginx nginx-extras # install Nginx
cpanm perltidy@20181120

5
doc/sources/admin/prereq.rst
View File

@ -88,7 +88,6 @@ SAML2
- `Lasso <http://lasso.entrouvert.org/>`__
- GLib
- XML::Simple
Second factor
~~~~~~~~~~~~~
@ -169,7 +168,7 @@ Perl dependencies:
::
apt install libapache-session-perl libcache-cache-perl libclone-perl libconfig-inifiles-perl libconvert-pem-perl libcrypt-openssl-bignum-perl libcrypt-openssl-rsa-perl libcrypt-openssl-x509-perl libcrypt-rijndael-perl libdbi-perl libdigest-hmac-perl libemail-sender-perl libgd-securityimage-perl libhtml-template-perl libio-string-perl libjson-perl libmime-tools-perl libmouse-perl libnet-ldap-perl libplack-perl libregexp-assemble-perl libregexp-common-perl libsoap-lite-perl libstring-random-perl libunicode-string-perl liburi-perl libwww-perl libxml-simple-perl libxml-libxslt-perl libcrypt-urandom-perl libtext-unidecode-perl libcookie-baker-xs-perl
apt install libapache-session-perl libcache-cache-perl libclone-perl libconfig-inifiles-perl libconvert-pem-perl libcrypt-openssl-bignum-perl libcrypt-openssl-rsa-perl libcrypt-openssl-x509-perl libcrypt-rijndael-perl libdbi-perl libdigest-hmac-perl libemail-sender-perl libgd-securityimage-perl libhtml-template-perl libio-string-perl libjson-perl libmime-tools-perl libmouse-perl libnet-ldap-perl libplack-perl libregexp-assemble-perl libregexp-common-perl libsoap-lite-perl libstring-random-perl libunicode-string-perl liburi-perl libwww-perl libxml-libxslt-perl libcrypt-urandom-perl libtext-unidecode-perl libcookie-baker-xs-perl
For Apache:
@ -199,7 +198,7 @@ Perl dependencies:
::
yum install perl-Apache-Session perl-Cache-Cache perl-Clone perl-Config-IniFiles perl-Convert-PEM perl-Crypt-OpenSSL-RSA perl-Crypt-OpenSSL-X509 perl-Crypt-Rijndael perl-Digest-HMAC perl-Digest-SHA perl-GD-SecurityImage perl-HTML-Template perl-IO-String perl-JSON perl-LDAP perl-Mouse perl-Plack perl-Regexp-Assemble perl-Regexp-Common perl-SOAP-Lite perl-String-Random perl-Unicode-String perl-version perl-XML-Simple perl-Crypt-URandom perl-Email-Sender
yum install perl-Apache-Session perl-Cache-Cache perl-Clone perl-Config-IniFiles perl-Convert-PEM perl-Crypt-OpenSSL-RSA perl-Crypt-OpenSSL-X509 perl-Crypt-Rijndael perl-Digest-HMAC perl-Digest-SHA perl-GD-SecurityImage perl-HTML-Template perl-IO-String perl-JSON perl-LDAP perl-Mouse perl-Plack perl-Regexp-Assemble perl-Regexp-Common perl-SOAP-Lite perl-String-Random perl-Unicode-String perl-version perl-Crypt-URandom perl-Email-Sender
For Apache:

3
lemonldap-ng-portal/META.json
View File

@ -32,8 +32,7 @@
"MIME::Entity" : "0",
"SOAP::Lite" : "0",
"Text::Unidecode" : "0",
"XML::LibXML" : "0",
"XML::Simple" : "0"
"XML::LibXML" : "0"
}
},
"configure" : {

1
lemonldap-ng-portal/META.yml
View File

@ -14,7 +14,6 @@ build_requires:
SOAP::Lite: '0'
Text::Unidecode: '0'
XML::LibXML: '0'
XML::Simple: '0'
configure_requires:
ExtUtils::MakeMaker: '0'
dynamic_config: 1

1
lemonldap-ng-portal/Makefile.PL
View File

@ -63,7 +63,6 @@ WriteMakefile(
'SOAP::Lite' => 0,
'Text::Unidecode' => 0,
'XML::LibXML' => 0,
'XML::Simple' => 0,
},
PREREQ_PM => {
'Clone' => 0,

3
lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-Logout-20.t
View File

@ -13,9 +13,6 @@ BEGIN {
my $debug = 'error';
my ( $issuer, $sp, $res );
eval { require XML::Simple };
plan skip_all => "Missing dependencies: $@" if ($@);
# Redefine LWP methods for tests
LWP::Protocol::PSGI->register(
sub {

3
lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-Logout-30.t
View File

@ -13,9 +13,6 @@ BEGIN {
my $debug = 'error';
my ( $issuer, $sp, $res );
eval { require XML::Simple };
plan skip_all => "Missing dependencies: $@" if ($@);
# Redefine LWP methods for tests
LWP::Protocol::PSGI->register(
sub {

3
lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-XSS-on-logout.t
View File

@ -13,9 +13,6 @@ BEGIN {
my $debug = 'error';
my ( $issuer, $sp, $res );
eval { require XML::Simple };
plan skip_all => "Missing dependencies: $@" if ($@);
# Redefine LWP methods for tests
LWP::Protocol::PSGI->register(
sub {

3
lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-declared-app-userattr.t
View File

@ -13,9 +13,6 @@ BEGIN {
my $debug = 'error';
my ( $issuer, $sp, $res );
eval { require XML::Simple };
plan skip_all => "Missing dependencies: $@" if ($@);
# Redefine LWP methods for tests
LWP::Protocol::PSGI->register(
sub {

3
lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-declared-app.t
View File

@ -13,9 +13,6 @@ BEGIN {
my $debug = 'error';
my ( $issuer, $sp, $res );
eval { require XML::Simple };
plan skip_all => "Missing dependencies: $@" if ($@);
# Redefine LWP methods for tests
LWP::Protocol::PSGI->register(
sub {

3
lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-declared-apps.t
View File

@ -13,9 +13,6 @@ BEGIN {
my $debug = 'error';
my ( $issuer, $sp, $res );
eval { require XML::Simple };
plan skip_all => "Missing dependencies: $@" if ($@);
# Redefine LWP methods for tests
LWP::Protocol::PSGI->register(
sub {

3
lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-default.t
View File

@ -13,9 +13,6 @@ BEGIN {
my $debug = 'error';
my ( $issuer, $sp, $res );
eval { require XML::Simple };
plan skip_all => "Missing dependencies: $@" if ($@);
# Redefine LWP methods for tests
LWP::Protocol::PSGI->register(
sub {

3
lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-gateway.t
View File

@ -13,9 +13,6 @@ BEGIN {
my $debug = 'error';
my ( $issuer, $sp, $res );
eval { require XML::Simple };
plan skip_all => "Missing dependencies: $@" if ($@);
# Redefine LWP methods for tests
LWP::Protocol::PSGI->register(
sub {

3
lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-proxied.t
View File

@ -13,9 +13,6 @@ BEGIN {
my $debug = 'error';
my ( $issuer, $sp, $res );
eval { require XML::Simple };
plan skip_all => "Missing dependencies: $@" if ($@);
# Redefine LWP methods for tests
LWP::Protocol::PSGI->register(
sub {

3
lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-with-choice-and-cancel.t
View File

@ -15,9 +15,6 @@ my $maintests = 12;
my $debug = 'error';
my ( $issuer, $sp, $res );
eval { require XML::Simple };
plan skip_all => "Missing dependencies: $@" if ($@);
# Redefine LWP methods for tests
LWP::Protocol::PSGI->register(
sub {

3
lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-with-choice.t
View File

@ -15,9 +15,6 @@ my $maintests = 21;
my $debug = 'error';
my ( $issuer, $sp, $res );
eval { require XML::Simple };
plan skip_all => "Missing dependencies: $@" if ($@);
# Redefine LWP methods for tests
LWP::Protocol::PSGI->register(
sub {

3
lemonldap-ng-portal/t/32-CAS-10.t
View File

@ -13,9 +13,6 @@ BEGIN {
my $debug = 'error';
my ( $issuer, $res );
eval { require XML::Simple };
plan skip_all => "Missing dependencies: $@" if ($@);
ok( $issuer = issuer(), 'Issuer portal' );
count(1);
switch ('issuer');

3
lemonldap-ng-portal/t/32-CAS-Macros.t
View File

@ -13,9 +13,6 @@ BEGIN {
my $debug = 'error';
my ( $issuer, $res );
eval { require XML::Simple };
plan skip_all => "Missing dependencies: $@" if ($@);
ok( $issuer = issuer(), 'Issuer portal' );
count(1);

4
lemonldap-ng-portal/t/37-CAS-App-to-SAML-IdP-POST-with-WAYF.t
View File

@ -57,9 +57,9 @@ LWP::Protocol::PSGI->register(
);
SKIP: {
eval "use Lasso;use XML::Simple";
eval "use Lasso";
if ($@) {
skip 'Lasso or XML::Simple not found', $maintests;
skip 'Lasso', $maintests;
}
# Initialization

4
lemonldap-ng-portal/t/37-CAS-App-to-SAML-IdP-POST.t
View File

@ -57,9 +57,9 @@ LWP::Protocol::PSGI->register(
);
SKIP: {
eval "use Lasso;use XML::Simple";
eval "use Lasso";
if ($@) {
skip 'Lasso or XML::Simple not found', $maintests;
skip 'Lasso not found', $maintests;
}
# Initialization

4
lemonldap-ng-portal/t/37-SAML-SP-POST-to-CAS-server-with-Choice.t
View File

@ -57,9 +57,9 @@ LWP::Protocol::PSGI->register(
);
SKIP: {
eval "use Lasso;use XML::Simple";
eval "use Lasso";
if ($@) {
skip 'Lasso or XML::Simple not found', $maintests;
skip 'Lasso not found', $maintests;
}
# Initialization

4
lemonldap-ng-portal/t/37-SAML-SP-POST-to-CAS-server.t
View File

@ -57,9 +57,9 @@ LWP::Protocol::PSGI->register(
);
SKIP: {
eval "use Lasso;use XML::Simple";
eval "use Lasso";
if ($@) {
skip 'Lasso or XML::Simple not found', $maintests;
skip 'Lasso not found', $maintests;
}
# Initialization

1
rpm/lemonldap-ng.spec
View File

@ -169,7 +169,6 @@ BuildRequires: perl(Web::ID)
%endif
BuildRequires: perl(XML::LibXML)
BuildRequires: perl(XML::LibXSLT)
BuildRequires: perl(XML::Simple)
BuildRequires: perl(YAML)
%if 0%{?fedora}
BuildRequires: systemd-rpm-macros