Changeset 3d6e95d for networking

Timestamp:

06/09/2016 11:28:10 PM (8 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

systemd-13485

Children:

26bc008

Parents:

8ee0429

Message:

(systemd) Merge to trunk r17470

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@17472 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

networking

Files:

• netlibs/curl.xml (modified) (1 diff)
• netprogs/ntp.xml (modified) (1 diff)
• netprogs/wpa_supplicant.xml (modified) (1 diff)
• netutils/avahi.xml (modified) (2 diffs)
• netutils/bind-utils.xml (modified) (1 diff)
• netutils/networkmanager.xml (modified) (3 diffs)
• netutils/wireshark.xml (modified) (3 diffs)

networking/netlibs/curl.xml

@@ -7 +7 @@
   <!ENTITY curl-download-http "https://curl.haxx.se/download/curl-&curl-version;.tar.lzma">
   <!ENTITY curl-download-ftp  " ">
-  <!ENTITY curl-md5sum        "f14b50657174e3c91d955f7a3e064e8c">
+  <!ENTITY curl-md5sum        "ae5e5e395da413d1fa0864e1d0a3fa57">
   <!ENTITY curl-size          "5.7 MB">
   <!ENTITY curl-buildsize     "57 MB (additional 9 MB for tests)">

networking/netprogs/ntp.xml

@@ -8 +8 @@
 <!--  <!ENTITY ntp-download-ftp  "&gentoo-ftp-repo;/ntp-&ntp-version;.tar.gz">-->
   <!ENTITY ntp-download-ftp  " ">
-  <!ENTITY ntp-md5sum        "46dfba933c3e4bc924d8e55068797578">
-  <!ENTITY ntp-size          "6.8 MB">
-  <!ENTITY ntp-buildsize     "94 MB (with tests)">
+  <!ENTITY ntp-md5sum        "4a8636260435b230636f053ffd070e34">
+  <!ENTITY ntp-size          "6.9 MB">
+  <!ENTITY ntp-buildsize     "102 MB (with tests)">
   <!ENTITY ntp-time          "0.8 SBU (with tests)">
 ]>

networking/netprogs/wpa_supplicant.xml

@@ -189 +189 @@
 
     <para>
-      If you have installed <xref linkend="qt4"/> and wish to build
+      If you have installed <xref linkend="qt5"/> and wish to build
       the <application>WPA Supplicant</application> GUI program, run
       the following commands:

networking/netutils/avahi.xml

@@ -89 +89 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="dbus-python"/>,
-      <xref linkend="pygtk"/> and
-      <xref linkend="qt4"/>
+      <xref linkend="dbus-python"/> and
+      <xref linkend="pygtk"/>
     </para>
 
@@ -173 +172 @@
     <para>
       <parameter>--disable-qt3</parameter>: This parameter disables the
-      building of <application>Qt3</application> mainloop integration.
-    </para>
-
-    <para>
-      <parameter>--disable-qt4</parameter>: This parameter disables the building
-      of <application>Qt4Core</application> mainloop integration. Omit
-      this if you have installed <application>Qt4</application>.
+      attempt to build the obsolete <application>Qt3</application>
+      portions of the package.
+    </para>
+
+    <para>
+      <parameter>--disable-qt4</parameter>: This parameter disables the
+      attempt to build the obsolete <application>Qt4Core</application>
+      portions of the package.
     </para>
 

networking/netutils/bind-utils.xml

@@ -6 +6 @@
   <!ENTITY bind-download-http " ">
   <!ENTITY bind-download-ftp  "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
-  <!ENTITY bind-md5sum          "f2167f42e6f1baad42c637d8771c9675">
+  <!ENTITY bind-md5sum          "361ecc597f25bdbadf2ea44dec1690ce">
   <!ENTITY bind-size            "8.9 MB">
-  <!ENTITY bind-utils-buildsize "128 MB">
+  <!ENTITY bind-utils-buildsize "131 MB">
   <!ENTITY bind-utils-time      "0.6 SBU">
 ]>

networking/netutils/networkmanager.xml

@@ -117 +117 @@
       <xref linkend="ModemManager"/>,
       <xref linkend="pygobject3"/>,
+      <xref linkend="qt5"/> (for examples),
       <xref linkend="valgrind"/>,
       <ulink url="http://libteam.org/">libteam</ulink>,
@@ -136 +137 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr                   \
+    <para>If <xref linkend="qt5"/> is installed and the Qt based
+    examples are desired, fix the configure script:</para>
+
+<screen><userinput>sed -e '/Qt[CDN]/s/Qt/Qt5/g'    \
+   -e 's/moc_location/host_bins/' \
+   -i configure</userinput></screen>
+
+<screen><userinput>CXXFLAGS="-O2 -fPIC"     \
+./configure --prefix=/usr                   \
             --sysconfdir=/etc               \
             --localstatedir=/var            \
@@ -161 +170 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <envar>CXXFLAGS="-O2 -fPIC"</envar>: These compiler options are
+      necessary to build the Qt5 based examples.
+    </para>
 
     <para>

networking/netutils/wireshark.xml

@@ -123 +123 @@
     </bridgehead>
     <para role="optional">
-      <xref linkend="gtk2"/>, or
-      <xref linkend="qt4"/>,
+      <xref linkend="gtk2"/>
     </para>
 
@@ -135 +134 @@
 
       <para>
-        The <application>Qt</application> GUI needs one of <xref linkend=
-        "qt4"/> or <xref linkend="qt5"/>. If both are installed, Qt5
-        is used by default.
+        The <application>Qt</application> GUI needs <xref linkend="qt5"/>.
       </para>
 
@@ -273 +270 @@
     <para>
       <option>--with-qt=[yes/no/4/5]</option>: For the Qt GUI. Default is yes.
-      If both Qt4 and 5 are installed, Qt5 is chosen by default. Notice that the
-      GUI for only one Qt version (either 4 or 5) can be built.
     </para>