aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter03/patches.xml8
-rw-r--r--chapter06/systemd.xml4
-rw-r--r--general.ent6
-rw-r--r--patches.ent3
5 files changed, 28 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 7c4e68ec0..08544d7f0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,16 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem.
-->
+ <listitem revision="systemd">
+ <para>2016-09-29</para>
+ <itemizedlist>
+ <listitem>
+ <para>[renodr] - Added a security patch for systemd. Fixes
+ <ulink url="&lfs-ticket-root;3986">#3986</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
<listitem>
<para>2016-09-16</para>
<itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 82abf9149..beca10595 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -90,6 +90,14 @@
</listitem>
</varlistentry>
+ <varlistentry revision="systemd">
+ <term>Systemd security patch - <token>&systemd-security-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink url="&patches-root;&systemd-security-patch;"/></para>
+ <para>MD5 sum: <literal>&systemd-security-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
<para>Total size of these patches: about <returnvalue/></para>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index a6c38904a..cce7c1177 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -59,6 +59,10 @@
-e 's@test-copy$(EXEEXT) @@' \
-i Makefile.in</userinput></screen>
+ <para>Apply a patch to fix a security issue:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-231-security_fix-1.patch</userinput></screen>
+
<para>Create a file to allow systemd to build when using Util-Linux
built in Chapter 5, to disable LTO by default, and to build without
xlstproc:</para>
diff --git a/general.ent b/general.ent
index 8b80be71d..377291614 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version "SVN-20160916">
+<!ENTITY version "SVN-20160929">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
-<!ENTITY versiond "20160916-systemd">
+<!ENTITY versiond "20160929-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "September 16, 2016">
+<!ENTITY releasedate "September 29, 2016">
<!ENTITY copyrightdate "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.11">
diff --git a/patches.ent b/patches.ent
index b4708a1f7..3657e90fd 100644
--- a/patches.ent
+++ b/patches.ent
@@ -34,3 +34,6 @@
<!ENTITY sysvinit-consolidated-patch-md5 "0b7b5ea568a878fdcc4057b2bf36e5cb">
<!ENTITY sysvinit-consolidated-patch-size "3.9 KB">
+<!ENTITY systemd-security-patch "systemd-&systemd-version;-security_fix-1.patch">
+<!ENTITY systemd-security-patch-md5 "aa9d81fec9a3875a54e63af86904513a">
+<!ENTITY systemd-security-patch-size "4 KB">