--- doc/install/linux/install.pl	2021/12/21 14:31:52	1.81
+++ doc/install/linux/install.pl	2024/06/20 00:29:49	1.90
@@ -78,7 +78,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.81 2021/12/21 14:31:52 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.90 2024/06/20 00:29:49 raeburn Exp $'."\n";
 }
 
 #
@@ -472,7 +472,7 @@ sub check_locale {
                       '/etc/sysconfig/i18n');
             $earlyout = 1;
         }
-    } elsif ($distro =~ /^(?:rhes|centos|scientific|oracle)(\d+)/) {
+    } elsif ($distro =~ /^(?:rhes|centos|scientific|oracle|rocky|alma)(\d+)/) {
         if ($1 >= 7) {
             if (!open($fh,"</etc/locale.conf")) {
                 print &mt('Failed to open: [_1], default locale not checked.',
@@ -572,7 +572,7 @@ sub check_required {
         if ($mysqlsetup eq 'needsrestart') {
             $mysqlrestart = '';
             if ($distro eq 'ubuntu') {
-                $mysqlrestart = 'sudo '; 
+                $mysqlrestart = 'sudo ';
             }
             $mysqlrestart .= 'service mysql restart';
             return ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,$mysqlrestart);
@@ -622,6 +622,14 @@ sub check_mysql_running {
             $process = 'mysqld';
             $proc_owner = 'mysql';
         }
+    } elsif ($distro =~ /^debian(\w+)/) {
+        if ($1 >= 10) {
+            $process = 'mysql';
+            $proc_owner = 'mysql';
+        }           
+        if ($1 >= 11) {
+            $mysqldaemon = 'mariadb';
+        }
     } elsif ($distro =~ /^fedora(\d+)/) {
         if ($1 >= 16) {
             $process = 'mysqld';
@@ -641,6 +649,9 @@ sub check_mysql_running {
             $proc_owner = 'mysql';
             $use_systemctl = 1;
         }
+        if ($1 >= 9) {
+            $process = 'mariadb';
+        }
     } elsif ($distro =~ /^sles(\d+)/) {
         if ($1 >= 12) {
             $use_systemctl = 1;
@@ -761,9 +772,13 @@ sub chkconfig {
         if (($distro =~ /^ubuntu/) && ($version <= 8)) {
             $daemon{'cups'} = 'cupsys';
         }
-        if (($distro =~ /^ubuntu/) && ($version >= 18)) {
+        if ((($distro =~ /^ubuntu/) && ($version >= 18)) ||
+            (($distro  =~ /^debian/) && ($version >= 10))) {
             $daemon{'ntp'}    = 'chrony';
         }
+        if (($distro  =~ /^debian/) && ($version >= 11)) {
+            $daemon{'mysql'} = 'mariadb';
+        }
     } elsif ($distro =~ /^fedora(\d+)/) {
         my $version = $1;
         if ($version >= 15) {
@@ -989,7 +1004,8 @@ sub chkapache {
         my $distname = $1;
         my $version = $2;
         my ($stdconf,$stdsite);
-        if (($distname eq 'ubuntu') && ($version > 12)) {
+        if ((($distname eq 'ubuntu') && ($version > 12)) ||
+            (($distname eq 'debian') && ($version >= 10))) {
             $stdconf = "$instdir/debian-ubuntu/ubuntu14/loncapa_conf";
             $stdsite = "$instdir/debian-ubuntu/ubuntu14/loncapa_sites";
         } else {
@@ -1000,7 +1016,8 @@ sub chkapache {
             print &mt('Warning: No LON-CAPA Apache configuration file found for installation check.')."\n"; 
         } else {
             my ($configfile,$sitefile);
-            if (($distname eq 'ubuntu') && ($version > 12)) {
+            if ((($distname eq 'ubuntu') && ($version > 12)) ||
+                (($distname eq 'debian') && ($version >= 10))) {
                 $sitefile = '/etc/apache2/sites-available/loncapa.conf';
                 $configfile = '/etc/apache2/conf-available/loncapa.conf';
             } else {
@@ -1016,7 +1033,8 @@ sub chkapache {
                     }
                 }
             }
-            if ((!$fixapache) && ($distname eq 'ubuntu') && ($version > 12)) {
+            if ((!$fixapache) && ((($distname eq 'ubuntu') && ($version > 12)) ||
+                                  (($distname eq 'debian') && ($version >= 10))))  {
                 if (($sitefile ne '') && (-e $sitefile) && (-e $stdsite)) {
                     if (open(PIPE, "diff --brief $stdsite $sitefile |")) {
                         my $diffres = <PIPE>;
@@ -1036,7 +1054,7 @@ sub chkapache {
                 }
             }
         }
-        if ((!$fixapache) && ($distname eq 'ubuntu')) {
+        if ((!$fixapache) && (($distname eq 'ubuntu') || ($distname eq 'debian'))) {
             my $sitestatus = "/etc/apache2/mods-available/status.conf";
             my $stdstatus = "$instdir/debian-ubuntu/status.conf";
             if ((-e $stdstatus) && (-e $sitestatus)) {
@@ -1387,7 +1405,11 @@ sub chkapachessl {
                             foreach my $file (sort(keys(%{$sslfiles{$key}}))) {
                                 unless ((-l "$enabled_dir/$file") &&
                                         (readlink("$enabled_dir/$file") eq "$ssldir/$file")) {
-                                    print_and_log(&mt("Warning, use: 'sudo a2ensite $file' to activate LON-CAPA SSL Apache config\n"));
+                                    if ($distro =~ /^debian(\d+)$/) {
+                                        print_and_log(&mt("Warning, use: 'a2ensite $file' to activate LON-CAPA SSL Apache config\n"));
+                                    } elsif ($distro =~ /^ubuntu(\d+)$/) {
+                                        print_and_log(&mt("Warning, use: 'sudo a2ensite $file' to activate LON-CAPA SSL Apache config\n"));
+                                    }
                                 }
                             }
                         }
@@ -1550,8 +1572,8 @@ sub check_mysql_setup {
     my ($instdir,$dsn,$distro) = @_;
     my ($mysqlsetup,$has_pass,$mysql_unix_socket,$mysql_has_wwwuser);
     my $dbh = DBI->connect($dsn,'root','',{'PrintError'=>0});
-    my ($mysqlversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
-    if (($mysqlname =~ /^MariaDB/i) && ($mysqlversion >= 10.4)) {
+    my ($mysqlversion,$mysqlminorversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
+    if (($mysqlname =~ /^MariaDB/i) && (($mysqlversion == 10 && $mysqlminorversion >= 4) || ($mysqlversion >= 11))) {
         if ($dbh) {
             my $sth = $dbh->prepare("SELECT Priv FROM mysql.global_priv WHERE (User = 'root' AND Host ='localhost')");
             $sth->execute();
@@ -1572,7 +1594,7 @@ sub check_mysql_setup {
     }
     if ($dbh) {
         $mysqlsetup = 'noroot';
-        if (($mysqlname !~ /^MariaDB/i) && ($mysqlversion >= 5.7)) {
+        if (($mysqlname !~ /^MariaDB/i) && (($mysqlversion == 5 && $mysqlminorversion >= 7) || ($mysqlversion >= 6))) {
             my $sth = $dbh->prepare("SELECT plugin from mysql.user where User='root'");
             $sth->execute();
             while (my $priv = $sth->fetchrow_array) {
@@ -1697,14 +1719,30 @@ sub get_pathto_iptables {
 
 sub firewall_is_active {
     if (-e '/proc/net/ip_tables_names') {
+        my $status;
         if (open(PIPE,'cat /proc/net/ip_tables_names |grep filter |')) {
-            my $status = <PIPE>;
+            $status = <PIPE>;
             close(PIPE);
             chomp($status);
             if ($status eq 'filter') {
                 return 1;
             }
         }
+        unless ($status) {
+            if (open(PIPE,'nft list tables |')) {
+                while(<PIPE>) {
+                    chomp();
+                    if (/filter$/) {
+                        $status = 1;
+                        last;
+                    }
+                }
+                close(PIPE);
+                if ($status) {
+                    return 1;
+                }
+            }
+        }
     }
     return 0;
 }
@@ -1908,7 +1946,7 @@ my %prompts = &texthash(
     mysql      => 'Set-up the MySQL database?',
     mysqlperms => 'Set-up MySQL permissions?',
     apache     => 'Configure Apache web server?',
-    apachessl  => 'Configure SSL for Apache web server?', 
+    apachessl  => 'Configure SSL for Apache web server?',
     runlevels  => 'Set overrides for start-up order of services?',
     firewall   => 'Configure firewall settings for Apache',
     stopsrvcs  => 'Stop extra services not required on a LON-CAPA server?',
@@ -2271,7 +2309,7 @@ if ($callsub{'download'}) {
     print &mt('LON-CAPA is available for download from: [_1]',
               'http://install.loncapa.org/')."\n";
     if (!-e '/etc/loncapa-release') {
-        &print_and_log(&mt('LON-CAPA is not yet installed on your system.')."\n\n"; 
+        &print_and_log(&mt('LON-CAPA is not yet installed on your system.')."\n\n");
         unless ($filetouse) {
             &print_and_log(&mt('You may retrieve the source for LON-CAPA by executing:')."\n".
                            "wget http://install.loncapa.org/versions/$lctarball\n");
@@ -2330,6 +2368,10 @@ if ($have_tarball && !$updateshown) {
             $lc_uses_systemctl = 1;
         }
         $uses_sudo = 1;
+    } elsif ($distro =~ /^debian(\d+)$/) {
+        if ($1 >= 10) {
+            $lc_uses_systemctl = 1;
+        }
     } elsif ($distro =~ /^sles(\d+)$/) {
         if ($1 > 12) {
             $lc_uses_systemctl = 1;
@@ -2450,6 +2492,29 @@ sub build_and_install_mod_auth_external
 > #define SERVER_UIDS $num		/* user "www" */
 ENDPATCH
 
+    my $patch_code = <<"ENDPATCH";
+127a128
+> #include <string.h>
+214a216
+> #include <time.h>
+566c568
+< check_fails()
+---
+> int check_fails()
+589c591
+< log_failure()
+---
+> void log_failure()
+629c631
+< snooze(int seconds)
+---
+> void snooze(int seconds)
+653c655
+< main(int argc, char **argv)
+---
+> int main(int argc, char **argv)
+ENDPATCH
+
     if (! -e "/usr/bin/patch") {
 	print_and_log(&mt('You must install the software development tools package: [_1], when installing Linux.',"'patch'")."\n");
         print_and_log(&mt('Authentication installation not completed.')."\n");
@@ -2460,9 +2525,17 @@ ENDPATCH
         return;
     }
     my $dir = "/tmp/pwauth-2.2.8";
+    my $patchedok;
     if (open(PATCH,"| patch $dir/config.h")) {
         print PATCH $patch;
         close(PATCH);
+        if (open(PATCH,"| patch $dir/pwauth.c")) {
+            print PATCH $patch_code;
+            close(PATCH);
+            $patchedok = 1;
+        }
+    }
+    if ($patchedok) {
         print_and_log("\n");
         ##
         ## Compile patched pwauth
@@ -2533,7 +2606,8 @@ sub kill_extra_services {
 	            &print_and_log(&mt('Removing [_1] from startup.',$service)."\n");
                     if ($distro =~ /^(?:debian|ubuntu)(\d+)/) {
                         my $version = $1;
-                        if (($distro =~ /^ubuntu/) && ($version > 16)) {
+                        if ((($distro =~ /^ubuntu/) && ($version > 16)) ||
+                            (($distro =~ /^debian/) && ($version >= 10))) {
                             if (ref($uses_systemctl) eq 'HASH') {
                                 if ($uses_systemctl->{$service}) {
                                     if (`systemctl is-enabled $service`) {
@@ -2603,21 +2677,23 @@ CREATE TABLE IF NOT EXISTS metadata (tit
 
 sub setup_mysql_permissions {
     my ($dbh,$has_pass,$mysql_unix_socket,@mysql_lc_commands) = @_;
-    my ($mysqlversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
+    my ($mysqlversion,$mysqlminorversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
     my ($usescreate,$usesauth,$is_mariadb,$hasauthcol,@mysql_commands);
     if ($mysqlname =~ /^MariaDB/i) {
         $is_mariadb = 1;
-        if ($mysqlversion >= 10.4) {
+        if ((($mysqlversion == 10) && ($mysqlminorversion >= 4)) || ($mysqlversion >= 11)) {
             $usescreate = 1;
-        } elsif ($mysqlversion >= 10.2) {
+        } elsif (($mysqlversion == 10) && ($mysqlminorversion >= 2)) { 
             $usesauth = 1;
-        } elsif ($mysqlversion >= 5.5) {
+        } elsif (($mysqlversion == 5) && ($mysqlminorversion >= 5)) {
             $hasauthcol = 1;
         }
     } else {
-        if (($mysqlversion > 5.7) || (($mysqlversion == 5.7) && ($mysqlsubver > 5))) {
+        if (($mysqlversion > 5) || (($mysqlminorversion == 5) && ($mysqlminorversion > 7)) ||
+            (($mysqlversion == 5) && ($mysqlminorversion == 7) && ($mysqlsubver > 5))) {
             $usesauth = 1;
-        } elsif (($mysqlversion >= 5.6) || (($mysqlversion == 5.5) && ($mysqlsubver >= 7))) {
+        } elsif (($mysqlversion == 5) &&
+                 (($mysqlminorversion >= 6) || (($mysqlminorversion == 5) && ($mysqlsubver >= 7)))) {
             $hasauthcol = 1;
         }
     }
@@ -2731,17 +2807,17 @@ sub new_mysql_rootpasswd {
 }
 
 sub get_mysql_version {
-    my ($version,$subversion,$name);
+    my ($version,$minorversion,$subversion,$name);
     if (open(PIPE," mysql -V |")) {
         my $info = <PIPE>;
         chomp($info);
         close(PIPE);
-        ($version,$subversion,$name) = ($info =~ /(\d+\.\d+)\.(\d+)(?:\-?(\w*),|)/);
+        ($version,$minorversion,$subversion,$name) = ($info =~ /(\d+)\.(\d+)\.(\d+)(?:\-?(\w*),|)/);
     } else {
         print &mt('Could not determine which version of MySQL is installed.').
               "\n";
     }
-    return ($version,$subversion,$name);
+    return ($version,$minorversion,$subversion,$name);
 }
 
 ###########################################################
@@ -3322,11 +3398,13 @@ sub copy_apache2_debconf {
         $distname = $1;
         $version = $2;
     }
-    if (($distname eq 'ubuntu') && ($version > 12)) {
+    if ((($distname eq 'ubuntu') && ($version > 12)) ||
+        (($distname eq 'debian') && ($version >= 10))) {
         $defaultconfig = "$apache2_sites_enabled_dir/000-default.conf";
     }
     my ($skipconf,$skipsite,$skipstatus);
-    if (($distname eq 'ubuntu') && ($version > 12)) {
+    if ((($distname eq 'ubuntu') && ($version > 12)) ||
+        (($distname eq 'debian') && ($version >= 10))) {
         my $apache2_conf_enabled_dir = '/etc/apache2/conf-enabled';
         my $apache2_conf_available_dir = '/etc/apache2/conf-available';
         my $defaultconf = $apache2_conf_enabled_dir.'/loncapa.conf';
@@ -3479,7 +3557,7 @@ sub copy_apache2_debconf {
             }
         }
     }
-    if ($distname eq 'ubuntu') {
+    if (($distname eq 'ubuntu') || ($distname eq 'debian')) {
         my $sitestatus = "$apache2_mods_available_dir/status.conf";
         my $stdstatus = "$instdir/debian-ubuntu/status.conf";
         if ((-e $sitestatus) && (-e $stdstatus)) {