[LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml loncapafiles.lpml picins_check.piml rpmcheck.piml sanitycheck.piml updatequery.piml wrap_setuid.piml
raeburn
raeburn@source.lon-capa.org
Sat, 01 Jan 2011 21:49:56 -0000
This is a MIME encoded message
--raeburn1293918596
Content-Type: text/plain
raeburn Sat Jan 1 21:49:56 2011 EDT
Modified files:
/doc/loncapafiles chkconfig.piml loncapafiles.lpml
picins_check.piml rpmcheck.piml sanitycheck.piml
updatequery.piml wrap_setuid.piml
Log:
- Support for suse11.3
--raeburn1293918596
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20110101214956.txt"
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.11 doc/loncapafiles/chkconfig.piml:1.12
--- doc/loncapafiles/chkconfig.piml:1.11 Fri Jan 1 04:29:01 2010
+++ doc/loncapafiles/chkconfig.piml Sat Jan 1 21:49:56 2011
@@ -3,7 +3,7 @@
<!-- checkconfig.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.11 2010/01/01 04:29:01 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.12 2011/01/01 21:49:56 raeburn Exp $ -->
<!--
@@ -44,7 +44,7 @@
$checker_bin = '/';
$webserver = 'apache';
@runlevels = qw/3 5/;
-} elsif ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2') {
+} elsif ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3') {
$webserver = 'apache2';
} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8') {
$checker_bin = '/usr/sbin/sysv-rc-conf';
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.715 doc/loncapafiles/loncapafiles.lpml:1.716
--- doc/loncapafiles/loncapafiles.lpml:1.715 Fri Dec 31 19:32:36 2010
+++ doc/loncapafiles/loncapafiles.lpml Sat Jan 1 21:49:56 2011
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.715 2010/12/31 19:32:36 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.716 2011/01/01 21:49:56 raeburn Exp $ -->
<!--
@@ -247,56 +247,56 @@
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/init.d</targetdir>
- <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>etc/init.d</targetdir>
+ <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3'>etc/init.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run during system startup</description>
</directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc0.d</targetdir>
- <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>etc/rc0.d</targetdir>
+ <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3'>etc/rc0.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run for run-level 0</description>
</directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc1.d</targetdir>
- <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>etc/rc1.d</targetdir>
+ <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3'>etc/rc1.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run for run-level 1</description>
</directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc2.d</targetdir>
- <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>etc/rc2.d</targetdir>
+ <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3'>etc/rc2.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run for run-level 2</description>
</directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc3.d</targetdir>
- <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>etc/rc3.d</targetdir>
+ <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3'>etc/rc3.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run for run-level 3</description>
</directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc4.d</targetdir>
- <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>etc/rc4.d</targetdir>
+ <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3'>etc/rc4.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run for run-level 4</description>
</directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc5.d</targetdir>
- <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>etc/rc5.d</targetdir>
+ <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3'>etc/rc5.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run for run-level 5</description>
</directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc6.d</targetdir>
- <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>etc/rc6.d</targetdir>
+ <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3'>etc/rc6.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run for run-level 6</description>
</directory>
@@ -901,7 +901,7 @@
<file>
<source>loncom/loncapa.conf</source>
<target dist='default'>etc/httpd/conf/loncapa.conf</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 debian5 ubuntu6 ubuntu8'>etc/apache2/loncapa.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 debian5 ubuntu6 ubuntu8'>etc/apache2/loncapa.conf</target>
<categoryname>conf</categoryname>
<description>
<p>
@@ -944,7 +944,7 @@
<file>
<source>loncom/loncapa_apache.conf</source>
<target dist='default'>etc/httpd/conf/loncapa_apache.conf</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 debian5 ubuntu6 ubuntu8'>etc/apache2/loncapa_apache.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 debian5 ubuntu6 ubuntu8'>etc/apache2/loncapa_apache.conf</target>
<categoryname>static conf</categoryname>
<description>
The goal of this file is to implement all LON-CAPA specific
@@ -964,7 +964,7 @@
<file>
<source>loncom/startup.pl</source>
<target dist='default'>etc/httpd/conf/startup.pl</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 debian5 ubuntu6 ubuntu8'>etc/apache2/startup.pl</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 debian5 ubuntu6 ubuntu8'>etc/apache2/startup.pl</target>
<categoryname>static conf</categoryname>
<description>
This file provides initializations for perl handlers. It adjusts what
@@ -5792,7 +5792,7 @@
<file>
<source>loncom/mime.types</source>
<target dist='default'>etc/httpd/conf/mime.types</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 debian5 ubuntu6 ubuntu8'>etc/apache2/mime.types</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 debian5 ubuntu6 ubuntu8'>etc/apache2/mime.types</target>
<categoryname>www static conf</categoryname>
<description>Expanded mime.types</description>
</file>
@@ -7288,7 +7288,7 @@
<file>
<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 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 debian5 ubuntu6 ubuntu8'>etc/init.d/loncontrol</target>
+<target dist='suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 debian5 ubuntu6 ubuntu8'>etc/init.d/loncontrol</target>
<categoryname>root script</categoryname>
<description>
Controls the launching/halting of lonc, lond, and lonsql processes.
@@ -7296,7 +7296,7 @@
</file>
<link>
<linkto dist='default'>etc/rc.d/init.d/loncontrol</linkto>
-<linkto dist='suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 debian5 ubuntu6 ubuntu8'>etc/init.d/loncontrol</linkto>
+<linkto dist='suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 debian5 ubuntu6 ubuntu8'>etc/init.d/loncontrol</linkto>
<target dist='default'>
etc/rc.d/rc0.d/K05loncontrol;
etc/rc.d/rc1.d/K05loncontrol;
@@ -7312,13 +7312,13 @@
</description>
</link>
-<file dist="suse10.2 suse10.3 suse11.1 suse11.2">
+<file dist="suse10.2 suse10.3 suse11.1 suse11.2 suse11.3">
<source>loncom/init.d/loncontrol</source>
<target>etc/rc.d/</target>
<description>
setup loncontrol to run at boot
</description>
- <installscript dist="suse10.2 suse10.3 suse11.1 suse11.2">
+ <installscript dist="suse10.2 suse10.3 suse11.1 suse11.2 suse11.3">
-c 'chkconfig --del loncontrol;chkconfig loncontrol 345;chkconfig --list loncontrol'
</installscript>
<dependencies>
Index: doc/loncapafiles/picins_check.piml
diff -u doc/loncapafiles/picins_check.piml:1.9 doc/loncapafiles/picins_check.piml:1.10
--- doc/loncapafiles/picins_check.piml:1.9 Fri Dec 31 18:01:57 2010
+++ doc/loncapafiles/picins_check.piml Sat Jan 1 21:49:56 2011
@@ -3,7 +3,7 @@
<!-- picins_check.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: picins_check.piml,v 1.9 2010/12/31 18:01:57 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.10 2011/01/01 21:49:56 raeburn Exp $ -->
<!--
@@ -32,7 +32,7 @@
<piml>
<files>
<file>
-<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 rhel6 sles11 suse11.1 suse11.2 debian5 ubuntu8">
+<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 rhes6 sles11 suse11.1 suse11.2 suse11.3 debian5 ubuntu8">
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.20 doc/loncapafiles/rpmcheck.piml:1.21
--- doc/loncapafiles/rpmcheck.piml:1.20 Fri Dec 31 18:03:46 2010
+++ doc/loncapafiles/rpmcheck.piml Sat Jan 1 21:49:56 2011
@@ -3,7 +3,7 @@
<!-- phpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: rpmcheck.piml,v 1.20 2010/12/31 18:03:46 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.21 2011/01/01 21:49:56 raeburn Exp $ -->
<!--
@@ -81,7 +81,7 @@
}
}
</perlscript>
-<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedra14 rhel6 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 suse11.1 suse11.2" mode="fg">
+<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 rhes6 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 suse11.1 suse11.2 suse11.3" mode="fg">
my @RPMS = `rpm -q -a`;
foreach my $rpm ('LONCAPA-prerequisites') {
my @matching_rpms = grep(/$rpm/,@RPMS);
Index: doc/loncapafiles/sanitycheck.piml
diff -u doc/loncapafiles/sanitycheck.piml:1.33 doc/loncapafiles/sanitycheck.piml:1.34
--- doc/loncapafiles/sanitycheck.piml:1.33 Wed Jul 21 00:32:44 2010
+++ doc/loncapafiles/sanitycheck.piml Sat Jan 1 21:49:56 2011
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- sanitycheck.piml -->
-<!-- $Id: sanitycheck.piml,v 1.33 2010/07/21 00:32:44 raeburn Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.34 2011/01/01 21:49:56 raeburn Exp $ -->
<!--
@@ -60,7 +60,7 @@
</file>
<file>
<target dist='default'>/var/lib/mysql/mysql.sock</target>
-<target dist='suse11.2'>/var/run/mysql/mysql.sock</target>
+<target dist='suse11.2 suse11.3'>/var/run/mysql/mysql.sock</target>
<target dist='debian5 ubuntu6 ubuntu8'>/var/run/mysqld/mysqld.sock</target>
<perlscript mode='fg'>
unless
@@ -113,7 +113,7 @@
</file>
<file>
<target dist='default'>/etc/httpd/conf/loncapa.conf</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 debian5 ubuntu6 ubuntu8'>/etc/apache2/loncapa.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 debian5 ubuntu6 ubuntu8'>/etc/apache2/loncapa.conf</target>
<perlscript mode='fg'>
open IN, "<<TARGET />";
my $hbug=-1;
Index: doc/loncapafiles/updatequery.piml
diff -u doc/loncapafiles/updatequery.piml:1.66 doc/loncapafiles/updatequery.piml:1.67
--- doc/loncapafiles/updatequery.piml:1.66 Fri Dec 31 17:58:57 2010
+++ doc/loncapafiles/updatequery.piml Sat Jan 1 21:49:56 2011
@@ -1,6 +1,6 @@
<!-- updatequery.piml -->
-<!-- $Id: updatequery.piml,v 1.66 2010/12/31 17:58:57 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.67 2011/01/01 21:49:56 raeburn Exp $ -->
<!--
@@ -530,7 +530,7 @@
# update loncapa.conf
my $confdir = '/etc/httpd/conf/';
-if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'debian5' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8') {
+if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq 'debian5' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8') {
$confdir = '/etc/apache2/';
}
my $filename='loncapa.conf';
@@ -587,7 +587,7 @@
</file>
<file>
<target dist='default'>/etc/httpd/conf/</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 debian5 ubuntu6 ubuntu8'>/etc/apache2/</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 debian5 ubuntu6 ubuntu8'>/etc/apache2/</target>
<perlscript mode='fg'>
sub securesetting {
my (%perlvar)=@_;
Index: doc/loncapafiles/wrap_setuid.piml
diff -u doc/loncapafiles/wrap_setuid.piml:1.11 doc/loncapafiles/wrap_setuid.piml:1.12
--- doc/loncapafiles/wrap_setuid.piml:1.11 Fri Dec 31 18:00:58 2010
+++ doc/loncapafiles/wrap_setuid.piml Sat Jan 1 21:49:56 2011
@@ -3,7 +3,7 @@
<!-- wrap_setuid.piml -->
<!-- Guy Albertelli -->
-<!-- $Id: wrap_setuid.piml,v 1.11 2010/12/31 18:00:58 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.12 2011/01/01 21:49:56 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 fedora14">
+<perlscript mode="fg" dist="suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 fedora14">
$fslist='<TARGET />';
open(FIND, "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) -print|");
--raeburn1293918596--