[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 Oct 28 12:24:23 EDT 2019
raeburn Mon Oct 28 16:24:23 2019 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 31
-------------- next part --------------
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.46 doc/loncapafiles/chkconfig.piml:1.47
--- doc/loncapafiles/chkconfig.piml:1.46 Fri Sep 20 15:01:54 2019
+++ doc/loncapafiles/chkconfig.piml Mon Oct 28 16:24:23 2019
@@ -3,7 +3,7 @@
<!-- checkconfig.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.46 2019/09/20 15:01:54 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.47 2019/10/28 16:24:23 raeburn Exp $ -->
<!--
@@ -60,9 +60,9 @@
$systemctl_only = 1;
} elsif (('<DIST />' eq 'fedora26') || ('<DIST />' eq 'fedora27') ||
('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29') ||
- ('<DIST />' eq 'fedora30') || ('<DIST />' eq 'centos8') ||
- ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'oracle7') ||
- ('<DIST />' eq 'oracle8')) {
+ ('<DIST />' eq 'fedora30') || ('<DIST />' eq 'fedora31') ||
+ ('<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.19 doc/loncapafiles/langcheck.piml:1.20
--- doc/loncapafiles/langcheck.piml:1.19 Tue Jul 2 19:40:13 2019
+++ doc/loncapafiles/langcheck.piml Mon Oct 28 16:24:23 2019
@@ -65,9 +65,9 @@
'<DIST />' eq 'fedora21' || '<DIST />' eq 'fedora22' || '<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 'rhes7' || '<DIST />' eq 'centos7' ||
- '<DIST />' eq 'scientific7' || '<DIST />' eq 'rhes8' || '<DIST />' eq 'centos8' ||
- '<DIST />' eq 'oracle7') {
+ '<DIST />' eq 'fedora30' || '<DIST />' eq 'fedora31' || '<DIST />' eq 'rhes7' ||
+ '<DIST />' eq 'centos7' || '<DIST />' eq 'scientific7' || '<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.993 doc/loncapafiles/loncapafiles.lpml:1.994
--- doc/loncapafiles/loncapafiles.lpml:1.993 Fri Sep 20 15:01:54 2019
+++ doc/loncapafiles/loncapafiles.lpml Mon Oct 28 16:24:23 2019
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.993 2019/09/20 15:01:54 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.994 2019/10/28 16:24:23 raeburn Exp $ -->
<!--
@@ -8715,7 +8715,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 rhes8 centos8 oracle7 oracle8'>home/httpd/perl/loncontrol</target>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 sles15 ubuntu18 rhes8 centos8 oracle7 oracle8'>home/httpd/perl/loncontrol</target>
<categoryname>root script</categoryname>
<description>
Controls the launching/halting of lonc, lond, and lonsql processes.
@@ -8724,7 +8724,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 rhes8 centos8 oracle7 oracle8'>etc/systemd/system/loncontrol.service</target>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 sles15 ubuntu18 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
@@ -8733,7 +8733,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 rhes8 centos8 oracle7 oracle8'>home/httpd/perl/loncontrol</linkto>
+<linkto dist='fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 sles15 ubuntu18 rhes8 centos8 oracle7 oracle8'>home/httpd/perl/loncontrol</linkto>
<target dist='default'>
etc/rc.d/rc0.d/K05loncontrol;
etc/rc.d/rc1.d/K05loncontrol;
@@ -8760,7 +8760,7 @@
etc/rc5.d/S95loncontrol;
etc/rc6.d/K05loncontrol
</target>
-<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8 oracle7 oracle8'>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 sles15 ubuntu18 rhes8 centos8 oracle7 oracle8'>
etc/rc.d/init.d/loncontrol
</target>
<categoryname>symbolic link</categoryname>
@@ -8782,13 +8782,13 @@
loncom/init.d/loncontrol
</dependencies>
</file>
-<file dist="fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8 oracle7 oracle8">
+<file dist="fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 sles15 ubuntu18 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 sles15 rhes8 centos8 oracle7 oracle8">
+ <installscript dist="fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 sles15 rhes8 centos8 oracle7 oracle8">
-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.41 doc/loncapafiles/modify_config_files.piml:1.42
--- doc/loncapafiles/modify_config_files.piml:1.41 Fri Sep 20 15:01:54 2019
+++ doc/loncapafiles/modify_config_files.piml Mon Oct 28 16:24:23 2019
@@ -3,7 +3,7 @@
<!-- modify_config_files.piml -->
<!-- Matthew Hall -->
-<!-- $Id: modify_config_files.piml,v 1.41 2019/09/20 15:01:54 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.42 2019/10/28 16:24:23 raeburn Exp $ -->
<!--
@@ -58,8 +58,9 @@
('<DIST />' eq 'fedora25') || ('<DIST />' eq 'fedora26') ||
('<DIST />' eq 'fedora27') || ('<DIST />' eq 'fedora28') ||
('<DIST />' eq 'fedora29') || ('<DIST />' eq 'fedora30') ||
- ('<DIST />' eq 'centos8') || ('<DIST />' eq 'rhes8') ||
- ('<DIST />' eq 'oracle7') || ('<DIST />' eq 'oracle8')) {
+ ('<DIST />' eq 'fedora31') || ('<DIST />' eq 'centos8') ||
+ ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'oracle7') ||
+ ('<DIST />' eq 'oracle8')) {
$mysqlcmd = '/bin/systemctl restart mariadb.service';
} elsif ('<DIST />' eq 'ubuntu18') {
$configfiles = 'Apt and MySQL';
Index: doc/loncapafiles/ntpcheck.piml
diff -u doc/loncapafiles/ntpcheck.piml:1.38 doc/loncapafiles/ntpcheck.piml:1.39
--- doc/loncapafiles/ntpcheck.piml:1.38 Fri Sep 20 15:01:54 2019
+++ doc/loncapafiles/ntpcheck.piml Mon Oct 28 16:24:23 2019
@@ -3,7 +3,7 @@
<!-- ntpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: ntpcheck.piml,v 1.38 2019/09/20 15:01:54 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.39 2019/10/28 16:24:23 raeburn Exp $ -->
<!--
@@ -56,17 +56,18 @@
('<DIST />' eq 'fedora25') || ('<DIST />' eq 'fedora26') ||
('<DIST />' eq 'fedora27') || ('<DIST />' eq 'fedora28') ||
('<DIST />' eq 'fedora29') || ('<DIST />' eq 'fedora30') ||
- ('<DIST />' eq 'centos7') || ('<DIST />' eq 'rhes7') ||
+ ('<DIST />' eq 'fedora31') || ('<DIST />' eq 'centos7') ||
+ ('<DIST />' eq 'rhes7') || ('<DIST />' eq 'oracle7') ||
('<DIST />' eq 'scientific7') || ('<DIST />' eq 'sles12') ||
('<DIST />' eq 'sles15') || ('<DIST />' eq 'ubuntu18') ||
('<DIST />' eq 'rhes8') || ('<DIST />' eq 'centos8') ||
- ('<DIST />' eq 'oracle7') || ('<DIST />' eq 'oracle8')) {
+ ('<DIST />' eq 'oracle8')) {
$NTPD = 'ntpd';
if ('<DIST />' eq 'ubuntu18') {
$NTPD = 'ntp';
- } elsif (('<DIST />' eq 'sles15') || ('<DIST />' eq 'rhes8') ||
+ } elsif (('<DIST />' eq 'sles15') || ('<DIST />' eq 'rhes8') ||
('<DIST />' eq 'centos8') || ('<DIST />' eq 'oracle7') ||
- ('<DIST />' eq 'oracle8')) {
+ ('<DIST />' eq 'oracle8') || ('<DIST />' eq 'fedora31')) {
$NTPD = 'chronyd';
$name = $NTPD;
}
@@ -116,11 +117,12 @@
('<DIST />' eq 'fedora25') || ('<DIST />' eq 'fedora26') ||
('<DIST />' eq 'fedora27') || ('<DIST />' eq 'fedora28') ||
('<DIST />' eq 'fedora29') || ('<DIST />' eq 'fedora30') ||
- ('<DIST />' eq 'centos7') || ('<DIST />' eq 'rhes7') ||
+ ('<DIST />' eq 'fedora31') || ('<DIST />' eq 'centos7') ||
+ ('<DIST />' eq 'rhes7') || ('<DIST />' eq 'oracle7') ||
('<DIST />' eq 'scientific7') || ('<DIST />' eq 'sles12') ||
('<DIST />' eq 'sles15') || ('<DIST />' eq 'ubuntu18') ||
('<DIST />' eq 'rhes8') || ('<DIST />' eq 'centos8') ||
- ('<DIST />' eq 'oracle7') || ('<DIST />' eq 'oracle8')) {
+ ('<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.42 doc/loncapafiles/picins_check.piml:1.43
--- doc/loncapafiles/picins_check.piml:1.42 Fri Sep 20 15:01:54 2019
+++ doc/loncapafiles/picins_check.piml Mon Oct 28 16:24:23 2019
@@ -3,7 +3,7 @@
<!-- picins_check.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: picins_check.piml,v 1.42 2019/09/20 15:01:54 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.43 2019/10/28 16:24:23 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 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">
+<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 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">
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.47 doc/loncapafiles/rpmcheck.piml:1.48
--- doc/loncapafiles/rpmcheck.piml:1.47 Fri Sep 20 15:01:54 2019
+++ doc/loncapafiles/rpmcheck.piml Mon Oct 28 16:24:23 2019
@@ -3,7 +3,7 @@
<!-- phpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: rpmcheck.piml,v 1.47 2019/09/20 15:01:54 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.48 2019/10/28 16:24:23 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 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 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.42 doc/loncapafiles/wrap_setuid.piml:1.43
--- doc/loncapafiles/wrap_setuid.piml:1.42 Fri Sep 20 15:01:54 2019
+++ doc/loncapafiles/wrap_setuid.piml Mon Oct 28 16:24:23 2019
@@ -3,7 +3,7 @@
<!-- wrap_setuid.piml -->
<!-- Guy Albertelli -->
-<!-- $Id: wrap_setuid.piml,v 1.42 2019/09/20 15:01:54 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.43 2019/10/28 16:24:23 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 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 ubuntu12 ubuntu14 ubuntu16 ubuntu18 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