Index: openacs-4/packages/acs-bootstrap-installer/installer/tcl/0-acs-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/tcl/0-acs-init.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-bootstrap-installer/installer/tcl/0-acs-init.tcl	11 Sep 2024 06:15:47 -0000	1.5
+++ openacs-4/packages/acs-bootstrap-installer/installer/tcl/0-acs-init.tcl	26 Nov 2024 09:10:54 -0000	1.6
@@ -32,8 +32,8 @@
     #
     # Enable / disable features depending on availability
     #
-    set ::acs::pageroot [expr {$::acs::useNaviServer ? [ns_server pagedir] : [ns_info pageroot]}]
-    set ::acs::tcllib   [expr {$::acs::useNaviServer ? [ns_server tcllib] : [ns_info tcllib]}]
+    set ::acs::pageroot [ns_server pagedir]
+    set ::acs::tcllib   [ns_server tcllib]
     set ::acs::rootdir  [file dirname [string trimright $::acs::tcllib "/"]]
     set ::acs::useNsfProc [expr {[namespace which ::nsf::proc] ne ""}]
 }
Index: openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl	8 Oct 2024 13:16:12 -0000	1.21
+++ openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl	26 Nov 2024 09:10:55 -0000	1.22
@@ -932,7 +932,7 @@
       select content from cr_revisions where revision_id = $revision_id
     " -file $filename
 
-    ns_chmod $filename 0764
+    file attributes $filename -permissions 0764
     ns_log debug "publish::write_multiple_blobs: Wrote revision $revision_id to $filename"
   } $root_path
 }
@@ -957,7 +957,7 @@
   foreach_publish_path $url {
     mkdirs $filename
     template::util::write_file $filename $text
-    ns_chmod $filename 0764
+    file attributes $filename -permissions 0764
     ns_log debug "publish::write_multiple_files: Wrote text to $filename"
   } $root_path
 }
Index: openacs-4/packages/acs-mail/tcl/acs-mail-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/tcl/acs-mail-procs.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-mail/tcl/acs-mail-procs.tcl	12 Feb 2019 17:28:59 -0000	1.14
+++ openacs-4/packages/acs-mail/tcl/acs-mail-procs.tcl	26 Nov 2024 09:10:55 -0000	1.15
@@ -238,7 +238,7 @@
                     } else {
                         # binary content - copy the blob to temp file
                         # that we will then uuencode
-                        set file [ns_tmpnam]
+                        set file [ns_mktemp]
                         db_blob_get_file copy_blob_to_file "
                             select r.content, i.storage_type
                             from cr_revisions r, cr_items i
@@ -349,7 +349,7 @@
             from acs_mail_bodies
             where body_id = :body_id
     }
-    set headers [ns_set new]
+    set headers [ns_set create]
     ns_set put $headers "Message-Id" "<$header_message_id>"
     # taking these out because they are redundant and
     # could conflict with the values in acs_mail_queue_outgoing
Index: openacs-4/packages/xowf/tcl/iprange-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/iprange-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/xowf/tcl/iprange-procs.tcl	3 Sep 2024 15:37:54 -0000	1.2
+++ openacs-4/packages/xowf/tcl/iprange-procs.tcl	26 Nov 2024 09:13:08 -0000	1.3
@@ -22,7 +22,7 @@
     :property {title ""}
 
     :method match {spec ip} {
-      if {[string first / $spec] > -1 && [ns_subnetmatch $spec $ip]} {
+      if {[string first / $spec] > -1 && [ns_ip match $spec $ip]} {
         return 1
       } elseif {[string first * $spec] > -1 && [string match $spec $ip]} {
         return 1