r305 - in x86/branches/utf8: . packages/coreutils

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Fri Jul 8 00:34:20 PDT 2005


Author: alexander
Date: 2005-07-08 01:34:19 -0600 (Fri, 08 Jul 2005)
New Revision: 305

Modified:
   x86/branches/utf8/BUGS
   x86/branches/utf8/packages/coreutils/Makefile
Log:
Added more RedHat patches to coreutils.


Modified: x86/branches/utf8/BUGS
===================================================================
--- x86/branches/utf8/BUGS	2005-07-07 14:54:08 UTC (rev 304)
+++ x86/branches/utf8/BUGS	2005-07-08 07:34:19 UTC (rev 305)
@@ -6,4 +6,9 @@
     strfmon():     Verify this function replaces conversion specifier i
                    with the double argument is formatted according to
 		   the locale's international currency format.
-    
+
+Coreutils:
+  /usr/bin/who -Hu header doesn't align with the main table contents in
+  some locales, because of two reasons: 1) assumption that the string
+  length in bytes and its width in cells are the same; 2) assumption that
+  translated strings fit. Possible fix: compile this program with NLS disabled.

Modified: x86/branches/utf8/packages/coreutils/Makefile
===================================================================
--- x86/branches/utf8/packages/coreutils/Makefile	2005-07-07 14:54:08 UTC (rev 304)
+++ x86/branches/utf8/packages/coreutils/Makefile	2005-07-08 07:34:19 UTC (rev 305)
@@ -20,21 +20,22 @@
 #        date --date="14 Mar 2004 21:04 +0100"
 #        outputs non-zero seconds.
 #
-# -overflow: without this, the de_DE.UTF-8 translation of "IDLE" overflows
-#        a buffer in /usr/bin/who.
-#
-# Other available patches:
 # -jday, -zh_CN: are supposed to fix output of "ls -l" if TIME_STYLE=locale
 #        in the corresponding locales.
 #        See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118958
-#        Actually the patches don't work because glibc code is used
-#        instead of the thing being patched.
+#        Actually the patches work only if one forces .gmo files to be
+#        regenerated.
 #
+# Other available patches:
 # -langinfo: is supposed to fix the output of "LANG=something LC_CTIME=C date",
 #        but in none of the locales provided by Glibc-2.3.4 the right hand of
 #        the conditional statement is evaluated, i.e. DATE_FMT_LANGINFO()
 #        always returns non-NULL. Thus, the patch is not needed.
 #
+# -overflow: without this, the translations of "IDLE" overflow
+#        a buffer in /usr/bin/who. However, the new buffer size is
+#        still insufficient, thus the patch has been replaced by sed.
+#
 # -sysinfo: we have -uname patch that does the same.
 #
 # -afs:  allows to build for AFS without installing AFS.
@@ -65,7 +66,8 @@
 RHPATCHES= \
 	coreutils-i18n.patch \
 	coreutils-dateseconds.patch \
-	coreutils-overflow.patch
+	coreutils-jday.patch \
+	coreutils-zh_CN.patch
 	
 URL= $(HTTP)/$(NM)/$(FILE)
 URL1= $(HTTP)/$(NM)/$(PATCH1)
@@ -104,8 +106,9 @@
 	 patch -Np1 -i $(SRC)/$(PATCH1) && patch -Np1 -i $(SRC)/$(PATCH2) && \
 	 for PATCH in $(RHPATCHES) ; do \
 	  patch -Np1 -i $(REDHAT)/coreutils/$$PATCH ; done && \
+	 sed -i 's,\(#define IDLESTR_LEN\) 6,\1 20,' src/who.c && \
 	 DEFAULT_POSIX2_VERSION=199209 ./configure --prefix=/usr && \
-	 make -j3 && make install && \
+	 make -j3 && make -C po update-gmo && make install && \
 	 $(WD)/bin/mv /usr/bin/{[,basename,cat,chgrp,chmod,chown,cp,dd,df} /bin && \
 	 $(WD)/bin/mv /usr/bin/{date,echo,false,head,hostname,install,ln} /bin && \
 	 $(WD)/bin/mv /usr/bin/{ls,mkdir,mknod,mv,pwd,rm,rmdir,sync} /bin && \




More information about the livecd mailing list