[BLFS-SVN] Version 2013-12-18, r12415 対応.

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

diff --git a/blfsbook/configure b/blfsbook/configure
index 1ef701e..eb27e3b 100755 (executable)
--- a/blfsbook/configure
+++ b/blfsbook/configure
@@ -4013,7 +4013,7 @@ $as_echo "found" >&6; }
   fi
 
 
-TARGETVER=20131217
+TARGETVER=20131218
 
 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/general.ch b/blfsbook/src/general.ch
index 541890b..c10210f 100644 (file)
--- a/blfsbook/src/general.ch
+++ b/blfsbook/src/general.ch
@@ -15,11 +15,11 @@
 
 @x
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "December 17th, &year;">
+<!ENTITY releasedate  "December 18th, &year;">
 @y
 <!ENTITY version      "&year;-&month;-&day;">
 <!ENTITY releasedate  "&year;/&month;/&day;">
-<!ENTITY jversion     "20131218">
+<!ENTITY jversion     "20131219">
 <!ENTITY jratio       "55.9 &percnt;">
 @z
 

diff --git a/blfsbook/src/general/genlib/libgcrypt.ch b/blfsbook/src/general/genlib/libgcrypt.ch
index 0d6eaf6..a49161f 100644 (file)
--- a/blfsbook/src/general/genlib/libgcrypt.ch
+++ b/blfsbook/src/general/genlib/libgcrypt.ch
@@ -183,7 +183,7 @@
 
 @x
         <seg>
-          dumpsexp, hmac256 and libgcrypt-config
+          dumpsexp, hmac256, libgcrypt-config, and mpicalc
         </seg>
         <seg>
           libgcrypt.so
@@ -193,7 +193,7 @@
         </seg>
 @y
         <seg>
-          dumpsexp, hmac256, libgcrypt-config
+          dumpsexp, hmac256, libgcrypt-config, mpicalc
         </seg>
         <seg>
           libgcrypt.so

diff --git a/blfsbook/src/general/prog/git.ch b/blfsbook/src/general/prog/git.ch
index aef0f29..d560bb3 100644 (file)
--- a/blfsbook/src/general/prog/git.ch
+++ b/blfsbook/src/general/prog/git.ch
@@ -14,14 +14,13 @@
 @z
 
 @x
-  <!ENTITY git-buildsize     "190 MB (203 MB with downloaded docs and man
-                              pages - 214 MB building docs and man pages)">
-  <!ENTITY git-time          "0.7 SBU (additional 8 SBU for tests and 2.7 SBU
+  <!ENTITY git-buildsize     "175 MB (additional 10 MB with downloaded docs and
+                              man pages, or 20 MB building docs and man pages)">
+  <!ENTITY git-time          "0.7 SBU (additional 8.7 SBU for tests and 2.7 SBU
                               for docs and man pages creation)">
 @y
-  <!ENTITY git-buildsize     "190 MB (203 MB with downloaded docs and man
-                              pages - 214 MB building docs and man pages)">
-  <!ENTITY git-time          "0.7 SBU (さらにテスト実行時は 8 SBU、ドキュメントおよびmanページ生成時は 2.7 SBU)">
+  <!ENTITY git-buildsize     "175 MB (さらにダウンロードしたドキュメントと man ページ利用の場合 10MB、それらをビルドする場合は 20MB)">
+  <!ENTITY git-time          "0.7 SBU (さらにテスト実行時は 8.7 SBU、ドキュメントおよび man ページ生成時は 2.7 SBU)">
 @z
 
 @x

diff --git a/blfsbook/src/networking/netutils/wireshark.ch b/blfsbook/src/networking/netutils/wireshark.ch
index 304683b..7ccfd06 100644 (file)
--- a/blfsbook/src/networking/netutils/wireshark.ch
+++ b/blfsbook/src/networking/netutils/wireshark.ch
@@ -379,14 +379,14 @@
         <seg>capinfos, dftest, dumpcap, editcap, mergecap, randpkt, rawshark,
         reordercap, text2pcap, tshark, and wireshark</seg>
         <seg>libwireshark.so, libwiretap.so, libwsutil.so, and
-        numerous plugin modules</seg>
+        numerous plugin modules under /usr/lib/wireshark/plugins</seg>
         <seg>/usr/lib/wireshark, /usr/share/doc/wireshark-&wireshark-version;,
         /usr/share/pixmaps/wireshark, and /usr/share/wireshark</seg>
 @y
         <seg>capinfos, dftest, dumpcap, editcap, mergecap, randpkt, rawshark,
         reordercap, text2pcap, tshark, wireshark</seg>
-        <seg>libwireshark.so, libwiretap.so, libwsutil.so, and
-        numerous plugin modules</seg>
+        <seg>libwireshark.so, libwiretap.so, libwsutil.so,
+        /usr/lib/wireshark/plugins ディレクトリ配下に多くのプラグインモジュール</seg>
         <seg>/usr/lib/wireshark, /usr/share/doc/wireshark-&wireshark-version;,
         /usr/share/pixmaps/wireshark, /usr/share/wireshark</seg>
 @z

diff --git a/blfsbook/version.ac b/blfsbook/version.ac
index 86aed31..6bbdc64 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], [20131217])
+m4_define([blfs_version], [20131218])