[LON-CAPA-cvs] cvs: loncom /build distprobe doc/loncapafiles chkconfig.piml langcheck.piml loncapafiles.lpml modify_config_files.piml picins_check.piml wrap_setuid.piml

raeburn raeburn at source.lon-capa.org
Sun May 26 21:26:32 EDT 2019 

raeburn		Mon May 27 01:26:32 2019 EDT

  Modified files:              
    /doc/loncapafiles	chkconfig.piml langcheck.piml loncapafiles.lpml 
                     	modify_config_files.piml picins_check.piml 
                     	wrap_setuid.piml 
    /loncom/build	distprobe 
  Log:
  - Support RHEL 8 (and CentOS 8, once released).
  
  
-------------- next part --------------
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.43 doc/loncapafiles/chkconfig.piml:1.44
--- doc/loncapafiles/chkconfig.piml:1.43	Tue Apr  9 15:54:12 2019
+++ doc/loncapafiles/chkconfig.piml	Mon May 27 01:26:26 2019
@@ -3,7 +3,7 @@
 <!-- checkconfig.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: chkconfig.piml,v 1.43 2019/04/09 15:54:12 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.44 2019/05/27 01:26:26 raeburn Exp $ -->
 
 <!--
 
@@ -60,7 +60,8 @@
     $systemctl_only = 1;
 } elsif (('<DIST />' eq 'fedora26') || ('<DIST />' eq 'fedora27') ||
          ('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29') ||
-         ('<DIST />' eq 'fedora30')) {
+         ('<DIST />' eq 'fedora30') || ('<DIST />' eq 'centos8')  ||
+         ('<DIST />' eq 'rhes8')) {
     $use_systemctl = 1;
     $systemctl_only = 1;
 }
Index: doc/loncapafiles/langcheck.piml
diff -u doc/loncapafiles/langcheck.piml:1.17 doc/loncapafiles/langcheck.piml:1.18
--- doc/loncapafiles/langcheck.piml:1.17	Tue Apr  9 15:54:12 2019
+++ doc/loncapafiles/langcheck.piml	Mon May 27 01:26:26 2019
@@ -66,7 +66,7 @@
          '<DIST />' eq 'fedora24' || '<DIST />' eq 'fedora25' || '<DIST />' eq 'fedora26' ||
          '<DIST />' eq 'fedora27' || '<DIST />' eq 'fedora28' || '<DIST />' eq 'fedora29' ||
          '<DIST />' eq 'fedora30' || '<DIST />' eq 'rhes7'    || '<DIST />' eq 'centos7'  || 
-         '<DIST />' eq 'scientific7') {
+         '<DIST />' eq 'scientific7' || '<DIST />' eq 'rhes8' || '<DIST />' eq 'centos8') {
     if (open(PIPE,"cat /etc/locale.conf |grep '^LANG' |")) {
         print "Checking OS language";
         if (<PIPE> =~ /^LANG="en/) {
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.987 doc/loncapafiles/loncapafiles.lpml:1.988
--- doc/loncapafiles/loncapafiles.lpml:1.987	Mon May 27 01:17:10 2019
+++ doc/loncapafiles/loncapafiles.lpml	Mon May 27 01:26:26 2019
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.987 2019/05/27 01:17:10 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.988 2019/05/27 01:26:26 raeburn Exp $ -->
 
 <!--
 
@@ -8699,7 +8699,7 @@
 <source>loncom/init.d/loncontrol</source>
 <target dist='default'>etc/rc.d/init.d/loncontrol</target>
 <target dist='suse9.2 suse9.3 sles9 sles10 sles11 sles12 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16'>etc/init.d/loncontrol</target>
-<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18'>home/httpd/perl/loncontrol</target>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8'>home/httpd/perl/loncontrol</target>
 <categoryname>root script</categoryname>
 <description>
 Controls the launching/halting of lonc, lond, and lonsql processes.
@@ -8708,7 +8708,7 @@
 <file>
 <source>loncom/init.d/loncontrol.service</source>
 <target dist='default'>home/httpd/perl/systemd/loncontrol.service</target>
-<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18'>etc/systemd/system/loncontrol.service</target>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8'>etc/systemd/system/loncontrol.service</target>
 <categoryname>static conf</categoryname>
 <description>
 Controls the launching/halting of lon-capa daemons by loncontrol in systemd
@@ -8717,7 +8717,7 @@
 <link>
 <linkto dist='default'>etc/rc.d/init.d/loncontrol</linkto>
 <linkto dist='suse9.2 suse9.3 sles9 sles10 sles11 sles12 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16'>etc/init.d/loncontrol</linkto>
-<linkto dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18'>home/httpd/perl/loncontrol</linkto>
+<linkto dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8'>home/httpd/perl/loncontrol</linkto>
 <target dist='default'>
 etc/rc.d/rc0.d/K05loncontrol;
 etc/rc.d/rc1.d/K05loncontrol;
@@ -8744,7 +8744,7 @@
 etc/rc5.d/S95loncontrol;
 etc/rc6.d/K05loncontrol
 </target>
-<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18'>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8'>
 etc/rc.d/init.d/loncontrol
 </target>
 <categoryname>symbolic link</categoryname>
@@ -8766,13 +8766,13 @@
 loncom/init.d/loncontrol
   </dependencies>
 </file>
-<file dist="fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18">
+<file dist="fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8">
 <source>loncom/init.d/loncontrol.service</source>
 <target>etc/systemd/system/loncontrol.service</target>
 <description>
 Controls the launching/halting of lon-capa daemons by loncontrol in systemd
 </description>
-  <installscript dist="fedora26 fedora27 fedora28 fedora29 fedora30 sles15">
+  <installscript dist="fedora26 fedora27 fedora28 fedora29 fedora30 sles15 rhes8 centos8">
 -c '/usr/bin/systemctl enable loncontrol.service'
   </installscript>
   <installscript dist="ubuntu18">
Index: doc/loncapafiles/modify_config_files.piml
diff -u doc/loncapafiles/modify_config_files.piml:1.38 doc/loncapafiles/modify_config_files.piml:1.39
--- doc/loncapafiles/modify_config_files.piml:1.38	Tue Apr  9 15:54:12 2019
+++ doc/loncapafiles/modify_config_files.piml	Mon May 27 01:26:26 2019
@@ -3,7 +3,7 @@
 <!-- modify_config_files.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: modify_config_files.piml,v 1.38 2019/04/09 15:54:12 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.39 2019/05/27 01:26:26 raeburn Exp $ -->
 
 <!--
 
@@ -57,7 +57,8 @@
          ('<DIST />' eq 'fedora23')    || ('<DIST />' eq 'fedora24') ||
          ('<DIST />' eq 'fedora25')    || ('<DIST />' eq 'fedora26') ||
          ('<DIST />' eq 'fedora27')    || ('<DIST />' eq 'fedora28') ||
-         ('<DIST />' eq 'fedora29')    || ('<DIST />' eq 'fedora30')) {
+         ('<DIST />' eq 'fedora29')    || ('<DIST />' eq 'fedora30') ||
+         ('<DIST />' eq 'centos8')     || ('<DIST />' eq 'rhes8')) {
     $mysqlcmd = '/bin/systemctl restart mariadb.service';
 } elsif ('<DIST />' eq 'ubuntu18') {
     $configfiles = 'Apt and MySQL';
Index: doc/loncapafiles/picins_check.piml
diff -u doc/loncapafiles/picins_check.piml:1.38 doc/loncapafiles/picins_check.piml:1.39
--- doc/loncapafiles/picins_check.piml:1.38	Tue Apr  9 15:54:12 2019
+++ doc/loncapafiles/picins_check.piml	Mon May 27 01:26:26 2019
@@ -3,7 +3,7 @@
 <!-- picins_check.piml -->
 <!-- Stuart Raeburn -->
 
-<!-- $Id: picins_check.piml,v 1.38 2019/04/09 15:54:12 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.39 2019/05/27 01:26:26 raeburn Exp $ -->
 
 <!--
 
@@ -32,7 +32,7 @@
 <piml>
 <files>
 <file>
-<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora 23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 rhes6 scientific6 centos6 rhes7 scientific7 centos7 sles11 sles12 sles15 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18">
+<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora 23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 rhes6 scientific6 centos6 rhes7 scientific7 centos7 rhes8 centos8 sles11 sles12 sles15 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18">
     my $picinspath = '/usr/share/texmf/tex/latex/picins'; 
     my $file = 'picins.sty';
     if (!-e "$picinspath/$file") {
Index: doc/loncapafiles/wrap_setuid.piml
diff -u doc/loncapafiles/wrap_setuid.piml:1.39 doc/loncapafiles/wrap_setuid.piml:1.40
--- doc/loncapafiles/wrap_setuid.piml:1.39	Tue Apr  9 15:54:12 2019
+++ doc/loncapafiles/wrap_setuid.piml	Mon May 27 01:26:26 2019
@@ -3,7 +3,7 @@
 <!-- wrap_setuid.piml -->
 <!-- Guy Albertelli -->
 
-<!-- $Id: wrap_setuid.piml,v 1.39 2019/04/09 15:54:12 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.40 2019/05/27 01:26:26 raeburn Exp $ -->
 
 <!--
 
@@ -37,7 +37,7 @@
 <perlscript mode="fg" dist="default">
 #print("Not wrapping setuid scripts\n");
 </perlscript>
-<perlscript mode="fg" dist="suse9.2 suse9.3 sles9 sles10 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 ubuntu12 ubuntu14 ubuntu16 ubuntu18 rhes7 centos7 scientific7">
+<perlscript mode="fg" dist="suse9.2 suse9.3 sles9 sles10 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 ubuntu12 ubuntu14 ubuntu16 ubuntu18 rhes7 centos7 scientific7 rhes8 centos8">
 
 $fslist='<TARGET />';
 open(FIND,  "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) -print|");
Index: loncom/build/distprobe
diff -u loncom/build/distprobe:1.21 loncom/build/distprobe:1.22
--- loncom/build/distprobe:1.21	Wed Oct 17 14:33:49 2018
+++ loncom/build/distprobe	Mon May 27 01:26:31 2019
@@ -2,7 +2,7 @@
 #
 # The LearningOnline Network with CAPA
 #
-# $Id: distprobe,v 1.21 2018/10/17 14:33:49 raeburn Exp $
+# $Id: distprobe,v 1.22 2019/05/27 01:26:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,6 +54,8 @@
         $dist = 'rhes'.$1;
     } elsif ($versionstring =~ /Red Hat Enterprise Linux Server release (\d+)/) {
         $dist = 'rhes'.$1;
+    } elsif ($versionstring =~ /Red Hat Enterprise Linux release (\d+)/) {
+        $dist = 'rhes'.$1;
     } elsif ($versionstring =~ /CentOS(?:| Linux) release (\d+)/) {
         $dist = 'centos'.$1;
     } elsif ($versionstring =~ /Scientific Linux (?:SL )?release ([\d.]+) /) {

More information about the LON-CAPA-cvs mailing list