Index: general/genlib/libportal.xml
===================================================================
--- general/genlib/libportal.xml	(revision 36746be9f1e7019ff88b6108aeebf8f033148456)
+++ general/genlib/libportal.xml	(revision 0f870c5f2beba4b86d3f9253e9770b5d65e9266c)
@@ -7,8 +7,8 @@
   <!ENTITY libportal-download-http "https://github.com/flatpak/libportal/releases/download/&libportal-version;/libportal-&libportal-version;.tar.xz">
   <!ENTITY libportal-download-ftp  " ">
-  <!ENTITY libportal-md5sum        "dffd58a937dfbabc873e51029dc587f3">
+  <!ENTITY libportal-md5sum        "2ca3806e18e2197dd87d22379405a624">
   <!ENTITY libportal-size          "52 KB">
-  <!ENTITY libportal-buildsize     "3.5 MB">
-  <!ENTITY libportal-time          "less than 0.1 SBU">
+  <!ENTITY libportal-buildsize     "3.6 MB">
+  <!ENTITY libportal-time          "0.1 SBU">
 
 ]>
Index: general/graphlib/opencv.xml
===================================================================
--- general/graphlib/opencv.xml	(revision 36746be9f1e7019ff88b6108aeebf8f033148456)
+++ general/graphlib/opencv.xml	(revision 0f870c5f2beba4b86d3f9253e9770b5d65e9266c)
@@ -7,8 +7,8 @@
   <!ENTITY opencv-download-http     "https://github.com/opencv/opencv/archive/&opencv-version;/opencv-&opencv-version;.tar.gz">
   <!ENTITY opencv-download-ftp      " ">
-  <!ENTITY opencv-md5sum            "2205d3169238ec1f184438a96de68513">
-  <!ENTITY opencv-size              "84 MB">
-  <!ENTITY opencv-buildsize         "706 MB">
-  <!ENTITY opencv-time              "2.9 SBU (using parallelism=4)">
+  <!ENTITY opencv-md5sum            "d3141f649ab2d76595fdd8991ee15c55">
+  <!ENTITY opencv-size              "85 MB">
+  <!ENTITY opencv-buildsize         "765 MB">
+  <!ENTITY opencv-time              "4.0 SBU (using parallelism=4)">
 
 
@@ -113,4 +113,5 @@
       <xref linkend="gtk3"/>,
       <xref linkend="jasper"/>,
+      <xref linkend="libexif"/>,
       <xref linkend="libjpeg"/>,
       <xref linkend="libpng"/>,
@@ -127,21 +128,23 @@
       <xref linkend="java"/>,
       <xref linkend="python2"/>,
+      <ulink url="https://www.netlib.org/blas/">blas</ulink>,
       <ulink url="https://developer.nvidia.com/cuda-zone">Cuda</ulink>,
       <ulink url="http://eigen.tuxfamily.org/">Eigen</ulink>,
       <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
-      <ulink url="http://gcd.joewheaton.org/">GCD</ulink>,
+      <!--<ulink url="http://gcd.joewheaton.org/">GCD</ulink>,-->
       <ulink url="http://www.gdal.org/">GDAL</ulink>,
-      <ulink url="https://www.jai.com/technology/interfaces">GigEVisionSDK</ulink>,
-      <ulink url="http://jackaudio.org/">JACK</ulink>,
+      <!--<ulink url="https://www.jai.com/technology/interfaces">GigEVisionSDK</ulink>,-->
+      <!--<ulink url="http://jackaudio.org/">JACK</ulink>,-->
+      <ulink url="http://www.netlib.org/lapack/">lapack</ulink>,
       <ulink url="https://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
-      <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
+      <!--<ulink url="http://www.gphoto.org/">libgphoto2</ulink>,-->
       <ulink url="http://www.numpy.org/">NumPy</ulink>,
-      <ulink url="http://structure.io/openni">OpenNI</ulink>,
+      <!--<ulink url="http://structure.io/openni">OpenNI</ulink>,
       <ulink url="http://plantuml.sourceforge.net/">PlanetUML</ulink>,
-      <ulink url="https://www.alliedvision.com/en/support/software-downloads.html">PvAPI</ulink>,
-      <ulink url="https://github.com/oneapi-src/oneTBB">Threading Building Blocks (TBB)</ulink>,
-      <ulink url="http://unicap-imaging.org/">UniCap</ulink>,
-      <ulink url="http://www.vtk.org/">VTK - The Visualization Toolkit</ulink>, and
-      <ulink url="http://www.ximea.com/">XIMEA</ulink>
+      <ulink url="https://www.alliedvision.com/en/support/software-downloads.html">PvAPI</ulink>,-->
+      <ulink url="https://github.com/oneapi-src/oneTBB">Threading Building Blocks (TBB)</ulink>, and
+      <!--<ulink url="http://unicap-imaging.org/">UniCap</ulink>,-->
+      <ulink url="http://www.vtk.org/">VTK - The Visualization Toolkit</ulink>,
+      <!--<ulink url="http://www.ximea.com/">XIMEA</ulink>-->
     </para>
 
@@ -224,4 +227,5 @@
           opencv_annotation,
           opencv_interactive-calibration,
+          opencv_model_diagnostics,
           opencv_version,
           opencv_visualisation, and
@@ -248,4 +252,6 @@
           /usr/include/opencv4
           /usr/lib/cmake/opencv4,
+          /usr/lib/python&python3-majorver;/site-packages/cv2,
+          /usr/share/licenses/opencv4,
           /usr/share/opencv4, and
           /usr/share/java/opencv4
Index: general/prog/decorator.xml
===================================================================
--- general/prog/decorator.xml	(revision 36746be9f1e7019ff88b6108aeebf8f033148456)
+++ general/prog/decorator.xml	(revision 0f870c5f2beba4b86d3f9253e9770b5d65e9266c)
@@ -7,7 +7,7 @@
   <!ENTITY decorator-download-http "https://files.pythonhosted.org/packages/source/d/decorator/decorator-&decorator-version;.tar.gz">
   <!ENTITY decorator-download-ftp  " ">
-  <!ENTITY decorator-md5sum        "d83c624cce93e6bdfab144821b526e1d">
+  <!ENTITY decorator-md5sum        "c35b2a3446478986e91b15ad1626e152">
   <!ENTITY decorator-size          "36 KB">
-  <!ENTITY decorator-buildsize     "244 KB">
+  <!ENTITY decorator-buildsize     "308 KB">
   <!ENTITY decorator-time          "less than 0.1 SBU">
 ]>
@@ -107,8 +107,8 @@
           </seg>
           <seg>
-            /usr/lib/python&python3-majorver;/site-packages/decorator/decorator-&decorator-version;-py&python3-majorver;.egg-info
+            /usr/lib/python&python3-majorver;/site-packages/decorator-&decorator-version;-py&python3-majorver;.egg-info
           </seg>
           <seg>
-            /usr/lib/python&python3-majorver;/site-packages/decorator
+            None
           </seg>
         </seglistitem>
Index: general/sysutils/bluez.xml
===================================================================
--- general/sysutils/bluez.xml	(revision 36746be9f1e7019ff88b6108aeebf8f033148456)
+++ general/sysutils/bluez.xml	(revision 0f870c5f2beba4b86d3f9253e9770b5d65e9266c)
@@ -7,7 +7,7 @@
   <!ENTITY bluez-download-http "&kernel-dl;/linux/bluetooth/bluez-&bluez-version;.tar.xz">
   <!ENTITY bluez-download-ftp  " ">
-  <!ENTITY bluez-md5sum        "e6c51b2aefa7c56ff072819a78611fa5">
+  <!ENTITY bluez-md5sum        "6737ba92a93432dbbd430bd41d7160c9">
   <!ENTITY bluez-size          "2.0 MB">
-  <!ENTITY bluez-buildsize     "68 MB (add 78 MB for tests)">
+  <!ENTITY bluez-buildsize     "83 MB (add 81 MB for tests)">
   <!ENTITY bluez-time          "0.2 SBU (using parallelism=4; add 0.2 SBU for tests)">
 ]>
@@ -105,5 +105,11 @@
     </para>
 
-<screen><literal>[*] Networking support ---&gt;                [CONFIG_NET]
+<screen><literal>
+General Setup ---&gt;
+  [*] Configure standard kernel features (expert users)               [CONFIG_EXPERT]
+    [*] Enable timerfd() system call               [CONFIG_TIMERFD]
+    [*] Enable eventfd() system call               [CONFIG_EVENTFD]
+
+[*] Networking support ---&gt;                [CONFIG_NET]
   &lt;*/M&gt; Bluetooth subsystem support ---&gt;    [CONFIG_BT]
     &lt;*/M&gt; RFCOMM protocol support          [CONFIG_BT_RFCOMM]
@@ -116,6 +122,17 @@
           (Select the appropriate drivers for your Bluetooth hardware)
 
-  &lt;*/M&gt; RF switch subsystem support ----   [CONFIG_RFKILL]</literal></screen>
-
+   &lt;*/M&gt; RF switch subsystem support ----   [CONFIG_RFKILL]
+
+-*- Cryptographic API ---&gt;
+   &lt;*/M*&gt; User-space cryptographic algorithm configuration         [CONFIG_CRYPTO_USER]
+   &lt;*/M*&gt; User-space interface for hash algorithms                 [CONFIG_CRYPTO_USER_API_HASH]
+   &lt;*/M*&gt; User-space interface for symmetric key cipher algorithms [CONFIG_CRYPTO_USER_API_SKCIPHER]
+   &lt;*/M*&gt; MD5 digest algorithm                                     [CONFIG_CRYPTO_MD5]
+   &lt;*/M*&gt; SHA1 digest algorithm                                    [CONFIG_CRYPTO_SHA1]
+
+Security Options ---&gt;
+  &lt;*/M*&gt; Diffie-Hellman operations on retained keys [CONFIG_KEY_DH_OPERATIONS]</literal></screen>
+
+<!--
     <para>
       If you wish to run the testsuite (even if treating this package as a build
@@ -124,8 +141,8 @@
     </para>
 
-<screen><literal>-*- Cryptographic API ---&gt;                                      [CONFIG_CRYPTO]
+<screen><literal>-*- Cryptographic API - - -&gt;                                      [CONFIG_CRYPTO]
   &lt;*/M&gt; User-space interface for hash algorithms                 [CONFIG_CRYPTO_USER_API_HASH]
   &lt;*/M&gt; User-space interface for symmetric key cipher algorithms [CONFIG_CRYPTO_USER_API_SKCIPHER]</literal></screen>
-
+-->
     <indexterm zone="bluez bluez-kernel">
       <primary sortas="d-bluez">bluez</primary>
@@ -310,5 +327,5 @@
       <seglistitem>
         <seg>
-          bccmd, 
+      <!--bccmd, -->
           bluemoon, 
           bluetoothctl, 
@@ -338,4 +355,5 @@
       <?dbhtml list-presentation="table"?>
 
+      <!--
       <varlistentry id="bccmd">
         <term><command>bccmd</command></term>
@@ -350,4 +368,5 @@
         </listitem>
       </varlistentry>
+      -->
 
       <varlistentry id="bluemoon">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 36746be9f1e7019ff88b6108aeebf8f033148456)
+++ introduction/welcome/changelog.xml	(revision 0f870c5f2beba4b86d3f9253e9770b5d65e9266c)
@@ -44,4 +44,24 @@
      <para>May 1st, 2021</para>
      <itemizedlist>
+       <listitem>
+         <para>[renodr] - Update to opencv-4.5.2. Fixes
+         <ulink url="&blfs-ticket-root;14855">#14855</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[renodr] - Update to bluez-5.58. Fixes
+         <ulink url="&blfs-ticket-root;14856">#14856</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[renodr] - Update to decorator-5.0.7 (Python Module). Fixes
+         <ulink url="&blfs-ticket-root;14857">#14857</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[renodr] - Update to stunnel-5.59. Fixes
+         <ulink url="&blfs-ticket-root;14869">#14869</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[renodr] - Update to libportal-0.4. Fixes
+         <ulink url="&blfs-ticket-root;14870">#14870</ulink>.</para>
+       </listitem>
        <listitem>
          <para>[thomas] - Update to bind-9.16.15 (server and utils). Fixes
Index: packages.ent
===================================================================
--- packages.ent	(revision 36746be9f1e7019ff88b6108aeebf8f033148456)
+++ packages.ent	(revision 0f870c5f2beba4b86d3f9253e9770b5d65e9266c)
@@ -38,5 +38,5 @@
 <!ENTITY shadow-version               "4.8.1">
 <!ENTITY ssh-askpass-version          "&openssh-version;">
-<!ENTITY stunnel-version              "5.58">
+<!ENTITY stunnel-version              "5.59">
 <!ENTITY sudo-version                 "1.9.6p1">
 <!ENTITY tripwire-version             "2.4.3.7">
@@ -155,5 +155,5 @@
 <!--<!ENTITY libnfsidmap-version          "0.26">-->
 <!ENTITY libpaper-version             "1.1.24+nmu5">
-<!ENTITY libportal-version            "0.3">
+<!ENTITY libportal-version            "0.4">
 <!ENTITY libqmi-version               "1.28.2">
 <!ENTITY libseccomp-version           "2.5.1">
@@ -230,5 +230,5 @@
 <!ENTITY mypaint-brushes-version      "1.3.0"> <!-- version 1 only -->
 <!ENTITY newt-version                 "0.52.21">
-<!ENTITY opencv-version               "4.5.1">
+<!ENTITY opencv-version               "4.5.2">
 <!ENTITY opencv-contrib-version       "4.5.1">
 <!ENTITY openjpeg-version             "1.5.2">
@@ -280,5 +280,5 @@
 <!ENTITY at-version                   "3.2.1">
 <!ENTITY autofs-version               "5.1.7">
-<!ENTITY bluez-version                "5.56">
+<!ENTITY bluez-version                "5.58">
 <!ENTITY bubblewrap-version           "0.4.1">
 <!ENTITY colord-version               "1.4.5">
@@ -555,5 +555,5 @@
 <!ENTITY dbusmock-version             "0.23.0">
 <!-- <!ENTITY funcsigs-version             "1.0.2"> -->
-<!ENTITY decorator-version            "4.4.2">
+<!ENTITY decorator-version            "5.0.7">
 <!ENTITY Jinja2-version               "2.11.3">
 <!-- libxml2 for Python2 shares the version of libxml2 -->
Index: postlfs/security/stunnel.xml
===================================================================
--- postlfs/security/stunnel.xml	(revision 36746be9f1e7019ff88b6108aeebf8f033148456)
+++ postlfs/security/stunnel.xml	(revision 0f870c5f2beba4b86d3f9253e9770b5d65e9266c)
@@ -139,4 +139,5 @@
     </para>
 
+<!-- Not needed, we're 10+ versions ahead of this now
     <note>
       <para>
@@ -154,4 +155,5 @@
       </para>
     </note>
+-->
 
 <screen revision="sysv"><userinput>./configure --prefix=/usr        \
