Update udev-lfs scripts

Update to systemd-197
Reformat 'Rebooting the System' recommendations


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10093 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

7 files changed, 65 insertions, 37 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 84a3671a9..f608b1df0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,20 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2013-01-09</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Reformat 'Rebooting the System'
+          recommendations.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update udev-lfs scripts.  Update to
+          systemd-197.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
 
     <listitem>
       <para>2013-01-02</para>
@@ -59,21 +73,6 @@
     </listitem>
 
     <listitem>
-      <para>2013-01-01</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Add additional recommendations for
-          additional packages in the 'Rebooting the System'
-          section.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Remove obsolete --enable-mpbsd from gmp 
-          instructions. Thanks to hauradou for the report.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
       <para>2012-12-31</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 5bfa5d6db..de5d3b968 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -53,10 +53,6 @@
 
 <screen><userinput remap="pre">tar -xvf ../&udev-lfs;.tar.bz2</userinput></screen>
 
-    <para>Fix a typo in the <userinput>udevadm</userinput> usage output:</para>
-
-<screen><userinput remap="pre">sed -i -e 's/create/update/' src/udev/udevadm-hwdb.c</userinput></screen>
-
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make -f &udev-lfs;/Makefile.lfs</userinput></screen>
diff --git a/chapter09/reboot.xml b/chapter09/reboot.xml
index 6ab7d1c52..7700b2e93 100644
--- a/chapter09/reboot.xml
+++ b/chapter09/reboot.xml
@@ -49,17 +49,34 @@
     url='&blfs-root;/view/svn/postlfs/openssl.html'>openssl</ulink>.
     </para></listitem>
 
+    <listitem><para>To make fetching files over the internet easier, install 
+    <ulink url='&blfs-root;/view/svn/basicnet/wget.html'>wget</ulink>.
+    </para></listitem>
+
     <listitem><para>If one or more of your disk drives have a GUID partition
     table (GPT), either <ulink
     url='&blfs-root;/view/svn/postlfs/gptfdisk.html'>gptfdisk</ulink> or <ulink
     url='&blfs-root;/view/svn/postlfs/parted.html'>parted</ulink> will be useful.
     </para></listitem>
 
-    <listitem><para>Finally, a review of configuration files such as
-    /etc/vimrc, /etc/dircolors, /etc/profile, /etc/bashrc, /etc/hosts,
-    /etc/inputrc, /etc/resolv.conf, /root/.bash_profile, and /root/.bashrc is
-    also appropriate at this point.  </para></listitem>
-
+    <listitem><para>Finally, a review of the following configuration files 
+    is also appropriate at this point.  </para>
+
+      <itemizedlist>
+        <listitem><para>/etc/bashrc                  </para></listitem>
+        <listitem><para>/etc/dircolors               </para></listitem>
+        <listitem><para>/etc/fstab                   </para></listitem>
+        <listitem><para>/etc/hosts                   </para></listitem>
+        <listitem><para>/etc/inputrc                 </para></listitem>
+        <listitem><para>/etc/profile                 </para></listitem>
+        <listitem><para>/etc/resolv.conf             </para></listitem>
+        <listitem><para>/etc/vimrc                   </para></listitem>
+        <listitem><para>/root/.bash_profile          </para></listitem>
+        <listitem><para>/root/.bashrc                </para></listitem>
+        <listitem><para>/etc/sysconfig/network       </para></listitem>
+        <listitem><para>/etc/sysconfig/ifconfig.eth0 </para></listitem>
+      </itemizedlist>
+    </listitem>
   </itemizedlist>
 
   <para>Now that we have said that, lets move on to booting our shiny new LFS
diff --git a/general.ent b/general.ent
index e1c0bad5c..710daff68 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20130102">
-<!ENTITY releasedate "January 2, 2013">
+<!ENTITY version "SVN-20130109">
+<!ENTITY releasedate "January 2, 2019">
 <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.3">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 608962241..de8da51e8 100644
--- a/packages.ent
+++ b/packages.ent
@@ -524,10 +524,10 @@
 <!ENTITY texinfo-ch6-du "24 MB">
 <!ENTITY texinfo-ch6-sbu "0.2 SBU">
 
-<!ENTITY systemd-version "196">
-<!ENTITY systemd-size    "1,928 KB">
+<!ENTITY systemd-version "197">
+<!ENTITY systemd-size    "2,012 KB">
 <!ENTITY systemd-url     "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5     "05ebd7f108e420e2b4e4810ea4b3c810">
+<!ENTITY systemd-md5     "56a860dceadfafe59f40141eb5223743">
 <!ENTITY systemd-home    "http://www.freedesktop.org/wiki/Software/systemd/">
 <!ENTITY systemd-ch6-du  "23 MB">
 <!ENTITY systemd-ch6-sbu "0.1 SBU">
@@ -540,10 +540,10 @@
 <!ENTITY tzdata-ch6-du "6.4 MB">
 <!ENTITY tzdata-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY udev-lfs        "udev-lfs-&systemd-version;-4">
-<!ENTITY udev-lfs-size   "18 KB">
+<!ENTITY udev-lfs        "udev-lfs-&systemd-version;-1">
+<!ENTITY udev-lfs-size   "17 KB">
 <!ENTITY udev-lfs-url    "&anduin-other;&udev-lfs;.tar.bz2">
-<!ENTITY udev-lfs-md5    "2d86cc6b8a9f5961429d57d98c88fca4">
+<!ENTITY udev-lfs-md5    "4534a2760481a24f3c1dc611c6932a0d">
 <!ENTITY udev-lfs-home   " ">
 
 <!ENTITY util-linux-version "2.22.2">
diff --git a/udev-lfs/Makefile.lfs b/udev-lfs/Makefile.lfs
index 64e17b3f1..c998d9e13 100644
--- a/udev-lfs/Makefile.lfs
+++ b/udev-lfs/Makefile.lfs
@@ -4,8 +4,8 @@
 # vim: tabstop=3
 
 SHELL=/bin/bash
-SYSTEMD_VERSION=196
-VERSION=196-3
+SYSTEMD_VERSION=197
+VERSION=197-1
 
 ifeq ($(V),)
  VB = @
@@ -79,7 +79,8 @@ COMMON_SRCS = log.c         \
               util.c        \
               dev-setup.c   \
               sd-login.c    \
-              sd-daemon.c
+              sd-daemon.c   \
+              time-util.c
 
 COMMON_OBJS := $(addprefix build/, $(COMMON_SRCS:.c=.o))
 
@@ -146,6 +147,14 @@ SED_PROCESS = \
        -e 's|@includedir@|/usr/include|g'  \
         < $< > $@
 
+SECURE = $(shell if nm /lib/libc.so.6 | grep -q " secure_getenv"; \
+then echo yes; fi)
+
+ifeq "$(SECURE)" "yes"
+   SECURE_GETENV = SECURE_GETENV
+else
+   SECURE_GETENV = __SECURE_GETENV
+endif
 
 udev: common                     \
       build/$(COMMON_LIB)        \
@@ -163,7 +172,9 @@ udev: common                     \
       build/libudev.pc
 
 cfg.h: udev-lfs-$(VERSION)/cfg.h
-	sed  -e 's/LFS-VERSION/$(SYSTEMD_VERSION)/' udev-lfs-$(VERSION)/cfg.h > ./cfg.h
+	sed  -e 's/LFS-VERSION/$(SYSTEMD_VERSION)/' \
+        -e 's/SECURE_GETENV/$(SECURE_GETENV)/' \
+        udev-lfs-$(VERSION)/cfg.h > ./cfg.h
 	@mkdir -p build
 
 common: cfg.h 
diff --git a/udev-lfs/cfg.h b/udev-lfs/cfg.h
index e12dabfc8..cec845d6c 100644
--- a/udev-lfs/cfg.h
+++ b/udev-lfs/cfg.h
@@ -1,3 +1,5 @@
+/* Custom udev (from systemd) configuration header file for LFS */
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
@@ -13,6 +15,10 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
+/* Define to 1 if you have the `secure_getenv' function. */
+/* For glibc before 2.17, this should be HAVE___SECURE_GETENV */
+#define HAVE_SECURE_GETENV 1
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 
@@ -56,4 +62,3 @@
 #define HAVE_DECL_PIVOT_ROOT 0
 #define HAVE_DECL_GETTID 0
 #define HAVE_NAME_TO_HANDLE_AT 1
-#define HAVE___SECURE_GETENV 1