Changeset 1dc31027

Timestamp:

08/07/2001 01:43:37 PM (23 years ago)

Author:

Mark Hymers <markh@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.0, 6.1, 6.1.1, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, v3_0, v3_1, v3_2, v3_3, v4_0, v4_1, v5_0, v5_1, v5_1_1, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

5b99103

Parents:

6fda0ee9

Message:

Bug 123: change patch to sed

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@922 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• Attic/appendixc/packages.xml (modified) (1 diff)
• Attic/appendixc/shadowpwd-patch.xml (deleted)
• chapter01/changelog.xml (modified) (1 diff)
• chapter04/packages.xml (modified) (1 diff)
• chapter04/shadowpwd-patch.xml (deleted)
• chapter06/shadowpwd-exp.xml (modified) (1 diff)
• chapter06/shadowpwd-inst.xml (modified) (1 diff)
• index.xml (modified) (4 diffs)

Attic/appendixc/packages.xml

@@ -59 +59 @@
 &ac-psmisc;
 &ac-shadowpwd;
-&ac-shadowpwd-patch;
 &ac-sysklogd;
 &ac-sysvinit;

chapter01/changelog.xml

@@ -28 +28 @@
 </para></listitem>
 
+<listitem><para>Removed shadow-utils patch in favour of a sed
+command</para></listitem>
+
 <listitem><para>Removed sysvinit patch in favour of a sed
 command.</para></listitem>

chapter04/packages.xml

@@ -59 +59 @@
 &c3-psmisc;
 &c3-shadowpwd;
-&c3-shadowpwd-patch;
 &c3-sysklogd;
 &c3-sysvinit;

chapter06/shadowpwd-exp.xml

@@ -1 +1 @@
 <sect2>
 <title>Command explanations</title>
+
+<para><userinput>sed 's/\(.*\) (nflg || \(.*\)/\1\(\2/' useradd.c.temp
+&gt; src/useradd.c</userinput>: This sed is used to fix a compilation
+bug which occurs due to a variable being used but not defined.</para>
 
 <para><userinput>cp limits login.access and others:</userinput> These files

chapter06/shadowpwd-inst.xml

@@ -2 +2 @@
 <title>Installation of Shadow Password Suite</title>
 
-<para>Before the shadow Password Suite can be installed, the patch file
-must be unpacked.  This patch fixes a compliation problem due to a
-variable being used but not defined.  Install the Shadow Password 
-Suite by running the following commands:</para>
+<para>Install the Shadow Password Suite by running the 
+following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../shadow-20001016.patch &amp;&amp;</userinput>
+<para><screen><userinput>mv src/useradd.c useradd.c.temp &amp;&amp;</userinput>
+<userinput>sed 's/\(.*\) (nflg || \(.*\)/\1\(\2/' useradd.c.temp &gt; src/useradd.c &amp;&amp;</userinput>
 <userinput>./configure --prefix=/usr &amp;&amp;</userinput>
 <userinput>make &amp;&amp;</userinput>

index.xml

@@ -122 +122 @@
 <!ENTITY c3-psmisc SYSTEM "chapter3/psmisc.xml">
 <!ENTITY c3-shadowpwd SYSTEM "chapter3/shadowpwd.xml">
-<!ENTITY c3-shadowpwd-patch SYSTEM "chapter3/shadowpwd-patch.xml">
 <!ENTITY c3-sysklogd SYSTEM "chapter3/sysklogd.xml">
 <!ENTITY c3-sysvinit SYSTEM "chapter3/sysvinit.xml">
@@ -510 +509 @@
 <!ENTITY ac-psmisc SYSTEM "appendixc/psmisc.xml">
 <!ENTITY ac-shadowpwd SYSTEM "appendixc/shadowpwd.xml">
-<!ENTITY ac-shadowpwd-patch SYSTEM "appendixc/shadowpwd-patch.xml">
 <!ENTITY ac-sysklogd SYSTEM "appendixc/sysklogd.xml">
 <!ENTITY ac-sysvinit SYSTEM "appendixc/sysvinit.xml">
@@ -517 +515 @@
 <!ENTITY ac-nettools SYSTEM "appendixc/nettools.xml">
 
-<!ENTITY all-version "cvs-20010806-1924">
+<!ENTITY all-version "cvs-20010807-0600">
 <!ENTITY all-size-kb "77,160 KB">
 <!ENTITY all-size-mb "75 MB">
@@ -789 +787 @@
 <!ENTITY shadow-version "20001016">
 <!ENTITY shadow-size "551 KB">
-<!ENTITY shadow-patch-size "1 KB">
 <!ENTITY shadow-compsize "shadow MB">
 <!ENTITY shadow-time "shadow minutes">