Author: alexander
Date: 2007-03-24 04:47:05 -0600 (Sat, 24 Mar 2007)
New Revision: 1824
Added:
trunk/packages/linux/linux-2.6.20.1-iocharset-2.patch
trunk/packages/linux64/linux-2.6.20.1-iocharset-2.patch
Modified:
trunk/packages/blfs-bootscripts/Makefile
trunk/packages/glibc/Makefile
trunk/packages/hal/Makefile
trunk/packages/librcc/Makefile
trunk/packages/linux/Makefile
trunk/packages/linux/config.x86
trunk/packages/linux64/Makefile
trunk/packages/linux64/config.x86_64
trunk/packages/recode/Makefile
Log:
* Added librcc configuration utility
* Added kernel patch that can switch default iocharset and codepage at runtime
* Updated HAL
* Added bugfixes to recode
* Added upstream patch to Chapter 5 glibc
Modified: trunk/packages/blfs-bootscripts/Makefile
===================================================================
--- trunk/packages/blfs-bootscripts/Makefile 2007-03-07 15:16:09 UTC (rev
1823)
+++ trunk/packages/blfs-bootscripts/Makefile 2007-03-24 10:47:05 UTC (rev
1824)
@@ -29,6 +29,8 @@
make install-service-pppoe
make install-gpm
make install-autosshd
+ make install-dbus
+ make install-haldaemon
install -m754 blfs/init.d/sshd /etc/rc.d/init.d/
install -m754 blfs/init.d/random /etc/rc.d/init.d/
install -m754 blfs/init.d/portmap /etc/rc.d/init.d/
Modified: trunk/packages/glibc/Makefile
===================================================================
--- trunk/packages/glibc/Makefile 2007-03-07 15:16:09 UTC (rev 1823)
+++ trunk/packages/glibc/Makefile 2007-03-24 10:47:05 UTC (rev 1824)
@@ -26,6 +26,7 @@
$(sep_dir_build)
compile-stage1:
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
# --enable-static overrides the unsuitable default in config.site
../$(DIR)/configure --prefix=$(WD) --disable-profile \
--enable-add-ons --enable-kernel=2.6.0 --with-binutils=$(WD)/bin \
Modified: trunk/packages/hal/Makefile
===================================================================
--- trunk/packages/hal/Makefile 2007-03-07 15:16:09 UTC (rev 1823)
+++ trunk/packages/hal/Makefile 2007-03-24 10:47:05 UTC (rev 1824)
@@ -1,12 +1,12 @@
# hal Makefile
NM= hal
-VRS= 0.5.8.1
+VRS= 0.5.9
DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
+FILE= $(DIR).rc1.tar.gz
URL-$(FILE)= http://people.freedesktop.org/~david/dist/$(FILE)
-SHA-$(FILE)= 35675b6701b9e953edfabf0d91b68ccee5a5a491
+SHA-$(FILE)= 024f748d296647b580e16f78f909ee6d1737b173
# Targets
Modified: trunk/packages/librcc/Makefile
===================================================================
--- trunk/packages/librcc/Makefile 2007-03-07 15:16:09 UTC (rev 1823)
+++ trunk/packages/librcc/Makefile 2007-03-24 10:47:05 UTC (rev 1824)
@@ -24,6 +24,8 @@
./configure --prefix=/usr
make
make install
+ make -C examples rcc-gtk2-config
+ install -m755 examples/rcc-gtk2-config /usr/bin
clean:
-rm -rf $(DIR)
Modified: trunk/packages/linux/Makefile
===================================================================
--- trunk/packages/linux/Makefile 2007-03-07 15:16:09 UTC (rev 1823)
+++ trunk/packages/linux/Makefile 2007-03-24 10:47:05 UTC (rev 1824)
@@ -10,6 +10,8 @@
PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch
+PATCH50= linux-2.6.20.1-iocharset-2.patch
+
# Targets
include $(ROOT)/scripts/functions
@@ -23,6 +25,7 @@
compile-stage2:
patch -Np1 -i ../$(PATCH3)
+ patch -Np1 -i ../$(PATCH50)
mkdir -p /boot/isolinux
make mrproper
cp ../config.x86 .config
Modified: trunk/packages/linux/config.x86
===================================================================
--- trunk/packages/linux/config.x86 2007-03-07 15:16:09 UTC (rev 1823)
+++ trunk/packages/linux/config.x86 2007-03-24 10:47:05 UTC (rev 1824)
@@ -1860,8 +1860,6 @@
CONFIG_FAT_FS=m
CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
CONFIG_NTFS_FS=m
# CONFIG_NTFS_DEBUG is not set
CONFIG_NTFS_RW=y
@@ -1919,7 +1917,6 @@
# CONFIG_RPCSEC_GSS_SPKM3 is not set
CONFIG_SMB_FS=m
CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp437"
CONFIG_CIFS=m
# CONFIG_CIFS_STATS is not set
CONFIG_CIFS_WEAK_PW_HASH=y
@@ -1942,6 +1939,7 @@
#
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_CODEPAGE_DEFAULT="cp437"
CONFIG_NLS_CODEPAGE_437=m
CONFIG_NLS_CODEPAGE_737=m
CONFIG_NLS_CODEPAGE_775=m
Added: trunk/packages/linux/linux-2.6.20.1-iocharset-2.patch
===================================================================
--- trunk/packages/linux/linux-2.6.20.1-iocharset-2.patch
(rev 0)
+++ trunk/packages/linux/linux-2.6.20.1-iocharset-2.patch 2007-03-24
10:47:05 UTC (rev 1824)
@@ -0,0 +1,420 @@
+diff -ur linux-2.6.20.1/include/linux/msdos_fs.h
linux-2.6.20.1.new/include/linux/msdos_fs.h
+--- linux-2.6.20.1/include/linux/msdos_fs.h 2007-02-20 11:34:32.000000000
+0500
++++ linux-2.6.20.1.new/include/linux/msdos_fs.h 2007-03-15
20:58:37.000000000 +0500
+@@ -191,7 +191,7 @@
+ gid_t fs_gid;
+ unsigned short fs_fmask;
+ unsigned short fs_dmask;
+- unsigned short codepage; /* Codepage for shortname conversions */
++ char *codepage; /* Codepage for shortname conversions */
+ char *iocharset; /* Charset used for filename input/display */
+ unsigned short shortname; /* flags for shortname display/create rule */
+ unsigned char name_check; /* r = relaxed, n = normal, s = strict */
+diff -ur linux-2.6.20.1/include/linux/nls.h
linux-2.6.20.1.new/include/linux/nls.h
+--- linux-2.6.20.1/include/linux/nls.h 2007-02-20 11:34:32.000000000 +0500
++++ linux-2.6.20.1.new/include/linux/nls.h 2007-03-15 19:44:40.000000000
+0500
+@@ -3,6 +3,11 @@
+
+ #include <linux/init.h>
+
++#define NLS_MAXNAMELEN 20
++
++extern char default_iocharset[NLS_MAXNAMELEN];
++extern char default_codepage[NLS_MAXNAMELEN];
++
+ /* unicode character */
+ typedef __u16 wchar_t;
+
+diff -ur linux-2.6.20.1/include/linux/smb.h
linux-2.6.20.1.new/include/linux/smb.h
+--- linux-2.6.20.1/include/linux/smb.h 2007-02-20 11:34:32.000000000 +0500
++++ linux-2.6.20.1.new/include/linux/smb.h 2007-03-15 19:44:16.000000000
+0500
+@@ -11,6 +11,7 @@
+
+ #include <linux/types.h>
+ #include <linux/magic.h>
++#include <linux/nls.h>
+
+ enum smb_protocol {
+ SMB_PROTOCOL_NONE,
+@@ -63,10 +64,9 @@
+
+ #ifdef __KERNEL__
+
+-#define SMB_NLS_MAXNAMELEN 20
+ struct smb_nls_codepage {
+- char local_name[SMB_NLS_MAXNAMELEN];
+- char remote_name[SMB_NLS_MAXNAMELEN];
++ char local_name[NLS_MAXNAMELEN];
++ char remote_name[NLS_MAXNAMELEN];
+ };
+
+
+diff -ur linux-2.6.20.1/fs/fat/inode.c linux-2.6.20.1.new/fs/fat/inode.c
+--- linux-2.6.20.1/fs/fat/inode.c 2007-02-20 11:34:32.000000000 +0500
++++ linux-2.6.20.1.new/fs/fat/inode.c 2007-03-15 21:49:09.000000000 +0500
+@@ -27,15 +27,6 @@
+ #include <linux/writeback.h>
+ #include <asm/unaligned.h>
+
+-#ifndef CONFIG_FAT_DEFAULT_IOCHARSET
+-/* if user don't select VFAT, this is undefined. */
+-#define CONFIG_FAT_DEFAULT_IOCHARSET ""
+-#endif
+-
+-static int fat_default_codepage = CONFIG_FAT_DEFAULT_CODEPAGE;
+-static char fat_default_iocharset[] = CONFIG_FAT_DEFAULT_IOCHARSET;
+-
+-
+ static int fat_add_cluster(struct inode *inode)
+ {
+ int err, cluster;
+@@ -462,15 +453,18 @@
+ if (sbi->nls_disk) {
+ unload_nls(sbi->nls_disk);
+ sbi->nls_disk = NULL;
+- sbi->options.codepage = fat_default_codepage;
+ }
+ if (sbi->nls_io) {
+ unload_nls(sbi->nls_io);
+ sbi->nls_io = NULL;
+ }
+- if (sbi->options.iocharset != fat_default_iocharset) {
++ if (sbi->options.iocharset != default_iocharset) {
+ kfree(sbi->options.iocharset);
+- sbi->options.iocharset = fat_default_iocharset;
++ sbi->options.iocharset = default_iocharset;
++ }
++ if (sbi->options.codepage != default_codepage) {
++ kfree(sbi->options.codepage);
++ sbi->options.codepage = default_codepage;
+ }
+
+ sb->s_fs_info = NULL;
+@@ -869,7 +863,7 @@
+ {Opt_umask, "umask=%o"},
+ {Opt_dmask, "dmask=%o"},
+ {Opt_fmask, "fmask=%o"},
+- {Opt_codepage, "codepage=%u"},
++ {Opt_codepage, "codepage=%s"},
+ {Opt_nocase, "nocase"},
+ {Opt_quiet, "quiet"},
+ {Opt_showexec, "showexec"},
+@@ -933,14 +927,15 @@
+ substring_t args[MAX_OPT_ARGS];
+ int option;
+ char *iocharset;
++ char *codepage;
+
+ opts->isvfat = is_vfat;
+
+ opts->fs_uid = current->uid;
+ opts->fs_gid = current->gid;
+ opts->fs_fmask = opts->fs_dmask = current->fs->umask;
+- opts->codepage = fat_default_codepage;
+- opts->iocharset = fat_default_iocharset;
++ opts->codepage = default_codepage;
++ opts->iocharset = default_iocharset;
+ if (is_vfat)
+ opts->shortname = VFAT_SFN_DISPLAY_LOWER|VFAT_SFN_CREATE_WIN95;
+ else
+@@ -1024,9 +1019,12 @@
+ opts->fs_fmask = option;
+ break;
+ case Opt_codepage:
+- if (match_int(&args[0], &option))
+- return 0;
+- opts->codepage = option;
++ if (opts->codepage != default_codepage)
++ kfree(opts->codepage);
++ codepage = match_strdup(&args[0]);
++ if (!codepage)
++ return -ENOMEM;
++ opts->codepage = codepage;
+ break;
+ case Opt_flush:
+ opts->flush = 1;
+@@ -1042,7 +1040,7 @@
+
+ /* vfat specific */
+ case Opt_charset:
+- if (opts->iocharset != fat_default_iocharset)
++ if (opts->iocharset != default_iocharset)
+ kfree(opts->iocharset);
+ iocharset = match_strdup(&args[0]);
+ if (!iocharset)
+@@ -1101,8 +1099,8 @@
+ }
+ /* UTF-8 doesn't provide FAT semantics */
+ if (!strcmp(opts->iocharset, "utf8")) {
+- printk(KERN_ERR "FAT: utf8 is not a recommended IO charset"
+- " for FAT filesystems, filesystem will be case
sensitive!\n");
++ printk(KERN_INFO "FAT: utf8 IO charset"
++ " is used, filesystem will be case sensitive!\n");
+ }
+
+ if (opts->unicode_xlate)
+@@ -1162,7 +1160,6 @@
+ int debug;
+ unsigned int media;
+ long error;
+- char buf[50];
+
+ sbi = kzalloc(sizeof(struct msdos_sb_info), GFP_KERNEL);
+ if (!sbi)
+@@ -1372,10 +1369,18 @@
+ */
+
+ error = -EINVAL;
+- sprintf(buf, "cp%d", sbi->options.codepage);
+- sbi->nls_disk = load_nls(buf);
++
++ sbi->nls_disk = load_nls(sbi->options.codepage);
++ if (!sbi->nls_disk) {
++ /* Maybe the old non-standard codepage specification is used */
++ char buf[NLS_MAXNAMELEN];
++ snprintf(buf, sizeof(buf), "cp%s", sbi->options.codepage);
++ buf[sizeof(buf) - 1] = 0;
++ sbi->nls_disk = load_nls(buf);
++ }
++
+ if (!sbi->nls_disk) {
+- printk(KERN_ERR "FAT: codepage %s not found\n", buf);
++ printk(KERN_ERR "FAT: codepage %s not found\n",
sbi->options.codepage);
+ goto out_fail;
+ }
+
+@@ -1421,8 +1426,10 @@
+ unload_nls(sbi->nls_io);
+ if (sbi->nls_disk)
+ unload_nls(sbi->nls_disk);
+- if (sbi->options.iocharset != fat_default_iocharset)
++ if (sbi->options.iocharset != default_iocharset)
+ kfree(sbi->options.iocharset);
++ if (sbi->options.codepage != default_codepage)
++ kfree(sbi->options.codepage);
+ sb->s_fs_info = NULL;
+ kfree(sbi);
+ return error;
+diff -ur linux-2.6.20.1/fs/isofs/inode.c linux-2.6.20.1.new/fs/isofs/inode.c
+--- linux-2.6.20.1/fs/isofs/inode.c 2007-02-20 11:34:32.000000000 +0500
++++ linux-2.6.20.1.new/fs/isofs/inode.c 2007-03-15 19:34:11.000000000
+0500
+@@ -773,7 +773,7 @@
+
+ #ifdef CONFIG_JOLIET
+ if (joliet_level && opt.utf8 == 0) {
+- char * p = opt.iocharset ? opt.iocharset : CONFIG_NLS_DEFAULT;
++ char * p = opt.iocharset ? opt.iocharset : default_iocharset;
+ sbi->s_nls_iocharset = load_nls(p);
+ if (! sbi->s_nls_iocharset) {
+ /* Fail only if explicit charset specified */
+diff -ur linux-2.6.20.1/fs/Kconfig linux-2.6.20.1.new/fs/Kconfig
+--- linux-2.6.20.1/fs/Kconfig 2007-02-20 11:34:32.000000000 +0500
++++ linux-2.6.20.1.new/fs/Kconfig 2007-03-16 14:03:57.000000000 +0500
+@@ -785,28 +785,6 @@
+ To compile this as a module, choose M here: the module will be called
+ vfat.
+
+-config FAT_DEFAULT_CODEPAGE
+- int "Default codepage for FAT"
+- depends on MSDOS_FS || VFAT_FS
+- default 437
+- help
+- This option should be set to the codepage of your FAT filesystems.
+- It can be overridden with the "codepage" mount option.
+- See <file:Documentation/filesystems/vfat.txt> for more information.
+-
+-config FAT_DEFAULT_IOCHARSET
+- string "Default iocharset for FAT"
+- depends on VFAT_FS
+- default "iso8859-1"
+- help
+- Set this to the default input/output character set you'd
+- like FAT to use. It should probably match the character set
+- that most of your FAT filesystems use, and can be overridden
+- with the "iocharset" mount option for FAT filesystems.
+- Note that "utf8" is not recommended for FAT filesystems.
+- If unsure, you shouldn't set "utf8" here.
+- See <file:Documentation/filesystems/vfat.txt> for more information.
+-
+ config NTFS_FS
+ tristate "NTFS file system support"
+ select NLS
+@@ -1830,35 +1808,6 @@
+ To compile the SMB support as a module, choose M here: the module will
+ be called smbfs. Most people say N, however.
+
+-config SMB_NLS_DEFAULT
+- bool "Use a default NLS"
+- depends on SMB_FS
+- help
+- Enabling this will make smbfs use nls translations by default. You
+- need to specify the local charset (CONFIG_NLS_DEFAULT) in the nls
+- settings and you need to give the default nls for the SMB server as
+- CONFIG_SMB_NLS_REMOTE.
+-
+- The nls settings can be changed at mount time, if your smbmount
+- supports that, using the codepage and iocharset parameters.
+-
+- smbmount from samba 2.2.0 or later supports this.
+-
+-config SMB_NLS_REMOTE
+- string "Default Remote NLS Option"
+- depends on SMB_NLS_DEFAULT
+- default "cp437"
+- help
+- This setting allows you to specify a default value for which
+- codepage the server uses. If this field is left blank no
+- translations will be done by default. The local codepage/charset
+- default to CONFIG_NLS_DEFAULT.
+-
+- The nls settings can be changed at mount time, if your smbmount
+- supports that, using the codepage and iocharset parameters.
+-
+- smbmount from samba 2.2.0 or later supports this.
+-
+ config CIFS
+ tristate "CIFS support (advanced network filesystem for Samba, Window
and other CIFS compliant servers)"
+ depends on INET
+diff -ur linux-2.6.20.1/fs/nls/Kconfig linux-2.6.20.1.new/fs/nls/Kconfig
+--- linux-2.6.20.1/fs/nls/Kconfig 2007-02-20 11:34:32.000000000 +0500
++++ linux-2.6.20.1.new/fs/nls/Kconfig 2007-03-15 20:04:38.000000000 +0500
+@@ -18,13 +18,13 @@
+ will be called nls_base.
+
+ config NLS_DEFAULT
+- string "Default NLS Option"
++ string "Default UNIX NLS Option"
+ depends on NLS
+ default "iso8859-1"
+ ---help---
+- The default NLS used when mounting file system. Note, that this is
+- the NLS used by your console, not the NLS used by a specific file
+- system (if different) to store data (filenames) on a disk.
++ The default UNIX NLS used when mounting file system. Note, that
++ this is the NLS expected by the "ls" command, ot the NLS used
++ internally by a specific file system to store filenames on a disk.
+ Currently, the valid values are:
+ big5, cp437, cp737, cp775, cp850, cp852, cp855, cp857, cp860, cp861,
+ cp862, cp863, cp864, cp865, cp866, cp869, cp874, cp932, cp936,
+@@ -37,6 +37,26 @@
+
+ If unsure, specify it as "iso8859-1".
+
++config CODEPAGE_DEFAULT
++ string "Default MS-DOS NLS Option"
++ depends on NLS
++ default "cp437"
++ ---help---
++ The default MS-DOS NLS used when mounting file systems with MS-DOS
++ origin. Note, that this is the NLS used internally by these file
++ systems to store filenames on a disk or for transmission over a
++ network, not the NLS expected by the "ls" command.
++ Currently, the valid values are:
++ big5, cp437, cp737, cp775, cp850, cp852, cp855, cp857, cp860, cp861,
++ cp862, cp863, cp864, cp865, cp866, cp869, cp874, cp932, cp936,
++ cp949, cp950, cp1251, cp1255, euc-jp, euc-kr, gb2312, iso8859-1,
++ iso8859-2, iso8859-3, iso8859-4, iso8859-5, iso8859-6, iso8859-7,
++ iso8859-8, iso8859-9, iso8859-13, iso8859-14, iso8859-15,
++ koi8-r, koi8-ru, koi8-u, sjis, tis-620, utf8.
++ If you specify a wrong value, mounting will fail.
++
++ If unsure, specify it as "cp437".
++
+ config NLS_CODEPAGE_437
+ tristate "Codepage 437 (United States, Canada)"
+ depends on NLS
+diff -ur linux-2.6.20.1/fs/nls/nls_base.c linux-2.6.20.1.new/fs/nls/nls_base.c
+--- linux-2.6.20.1/fs/nls/nls_base.c 2007-02-20 11:34:32.000000000 +0500
++++ linux-2.6.20.1.new/fs/nls/nls_base.c 2007-03-15 19:45:59.000000000
+0500
+@@ -18,6 +18,9 @@
+ #endif
+ #include <linux/spinlock.h>
+
++char default_iocharset[NLS_MAXNAMELEN] = CONFIG_NLS_DEFAULT;
++char default_codepage[NLS_MAXNAMELEN] = CONFIG_CODEPAGE_DEFAULT;
++
+ static struct nls_table default_table;
+ static struct nls_table *tables = &default_table;
+ static DEFINE_SPINLOCK(nls_lock);
+@@ -474,7 +477,7 @@
+ {
+ struct nls_table *default_nls;
+
+- default_nls = load_nls(CONFIG_NLS_DEFAULT);
++ default_nls = load_nls(default_iocharset);
+ if (default_nls != NULL)
+ return default_nls;
+ else
+@@ -490,5 +507,13 @@
+ EXPORT_SYMBOL(utf8_mbstowcs);
+ EXPORT_SYMBOL(utf8_wctomb);
+ EXPORT_SYMBOL(utf8_wcstombs);
++EXPORT_SYMBOL(default_iocharset);
++EXPORT_SYMBOL(default_codepage);
++
++module_param_string(iocharset, default_iocharset, NLS_MAXNAMELEN, 0644);
++MODULE_PARM_DESC(iocharset, "Default UNIX filename charset");
++
++module_param_string(codepage, default_codepage, NLS_MAXNAMELEN, 0644);
++MODULE_PARM_DESC(codepage, "Default MS-DOS filename charset");
+
+ MODULE_LICENSE("Dual BSD/GPL");
+diff -ur linux-2.6.20.1/fs/smbfs/inode.c linux-2.6.20.1.new/fs/smbfs/inode.c
+--- linux-2.6.20.1/fs/smbfs/inode.c 2007-02-20 11:34:32.000000000 +0500
++++ linux-2.6.20.1.new/fs/smbfs/inode.c 2007-03-15 19:57:42.000000000
+0500
+@@ -36,13 +36,6 @@
+ #include "getopt.h"
+ #include "proto.h"
+
+-/* Always pick a default string */
+-#ifdef CONFIG_SMB_NLS_REMOTE
+-#define SMB_NLS_REMOTE CONFIG_SMB_NLS_REMOTE
+-#else
+-#define SMB_NLS_REMOTE ""
+-#endif
+-
+ #define SMB_TTL_DEFAULT 1000
+
+ static void smb_delete_inode(struct inode *);
+@@ -396,11 +389,11 @@
+ break;
+ case 'i':
+ strlcpy(mnt->codepage.local_name, optarg,
+- SMB_NLS_MAXNAMELEN);
++ NLS_MAXNAMELEN);
+ break;
+ case 'c':
+ strlcpy(mnt->codepage.remote_name, optarg,
+- SMB_NLS_MAXNAMELEN);
++ NLS_MAXNAMELEN);
+ break;
+ case 't':
+ mnt->ttl = value;
+@@ -446,10 +439,8 @@
+ if (mnt->flags & SMB_MOUNT_DMODE)
+ seq_printf(s, ",dir_mode=%04o", mnt->dir_mode & S_IRWXUGO);
+
+- if (strcmp(mnt->codepage.local_name, CONFIG_NLS_DEFAULT))
+- seq_printf(s, ",iocharset=%s", mnt->codepage.local_name);
+- if (strcmp(mnt->codepage.remote_name, SMB_NLS_REMOTE))
+- seq_printf(s, ",codepage=%s", mnt->codepage.remote_name);
++ seq_printf(s, ",iocharset=%s", mnt->codepage.local_name);
++ seq_printf(s, ",codepage=%s", mnt->codepage.remote_name);
+
+ if (mnt->ttl != SMB_TTL_DEFAULT)
+ seq_printf(s, ",ttl=%d", mnt->ttl);
+@@ -555,10 +546,10 @@
+ mnt = server->mnt;
+
+ memset(mnt, 0, sizeof(struct smb_mount_data_kernel));
+- strlcpy(mnt->codepage.local_name, CONFIG_NLS_DEFAULT,
+- SMB_NLS_MAXNAMELEN);
+- strlcpy(mnt->codepage.remote_name, SMB_NLS_REMOTE,
+- SMB_NLS_MAXNAMELEN);
++ strlcpy(mnt->codepage.local_name, default_iocharset,
++ NLS_MAXNAMELEN);
++ strlcpy(mnt->codepage.remote_name, default_codepage,
++ NLS_MAXNAMELEN);
+
+ mnt->ttl = SMB_TTL_DEFAULT;
+ if (ver == SMB_MOUNT_OLDVERSION) {
Modified: trunk/packages/linux64/Makefile
===================================================================
--- trunk/packages/linux64/Makefile 2007-03-07 15:16:09 UTC (rev 1823)
+++ trunk/packages/linux64/Makefile 2007-03-24 10:47:05 UTC (rev 1824)
@@ -10,6 +10,8 @@
PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch
+PATCH50= linux-2.6.20.1-iocharset-2.patch
+
# Targets
include $(ROOT)/scripts/functions
@@ -23,6 +25,7 @@
compile-stage2:
patch -Np1 -i ../$(PATCH3)
+ patch -Np1 -i ../$(PATCH50)
make mrproper
cp ../config.x86_64 .config
PATH=$$PATH:$(WD)/bin make ARCH=x86_64
CROSS_COMPILE=x86_64-unknown-linux-gnu-
Modified: trunk/packages/linux64/config.x86_64
===================================================================
--- trunk/packages/linux64/config.x86_64 2007-03-07 15:16:09 UTC (rev
1823)
+++ trunk/packages/linux64/config.x86_64 2007-03-24 10:47:05 UTC (rev
1824)
@@ -1838,8 +1838,6 @@
CONFIG_FAT_FS=m
CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
CONFIG_NTFS_FS=m
# CONFIG_NTFS_DEBUG is not set
CONFIG_NTFS_RW=y
@@ -1896,8 +1894,6 @@
# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RPCSEC_GSS_SPKM3 is not set
CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp437"
CONFIG_CIFS=m
# CONFIG_CIFS_STATS is not set
CONFIG_CIFS_WEAK_PW_HASH=y
@@ -1920,6 +1916,7 @@
#
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_CODEPAGE_DEFAULT="cp437"
CONFIG_NLS_CODEPAGE_437=m
CONFIG_NLS_CODEPAGE_737=m
CONFIG_NLS_CODEPAGE_775=m
Added: trunk/packages/linux64/linux-2.6.20.1-iocharset-2.patch
===================================================================
--- trunk/packages/linux64/linux-2.6.20.1-iocharset-2.patch
(rev 0)
+++ trunk/packages/linux64/linux-2.6.20.1-iocharset-2.patch 2007-03-24
10:47:05 UTC (rev 1824)
@@ -0,0 +1,420 @@
+diff -ur linux-2.6.20.1/include/linux/msdos_fs.h
linux-2.6.20.1.new/include/linux/msdos_fs.h
+--- linux-2.6.20.1/include/linux/msdos_fs.h 2007-02-20 11:34:32.000000000
+0500
++++ linux-2.6.20.1.new/include/linux/msdos_fs.h 2007-03-15
20:58:37.000000000 +0500
+@@ -191,7 +191,7 @@
+ gid_t fs_gid;
+ unsigned short fs_fmask;
+ unsigned short fs_dmask;
+- unsigned short codepage; /* Codepage for shortname conversions */
++ char *codepage; /* Codepage for shortname conversions */
+ char *iocharset; /* Charset used for filename input/display */
+ unsigned short shortname; /* flags for shortname display/create rule */
+ unsigned char name_check; /* r = relaxed, n = normal, s = strict */
+diff -ur linux-2.6.20.1/include/linux/nls.h
linux-2.6.20.1.new/include/linux/nls.h
+--- linux-2.6.20.1/include/linux/nls.h 2007-02-20 11:34:32.000000000 +0500
++++ linux-2.6.20.1.new/include/linux/nls.h 2007-03-15 19:44:40.000000000
+0500
+@@ -3,6 +3,11 @@
+
+ #include <linux/init.h>
+
++#define NLS_MAXNAMELEN 20
++
++extern char default_iocharset[NLS_MAXNAMELEN];
++extern char default_codepage[NLS_MAXNAMELEN];
++
+ /* unicode character */
+ typedef __u16 wchar_t;
+
+diff -ur linux-2.6.20.1/include/linux/smb.h
linux-2.6.20.1.new/include/linux/smb.h
+--- linux-2.6.20.1/include/linux/smb.h 2007-02-20 11:34:32.000000000 +0500
++++ linux-2.6.20.1.new/include/linux/smb.h 2007-03-15 19:44:16.000000000
+0500
+@@ -11,6 +11,7 @@
+
+ #include <linux/types.h>
+ #include <linux/magic.h>
++#include <linux/nls.h>
+
+ enum smb_protocol {
+ SMB_PROTOCOL_NONE,
+@@ -63,10 +64,9 @@
+
+ #ifdef __KERNEL__
+
+-#define SMB_NLS_MAXNAMELEN 20
+ struct smb_nls_codepage {
+- char local_name[SMB_NLS_MAXNAMELEN];
+- char remote_name[SMB_NLS_MAXNAMELEN];
++ char local_name[NLS_MAXNAMELEN];
++ char remote_name[NLS_MAXNAMELEN];
+ };
+
+
+diff -ur linux-2.6.20.1/fs/fat/inode.c linux-2.6.20.1.new/fs/fat/inode.c
+--- linux-2.6.20.1/fs/fat/inode.c 2007-02-20 11:34:32.000000000 +0500
++++ linux-2.6.20.1.new/fs/fat/inode.c 2007-03-15 21:49:09.000000000 +0500
+@@ -27,15 +27,6 @@
+ #include <linux/writeback.h>
+ #include <asm/unaligned.h>
+
+-#ifndef CONFIG_FAT_DEFAULT_IOCHARSET
+-/* if user don't select VFAT, this is undefined. */
+-#define CONFIG_FAT_DEFAULT_IOCHARSET ""
+-#endif
+-
+-static int fat_default_codepage = CONFIG_FAT_DEFAULT_CODEPAGE;
+-static char fat_default_iocharset[] = CONFIG_FAT_DEFAULT_IOCHARSET;
+-
+-
+ static int fat_add_cluster(struct inode *inode)
+ {
+ int err, cluster;
+@@ -462,15 +453,18 @@
+ if (sbi->nls_disk) {
+ unload_nls(sbi->nls_disk);
+ sbi->nls_disk = NULL;
+- sbi->options.codepage = fat_default_codepage;
+ }
+ if (sbi->nls_io) {
+ unload_nls(sbi->nls_io);
+ sbi->nls_io = NULL;
+ }
+- if (sbi->options.iocharset != fat_default_iocharset) {
++ if (sbi->options.iocharset != default_iocharset) {
+ kfree(sbi->options.iocharset);
+- sbi->options.iocharset = fat_default_iocharset;
++ sbi->options.iocharset = default_iocharset;
++ }
++ if (sbi->options.codepage != default_codepage) {
++ kfree(sbi->options.codepage);
++ sbi->options.codepage = default_codepage;
+ }
+
+ sb->s_fs_info = NULL;
+@@ -869,7 +863,7 @@
+ {Opt_umask, "umask=%o"},
+ {Opt_dmask, "dmask=%o"},
+ {Opt_fmask, "fmask=%o"},
+- {Opt_codepage, "codepage=%u"},
++ {Opt_codepage, "codepage=%s"},
+ {Opt_nocase, "nocase"},
+ {Opt_quiet, "quiet"},
+ {Opt_showexec, "showexec"},
+@@ -933,14 +927,15 @@
+ substring_t args[MAX_OPT_ARGS];
+ int option;
+ char *iocharset;
++ char *codepage;
+
+ opts->isvfat = is_vfat;
+
+ opts->fs_uid = current->uid;
+ opts->fs_gid = current->gid;
+ opts->fs_fmask = opts->fs_dmask = current->fs->umask;
+- opts->codepage = fat_default_codepage;
+- opts->iocharset = fat_default_iocharset;
++ opts->codepage = default_codepage;
++ opts->iocharset = default_iocharset;
+ if (is_vfat)
+ opts->shortname = VFAT_SFN_DISPLAY_LOWER|VFAT_SFN_CREATE_WIN95;
+ else
+@@ -1024,9 +1019,12 @@
+ opts->fs_fmask = option;
+ break;
+ case Opt_codepage:
+- if (match_int(&args[0], &option))
+- return 0;
+- opts->codepage = option;
++ if (opts->codepage != default_codepage)
++ kfree(opts->codepage);
++ codepage = match_strdup(&args[0]);
++ if (!codepage)
++ return -ENOMEM;
++ opts->codepage = codepage;
+ break;
+ case Opt_flush:
+ opts->flush = 1;
+@@ -1042,7 +1040,7 @@
+
+ /* vfat specific */
+ case Opt_charset:
+- if (opts->iocharset != fat_default_iocharset)
++ if (opts->iocharset != default_iocharset)
+ kfree(opts->iocharset);
+ iocharset = match_strdup(&args[0]);
+ if (!iocharset)
+@@ -1101,8 +1099,8 @@
+ }
+ /* UTF-8 doesn't provide FAT semantics */
+ if (!strcmp(opts->iocharset, "utf8")) {
+- printk(KERN_ERR "FAT: utf8 is not a recommended IO charset"
+- " for FAT filesystems, filesystem will be case
sensitive!\n");
++ printk(KERN_INFO "FAT: utf8 IO charset"
++ " is used, filesystem will be case sensitive!\n");
+ }
+
+ if (opts->unicode_xlate)
+@@ -1162,7 +1160,6 @@
+ int debug;
+ unsigned int media;
+ long error;
+- char buf[50];
+
+ sbi = kzalloc(sizeof(struct msdos_sb_info), GFP_KERNEL);
+ if (!sbi)
+@@ -1372,10 +1369,18 @@
+ */
+
+ error = -EINVAL;
+- sprintf(buf, "cp%d", sbi->options.codepage);
+- sbi->nls_disk = load_nls(buf);
++
++ sbi->nls_disk = load_nls(sbi->options.codepage);
++ if (!sbi->nls_disk) {
++ /* Maybe the old non-standard codepage specification is used */
++ char buf[NLS_MAXNAMELEN];
++ snprintf(buf, sizeof(buf), "cp%s", sbi->options.codepage);
++ buf[sizeof(buf) - 1] = 0;
++ sbi->nls_disk = load_nls(buf);
++ }
++
+ if (!sbi->nls_disk) {
+- printk(KERN_ERR "FAT: codepage %s not found\n", buf);
++ printk(KERN_ERR "FAT: codepage %s not found\n",
sbi->options.codepage);
+ goto out_fail;
+ }
+
+@@ -1421,8 +1426,10 @@
+ unload_nls(sbi->nls_io);
+ if (sbi->nls_disk)
+ unload_nls(sbi->nls_disk);
+- if (sbi->options.iocharset != fat_default_iocharset)
++ if (sbi->options.iocharset != default_iocharset)
+ kfree(sbi->options.iocharset);
++ if (sbi->options.codepage != default_codepage)
++ kfree(sbi->options.codepage);
+ sb->s_fs_info = NULL;
+ kfree(sbi);
+ return error;
+diff -ur linux-2.6.20.1/fs/isofs/inode.c linux-2.6.20.1.new/fs/isofs/inode.c
+--- linux-2.6.20.1/fs/isofs/inode.c 2007-02-20 11:34:32.000000000 +0500
++++ linux-2.6.20.1.new/fs/isofs/inode.c 2007-03-15 19:34:11.000000000
+0500
+@@ -773,7 +773,7 @@
+
+ #ifdef CONFIG_JOLIET
+ if (joliet_level && opt.utf8 == 0) {
+- char * p = opt.iocharset ? opt.iocharset : CONFIG_NLS_DEFAULT;
++ char * p = opt.iocharset ? opt.iocharset : default_iocharset;
+ sbi->s_nls_iocharset = load_nls(p);
+ if (! sbi->s_nls_iocharset) {
+ /* Fail only if explicit charset specified */
+diff -ur linux-2.6.20.1/fs/Kconfig linux-2.6.20.1.new/fs/Kconfig
+--- linux-2.6.20.1/fs/Kconfig 2007-02-20 11:34:32.000000000 +0500
++++ linux-2.6.20.1.new/fs/Kconfig 2007-03-16 14:03:57.000000000 +0500
+@@ -785,28 +785,6 @@
+ To compile this as a module, choose M here: the module will be called
+ vfat.
+
+-config FAT_DEFAULT_CODEPAGE
+- int "Default codepage for FAT"
+- depends on MSDOS_FS || VFAT_FS
+- default 437
+- help
+- This option should be set to the codepage of your FAT filesystems.
+- It can be overridden with the "codepage" mount option.
+- See <file:Documentation/filesystems/vfat.txt> for more information.
+-
+-config FAT_DEFAULT_IOCHARSET
+- string "Default iocharset for FAT"
+- depends on VFAT_FS
+- default "iso8859-1"
+- help
+- Set this to the default input/output character set you'd
+- like FAT to use. It should probably match the character set
+- that most of your FAT filesystems use, and can be overridden
+- with the "iocharset" mount option for FAT filesystems.
+- Note that "utf8" is not recommended for FAT filesystems.
+- If unsure, you shouldn't set "utf8" here.
+- See <file:Documentation/filesystems/vfat.txt> for more information.
+-
+ config NTFS_FS
+ tristate "NTFS file system support"
+ select NLS
+@@ -1830,35 +1808,6 @@
+ To compile the SMB support as a module, choose M here: the module will
+ be called smbfs. Most people say N, however.
+
+-config SMB_NLS_DEFAULT
+- bool "Use a default NLS"
+- depends on SMB_FS
+- help
+- Enabling this will make smbfs use nls translations by default. You
+- need to specify the local charset (CONFIG_NLS_DEFAULT) in the nls
+- settings and you need to give the default nls for the SMB server as
+- CONFIG_SMB_NLS_REMOTE.
+-
+- The nls settings can be changed at mount time, if your smbmount
+- supports that, using the codepage and iocharset parameters.
+-
+- smbmount from samba 2.2.0 or later supports this.
+-
+-config SMB_NLS_REMOTE
+- string "Default Remote NLS Option"
+- depends on SMB_NLS_DEFAULT
+- default "cp437"
+- help
+- This setting allows you to specify a default value for which
+- codepage the server uses. If this field is left blank no
+- translations will be done by default. The local codepage/charset
+- default to CONFIG_NLS_DEFAULT.
+-
+- The nls settings can be changed at mount time, if your smbmount
+- supports that, using the codepage and iocharset parameters.
+-
+- smbmount from samba 2.2.0 or later supports this.
+-
+ config CIFS
+ tristate "CIFS support (advanced network filesystem for Samba, Window
and other CIFS compliant servers)"
+ depends on INET
+diff -ur linux-2.6.20.1/fs/nls/Kconfig linux-2.6.20.1.new/fs/nls/Kconfig
+--- linux-2.6.20.1/fs/nls/Kconfig 2007-02-20 11:34:32.000000000 +0500
++++ linux-2.6.20.1.new/fs/nls/Kconfig 2007-03-15 20:04:38.000000000 +0500
+@@ -18,13 +18,13 @@
+ will be called nls_base.
+
+ config NLS_DEFAULT
+- string "Default NLS Option"
++ string "Default UNIX NLS Option"
+ depends on NLS
+ default "iso8859-1"
+ ---help---
+- The default NLS used when mounting file system. Note, that this is
+- the NLS used by your console, not the NLS used by a specific file
+- system (if different) to store data (filenames) on a disk.
++ The default UNIX NLS used when mounting file system. Note, that
++ this is the NLS expected by the "ls" command, ot the NLS used
++ internally by a specific file system to store filenames on a disk.
+ Currently, the valid values are:
+ big5, cp437, cp737, cp775, cp850, cp852, cp855, cp857, cp860, cp861,
+ cp862, cp863, cp864, cp865, cp866, cp869, cp874, cp932, cp936,
+@@ -37,6 +37,26 @@
+
+ If unsure, specify it as "iso8859-1".
+
++config CODEPAGE_DEFAULT
++ string "Default MS-DOS NLS Option"
++ depends on NLS
++ default "cp437"
++ ---help---
++ The default MS-DOS NLS used when mounting file systems with MS-DOS
++ origin. Note, that this is the NLS used internally by these file
++ systems to store filenames on a disk or for transmission over a
++ network, not the NLS expected by the "ls" command.
++ Currently, the valid values are:
++ big5, cp437, cp737, cp775, cp850, cp852, cp855, cp857, cp860, cp861,
++ cp862, cp863, cp864, cp865, cp866, cp869, cp874, cp932, cp936,
++ cp949, cp950, cp1251, cp1255, euc-jp, euc-kr, gb2312, iso8859-1,
++ iso8859-2, iso8859-3, iso8859-4, iso8859-5, iso8859-6, iso8859-7,
++ iso8859-8, iso8859-9, iso8859-13, iso8859-14, iso8859-15,
++ koi8-r, koi8-ru, koi8-u, sjis, tis-620, utf8.
++ If you specify a wrong value, mounting will fail.
++
++ If unsure, specify it as "cp437".
++
+ config NLS_CODEPAGE_437
+ tristate "Codepage 437 (United States, Canada)"
+ depends on NLS
+diff -ur linux-2.6.20.1/fs/nls/nls_base.c linux-2.6.20.1.new/fs/nls/nls_base.c
+--- linux-2.6.20.1/fs/nls/nls_base.c 2007-02-20 11:34:32.000000000 +0500
++++ linux-2.6.20.1.new/fs/nls/nls_base.c 2007-03-15 19:45:59.000000000
+0500
+@@ -18,6 +18,9 @@
+ #endif
+ #include <linux/spinlock.h>
+
++char default_iocharset[NLS_MAXNAMELEN] = CONFIG_NLS_DEFAULT;
++char default_codepage[NLS_MAXNAMELEN] = CONFIG_CODEPAGE_DEFAULT;
++
+ static struct nls_table default_table;
+ static struct nls_table *tables = &default_table;
+ static DEFINE_SPINLOCK(nls_lock);
+@@ -474,7 +477,7 @@
+ {
+ struct nls_table *default_nls;
+
+- default_nls = load_nls(CONFIG_NLS_DEFAULT);
++ default_nls = load_nls(default_iocharset);
+ if (default_nls != NULL)
+ return default_nls;
+ else
+@@ -490,5 +507,13 @@
+ EXPORT_SYMBOL(utf8_mbstowcs);
+ EXPORT_SYMBOL(utf8_wctomb);
+ EXPORT_SYMBOL(utf8_wcstombs);
++EXPORT_SYMBOL(default_iocharset);
++EXPORT_SYMBOL(default_codepage);
++
++module_param_string(iocharset, default_iocharset, NLS_MAXNAMELEN, 0644);
++MODULE_PARM_DESC(iocharset, "Default UNIX filename charset");
++
++module_param_string(codepage, default_codepage, NLS_MAXNAMELEN, 0644);
++MODULE_PARM_DESC(codepage, "Default MS-DOS filename charset");
+
+ MODULE_LICENSE("Dual BSD/GPL");
+diff -ur linux-2.6.20.1/fs/smbfs/inode.c linux-2.6.20.1.new/fs/smbfs/inode.c
+--- linux-2.6.20.1/fs/smbfs/inode.c 2007-02-20 11:34:32.000000000 +0500
++++ linux-2.6.20.1.new/fs/smbfs/inode.c 2007-03-15 19:57:42.000000000
+0500
+@@ -36,13 +36,6 @@
+ #include "getopt.h"
+ #include "proto.h"
+
+-/* Always pick a default string */
+-#ifdef CONFIG_SMB_NLS_REMOTE
+-#define SMB_NLS_REMOTE CONFIG_SMB_NLS_REMOTE
+-#else
+-#define SMB_NLS_REMOTE ""
+-#endif
+-
+ #define SMB_TTL_DEFAULT 1000
+
+ static void smb_delete_inode(struct inode *);
+@@ -396,11 +389,11 @@
+ break;
+ case 'i':
+ strlcpy(mnt->codepage.local_name, optarg,
+- SMB_NLS_MAXNAMELEN);
++ NLS_MAXNAMELEN);
+ break;
+ case 'c':
+ strlcpy(mnt->codepage.remote_name, optarg,
+- SMB_NLS_MAXNAMELEN);
++ NLS_MAXNAMELEN);
+ break;
+ case 't':
+ mnt->ttl = value;
+@@ -446,10 +439,8 @@
+ if (mnt->flags & SMB_MOUNT_DMODE)
+ seq_printf(s, ",dir_mode=%04o", mnt->dir_mode & S_IRWXUGO);
+
+- if (strcmp(mnt->codepage.local_name, CONFIG_NLS_DEFAULT))
+- seq_printf(s, ",iocharset=%s", mnt->codepage.local_name);
+- if (strcmp(mnt->codepage.remote_name, SMB_NLS_REMOTE))
+- seq_printf(s, ",codepage=%s", mnt->codepage.remote_name);
++ seq_printf(s, ",iocharset=%s", mnt->codepage.local_name);
++ seq_printf(s, ",codepage=%s", mnt->codepage.remote_name);
+
+ if (mnt->ttl != SMB_TTL_DEFAULT)
+ seq_printf(s, ",ttl=%d", mnt->ttl);
+@@ -555,10 +546,10 @@
+ mnt = server->mnt;
+
+ memset(mnt, 0, sizeof(struct smb_mount_data_kernel));
+- strlcpy(mnt->codepage.local_name, CONFIG_NLS_DEFAULT,
+- SMB_NLS_MAXNAMELEN);
+- strlcpy(mnt->codepage.remote_name, SMB_NLS_REMOTE,
+- SMB_NLS_MAXNAMELEN);
++ strlcpy(mnt->codepage.local_name, default_iocharset,
++ NLS_MAXNAMELEN);
++ strlcpy(mnt->codepage.remote_name, default_codepage,
++ NLS_MAXNAMELEN);
+
+ mnt->ttl = SMB_TTL_DEFAULT;
+ if (ver == SMB_MOUNT_OLDVERSION) {
Modified: trunk/packages/recode/Makefile
===================================================================
--- trunk/packages/recode/Makefile 2007-03-07 15:16:09 UTC (rev 1823)
+++ trunk/packages/recode/Makefile 2007-03-24 10:47:05 UTC (rev 1824)
@@ -8,6 +8,10 @@
URL-$(FILE)= http://ftp.gnu.org/gnu/recode/$(FILE)
SHA-$(FILE)= 2de90cd2ba553bc07d75a29913ea4424dd9e616b
+PATCH1= $(DIR)-fixes-1.patch
+URL-$(PATCH1)=
http://www.linuxfromscratch.org/patches/downloads/recode/$(PATCH1)
+SHA-$(PATCH1)= 852d654c1b138dfbff3ed202d06e94d0a49f79ee
+
# Targets
include $(ROOT)/scripts/functions
@@ -16,11 +20,12 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH1)
$(std_build)
compile-stage2:
- ./configure --prefix=/usr --sysconfdir=/etc --without-included-gettext
+ patch -Np1 -i ../$(PATCH1)
+ ./configure --prefix=/usr --without-included-gettext
make
make install
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
