From 6d3a3af8d37dffaef11f0c43f783e77f6d25bef5 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Wed, 17 Aug 2016 07:16:33 +0000
Subject: [PATCH] Update to setuptools-25.2.0 Update to ModemManager-1.6.0
 Update to network-manager-applet-1.2.4 Update to NetworkManager-1.2.4 Fix my
 mistake in the UPower dependencies (systemd)

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17640 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                                   |  4 +--
 general/prog/setuptools.xml                   |  4 +--
 general/sysutils/modemmanager.xml             | 23 ++++++++++++++---
 general/sysutils/upower.xml                   |  3 +--
 gnome.ent                                     |  2 +-
 gnome/applications/network-manager-applet.xml |  6 ++---
 introduction/welcome/changelog.xml            | 25 +++++++++++++++++++
 networking/netutils/networkmanager.xml        |  6 ++---
 packages.ent                                  |  6 ++---
 9 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/general.ent b/general.ent
index 17829d9883..eb35e754bf 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "15">                   <!-- Always 2 digits -->
+<!ENTITY day          "17">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 15th &year;">
+<!ENTITY releasedate  "August 17th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->
diff --git a/general/prog/setuptools.xml b/general/prog/setuptools.xml
index 7b3f55c66d..9c3d5a7819 100644
--- a/general/prog/setuptools.xml
+++ b/general/prog/setuptools.xml
@@ -6,9 +6,9 @@
 
 <!-- I don't like the way this URL is structured. -renodr -->
   <!ENTITY setuptools-download-http
-           "https://pypi.python.org/packages/1f/7a/6b239a65d452b04ad8068193ae313b386e6fc745b92cd4584fccebecebf0/setuptools-&setuptools-version;.tar.gz">
+           "https://pypi.python.org/packages/9f/32/81c324675725d78e7f6da777483a3453611a427db0145dfb878940469692/setuptools-&setuptools-version;.tar.gz">
   <!ENTITY setuptools-download-ftp  " ">
-  <!ENTITY setuptools-md5sum        "fa165d9e7f9b68378076fa0aa3df8abd">
+  <!ENTITY setuptools-md5sum        "a0dbb65889c46214c691f6c516cf959c">
   <!ENTITY setuptools-size          "600 KB">
   <!ENTITY setuptools-buildsize     "7.6 MB">
   <!ENTITY setuptools-time          "less than 0.1 SBU">
diff --git a/general/sysutils/modemmanager.xml b/general/sysutils/modemmanager.xml
index 4fa768987c..08ddd22bcb 100644
--- a/general/sysutils/modemmanager.xml
+++ b/general/sysutils/modemmanager.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY ModemManager-download-http "http://www.freedesktop.org/software/ModemManager/ModemManager-&ModemManager-version;.tar.xz">
   <!ENTITY ModemManager-download-ftp  " ">
-  <!ENTITY ModemManager-md5sum        "cabb72e7c2ddf6af96eca2c9f3d168a3">
+  <!ENTITY ModemManager-md5sum        "d9d93d2961ee35b4cd8a75a6a8631cb4">
   <!ENTITY ModemManager-size          "1.4 MB">
-  <!ENTITY ModemManager-buildsize     "98 MB">
-  <!ENTITY ModemManager-time          "0.8 SBU (with tests)">
+  <!ENTITY ModemManager-buildsize     "117 MB (with tests)">
+  <!ENTITY ModemManager-time          "0.9 SBU (with tests)">
 ]>
 
 <sect1 id="ModemManager" xreflabel="ModemManager-&ModemManager-version;">
@@ -105,13 +105,22 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr        \
+<screen revision="sysv"><userinput>./configure --prefix=/usr        \
             --sysconfdir=/etc    \
             --localstatedir=/var \
             --enable-more-warnings=no \
             --disable-static     &amp;&amp;
 make</userinput></screen>
 
+<screen revision="systemd"><userinput>
+./configure --prefix=/usr                 \
+            --sysconfdir=/etc             \
+            --localstatedir=/var          \
+            --enable-more-warnings=no     \
+            --with-suspend-resume=systemd \
+            --disable-static &amp;&amp;
+make</userinput></screen>
+
     <para>
       To test the results, issue: <command>make check</command>.
     </para>
@@ -128,6 +137,12 @@ make</userinput></screen>
 
     <title>Command Explanations</title>
 
+    <para revision="systemd">
+      <parameter>--with-suspend-resume=systemd</parameter>: This
+      switch forces <application>ModemManager</application> to use the systemd
+      power management facilities.
+    </para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
 
diff --git a/general/sysutils/upower.xml b/general/sysutils/upower.xml
index 108a6be1f2..5eeacd3a5c 100644
--- a/general/sysutils/upower.xml
+++ b/general/sysutils/upower.xml
@@ -147,10 +147,9 @@ make</userinput></screen>
   <sect2 role="configuration">
     <title>Configuring your kernel for UPower</title>
 
-<!-- FIXME: Update for systemd xref for gnome-power-manager after it goes in -->
     <para>
       To use the command <command>upower -w</command> for information about
-      processor wakeups (this command is used by <phrase revision="sysv"><ulink url="http://ftp.gnome.org/pub/gnome/sources/gnome-power-manager/">gnome-power-manager</ulink></phrase><phrase revision="systemd"><ulink url="gnome-power-manager"/></phrase>)
+      processor wakeups (this command is used by <phrase revision="sysv"><ulink url="http://ftp.gnome.org/pub/gnome/sources/gnome-power-manager/">gnome-power-manager</ulink></phrase><phrase revision="systemd"><xref linkend="gnome-power-manager"/></phrase>)
       you need to enable CONFIG_TIMER_STATS.  This is achieved in
       <command>make menuconfig</command> by going to the &apos;kernel-hacking&apos;
       menu and selecting &apos;Collect kernel timers statistics&apos;.
diff --git a/gnome.ent b/gnome.ent
index 4fd3938fe1..8a5bc8d244 100644
--- a/gnome.ent
+++ b/gnome.ent
@@ -95,7 +95,7 @@
 <!ENTITY gnome-tweak-tool-version       "3.20.1">
 <!ENTITY gnome-weather-version          "3.20.1">
 <!ENTITY gucharmap-version              "9.0.0">
-<!ENTITY network-manager-applet-version "1.2.2">
+<!ENTITY network-manager-applet-version "1.2.4">
 <!ENTITY seahorse-version               "3.20.0">
 <!ENTITY vinagre-version                "3.20.2">
 <!ENTITY vino-version                   "3.20.2">
diff --git a/gnome/applications/network-manager-applet.xml b/gnome/applications/network-manager-applet.xml
index 9e4968a6e4..371c622735 100644
--- a/gnome/applications/network-manager-applet.xml
+++ b/gnome/applications/network-manager-applet.xml
@@ -8,10 +8,10 @@
            "&gnome-download-http;/network-manager-applet/1.2/network-manager-applet-&network-manager-applet-version;.tar.xz">
   <!ENTITY network-manager-applet-download-ftp
            "&gnome-download-ftp;/network-manager-applet/1.2/network-manager-applet-&network-manager-applet-version;.tar.xz">
-  <!ENTITY network-manager-applet-md5sum        "54b29dff37348fce09a567907688e172">
-  <!ENTITY network-manager-applet-size          "1.2 MB">
+  <!ENTITY network-manager-applet-md5sum        "33735627b40e6048635bc4ca4261e835">
+  <!ENTITY network-manager-applet-size          "1.3 MB">
   <!ENTITY network-manager-applet-buildsize     "58 MB (with tests)">
-  <!ENTITY network-manager-applet-time          "0.6 SBU (with tests)">
+  <!ENTITY network-manager-applet-time          "0.5 SBU (with tests)">
 ]>
 
 <sect1 id="network-manager-applet" xreflabel="network-manager-applet-&network-manager-applet-version;">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 22da580ccd..26d3be3b7b 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,31 @@
 
 -->
     
+    <listitem>
+      <para>August 17th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to NetworkManager-1.2.4. Partially
+          fixes <ulink url="&blfs-ticket-root;8147">#8147</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to network-manager-applet-1.2.4. Partially
+          fixes <ulink url="&blfs-ticket-root;8147">#8147</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[renodr] - Fix dependencies in UPower again.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to ModemManager-1.6.0. Fixes
+          <ulink url="&blfs-ticket-root;8113">#8113</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[renodr] - Update to setuptools-25.2.0. Fixes
+          <ulink url="&blfs-ticket-root;8175">#8175</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>August 15th, 2016</para>
       <itemizedlist>
diff --git a/networking/netutils/networkmanager.xml b/networking/netutils/networkmanager.xml
index 5b166d93fd..520a89fbd3 100644
--- a/networking/netutils/networkmanager.xml
+++ b/networking/netutils/networkmanager.xml
@@ -8,10 +8,10 @@
            "&gnome-download-http;/NetworkManager/1.2/NetworkManager-&NetworkManager-version;.tar.xz">
   <!ENTITY NetworkManager-download-ftp
            "&gnome-download-ftp;/NetworkManager/1.2/NetworkManager-&NetworkManager-version;.tar.xz">
-  <!ENTITY NetworkManager-md5sum        "a922bf20c2243c9014fb14c4427ad035">
+  <!ENTITY NetworkManager-md5sum        "66064dfe29c37502a0a9350e5caa46d3">
   <!ENTITY NetworkManager-size          "3.6 MB">
-  <!ENTITY NetworkManager-buildsize     "522 MB (with tests)">
-  <!ENTITY NetworkManager-time          "3.3 SBU (with tests)">
+  <!ENTITY NetworkManager-buildsize     "524 MB (with tests)">
+  <!ENTITY NetworkManager-time          "2.8 SBU (with tests)">
 ]>
 
 <sect1 id="NetworkManager" xreflabel="NetworkManager-&NetworkManager-version;">
diff --git a/packages.ent b/packages.ent
index 92b89932bd..1e345e181e 100644
--- a/packages.ent
+++ b/packages.ent
@@ -245,7 +245,7 @@
 <!ENTITY lm_sensors-version           "3.4.0">
 <!ENTITY logrotate-version            "3.9.1">
 <!ENTITY mc-version                   "4.8.17">
-<!ENTITY ModemManager-version         "1.4.14">
+<!ENTITY ModemManager-version         "1.6.0">
 <!ENTITY obex-data-server-version     "0.4.6">
 <!ENTITY p7zip-version                "16.02">
 <!ENTITY pax-version                  "070715">
@@ -375,7 +375,7 @@
 <!ENTITY pygtk-version                "2.24.0">
 <!ENTITY pyxdg-version                "0.25">
 <!ENTITY PyYAML-version               "3.11">
-<!ENTITY setuptools-version           "25.1.6">
+<!ENTITY setuptools-version           "25.2.0">
 <!ENTITY mako-version                 "1.0.4">
 
 <!-- Part IV -->
@@ -403,7 +403,7 @@
 <!ENTITY bind-minor-version           "9.10">
 <!ENTITY bind-version                 "&bind-minor-version;.4-P2">
 <!ENTITY mod_dnssd-version            "0.6">
-<!ENTITY NetworkManager-version       "1.2.2">
+<!ENTITY NetworkManager-version       "1.2.4">
 <!ENTITY nmap-version                 "7.12">
 <!ENTITY traceroute-version           "2.1.0">
 <!ENTITY whois-version                "5.2.12">