[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
Tue Aug 9 11:22:33 EDT 2016
raeburn Tue Aug 9 15:22:33 2016 EDT
Modified files:
/doc/loncapafiles chkconfig.piml modify_config_files.piml
ntpcheck.piml picins_check.piml rpmcheck.piml
wrap_setuid.piml
Log:
- Support Fedora 22, 23 and 24.
-------------- next part --------------
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.35 doc/loncapafiles/chkconfig.piml:1.36
--- doc/loncapafiles/chkconfig.piml:1.35 Sat Apr 9 19:04:39 2016
+++ doc/loncapafiles/chkconfig.piml Tue Aug 9 15:22:33 2016
@@ -3,7 +3,7 @@
<!-- checkconfig.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.35 2016/04/09 19:04:39 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.36 2016/08/09 15:22:33 raeburn Exp $ -->
<!--
@@ -57,11 +57,12 @@
if (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17') ||
('<DIST />' eq 'fedora18') || ('<DIST />' eq 'fedora19') ||
('<DIST />' eq 'fedora20') || ('<DIST />' eq 'fedora21') ||
- ('<DIST />' eq 'suse12.1') || ('<DIST />' eq 'suse12.2') ||
- ('<DIST />' eq 'suse12.3') || ('<DIST />' eq 'suse13.1') ||
- ('<DIST />' eq 'suse13.2') || ('<DIST />' eq 'rhes7') ||
- ('<DIST />' eq 'centos7') || ('<DIST />' eq 'scientific7') ||
- ('<DIST />' eq 'sles12')) {
+ ('<DIST />' eq 'fedora22') || ('<DIST />' eq 'fedora23') ||
+ ('<DIST />' eq 'fedora24') || ('<DIST />' eq 'suse12.1') ||
+ ('<DIST />' eq 'suse12.2') || ('<DIST />' eq 'suse12.3') ||
+ ('<DIST />' eq 'suse13.1') || ('<DIST />' eq 'suse13.2') ||
+ ('<DIST />' eq 'sles12') || ('<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.31 doc/loncapafiles/modify_config_files.piml:1.32
--- doc/loncapafiles/modify_config_files.piml:1.31 Sat Apr 9 19:04:39 2016
+++ doc/loncapafiles/modify_config_files.piml Tue Aug 9 15:22:33 2016
@@ -3,7 +3,7 @@
<!-- modify_config_files.piml -->
<!-- Matthew Hall -->
-<!-- $Id: modify_config_files.piml,v 1.31 2016/04/09 19:04:39 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.32 2016/08/09 15:22:33 raeburn Exp $ -->
<!--
@@ -52,8 +52,9 @@
('<DIST />' eq 'fedora18') || ('<DIST />' eq 'fedora19') ||
('<DIST />' eq 'fedora20') || ('<DIST />' eq 'fedora21')) {
$mysqlcmd = '/bin/systemctl restart mysqld.service';
-} elsif (('<DIST />' eq 'rhes7') || ('<DIST />' eq 'centos7') ||
- ('<DIST />' eq 'scientific7')) {
+} elsif (('<DIST />' eq 'rhes7') || ('<DIST />' eq 'centos7') ||
+ ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'fedora22') ||
+ ('<DIST />' eq 'fedora23') || ('<DIST />' eq 'fedora24')) {
$mysqlcmd = '/bin/systemctl restart mariadb.service';
}
Index: doc/loncapafiles/ntpcheck.piml
diff -u doc/loncapafiles/ntpcheck.piml:1.27 doc/loncapafiles/ntpcheck.piml:1.28
--- doc/loncapafiles/ntpcheck.piml:1.27 Sun May 22 23:15:28 2016
+++ doc/loncapafiles/ntpcheck.piml Tue Aug 9 15:22:33 2016
@@ -3,7 +3,7 @@
<!-- ntpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: ntpcheck.piml,v 1.27 2016/05/22 23:15:28 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.28 2016/08/09 15:22:33 raeburn Exp $ -->
<!--
@@ -41,12 +41,13 @@
my $checkcmd = 'ps -ef |grep ntp |grep -v grep |grep -v ntpcheck';
my $startntpcmd;
my $is_running;
-if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16') ||
- ('<DIST />' eq 'fedora17') || ('<DIST />' eq 'fedora18') ||
- ('<DIST />' eq 'fedora19') || ('<DIST />' eq 'fedora20') ||
- ('<DIST />' eq 'fedora21') || ('<DIST />' eq 'rhes7') ||
- ('<DIST />' eq 'centos7') || ('<DIST />' eq 'scientific7') ||
- ('<DIST />' eq 'sles12')) {
+if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16') ||
+ ('<DIST />' eq 'fedora17') || ('<DIST />' eq 'fedora18') ||
+ ('<DIST />' eq 'fedora19') || ('<DIST />' eq 'fedora20') ||
+ ('<DIST />' eq 'fedora21') || ('<DIST />' eq 'fedora22') ||
+ ('<DIST />' eq 'fedora23') || ('<DIST />' eq 'fedora24') ||
+ ('<DIST />' eq 'rhes7') || ('<DIST />' eq 'centos7') ||
+ ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'sles12')) {
$NTPD = 'ntpd';
$startntpcmd = 'systemctl start ntpd.service';
if (!-e '/usr/sbin/ntpd') {
@@ -81,12 +82,13 @@
}
# chkconfig barfs to stderr if the target isn't set up right.
-if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16') ||
- ('<DIST />' eq 'fedora17') || ('<DIST />' eq 'fedora18') ||
- ('<DIST />' eq 'fedora19') || ('<DIST />' eq 'fedora20') ||
- ('<DIST />' eq 'fedora21') || ('<DIST />' eq 'rhes7') ||
- ('<DIST />' eq 'centos7') || ('<DIST />' eq 'scientific7') ||
- ('<DIST />' eq 'sles12')) {
+if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16') ||
+ ('<DIST />' eq 'fedora17') || ('<DIST />' eq 'fedora18') ||
+ ('<DIST />' eq 'fedora19') || ('<DIST />' eq 'fedora20') ||
+ ('<DIST />' eq 'fedora21') || ('<DIST />' eq 'fedora22') ||
+ ('<DIST />' eq 'fedora23') || ('<DIST />' eq 'fedora24') ||
+ ('<DIST />' eq 'rhes7') || ('<DIST />' eq 'centos7') ||
+ ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'sles12')) {
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.30 doc/loncapafiles/picins_check.piml:1.31
--- doc/loncapafiles/picins_check.piml:1.30 Sat Apr 9 19:04:39 2016
+++ doc/loncapafiles/picins_check.piml Tue Aug 9 15:22:33 2016
@@ -3,7 +3,7 @@
<!-- picins_check.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: picins_check.piml,v 1.30 2016/04/09 19:04:39 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.31 2016/08/09 15:22:33 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 rhes6 scientific6 centos6 rhes7 scientific7 centos7 sles11 sles12 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">
+<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora 23 fedora24 rhes6 scientific6 centos6 rhes7 scientific7 centos7 sles11 sles12 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">
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.37 doc/loncapafiles/rpmcheck.piml:1.38
--- doc/loncapafiles/rpmcheck.piml:1.37 Mon Jan 19 20:42:37 2015
+++ doc/loncapafiles/rpmcheck.piml Tue Aug 9 15:22:33 2016
@@ -3,7 +3,7 @@
<!-- phpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: rpmcheck.piml,v 1.37 2015/01/19 20:42:37 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.38 2016/08/09 15:22:33 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 rhes5 rhes6 rhes7 centos5 scientific5 scientific6 centos6 scientific7 centos7 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 sles12 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 rhes5 rhes6 rhes7 centos5 scientific5 scientific6 centos6 scientific7 centos7 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 sles12 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.30 doc/loncapafiles/wrap_setuid.piml:1.31
--- doc/loncapafiles/wrap_setuid.piml:1.30 Sat Apr 9 19:04:39 2016
+++ doc/loncapafiles/wrap_setuid.piml Tue Aug 9 15:22:33 2016
@@ -3,7 +3,7 @@
<!-- wrap_setuid.piml -->
<!-- Guy Albertelli -->
-<!-- $Id: wrap_setuid.piml,v 1.30 2016/04/09 19:04:39 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.31 2016/08/09 15:22:33 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 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 ubuntu12 ubuntu14 ubuntu16 rhes7 centos7 scientific7">
+<perlscript mode="fg" 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 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 ubuntu12 ubuntu14 ubuntu16 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