From f6528ac86d1a9dc96170011ae98ee0160b28abda Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 4 Jul 2018 02:41:02 +0000
Subject: Update to attr-2.4.48. Update to acl-2.2.53.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11428 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/acl.xml  | 42 ++++++++++++------------------------------
 chapter06/attr.xml | 38 +++++++++++++-------------------------
 2 files changed, 25 insertions(+), 55 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/acl.xml b/chapter06/acl.xml
index df058f721..cb5be400e 100644
--- a/chapter06/acl.xml
+++ b/chapter06/acl.xml
@@ -42,35 +42,18 @@
   <sect2 role="installation">
     <title>Installation of Acl</title>
 
-    <para>Modify the documentation directory so that it is a versioned
-    directory:</para>
-
-<screen><userinput remap="pre">sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
-
-    <para>Fix some broken tests:</para>
-
-<screen><userinput remap="pre">sed -i "s:| sed.*::g" test/{sbits-restore,cp,misc}.test</userinput></screen>
-
-    <para>Fix a problem in the test procedures caused by changes in perl-5.26:</para>
-
-<screen><userinput remap="pre">sed -i 's/{(/\\{(/' test/run</userinput></screen>
-
-    <para>Additionally, fix a bug that causes <command>getfacl -e</command>
-    to segfault on overly long group name:</para>
-
-<screen><userinput remap="pre">sed -i -e "/TABS-1;/a if (x > (TABS-1)) x = (TABS-1);" \
-    libacl/__acl_to_any_text.c</userinput></screen>
-
     <para>Prepare Acl for compilation:</para>
 
-<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr    \
-            --bindir=/bin    \
-            --disable-static \
-            --libexecdir=/usr/lib</userinput></screen>
+<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr         \
+            --bindir=/bin         \
+            --disable-static      \
+            --libexecdir=/usr/lib \
+            --docdir=/usr/share/doc/acl-&acl-version;</userinput></screen>
 
-<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr    \
-            --disable-static \
-            --libexecdir=/usr/lib</userinput></screen>
+<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr         \
+            --disable-static      \
+            --libexecdir=/usr/lib \
+            --docdir=/usr/share/doc/acl-&acl-version;</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -78,14 +61,13 @@
 
     <para>The Acl tests need to be run on a filesystem that supports access
     controls after <application>Coreutils</application> has been built with the
-    Acl libraries.  If desired, return to this package and run <command>make -j1
-    tests</command> after <application>Coreutils</application> has been built
+    Acl libraries.  If desired, return to this package and run <command>make
+    check</command> after <application>Coreutils</application> has been built
     later in this chapter.</para>
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install install-dev install-lib
-chmod -v 755 /usr/lib/libacl.so</userinput></screen>
+<screen><userinput remap="install">make install</userinput></screen>
 
     <para>The shared library needs to be moved to
     <filename class="directory">/lib</filename>, and as a result the
diff --git a/chapter06/attr.xml b/chapter06/attr.xml
index f81df844c..56c9fa848 100644
--- a/chapter06/attr.xml
+++ b/chapter06/attr.xml
@@ -41,44 +41,32 @@
   <sect2 role="installation">
     <title>Installation of Attr</title>
 
-    <para>Modify the documentation directory so that it is a versioned
-    directory:</para>
-
-<screen><userinput remap="pre">sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
-
-    <para>Prevent installation of manual pages that were already installed by
-    the <xref linkend="man-pages"/> package:</para>
-
-<screen><userinput remap="pre">sed -i -e "/SUBDIRS/s|man[25]||g" man/Makefile</userinput></screen>
-
-    <para>Fix a problem in the test procedures caused by changes in perl-5.26:</para>
-
-<screen><userinput remap="pre">sed -i 's:{(:\\{(:' test/run</userinput></screen>
-
     <para>Prepare Attr for compilation:</para>
 
-<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr \
-            --bindir=/bin \
-            --disable-static</userinput></screen>
+<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr     \
+            --bindir=/bin     \
+            --disable-static  \
+            --sysconfdir=/etc \
+            --docdir=/usr/share/doc/attr-&attr-version;</userinput></screen>
 
-<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr \
-            --disable-static</userinput></screen>
+<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr     \
+            --disable-static  \
+            --sysconfdir=/etc \
+            --docdir=/usr/share/doc/attr-&attr-version;</userinput></screen>
 
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
 
     <para>The tests need to be run on a filesystem that supports extended
-    attributes such as the ext2, ext3, or ext4 filesystems. The tests are also
-    known to fail if running multiple simultaneous tests (-j option greater than
-    1).  To test the results, issue:</para>
+    attributes such as the ext2, ext3, or ext4 filesystems. 
+    To test the results, issue:</para>
 
-<screen><userinput remap="test">make -j1 tests root-tests</userinput></screen>
+<screen><userinput remap="test">make check</userinput></screen>
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install install-dev install-lib
-chmod -v 755 /usr/lib/libattr.so</userinput></screen>
+<screen><userinput remap="install">make install</userinput></screen>
 
     <para>The shared library needs to be moved to
     <filename class="directory">/lib</filename>, and as a result the
-- 
cgit v1.2.3-54-g00ecf