[LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml langcheck.piml loncapafiles.lpml modify_config_files.piml ntpcheck.piml picins_check.piml rpmcheck.piml wrap_setuid.piml
raeburn
raeburn at source.lon-capa.org
Mon Nov 2 15:05:35 EST 2020
raeburn Mon Nov 2 20:05:35 2020 EDT
Modified files:
/doc/loncapafiles chkconfig.piml langcheck.piml loncapafiles.lpml
modify_config_files.piml ntpcheck.piml
picins_check.piml rpmcheck.piml wrap_setuid.piml
Log:
- Support Fedora 33
-------------- next part --------------
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.50 doc/loncapafiles/chkconfig.piml:1.51
--- doc/loncapafiles/chkconfig.piml:1.50 Fri May 29 18:13:20 2020
+++ doc/loncapafiles/chkconfig.piml Mon Nov 2 20:05:35 2020
@@ -3,7 +3,7 @@
<!-- checkconfig.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.50 2020/05/29 18:13:20 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.51 2020/11/02 20:05:35 raeburn Exp $ -->
<!--
@@ -61,9 +61,9 @@
} elsif (('<DIST />' eq 'fedora26') || ('<DIST />' eq 'fedora27') ||
('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29') ||
('<DIST />' eq 'fedora30') || ('<DIST />' eq 'fedora31') ||
- ('<DIST />' eq 'fedora32') || ('<DIST />' eq 'centos8') ||
- ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'oracle7') ||
- ('<DIST />' eq 'oracle8')) {
+ ('<DIST />' eq 'fedora32') || ('<DIST />' eq 'fedora33') ||
+ ('<DIST />' eq 'centos8') || ('<DIST />' eq 'rhes8') ||
+ ('<DIST />' eq 'oracle7') || ('<DIST />' eq 'oracle8')) {
$use_systemctl = 1;
$systemctl_only = 1;
}
Index: doc/loncapafiles/langcheck.piml
diff -u doc/loncapafiles/langcheck.piml:1.23 doc/loncapafiles/langcheck.piml:1.24
--- doc/loncapafiles/langcheck.piml:1.23 Fri May 29 18:13:20 2020
+++ doc/loncapafiles/langcheck.piml Mon Nov 2 20:05:35 2020
@@ -67,9 +67,9 @@
'<DIST />' eq 'fedora24' || '<DIST />' eq 'fedora25' || '<DIST />' eq 'fedora26' ||
'<DIST />' eq 'fedora27' || '<DIST />' eq 'fedora28' || '<DIST />' eq 'fedora29' ||
'<DIST />' eq 'fedora30' || '<DIST />' eq 'fedora31' || '<DIST />' eq 'fedora32' ||
- '<DIST />' eq 'rhes7' || '<DIST />' eq 'centos7' || '<DIST />' eq 'scientific7' ||
- '<DIST />' eq 'rhes8' || '<DIST />' eq 'centos8' || '<DIST />' eq 'oracle7' ||
- '<DIST />' eq 'oracle8') {
+ '<DIST />' eq 'fedora33' || '<DIST />' eq 'rhes7' || '<DIST />' eq 'scientific7' ||
+ '<DIST />' eq 'centos7' || '<DIST />' eq 'rhes8' || '<DIST />' eq 'centos8' ||
+ '<DIST />' eq 'oracle7' || '<DIST />' eq 'oracle8') {
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.1005 doc/loncapafiles/loncapafiles.lpml:1.1006
--- doc/loncapafiles/loncapafiles.lpml:1.1005 Mon Nov 2 19:58:08 2020
+++ doc/loncapafiles/loncapafiles.lpml Mon Nov 2 20:05:35 2020
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.1005 2020/11/02 19:58:08 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.1006 2020/11/02 20:05:35 raeburn Exp $ -->
<!--
@@ -8720,7 +8720,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 fedora31 fedora32 sles15 ubuntu18 ubuntu20 rhes8 centos8 oracle7 oracle8'>home/httpd/perl/loncontrol</target>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 fedora33 sles15 ubuntu18 ubuntu20 rhes8 centos8 oracle7 oracle8'>home/httpd/perl/loncontrol</target>
<categoryname>root script</categoryname>
<description>
Controls the launching/halting of lonc, lond, and lonsql processes.
@@ -8729,7 +8729,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 fedora31 fedora32 sles15 ubuntu18 ubuntu20 rhes8 centos8 oracle7 oracle8'>etc/systemd/system/loncontrol.service</target>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 fedora33 sles15 ubuntu18 ubuntu20 rhes8 centos8 oracle7 oracle8'>etc/systemd/system/loncontrol.service</target>
<categoryname>static conf</categoryname>
<description>
Controls the launching/halting of lon-capa daemons by loncontrol in systemd
@@ -8783,13 +8783,13 @@
loncom/init.d/loncontrol
</dependencies>
</file>
-<file dist="fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 sles15 ubuntu18 ubuntu20 rhes8 centos8 oracle7 oracle8">
+<file dist="fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 fedora33 sles15 ubuntu18 ubuntu20 rhes8 centos8 oracle7 oracle8">
<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 fedora31 fedora32 sles15 rhes8 centos8 oracle7 oracle8">
+ <installscript dist="fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 fedora33 sles15 rhes8 centos8 oracle7 oracle8">
-c '/usr/bin/systemctl enable loncontrol.service'
</installscript>
<installscript dist="ubuntu18 ubuntu20">
Index: doc/loncapafiles/modify_config_files.piml
diff -u doc/loncapafiles/modify_config_files.piml:1.44 doc/loncapafiles/modify_config_files.piml:1.45
--- doc/loncapafiles/modify_config_files.piml:1.44 Fri May 29 19:14:39 2020
+++ doc/loncapafiles/modify_config_files.piml Mon Nov 2 20:05:35 2020
@@ -3,7 +3,7 @@
<!-- modify_config_files.piml -->
<!-- Matthew Hall -->
-<!-- $Id: modify_config_files.piml,v 1.44 2020/05/29 19:14:39 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.45 2020/11/02 20:05:35 raeburn Exp $ -->
<!--
@@ -59,8 +59,9 @@
('<DIST />' eq 'fedora27') || ('<DIST />' eq 'fedora28') ||
('<DIST />' eq 'fedora29') || ('<DIST />' eq 'fedora30') ||
('<DIST />' eq 'fedora31') || ('<DIST />' eq 'fedora32') ||
- ('<DIST />' eq 'centos8') || ('<DIST />' eq 'rhes8') ||
- ('<DIST />' eq 'oracle7') || ('<DIST />' eq 'oracle8')) {
+ ('<DIST />' eq 'fedora33') || ('<DIST />' eq 'centos8') ||
+ ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'oracle7') ||
+ ('<DIST />' eq 'oracle8')) {
$mysqlcmd = '/bin/systemctl restart mariadb.service';
} elsif (('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'ubuntu20')) {
$configfiles = 'Apt and MySQL';
Index: doc/loncapafiles/ntpcheck.piml
diff -u doc/loncapafiles/ntpcheck.piml:1.46 doc/loncapafiles/ntpcheck.piml:1.47
--- doc/loncapafiles/ntpcheck.piml:1.46 Fri May 29 18:13:20 2020
+++ doc/loncapafiles/ntpcheck.piml Mon Nov 2 20:05:35 2020
@@ -3,7 +3,7 @@
<!-- ntpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: ntpcheck.piml,v 1.46 2020/05/29 18:13:20 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.47 2020/11/02 20:05:35 raeburn Exp $ -->
<!--
@@ -39,10 +39,11 @@
if (('<DIST />' eq 'fedora26') || ('<DIST />' eq 'fedora27') ||
('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29') ||
('<DIST />' eq 'fedora30') || ('<DIST />' eq 'fedora31') ||
- ('<DIST />' eq 'fedora32') || ('<DIST />' eq 'sles15') ||
- ('<DIST />' eq 'centos8') || ('<DIST />' eq 'rhes8') ||
- ('<DIST />' eq 'oracle7') || ('<DIST />' eq 'oracle8') ||
- ('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'ubuntu20')) {
+ ('<DIST />' eq 'fedora32') || ('<DIST />' eq 'fedora33') ||
+ ('<DIST />' eq 'sles15') || ('<DIST />' eq 'centos8') ||
+ ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'oracle7') ||
+ ('<DIST />' eq 'oracle8') || ('<DIST />' eq 'ubuntu18') ||
+ ('<DIST />' eq 'ubuntu20')) {
print "For more information on chronyd please see https://chrony.tuxfamily.org/\n";
} else {
print "For more information on ntpd please see http://www.ntp.org/\n";
@@ -61,12 +62,12 @@
('<DIST />' eq 'fedora27') || ('<DIST />' eq 'fedora28') ||
('<DIST />' eq 'fedora29') || ('<DIST />' eq 'fedora30') ||
('<DIST />' eq 'fedora31') || ('<DIST />' eq 'fedora32') ||
- ('<DIST />' eq 'centos7') || ('<DIST />' eq 'rhes7') ||
- ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'oracle7') ||
- ('<DIST />' eq 'sles12') || ('<DIST />' eq 'sles15') ||
- ('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'ubuntu20') ||
- ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'centos8') ||
- ('<DIST />' eq 'oracle8')) {
+ ('<DIST />' eq 'fedora33') || ('<DIST />' eq 'centos7') ||
+ ('<DIST />' eq 'rhes7') || ('<DIST />' eq 'oracle7') ||
+ ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'sles12') ||
+ ('<DIST />' eq 'sles15') || ('<DIST />' eq 'ubuntu18') ||
+ ('<DIST />' eq 'ubuntu20') || ('<DIST />' eq 'rhes8') ||
+ ('<DIST />' eq 'centos8') || ('<DIST />' eq 'oracle8')) {
$NTPD = 'ntpd';
my $binname = $NTPD;
if (('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'ubuntu20')) {
@@ -76,9 +77,10 @@
} elsif (('<DIST />' eq 'fedora26') || ('<DIST />' eq 'fedora27') ||
('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29') ||
('<DIST />' eq 'fedora30') || ('<DIST />' eq 'fedora31') ||
- ('<DIST />' eq 'fedora32') || ('<DIST />' eq 'sles15') ||
- ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'centos8') ||
- ('<DIST />' eq 'oracle7') || ('<DIST />' eq 'oracle8')) {
+ ('<DIST />' eq 'fedora32') || ('<DIST />' eq 'fedora33') ||
+ ('<DIST />' eq 'sles15') || ('<DIST />' eq 'rhes8') ||
+ ('<DIST />' eq 'centos8') || ('<DIST />' eq 'oracle7') ||
+ ('<DIST />' eq 'oracle8')) {
$NTPD = 'chronyd';
$name = $NTPD;
$binname = $NTPD;
@@ -130,12 +132,12 @@
('<DIST />' eq 'fedora27') || ('<DIST />' eq 'fedora28') ||
('<DIST />' eq 'fedora29') || ('<DIST />' eq 'fedora30') ||
('<DIST />' eq 'fedora31') || ('<DIST />' eq 'fedora32') ||
+ ('<DIST />' eq 'fedora33') || ('<DIST />' eq 'oracle7') ||
('<DIST />' eq 'centos7') || ('<DIST />' eq 'rhes7') ||
- ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'oracle7') ||
- ('<DIST />' eq 'sles12') || ('<DIST />' eq 'sles15') ||
- ('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'ubuntu20') ||
- ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'centos8') ||
- ('<DIST />' eq 'oracle8')) {
+ ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'sles12') ||
+ ('<DIST />' eq 'sles15') || ('<DIST />' eq 'ubuntu18') ||
+ ('<DIST />' eq 'ubuntu20') || ('<DIST />' eq 'rhes8') ||
+ ('<DIST />' eq 'centos8') || ('<DIST />' eq 'oracle8')) {
if (!-l "/etc/systemd/system/multi-user.target.wants/$NTPD.service") {
print "**** WARNING: $NTPD is not configured to run at boot. To correct this run:\nsystemctl enable $NTPD.service\n";
}
Index: doc/loncapafiles/picins_check.piml
diff -u doc/loncapafiles/picins_check.piml:1.45 doc/loncapafiles/picins_check.piml:1.46
--- doc/loncapafiles/picins_check.piml:1.45 Fri May 29 18:13:20 2020
+++ doc/loncapafiles/picins_check.piml Mon Nov 2 20:05:35 2020
@@ -3,7 +3,7 @@
<!-- picins_check.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: picins_check.piml,v 1.45 2020/05/29 18:13:20 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.46 2020/11/02 20:05:35 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 fedora31 fedora32 rhes6 scientific6 centos6 oracle6 rhes7 scientific7 centos7 oracle7 rhes8 centos8 oracle8 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 ubuntu20">
+<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 fedora31 fedora32 fedora33 rhes6 scientific6 centos6 oracle6 rhes7 scientific7 centos7 oracle7 rhes8 centos8 oracle8 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 ubuntu20">
my $picinspath = '/usr/share/texmf/tex/latex/picins';
my $file = 'picins.sty';
if (!-e "$picinspath/$file") {
Index: doc/loncapafiles/rpmcheck.piml
diff -u doc/loncapafiles/rpmcheck.piml:1.50 doc/loncapafiles/rpmcheck.piml:1.51
--- doc/loncapafiles/rpmcheck.piml:1.50 Fri May 29 18:13:20 2020
+++ doc/loncapafiles/rpmcheck.piml Mon Nov 2 20:05:35 2020
@@ -3,7 +3,7 @@
<!-- phpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: rpmcheck.piml,v 1.50 2020/05/29 18:13:20 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.51 2020/11/02 20:05:35 raeburn Exp $ -->
<!--
@@ -81,7 +81,7 @@
}
}
</perlscript>
-<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 rhes5 rhes6 rhes7 rhes8 centos5 scientific5 scientific6 centos6 oracle6 scientific7 centos7 oracle7 centos8 oracle8 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 sles12 sles15 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2" mode="fg">
+<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 fedora33 rhes5 rhes6 rhes7 rhes8 centos5 scientific5 scientific6 centos6 oracle6 scientific7 centos7 oracle7 centos8 oracle8 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 sles12 sles15 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2" mode="fg">
my $hasprereqs = 0;
if (open(PIPE,"rpm -q LONCAPA-prerequisites|")) {
my @lines = (<PIPE>);
Index: doc/loncapafiles/wrap_setuid.piml
diff -u doc/loncapafiles/wrap_setuid.piml:1.45 doc/loncapafiles/wrap_setuid.piml:1.46
--- doc/loncapafiles/wrap_setuid.piml:1.45 Fri May 29 18:13:20 2020
+++ doc/loncapafiles/wrap_setuid.piml Mon Nov 2 20:05:35 2020
@@ -3,7 +3,7 @@
<!-- wrap_setuid.piml -->
<!-- Guy Albertelli -->
-<!-- $Id: wrap_setuid.piml,v 1.45 2020/05/29 18:13:20 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.46 2020/11/02 20:05:35 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 fedora31 fedora32 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 rhes7 centos7 scientific7 oracle7 rhes8 centos8 oracle8">
+<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 fedora31 fedora32 fedora33 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 rhes7 centos7 scientific7 oracle7 rhes8 centos8 oracle8">
$fslist='<TARGET />';
open(FIND, "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) -print|");
More information about the LON-CAPA-cvs
mailing list