aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXi Ruoyao <xry111@mengyan1223.wang>2021-03-28 15:11:25 +0000
committerXi Ruoyao <xry111@mengyan1223.wang>2021-03-28 15:11:25 +0000
commit8d557ad89d660aba47a9932e28cc1e65666da1fe (patch)
tree46a08ddaad44b1d92625663d0d6e495f94caa192
parent2ec1c1574a40ab987ee9b1e967d05ba717ff4c22 (diff)
file: secure the URL, add libseccomp as external dep, and move libmagic.so to /lib
/bin/more links to libmagic.so (found on gimli and rivendell with a script) git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12174 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--appendices/dependencies.xml4
-rw-r--r--chapter06/file.xml6
-rw-r--r--chapter08/file.xml10
-rw-r--r--packages.ent2
4 files changed, 20 insertions, 2 deletions
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index a3bf1f810..6c9e8a76b 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -718,7 +718,9 @@
<segtitle>&external;</segtitle>
<seglistitem>
- <seg>None</seg>
+ <seg>
+ <ulink url="&blfs-root;/view/stable/general/libseccomp.html">Libseccomp</ulink>
+ </seg>
</seglistitem>
</segmentedlist>
diff --git a/chapter06/file.xml b/chapter06/file.xml
index dc6024177..b44a639be 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -90,6 +90,12 @@ popd</userinput></screen>
<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
+ <para>Move a shared library into its final location in the LFS system,
+ and recreate the symlink for it:</para>
+
+<screen><userinput remap="install">mv -v $LFS/usr/lib/libmagic.so.* $LFS/lib
+ln -sfv ../../lib/$(readlink /usr/lib/libmagic.so) $LFS/usr/lib/libmagic.so</userinput></screen>
+
</sect2>
<sect2 role="content">
diff --git a/chapter08/file.xml b/chapter08/file.xml
index eb9f41a2b..326f99eeb 100644
--- a/chapter08/file.xml
+++ b/chapter08/file.xml
@@ -57,6 +57,16 @@
<screen><userinput remap="install">make install</userinput></screen>
+ <para><command>/bin/more</command> from util-linux will link to
+ <filename class="libraryfile">libmagic.so</filename>, so the shared
+ library should be moved to <filename class="directory">/lib</filename>,
+ and as a result the
+ <filename class="extension">.so</filename> file in
+ <filename class="directory">/usr/lib</filename> will need to be recreated:</para>
+
+<screen><userinput remap="install">mv -v /usr/lib/libmagic.so.* /lib
+ln -sfv ../../lib/$(readlink /usr/lib/libmagic.so) /usr/lib/libmagic.so</userinput></screen>
+
</sect2>
diff --git a/packages.ent b/packages.ent
index 9f089c14e..fb615c162 100644
--- a/packages.ent
+++ b/packages.ent
@@ -181,7 +181,7 @@
<!ENTITY file-version "5.39">
<!ENTITY file-size "932 KB">
-<!ENTITY file-url "http://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
+<!ENTITY file-url "https://astron.com/pub/file/file-&file-version;.tar.gz">
<!ENTITY file-md5 "1c450306053622803a25647d88f80f25">
<!ENTITY file-home "https://www.darwinsys.com/file/">
<!ENTITY file-tmp-du "31 MB">