Merging upstream version 7.0.18-dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 71 insertions, 0 deletions

diff --git a/doc/manual/en_US/user_Installation.xml b/doc/manual/en_US/user_Installation.xml
index 2661b259..4cf6e403 100644
--- a/doc/manual/en_US/user_Installation.xml
+++ b/doc/manual/en_US/user_Installation.xml
@@ -56,6 +56,50 @@
 
     </sect2>
 
+    <sect2 id="install-win-installdir-req">
+
+      <title>Windows Installation Directory Security Requirements</title>
+
+      <para>
+        The installation directory on Windows hosts must meet certain security requirements, in
+        order to be accepted by the Windows installer.
+      </para>
+
+      <para>
+        This also applies for upgrades of &product-name;.
+      </para>
+      
+      <para>
+        For example, when installing &product-name; into a custom location at
+        X:\Data\MyPrograms\&product-name;, all parent directories of this path
+        (namely X:\Data and X:\Data\MyPrograms) have to meet the following
+        Discretionary Access Control List (DACL):
+        <screen>
+          Users               S-1-5-32-545:(OI)(CI)(RX)
+          Users               S-1-5-32-545:(DE,WD,AD,WEA,WA)
+          Authenticated Users S-1-5-11:(OI)(CI)(RX)
+          Authenticated Users S-1-5-11:(DE,WD,AD,WEA,WA)
+        </screen>
+        Directory inheritance must also be disabled for all parent directories.
+      </para>
+      
+      <para>
+        You can use the <command>icacls</command> Windows command line tool
+        to meet the security requirements. For example:
+        <screen>
+          icacls &lt;Directory&gt; /reset /t /c
+          icacls &lt;Directory&gt; /inheritance:d /t /c
+          icacls &lt;Directory&gt; /grant *S-1-5-32-545:(OI)(CI)(RX)
+          icacls &lt;Directory&gt; /deny  *S-1-5-32-545:(DE,WD,AD,WEA,WA)
+          icacls &lt;Directory&gt; /grant *S-1-5-11:(OI)(CI)(RX)
+          icacls &lt;Directory&gt; /deny  *S-1-5-11:(DE,WD,AD,WEA,WA)
+        </screen>
+        Note that these commands must be repeated for all parent directories
+        (X:\Data and X:\Data\MyPrograms in this example).
+      </para>
+    
+    </sect2>
+
     <sect2 id="install-win-performing">
 
       <title>Performing the Installation</title>
diff --git a/doc/manual/user_ChangeLogImpl.xml b/doc/manual/user_ChangeLogImpl.xml
index ef9aeced..bceaf745 100644
--- a/doc/manual/user_ChangeLogImpl.xml
+++ b/doc/manual/user_ChangeLogImpl.xml
@@ -73,6 +73,33 @@ Rules for adding a changelog entry to make them look more uniform:
                            So, we use chapter and xpointer="xpointer(/chapter/)" with xi:include. -->
   <sect1>
 
+    <title>Version 7.0.18 (2024-05-07)</title>
+
+    <para>This is a maintenance release. The following items were fixed and/or
+      added:</para>
+
+    <itemizedlist>
+
+      <listitem>
+       <para>Networking: Fixed an issue which caused host system crash
+         when VM was using bridged or host-only network adapter (bug #22045)</para>
+      </listitem>
+
+      <listitem>
+       <para>Linux Guest Additions: Added more fixes to prevent UBSAN
+         warnings (bug #21877)</para>
+      </listitem>
+
+      <listitem>
+       <para>Linux Guest Additions: Fixed issue when time stamps were displayed
+         incorrectly within mounted shared folder (bug #22047)</para>
+      </listitem>
+
+    </itemizedlist>
+  </sect1>
+
+  <sect1>
+
     <title>Version 7.0.16 (2024-04-16)</title>
 
     <para>This is a maintenance release. The following items were fixed and/or