Index: gnome.ent
===================================================================
--- gnome.ent	(revision 864abc637afc2381c5e8daa88c981a0af7e13ed8)
+++ gnome.ent	(revision 1ad3510ed7e978f0098c540e0c4e212f9a9ec3de)
@@ -12,4 +12,5 @@
 <!ENTITY gnome-minor-26       "3.26">
 <!ENTITY gnome-minor-28       "3.28">
+<!ENTITY gnome-minor-30       "3.30">
 
 <!-- Chapter 30 -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 864abc637afc2381c5e8daa88c981a0af7e13ed8)
+++ introduction/welcome/changelog.xml	(revision 1ad3510ed7e978f0098c540e0c4e212f9a9ec3de)
@@ -46,4 +46,16 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Added libpsl. Fixes
+          <ulink url="&blfs-ticket-root;11121">#11121</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libsoup-2.64.0. Fixes
+          <ulink url="&blfs-ticket-root;11103">#11103</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to glib-networking-2.58.0. Fixes
+          <ulink url="&blfs-ticket-root;11094">#11094</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to libarchive-3.3.3. Fixes
           <ulink url="&blfs-ticket-root;11115">#11115</ulink>.</para>
Index: networking/netlibs/curl.xml
===================================================================
--- networking/netlibs/curl.xml	(revision 864abc637afc2381c5e8daa88c981a0af7e13ed8)
+++ networking/netlibs/curl.xml	(revision 1ad3510ed7e978f0098c540e0c4e212f9a9ec3de)
@@ -11,6 +11,4 @@
   <!ENTITY curl-buildsize     "43 MB (add 14 MB for tests)">
   <!ENTITY curl-time          "0.2 SBU (add 3.2 SBU for tests)">
-  <!-- Note that I did this package with minimal optional dependencies. I can
-       retest later if needed. -->
 ]>
 
@@ -89,4 +87,5 @@
       <xref linkend="gnutls"/>,
       <xref linkend="libidn2"/>,
+      <xref linkend="libpsl"/>,
       <xref linkend="libssh2"/>,
       <xref linkend="mitkrb"/>,
@@ -95,5 +94,4 @@
       <xref linkend="samba"/>,
       <ulink url="https://launchpad.net/libmetalink/">libmetalink</ulink>,
-      <ulink url="https://github.com/rockdaboot/libpsl">libpsl</ulink>,
       <ulink url="http://rtmpdump.mplayerhq.hu/">librtmp</ulink>,
       <ulink url="https://tls.mbed.org/">mbed TLS</ulink> (formerly known as
@@ -108,5 +106,5 @@
        reported that the tool set in the test case does not exist - ken -->
       <xref linkend="stunnel"/> (for the HTTPS and FTPS tests) and
-      <xref linkend="valgrind"/> (this will slow the tests down)
+      <xref linkend="valgrind"/> (this will slow the tests down and may cause failures.)
     </para>
 
@@ -160,5 +158,8 @@
     <para>
       To run the test suite, issue: <command>make test</command>. Two (of 857) tests
-      fail for unknown reasons.<!--
+      fail for unknown reasons, and all tests fail is valgrind is installed. Moving
+      valgrind out of $PATH is recommended if you wish to run the tests suite while
+      it is installed.
+<!--
 Added by Pierre for curl-7.59.0:
 no stunnel, no valgrind, no options
@@ -181,5 +182,5 @@
       or upstream servers that may not be available, especially for tests 
       numbered 700 and above.
-      Test time may be significantly increase due to hanging tests that fail. i
+      Test time may be significantly increase due to hanging tests that fail. 
 __________
 Added by Bruce for curl-7.60.0:
Index: networking/netlibs/glib-networking.xml
===================================================================
--- networking/netlibs/glib-networking.xml	(revision 864abc637afc2381c5e8daa88c981a0af7e13ed8)
+++ networking/netlibs/glib-networking.xml	(revision 1ad3510ed7e978f0098c540e0c4e212f9a9ec3de)
@@ -6,10 +6,10 @@
 
   <!ENTITY glib-networking-download-http
-    "&gnome-download-http;/glib-networking/2.56/glib-networking-&glib-networking-version;.tar.xz">
+    "&gnome-download-http;/glib-networking/2.58/glib-networking-&glib-networking-version;.tar.xz">
   <!ENTITY glib-networking-download-ftp
-    "&gnome-download-ftp;/glib-networking/2.56/glib-networking-&glib-networking-version;.tar.xz">
-  <!ENTITY glib-networking-md5sum        "456572f1e8fea32ef747541d64508a8e">
-  <!ENTITY glib-networking-size          "164 KB">
-  <!ENTITY glib-networking-buildsize     "4.8 MB (with tests)">
+    "&gnome-download-ftp;/glib-networking/2.58/glib-networking-&glib-networking-version;.tar.xz">
+  <!ENTITY glib-networking-md5sum        "75b14b7e73a67753be9ce307751c661d">
+  <!ENTITY glib-networking-size          "172 KB">
+  <!ENTITY glib-networking-buildsize     "6.4 MB (with tests)">
   <!ENTITY glib-networking-time          "0.1 SBU (with tests)">
 ]>
@@ -77,5 +77,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/>, <!-- needed because version is important -->
+      <xref linkend="glib2"/>,
       <xref linkend="gnutls"/>, and
       <xref linkend="gsettings-desktop-schemas"/>
@@ -111,5 +111,5 @@
 meson --prefix=/usr            \
       -Dlibproxy_support=false \
-      -Dca_certificates_path=/etc/ssl/ca-bundle.crt .. &amp;&amp;
+      -Dpkcs11_support=true .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -142,4 +142,5 @@
   <sect2 role="configuration">
     <title>Configuring Glib-networking</title>
+    <!-- This breaks the libsoup tests -->
 
     <sect3 id="glib-networking-config">
Index: networking/netlibs/libpsl.xml
===================================================================
--- networking/netlibs/libpsl.xml	(revision 1ad3510ed7e978f0098c540e0c4e212f9a9ec3de)
+++ networking/netlibs/libpsl.xml	(revision 1ad3510ed7e978f0098c540e0c4e212f9a9ec3de)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libpsl-download-http "https://github.com/rockdaboot/libpsl/releases/download/libpsl-&libpsl-version;/libpsl-&libpsl-version;.tar.gz">
+  <!ENTITY libpsl-download-ftp  " ">
+  <!ENTITY libpsl-md5sum        "f604f7d30d64bc673870ecf84b860a1e">
+  <!ENTITY libpsl-size          "8.8 MB">
+  <!ENTITY libpsl-buildsize     "54 MB">
+  <!ENTITY libpsl-time          "Less than 0.1 SBU (including tests)">
+]>
+
+<sect1 id="libpsl" xreflabel="libpsl-&libpsl-version;">
+  <?dbhtml filename="libpsl.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libpsl-&libpsl-version;</title>
+
+  <indexterm zone="libpsl">
+    <primary sortas="a-libpsl">libpsl</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libpsl</title>
+
+    <para>
+      The <application>libpsl</application> package provides a library for
+      accessing and resolving information from the Public Suffix List (PSL). The PSL
+      is a set of domain names beyond the standard suffixes, such as .com.
+    </para>
+
+    &lfs83_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libpsl-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libpsl-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libpsl-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libpsl-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libpsl-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libpsl-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libpsl Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libidn2"/> and
+      <xref linkend="python2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> (for documentation) and
+      <xref linkend="valgrind"/> (for tests)
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libpsl"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libpsl</title>
+
+    <para>
+      Install <application>libpsl</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          psl
+        </seg>
+        <seg>
+          libpsl.so
+        </seg>
+        <seg>
+          None
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="psl">
+        <term><command>psl</command></term>
+        <listitem>
+          <para>
+            queries the Public Suffix List.
+          </para>
+          <indexterm zone="libpsl psl">
+            <primary sortas="b-psl">psl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpsl-lib">
+        <term><filename class="libraryfile">libpsl.so</filename></term>
+        <listitem>
+          <para>
+            contains a library used to access the Public Suffix List.
+          </para>
+          <indexterm zone="libpsl libpsl-lib">
+            <primary sortas="c-libpsl">libpsl.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>
Index: networking/netlibs/libsoup.xml
===================================================================
--- networking/netlibs/libsoup.xml	(revision 864abc637afc2381c5e8daa88c981a0af7e13ed8)
+++ networking/netlibs/libsoup.xml	(revision 1ad3510ed7e978f0098c540e0c4e212f9a9ec3de)
@@ -6,11 +6,11 @@
 
   <!ENTITY libsoup-download-http
-           "&gnome-download-http;/libsoup/2.62/libsoup-&libsoup-version;.tar.xz">
+           "&gnome-download-http;/libsoup/2.64/libsoup-&libsoup-version;.tar.xz">
   <!ENTITY libsoup-download-ftp
-           "&gnome-download-ftp;/libsoup/2.62/libsoup-&libsoup-version;.tar.xz">
-  <!ENTITY libsoup-md5sum        "dfbf30af5fb6190bfafc5aa6abcc9dce">
-  <!ENTITY libsoup-size          "1.8 MB">
-  <!ENTITY libsoup-buildsize     "32 MB (with tests)">
-  <!ENTITY libsoup-time          "0.3 SBU">
+           "&gnome-download-ftp;/libsoup/2.64/libsoup-&libsoup-version;.tar.xz">
+  <!ENTITY libsoup-md5sum        "75bf3cb20d5c045922140c5e01b10696">
+  <!ENTITY libsoup-size          "1.7 MB">
+  <!ENTITY libsoup-buildsize     "27 MB (with tests)">
+  <!ENTITY libsoup-time          "0.3 SBU (with tests)">
 ]>
 
@@ -80,4 +80,5 @@
     <para role="required">
       <xref linkend="glib-networking"/>,
+      <xref linkend="libpsl"/>,
       <xref linkend="libxml2"/> and
       <xref linkend="sqlite"/>
@@ -114,9 +115,12 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
+<screen><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+
+meson --prefix=/usr -Dvapi=true .. &amp;&amp;
+ninja</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>ninja test</command>.
     </para>
 
@@ -125,5 +129,5 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
   </sect2>
@@ -132,15 +136,19 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--disable-vala</option>: use this if you have not installed
+    <para>
+      <option>-Dvapi=false</option>: use this if you have not installed
       <application>Vala</application>, e.g. because you are not building 
       <application>GNOME</application>.
     </para>
 
+<!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
+-->
+
+    <para>
+      <option>-Ddoc=true</option>: Use this option if you want to build
+      the documentation. Note that you must have <xref linkend="gtk-doc"/> installed.
+    </para>
 
   </sect2>
@@ -164,5 +172,6 @@
           /usr/include/libsoup-2.4,
           /usr/include/libsoup-gnome-2.4 and
-          /usr/share/gtk-doc/html/libsoup-2.4
+          /usr/share/gtk-doc/html/libsoup-2.4 <!-- only installed if -Ddoc=true is
+          passed. -->
         </seg>
       </seglistitem>
Index: networking/netlibs/netlibs.xml
===================================================================
--- networking/netlibs/netlibs.xml	(revision 864abc637afc2381c5e8daa88c981a0af7e13ed8)
+++ networking/netlibs/netlibs.xml	(revision 1ad3510ed7e978f0098c540e0c4e212f9a9ec3de)
@@ -32,4 +32,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnsl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpsl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libndp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsoup.xml"/>
Index: networking/netprogs/wget.xml
===================================================================
--- networking/netprogs/wget.xml	(revision 864abc637afc2381c5e8daa88c981a0af7e13ed8)
+++ networking/netprogs/wget.xml	(revision 1ad3510ed7e978f0098c540e0c4e212f9a9ec3de)
@@ -87,8 +87,8 @@
       <xref linkend="perl-io-socket-ssl"/> (for the test suite),
       <xref linkend="libidn2"/>,
+      <xref linkend="libpsl"/>,
       <xref linkend="pcre"/>,
-      <xref linkend="python2"/> (built with ssl; for the test suite),
-      <xref linkend="valgrind"/> (for the test suite), and
-      <ulink url="https://github.com/rockdaboot/libpsl/">libpsl</ulink>
+      <xref linkend="python2"/> (built with ssl; for the test suite), and
+      <xref linkend="valgrind"/> (for the test suite)
     </para>
 
Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision 864abc637afc2381c5e8daa88c981a0af7e13ed8)
+++ networking/netutils/networkmanager.xml	(revision 1ad3510ed7e978f0098c540e0c4e212f9a9ec3de)
@@ -116,4 +116,5 @@
       <xref linkend="bluez"/>,
       <xref linkend="gtk-doc"/>,
+      <xref linkend="libpsl"/>,
       <xref linkend="qt5"/> (for examples),
       <xref linkend="ModemManager"/>,
@@ -123,5 +124,4 @@
       <ulink url="https://github.com/Distrotech/libaudit">libaudit</ulink>,
       <ulink url="https://github.com/jpirko/libteam">libteam</ulink>,
-      <ulink url="https://github.com/rockdaboot/libpsl">libpsl</ulink>,
       <ulink url="https://www.samba.org/ftp/ppp/">PPP</ulink>, and
       <ulink url="https://www.roaringpenguin.com/products/pppoe">RP-PPPoE</ulink>
Index: packages.ent
===================================================================
--- packages.ent	(revision 864abc637afc2381c5e8daa88c981a0af7e13ed8)
+++ packages.ent	(revision 1ad3510ed7e978f0098c540e0c4e212f9a9ec3de)
@@ -468,5 +468,5 @@
 <!ENTITY curl-version                 "7.61.0">
 <!ENTITY geoclue2-version             "2.4.11">
-<!ENTITY glib-networking-version      "2.56.1">
+<!ENTITY glib-networking-version      "2.58.0">
 <!ENTITY ldns-version                 "1.7.0">
 <!ENTITY libevent-version             "2.1.8">
@@ -475,7 +475,8 @@
 <!ENTITY libnsl-version               "1.2.0">
 <!ENTITY libpcap-version              "1.9.0">
+<!ENTITY libpsl-version               "0.20.2">
 <!ENTITY libndp-version               "1.7">
 <!ENTITY libproxy-version             "0.4.7">
-<!ENTITY libsoup-version              "2.62.3">
+<!ENTITY libsoup-version              "2.64.0">
 <!ENTITY libtirpc-version             "1.1.4">
 <!ENTITY neon-version                 "0.30.2">
Index: template/template.xml
===================================================================
--- template/template.xml	(revision 864abc637afc2381c5e8daa88c981a0af7e13ed8)
+++ template/template.xml	(revision 1ad3510ed7e978f0098c540e0c4e212f9a9ec3de)
@@ -29,5 +29,5 @@
 
   <sect1info>
-    <!-- this part gets updated when you commit, IFF you set the properties:
+    <!-- this part gets updated when you commit, IF you set the properties:
       first, svn add path/to/thisfile.xml and then
       svn propset svn:mime-type text/plain path/to/thisfile.xml and
