From 3019de74f35d6202edd9f8eacf17a1fd08f99e2c Mon Sep 17 00:00:00 2001 From: Thomas Trepl Date: Sun, 17 Nov 2019 20:38:59 +0000 Subject: [PATCH] MultiLib: Merge changes from trunk git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11700 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- bootscripts/ChangeLog | 4 ++ bootscripts/lfs/init.d/checkfs | 2 +- bootscripts/lfs/init.d/sysklogd | 4 +- chapter01/changelog.xml | 69 ++++++++++++++++++++++++++++++++- chapter01/whatsnew.xml | 12 +++--- chapter06/check.xml | 3 +- chapter06/gettext.xml | 12 +++++- chapter06/systemd.xml | 2 +- general.ent | 6 +-- packages.ent | 32 +++++++-------- patches.ent | 6 +-- 11 files changed, 117 insertions(+), 35 deletions(-) diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index a54fd1a3d..28a812d2c 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,7 @@ +2019-10-31 DJ Lucas + * Syslog should not start in runlevel 2 due to network logging + * Remove errant swap dependency for checkfs + 2019-10-04 DJ Lucas * Additional updates to facilities in LSB headers to keep proper order * Network script depends on firewall scripts from BLFS if activated diff --git a/bootscripts/lfs/init.d/checkfs b/bootscripts/lfs/init.d/checkfs index 42fce219a..c6827b363 100644 --- a/bootscripts/lfs/init.d/checkfs +++ b/bootscripts/lfs/init.d/checkfs @@ -27,7 +27,7 @@ ### BEGIN INIT INFO # Provides: checkfs -# Required-Start: udev swap +# Required-Start: udev # Should-Start: # Required-Stop: # Should-Stop: diff --git a/bootscripts/lfs/init.d/sysklogd b/bootscripts/lfs/init.d/sysklogd index 7f0f153d9..a3d37686e 100644 --- a/bootscripts/lfs/init.d/sysklogd +++ b/bootscripts/lfs/init.d/sysklogd @@ -18,8 +18,8 @@ # Should-Start: # Required-Stop: $local_fs # Should-Stop: sendsignals -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 # Short-Description: Starts kernel and system log daemons. # Description: Starts kernel and system log daemons. # /etc/fstab. diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index fce436766..7bd5fd605 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -44,7 +44,48 @@ or as appropriate for the entry or if needed the entire day's listitem. --> - + + 2019-10-31 + + + [dj] - Update to lfs-bootscripts-20191031. + + + + + + 2019-11-08 + + + [renodr] - Update to Linux-5.3.9. Resolves a regression + with restarting systems with HD Audio (hda), data corruption + on btrfs, and a security vulnerability with systems that use + the RTLWIFI driver. Fixes + #4544. + + + + + + 2019-11-06 + + + [renodr] - Fix potential infinite loop with meson-0.52 + and systemd-243. + + + + + + 2019-10-31 + + + [dj] - Update to lfs-bootscripts-20191031. + + + + + 2019-10-25 @@ -53,6 +94,32 @@ + + 2019-11-01 + + + [bdubbs] - Update to linux-5.3.8. Fixes + #4539. + + + [bdubbs] - Update to bc-2.2.0. Fixes + #4543. + + + [bdubbs] - Update to check-0.13.0. Fixes + #4540. + + + [bdubbs] - Update to eudev-3.2.9. Fixes + #4542. + + + [bdubbs] - Update to man-db-2.9.0. Fixes + #4541. + + + + 2019-10-17 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 4d7509b19..d38632ae9 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -41,9 +41,9 @@ - + Binutils-&binutils-version; @@ -53,9 +53,9 @@ - + @@ -71,9 +71,9 @@ E2fsprogs-&e2fsprogs-version; - + Expat-&expat-version; diff --git a/chapter06/check.xml b/chapter06/check.xml index 739af9803..ee72a0725 100644 --- a/chapter06/check.xml +++ b/chapter06/check.xml @@ -58,8 +58,9 @@ Install the package and fix a script: - make docdir=/usr/share/doc/check-&check-version; install + make docdir=/usr/share/doc/check-&check-version; install && sed -i '1 s/tools/usr/' /usr/bin/checkmk + diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml index 6d50449fb..ef4b24741 100644 --- a/chapter06/gettext.xml +++ b/chapter06/gettext.xml @@ -104,7 +104,7 @@ chmod -v 0755 /usr/lib/preloadable_libintl.so msgexec, msgfilter, msgfmt, msggrep, msginit, msgmerge, msgunfmt, msguniq, ngettext, recode-sr-latin, and xgettext libasprintf.so, libgettextlib.so, libgettextpo.so, - libgettextsrc.so, and preloadable_libintl.so + libgettextsrc.so, libtextstyle.so, and preloadable_libintl.so /usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;, /usr/share/gettext, and /usr/share/gettext-0.19.8 @@ -402,6 +402,16 @@ chmod -v 0755 /usr/lib/preloadable_libintl.so + + libtextstyle + + Text styling library + + libtextstyle + + + + preloadable_libintl diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index 5ee8a138a..186cd8f91 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -43,7 +43,7 @@ First, apply a patch to fix various bugs since the release of systemd-243. -patch -Np1 -i ../systemd-&systemd-version;-consolidated_fixes-1.patch +patch -Np1 -i ../systemd-&systemd-version;-consolidated_fixes-2.patch Create a symlink to work around missing xsltproc: diff --git a/general.ent b/general.ent index fedee0710..5a734534f 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + diff --git a/packages.ent b/packages.ent index d0dc1525c..1ebdeb87c 100644 --- a/packages.ent +++ b/packages.ent @@ -50,10 +50,10 @@ - - + + - + @@ -99,10 +99,10 @@ - - + + - + @@ -159,10 +159,10 @@ - - + + - + @@ -388,7 +388,7 @@ - + @@ -430,12 +430,12 @@ - + - + - +