[LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml langcheck.piml loncapafiles.lpml modify_config_files.piml ntpcheck.piml picins_check.piml rpmcheck.piml sanitycheck.piml updatequery.piml webserver.piml wrap_setuid.piml
raeburn
raeburn at source.lon-capa.org
Thu Jun 13 08:57:13 EDT 2024
raeburn Thu Jun 13 12:57:13 2024 EDT
Modified files:
/doc/loncapafiles chkconfig.piml langcheck.piml loncapafiles.lpml
modify_config_files.piml ntpcheck.piml
picins_check.piml rpmcheck.piml sanitycheck.piml
updatequery.piml webserver.piml wrap_setuid.piml
Log:
- Support Debian 12 (bookworm) on amd64.
-------------- next part --------------
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.60 doc/loncapafiles/chkconfig.piml:1.61
--- doc/loncapafiles/chkconfig.piml:1.60 Sat Apr 27 03:28:12 2024
+++ doc/loncapafiles/chkconfig.piml Thu Jun 13 12:57:13 2024
@@ -3,7 +3,7 @@
<!-- checkconfig.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.60 2024/04/27 03:28:12 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.61 2024/06/13 12:57:13 raeburn Exp $ -->
<!--
@@ -56,7 +56,7 @@
$webserver = 'apache2';
} elsif (('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'ubuntu20') ||
('<DIST />' eq 'ubuntu22') || ('<DIST />' eq 'ubuntu24') ||
- ('<DIST />' eq 'sles15')) {
+ ('<DIST />' eq 'sles15') || ('<DIST />' eq 'debian12')) {
$webserver = 'apache2';
$use_systemctl = 1;
$systemctl_only = 1;
Index: doc/loncapafiles/langcheck.piml
diff -u doc/loncapafiles/langcheck.piml:1.35 doc/loncapafiles/langcheck.piml:1.36
--- doc/loncapafiles/langcheck.piml:1.35 Sat Apr 27 03:28:12 2024
+++ doc/loncapafiles/langcheck.piml Thu Jun 13 12:57:13 2024
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- langcheck.piml -->
-<!-- $Id: langcheck.piml,v 1.35 2024/04/27 03:28:12 raeburn Exp $ -->
+<!-- $Id: langcheck.piml,v 1.36 2024/06/13 12:57:13 raeburn Exp $ -->
<!--
@@ -80,7 +80,8 @@
} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' ||
'<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' ||
'<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16' || '<DIST />' eq 'ubuntu18' ||
- '<DIST />' eq 'ubuntu20' || '<DIST />' eq 'ubuntu22' || '<DIST />' eq 'ubuntu24') {
+ '<DIST />' eq 'ubuntu20' || '<DIST />' eq 'ubuntu22' || '<DIST />' eq 'ubuntu24' ||
+ '<DIST />' eq 'debian12') {
if (open(PIPE,"cat /etc/default/locale |grep '^LANG' |")) {
print "Checking OS language";
if (<PIPE> =~ /^LANG=en/) {
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.1065 doc/loncapafiles/loncapafiles.lpml:1.1066
--- doc/loncapafiles/loncapafiles.lpml:1.1065 Sat Jun 1 15:55:01 2024
+++ doc/loncapafiles/loncapafiles.lpml Thu Jun 13 12:57:13 2024
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.1065 2024/06/01 15:55:01 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.1066 2024/06/13 12:57:13 raeburn Exp $ -->
<!--
@@ -259,7 +259,7 @@
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/httpd/conf</targetdir>
<targetdir dist='suse9.2 suse9.3 sles9'>etc/httpd</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24 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'>etc/apache2</targetdir>
+ <targetdir dist='debian5 debian6 debian12 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24 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'>etc/apache2</targetdir>
<categoryname>standard</categoryname>
<description>web configuration files</description>
</directory>
@@ -267,7 +267,7 @@
<protectionlevel>modest_delete</protectionlevel>
<targetdir dist='default'>etc/httpd/conf/rewrites</targetdir>
<targetdir dist='suse9.2 suse9.3 sles9'>etc/httpd/rewrites</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24 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'>etc/apache2/rewrites</targetdir>
+ <targetdir dist='debian5 debian6 debian12 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24 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'>etc/apache2/rewrites</targetdir>
<categoryname>standard</categoryname>
<description>
default configuration files to enable/disable http:// -> https:// rewrites
@@ -1065,7 +1065,7 @@
<file>
<source>loncom/loncapa.conf</source>
<target dist='default'>etc/httpd/conf/loncapa.conf</target>
-<target dist='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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>etc/apache2/loncapa.conf</target>
+<target dist='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 debian5 debian6 debian12 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>etc/apache2/loncapa.conf</target>
<categoryname>conf</categoryname>
<description>
<p>
@@ -1108,7 +1108,7 @@
<file type="postaboutversion">
<source>loncom/loncapa_apache.conf</source>
<target dist='default'>etc/httpd/conf/loncapa_apache.conf</target>
-<target dist='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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>etc/apache2/loncapa_apache.conf</target>
+<target dist='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 debian5 debian6 debian12 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>etc/apache2/loncapa_apache.conf</target>
<categoryname>static conf</categoryname>
<description>
The goal of this file is to implement all LON-CAPA specific
@@ -1128,7 +1128,7 @@
<file>
<source>loncom/loncapa_apache_local.conf</source>
<target dist='default'>etc/httpd/conf/loncapa_apache_local.conf</target>
-<target dist='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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>etc/apache2/loncapa_apache_local.conf</target>
+<target dist='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 debian5 debian6 debian12 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>etc/apache2/loncapa_apache_local.conf</target>
<categoryname>static conf</categoryname>
<description>
Documentation file describing how to add domain-specific Apache configuration
@@ -1141,7 +1141,7 @@
<file>
<source>loncom/startup.pl</source>
<target dist='default'>etc/httpd/conf/startup.pl</target>
-<target dist='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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>etc/apache2/startup.pl</target>
+<target dist='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 debian5 debian6 debian12 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>etc/apache2/startup.pl</target>
<categoryname>static conf</categoryname>
<description>
This file provides initializations for perl handlers. It adjusts what
@@ -1152,7 +1152,7 @@
</file>
<link>
<linkto>etc/apache2</linkto>
-<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>
+<target dist='debian5 debian6 debian12 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>
etc/apache2/conf
</target>
<categoryname>symbolic link</categoryname>
@@ -1163,7 +1163,7 @@
<file>
<source>loncom/rewrites/loncapa_rewrite_off.conf</source>
<target dist='default'>etc/httpd/conf/loncapa_rewrite.conf</target>
-<target dist='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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>etc/apache2/loncapa_rewrite.conf</target>
+<target dist='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 debian5 debian6 debian12 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>etc/apache2/loncapa_rewrite.conf</target>
<categoryname>conf</categoryname>
<description>
Default rewrite file.
@@ -1175,7 +1175,7 @@
<source>loncom/rewrites/loncapa_rewrite_on.conf</source>
<target dist='default'>etc/httpd/conf/rewrites/loncapa_rewrite_on.conf</target>
<target dist='sles9'>etc/apache/rewrites/loncapa_rewrite_on.conf</target>
-<target dist='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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>etc/apache2/rewrites/loncapa_rewrite_on.conf</target>
+<target dist='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 debian5 debian6 debian12 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>etc/apache2/rewrites/loncapa_rewrite_on.conf</target>
<categoryname>static conf</categoryname>
<description>
File to copy to /etc/apache2/loncapa_rewrite.conf (SuSE/SLES/Debian/Ubuntu LTS) or to /etc/httpd/conf/loncapa_rewrite.conf to enable rewriting of
@@ -1186,7 +1186,7 @@
<source>loncom/rewrites/loncapa_rewrite_off.conf</source>
<target dist='default'>etc/httpd/conf/rewrites/loncapa_rewrite_off.conf</target>
<target dist='sles9'>etc/apache/rewrites/loncapa_rewrite_off.conf</target>
-<target dist='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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>etc/apache2/rewrites/loncapa_rewrite_off.conf</target>
+<target dist='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 debian5 debian6 debian12 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>etc/apache2/rewrites/loncapa_rewrite_off.conf</target>
<categoryname>static conf</categoryname>
<description>
File to copy to /etc/apache2/loncapa_rewrite.conf (SuSE/SLES/Debian/Ubuntu LTS) or to /etc/httpd/conf/loncapa_rewrite.conf to disable rewriting of
@@ -7289,7 +7289,7 @@
<file>
<source>loncom/mime.types</source>
<target dist='default'>etc/httpd/conf/mime.types</target>
-<target dist='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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>etc/apache2/mime.types</target>
+<target dist='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 debian5 debian6 debian12 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>etc/apache2/mime.types</target>
<categoryname>www static conf</categoryname>
<description>Expanded mime.types</description>
</file>
@@ -8906,7 +8906,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 fedora30 fedora31 fedora32 fedora33 fedora34 fedora35 fedora36 fedora37 fedora38 fedora39 fedora40 sles15 ubuntu18 ubuntu20 ubuntu22 ubuntu24 rhes8 centos8 oracle7 oracle8 rocky8 alma8 centos8-stream centos9-stream rhes9 oracle9 rocky9 alma9'>home/httpd/perl/loncontrol</target>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 fedora33 fedora34 fedora35 fedora36 fedora37 fedora38 fedora39 fedora40 sles15 debian12 ubuntu18 ubuntu20 ubuntu22 ubuntu24 rhes8 centos8 oracle7 oracle8 rocky8 alma8 centos8-stream centos9-stream rhes9 oracle9 rocky9 alma9'>home/httpd/perl/loncontrol</target>
<categoryname>root script</categoryname>
<description>
Controls the launching/halting of lonc, lond, and lonsql processes.
@@ -8915,7 +8915,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 fedora30 fedora31 fedora32 fedora33 fedora34 fedora35 fedora36 fedora37 fedora38 fedora39 fedora40 sles15 ubuntu18 ubuntu20 ubuntu22 ubuntu24 rhes8 centos8 oracle7 oracle8 rocky8 alma8 centos8-stream centos9-stream rhes9 oracle9 rocky9 alma9'>etc/systemd/system/loncontrol.service</target>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 fedora33 fedora34 fedora35 fedora36 fedora37 fedora38 fedora39 fedora40 sles15 debian12 ubuntu18 ubuntu20 ubuntu22 ubuntu24 rhes8 centos8 oracle7 oracle8 rocky8 alma8 centos8-stream centos9-stream rhes9 oracle9 rocky9 alma9'>etc/systemd/system/loncontrol.service</target>
<categoryname>static conf</categoryname>
<description>
Controls the launching/halting of lon-capa daemons by loncontrol in systemd
@@ -8969,7 +8969,7 @@
loncom/init.d/loncontrol
</dependencies>
</file>
-<file dist="fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 fedora33 fedora34 fedora35 fedora36 fedora37 fedora38 fedora39 fedora40 sles15 ubuntu18 ubuntu20 ubuntu22 ubuntu24 rhes8 centos8 oracle7 oracle8 rocky8 alma8 centos8-stream centos9-stream rhes9 oracle9 rocky9 alma9">
+<file dist="fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 fedora33 fedora34 fedora35 fedora36 fedora37 fedora38 fedora39 fedora40 sles15 debian12 ubuntu18 ubuntu20 ubuntu22 ubuntu24 rhes8 centos8 oracle7 oracle8 rocky8 alma8 centos8-stream centos9-stream rhes9 oracle9 rocky9 alma9">
<source>loncom/init.d/loncontrol.service</source>
<target>etc/systemd/system/loncontrol.service</target>
<description>
@@ -8978,7 +8978,7 @@
<installscript dist="fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 fedora32 fedora33 fedora34 fedora35 fedora36 fedora37 fedora38 fedora39 fedora40 sles15 rhes8 centos8 oracle7 oracle8 rocky8 alma8 centos8-stream centos9-stream rhes9 oracle9 rocky9 alma9">
-c '/usr/bin/systemctl enable loncontrol.service'
</installscript>
- <installscript dist="ubuntu18 ubuntu20 ubuntu22 ubuntu24">
+ <installscript dist="debian12 ubuntu18 ubuntu20 ubuntu22 ubuntu24">
-c '/bin/systemctl enable loncontrol.service'
</installscript>
<dependencies>loncom/init.d/loncontrol.service</dependencies>
Index: doc/loncapafiles/modify_config_files.piml
diff -u doc/loncapafiles/modify_config_files.piml:1.54 doc/loncapafiles/modify_config_files.piml:1.55
--- doc/loncapafiles/modify_config_files.piml:1.54 Sat Apr 27 03:28:12 2024
+++ doc/loncapafiles/modify_config_files.piml Thu Jun 13 12:57:13 2024
@@ -3,7 +3,7 @@
<!-- modify_config_files.piml -->
<!-- Matthew Hall -->
-<!-- $Id: modify_config_files.piml,v 1.54 2024/04/27 03:28:12 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.55 2024/06/13 12:57:13 raeburn Exp $ -->
<!--
@@ -68,7 +68,8 @@
('<DIST />' eq 'rocky8') || ('<DIST />' eq 'alma8') ||
('<DIST />' eq 'centos8-stream') || ('<DIST />' eq 'centos9-stream') ||
('<DIST />' eq 'rhes9') || ('<DIST />' eq 'oracle9') ||
- ('<DIST />' eq 'rocky9') || ('<DIST />' eq 'alma9')) {
+ ('<DIST />' eq 'rocky9') || ('<DIST />' eq 'alma9') ||
+ ('<DIST />' eq 'debian12')) {
$mysqlcmd = '/bin/systemctl restart mariadb.service';
} elsif (('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'ubuntu20') ||
('<DIST />' eq 'ubuntu22') || ('<DIST />' eq 'ubuntu24')) {
Index: doc/loncapafiles/ntpcheck.piml
diff -u doc/loncapafiles/ntpcheck.piml:1.56 doc/loncapafiles/ntpcheck.piml:1.57
--- doc/loncapafiles/ntpcheck.piml:1.56 Sat Apr 27 03:28:12 2024
+++ doc/loncapafiles/ntpcheck.piml Thu Jun 13 12:57:13 2024
@@ -3,7 +3,7 @@
<!-- ntpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: ntpcheck.piml,v 1.56 2024/04/27 03:28:12 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.57 2024/06/13 12:57:13 raeburn Exp $ -->
<!--
@@ -51,7 +51,8 @@
('<DIST />' eq 'rocky8') || ('<DIST />' eq 'alma8') ||
('<DIST />' eq 'centos8-stream') || ('<DIST />' eq 'centos9-stream') ||
('<DIST />' eq 'rhes9') || ('<DIST />' eq 'oracle9') ||
- ('<DIST />' eq 'rocky9') || ('<DIST />' eq 'alma9')) {
+ ('<DIST />' eq 'rocky9') || ('<DIST />' eq 'alma9') ||
+ ('<DIST />' eq 'debian12')) {
print "For more information on chronyd please see https://chrony.tuxfamily.org/\n";
} else {
print "For more information on ntpd please see http://www.ntp.org/\n";
@@ -84,11 +85,12 @@
('<DIST />' eq 'alma8') || ('<DIST />' eq 'centos8-stream') ||
('<DIST />' eq 'centos9-stream') || ('<DIST />' eq 'rhes9') ||
('<DIST />' eq 'oracle9') || ('<DIST />' eq 'rocky9') ||
- ('<DIST />' eq 'alma9')) {
+ ('<DIST />' eq 'alma9') || ('<DIST />' eq 'debian12')) {
$NTPD = 'ntpd';
my $binname = $NTPD;
if (('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'ubuntu20') ||
- ('<DIST />' eq 'ubuntu22') || ('<DIST />' eq 'ubuntu24')) {
+ ('<DIST />' eq 'ubuntu22') || ('<DIST />' eq 'ubuntu24') ||
+ ('<DIST />' eq 'debian12')) {
$NTPD = 'chrony';
$name = $NTPD;
$binname = 'chronyd';
@@ -171,7 +173,7 @@
('<DIST />' eq 'alma8') || ('<DIST />' eq 'centos8-stream') ||
('<DIST />' eq 'centos9-stream') || ('<DIST />' eq 'rhes9') ||
('<DIST />' eq 'oracle9') || ('<DIST />' eq 'rocky9') ||
- ('<DIST />' eq 'alma9')) {
+ ('<DIST />' eq 'alma9') || ('<DIST />' eq 'debian12')) {
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.55 doc/loncapafiles/picins_check.piml:1.56
--- doc/loncapafiles/picins_check.piml:1.55 Sat Apr 27 03:28:12 2024
+++ doc/loncapafiles/picins_check.piml Thu Jun 13 12:57:13 2024
@@ -3,7 +3,7 @@
<!-- picins_check.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: picins_check.piml,v 1.55 2024/04/27 03:28:12 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.56 2024/06/13 12:57:13 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 fedora30 fedora31 fedora32 fedora33 fedora34 fedora35 fedora36 fedora37 fedora38 fedora39 fedora40 rhes6 scientific6 centos6 oracle6 rhes7 scientific7 centos7 oracle7 rhes8 centos8 oracle8 rocky8 alma8 centos8-stream centos9-stream rhes9 oracle9 rocky9 alma9 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 ubuntu20 ubuntu22 ubuntu24">
+<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 fedora31 fedora32 fedora33 fedora34 fedora35 fedora36 fedora37 fedora38 fedora39 fedora40 rhes6 scientific6 centos6 oracle6 rhes7 scientific7 centos7 oracle7 rhes8 centos8 oracle8 rocky8 alma8 centos8-stream centos9-stream rhes9 oracle9 rocky9 alma9 sles11 sles12 sles15 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 debian12 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24">
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.60 doc/loncapafiles/rpmcheck.piml:1.61
--- doc/loncapafiles/rpmcheck.piml:1.60 Sat Apr 27 03:28:12 2024
+++ doc/loncapafiles/rpmcheck.piml Thu Jun 13 12:57:13 2024
@@ -3,7 +3,7 @@
<!-- phpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: rpmcheck.piml,v 1.60 2024/04/27 03:28:12 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.61 2024/06/13 12:57:13 raeburn Exp $ -->
<!--
@@ -98,7 +98,7 @@
print "**** WARNING: LONCAPA-prerequisites does not appear to be installed.\n";
}
</perlscript>
-<perlscript dist="debian5 debian6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24" mode="fg">
+<perlscript dist="debian5 debian6 debian12 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24" mode="fg">
my $hasprereqs = 0;
if (open(PIPE,"dpkg -l loncapa-prerequisites|")) {
my @lines = (<PIPE>);
Index: doc/loncapafiles/sanitycheck.piml
diff -u doc/loncapafiles/sanitycheck.piml:1.49 doc/loncapafiles/sanitycheck.piml:1.50
--- doc/loncapafiles/sanitycheck.piml:1.49 Wed Apr 24 21:57:16 2024
+++ doc/loncapafiles/sanitycheck.piml Thu Jun 13 12:57:13 2024
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- sanitycheck.piml -->
-<!-- $Id: sanitycheck.piml,v 1.49 2024/04/24 21:57:16 raeburn Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.50 2024/06/13 12:57:13 raeburn Exp $ -->
<!--
@@ -61,7 +61,7 @@
<file>
<target dist='default'>/var/lib/mysql/mysql.sock</target>
<target dist='suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 sles12 sles15'>/var/run/mysql/mysql.sock</target>
-<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>/var/run/mysqld/mysqld.sock</target>
+<target dist='debian5 debian6 debian12 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>/var/run/mysqld/mysqld.sock</target>
<perlscript mode='fg'>
unless
(-e '<TARGET />') # Does file exist?
@@ -113,7 +113,7 @@
</file>
<file>
<target dist='default'>/etc/httpd/conf/loncapa.conf</target>
-<target dist='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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>/etc/apache2/loncapa.conf</target>
+<target dist='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 debian5 debian6 debian12 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>/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.95 doc/loncapafiles/updatequery.piml:1.96
--- doc/loncapafiles/updatequery.piml:1.95 Wed Apr 24 21:57:16 2024
+++ doc/loncapafiles/updatequery.piml Thu Jun 13 12:57:13 2024
@@ -1,6 +1,6 @@
<!-- updatequery.piml -->
-<!-- $Id: updatequery.piml,v 1.95 2024/04/24 21:57:16 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.96 2024/06/13 12:57:13 raeburn Exp $ -->
<!--
@@ -62,7 +62,7 @@
sub get_static_config {
# get LCperlvars from loncapa_apache.conf
my $confdir = '/etc/httpd/conf/';
- if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || '<DIST />' eq 'sles15' || '<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 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2' || '<DIST />' eq 'suse12.3' || '<DIST />' eq 'suse13.1' || '<DIST />' eq 'suse13.2' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16' || '<DIST />' eq 'ubuntu18' || '<DIST />' eq 'ubuntu20' || '<DIST />' eq 'ubuntu22' || '<DIST />' eq 'ubuntu24') {
+ if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || '<DIST />' eq 'sles15' || '<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 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2' || '<DIST />' eq 'suse12.3' || '<DIST />' eq 'suse13.1' || '<DIST />' eq 'suse13.2' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16' || '<DIST />' eq 'ubuntu18' || '<DIST />' eq 'ubuntu20' || '<DIST />' eq 'ubuntu22' || '<DIST />' eq 'ubuntu24' || '<DIST />' eq 'debian12') {
$confdir = '/etc/apache2/';
}
my $filename='loncapa_apache.conf';
@@ -1301,7 +1301,7 @@
# update loncapa.conf
my $confdir = '/etc/httpd/conf/';
-if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || '<DIST />' eq 'sles15' || '<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 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2' || '<DIST />' eq 'suse12.3' || '<DIST />' eq 'suse13.1' || '<DIST />' eq 'suse13.2' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16' || '<DIST />' eq 'ubuntu18' || '<DIST />' eq 'ubuntu20' || '<DIST />' eq 'ubuntu22' || '<DIST />' eq 'ubuntu24') {
+if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || '<DIST />' eq 'sles15' || '<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 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2' || '<DIST />' eq 'suse12.3' || '<DIST />' eq 'suse13.1' || '<DIST />' eq 'suse13.2' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16' || '<DIST />' eq 'ubuntu18' || '<DIST />' eq 'ubuntu20' || '<DIST />' eq 'ubuntu22' || '<DIST />' eq 'ubuntu24' || '<DIST />' eq 'debian12') {
$confdir = '/etc/apache2/';
}
my $filename='loncapa.conf';
@@ -1358,7 +1358,7 @@
</file>
<file>
<target dist='default'>/etc/httpd/conf/</target>
-<target dist='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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>/etc/apache2/</target>
+<target dist='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 debian5 debian6 debian12 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>/etc/apache2/</target>
<perlscript mode='fg'>
# read values from loncapa.conf
my $confdir = "<TARGET />";
Index: doc/loncapafiles/webserver.piml
diff -u doc/loncapafiles/webserver.piml:1.59 doc/loncapafiles/webserver.piml:1.60
--- doc/loncapafiles/webserver.piml:1.59 Wed Apr 24 21:57:16 2024
+++ doc/loncapafiles/webserver.piml Thu Jun 13 12:57:13 2024
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- webserver.piml -->
-<!-- $Id: webserver.piml,v 1.59 2024/04/24 21:57:16 raeburn Exp $ -->
+<!-- $Id: webserver.piml,v 1.60 2024/06/13 12:57:13 raeburn Exp $ -->
<!--
@@ -48,7 +48,7 @@
<target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>
<target dist='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'>/etc/apache2/default-server.conf</target>
<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/etc/apache2/sites-available/loncapa</target>
-<target dist='ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>/etc/apache2/conf-available/loncapa.conf</target>
+<target dist='debian12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>/etc/apache2/conf-available/loncapa.conf</target>
<note>This is for Apache 1.X for Red Hat 4ES, Fedora 2, 3 and 4, SusSE 9.2 and 9.3, and SLES 9 distributions. This is for Apache 2.X for Fedora 5, Red Hat 5, CentOS 5, Scientific Linux 5, Oracle Linux 5, SuSE 10.1, SLES 10, Debian 5, Ubuntu LTS 8 and later distributions</note>
<dependencies dist='default'>
/etc/httpd/conf/httpd.conf
@@ -59,7 +59,7 @@
<dependencies dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>
/etc/apache2/sites-available/loncapa
</dependencies>
-<dependencies dist='ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>
+<dependencies dist='debian12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>
/etc/apache2/conf-available/loncapa.conf
</dependencies>
<dependencies dist='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'>
Index: doc/loncapafiles/wrap_setuid.piml
diff -u doc/loncapafiles/wrap_setuid.piml:1.55 doc/loncapafiles/wrap_setuid.piml:1.56
--- doc/loncapafiles/wrap_setuid.piml:1.55 Sat Apr 27 03:28:12 2024
+++ doc/loncapafiles/wrap_setuid.piml Thu Jun 13 12:57:13 2024
@@ -3,7 +3,7 @@
<!-- wrap_setuid.piml -->
<!-- Guy Albertelli -->
-<!-- $Id: wrap_setuid.piml,v 1.55 2024/04/27 03:28:12 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.56 2024/06/13 12:57:13 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 fedora30 fedora31 fedora32 fedora33 fedora34 fedora35 fedora36 fedora37 fedora38 fedora39 fedora40 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24 rhes7 centos7 scientific7 oracle7 rhes8 centos8 oracle8 rocky8 alma8 centos8-stream centos9-stream rhes9 oracle9 rocky9 alma9">
+<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 fedora31 fedora32 fedora33 fedora34 fedora35 fedora36 fedora37 fedora38 fedora39 fedora40 debian12 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24 rhes7 centos7 scientific7 oracle7 rhes8 centos8 oracle8 rocky8 alma8 centos8-stream centos9-stream rhes9 oracle9 rocky9 alma9">
$fslist='<TARGET />';
open(FIND, "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) -print|");
More information about the LON-CAPA-cvs
mailing list