From 6e1616e2f6c43619bdde51c3be25b9983feeaa3c Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Sun, 3 Mar 2013 16:07:38 +0000
Subject: [PATCH] NetworkManager 0.9.8.0.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11047 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                            |  4 +--
 gnome/core/network-manager-applet.xml  | 10 +++---
 networking/netutils/networkmanager.xml | 42 ++++++++++++++------------
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/general.ent b/general.ent
index 9152214554..8df0e50675 100644
--- a/general.ent
+++ b/general.ent
@@ -481,7 +481,7 @@ export -f as_root</userinput></screen>
 <!ENTITY avahi-version                "0.6.31">
 <!ENTITY bind-version                 "9.9.2">
 <!ENTITY mod_dnssd-version            "0.6">
-<!ENTITY NetworkManager-version       "0.9.6.4">
+<!ENTITY NetworkManager-version       "0.9.8.0">
 <!ENTITY nmap-version                 "6.01">
 <!ENTITY traceroute-version           "2.0.18">
 <!ENTITY whois-version                "5.0.20">
@@ -702,7 +702,7 @@ export -f as_root</userinput></screen>
 <!ENTITY gnome-terminal-version       "3.6.1">
 <!ENTITY zenity-version               "3.6.0">
 <!ENTITY metacity-version             "2.34.13">
-<!ENTITY network-manager-applet-version "0.9.6.4">
+<!ENTITY network-manager-applet-version "0.9.8.0">
 <!ENTITY caribou-version              "0.4.4.2">
 <!ENTITY mutter-version               "3.6.2">
 <!ENTITY gnome-shell-version          "3.6.2">
diff --git a/gnome/core/network-manager-applet.xml b/gnome/core/network-manager-applet.xml
index d5eb456583..4fd6db4b59 100644
--- a/gnome/core/network-manager-applet.xml
+++ b/gnome/core/network-manager-applet.xml
@@ -8,9 +8,9 @@
            "&gnome-download-http;/network-manager-applet/0.9/network-manager-applet-&network-manager-applet-version;.tar.xz">
   <!ENTITY network-manager-applet-download-ftp
            "&gnome-download-ftp;/network-manager-applet/0.9/network-manager-applet-&network-manager-applet-version;.tar.xz">
-  <!ENTITY network-manager-applet-md5sum        "8750d83a1151f5f9b0edd2ffcd4e8fc6">
-  <!ENTITY network-manager-applet-size          "1.1 MB">
-  <!ENTITY network-manager-applet-buildsize     "40 MB">
+  <!ENTITY network-manager-applet-md5sum        "531ce56c51ec86c5d2dc4cbe58649583">
+  <!ENTITY network-manager-applet-size          "1.2 MB">
+  <!ENTITY network-manager-applet-buildsize     "50 MB">
   <!ENTITY network-manager-applet-time          "0.4 SBU">
 ]>
 
@@ -96,7 +96,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <ulink url="&gnome-download-http;/mobile-broadband-provider-info">
-      mobile-broadband-provider-info</ulink>
+      mobile-broadband-provider-info</ulink> and
+      <ulink url="http://ftp.gnome.org/pub/gnome/sources/ModemManager/">
+      ModemManager</ulink> (0.7 and later)
     </para>
 
     <para condition="html" role="usernotes">User Notes:
diff --git a/networking/netutils/networkmanager.xml b/networking/netutils/networkmanager.xml
index b5a469ee04..845cea680f 100644
--- a/networking/netutils/networkmanager.xml
+++ b/networking/netutils/networkmanager.xml
@@ -8,9 +8,9 @@
            "&gnome-download-http;/NetworkManager/0.9/NetworkManager-&NetworkManager-version;.tar.xz">
   <!ENTITY NetworkManager-download-ftp
            "&gnome-download-ftp;/NetworkManager/0.9/NetworkManager-&NetworkManager-version;.tar.xz">
-  <!ENTITY NetworkManager-md5sum        "54ca5200edeb5155086ced43d00b0cad">
-  <!ENTITY NetworkManager-size          "1.9 MB">
-  <!ENTITY NetworkManager-buildsize     "72 MB">
+  <!ENTITY NetworkManager-md5sum        "38d28f6bd9220d85dfff47210706195c">
+  <!ENTITY NetworkManager-size          "2.0 MB">
+  <!ENTITY NetworkManager-buildsize     "105 MB">
   <!ENTITY NetworkManager-time          "1.0 SBU">
 ]>
 
@@ -80,10 +80,11 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="dbus-glib"/>,
+      <xref linkend="intltool"/>,
       <xref linkend="libnl"/>,
-      <xref linkend="nss"/>,
-      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for GUdev), and
-      <xref linkend="wireless_tools"/>
+      <xref linkend="nss"/> and
+      <xref linkend="udev"/> or
+      <xref linkend="udev-extras"/> (for GUdev)
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -93,15 +94,17 @@
       <xref linkend="dhcp"/> (client only),
       <xref linkend="gobject-introspection"/>,
       <xref linkend="iptables"/>,
-      <xref linkend="libsoup"/> and
-      <xref linkend="polkit"/>
+      <xref linkend="libsoup"/>,
+      <xref linkend="polkit"/>,
+      <xref linkend="upower"/> and
+      <xref linkend="vala"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="gtk-doc"/>,
       <ulink url="http://ftp.gnome.org/pub/gnome/sources/ModemManager/">
-      ModemManager</ulink>, and
+      ModemManager</ulink> (0.7 and later), and
       <xref linkend="wpa_supplicant"/> (Built with D-Bus support).
     </para>
 
@@ -148,13 +151,13 @@ make</userinput></screen>
 
     <para>
       <option>--disable-ppp</option>: This parameter disables optional
-      <application>PPP</application> support in <application>NetworkManager</application>.
-      <!-- Omit if you have <xref linkend="ppp"/> installed. -->
+      <application>PPP</application> support in
+      <application>NetworkManager</application>.
     </para>
 
     <para>
-      <parameter>--with-distro=lfs</parameter>: This parameter is only needed if you
-      failed to create <filename>/etc/lfs-release</filename> when you installed LFS.
+      <option>--enable-doc</option>: Use this switch if you have installed
+      <xref linkend="gtk-doc"/> and wish to build the API manuals.
     </para>
 
   </sect2>
@@ -237,9 +240,10 @@ EOF</userinput></screen>
           /usr/include/libnm-glib,
           /usr/include/NetworkManager,
           /usr/lib/NetworkManager,
-          /usr/share/NetworkManager,
-          /var/lib/NetworkManager and
-          /var/run/NetworkManager
+          /usr/share/gtk-doc/html/libnm-glib,
+          /usr/share/gtk-doc/html/libnm-util,
+          /usr/share/gtk-doc/html/NetworkManager and
+          /var/lib/NetworkManager
         </seg>
       </seglistitem>
     </segmentedlist>
@@ -302,7 +306,7 @@ EOF</userinput></screen>
       </varlistentry>
 
       <varlistentry id="libnm-glib">
-        <term><filename class='libraryfile'>libnm-glib.so</filename></term>
+        <term><filename class="libraryfile">libnm-glib.so</filename></term>
         <listitem>
           <para>
             contains functions used by <application>NetworkManager</application>.
@@ -314,7 +318,7 @@ EOF</userinput></screen>
       </varlistentry>
 
       <varlistentry id="libnm-glib-vpn">
-        <term><filename class='libraryfile'>libnm-glib-vpn.so</filename></term>
+        <term><filename class="libraryfile">libnm-glib-vpn.so</filename></term>
         <listitem>
           <para>
             contains functions used by <application>NetworkManager</application>
@@ -327,7 +331,7 @@ EOF</userinput></screen>
       </varlistentry>
 
       <varlistentry id="libnm-util">
-        <term><filename class='libraryfile'>libnm-util.so</filename></term>
+        <term><filename class="libraryfile">libnm-util.so</filename></term>
         <listitem>
           <para>
             contains functions used by <application>NetworkManager</application>