[LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml modify_config_files.piml ntpcheck.piml picins_check.piml rpmcheck.piml wrap_setuid.piml
raeburn
raeburn at source.lon-capa.org
Wed Dec 31 16:03:54 EST 2014
raeburn Wed Dec 31 21:03:54 2014 EDT
Modified files:
/doc/loncapafiles chkconfig.piml modify_config_files.piml
ntpcheck.piml picins_check.piml rpmcheck.piml
wrap_setuid.piml
Log:
- Support Fedora 21 Server
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.31 doc/loncapafiles/chkconfig.piml:1.32
--- doc/loncapafiles/chkconfig.piml:1.31 Sun Jun 29 23:50:25 2014
+++ doc/loncapafiles/chkconfig.piml Wed Dec 31 21:03:54 2014
@@ -3,7 +3,7 @@
<!-- checkconfig.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.31 2014/06/29 23:50:25 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.32 2014/12/31 21:03:54 raeburn Exp $ -->
<!--
@@ -56,10 +56,11 @@
}
if (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17') ||
('<DIST />' eq 'fedora18') || ('<DIST />' eq 'fedora19') ||
- ('<DIST />' eq 'fedora20') || ('<DIST />' eq 'suse12.1') ||
- ('<DIST />' eq 'suse12.2') || ('<DIST />' eq 'suse12.3') ||
- ('<DIST />' eq 'suse13.1') || ('<DIST />' eq 'rhes7') ||
- ('<DIST />' eq 'centos7') || ('<DIST />' eq 'scientific7')) {
+ ('<DIST />' eq 'fedora20') || ('<DIST />' eq 'fedora21') ||
+ ('<DIST />' eq 'suse12.1') || ('<DIST />' eq 'suse12.2') ||
+ ('<DIST />' eq 'suse12.3') || ('<DIST />' eq 'suse13.1') ||
+ ('<DIST />' eq 'rhes7') || ('<DIST />' eq 'centos7') ||
+ ('<DIST />' eq 'scientific7')) {
$use_systemctl = 1;
}
exit if (! -x $checker_bin);
Index: doc/loncapafiles/modify_config_files.piml
diff -u doc/loncapafiles/modify_config_files.piml:1.27 doc/loncapafiles/modify_config_files.piml:1.28
--- doc/loncapafiles/modify_config_files.piml:1.27 Sun Jun 29 23:50:25 2014
+++ doc/loncapafiles/modify_config_files.piml Wed Dec 31 21:03:54 2014
@@ -3,7 +3,7 @@
<!-- modify_config_files.piml -->
<!-- Matthew Hall -->
-<!-- $Id: modify_config_files.piml,v 1.27 2014/06/29 23:50:25 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.28 2014/12/31 21:03:54 raeburn Exp $ -->
<!--
@@ -47,7 +47,7 @@
$mysqlcmd = '/etc/init.d/mysql restart';
} elsif (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17') ||
('<DIST />' eq 'fedora18') || ('<DIST />' eq 'fedora19') ||
- ('<DIST />' eq 'fedora20')) {
+ ('<DIST />' eq 'fedora20') || ('<DIST />' eq 'fedora21')) {
$mysqlcmd = '/bin/systemctl restart mysqld.service';
} elsif (('<DIST />' eq 'rhes7') || ('<DIST />' eq 'centos7') ||
('<DIST />' eq 'scientific7')) {
Index: doc/loncapafiles/ntpcheck.piml
diff -u doc/loncapafiles/ntpcheck.piml:1.23 doc/loncapafiles/ntpcheck.piml:1.24
--- doc/loncapafiles/ntpcheck.piml:1.23 Sun Jun 29 23:50:25 2014
+++ doc/loncapafiles/ntpcheck.piml Wed Dec 31 21:03:54 2014
@@ -3,7 +3,7 @@
<!-- ntpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: ntpcheck.piml,v 1.23 2014/06/29 23:50:25 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.24 2014/12/31 21:03:54 raeburn Exp $ -->
<!--
@@ -44,8 +44,8 @@
if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16') ||
('<DIST />' eq 'fedora17') || ('<DIST />' eq 'fedora18') ||
('<DIST />' eq 'fedora19') || ('<DIST />' eq 'fedora20') ||
- ('<DIST />' eq 'rhes7') || ('<DIST />' eq 'centos7') ||
- ('<DIST />' eq 'scientific7')) {
+ ('<DIST />' eq 'fedora21') || ('<DIST />' eq 'rhes7') ||
+ ('<DIST />' eq 'centos7') || ('<DIST />' eq 'scientific7')) {
$NTPD = 'ntpd';
$startntpcmd = 'systemctl start ntpd.service';
if (!-e '/usr/sbin/ntpd') {
Index: doc/loncapafiles/picins_check.piml
diff -u doc/loncapafiles/picins_check.piml:1.26 doc/loncapafiles/picins_check.piml:1.27
--- doc/loncapafiles/picins_check.piml:1.26 Fri Nov 28 17:55:38 2014
+++ doc/loncapafiles/picins_check.piml Wed Dec 31 21:03:54 2014
@@ -3,7 +3,7 @@
<!-- picins_check.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: picins_check.piml,v 1.26 2014/11/28 17:55:38 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.27 2014/12/31 21:03:54 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 rhes6 scientific6 centos6 rhes7 scientific7 centos7 sles11 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 debian5 debian6 ubuntu8 ubuntu10 ubuntu12 ubuntu14">
+<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 rhes6 scientific6 centos6 rhes7 scientific7 centos7 sles11 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 debian5 debian6 ubuntu8 ubuntu10 ubuntu12 ubuntu14">
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.34 doc/loncapafiles/rpmcheck.piml:1.35
--- doc/loncapafiles/rpmcheck.piml:1.34 Sun Jun 29 23:50:25 2014
+++ doc/loncapafiles/rpmcheck.piml Wed Dec 31 21:03:54 2014
@@ -3,7 +3,7 @@
<!-- phpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: rpmcheck.piml,v 1.34 2014/06/29 23:50:25 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.35 2014/12/31 21:03:54 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 rhes5 rhes6 rhes7 centos5 scientific5 scientific6 centos6 scientific7 centos7 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1" 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 rhes5 rhes6 rhes7 centos5 scientific5 scientific6 centos6 scientific7 centos7 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1" 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.26 doc/loncapafiles/wrap_setuid.piml:1.27
--- doc/loncapafiles/wrap_setuid.piml:1.26 Sun Jun 29 23:50:25 2014
+++ doc/loncapafiles/wrap_setuid.piml Wed Dec 31 21:03:54 2014
@@ -3,7 +3,7 @@
<!-- wrap_setuid.piml -->
<!-- Guy Albertelli -->
-<!-- $Id: wrap_setuid.piml,v 1.26 2014/06/29 23:50:25 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.27 2014/12/31 21:03:54 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 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 ubuntu12 ubuntu14 rhes7 centos7 scientific7">
+<perlscript mode="fg" dist="suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 ubuntu12 ubuntu14 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