aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2012-04-29 11:30:17 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2012-04-29 11:30:17 +0000
commitae0510ab1db8f11772c0f3a14551bf2734eee0fd (patch)
tree2cce33324283edefe3a28a410e566858a4bd0d6d
parentd38ac3a291c8ba50a9097bf0e8815f741b8a3ba4 (diff)
Upgrade to Grep-2.12. Fixes #3068.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9835 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter06/grep.xml4
-rw-r--r--general.ent4
-rw-r--r--packages.ent6
4 files changed, 15 insertions, 9 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 025053c58..d31abc758 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>2012-04-29</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Upgrade to Grep-2.12. Fixes
+ <ulink url="&lfs-ticket-root;3068">#3068</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2012-04-26</para>
<itemizedlist>
<listitem>
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index 4622bdb90..58b0db366 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -40,10 +40,6 @@
<sect2 role="installation">
<title>Installation of Grep</title>
- <para>First, fix a small problem with a test script:</para>
-
-<screen><userinput remap="pre">sed -i 's/cp/#&amp;/' tests/unibyte-bracket-expr</userinput></screen>
-
<para>Prepare Grep for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin</userinput></screen>
diff --git a/general.ent b/general.ent
index a26034acf..eb446208c 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120426">
-<!ENTITY releasedate "Apr 26, 2012">
+<!ENTITY version "SVN-20120429">
+<!ENTITY releasedate "Apr 29, 2012">
<!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.2">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index e5aa25e22..f7f83cce7 100644
--- a/packages.ent
+++ b/packages.ent
@@ -219,10 +219,10 @@
<!ENTITY gmp-ch6-du "39 MB">
<!ENTITY gmp-ch6-sbu "1.7 SBU">
-<!ENTITY grep-version "2.11">
-<!ENTITY grep-size "1,101 KB">
+<!ENTITY grep-version "2.12">
+<!ENTITY grep-size "1,152 KB">
<!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
-<!ENTITY grep-md5 "ad9c6dbdeab93e50d2bc380f10ed3643">
+<!ENTITY grep-md5 "8d2f0346d08b13c18afb81f0e8aa1e2f">
<!ENTITY grep-home "&gnu-software;grep/">
<!ENTITY grep-ch5-du "18 MB">
<!ENTITY grep-ch5-sbu "0.2 SBU">