Merge branch 'v2.0' of gitlab.ow2.org:lemonldap-ng/lemonldap-ng into v2.0

debian/control

@@ -36,6 +36,7 @@ Build-Depends-Indep: gsfonts <!nocheck>,
                      libmouse-perl <!nocheck>,
                      libnet-cidr-lite-perl <!nocheck>,
                      libnet-ldap-perl <!nocheck>,
+                     libio-socket-timeout-perl <!nocheck>,
                      libnet-openid-consumer-perl <!nocheck>,
                      libnet-openid-server-perl <!nocheck>,
                      libplack-perl <!nocheck>,

lemonldap-ng-portal/t/test-ldap.pm

@@ -43,7 +43,7 @@ sub stopLdapServer {
         my $die = 0;
         close F;
         if ($pid) {
-            system "kill $pid";
+            kill 15, $pid;
 
             # give the PID 10 seconds to stop
             my $waitloop = 0;
@@ -51,6 +51,9 @@ sub stopLdapServer {
                 $waitloop++;
                 usleep 10000;
             }
+            if (kill 0, $pid){
+                kill 9, $pid;
+            }
         }
         else {
 
@@ -67,7 +70,7 @@ sub tempStopLdapServer {
         my $pid = join '', <F>;
         close F;
         if ($pid) {
-            system "kill $pid";
+            kill 15, $pid;
 
             # give the PID 10 seconds to stop
             my $waitloop = 0;
@@ -75,6 +78,9 @@ sub tempStopLdapServer {
                 $waitloop++;
                 usleep 10000;
             }
+            if (kill 0, $pid){
+                kill 9, $pid;
+            }
         }
         else {
             _ldap_cleanup();

scripts/sonar

@@ -1,11 +1,13 @@
 #!/bin/sh
 
-apt update
+apt update --allow-releaseinfo-change
 mk-build-deps --install --remove \
     --tool "apt-get -o Debug::pkgProblemResolver=yes -q -y" \
     debian/control
-apt -y install libperl-critic-perl libdevel-cover-perl cpanminus
+export DEBIAN_FRONTEND=noninteractive
+apt -y install libperl-critic-perl libdevel-cover-perl cpanminus slapd
 cpanm install Devel::Cover::Report::SonarGeneric
+export LLNGTESTLDAP=1
 make SKIP_DOCUMENTATION=1
 
 for module in common handler portal manager; do