[LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml langcheck.piml loncapafiles.lpml modify_config_files.piml picins_check.piml rpmcheck.piml wrap_setuid.piml
raeburn
raeburn at source.lon-capa.org
Tue Apr 9 11:54:12 EDT 2019
raeburn Tue Apr 9 15:54:12 2019 EDT
Modified files:
/doc/loncapafiles chkconfig.piml langcheck.piml loncapafiles.lpml
modify_config_files.piml picins_check.piml
rpmcheck.piml wrap_setuid.piml
Log:
- Support Fedora 30.
-------------- next part --------------
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.42 doc/loncapafiles/chkconfig.piml:1.43
--- doc/loncapafiles/chkconfig.piml:1.42 Thu Nov 1 02:05:15 2018
+++ doc/loncapafiles/chkconfig.piml Tue Apr 9 15:54:12 2019
@@ -3,7 +3,7 @@
<!-- checkconfig.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.42 2018/11/01 02:05:15 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.43 2019/04/09 15:54:12 raeburn Exp $ -->
<!--
@@ -59,7 +59,8 @@
$use_systemctl = 1;
$systemctl_only = 1;
} elsif (('<DIST />' eq 'fedora26') || ('<DIST />' eq 'fedora27') ||
- ('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29')) {
+ ('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29') ||
+ ('<DIST />' eq 'fedora30')) {
$use_systemctl = 1;
$systemctl_only = 1;
}
Index: doc/loncapafiles/langcheck.piml
diff -u doc/loncapafiles/langcheck.piml:1.16 doc/loncapafiles/langcheck.piml:1.17
--- doc/loncapafiles/langcheck.piml:1.16 Tue Feb 19 21:20:05 2019
+++ doc/loncapafiles/langcheck.piml Tue Apr 9 15:54:12 2019
@@ -65,7 +65,8 @@
'<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 'rhes7' || '<DIST />' eq 'centos7' || '<DIST />' eq 'scientific7') {
+ '<DIST />' eq 'fedora30' || '<DIST />' eq 'rhes7' || '<DIST />' eq 'centos7' ||
+ '<DIST />' eq 'scientific7') {
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.983 doc/loncapafiles/loncapafiles.lpml:1.984
--- doc/loncapafiles/loncapafiles.lpml:1.983 Sun Mar 17 23:23:32 2019
+++ doc/loncapafiles/loncapafiles.lpml Tue Apr 9 15:54:12 2019
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.983 2019/03/17 23:23:32 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.984 2019/04/09 15:54:12 raeburn Exp $ -->
<!--
@@ -8690,7 +8690,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 sles15 ubuntu18'>home/httpd/perl/loncontrol</target>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18'>home/httpd/perl/loncontrol</target>
<categoryname>root script</categoryname>
<description>
Controls the launching/halting of lonc, lond, and lonsql processes.
@@ -8699,7 +8699,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 sles15 ubuntu18'>etc/systemd/system/loncontrol.service</target>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18'>etc/systemd/system/loncontrol.service</target>
<categoryname>root script</categoryname>
<description>
Controls the launching/halting of lon-capa daemons by loncontrol in systemd
@@ -8752,13 +8752,13 @@
loncom/init.d/loncontrol
</dependencies>
</file>
-<file dist="fedora26 fedora27 fedora28 fedora29 sles15 ubuntu18">
+<file dist="fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18">
<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 sles15">
+ <installscript dist="fedora26 fedora27 fedora28 fedora29 fedora30 sles15">
-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.37 doc/loncapafiles/modify_config_files.piml:1.38
--- doc/loncapafiles/modify_config_files.piml:1.37 Sat Oct 27 00:03:31 2018
+++ doc/loncapafiles/modify_config_files.piml Tue Apr 9 15:54:12 2019
@@ -3,7 +3,7 @@
<!-- modify_config_files.piml -->
<!-- Matthew Hall -->
-<!-- $Id: modify_config_files.piml,v 1.37 2018/10/27 00:03:31 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.38 2019/04/09 15:54:12 raeburn Exp $ -->
<!--
@@ -57,7 +57,7 @@
('<DIST />' eq 'fedora23') || ('<DIST />' eq 'fedora24') ||
('<DIST />' eq 'fedora25') || ('<DIST />' eq 'fedora26') ||
('<DIST />' eq 'fedora27') || ('<DIST />' eq 'fedora28') ||
- ('<DIST />' eq 'fedora29')) {
+ ('<DIST />' eq 'fedora29') || ('<DIST />' eq 'fedora30')) {
$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.37 doc/loncapafiles/picins_check.piml:1.38
--- doc/loncapafiles/picins_check.piml:1.37 Sun Oct 28 03:09:16 2018
+++ doc/loncapafiles/picins_check.piml Tue Apr 9 15:54:12 2019
@@ -3,7 +3,7 @@
<!-- picins_check.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: picins_check.piml,v 1.37 2018/10/28 03:09:16 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.38 2019/04/09 15:54:12 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 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 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.42 doc/loncapafiles/rpmcheck.piml:1.43
--- doc/loncapafiles/rpmcheck.piml:1.42 Sun Oct 28 03:09:16 2018
+++ doc/loncapafiles/rpmcheck.piml Tue Apr 9 15:54:12 2019
@@ -3,7 +3,7 @@
<!-- phpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: rpmcheck.piml,v 1.42 2018/10/28 03:09:16 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.43 2019/04/09 15:54:12 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 rhes5 rhes6 rhes7 centos5 scientific5 scientific6 centos6 scientific7 centos7 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 rhes5 rhes6 rhes7 centos5 scientific5 scientific6 centos6 scientific7 centos7 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.38 doc/loncapafiles/wrap_setuid.piml:1.39
--- doc/loncapafiles/wrap_setuid.piml:1.38 Tue Apr 9 15:52:43 2019
+++ doc/loncapafiles/wrap_setuid.piml Tue Apr 9 15:54:12 2019
@@ -3,7 +3,7 @@
<!-- wrap_setuid.piml -->
<!-- Guy Albertelli -->
-<!-- $Id: wrap_setuid.piml,v 1.38 2019/04/09 15:52:43 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.39 2019/04/09 15:54:12 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 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">
$fslist='<TARGET />';
open(FIND, "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) -print|");
More information about the LON-CAPA-cvs
mailing list