[LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml loncapafiles.lpml picins_check.piml rpmcheck.piml sanitycheck.piml updatequery.piml webserver.piml wrap_setuid.piml

raeburn raeburn@source.lon-capa.org
Tue, 29 Dec 2009 07:04:38 -0000 

This is a MIME encoded message

--raeburn1262070278
Content-Type: text/plain

raeburn		Tue Dec 29 07:04:38 2009 EDT

  Modified files:              
    /doc/loncapafiles	chkconfig.piml loncapafiles.lpml 
                     	picins_check.piml rpmcheck.piml sanitycheck.piml 
                     	updatequery.piml webserver.piml wrap_setuid.piml 
  Log:
  - Support for SuSE 11.2.
  
  
--raeburn1262070278
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20091229070438.txt"

Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.9 doc/loncapafiles/chkconfig.piml:1.10
--- doc/loncapafiles/chkconfig.piml:1.9	Tue Jul 14 21:05:35 2009
+++ doc/loncapafiles/chkconfig.piml	Tue Dec 29 07:04:38 2009
@@ -3,7 +3,7 @@
 <!-- checkconfig.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: chkconfig.piml,v 1.9 2009/07/14 21:05:35 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.10 2009/12/29 07:04:38 raeburn Exp $ -->
 
 <!--
 
@@ -44,7 +44,7 @@
     $checker_bin = '/';
     $webserver = 'apache';
     @runlevels = qw/3 5/;
-} elsif ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1') {
+} elsif ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2') {
     $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.671 doc/loncapafiles/loncapafiles.lpml:1.672
--- doc/loncapafiles/loncapafiles.lpml:1.671	Tue Dec 22 04:22:11 2009
+++ doc/loncapafiles/loncapafiles.lpml	Tue Dec 29 07:04:38 2009
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.671 2009/12/22 04:22:11 faziophi Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.672 2009/12/29 07:04:38 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 suse10.1 suse10.2 suse10.3 suse11.1'>etc/init.d</targetdir>
+  <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>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 suse10.1 suse10.2 suse10.3 suse11.1'>etc/rc0.d</targetdir>
+  <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>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 suse10.1 suse10.2 suse10.3 suse11.1'>etc/rc1.d</targetdir>
+  <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>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 suse10.1 suse10.2 suse10.3 suse11.1'>etc/rc2.d</targetdir>
+  <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>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 suse10.1 suse10.2 suse10.3 suse11.1'>etc/rc3.d</targetdir>
+  <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>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 suse10.1 suse10.2 suse10.3 suse11.1'>etc/rc4.d</targetdir>
+  <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>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 suse10.1 suse10.2 suse10.3 suse11.1'>etc/rc5.d</targetdir>
+  <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>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 suse10.1 suse10.2 suse10.3 suse11.1'>etc/rc6.d</targetdir>
+  <targetdir dist='debian5 ubuntu6 ubuntu8 suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>etc/rc6.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run for run-level 6</description>
 </directory>
@@ -535,6 +535,12 @@
 </directory>
 <directory dist='default'>
   <protectionlevel>modest_delete</protectionlevel>
+  <targetdir dist='default'>home/httpd/html/adm/ckeditor</targetdir>
+  <categoryname>server readonly</categoryname>
+  <description>Rich Text Editor</description>
+</directory>
+<directory dist='default'>
+  <protectionlevel>modest_delete</protectionlevel>
   <targetdir dist='default'>home/httpd/html/adm/jQuery</targetdir>
   <categoryname>server readonly</categoryname>
   <description>jQuery JavaScript library</description>
@@ -890,7 +896,7 @@
 <file>
 <source>loncom/loncapa.conf</source>
 <target dist='default'>etc/httpd/conf/loncapa.conf</target>
-<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1 debian5 ubuntu6 ubuntu8'>etc/apache2/loncapa.conf</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 debian5 ubuntu6 ubuntu8'>etc/apache2/loncapa.conf</target>
 <categoryname>conf</categoryname>
 <description>
 <p>
@@ -933,7 +939,7 @@
 <file>
 <source>loncom/loncapa_apache.conf</source>
 <target dist='default'>etc/httpd/conf/loncapa_apache.conf</target>
-<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1 debian5 ubuntu6 ubuntu8'>etc/apache2/loncapa_apache.conf</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 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
@@ -953,7 +959,7 @@
 <file>
 <source>loncom/startup.pl</source>
 <target dist='default'>etc/httpd/conf/startup.pl</target>
-<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1 debian5 ubuntu6 ubuntu8'>etc/apache2/startup.pl</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 debian5 ubuntu6 ubuntu8'>etc/apache2/startup.pl</target>
 <categoryname>static conf</categoryname>
 <description>
 This file provides initializations for perl handlers.  It adjusts what
@@ -5505,7 +5511,7 @@
 <file>
 <source>loncom/mime.types</source>
 <target dist='default'>etc/httpd/conf/mime.types</target>
-<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1 debian5 ubuntu6 ubuntu8'>etc/apache2/mime.types</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 debian5 ubuntu6 ubuntu8'>etc/apache2/mime.types</target>
 <categoryname>www static conf</categoryname>
 <description>Expanded mime.types</description>
 </file>
@@ -7128,7 +7134,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 suse10.1 suse10.2 suse10.3 suse11.1 debian5 ubuntu6 ubuntu8'>etc/init.d/loncontrol</target>
+<target dist='suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 debian5 ubuntu6 ubuntu8'>etc/init.d/loncontrol</target>
 <categoryname>root script</categoryname>
 <description>
 Controls the launching/halting of lonc, lond, and lonsql processes.
@@ -7136,7 +7142,7 @@
 </file>
 <link>
 <linkto dist='default'>etc/rc.d/init.d/loncontrol</linkto>
-<linkto dist='suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3 suse11.1 debian5 ubuntu6 ubuntu8'>etc/init.d/loncontrol</linkto>
+<linkto dist='suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 debian5 ubuntu6 ubuntu8'>etc/init.d/loncontrol</linkto>
 <target dist='default'>
 etc/rc.d/rc0.d/K05loncontrol;
 etc/rc.d/rc1.d/K05loncontrol;
@@ -7152,13 +7158,13 @@
 </description>
 </link>
 
-<file dist="suse10.2 suse10.3 suse11.1">
+<file dist="suse10.2 suse10.3 suse11.1 suse11.2">
   <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">
+  <installscript dist="suse10.2 suse10.3 suse11.1 suse11.2">
 -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.3 doc/loncapafiles/picins_check.piml:1.4
--- doc/loncapafiles/picins_check.piml:1.3	Tue Jul 14 03:43:14 2009
+++ doc/loncapafiles/picins_check.piml	Tue Dec 29 07:04:38 2009
@@ -3,7 +3,7 @@
 <!-- picins_check.piml -->
 <!-- Stuart Raeburn -->
 
-<!-- $Id: picins_check.piml,v 1.3 2009/07/14 03:43:14 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.4 2009/12/29 07:04:38 raeburn Exp $ -->
 
 <!--
 
@@ -32,7 +32,7 @@
 <piml>
 <files>
 <file>
-<perlscript mode="fg" dist="fedora9 fedora10 fedora11 sles11.1 debian5 ubuntu8">
+<perlscript mode="fg" dist="fedora9 fedora10 fedora11 suse11.1 suse11.2 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.15 doc/loncapafiles/rpmcheck.piml:1.16
--- doc/loncapafiles/rpmcheck.piml:1.15	Sun Jul  5 21:23:42 2009
+++ doc/loncapafiles/rpmcheck.piml	Tue Dec 29 07:04:38 2009
@@ -3,7 +3,7 @@
 <!-- phpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: rpmcheck.piml,v 1.15 2009/07/05 21:23:42 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.16 2009/12/29 07:04:38 raeburn Exp $ -->
 
 <!--
 
@@ -81,7 +81,7 @@
     }
 }
 </perlscript>
-<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 suse11.1" mode="fg">
+<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 suse11.1 suse11.2" 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.28 doc/loncapafiles/sanitycheck.piml:1.29
--- doc/loncapafiles/sanitycheck.piml:1.28	Tue Jul 14 04:14:29 2009
+++ doc/loncapafiles/sanitycheck.piml	Tue Dec 29 07:04:38 2009
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- sanitycheck.piml -->
 
-<!-- $Id: sanitycheck.piml,v 1.28 2009/07/14 04:14:29 raeburn Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.29 2009/12/29 07:04:38 raeburn Exp $ -->
 
 <!--
 
@@ -112,7 +112,7 @@
 </file>
 <file>
 <target dist='default'>/etc/httpd/conf/loncapa.conf</target>
-<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1 debian5 ubuntu6 ubuntu8'>/etc/apache2/loncapa.conf</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1 susee11.2 debian5 ubuntu6 ubuntu8'>/etc/apache2/loncapa.conf</target>
 <perlscript mode='fg'>
 open IN, "&lt;<TARGET />";
 my $hbug=-1;
Index: doc/loncapafiles/updatequery.piml
diff -u doc/loncapafiles/updatequery.piml:1.62 doc/loncapafiles/updatequery.piml:1.63
--- doc/loncapafiles/updatequery.piml:1.62	Fri Jul 17 19:47:13 2009
+++ doc/loncapafiles/updatequery.piml	Tue Dec 29 07:04:38 2009
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.62 2009/07/17 19:47:13 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.63 2009/12/29 07:04:38 raeburn Exp $ -->
 
 <!--
 
@@ -500,7 +500,7 @@
 
 # update loncapa.conf
 my $confdir = '/etc/httpd/conf/';
-if ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'debian5' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8') {
+if ('<DIST />' eq 'sles10' || '<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') {
      $confdir = '/etc/apache2/';
 }   
 my $filename='loncapa.conf';
@@ -557,7 +557,7 @@
 </file>
 <file>
 <target dist='default'>/etc/httpd/conf/</target>
-<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1 debian5 ubuntu6 ubuntu8'>/etc/apache2/</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 debian5 ubuntu6 ubuntu8'>/etc/apache2/</target>
 <perlscript mode='fg'>
 sub securesetting {
     my (%perlvar)=@_;
Index: doc/loncapafiles/webserver.piml
diff -u doc/loncapafiles/webserver.piml:1.27 doc/loncapafiles/webserver.piml:1.28
--- doc/loncapafiles/webserver.piml:1.27	Fri Jul 17 15:40:49 2009
+++ doc/loncapafiles/webserver.piml	Tue Dec 29 07:04:38 2009
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- webserver.piml -->
 
-<!-- $Id: webserver.piml,v 1.27 2009/07/17 15:40:49 raeburn Exp $ -->
+<!-- $Id: webserver.piml,v 1.28 2009/12/29 07:04:38 raeburn Exp $ -->
 
 <!--
 
@@ -46,7 +46,7 @@
 <file>
 <target dist='default'>/etc/httpd/conf/httpd.conf</target>
 <target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>
-<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1'>/etc/apache2/default-server.conf</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>/etc/apache2/default-server.conf</target>
 <target dist='debian5 ubuntu6 ubuntu8'>/etc/apache2/sites-available/loncapa</target>
 <note>This is for Apache 1.X for Red Hat, Fedora 2,3 and 4, and SusSE 9.2, 9.3 and SLES 9 distributions. This is for Apache 2.X for Fedora 5 and later, and SuSE 10.X, 11.X and SLES 10 distributions, and Debian 5, Ubuntu 6 and Ubuntu 8 LTS distributions</note>
 <dependencies dist='default'>
@@ -58,7 +58,7 @@
 <dependencies dist='debian5 ubuntu6 ubuntu8'>
 /etc/apache2/sites-available/loncapa
 </dependencies>
-<dependencies dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1'>
+<dependencies dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2'>
 /etc/apache2/default-server.conf
 </dependencies>
 <perlscript mode='fg' dist="default">
Index: doc/loncapafiles/wrap_setuid.piml
diff -u doc/loncapafiles/wrap_setuid.piml:1.8 doc/loncapafiles/wrap_setuid.piml:1.9
--- doc/loncapafiles/wrap_setuid.piml:1.8	Sun Jul  5 21:23:42 2009
+++ doc/loncapafiles/wrap_setuid.piml	Tue Dec 29 07:04:38 2009
@@ -3,7 +3,7 @@
 <!-- wrap_setuid.piml -->
 <!-- Guy Albertelli -->
 
-<!-- $Id: wrap_setuid.piml,v 1.8 2009/07/05 21:23:42 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.9 2009/12/29 07:04:38 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 suse10.1 suse10.2 suse10.3 suse11.1">
+<perlscript mode="fg" dist="suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2">
 
 $fslist='<TARGET />';
 open(FIND,  "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) -print|");

--raeburn1262070278--