Changeset 1ad3510e

Timestamp:

09/06/2018 10:54:04 PM (5 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/inkscape-core-mods, lazarus, lxqt, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

f3e3b83

Parents:

864abc6

Message:

Add libpsl
Update to libsoup-2.64.0
Update to glib-networking-2.58.0
Add text to cURL regarding test issues with valgrind
Add GNOME-3.30 entity
Typo fix in template

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@20466 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• gnome.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/netlibs/curl.xml (modified) (6 diffs)
• networking/netlibs/glib-networking.xml (modified) (4 diffs)
• networking/netlibs/libpsl.xml (added)
• networking/netlibs/libsoup.xml (modified) (6 diffs)
• networking/netlibs/netlibs.xml (modified) (1 diff)
• networking/netprogs/wget.xml (modified) (1 diff)
• networking/netutils/networkmanager.xml (modified) (2 diffs)
• packages.ent (modified) (2 diffs)
• template/template.xml (modified) (1 diff)

gnome.ent

@@ -12 +12 @@
 <!ENTITY gnome-minor-26       "3.26">
 <!ENTITY gnome-minor-28       "3.28">
+<!ENTITY gnome-minor-30       "3.30">
 
 <!-- Chapter 30 -->

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <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>

networking/netlibs/curl.xml

@@ -11 +11 @@
   <!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 +87 @@
       <xref linkend="gnutls"/>,
       <xref linkend="libidn2"/>,
+      <xref linkend="libpsl"/>,
       <xref linkend="libssh2"/>,
       <xref linkend="mitkrb"/>,
@@ -95 +94 @@
       <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 +106 @@
        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 +158 @@
     <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 +182 @@
       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:

networking/netlibs/glib-networking.xml

@@ -6 +6 @@
 
   <!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 +77 @@
     <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 +111 @@
 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 +142 @@
   <sect2 role="configuration">
     <title>Configuring Glib-networking</title>
+    <!-- This breaks the libsoup tests -->
 
     <sect3 id="glib-networking-config">

networking/netlibs/libsoup.xml

@@ -6 +6 @@
 
   <!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 +80 @@
     <para role="required">
       <xref linkend="glib-networking"/>,
+      <xref linkend="libpsl"/>,
       <xref linkend="libxml2"/> and
       <xref linkend="sqlite"/>
@@ -114 +115 @@
     </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 +129 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
   </sect2>
@@ -132 +136 @@
     <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 +172 @@
           /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>

networking/netlibs/netlibs.xml

@@ -32 +32 @@
   <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"/>

networking/netprogs/wget.xml

@@ -87 +87 @@
       <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>
 

networking/netutils/networkmanager.xml

@@ -116 +116 @@
       <xref linkend="bluez"/>,
       <xref linkend="gtk-doc"/>,
+      <xref linkend="libpsl"/>,
       <xref linkend="qt5"/> (for examples),
       <xref linkend="ModemManager"/>,
@@ -123 +124 @@
       <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>

packages.ent

@@ -468 +468 @@
 <!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 +475 @@
 <!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">

template/template.xml

@@ -29 +29 @@
 
   <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