Changeset cfb2026a

Timestamp:

May 30, 2011, 3:05:44 PM (13 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

ec008670

Parents:

1718e20 (diff), 9f51c06 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Files:

• BOOK/final-system/common/grep.xml (modified) (1 diff)
• BOOK/final-system/common/shadow.xml (modified) (1 diff)
• BOOK/final-system/multilib/grep.xml (modified) (1 diff)
• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/materials/common/patches.xml (modified) (1 diff)
• BOOK/packages.ent (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/grep-2.6.3-fixes-1.patch (deleted)

BOOK/final-system/common/grep.xml

@@ -25 +25 @@
   <sect2 role="installation">
     <title>Installation of Grep</title>
-
-    <para os="p1">This patch contains various bug fixes for Grep:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&grep-fixes-patch;</userinput></screen>
 
     <para os="a">Prepare Grep for compilation:</para>

BOOK/final-system/common/shadow.xml

@@ -33 +33 @@
       command below.</para>
     </note>
+
+    <para os="f1">Fix an issue with the Russian man pages:</para>
+
+    <screen os="f2"><userinput>sed -i 's/man_MANS = $(man_nopam) /man_MANS = /' man/ru/Makefile.in</userinput></screen>
 
     <para os="b">Prepare Shadow for compilation:</para>

BOOK/final-system/multilib/grep.xml

@@ -21 +21 @@
   <sect2 role="installation">
     <title>Installation of Grep</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/introduction/common/changelog.xml

@@ -36 +36 @@
     </listitem>
 -->
+
+    <listitem>
+      <para>May 26, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jonathan] - Upgraded Shadow to 4.1.4.3.</para>
+        </listitem>
+        <listitem>
+          <para>[Jonathan] - Removed old grep patch.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>

BOOK/materials/common/patches.xml

@@ -74 +74 @@
 
     <varlistentry>
-      <term>Grep Fixes Patch - <token>&grep-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&grep-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&grep-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>IPUtils Fixes Patch - <token>&iputils-fixes-patch-size;</token>:</term>
       <listitem>

BOOK/packages.ent

@@ -414 +414 @@
 <!ENTITY sed-home "&gnu-software;sed">
 
-<!ENTITY shadow-version "4.1.4.2">
-<!ENTITY shadow-size "1,748 KB">
+<!ENTITY shadow-version "4.1.4.3">
+<!ENTITY shadow-size "1,804 KB">
 <!ENTITY shadow-url "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-&shadow-version;.tar.bz2">
-<!ENTITY shadow-md5 "d593a9cab93c48ee0a6ba056db8c1997">
+<!ENTITY shadow-md5 "b8608d8294ac88974f27b20f991c0e79">
 <!ENTITY shadow-home "http://pkg-shadow.alioth.debian.org">
 

BOOK/patches.ent

@@ -32 +32 @@
 <!ENTITY gcc-branch_update-patch-md5 "3ff1f39dc12932736694bf6fb6a1846a">
 <!ENTITY gcc-branch_update-patch-size "1.5 MB">
-
-<!ENTITY grep-fixes-patch "grep-&grep-version;-fixes-1.patch">
-<!ENTITY grep-fixes-patch-md5 "0cb36684847842adb17a1b3fb96f733d">
-<!ENTITY grep-fixes-patch-size "12 KB">
 
 <!ENTITY iputils-fixes-patch "iputils-&iputils-version;-fixes-1.patch">