[LFS-SVN] SVN-20190629, チェンジセット 11621-11629 対応。lfs-bootscripts*.tar.xz 対応。

git-svn-id: svn+ssh://svn.osdn.net/svnroot/lfsbookja/trunk@1252 d6661c75-0afd-443a-aae1-cb31083e41e8

diff --git a/lfsbook/configure b/lfsbook/configure
index 668a13f..0d99872 100755 (executable)
--- a/lfsbook/configure
+++ b/lfsbook/configure
@@ -4034,7 +4034,7 @@ fi
 
 
 
-TARGETVER=svn-20190616
+TARGETVER=svn-20190629
 
 SVNVER=`grep 'ENTITY version ' ${bookdir}/general.ent | sed -e 's/^<!ENTITY version         \"//' -e 's/\">$//' | tr 'A-Z' 'a-z'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the original XML version" >&5

diff --git a/lfsbook/src/Makefile.am b/lfsbook/src/Makefile.am
index b8ba6f0..602c38a 100644 (file)
--- a/lfsbook/src/Makefile.am
+++ b/lfsbook/src/Makefile.am
@@ -9,7 +9,7 @@ SUBDIRS=appendices chapter01 chapter02 chapter03 chapter04 chapter05 \
        chapter06 chapter07 chapter08 chapter09 prologue stylesheets \
        udev-lfs
 EXTRA_DIST = general.ch index.ch packages.ch patches.ch pdf-fixups.ch \
-       tidy.ch make-aux-files.ch
+       tidy.ch make-aux-files.ch aux-file-data.ch
 BOOKdir = @abs_bookdir@
 srcdir = @srcdir@
 srcs = general.ent index.xml packages.ent patches.ent pdf-fixups.sh \
@@ -51,8 +51,9 @@ tidy.conf: $(BOOKdir)/tidy.conf $(srcdir)/tidy.ch
 
 process-scripts.sh: $(BOOKdir)/process-scripts.sh
        cp -p $^ $@
-aux-file-data.sh: $(BOOKdir)/aux-file-data.sh
-       cp -p $^ $@
+aux-file-data.sh: $(BOOKdir)/aux-file-data.sh $(srcdir)/aux-file-data.ch
+       $(top_builddir)/$(CTIE) -m $@ $^ >/dev/null
+       chmod +x $@
 #      sed -i '/.\/make-aux-files.sh/d' $@
 make-aux-files.sh: $(BOOKdir)/make-aux-files.sh $(srcdir)/make-aux-files.ch
        $(top_builddir)/$(CTIE) -m $@ $^ >/dev/null
@@ -171,12 +172,12 @@ validate: tmpdir $(ALLXML)
                $(RENDERTMP)/lfs-html2.xml
 
        rm -f appendices/*.script
-       ./aux-file-data.sh $(RENDERTMP)/lfs-full.xml
+       ./aux-file-data.sh $(RENDERTMP)/lfs-full.xml $(BOOKdir)
        @echo "Validation complete."
 
 maketar:
        @echo "Making tarballs..."
-       sh make-aux-files.sh
+       sh make-aux-files.sh $(BOOKdir)
 
 profile-html: validate $(ALLXML)
        @echo "Generating profiled XML for XHTML..."
@@ -212,7 +213,7 @@ $(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml packages.e
                 stylesheets/md5sum.xsl      \
                 $(RENDERTMP)/sysv-md5sum.xml
        sed -i -e \
-           "s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.bz2 | cut -d' ' -f1)/" \
+           "s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.xz | cut -d' ' -f1)/" \
            $(BASEDIR)/md5sums
 
 #dump-commands: validate

diff --git a/lfsbook/src/Makefile.in b/lfsbook/src/Makefile.in
index 88aa835..04c3c6b 100644 (file)
--- a/lfsbook/src/Makefile.in
+++ b/lfsbook/src/Makefile.in
@@ -295,7 +295,7 @@ SUBDIRS = appendices chapter01 chapter02 chapter03 chapter04 chapter05 \
        udev-lfs
 
 EXTRA_DIST = general.ch index.ch packages.ch patches.ch pdf-fixups.ch \
-       tidy.ch make-aux-files.ch
+       tidy.ch make-aux-files.ch aux-file-data.ch
 
 BOOKdir = @abs_bookdir@
 srcs = general.ent index.xml packages.ent patches.ent pdf-fixups.sh \
@@ -637,8 +637,9 @@ tidy.conf: $(BOOKdir)/tidy.conf $(srcdir)/tidy.ch
 
 process-scripts.sh: $(BOOKdir)/process-scripts.sh
        cp -p $^ $@
-aux-file-data.sh: $(BOOKdir)/aux-file-data.sh
-       cp -p $^ $@
+aux-file-data.sh: $(BOOKdir)/aux-file-data.sh $(srcdir)/aux-file-data.ch
+       $(top_builddir)/$(CTIE) -m $@ $^ >/dev/null
+       chmod +x $@
 #      sed -i '/.\/make-aux-files.sh/d' $@
 make-aux-files.sh: $(BOOKdir)/make-aux-files.sh $(srcdir)/make-aux-files.ch
        $(top_builddir)/$(CTIE) -m $@ $^ >/dev/null
@@ -757,12 +758,12 @@ validate: tmpdir $(ALLXML)
                $(RENDERTMP)/lfs-html2.xml
 
        rm -f appendices/*.script
-       ./aux-file-data.sh $(RENDERTMP)/lfs-full.xml
+       ./aux-file-data.sh $(RENDERTMP)/lfs-full.xml $(BOOKdir)
        @echo "Validation complete."
 
 maketar:
        @echo "Making tarballs..."
-       sh make-aux-files.sh
+       sh make-aux-files.sh $(BOOKdir)
 
 profile-html: validate $(ALLXML)
        @echo "Generating profiled XML for XHTML..."
@@ -798,7 +799,7 @@ $(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml packages.e
                 stylesheets/md5sum.xsl      \
                 $(RENDERTMP)/sysv-md5sum.xml
        sed -i -e \
-           "s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.bz2 | cut -d' ' -f1)/" \
+           "s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.xz | cut -d' ' -f1)/" \
            $(BASEDIR)/md5sums
 
 #dump-commands: validate

diff --git a/lfsbook/src/aux-file-data.ch b/lfsbook/src/aux-file-data.ch
new file mode 100644 (file)
index 0000000..69c8068
--- /dev/null
+++ b/lfsbook/src/aux-file-data.ch
@@ -0,0 +1,19 @@
+%
+% This is part of LFSbookja package.
+%
+% This is a CTIE change file for the original XML source of the LFSbook.
+%
+% $Author: matsuand $
+% $Rev: 906 $
+% $Date:: 2014-03-30 14:58:30 +0900#$
+%
+@x
+FILE=$1
+
+./make-aux-files.sh
+@y
+FILE=$1
+SRCDIR=$2
+
+./make-aux-files.sh $SRCDIR
+@z

diff --git a/lfsbook/src/chapter01/changelog.ch b/lfsbook/src/chapter01/changelog.ch
index 9ffc973..4e65a3e 100644 (file)
--- a/lfsbook/src/chapter01/changelog.ch
+++ b/lfsbook/src/chapter01/changelog.ch
@@ -54,6 +54,115 @@
 @z
 
 @x
+      <para>2019-06-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Fixed issue with installing Check's documentation
+          in a verisoned directory. Thanks goes to Ryan Marsaw for the report.
+          This was fixed be removing the unrecognized/unused --docdir
+          and replacing it with a "docdir=" in the make install command.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2019-06-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Check のドキュメントをバージョンつきディレクトリにインストールする際の問題を修正。
+          報告をあげてくれた Ryan Marsaw に感謝。
+          これは、オプションの中で認識されない、かつ利用もされていない --docdir を削除し、代わりに make install コマンドにて "docdir=" を用いる方法とした。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
+      <para>2019-06-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Properly initialize a data structure in
+          OpenSSL to avoid valgrind uninitialized value errors. Fixes
+          <ulink url="&lfs-ticket-root;4491">#4491</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to meson-0.51.0. Fixes
+          <ulink url="&lfs-ticket-root;4483">#4483</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gawk-5.0.1. Fixes
+          <ulink url="&lfs-ticket-root;4486">#4486</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to expat-2.2.7. Fixes
+          <ulink url="&lfs-ticket-root;4488">#4488</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.1.15. Fixes
+          <ulink url="&lfs-ticket-root;4487">#4487</ulink>.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[bdubbs] - Update to sysvinit-2.95. Fixes
+          <ulink url="&lfs-ticket-root;4484">#4484</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bzip2-1.0.7. Fixes
+          <ulink url="&lfs-ticket-root;4490">#4490</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2019-06-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - OpenSSL においてデータ構造を適切に初期化するように。
+          これを行わないと valgrind にて未初期化のエラーとなるため。
+          <ulink url="&lfs-ticket-root;4491">#4491</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - meson-0.51.0 へのアップデート。
+          <ulink url="&lfs-ticket-root;4483">#4483</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - gawk-5.0.1 へのアップデート。
+          <ulink url="&lfs-ticket-root;4486">#4486</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - expat-2.2.7 へのアップデート。
+          <ulink url="&lfs-ticket-root;4488">#4488</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - linux-5.1.15 へのアップデート。
+          <ulink url="&lfs-ticket-root;4487">#4487</ulink> を Fix に。</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[bdubbs] - sysvinit-2.95 へのアップデート。
+          <ulink url="&lfs-ticket-root;4484">#4484</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - bzip2-1.0.7 へのアップデート。
+          <ulink url="&lfs-ticket-root;4490">#4490</ulink> を Fix に。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
+      <para>2019-06-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to linux-5.1.11. Fixes the SOCK PANIC
+          issue. Fixes
+          <ulink url="&lfs-ticket-root;4485">#4485</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2019-06-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - linux-5.1.11 へのアップデート。
+          SOCK PANIC 問題への修正。
+          <ulink url="&lfs-ticket-root;4485">#4485</ulink> を Fix に。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
       <para>2019-06-16</para>
       <itemizedlist>
         <listitem>
@@ -68,7 +177,7 @@
           <para>[bdubbs] - Update to linux-5.1.10. Fixes
           <ulink url="&lfs-ticket-root;4478">#4478</ulink>.</para>
         </listitem>
-        <listitem revision="sysv">
+        <listitem>
           <para>[bdubbs] - Update to less-551. Fixes
           <ulink url="&lfs-ticket-root;4477">#4477</ulink>.</para>
         </listitem>
@@ -96,7 +205,7 @@
           <para>[bdubbs] - linux-5.1.10 へのアップデート。
           <ulink url="&lfs-ticket-root;4478">#4478</ulink> を Fix に。</para>
         </listitem>
-        <listitem revision="sysv">
+        <listitem>
           <para>[bdubbs] - less-551 へのアップデート。
           <ulink url="&lfs-ticket-root;4477">#4477</ulink> を Fix に。</para>
         </listitem>

diff --git a/lfsbook/src/chapter01/jchangelog.ch b/lfsbook/src/chapter01/jchangelog.ch
index bba3a59..6ee0b2a 100644 (file)
--- a/lfsbook/src/chapter01/jchangelog.ch
+++ b/lfsbook/src/chapter01/jchangelog.ch
@@ -60,6 +60,22 @@
 -->
 
    <listitem>
+      <para>2019-07-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          <phrase revision="sysv">SVN-20190629</phrase>
+          <phrase revision="systemd">20190629-systemd</phrase>,
+          チェンジセット
+          <ulink url="&lfs-rev-root;11621">11621</ulink> ～
+          <ulink url="&lfs-rev-root;11629">11629</ulink>
+          対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem>
       <para>2019-06-17</para>
       <itemizedlist>
         <listitem>

diff --git a/lfsbook/src/chapter06/libtool.ch b/lfsbook/src/chapter06/libtool.ch
index 4431c90..8ea460e 100644 (file)
--- a/lfsbook/src/chapter06/libtool.ch
+++ b/lfsbook/src/chapter06/libtool.ch
@@ -43,9 +43,9 @@
 @z
 
 @x
-    <para>To test the results (about 11.0 SBU), issue:</para>
+<para>To test the results<!--(about 11.0 SBU)-->, issue:</para>
 @y
-    <para>コンパイル結果をテストするには以下を実行します。(約 11.0 SBU)</para>
+<para>コンパイル結果をテストするには以下を実行します。</para>
 @z
 
 @x

diff --git a/lfsbook/src/chapter06/openssl.ch b/lfsbook/src/chapter06/openssl.ch
index d8b63d4..512ca37 100644 (file)
--- a/lfsbook/src/chapter06/openssl.ch
+++ b/lfsbook/src/chapter06/openssl.ch
@@ -33,6 +33,14 @@
 @z
 
 @x
+    <para>First, fix a problem identified upstream:</para>
+@y
+    <para>
+    はじめに、開発元が認識している問題を修正します。
+    </para>
+@z
+
+@x
     <para>Prepare OpenSSL for compilation:</para>
 @y
     <para>&PreparePackage1;OpenSSL&PreparePackage2;</para>

diff --git a/lfsbook/src/general.ch b/lfsbook/src/general.ch
index b1eb04b..888b7d9 100644 (file)
--- a/lfsbook/src/general.ch
+++ b/lfsbook/src/general.ch
@@ -8,24 +8,24 @@
 % $Date::                           $
 %
 @x
-<!ENTITY version         "SVN-20190616">
+<!ENTITY version         "SVN-20190629">
 @y
 <?xml version="1.0" encoding="UTF-8"?>
-<!ENTITY version         "SVN-20190616">
+<!ENTITY version         "SVN-20190629">
 @z
 
 @x
-<!ENTITY versiond        "20190616-systemd">
+<!ENTITY versiond        "20190629-systemd">
 @y
-<!ENTITY versiond        "20190616-systemd">
+<!ENTITY versiond        "20190629-systemd">
 @z
 
 @x
-<!ENTITY releasedate     "June 16, 2019">
+<!ENTITY releasedate     "June 29, 2019">
 @y
-<!ENTITY releasedate     "2019年6月16日">
-<!ENTITY jversion        "20190617">
-<!ENTITY jversiond       "20190617">
+<!ENTITY releasedate     "2019年6月29日">
+<!ENTITY jversion        "20190701">
+<!ENTITY jversiond       "20190701">
 <!ENTITY dir-jversion    "svn-ja">
 <!ENTITY dir-jversiond   "svn-sysdja">
 @z

diff --git a/lfsbook/src/make-aux-files-ja.sh b/lfsbook/src/make-aux-files-ja.sh
index a39d22b..89e7c9b 100755 (executable)
--- a/lfsbook/src/make-aux-files-ja.sh
+++ b/lfsbook/src/make-aux-files-ja.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-#rm -f lfs-bootscripts*.tar.bz2
+#rm -f lfs-bootscripts*.tar.xz
 
 # Get base file name
 version=`grep "ENTITY lfs-bootscripts-version" packages.ent |cut -d'"' -f2`
 
 # Get the original bootscripts tarball
 url="http://www.linuxfromscratch.org/lfs/downloads/development/"
-wget -N "$url/lfs-bootscripts-$version.tar.bz2"
+wget -N "$url/lfs-bootscripts-$version.tar.xz"
 

diff --git a/lfsbook/src/make-aux-files.ch b/lfsbook/src/make-aux-files.ch
index 2ce4bd1..c9cf771 100644 (file)
--- a/lfsbook/src/make-aux-files.ch
+++ b/lfsbook/src/make-aux-files.ch
@@ -8,14 +8,19 @@
 % $Date::                           $
 %
 @x
-tar -cjf lfs-bootscripts-$version.tar.bz2 --exclude .svn lfs-bootscripts-$version
+rm -f lfs-bootscripts*.tar.?z*
 @y
-# Get the original bootscripts tarball
-wgetflag=""
-url="http://www.linuxfromscratch.org/lfs/downloads/development/"
-wget -N "$url/lfs-bootscripts-$version.tar.bz2" 2>/dev/null || wgetflag="none"
+SRCDIR=$1
 
-if test "x$wgetflag" != "x"; then
-  tar -cjf lfs-bootscripts-$version.tar.bz2 --exclude .svn lfs-bootscripts-$version
+rm -f lfs-bootscripts*.tar.?z*
+@z
+
+@x
+tar -cJf lfs-bootscripts-$version.tar.xz --exclude .svn lfs-bootscripts-$version
+@y
+if test -f $SRCDIR/lfs-bootscripts-$version.tar.xz; then
+  cp -p $SRCDIR/lfs-bootscripts-$version.tar.xz .
+else
+  tar -cJf lfs-bootscripts-$version.tar.xz --exclude .svn lfs-bootscripts-$version
 fi
 @z

diff --git a/lfsbook/src/packages.ch b/lfsbook/src/packages.ch
index 5626ea4..66f60c4 100644 (file)
--- a/lfsbook/src/packages.ch
+++ b/lfsbook/src/packages.ch
@@ -92,9 +92,9 @@
 @z
 
 @x
-<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
+<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
 @y
-<!ENTITY lfs-bootscripts-url "&download-scripts;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
+<!ENTITY lfs-bootscripts-url "&download-scripts;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
 @z
 @x
 <!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">

diff --git a/lfsbook/version.ac b/lfsbook/version.ac
index 7f756a2..04d3fd5 100644 (file)
--- a/lfsbook/version.ac
+++ b/lfsbook/version.ac
@@ -6,5 +6,5 @@ dnl  $Rev$
 dnl  $Date::                           $
 dnl
 dnl m4-include this file to define the current LFS version
-m4_define([lfs_version], [svn-20190616])
-m4_define([lfsd_version], [20190616-systemd])
+m4_define([lfs_version], [svn-20190629])
+m4_define([lfsd_version], [20190629-systemd])