Index: openacs-4/packages/acs-tcl/acs-tcl.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v
diff -u -r1.95.2.21 -r1.95.2.22
--- openacs-4/packages/acs-tcl/acs-tcl.info	1 Mar 2021 09:19:02 -0000	1.95.2.21
+++ openacs-4/packages/acs-tcl/acs-tcl.info	3 Mar 2021 04:32:42 -0000	1.95.2.22
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.10.0d43" url="http://openacs.org/repository/download/apm/acs-tcl-5.10.0d43.apm">
+    <version name="5.10.0d44" url="http://openacs.org/repository/download/apm/acs-tcl-5.10.0d44.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>The Kernel Tcl API library.</summary>
         <release-date>2017-08-06</release-date>
@@ -18,7 +18,7 @@
         <license>GPL version 2</license>
         <maturity>3</maturity>
 
-        <provides url="acs-tcl" version="5.10.0d43"/>
+        <provides url="acs-tcl" version="5.10.0d44"/>
         <requires url="acs-bootstrap-installer" version="5.10.0d10"/>
         <requires url="acs-kernel" version="5.10.0d0"/>
 
Index: openacs-4/packages/acs-tcl/tcl/00-icanuse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/00-icanuse-procs.tcl,v
diff -u -r1.1.2.24 -r1.1.2.25
--- openacs-4/packages/acs-tcl/tcl/00-icanuse-procs.tcl	17 Feb 2021 20:51:42 -0000	1.1.2.24
+++ openacs-4/packages/acs-tcl/tcl/00-icanuse-procs.tcl	3 Mar 2021 04:32:42 -0000	1.1.2.25
@@ -193,6 +193,24 @@
     }
 }
 
+if {[namespace which ::ns_uuid] eq ""} {
+    
+    ad_proc ns_uuid {} {
+        
+        Return a unique ID, based on the combination of high
+        resolution time and a random token. The result should follow
+        the syntax-requirements of the left token of Message-IDs (RFC
+        5322).
+
+        The result does not follow the format of RFC 4122 UUIDs, but
+        this is just for backwards compatiblity, when no recent
+        NaviServer is used.
+        
+    } {
+        return "[clock clicks]-[sec_random_token]"
+    }
+}
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/general-comments/general-comments.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/general-comments.info,v
diff -u -r1.18 -r1.18.2.1
--- openacs-4/packages/general-comments/general-comments.info	7 Aug 2017 23:48:12 -0000	1.18
+++ openacs-4/packages/general-comments/general-comments.info	3 Mar 2021 04:32:42 -0000	1.18.2.1
@@ -8,7 +8,7 @@
     <singleton-p>t</singleton-p>
     <auto-mount>comments</auto-mount>
 
-    <version name="5.10.0d1" url="http://openacs.org/repository/download/apm/general-comments-5.10.0d1.apm">
+    <version name="5.10.0d2" url="http://openacs.org/repository/download/apm/general-comments-5.10.0d2.apm">
         <owner url="mailto:dave@thedesignexperience.org">Dave Bauer</owner>
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
         <summary>Service to provide comment entry and display on objects.</summary>
@@ -18,10 +18,10 @@
         <license>GPL</license>
         <maturity>2</maturity>
 
-        <provides url="general-comments" version="5.10.0d1"/>
+        <provides url="general-comments" version="5.10.0d2"/>
 	<requires url="acs-kernel" version="5.9.1"/>
         <requires url="acs-content-repository" version="5.9.1"/>
-        <requires url="acs-tcl" version="5.9.1"/>
+        <requires url="acs-tcl" version="5.10.0d44"/>
         <requires url="acs-messaging" version="5.9.1"/>
 
         <callbacks>
Index: openacs-4/packages/general-comments/tcl/general-comments-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/tcl/general-comments-procs.tcl,v
diff -u -r1.25.2.4 -r1.25.2.5
--- openacs-4/packages/general-comments/tcl/general-comments-procs.tcl	23 Feb 2021 16:18:41 -0000	1.25.2.4
+++ openacs-4/packages/general-comments/tcl/general-comments-procs.tcl	3 Mar 2021 04:32:42 -0000	1.25.2.5
@@ -36,8 +36,7 @@
 } {
 
     # Generate a unique id for the message
-    # result from proc comes enveloped in <>
-    set rfc822_id [string range [acs_mail_lite::generate_message_id] 1 end-1]
+    set rfc822_id [ns_uuid]
 
     db_transaction {