[LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml loncapafiles.lpml modify_config_files.piml ntpcheck.piml picins_check.piml rpmcheck.piml wrap_setuid.piml
raeburn
raeburn at source.lon-capa.org
Fri Dec 17 12:48:13 EST 2021
raeburn Fri Dec 17 17:48:13 2021 EDT
Modified files:
/doc/loncapafiles chkconfig.piml loncapafiles.lpml
modify_config_files.piml ntpcheck.piml
picins_check.piml rpmcheck.piml wrap_setuid.piml
Log:
- Support Fedora 35
-------------- next part --------------
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.52 doc/loncapafiles/chkconfig.piml:1.53
--- doc/loncapafiles/chkconfig.piml:1.52 Wed Jul 28 14:44:30 2021
+++ doc/loncapafiles/chkconfig.piml Fri Dec 17 17:48:13 2021
@@ -3,7 +3,7 @@
<!-- checkconfig.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.52 2021/07/28 14:44:30 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.53 2021/12/17 17:48:13 raeburn Exp $ -->
<!--
@@ -62,9 +62,9 @@
('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29') ||
('<DIST />' eq 'fedora30') || ('<DIST />' eq 'fedora31') ||
('<DIST />' eq 'fedora32') || ('<DIST />' eq 'fedora33') ||
- ('<DIST />' eq 'fedora34') || ('<DIST />' eq 'centos8') ||
- ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'oracle7') ||
- ('<DIST />' eq 'oracle8')) {
+ ('<DIST />' eq 'fedora34') || ('<DIST />' eq 'fedora35') ||
+ ('<DIST />' eq 'centos8') || ('<DIST />' eq 'rhes8') ||
+ ('<DIST />' eq 'oracle7') || ('<DIST />' eq 'oracle8')) {
$use_systemctl = 1;
$systemctl_only = 1;
}
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.1018 doc/loncapafiles/loncapafiles.lpml:1.1019
--- doc/loncapafiles/loncapafiles.lpml:1.1018 Fri Dec 17 16:49:05 2021
+++ doc/loncapafiles/loncapafiles.lpml Fri Dec 17 17:48:13 2021
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.1018 2021/12/17 16:49:05 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.1019 2021/12/17 17:48:13 raeburn Exp $ -->
<!--
@@ -8780,7 +8780,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 fedora33 fedora34 sles15 ubuntu18 ubuntu20 rhes8 centos8 oracle7 oracle8'>home/httpd/perl/loncontrol</target>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 fedora33 fedora34 fedora35 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.
@@ -8789,7 +8789,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 fedora33 fedora34 sles15 ubuntu18 ubuntu20 rhes8 centos8 oracle7 oracle8'>etc/systemd/system/loncontrol.service</target>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 fedora33 fedora34 fedora35 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
@@ -8843,13 +8843,13 @@
loncom/init.d/loncontrol
</dependencies>
</file>
-<file dist="fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 fedora33 fedora34 sles15 ubuntu18 ubuntu20 rhes8 centos8 oracle7 oracle8">
+<file dist="fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 fedora33 fedora34 fedora35 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 fedora33 fedora34 sles15 rhes8 centos8 oracle7 oracle8">
+ <installscript dist="fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 fedora33 fedora34 fedora35 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.46 doc/loncapafiles/modify_config_files.piml:1.47
--- doc/loncapafiles/modify_config_files.piml:1.46 Wed Jul 28 14:44:30 2021
+++ doc/loncapafiles/modify_config_files.piml Fri Dec 17 17:48:13 2021
@@ -3,7 +3,7 @@
<!-- modify_config_files.piml -->
<!-- Matthew Hall -->
-<!-- $Id: modify_config_files.piml,v 1.46 2021/07/28 14:44:30 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.47 2021/12/17 17:48:13 raeburn Exp $ -->
<!--
@@ -60,8 +60,9 @@
('<DIST />' eq 'fedora29') || ('<DIST />' eq 'fedora30') ||
('<DIST />' eq 'fedora31') || ('<DIST />' eq 'fedora32') ||
('<DIST />' eq 'fedora33') || ('<DIST />' eq 'fedora34') ||
- ('<DIST />' eq 'centos8') || ('<DIST />' eq 'rhes8') ||
- ('<DIST />' eq 'oracle7') || ('<DIST />' eq 'oracle8')) {
+ ('<DIST />' eq 'fedora35') || ('<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.48 doc/loncapafiles/ntpcheck.piml:1.49
--- doc/loncapafiles/ntpcheck.piml:1.48 Wed Jul 28 14:44:30 2021
+++ doc/loncapafiles/ntpcheck.piml Fri Dec 17 17:48:13 2021
@@ -3,7 +3,7 @@
<!-- ntpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: ntpcheck.piml,v 1.48 2021/07/28 14:44:30 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.49 2021/12/17 17:48:13 raeburn Exp $ -->
<!--
@@ -40,10 +40,11 @@
('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29') ||
('<DIST />' eq 'fedora30') || ('<DIST />' eq 'fedora31') ||
('<DIST />' eq 'fedora32') || ('<DIST />' eq 'fedora33') ||
- ('<DIST />' eq 'fedora34') || ('<DIST />' eq 'sles15') ||
- ('<DIST />' eq 'centos8') || ('<DIST />' eq 'rhes8') ||
- ('<DIST />' eq 'oracle7') || ('<DIST />' eq 'oracle8') ||
- ('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'ubuntu20')) {
+ ('<DIST />' eq 'fedora34') || ('<DIST />' eq 'fedora35') ||
+ ('<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";
@@ -63,12 +64,12 @@
('<DIST />' eq 'fedora29') || ('<DIST />' eq 'fedora30') ||
('<DIST />' eq 'fedora31') || ('<DIST />' eq 'fedora32') ||
('<DIST />' eq 'fedora33') || ('<DIST />' eq 'fedora34') ||
- ('<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 'fedora35') || ('<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')) {
@@ -79,9 +80,10 @@
('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29') ||
('<DIST />' eq 'fedora30') || ('<DIST />' eq 'fedora31') ||
('<DIST />' eq 'fedora32') || ('<DIST />' eq 'fedora33') ||
- ('<DIST />' eq 'fedora34') || ('<DIST />' eq 'sles15') ||
- ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'centos8') ||
- ('<DIST />' eq 'oracle7') || ('<DIST />' eq 'oracle8')) {
+ ('<DIST />' eq 'fedora34') || ('<DIST />' eq 'fedora35') ||
+ ('<DIST />' eq 'sles15') || ('<DIST />' eq 'rhes8') ||
+ ('<DIST />' eq 'centos8') || ('<DIST />' eq 'oracle7') ||
+ ('<DIST />' eq 'oracle8')) {
$NTPD = 'chronyd';
$name = $NTPD;
$binname = $NTPD;
@@ -134,12 +136,12 @@
('<DIST />' eq 'fedora29') || ('<DIST />' eq 'fedora30') ||
('<DIST />' eq 'fedora31') || ('<DIST />' eq 'fedora32') ||
('<DIST />' eq 'fedora33') || ('<DIST />' eq 'fedora34') ||
- ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'centos7') ||
- ('<DIST />' eq 'rhes7') || ('<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 'fedora35') || ('<DIST />' eq 'centos7') ||
+ ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'rhes7') ||
+ ('<DIST />' eq 'oracle7') || ('<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.47 doc/loncapafiles/picins_check.piml:1.48
--- doc/loncapafiles/picins_check.piml:1.47 Wed Jul 28 14:44:30 2021
+++ doc/loncapafiles/picins_check.piml Fri Dec 17 17:48:13 2021
@@ -3,7 +3,7 @@
<!-- picins_check.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: picins_check.piml,v 1.47 2021/07/28 14:44:30 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.48 2021/12/17 17:48:13 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 fedora33 fedora34 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 fedora34 fedora35 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.52 doc/loncapafiles/rpmcheck.piml:1.53
--- doc/loncapafiles/rpmcheck.piml:1.52 Wed Jul 28 14:44:30 2021
+++ doc/loncapafiles/rpmcheck.piml Fri Dec 17 17:48:13 2021
@@ -3,7 +3,7 @@
<!-- phpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: rpmcheck.piml,v 1.52 2021/07/28 14:44:30 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.53 2021/12/17 17:48:13 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 fedora33 fedora34 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 fedora34 fedora35 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.47 doc/loncapafiles/wrap_setuid.piml:1.48
--- doc/loncapafiles/wrap_setuid.piml:1.47 Wed Jul 28 14:44:30 2021
+++ doc/loncapafiles/wrap_setuid.piml Fri Dec 17 17:48:13 2021
@@ -3,7 +3,7 @@
<!-- wrap_setuid.piml -->
<!-- Guy Albertelli -->
-<!-- $Id: wrap_setuid.piml,v 1.47 2021/07/28 14:44:30 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.48 2021/12/17 17:48:13 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 fedora33 fedora34 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 fedora34 fedora35 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