[BLFS-SVN] Version 2014-01-21, r12616 対応.

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

diff --git a/blfsbook/configure b/blfsbook/configure
index 52eee32..82d11bc 100755 (executable)
--- a/blfsbook/configure
+++ b/blfsbook/configure
@@ -4013,7 +4013,7 @@ $as_echo "found" >&6; }
   fi
 
 
-TARGETVER=20140114
+TARGETVER=20140121
 
 ORGDAY=`grep 'ENTITY day' ${bookdir}/general.ent | gawk '{print $3;}' | sed 's/^[^\"]*\"\([0-9]*\)\".*$/\1/'`
 ORGMONTH=`grep 'ENTITY month' ${bookdir}/general.ent | gawk '{print $3;}' | sed 's/^[^\"]*\"\([0-9]*\)\".*$/\1/'`

diff --git a/blfsbook/src/postlfs/config/inputrc.ch b/blfsbook/src/archive/inputrc.ch
similarity index 100%
rename from blfsbook/src/postlfs/config/inputrc.ch
rename to blfsbook/src/archive/inputrc.ch

diff --git a/blfsbook/src/general.ch b/blfsbook/src/general.ch
index f40042e..f335e83 100644 (file)
--- a/blfsbook/src/general.ch
+++ b/blfsbook/src/general.ch
@@ -15,11 +15,11 @@
 
 @x
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 14th, &year;">
+<!ENTITY releasedate  "January 21st, &year;">
 @y
 <!ENTITY version      "&year;-&month;-&day;">
 <!ENTITY releasedate  "&year;/&month;/&day;">
-<!ENTITY jversion     "20140115">
+<!ENTITY jversion     "20140122">
 <!ENTITY jratio       "55.9 &percnt;">
 @z
 

diff --git a/blfsbook/src/general/graphlib/exiv2.ch b/blfsbook/src/general/graphlib/exiv2.ch
index bf0212f..081a715 100644 (file)
--- a/blfsbook/src/general/graphlib/exiv2.ch
+++ b/blfsbook/src/general/graphlib/exiv2.ch
@@ -132,7 +132,7 @@
 @x
       <segtitle>Installed Program</segtitle>
       <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 @y
       <segtitle>&InstalledPrograms;</segtitle>
       <segtitle>&InstalledLibraries;</segtitle>
@@ -147,7 +147,7 @@
           libexiv2.so
         </seg>
         <seg>
-          None
+          /usr/include/exiv2
         </seg>
 @y
         <seg>
@@ -157,7 +157,7 @@
           libexiv2.so
         </seg>
         <seg>
-          &None;
+          /usr/include/exiv2
         </seg>
 @z
 

diff --git a/blfsbook/src/general/prog/elfutils.ch b/blfsbook/src/general/prog/elfutils.ch
index 165ea98..fc41994 100644 (file)
--- a/blfsbook/src/general/prog/elfutils.ch
+++ b/blfsbook/src/general/prog/elfutils.ch
@@ -134,7 +134,7 @@
         <seg>
           eu-addr2line, eu-ar, eu-elfcmp, eu-elflint, eu-findtextrel, eu-ld,
           eu-make-debug-archive, eu-nm, eu-objdump, eu-ranlib, eu-readelf,
-          eu-size, eu-strings, eu-strip, and eu-unstrip
+          eu-size, eu-stack, eu-strings, eu-strip, and eu-unstrip
         </seg>
         <seg>
           libasm.{a,so}, libdw.{a,so}, libebl.a, and libelf.{a,so}
@@ -147,7 +147,7 @@
         <seg>
           eu-addr2line, eu-ar, eu-elfcmp, eu-elflint, eu-findtextrel, eu-ld,
           eu-make-debug-archive, eu-nm, eu-objdump, eu-ranlib, eu-readelf,
-          eu-size, eu-strings, eu-strip, eu-unstrip
+          eu-size, eu-stack, eu-strings, eu-strip, eu-unstrip
         </seg>
         <seg>
           libasm.{a,so}, libdw.{a,so}, libebl.a, libelf.{a,so}

diff --git a/blfsbook/src/general/prog/perl-modules.ch b/blfsbook/src/general/prog/perl-modules.ch
index 0cb45cd..5f22c90 100644 (file)
--- a/blfsbook/src/general/prog/perl-modules.ch
+++ b/blfsbook/src/general/prog/perl-modules.ch
@@ -66,10 +66,10 @@
 
 @x
           <ulink url="http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/Archive-Zip-&Archive-Zip-version;.tar.gz">
-          Archive::Zip-&Archive-Zip-version;</ulink> (MD5 sum: a2f6378911f7f34e8d94f0012408e22b)
+          Archive::Zip-&Archive-Zip-version;</ulink> (MD5 sum: e804985def2c1f0ed640ab4ca6aa85a1)
 @y
           <ulink url="http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/Archive-Zip-&Archive-Zip-version;.tar.gz">
-          Archive::Zip-&Archive-Zip-version;</ulink> (MD5 sum: a2f6378911f7f34e8d94f0012408e22b)
+          Archive::Zip-&Archive-Zip-version;</ulink> (MD5 sum: e804985def2c1f0ed640ab4ca6aa85a1)
 @z
 
 

diff --git a/blfsbook/src/general/sysutils/dbus.ch b/blfsbook/src/general/sysutils/dbus.ch
index 27ad54c..f0b74df 100644 (file)
--- a/blfsbook/src/general/sysutils/dbus.ch
+++ b/blfsbook/src/general/sysutils/dbus.ch
@@ -92,14 +92,12 @@
 @x
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="expat"/> or
-      <xref linkend="libxml2"/>
+      <xref linkend="expat"/>
     </para>
 @y
     <bridgehead renderas="sect4">&Required;</bridgehead>
     <para role="required">
-      <xref linkend="expat"/> または
-      <xref linkend="libxml2"/>
+      <xref linkend="expat"/>
     </para>
 @z
 
@@ -487,7 +485,7 @@
 @x
         <seg>
           dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor,
-          dbus-send and dbus-uuidgen
+          dbus-run-session, dbus-send and dbus-uuidgen
         </seg>
         <seg>
            libdbus-1.so
@@ -504,7 +502,7 @@
 @y
         <seg>
           dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor,
-          dbus-send, dbus-uuidgen
+          dbus-run-session, dbus-send, dbus-uuidgen
         </seg>
         <seg>
            libdbus-1.so

diff --git a/blfsbook/src/networking/netprogs/wget.ch b/blfsbook/src/networking/netprogs/wget.ch
index 4ebbe95..01f8a00 100644 (file)
--- a/blfsbook/src/networking/netprogs/wget.ch
+++ b/blfsbook/src/networking/netprogs/wget.ch
@@ -69,18 +69,6 @@
 @z
 
 @x
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-@y
-    <bridgehead renderas="sect3">&AdditionalDownloads;</bridgehead>
-@z
-
-@x
-          Required patch:
-@y
-          必須のパッチ:
-@z
-
-@x
     <bridgehead renderas="sect3">Wget Dependencies</bridgehead>
 @y
     <bridgehead renderas="sect3">&Dependencies1;Wget&Dependencies2;</bridgehead>

diff --git a/blfsbook/src/postlfs/config/Makefile.am b/blfsbook/src/postlfs/config/Makefile.am
index d064148..c110924 100644 (file)
--- a/blfsbook/src/postlfs/config/Makefile.am
+++ b/blfsbook/src/postlfs/config/Makefile.am
@@ -11,7 +11,6 @@ CHANGE_FILES = \
        config.ch      \
        devices.ch     \
        etcshells.ch   \
-       inputrc.ch     \
        logon.ch       \
        lsb-release.ch \
        profile.ch     \
@@ -37,7 +36,6 @@ bootdisk.xml:    $(BOOKdir)/$@ $(srcdir)/bootdisk.ch
 config.xml:      $(BOOKdir)/$@ $(srcdir)/config.ch
 devices.xml:     $(BOOKdir)/$@ $(srcdir)/devices.ch
 etcshells.xml:   $(BOOKdir)/$@ $(srcdir)/etcshells.ch
-inputrc.xml:     $(BOOKdir)/$@ $(srcdir)/inputrc.ch
 logon.xml:       $(BOOKdir)/$@ $(srcdir)/logon.ch
 lsb-release.xml: $(BOOKdir)/$@ $(srcdir)/lsb-release.ch
 profile.xml:     $(BOOKdir)/$@ $(srcdir)/profile.ch

diff --git a/blfsbook/src/postlfs/config/Makefile.in b/blfsbook/src/postlfs/config/Makefile.in
index 70a4c85..7d74620 100644 (file)
--- a/blfsbook/src/postlfs/config/Makefile.in
+++ b/blfsbook/src/postlfs/config/Makefile.in
@@ -188,7 +188,6 @@ CHANGE_FILES = \
        config.ch      \
        devices.ch     \
        etcshells.ch   \
-       inputrc.ch     \
        logon.ch       \
        lsb-release.ch \
        profile.ch     \
@@ -396,7 +395,6 @@ bootdisk.xml:    $(BOOKdir)/$@ $(srcdir)/bootdisk.ch
 config.xml:      $(BOOKdir)/$@ $(srcdir)/config.ch
 devices.xml:     $(BOOKdir)/$@ $(srcdir)/devices.ch
 etcshells.xml:   $(BOOKdir)/$@ $(srcdir)/etcshells.ch
-inputrc.xml:     $(BOOKdir)/$@ $(srcdir)/inputrc.ch
 logon.xml:       $(BOOKdir)/$@ $(srcdir)/logon.ch
 lsb-release.xml: $(BOOKdir)/$@ $(srcdir)/lsb-release.ch
 profile.xml:     $(BOOKdir)/$@ $(srcdir)/profile.ch

diff --git a/blfsbook/src/postlfs/config/bootdisk.ch b/blfsbook/src/postlfs/config/bootdisk.ch
index d31a496..b6fd6be 100644 (file)
--- a/blfsbook/src/postlfs/config/bootdisk.ch
+++ b/blfsbook/src/postlfs/config/bootdisk.ch
@@ -129,14 +129,14 @@
 @x
     <para>Also, the LFS Community has developed its own LiveCD available at
     <ulink url='http://www.&lfs-domainname;/livecd/'/>.  This LiveCD, is no
-    longer capable of building an entire LFS/BLFS system, but is stiil a 
+    longer capable of building an entire LFS/BLFS system, but is still a
     good rescue CD-ROM.  If you download the
     ISO image, use <xref linkend="xorriso"/> to copy the image to a
     CD-ROM.</para>
 @y
     <para>Also, the LFS Community has developed its own LiveCD available at
     <ulink url='http://www.&lfs-domainname;/livecd/'/>.  This LiveCD, is no
-    longer capable of building an entire LFS/BLFS system, but is stiil a 
+    longer capable of building an entire LFS/BLFS system, but is still a
     good rescue CD-ROM.  If you download the
     ISO image, use <xref linkend="xorriso"/> to copy the image to a
     CD-ROM.</para>

diff --git a/blfsbook/src/postlfs/security/p11-kit.ch b/blfsbook/src/postlfs/security/p11-kit.ch
index d958047..5fbae2a 100644 (file)
--- a/blfsbook/src/postlfs/security/p11-kit.ch
+++ b/blfsbook/src/postlfs/security/p11-kit.ch
@@ -182,7 +182,7 @@
           p11-kit and trust
         </seg>
         <seg>
-          libp11-kit.so and p11-kit-proxy.so
+          libp11-kit.so, p11-kit-proxy.so and /usr/lib/pkcs11/p11-kit-trust.so
         </seg>
         <seg>
           /etc/pkcs11,
@@ -197,7 +197,7 @@
           p11-kit, trust
         </seg>
         <seg>
-          libp11-kit.so, p11-kit-proxy.so
+          libp11-kit.so, p11-kit-proxy.so, /usr/lib/pkcs11/p11-kit-trust.so
         </seg>
         <seg>
           /etc/pkcs11,

diff --git a/blfsbook/src/postlfs/security/sudo.ch b/blfsbook/src/postlfs/security/sudo.ch
index b892fbd..2db981f 100644 (file)
--- a/blfsbook/src/postlfs/security/sudo.ch
+++ b/blfsbook/src/postlfs/security/sudo.ch
@@ -142,26 +142,26 @@
 @z
 
 @x
-      <option>--with-timedir=/var/lib/sudo</option>: This switch places
+      <parameter>--with-timedir=/var/lib/sudo</parameter>: This switch places
       the variable time stamp files in a FHS compatible location.
 @y
-      <option>--with-timedir=/var/lib/sudo</option>:
+      <parameter>--with-timedir=/var/lib/sudo</parameter>:
       本スイッチはタイムスタンプファイルを FHS 互換のディレクトリに配置することを指示します。
 @z
 
 @x
-      <option>--with-all-insults</option>: This switch includes all the
+      <parameter>--with-all-insults</parameter>: This switch includes all the
       <application>sudo</application> insult sets.
 @y
-      <option>--with-all-insults</option>:
+      <parameter>--with-all-insults</parameter>:
       このスイッチは <application>sudo</application> が表示する侮辱の文言をすべて含めます。
 @z
 
 @x
-      <option>--with-env-editor</option>: This switch enables use of the 
+      <parameter>--with-env-editor</parameter>: This switch enables use of the
       environment variable EDITOR for <command>visudo</command>.
 @y
-      <option>--with-env-editor</option>:
+      <parameter>--with-env-editor</parameter>:
       このスイッチは <command>visudo</command> において環境変数 EDITOR の利用を有効にします。
 @z
 

diff --git a/blfsbook/src/x/lib/clutter-gst2.ch b/blfsbook/src/x/lib/clutter-gst2.ch
index 6347d82..d8325c5 100644 (file)
--- a/blfsbook/src/x/lib/clutter-gst2.ch
+++ b/blfsbook/src/x/lib/clutter-gst2.ch
@@ -171,7 +171,7 @@
           None
         </seg>
         <seg>
-          libclutter-gst-2.0.so
+          libclutter-gst-2.0.so and /usr/lib/gstreamer-1.0/libgstclutter.so
         </seg>
         <seg>
           /usr/include/clutter-gst-2.0 and
@@ -182,7 +182,7 @@
           &None;
         </seg>
         <seg>
-          libclutter-gst-2.0.so
+          libclutter-gst-2.0.so, /usr/lib/gstreamer-1.0/libgstclutter.so
         </seg>
         <seg>
           /usr/include/clutter-gst-2.0,

diff --git a/blfsbook/src/x/lib/cogl.ch b/blfsbook/src/x/lib/cogl.ch
index 7b2ad1b..1be1f9f 100644 (file)
--- a/blfsbook/src/x/lib/cogl.ch
+++ b/blfsbook/src/x/lib/cogl.ch
@@ -110,6 +110,7 @@
 @x
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="gst10-plugins-base"/>,
       <xref linkend="gtk-doc"/>,
       <xref linkend="sdl"/>,
       <ulink url="http://www.libsdl.org/tmp/release/">SDL2</ulink>, and
@@ -118,6 +119,7 @@
 @y
     <bridgehead renderas="sect4">&Optional;</bridgehead>
     <para role="optional">
+      <xref linkend="gst10-plugins-base"/>,
       <xref linkend="gtk-doc"/>,
       <xref linkend="sdl"/>,
       <ulink url="http://www.libsdl.org/tmp/release/">SDL2</ulink>,
@@ -188,8 +190,9 @@
         </seg>
         <seg>
           libcogl-gles2.so, 
-          libcogl-pango.so, and 
-          libcogl.so
+          libcogl-pango.so and 
+          libcogl.so, and optional libraries
+          libcogl-gst.so and /usr/lib/gstreamer-1.0/libgstcogl.so
        </seg>
         <seg>
          /usr/include/cogl and
@@ -202,7 +205,8 @@
         <seg>
           libcogl-gles2.so, 
           libcogl-pango.so,
-          libcogl.so
+          libcogl.so, 任意ビルドとして
+          libcogl-gst.so, /usr/lib/gstreamer-1.0/libgstcogl.so
        </seg>
         <seg>
          /usr/include/cogl,

diff --git a/blfsbook/src/xfce/apps/midori.ch b/blfsbook/src/xfce/apps/midori.ch
index 6264a2c..651c655 100644 (file)
--- a/blfsbook/src/xfce/apps/midori.ch
+++ b/blfsbook/src/xfce/apps/midori.ch
@@ -14,11 +14,13 @@
 @z
 
 @x
-  <!ENTITY midori-buildsize     "54 MB (additional 2 MB for the tests)">
-  <!ENTITY midori-time          "0.5 SBU (additional 0.3 SBU for the tests)">
+  <!ENTITY midori-buildsize     "55 MB (additional 2 MB for the tests)">
+  <!ENTITY midori-time          "0.5 SBU (additional less than 0.1 SBU
+                                 for the tests)">
 @y
-  <!ENTITY midori-buildsize     "54 MB (additional 2 MB for the tests)">
-  <!ENTITY midori-time          "0.5 SBU (additional 0.3 SBU for the tests)">
+  <!ENTITY midori-buildsize     "55 MB (additional 2 MB for the tests)">
+  <!ENTITY midori-time          "0.5 SBU (additional less than 0.1 SBU
+                                 for the tests)">
 @z
 
 @x
@@ -118,18 +120,18 @@
 @x
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libzeitgeist"/>, and
-      <xref linkend="libunique"/> or
-      <ulink url="&gnome-download-http;/libunique/">libunique (3.x)</ulink>
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="libzeitgeist"/>
+<!--      <xref linkend="libunique"/> or
+      <ulink url="&gnome-download-http;/libunique/">libunique (3.x)</ulink>-->
     </para>
 @y
     <bridgehead renderas="sect4">&Optional;</bridgehead>
     <para role="optional">
       <xref linkend="gtk-doc"/>,
-      <xref linkend="libzeitgeist"/>,
-      <xref linkend="libunique"/> または
-      <ulink url="&gnome-download-http;/libunique/">libunique (3.x)</ulink>
+      <xref linkend="libzeitgeist"/>
+<!--      <xref linkend="libunique"/> or
+      <ulink url="&gnome-download-http;/libunique/">libunique (3.x)</ulink>-->
     </para>
 @z
 
@@ -153,11 +155,10 @@
 @z
 
 @x
-      To test the results, issue: <command>make -k check</command> from an X
-      terminal emulator. Two tests fail for unknown reasons.
+      To test the results, issue: <command>make check</command> from an X
+      terminal emulator.
 @y
-      ビルド結果をテストする場合は、X端末エミュレーター上にて <command>make -k check</command> を実行します。
-      テストのうち二つのテストは原因不明により失敗します。
+      ビルド結果をテストする場合は、X端末エミュレーター上にて <command>make check</command> を実行します。
 @z
 
 @x

diff --git a/blfsbook/src/xfce/core/xfconf.ch b/blfsbook/src/xfce/core/xfconf.ch
index d0aab02..3c9709c 100644 (file)
--- a/blfsbook/src/xfce/core/xfconf.ch
+++ b/blfsbook/src/xfce/core/xfconf.ch
@@ -93,13 +93,21 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="gtk-doc"/> and
-      <xref linkend="perl-glib"/>
+      Perl Module
+      <ulink url="http://sourceforge.net/projects/gtk2-perl/files/Glib/">Glib</ulink>
+      (you may want to use <xref linkend="perl-standard-install"/> or
+      <xref linkend="perl-auto-install"/>)
+<!--      <xref linkend="perl-glib"/>-->
     </para>
 @y
     <bridgehead renderas="sect4">&Optional;</bridgehead>
     <para role="optional">
       <xref linkend="gtk-doc"/> and
-      <xref linkend="perl-glib"/>
+      Perl Module
+      <ulink url="http://sourceforge.net/projects/gtk2-perl/files/Glib/">Glib</ulink>
+      (you may want to use <xref linkend="perl-standard-install"/> or
+      <xref linkend="perl-auto-install"/>)
+<!--      <xref linkend="perl-glib"/>-->
     </para>
 @z
 

diff --git a/blfsbook/version.ac b/blfsbook/version.ac
index 7e6b213..5726a11 100644 (file)
--- a/blfsbook/version.ac
+++ b/blfsbook/version.ac
@@ -6,4 +6,4 @@ dnl  $Rev$
 dnl  $Date::                           $
 dnl
 dnl m4-include this file to define the current BLFS version
-m4_define([blfs_version], [20140114])
+m4_define([blfs_version], [20140121])