security

dj Tue, 04 Aug 2009 22:25:19 -0700

Author: dj
Date: 2009-08-04 23:24:57 -0600 (Tue, 04 Aug 2009)
New Revision: 7936


Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/sysutils/mc.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/postlfs/security/shadow.xml
Log:
Removed/replaced convert-mans commands.

Modified: trunk/BOOK/general/sysutils/mc.xml
===================================================================
--- trunk/BOOK/general/sysutils/mc.xml  2009-08-04 17:44:17 UTC (rev 7935)
+++ trunk/BOOK/general/sysutils/mc.xml  2009-08-05 05:24:57 UTC (rev 7936)
@@ -139,16 +139,31 @@
     <application>MC</application>, so the documentation files have to be
     converted if (and only if) the Debian patch has been applied:</para>
 
-<screen><userinput>convert-mans ISO-8859-1 UTF-8 lib/mc.hint{,.es,.it,.nl} 
&amp;&amp;
-convert-mans ISO-8859-2 UTF-8 lib/mc.hint{.cs,.hu,.pl} &amp;&amp;
-convert-mans ISO-8859-5 UTF-8 lib/mc.hint.sr &amp;&amp;
-convert-mans KOI8-R UTF-8 lib/mc.hint.ru &amp;&amp;
-convert-mans KOI8-U UTF-8 lib/mc.hint.uk &amp;&amp;
-convert-mans BIG5 UTF-8 lib/mc.hint.zh &amp;&amp;
-convert-mans ISO-8859-1 UTF-8 doc/{es,it}/mc.hlp.* &amp;&amp;
-convert-mans ISO-8859-2 UTF-8 doc/{hu,pl}/mc.hlp.* &amp;&amp;
-convert-mans ISO-8859-5 UTF-8 doc/sr/mc.hlp.sr &amp;&amp;
-convert-mans KOI8-R UTF-8 doc/ru/mc.hlp.ru</userinput></screen>
+<!-- The proposed (untested) fix...somebody who uses MC please verify -->
+<screen><userinput>for file in lib/mc.hint{,.es,.it,.nl} doc/{es,it}/mc.hlp.*
+do
+    iconv -f ISO-8859-1 -t UTF-8 ${file} > ${file}.utf8 &amp;&amp;
+    mv ${file}.utf8 ${file}
+done &amp;&amp;
+for file in lib/mc.hint{.cs,.hu,.pl} doc/{hu,pl}/mc.hlp.*
+do
+    iconv -f ISO-8859-2 -t UTF-8 ${file} > ${file}.utf8 &amp;&amp;
+    mv ${file}.utf8 ${file}
+done &amp;&amp;
+for file in lib/mc.hint.sr doc/sr/mc.hlp.sr
+do
+    iconv -f ISO-8859-5 -t UTF-8 ${file} > ${file}.utf8 &amp;&amp;
+    mv ${file}.utf8 ${file}
+done &amp;&amp;
+for file in doc/ru/mc.hlp.ru lib/mc.hint.ru
+do
+    iconv -f KOI8-R -t UTF-8 ${file} > ${file}.utf8 &amp;&amp;
+    mv ${file}.utf8 ${file}
+done &amp;&amp;
+iconv -f KOI8-U -t UTF-8 lib/mc.hint.uk > lib/mc.hint.uk.utf8 &amp;&amp;
+mv lib/mc.hint.uk.utf8 lib/mc.hint.uk &amp;&amp;
+iconv -f BIG5 -t UTF-8 lib/mc.hint.zh > lib/mc.hint.zh.utf8 &amp;&amp;
+mv lib/mc.hint.zh.utf8 lib/mc.hint.zh</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
 

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2009-08-04 17:44:17 UTC (rev 7935)
+++ trunk/BOOK/general.ent      2009-08-05 05:24:57 UTC (rev 7936)
@@ -3,7 +3,7 @@
 $Date$
 -->
 
-<!ENTITY day          "04">                   <!-- Always 2 digits -->
+<!ENTITY day          "05">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2009">
 <!ENTITY copyrightdate "2001-&year;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       2009-08-04 17:44:17 UTC 
(rev 7935)
+++ trunk/BOOK/introduction/welcome/changelog.xml       2009-08-05 05:24:57 UTC 
(rev 7936)
@@ -41,6 +41,17 @@
 
 -->
     <listitem>
+      <para>August 5th, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Removed unnecessary convert-mans commands in shadow
+          instructions, and replaced invalid convert-mans commands with
+          equivalent iconv commands in MC.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>August 4th, 2009</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/postlfs/security/shadow.xml
===================================================================
--- trunk/BOOK/postlfs/security/shadow.xml      2009-08-04 17:44:17 UTC (rev 
7935)
+++ trunk/BOOK/postlfs/security/shadow.xml      2009-08-05 05:24:57 UTC (rev 
7936)
@@ -110,18 +110,6 @@
 find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \; &amp;&amp;
 sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile.in       &amp;&amp;
 
-for i in de fi fr id it pt_BR; do
-    convert-mans UTF-8 ISO-8859-1 man/${i}/*.?
-done                                                            &amp;&amp;
-
-for i in cs hu pl; do
-    convert-mans UTF-8 ISO-8859-2 man/${i}/*.?
-done                                                            &amp;&amp;
-
-convert-mans UTF-8 EUC-JP man/ja/*.?                            &amp;&amp;
-convert-mans UTF-8 KOI8-R man/ru/*.?                            &amp;&amp;
-convert-mans UTF-8 ISO-8859-9 man/tr/*.?                        &amp;&amp;
-
 sed -i -e 's...@#encrypt_method d...@encrypt_method MD5@' \
        -e 's@/var/spool/mail@/var/mail@' etc/login.defs         &amp;&amp;
 
@@ -155,10 +143,6 @@
     command disables the installation of Chinese and Korean manual pages, since
     <application>Man-DB</application> cannot format them properly.</para>
 
-    <para><command>convert-mans ...</command>: These commands are used to
-    convert some of the man pages so that <application>Man-DB</application>
-    will display them in the expected encodings.</para>
-
     <para><command>sed -i -e 's...@#encrypt_method d...@encrypt_method MD5@'
     -e 's@/var/spool/mail@/var/mail@' etc/login.defs</command>:
     Instead of using the default 'crypt' method, this command modifies the

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

r7936 - in trunk/BOOK: . general/sysutils introduction/welcome postlfs/security

Reply via email to