Author: renodr
Date: Thu Sep 6 15:54:04 2018
New Revision: 20466
Log:
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
Added:
trunk/BOOK/networking/netlibs/libpsl.xml (contents, props changed)
- copied, changed from r20465, trunk/BOOK/template/template.xml
Modified:
trunk/BOOK/gnome.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/networking/netlibs/curl.xml
trunk/BOOK/networking/netlibs/glib-networking.xml
trunk/BOOK/networking/netlibs/libsoup.xml
trunk/BOOK/networking/netlibs/netlibs.xml
trunk/BOOK/networking/netprogs/wget.xml
trunk/BOOK/networking/netutils/networkmanager.xml
trunk/BOOK/packages.ent
trunk/BOOK/template/template.xml
Modified: trunk/BOOK/gnome.ent
==============================================================================
--- trunk/BOOK/gnome.ent Thu Sep 6 14:16:55 2018 (r20465)
+++ trunk/BOOK/gnome.ent Thu Sep 6 15:54:04 2018 (r20466)
@@ -11,6 +11,7 @@
<!ENTITY gnome-minor-24 "3.24">
<!ENTITY gnome-minor-26 "3.26">
<!ENTITY gnome-minor-28 "3.28">
+<!ENTITY gnome-minor-30 "3.30">
<!-- Chapter 30 -->
<!-- Platform -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Thu Sep 6 14:16:55
2018 (r20465)
+++ trunk/BOOK/introduction/welcome/changelog.xml Thu Sep 6 15:54:04
2018 (r20466)
@@ -45,6 +45,18 @@
<para>September 6th, 2018</para>
<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>
</listitem>
Modified: trunk/BOOK/networking/netlibs/curl.xml
==============================================================================
--- trunk/BOOK/networking/netlibs/curl.xml Thu Sep 6 14:16:55 2018
(r20465)
+++ trunk/BOOK/networking/netlibs/curl.xml Thu Sep 6 15:54:04 2018
(r20466)
@@ -10,8 +10,6 @@
<!ENTITY curl-size "2.2 MB">
<!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. -->
]>
<sect1 id="curl" xreflabel="cURL-&curl-version;">
@@ -88,13 +86,13 @@
<xref linkend="c-ares"/>,
<xref linkend="gnutls"/>,
<xref linkend="libidn2"/>,
+ <xref linkend="libpsl"/>,
<xref linkend="libssh2"/>,
<xref linkend="mitkrb"/>,
<xref linkend="nghttp2"/>,
<xref linkend="openldap"/>,
<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
PolarSSL), and
@@ -107,7 +105,7 @@
tests completed happily without it, although the test for unit1323
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>
<para condition="html" role="usernotes">User Notes:
@@ -159,7 +157,10 @@
<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
Warning: smb server unexpectedly alive
@@ -180,7 +181,7 @@
may fail that depend on optional dependencies that may not be installed
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:
TESTDONE: 957 tests out of 959 reported OK: 99%
Modified: trunk/BOOK/networking/netlibs/glib-networking.xml
==============================================================================
--- trunk/BOOK/networking/netlibs/glib-networking.xml Thu Sep 6 14:16:55
2018 (r20465)
+++ trunk/BOOK/networking/netlibs/glib-networking.xml Thu Sep 6 15:54:04
2018 (r20466)
@@ -5,12 +5,12 @@
%general-entities;
<!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)">
]>
@@ -76,7 +76,7 @@
<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"/>
</para>
@@ -110,7 +110,7 @@
meson --prefix=/usr \
-Dlibproxy_support=false \
- -Dca_certificates_path=/etc/ssl/ca-bundle.crt .. &&
+ -Dpkcs11_support=true .. &&
ninja</userinput></screen>
<para>
@@ -141,6 +141,7 @@
-->
<sect2 role="configuration">
<title>Configuring Glib-networking</title>
+ <!-- This breaks the libsoup tests -->
<sect3 id="glib-networking-config">
<title>Config Files</title>
Copied and modified: trunk/BOOK/networking/netlibs/libpsl.xml (from r20465,
trunk/BOOK/template/template.xml)
==============================================================================
--- trunk/BOOK/template/template.xml Thu Sep 6 14:16:55 2018
(r20465, copy source)
+++ trunk/BOOK/networking/netlibs/libpsl.xml Thu Sep 6 15:54:04 2018
(r20466)
@@ -4,209 +4,103 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!-- Place this in the packages.ent file
- <!ENTITY TEMPLATE-version "">
- -->
-
- <!ENTITY TEMPLATE-download-http "http://";>
- <!ENTITY TEMPLATE-download-ftp "ftp://";>
- <!ENTITY TEMPLATE-md5sum "MD5 sum">
- <!ENTITY TEMPLATE-size "?? MB">
- <!ENTITY TEMPLATE-buildsize "?? MB">
- <!ENTITY TEMPLATE-time "?? SBU">
-<!-- SBU should be rounded to integer if greater than 10, to one
- decimal if below 10, and should be "less than 0.1 SBU" if
- below 0.1. If the SBU without parallelisation is too long,
- it is acceptable to give the value "with parallelism=N", where
- N is the number of threads used. Note that some build system
- automatically fix N equal to the number of available CPU cores
- on the machine. -->
+ <!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)">
]>
-<!-- Try to keep the indentation used in this file-->
-<sect1 id="TEMPLATE" xreflabel="TEMPLATE-&TEMPLATE-version;">
- <?dbhtml filename="TEMPLATE.html"?>
+<sect1 id="libpsl" xreflabel="libpsl-&libpsl-version;">
+ <?dbhtml filename="libpsl.html"?>
<sect1info>
- <!-- this part gets updated when you commit, IFF 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
- svn propset svn:keywords "Date LastChangedBy" path/to/thisfile.xml -->
<othername>$LastChangedBy$</othername>
<date>$Date$</date>
</sect1info>
- <!-- No other tags inside any title.
- Use Title Case in All Titles -->
- <title>TEMPLATE-&TEMPLATE-version;</title>
+ <title>libpsl-&libpsl-version;</title>
- <indexterm zone="TEMPLATE">
- <primary sortas="a-TEMPLATE">TEMPLATE</primary>
+ <indexterm zone="libpsl">
+ <primary sortas="a-libpsl">libpsl</primary>
</indexterm>
- <!--Required section-->
<sect2 role="package">
- <title>Introduction to TEMPLATE</title>
+ <title>Introduction to libpsl</title>
<para>
- The <application>TEMPLATE</application> package contains...
- This is useful for...
+ 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>
- <!-- if it builds but hasn't been tested: -->
- &lfs8?_built;
- <!-- if it works: -->
- &lfs8?_checked;
+ &lfs83_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
<para>
- Download (HTTP): <ulink url="&TEMPLATE-download-http;"/>
+ Download (HTTP): <ulink url="&libpsl-download-http;"/>
</para>
</listitem>
<listitem>
<para>
- Download (FTP): <ulink url="&TEMPLATE-download-ftp;"/>
+ Download (FTP): <ulink url="&libpsl-download-ftp;"/>
</para>
</listitem>
<listitem>
<para>
- Download MD5 sum: &TEMPLATE-md5sum;
+ Download MD5 sum: &libpsl-md5sum;
</para>
</listitem>
<listitem>
<para>
- Download size: &TEMPLATE-size;
+ Download size: &libpsl-size;
</para>
</listitem>
<listitem>
<para>
- Estimated disk space required: &TEMPLATE-buildsize;
+ Estimated disk space required: &libpsl-buildsize;
</para>
</listitem>
<listitem>
<para>
- Estimated build time: &TEMPLATE-time;
+ Estimated build time: &libpsl-time;
</para>
</listitem>
</itemizedlist>
- <!-- As required -->
- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
- <itemizedlist spacing="compact">
- <listitem>
- <para>
- Required patch:
- <ulink
url="&patch-root;/TEMPLATE-&TEMPLATE-version;-patch_name-patch_version.patch"/>
- </para>
- </listitem>
- </itemizedlist>
-
- <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
+ <bridgehead renderas="sect3">libpsl Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="BLFS_DEPENDENCY"/> <!-- notice no period as this is not
- a sentence. If there are more than two, they must be separated by commas
- with the last member having "and" in front of it. The use of a serial
- comma is preferred (a comma after the next to last member before the
- "and"). BLFS_DEPENDENCY should be an "id" attribute defined somewhere
- in the book (usually in a <sect1>). -->
- <xref role="runtime" linkend="RUNTIME_DEPENDENCY"/> (runtime)
- <!-- Specifying that a dependency is a runtime one, may avoid circular
- dependencies. Add role="runtime" to help jhalfs -->
+ <xref linkend="libidn2"/> and
+ <xref linkend="python2"/>
</para>
- <!-- It may be nice to have a separate section for runtime dependencies.
- Do it as follow. -->
- <bridgehead renderas="sect4">Required at runtime</bridgehead>
- <para role="required">
- <xref role="runtime" linkend="RUNTIME_DEPENDENCY"/>
- </para>
-
- <!-- As required -->
- <bridgehead renderas="sect4">Recommended</bridgehead>
- <para role="recommended">
- <xref linkend="BLFS_DEPENDENCY"/> <!-- notice no period as this is not
- a sentence. See above for the use of "and" and commas. Normally, neither
- required nor recommended dependencies should be <ulink>. -->
- <xref linkend="ANOTHER_RECOMMENDED_DEP"/> (required if building
- <xref role="nodep" linkend="SOME_FANCY_PACKAGE"/>) <!-- You may need
- to refer to another package, which is not a dependency. Use the role
- attibute with value "nodep". -->
- <!-- See above for runtime dependencies -->
- </para>
-
- <!-- As required -->
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="BLFS_DEPENDENCY"/> and
- <ulink url="http://www.some.url/";>EXTERNAL DEPENDENCY</ulink>
- <!-- notice no period as this is not a sentence. See above for the use
- of commas and "and". The order should <xref> before <ulink>.-->
- <!-- See above how to refer to another package, which is not a
- dependency. -->
+ <xref linkend="gtk-doc"/> (for documentation) and
+ <xref linkend="valgrind"/> (for tests)
</para>
<para condition="html" role="usernotes">
- User Notes: <ulink url="&blfs-wiki;/TEMPLATE"/>
- </para>
- </sect2>
-
- <!-- Optional section for packages that need a specific kernel
- configuration-->
- <sect2 role="kernel" id="TEMPLATE-kernel">
- <title>Kernel Configuration</title>
-
- <para>
- Enable the following options in the kernel configuration and recompile
the
- kernel if necessary:
- </para>
-
-<!-- Spaces are significant in <screen> sections -->
-<screen><literal>Master section --->
- Subsection --->
- [*] Required parameter [CONFIG_REQU_PAR]
- <*> Required parameter (not as module) [CONFIG_REQU_PAR_NMOD]
- <*/M> Required parameter (could be a module) [CONFIG_REQU_PAR_MOD]
- <*/M/ > Optional parameter [CONFIG_OPT_PAR]
- [ ] Incompatible parameter [CONFIG_INCOMP_PAR]
- < > Incompatible parameter (even as module)
[CONFIG_INCOMP_PAR_MOD]</literal></screen>
-
- <para>
- Select the appropriate sub-options that appear when the above options are
- selected. As much as possible, the layout should be the same as in
- kernel menus.
+ User Notes: <ulink url="&blfs-wiki;/libpsl"/>
</para>
-
- <indexterm zone="TEMPLATE TEMPLATE-kernel">
- <primary sortas="d-TEMPLATE">TEMPLATE</primary>
- </indexterm>
</sect2>
- <!--Required section-->
<sect2 role="installation">
- <title>Installation of TEMPLATE</title>
+ <title>Installation of libpsl</title>
<para>
- Install <application>TEMPLATE</application> by running the following
+ Install <application>libpsl</application> by running the following
commands:
</para>
-<!-- Spaces are significant in <screen> sections -->
<screen><userinput>./configure --prefix=/usr --disable-static &&
make</userinput></screen>
- <!-- Optional section. Use one of the two mentions below about a test
- suite, delete the line that is not applicable. Of course, if the
- test suite uses syntax other than 'make check', revise the
- line to reflect the actual syntax to run the test suite -->
-
- <para>
- This package does not come with a test suite.
- </para>
-
<para>
To test the results, issue: <command>make check</command>.
</para>
@@ -218,136 +112,23 @@
<screen role="root"><userinput>make install</userinput></screen>
</sect2>
- <!--Optional section-->
- <sect2 role="commands">
- <title>Command Explanations</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
- href="../../xincludes/static-libraries.xml"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
- href="../../xincludes/gtk-doc-rebuild.xml"/>
-
- <para>
- <command>COMMAND</command>: This command does something.
- </para>
-
- <para>
- <parameter>--PARAMETER</parameter>: This parameter does something
- mandatory for BLFS purposes. It will be in the instructions above. It is
- not optional and is why it is listed as a parameter and not an option.
- </para>
-
- <para>
- <option>--OPTION</option>: This option does something optionally per the
- user's desires. It is not listed in the instructions above, but instead,
- is listed here because many (some) readers may want to include it.
- </para>
- </sect2>
-
- <sect2 role="using">
- <title>Using TEMPLATE</title>
-
- <para>
- Stuff about how to use TEMPLATE to do something. This section is rarely
- used.
- </para>
- </sect2>
-
- <!--Optional section-->
- <sect2 role="configuration">
- <title>Configuring TEMPLATE</title>
-
- <sect3 id="TEMPLATE-config">
- <title>Config Files</title>
- <para>
- <filename>~/.Configfilename1</filename> and
- <filename>/etc/path/Configfilename2</filename> <!-- notice no period
as this is not a sentence-->
- </para>
-
- <indexterm zone="TEMPLATE TEMPLATE-config">
- <primary sortas="e-AA.Configfilename1">~/.Configfilename1</primary>
- </indexterm>
-
- <indexterm zone="TEMPLATE TEMPLATE-config">
- <primary
- sortas="e-etc-path-Configfilename2">/etc/path/Configfilename2</primary>
- </indexterm>
- </sect3>
-
- <sect3><title>Configuration Information</title>
-
- <para>
- Blah blah blah about config.
- </para>
-
-<screen><userinput>USER CONFIG COMMANDS</userinput></screen>
-
-<screen role="root"><userinput>ROOT CONFIG COMMANDS</userinput></screen>
-
- <!-- File creation. Add the appropriate <indexterm> block if needed.-->
- <para>
- Create the file .... for ...
- </para>
-
-<screen role="root"><userinput>cat >> /PATH/FILENAME << "EOF"
-<literal># Begin FILENAME
-
-TEXT
-
-# End FILENAME</literal>
-EOF</userinput></screen>
- </sect3>
-
- <sect3 id="TEMPLATE-init">
- <title>Boot Script</title>
-
- <para>
- To automatically start the <command>TEMPLATE</command> daemon when the
- system is rebooted, install the
- <filename>/etc/rc.d/init.d/TEMPLATE</filename> bootscript from the
- <xref linkend="bootscripts" revision="sysv"/>
- <xref linkend="systemd-units" revision="systemd"/> package as the
- <systemitem class="username">root</systemitem> user:
- </para>
-
- <indexterm zone="TEMPLATE TEMPLATE-init">
- <primary sortas="f-TEMPLATE">TEMPLATE</primary>
- </indexterm>
-
-<screen role="root"><userinput>make install-TEMPLATE</userinput></screen>
- </sect3>
- </sect2>
-
- <!--Required section-->
<sect2 role="content">
<title>Contents</title>
<segmentedlist>
- <segtitle>Installed Program(s)</segtitle>
- <segtitle>Installed Librar(y,ies)</segtitle>
- <segtitle>Installed Director(y,ies)</segtitle>
-
- <!-- If there were no programs, libraries, or directories created, then
- we would list the section as "None". However, a decision must have
- been made to change the "None" to just removing the whole section
- because I've noticed that many packages have had the "None"
- removed and the section completely removed as well. The reasoning
- was that by putting "None", it appears as we know there are none.
- Without anything it appears as we are not sure. -->
+ <segtitle>Installed Program</segtitle>
+ <segtitle>Installed Library</segtitle>
+ <segtitle>Installed Directories</segtitle>
<seglistitem>
<seg>
- PROGRAM1, PROGRAM2 and PROGRAM3.
+ psl
</seg>
<seg>
- libLIBRARY1.so, libLIBRARY2.so and libLIBRARY3.so.
+ libpsl.so
</seg>
<seg>
- /etc/TEMPLATE, /usr/include/TEMPLATE, /usr/lib/TEMPLATE,
- /usr/share/TEMPLATE-&TEMPLATE-version;,
- /usr/share/doc/TEMPLATE-&TEMPLATE-version; and
- /var/lib/TEMPLATE.
+ None
</seg>
</seglistitem>
</segmentedlist>
@@ -357,42 +138,26 @@
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
- <!-- If the program or library name conflicts (is the same) as the
- package name, add -prog or -lib to the varlistentry entity id
- and the 2nd entry of the indexterm zone entity -->
-
- <varlistentry id="PROGRAM1">
- <term><command>PROGRAM1</command></term>
- <listitem>
- <para>
- does this ..... (end the sentence with a period).
- </para>
- <indexterm zone="TEMPLATE PROGRAM1">
- <primary sortas="b-PROGRAM1">PROGRAM1</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="PROGRAM2">
- <term><command>PROGRAM2</command></term>
+ <varlistentry id="psl">
+ <term><command>psl</command></term>
<listitem>
<para>
- does this ..... (end the sentence with a period).
+ queries the Public Suffix List.
</para>
- <indexterm zone="TEMPLATE PROGRAM2">
- <primary sortas="b-PROGRAM2">PROGRAM2</primary>
+ <indexterm zone="libpsl psl">
+ <primary sortas="b-psl">psl</primary>
</indexterm>
</listitem>
</varlistentry>
- <varlistentry id="libLIBRARY1">
- <term><filename class="libraryfile">libLIBRARY1.so</filename></term>
+ <varlistentry id="libpsl-lib">
+ <term><filename class="libraryfile">libpsl.so</filename></term>
<listitem>
<para>
- contains functions that ..... (end the sentence with a period).
+ contains a library used to access the Public Suffix List.
</para>
- <indexterm zone="TEMPLATE libLIBRARY1">
- <primary sortas="c-libLIBRARY1">libLIBRARY1.so</primary>
+ <indexterm zone="libpsl libpsl-lib">
+ <primary sortas="c-libpsl">libpsl.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: trunk/BOOK/networking/netlibs/libsoup.xml
==============================================================================
--- trunk/BOOK/networking/netlibs/libsoup.xml Thu Sep 6 14:16:55 2018
(r20465)
+++ trunk/BOOK/networking/netlibs/libsoup.xml Thu Sep 6 15:54:04 2018
(r20466)
@@ -5,13 +5,13 @@
%general-entities;
<!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)">
]>
<sect1 id="libsoup" xreflabel="libsoup-&libsoup-version;">
@@ -79,6 +79,7 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
<xref linkend="glib-networking"/>,
+ <xref linkend="libpsl"/>,
<xref linkend="libxml2"/> and
<xref linkend="sqlite"/>
</para>
@@ -113,35 +114,42 @@
commands:
</para>
-<screen><userinput>./configure --prefix=/usr --disable-static &&
-make</userinput></screen>
+<screen><userinput>mkdir build &&
+cd build &&
+
+meson --prefix=/usr -Dvapi=true .. &&
+ninja</userinput></screen>
<para>
- To test the results, issue: <command>make check</command>.
+ To test the results, issue: <command>ninja test</command>.
</para>
<para>
Now, as the <systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
</sect2>
<sect2 role="commands">
<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
+ <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>
@@ -163,7 +171,8 @@
<seg>
/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>
</segmentedlist>
Modified: trunk/BOOK/networking/netlibs/netlibs.xml
==============================================================================
--- trunk/BOOK/networking/netlibs/netlibs.xml Thu Sep 6 14:16:55 2018
(r20465)
+++ trunk/BOOK/networking/netlibs/netlibs.xml Thu Sep 6 15:54:04 2018
(r20466)
@@ -31,6 +31,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libnl.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libtirpc.xml"/>
Modified: trunk/BOOK/networking/netprogs/wget.xml
==============================================================================
--- trunk/BOOK/networking/netprogs/wget.xml Thu Sep 6 14:16:55 2018
(r20465)
+++ trunk/BOOK/networking/netprogs/wget.xml Thu Sep 6 15:54:04 2018
(r20466)
@@ -86,10 +86,10 @@
<xref linkend="perl-http-daemon"/> (for the test suite),
<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>
<para condition="html" role="usernotes">
Modified: trunk/BOOK/networking/netutils/networkmanager.xml
==============================================================================
--- trunk/BOOK/networking/netutils/networkmanager.xml Thu Sep 6 14:16:55
2018 (r20465)
+++ trunk/BOOK/networking/netutils/networkmanager.xml Thu Sep 6 15:54:04
2018 (r20466)
@@ -115,6 +115,7 @@
<para role="optional">
<xref linkend="bluez"/>,
<xref linkend="gtk-doc"/>,
+ <xref linkend="libpsl"/>,
<xref linkend="qt5"/> (for examples),
<xref linkend="ModemManager"/>,
<xref linkend="valgrind"/>,
@@ -122,7 +123,6 @@
<ulink url="http://www.digip.org/jansson/";>Jansson</ulink>,
<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>
</para>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Thu Sep 6 14:16:55 2018 (r20465)
+++ trunk/BOOK/packages.ent Thu Sep 6 15:54:04 2018 (r20466)
@@ -467,16 +467,17 @@
<!ENTITY c-ares-version "1.14.0">
<!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">
<!ENTITY libnl-version "3.4.0">
<!ENTITY libnl-dl-version "3_4_0">
<!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">
<!ENTITY nghttp2-version "1.33.0">
Modified: trunk/BOOK/template/template.xml
==============================================================================
--- trunk/BOOK/template/template.xml Thu Sep 6 14:16:55 2018 (r20465)
+++ trunk/BOOK/template/template.xml Thu Sep 6 15:54:04 2018 (r20466)
@@ -28,7 +28,7 @@
<?dbhtml filename="TEMPLATE.html"?>
<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
svn propset svn:keywords "Date LastChangedBy" path/to/thisfile.xml -->
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
