Update attr and acl (r11428)

Update to attr-2.4.48.
Update to acl-2.2.53.

chapter01/changelog.xml

@@ -41,6 +41,20 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem>
+      <para>2018-06-25</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - 更新到 attr-2.4.48。修复 
+           <ulink url="&lfs-ticket-root;4308">#4308</ulink>。</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - 更新到 acl-2.2.53。修复 
+           <ulink url="&lfs-ticket-root;4307">#4307</ulink>。</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2018-06-25</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -27,9 +27,9 @@
     <!--<listitem>
     <para>None</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Acl-&acl-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Attr-&attr-version;</para>
     </listitem>-->

chapter06/acl.xml

@@ -41,34 +41,18 @@
   <sect2 role="installation">
     <title>安装 Acl</title>
 
-    <para>修改文档安装目录，使它包含版本号：</para>
-
-<screen><userinput remap="pre">sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
-
-    <para>修复一些不能正常运行的测试：</para>
-
-<screen><userinput remap="pre">sed -i "s:| sed.*::g" test/{sbits-restore,cp,misc}.test</userinput></screen>
-
-    <para>修复 perl-5.26 的更新引入的测试过程问题：</para>
-
-<screen><userinput remap="pre">sed -i 's/{(/\\{(/' test/run</userinput></screen>
-
-    <para>另外，修复一个导致 <command>getfacl -e</command>
-		在有过长组名称时发生段错误的 bug：</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>准备安装 Acl：</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>编译该软件包：</para>
 
@@ -78,12 +62,11 @@
 		<application>Coreutils</application>
 		后才能在支持访问控制的文件系统上运行。
 		如果想运行它们，在构建好 <application>Coreutils</application>
-		后再返回这里，并执行 <command>make -j1 tests</command>。</para>
+		后再返回这里，并执行 <command>make check</command>。</para>
 
     <para>安装该软件包：</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>共享库需要被移动到
     <filename class="directory">/lib</filename> 目录，因此

chapter06/attr.xml

@@ -40,42 +40,31 @@
   <sect2 role="installation">
     <title>安装 Attr</title>
 
-    <para>修改文档的安装目录名，使其包含版本号：</para>
-
-<screen><userinput remap="pre">sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
-
-    <para>不要安装之前已经被 <xref linkend="man-pages"/>
-    软件包安装的手册页面：</para>
-
-<screen><userinput remap="pre">sed -i -e "/SUBDIRS/s|man[25]||g" man/Makefile</userinput></screen>
-
-	<para>修复由 perl-5.26 中的更新引入的测试过程问题：</para>
-
-<screen><userinput remap="pre">sed -i 's:{(:\\{(:' test/run</userinput></screen>
-
     <para>准备安装 Attr：</para>
 
-<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr \
-            --bindir=/bin \
-            --disable-static</userinput></screen>
-
-<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr \
-            --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  \
+            --sysconfdir=/etc \
+            --docdir=/usr/share/doc/attr-&attr-version;</userinput></screen>
+ 
     <para>编译该软件包：</para>
 
 <screen><userinput remap="make">make</userinput></screen>
 
     <para>测试套件必须在支持扩展属性的文件系统，如 ext2、ext3 或 ext4
-		上运行。另外，已知在同时运行多个测试 （指定了大于 1 的 -j 选项）
-		时测试会失败。运行以下命令以测试编译结果：</para>
+		上运行。运行下列命令以测试编译结果：</para>
 
-<screen><userinput remap="test">make -j1 tests root-tests</userinput></screen>
+<screen><userinput remap="test">make check</userinput></screen>
 
     <para>安装该软件包：</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>需要将共享库移动到
     <filename class="directory">/lib</filename> 目录，因此

general.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20180625">
+<!ENTITY version         "SVN-20180703">
 <!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        "20180625-systemd">
+<!ENTITY versiond        "20180703-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "2018 年 6 月 25 日">
+<!ENTITY releasedate     "2018 年 7 月 3 日">
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.3">

lfs-latest.php

@@ -234,7 +234,7 @@ if ( $package == "vim"        ) $dirpath = "ftp://ftp.vim.org/pub/vim/unix";
   if ( $package == "attr" ||  
        $package == "acl"  )
   {
-     return find_max( $lines, "/$package/", "/^.*$package-([\d\.-]*\d)\.src.*$/" );
+     return find_max( $lines, "/$package/", "/^.*$package-([\d\.-]*\d)\.*$/" );
   }
 
   if ( $package == "e2fsprogs" )

packages.ent

@@ -6,18 +6,18 @@
      Allowed deviation in SBUs : 10%
      Allowed deviation in disk usage : 2% -->
 
-<!ENTITY acl-version "2.2.52">
-<!ENTITY acl-size "380 KB">
-<!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.src.tar.gz">
-<!ENTITY acl-md5 "a61415312426e9c2212bd7dc7929abda">
+<!ENTITY acl-version "2.2.53">
+<!ENTITY acl-size "513 KB">
+<!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.tar.gz">
+<!ENTITY acl-md5 "007aabf1dbb550bcddde52a244cd1070">
 <!ENTITY acl-home " ">
 <!ENTITY acl-ch6-du "4.9 MB">
 <!ENTITY acl-ch6-sbu "不到 0.1 SBU">
 
-<!ENTITY attr-version "2.4.47">
-<!ENTITY attr-size "336 KB">
-<!ENTITY attr-url "&savannah;/releases/attr/attr-&attr-version;.src.tar.gz">
-<!ENTITY attr-md5 "84f58dec00b60f2dc8fd1c9709291cc7">
+<!ENTITY attr-version "2.4.48">
+<!ENTITY attr-size "457 KB">
+<!ENTITY attr-url "&savannah;/releases/attr/attr-&attr-version;.tar.gz">
+<!ENTITY attr-md5 "bc1e5cb5c96d99b24886f1f527d3bb3d">
 <!ENTITY attr-home "&savannah-nongnu;/projects/attr">
 <!ENTITY attr-ch6-du "3.3 MB">
 <!ENTITY attr-ch6-sbu "不到 0.1 SBU">