IPFire-SCM April 2010

ipfire-scm@lists.ipfire.org

1 participants
83 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. cae7b5a5b1ad97eee4ceecf40d09e0710e17c5d9
by git＠ipfire.org 30 Apr '10

30 Apr '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via cae7b5a5b1ad97eee4ceecf40d09e0710e17c5d9 (commit) from fb5d2ce172b7621f235576cdf566d656692670b1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit cae7b5a5b1ad97eee4ceecf40d09e0710e17c5d9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 1 00:32:44 2010 +0200 Updated clamav (0.96). ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/clamav | 14 ++++++-------- doc/packages-list.txt | 2 +- lfs/clamav | 6 +++--- 3 files changed, 10 insertions(+), 12 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index 666af2a..cad65e0 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -1,26 +1,24 @@ -#usr/bin/clamav-config -#usr/bin/clamconf +usr/bin/clamav-config +usr/bin/clambc +usr/bin/clamconf usr/bin/clamdscan usr/bin/clamdtop usr/bin/clamscan usr/bin/freshclam usr/bin/sigtool #usr/include/clamav.h -#usr/lib/libclamav.a #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.0.5 -#usr/lib/libclamunrar.a +usr/lib/libclamav.so.6.1.2 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.0.5 -#usr/lib/libclamunrar_iface.a +usr/lib/libclamunrar.so.6.1.2 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.0.5 +usr/lib/libclamunrar_iface.so.6.1.2 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav diff --git a/doc/packages-list.txt b/doc/packages-list.txt index c02137d..bf6088c 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -65,7 +65,7 @@ * ccache-3.0pre0 * cdrtools-2.01.01 * centerim-4.22.1 -* clamav-0.95.3 +* clamav-0.96 * cmake-2.4.8 * collectd-4.9.1 * coreutils-5.96 diff --git a/lfs/clamav b/lfs/clamav index 9cf6961..c0f4a1e 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.95.3 +VER = 0.96 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 10 +PAK_VER = 11 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = eaf9fccc3cc3567605a9732313652967 +$(DL_FILE)_MD5 = 28ac7bec4cc03627a8e2d6e8647ee661 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. fb5d2ce172b7621f235576cdf566d656692670b1
by git＠ipfire.org 30 Apr '10

30 Apr '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via fb5d2ce172b7621f235576cdf566d656692670b1 (commit) from d68506e9816aa2b780dbc18044cc940a28780556 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fb5d2ce172b7621f235576cdf566d656692670b1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 30 22:07:00 2010 +0200 Don't restart collectd after upgrade. The sensor modules are not present until reboot ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/38/update.sh | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh index 20b8e2c..e4843b8 100644 --- a/config/rootfiles/core/38/update.sh +++ b/config/rootfiles/core/38/update.sh @@ -167,7 +167,6 @@ echo Cleaned up collectd directory from $PRECLEAN to $POSTCLEAN size. # Start Sevices # /etc/init.d/squid start -/etc/init.d/collectd start # # This core-update need a reboot /usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg" hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. d68506e9816aa2b780dbc18044cc940a28780556
by git＠ipfire.org 30 Apr '10

30 Apr '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via d68506e9816aa2b780dbc18044cc940a28780556 (commit) via ff1dcdd6fde0a406d9fdb9edf574312d02129b1c (commit) via 1414cebe38a627e8fc6c2e3e0b1c8277f1056a20 (commit) from d81baab208e93a892049779b10433b5534945472 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d68506e9816aa2b780dbc18044cc940a28780556 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 30 21:48:32 2010 +0200 Updated kernel (2.6.32.12). commit ff1dcdd6fde0a406d9fdb9edf574312d02129b1c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 30 21:47:55 2010 +0200 Updated elinks (0.11.7). commit 1414cebe38a627e8fc6c2e3e0b1c8277f1056a20 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 30 21:47:00 2010 +0200 Updated v4l-dvb (2010-04-30). ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/38/update.sh | 2 +- doc/packages-list.txt | 31 ++++---- lfs/elinks | 6 +- lfs/linux | 9 +- lfs/v4l-dvb | 5 +- src/paks/linux-xen/install.sh | 2 +- src/patches/suse_xen_series.conf | 153 ++++++++++++++++++++++++------------ 7 files changed, 131 insertions(+), 77 deletions(-) Difference in files: diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh index 095d7ba..20b8e2c 100644 --- a/config/rootfiles/core/38/update.sh +++ b/config/rootfiles/core/38/update.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # -KVER="2.6.32.11" +KVER="2.6.32.12" ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1` MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 0519d74..c02137d 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -37,7 +37,7 @@ * Unix-Syslog-0.100 * XML-Parser-2.34 * alsa-lib-1.0.22 -* alsa-lib-1.0.22-kmod-2.6.32.11-ipfire +* alsa-lib-1.0.22-kmod-2.6.32.12-ipfire * amavisd-new-2.5.2 * apcupsd-3.14.4 * applejuice-0.31 @@ -62,7 +62,6 @@ * cacti-0.8.7e * calamaris-2.59 * capi4k-utils-2005-07-18 -* ccache-2.4 * ccache-3.0pre0 * cdrtools-2.01.01 * centerim-4.22.1 @@ -72,15 +71,15 @@ * coreutils-5.96 * cpio-2.6 * cpufrequtils-007 -* cryptodev-20091126-kmod-2.6.32.11-ipfire -* cryptodev-20091126-kmod-2.6.32.11-ipfire-xen +* cryptodev-20091126-kmod-2.6.32.12-ipfire +* cryptodev-20091126-kmod-2.6.32.12-ipfire-xen * cups-1.4.2 * curl-7.19.5 * cyrus-imapd-2.2.12 * cyrus-sasl-2.1.21 * dahdi-2.2.1 -* dahdi-2.2.1-kmod-2.6.32.11-ipfire -* dahdi-2.2.1-kmod-2.6.32.11-ipfire-xen +* dahdi-2.2.1-kmod-2.6.32.12-ipfire +* dahdi-2.2.1-kmod-2.6.32.12-ipfire-xen * db-4.4.20 * dbus-1.0.3 * dhcp-3.1.0 @@ -92,7 +91,7 @@ * ebtables-v2.0.8-2 * ed-0.2 * eject-2.1.5 -* elinks-0.11.6 +* elinks-0.11.7 * esniper-2-19-0 * espgs-8.15.1 * etherwake-1.09 @@ -158,10 +157,10 @@ * jpegsrc.v6b * kbd-1.12 * klibc-1.5.14 -* kqemu-1.4.0pre1-kmod-2.6.32.11-ipfire -* kqemu-1.4.0pre1-kmod-2.6.32.11-ipfire-xen +* kqemu-1.4.0pre1-kmod-2.6.32.12-ipfire +* kqemu-1.4.0pre1-kmod-2.6.32.12-ipfire-xen * kudzu-1.2.64 -* kvm-kmod-2.6.33.1-kmod-2.6.32.11-ipfire +* kvm-kmod-2.6.33.1-kmod-2.6.32.12-ipfire * l7-protocols-2009-05-10 * lame-3.97 * lcd4linux-0.10.1-RC2 @@ -193,8 +192,8 @@ * libwww-perl-5.803 * libxml2-2.6.26 * libxslt-1.1.17 -* linux-2.6.32.11-ipfire -* linux-2.6.32.11-ipfire-xen +* linux-2.6.32.12-ipfire +* linux-2.6.32.12-ipfire-xen * linux-atm-2.4.1 * linux-firmware-20100318 * linux-libc-headers-2.6.12.0 @@ -206,8 +205,8 @@ * lzo-2.02 * m4-1.4.4 * mISDNuser_20090906 -* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.11-ipfire -* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.11-ipfire-xen +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.12-ipfire +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.12-ipfire-xen * make-3.81 * man-db-2.4.3 * man-pages-2.34 @@ -332,8 +331,8 @@ * usb_modeswitch-1.0.6 * usbutils-0.72 * util-linux-2.12r -* v4l-dvb-690055993011-kmod-2.6.32.11-ipfire -* v4l-dvb-690055993011-kmod-2.6.32.11-ipfire-xen +* v4l-dvb-ee9826bc7106-kmod-2.6.32.12-ipfire +* v4l-dvb-ee9826bc7106-kmod-2.6.32.12-ipfire-xen * vdr-1.6.0 * vdradmin-am-3.6.5 * vim-7.0 diff --git a/lfs/elinks b/lfs/elinks index 4fc4d9d..4a41e1b 100644 --- a/lfs/elinks +++ b/lfs/elinks @@ -24,7 +24,7 @@ include Config -VER = 0.11.6 +VER = 0.11.7 THISAPP = elinks-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = elinks -PAK_VER = 2 +PAK_VER = 3 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 463ec007b013822a82d197580117ea16 +$(DL_FILE)_MD5 = fcd087a6d2415cd4c6fd1db53dceb646 install : $(TARGET) diff --git a/lfs/linux b/lfs/linux index 646b093..24b095b 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -PATCHLEVEL = .11 -VER = 2.6.32.11 +PATCHLEVEL = .12 +VER = 2.6.32.12 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -67,12 +67,13 @@ squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 = $(URL_IPFIRE)/squashfs-lzma- linux-$(VER)-suse_xen_patches-1.tar.bz2 = $(URL_IPFIRE)/linux-$(VER)-suse_xen_patches-1.tar.bz2 -$(DL_FILE)_MD5 = 3709c691d909b4f8ca692edc6c726cb6 +$(DL_FILE)_MD5 = bc87db696ed4be729334584493d6d98d netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2_MD5 = d2a84311081023c7ffd28cdca67c45d4 -linux-$(VER)-suse_xen_patches-1.tar.bz2_MD5 = cf3620071cbb37081b366e79bb438fb0 +linux-$(VER)-suse_xen_patches-1.tar.bz2_MD5 = e568ec5d8e65a4b0f2008d67f30198bb + install : $(TARGET) diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb index bdc8ffe..691947c 100644 --- a/lfs/v4l-dvb +++ b/lfs/v4l-dvb @@ -30,7 +30,7 @@ else VERSUFIX=ipfire endif -VER = 690055993011 +VER = ee9826bc7106 THISAPP = v4l-dvb-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -47,7 +47,8 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 830f055b637afbb4f131246c313a6e05 +$(DL_FILE)_MD5 = 210d3739dec4d98223d7a324bf561afe + install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index fcf0152..92ff786 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.11 +KVER=2.6.32.12 ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1` MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden diff --git a/src/patches/suse_xen_series.conf b/src/patches/suse_xen_series.conf index 576fcf4..5f0676d 100644 --- a/src/patches/suse_xen_series.conf +++ b/src/patches/suse_xen_series.conf @@ -38,6 +38,7 @@ # patches.kernel.org/patch-2.6.32.8-9 # patches.kernel.org/patch-2.6.32.9-10 # patches.kernel.org/patch-2.6.32.10-11 +# patches.kernel.org/patch-2.6.32.11-12 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -62,6 +63,7 @@ # kABI consistency patches ######################################################## patches.kabi/kabi-fix-up-struct-hrtimer_cpu_base-change.patch + patches.kabi/revert-2.6.32.12-b43 ######################################################## # @@ -124,7 +126,6 @@ patches.fixes/sched-cpuacct-percpu-counter-batch.patch # writable limits - patches.suse/rlim-0002-resource-move-kernel-function-inside-__KERNEL__.patch patches.suse/rlim-0004-IA64-use-helpers-for-rlimits.patch patches.suse/rlim-0005-core-posix-cpu-timers-cleanup-rlimits-usage.patch patches.suse/rlim-0006-PPC-use-helpers-for-rlimits.patch @@ -159,6 +160,13 @@ patches.fixes/sched-fix-cputime-monotonicity.patch patches.suse/cgroup-disable-memcg-when-low-lowmem.patch + patches.fixes/kernel-mutex-adaptive-cpu-offline-livelock.patch + patches.fixes/spinning-mutex-BKL-deadlock.patch + patches.suse/revert-percpu-stable-changes.patch + + # bug 598253 + patches.fixes/kernel-core-add-pid_max-start-option.patch + ######################################################## # Architecture-specific patches. These used to be all # at the end of series.conf, but since we don't do @@ -183,7 +191,6 @@ ######################################################## # i386 ######################################################## - patches.arch/i386-do-a-global-tlb-flush-in-S4-resume.patch # amd64 | x86-64 | x86_64 # 'Intel(r) Extended Memory 64 Technology' | 'Intel(r) EM64T' @@ -243,16 +250,11 @@ # bug 588008 patches.arch/x86-pat-Update-page-flags-for-memtype-without-using-memtype_lock-V4.patch - # bug 590859 - patches.arch/x86-32-clean-up-rwsem-inline-asm-statements.patch - patches.arch/x86-clean-up-rwsem-type-system.patch - patches.arch/x86-64-rwsem-64-bit-xadd-rwsem-implementation.patch - patches.arch/x86-Fix-breakage-of-UML-from-the-changes-in-the-rwsem-system.patch - patches.arch/x86-64-support-native-xadd-rwsem-implementation.patch - patches.arch/x86-64-rwsem-Avoid-store-forwarding-hazard-in-__downgrade_write.patch + # bug 592176 + patches.arch/x86-MCE-fix-MSR_IA32_MCI_CTL2-CMCI-threshold-setup.patch - patches.arch/x86_hpet_erratum_15.patch - patches.arch/x86_x2apic_double_enable_non_smp.patch + # bug 579639 + patches.arch/intel-iommu-Dont-complain-that-ACPI_DMAR_SCOPE_TYPE_IOAPIC-is-not-supported.patch ######################################################## # x86 MCE/MCA (Machine Check Error/Architecture) extensions @@ -357,6 +359,12 @@ # bug 586806 patches.arch/x86-UV-BAU-performance-and-error-recovery.patch + # bug 594131 + patches.arch/tlb_uv_update2.patch + + # bug 590585 + patches.arch/x86-UV-Delete-unneeded-boot-messages.patch + ######################################################## # x86_64/i386 depending on the UV patchset ######################################################## @@ -427,6 +435,8 @@ patches.arch/ppc-mark_preferred_offline_state_before_removing_cpus.patch patches.fixes/powerpc-fix-handling-of-strnlen-with-zero-len patches.arch/ppc-unmap_vmallocs_on_hotremove.patch + patches.arch/power7-type1-numa-affinity + patches.arch/ppc-pseries-cmm4kdump ######################################################## # PS3 @@ -514,6 +524,15 @@ patches.arch/s390-11-02-zfcp-unit_add_lock_dep.patch patches.arch/s390-11-03-zfcp_unit_remove_lock_dep.patch + patches.arch/s390-12-01_callhome.patch + patches.arch/s390-12-02-vmalloc.patch + + patches.arch/s390-13-01-nss-add-previous-stmt.patch + patches.arch/s390-13-02-zcore-reipl-check.patch + + patches.arch/s390-14-01-vdso-ntp-multiplier.patch + patches.arch/s390-14-02-vdso-install.patch + patches.arch/s390-phys_device.patch ######################################################## @@ -550,6 +569,8 @@ patches.fixes/mm-pagealloc-fix-congestion-wait.patch patches.suse/mm-uninline-add-to-page-cache.patch patches.suse/pagecache-limit.patch + patches.suse/pagecache-limit-shmem.diff + patches.fixes/mempolicy-fix-get_mempolicy-for-relative-and-static-nodes.patch ######################################################## # IPC patches @@ -631,6 +652,8 @@ patches.drivers/cpufreq_processor_clocking_control_pcc_driver_cast_fix.patch patches.fixes/bios_driven_exclude_firmware_error.patch + patches.fixes/x86_cpufreq_powernowk8_fix_wrong_freqs.patch + ######################################################## # AGP, graphics related stuff ######################################################## @@ -651,6 +674,8 @@ patches.fixes/bridge-module-get-put.patch patches.fixes/gre-fix-netns-vs-proto-registration-ordering patches.fixes/tunnels-fix-netns-vs-proto-registration-ordering + patches.fixes/sctp-fix-oops-when-sending-queued-asconf-chunks + patches.fixes/sctp-fix-to-calc-the-init-init-ack-chunk-length-correctly-is-set ######################################################## # NFS @@ -692,6 +717,7 @@ patches.fixes/reiserfs-replay-honor-ro patches.suse/reiserfs-barrier-default patches.fixes/reiserfs-fix-oops-while-creating-privroot-with-selinux-enabled + patches.fixes/reiserfs-fix-permissions-on-reiserfs_priv ######################################################## # dlm @@ -784,14 +810,33 @@ patches.fixes/ocfs2-userdlm-Add-tracing-in-userdlm.patch patches.fixes/ocfs2-send-SIGXFSZ-if-new-filesize-exceeds-limit-v2.patch patches.fixes/Ocfs2-Move-ocfs2-ioctl-definitions-from-ocfs2_fs.h-t.patch + patches.fixes/Ocfs2-Handle-deletion-of-reflinked-oprhan-inodes-cor.patch + patches.fixes/PATCH-Skip-check-for-mandatory-locks-when-unlocking.patch + patches.fixes/ocfs2-Update-i_blocks-in-reflink-operations.patch + patches.fixes/ocfs2-Fix-the-update-of-name_offset-when-removing-xa.patch + patches.fixes/ocfs2-Init-meta_ac-properly-in-ocfs2_create_empty_xa.patch + patches.fixes/ocfs2-Clear-undo-bits-when-local-alloc-is-freed.patch + patches.fixes/Ocfs2-Journaling-i_flags-and-i_orphaned_slot-when-ad.patch + patches.fixes/fs-ocfs2-cluster-tcp.c-remove-use-of-NIPQUAD-use-pI4.patch + patches.fixes/ocfs2-Fix-a-race-in-o2dlm-lockres-mastery.patch + patches.fixes/ocfs2_dlmfs-User-DLM_-when-decoding-file-open-flags.patch + patches.fixes/ocfs2-Check-the-owner-of-a-lockres-inside-the-spinlo.patch # ocfs2 fixes from 2.6.34 patches.fixes/ocfs2-always-try-for-maximum-bits-with-new-local-all.patch - #bnc#575752 - patches.fixes/ocfs2-set-i_mode-on-disk-during-acl-operations.patch - #bnc#590401 - patches.fixes/ocfs2-Change-bg_chain-check-for-ocfs2_validate_gd_parent.patch + #bnc#592945 + patches.fixes/ocfs2-Compute-metaecc-for-superblocks-during-online-.patch + + #bnc#501563 + patches.suse/ocfs2-clean-up-localalloc-mount-option-size-parsing.patch + patches.suse/ocfs2-increase-the-default-size-of-local-alloc-windo.patch + patches.suse/ocfs2-change-default-reservation-window-sizes.patch + patches.suse/ocfs2-Add-dir_resv_level-mount-option.patch + + #bnc#591039 + patches.fixes/ocfs2-avoid-direct-write-if-we-fall-back-to-buffered.patch + ######################################################## # gfs2 read-only support for migration ######################################################## @@ -809,13 +854,8 @@ patches.fixes/xfs-redirty-ENOSPC.patch patches.fixes/xfs-export-debug - patches.xfs/xfs-simplify-inode-teardown.patch - patches.xfs/xfs-fix-mmap_sem-iolock-inversion-in-xfs_free_eofblo.patch - patches.xfs/xfs-I-O-completion-handlers-must-use-NOFS-allocation.patch patches.xfs/xfs-reset-the-i_iolock-lock-class-in-the-reclaim-pat.patch patches.xfs/xfs-use-WRITE_SYNC_PLUG-for-synchronous-writeout.patch - patches.xfs/xfs-cleanup-data-end-I-O-handlers.patch - patches.xfs/xfs-Wrapped-journal-record-corruption-on-read-at-rec.patch patches.xfs/xfs-remove-IO_ISAIO.patch patches.xfs/xfs-simplify-xfs_buf_get-xfs_buf_read-interfaces.patch patches.xfs/xfs-rename-xfs_attr_fetch-to-xfs_attr_get_int.patch @@ -823,25 +863,15 @@ patches.xfs/xfs-kill-the-STATIC_INLINE-macro.patch patches.xfs/xfs-remove-incorrect-sparse-annotation-for-xfs_iget_.patch patches.xfs/xfs-cleanup-dmapi-macros-in-the-umount-path.patch - patches.xfs/xfs-Fix-error-return-for-fallocate-on-XFS.patch patches.xfs/xfs-cleanup-bmap-extent-state-macros.patch patches.xfs/xfs-change-the-xfs_iext_insert-xfs_iext_remove.patch - patches.xfs/xfs-check-for-not-fully-initialized-inodes-in-xfs_ir.patch patches.xfs/xfs-improve-metadata-I-O-merging-in-the-elevator.patch patches.xfs/xfs-kill-xfs_bmbt_rec_32-64-types.patch patches.xfs/XFS-Free-buffer-pages-array-unconditionally.patch patches.xfs/kill-I_LOCK.patch - patches.xfs/xfs-fix-timestamp-handling-in-xfs_setattr.patch - patches.xfs/xfs-Don-t-flush-stale-inodes.patch - patches.xfs/xfs-Ensure-we-force-all-busy-extents-in-range-to-dis.patch - patches.xfs/xfs-reclaim-inodes-under-a-write-lock.patch - patches.xfs/xfs-Avoid-inodes-in-reclaim-when-flushing-from-inode.patch - patches.xfs/xfs-reclaim-all-inodes-by-background-tree-walks.patch patches.xfs/xfs-Remove-inode-iolock-held-check-during-allocation.patch - patches.xfs/xfs-fix-stale-inode-flush-avoidance.patch patches.xfs/xfs-fix-missing-error-check-in-xfs_rtfree_range.patch - patches.xfs/xfs-xfs_swap_extents-needs-to-handle-dynamic-fork-of.patch - patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch +# patches.xfs/xfs-cleanup-data-end-I-O-handlers.patch STILL NEEDED??? patches.suse/xfs-dmapi-re-add-flags-for-xfs_free_eofblocks @@ -854,6 +884,10 @@ # patches.fixes/novfs-fix-inode-uid # patches.fixes/novfs-incorrect-filesize-fix # patches.fixes/novfs-truncate-fix +# patches.fixes/novfs-fix-oops-in-scope-finding +# patches.fixes/novfs-dentry-cache-limit.patch +# patches.fixes/novfs-return-ENOTEMPTY-when-deleting-nonempty-dir +# patches.fixes/novfs-LFS-initialization ######################################################## # other filesystem stuff @@ -934,6 +968,8 @@ # Storage ######################################################## + patches.fixes/block-blk_abort_request-lock-fix + # add genhd.mangle_minor parameter patches.suse/block-add-mangle-devt-switch @@ -947,18 +983,19 @@ patches.drivers/libata-missing-_SDD-is-not-an-error # Block layer fixes + patches.fixes/loop-update-mtime.patch patches.fixes/scsi-inquiry-too-short-ratelimit patches.suse/scsi-netlink-ml # from scsi-misc - patches.fixes/scsi-fc-class-failfast-bsg-requests - patches.fixes/scsi-add-scsi-target-reset-support-to-ioctl patches.suse/modify-change_queue_depth-to-take-in-reason-why-it-is-being-called.patch patches.suse/scsi-error-have-scsi-ml-call-change_queue_depth-to-handle-queue_full.patch patches.suse/add-queue_depth-ramp-up-code.patch patches.drivers/mpt-fusion-4.22.00.00-update patches.drivers/hpsa + patches.drivers/hpsa-update + patches.drivers/hpsa-only-unmap-buffer-when-allocated patches.fixes/scsi-introduce-helper-function-for-blocking-eh patches.fixes/scsi-dh-queuedata-accessors patches.fixes/scsi-dh-alua-retry-UA @@ -976,11 +1013,11 @@ patches.suse/fc-transport-allow-dev_loss_tmo-disable patches.suse/blk-queue-unprep-fn patches.suse/blk-add-atomic-abort-flag - patches.fixes/fc_bsg_request_packed patches.fixes/bsg-SG_IO-compat_ioctl patches.fixes/scsi-allow-fc-lld-to-fast-fail-scsi-eh patches.fixes/zfcp-pass-return-code-from-fc_block_scsi_eh-to-scsi_eh patches.fixes/sd-no-read-cap16-if-not-supported + patches.fixes/sd-retry-readcap-on-ua patches.fixes/scsi-check-host-lookup-failure patches.drivers/aacraid-24701-update @@ -989,6 +1026,7 @@ patches.drivers/qla2xxx-8.03.01.02.11.1-k8-update patches.drivers/qla2xxx-8.03.01.03.11.1-k8-update patches.drivers/qla2xxx-8.03.01.04.11.1-k8-update + patches.drivers/qla2xxx-8.03.01.05.11.1-k8-update patches.drivers/megaraid-mbox-fix-SG_IO patches.drivers/mpt2sas-03.100.03.00-update patches.drivers/mpt2sas-04.100.01.00-update @@ -1000,6 +1038,7 @@ patches.drivers/qla4xxx-5.01.00.00.11.01-k10_5.01.00.00.11.01-k11.patch patches.drivers/qla4xxx-5.01.00.00.11.01-k11_5.01.00.00.11.01-k12.patch patches.drivers/qla4xxx-5.01.00.00.11.01-k12_5.01.00.00.11.01-k13.patch + patches.drivers/qla4xxx-5.01.00.00.11.01-k13_5.01.00.00.11.01-k14.patch patches.fixes/aic79xx-null-scb-in-nonpkt-busfree patches.drivers/lpfc-8.3.5-update patches.drivers/lpfc-8.3.5.3-update @@ -1017,6 +1056,8 @@ patches.drivers/scsi-transport-sas-enable-tlr patches.fixes/scsi-fixup-vpd-page-allocation patches.fixes/fc-transport-make-sure-cmds-are-completed-for-offlined-rport + patches.fixes/ipr-strstrip-retval-fix + patches.fixes/scsi-requeue-abort-request-race # Remaining SCSI patches (garloff) patches.suse/scsi-error-test-unit-ready-timeout @@ -1035,6 +1076,10 @@ patches.fixes/cciss-remove-scan-thread.patch patches.fixes/cciss-unmap-xfer-buffer-correctly + # bnc#598270 + patches.fixes/ibmvscsi-add-barriers + patches.fixes/ibmvscsi-reduce-error-recovery-timeout + ######################################################## # DRM/Video ######################################################## @@ -1048,6 +1093,8 @@ patches.drivers/drm-i915-fix-eDP-pipe-mask patches.drivers/drm-i915-fix-pixel-color-depth-setting-on-eDP patches.drivers/drm-i915-parse-eDP-panel-color-depth-from-VBT-block + patches.drivers/drm-i915-Clear-TV-sense-state-bits-on-GM45 + patches.drivers/drm-i915-IronLake-fix-VGA-output-at-S4 ######################################################## # Network @@ -1060,7 +1107,7 @@ patches.suse/nameif-track-rename.patch patches.fixes/tg3-fix-default-wol.patch patches.drivers/ehea-modinfo.patch - patches.drivers/igb-add-support-for-82576NS-SerDes-adapter.patch + patches.drivers/ehea-0102-0103-update patches.fixes/tehuti-firmware-name patches.drivers/dmfe-tulip-Let-dmfe-handle-DM910x-except-for-SPARC-o.patch @@ -1165,6 +1212,7 @@ patches.drivers/sky2-optima-fix-pci-cfg patches.suse/allow_bonding_with_blacklisted_ipv6.patch + patches.fixes/ipv6-fix-dad-race.patch #FCOE update (fate#306857, fate#306859, bnc#551175) patches.suse/libfc-fcoe-don-t-export_symbols-unnecessarily.patch @@ -1322,6 +1370,11 @@ patches.suse/libfcoe-don-t-fill-mac-desc-in patches.suse/fcoe-reset-fip-ctlr-link-state patches.suse/fcoe-check-netif-operstate-ins + patches.suse/libfc-bug-in-erroring-out-upon + patches.suse/fcoe-libfc-increased-cdb-size + patches.suse/libfc-set-seq_id-for-incoming + patches.suse/fcoe-fixes-wrong-error-exit-in + patches.suse/fcoe-fix-a-circular-locking-is # ixgbe patches from 2.6.33 bnc#562046 patches.drivers/dcb-data-center-bridging-ops-s @@ -1361,6 +1414,8 @@ patches.drivers/ixgbe-priority-tag-fip-frames patches.drivers/ixgbe-filter-fip-frames-into-t patches.drivers/ixgbe-fix-for-real_num_tx_queu + patches.drivers/ixgbe-Fix-82599-multispeed-fiber-link-issues-due-to-.patch + patches.fixes/ixgbe-power-down-phy-during-driver-resets.patch patches.fixes/vlan-add-vlan_dev_select_queue patches.fixes/vlan-updates-real_num_tx_queues @@ -1370,6 +1425,7 @@ patches.drivers/bnx2x-backports-v2.6.32-to-af901ca.patch patches.drivers/bnx2x-to-version-1.52.1-7.patch + patches.drivers/bnx2x-initialize-cnic-status-block-during-chip-reset.patch patches.drivers/cxgb3-add-memory-barriers.patch patches.drivers/cxgb3-Set-the-rxq.patch @@ -1432,6 +1488,7 @@ patches.fixes/bnx2i-use-common-iscsi-suspend-queue patches.drivers/bnx2i-backport-from-v2.6.32-to-45ca38e.patch patches.drivers/bnx2i-update-to-2.1.1 + patches.drivers/bnx2i-mtu-change-bugfix patches.fixes/libiscsi-fix-login-text-checks-in-pdu-inject patches.fixes/libiscsi-check-tmf-state-before-sending-pdu patches.fixes/libiscsi-add-warm-target-reset-tmf-support @@ -1440,6 +1497,7 @@ patches.drivers/cnic-backport-from-v2.6.32-4e9c4f.patch patches.drivers/cnic-Use-union-for-the-status-blocks-of-different-de.patch patches.fixes/cnic-fix-crash-during-bnx2x-mtu-change.patch + patches.drivers/cnic-give-a-chance-for-the-uio-device-to-be-opened patches.drivers/be2iscsi-beta4-update patches.fixes/libiscsi-add-recover-target @@ -1448,7 +1506,6 @@ ######################################################## # PCI and PCI hotplug ######################################################## - patches.fixes/PCIe-AER-reject-aer-inject-if-hardware-mask-error-reporting.patch # Use list instead static array for pci resources patches.fixes/pci_use_list_for_resources_1_5.patch @@ -1457,11 +1514,9 @@ patches.fixes/pci_use_list_for_resources_4_5.patch patches.fixes/pci_use_list_for_resources_5_5.patch patches.fixes/pci_use_acpi_resources_whitelist.patch + patches.fixes/x86_hp_add_more_usecrs_to_whitelist.patch patches.fixes/pci_fix_invalid_resource_length.patch - # bug 586343 - patches.fixes/vgaarb-fix-vga-arbiter-to-accept-pci-domains-other-than-0.patch - patches.fixes/pci-update-pci_set_vga_state-to-call-arch-functions.patch patches.fixes/dmar-mark-dmar_ir_support-as-init ######################################################## @@ -1488,10 +1543,10 @@ patches.suse/Cleanup-and-make-boot-splash-work-with-KMS.patch patches.suse/bootsplash-keep-multiple-data patches.suse/bootsplash-scaler + patches.suse/bootsplash-console-fix patches.drivers/elousb.patch patches.fixes/input-add-acer-aspire-5710-to-nomux.patch patches.drivers/synaptics-hp-clickpad - patches.fixes/hid-fix-gyration-oops.patch ########################################################## # Sound @@ -1576,13 +1631,10 @@ patches.suse/raw_device_max_minors_param.diff patches.suse/no-partition-scan - patches.drivers/add-support-for-intel-cougar-point-chipset.patch - patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch patches.drivers/support-pci-domains-in-aer-inject patches.fixes/infiniband_cxgb3_improve_dlpar_remove_on_active_rdma_traffic.patch - patches.fixes/hpwdt-fix-lower-timeout-limit.patch - patches.drivers/lis3-fix-show-rate-for-8-bits-chips patches.drivers/lis3-add-support-for-hp-probook + patches.drivers/lis3-add-support-for-hp-probook-2 patches.drivers/ipmi-add-parameter-to-limit-cpu-usage-in-kipmid.patch ######################################################## @@ -1611,12 +1663,13 @@ patches.suse/dm-mpath-skip-disabled-devices-when-iterating patches.fixes/dm-mpath-abstract-dm_in_flight-function patches.fixes/dm-mpath-simplify-rq-based-suspend - patches.fixes/dm-mpath-requeue-stall patches.fixes/dm-mpath-trace-rq-based-remapping + patches.suse/dm-mpath-leastpending-select-path-fix ######################################################## # md ######################################################## + patches.fixes/md-write-behind-race ########################################################## # @@ -1701,6 +1754,8 @@ # bug 593731 patches.arch/x86-fix-unknown_nmi_error.patch + patches.fixes/kdb-no-printk-logging.patch + ######################################################## # Other patches for debugging ######################################################## @@ -1750,7 +1805,6 @@ patches.fixes/kvm-pause-filter-0001-KVM-introduce-kvm_vcpu_on_spin.patch patches.fixes/kvm-pause-filter-0002-KVM-VMX-Add-support-for-Pause-Loop-Exiting.patch patches.fixes/kvm-pause-filter-0003-KVM-SVM-Support-Pause-Filter-in-AMD-processors.patch - patches.fixes/kvm-disable-pvmmu-0001-KVM-x86-disable-paravirt-mmu-reporting.patch patches.fixes/kvm-constant_tsc-0001-KVM-SVM-Adjust-tsc_offset-only-if-tsc_unstable.patch patches.fixes/kvm-vcpu_events-0001-KVM-x86-Add-KVM_GET-SET_VCPU_EVENTS.patch patches.fixes/kvm-vcpu_events-0002-KVM-x86-Extend-KVM_SET_VCPU_EVENTS-with-selective.patch @@ -1805,7 +1859,6 @@ # some driver patches, should move up in the series... patches.suse/linux-2.6.29-touchkit.patch patches.suse/uvcvideo-ignore-hue-control-for-5986-0241.patch - patches.fixes/ipoib-tx-queue-lockup-fix.patch ######################################################## # You'd better have a good reason for adding a patch @@ -1888,6 +1941,8 @@ patches.xen/xen3-patch-2.6.32.7-8 patches.xen/xen3-patch-2.6.32.8-9 patches.xen/xen3-patch-2.6.32.9-10 + patches.xen/xen3-patch-2.6.32.10-11 + patches.xen/xen3-patch-2.6.32.12-rc2 patches.xen/xen3-seccomp-disable-tsc-option patches.xen/xen3-fix_clock_gettime_vsyscall_time_warp.diff patches.xen/xen3-x86-mcp51-no-dac @@ -1899,17 +1954,14 @@ patches.xen/xen3-x86-Remove-CPU-cache-size-output-for-non-Intel-too.patch patches.xen/xen3-x86-cpu-mv-display_cacheinfo-cpu_detect_cache_sizes.patch patches.xen/xen3-x86-Limit-the-number-of-processor-bootup-messages.patch - patches.xen/xen3-x86_64_apic_consider_hotplug_for_mode_logical_flat.patch patches.xen/xen3-x86_ioapic_fix_out_of_order_gsi.patch patches.xen/xen3-x86-Reduce-per-cpu-warning-boot-up-messages.patch patches.xen/xen3-x86-pat-Update-page-flags-for-memtype-without-using-memtype_lock-V4.patch patches.xen/xen3-bug-561933_uv_pat_is_gru_range.patch - patches.xen/xen3-x86-Fix-sched_clock_cpu-for-systems-with-unsynchronized-TSC.patch patches.xen/xen3-x86-Unify-fixup_irqs-for-32-bit-and-64-bit-kernels.patch patches.xen/xen3-x86-intr-remap-Avoid-irq_chip-mask-unmask-in-fixup_irqs-for-intr-remapping.patch patches.xen/xen3-x86-Remove-local_irq_enable-local_irq_disable-in-fixup_irqs.patch patches.xen/xen3-vmw_pvscsi-scsi-driver-for-vmware-s-virtual-hba.patch - patches.xen/xen3-add-support-for-intel-cougar-point-chipset.patch patches.xen/xen3-kdb-x86 patches.xen/xen3-stack-unwind patches.xen/xen3-x86_64-unwind-annotations @@ -1921,6 +1973,7 @@ patches.xen/xen-blkif-protocol-fallback-hack patches.xen/xen-blkback-cdrom patches.xen/xen-blktap-write-barriers + patches.xen/xen-blktap-teardown patches.xen/xen-op-packet patches.xen/xen-blkfront-cdrom patches.xen/xen-sections hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. d81baab208e93a892049779b10433b5534945472
by git＠ipfire.org 30 Apr '10

30 Apr '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via d81baab208e93a892049779b10433b5534945472 (commit) via 9f84d3130f687782cc69fb2c69e0a1bb9dfb630d (commit) from e1cf3df51e10284e6cfd63d1a3d9f04f2d935442 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d81baab208e93a892049779b10433b5534945472 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Apr 30 17:03:15 2010 +0200 Add support for alix2 leds. This script enables led 2 and 3 of the alix boards and they will show traffic on the red device. commit 9f84d3130f687782cc69fb2c69e0a1bb9dfb630d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Apr 30 16:52:26 2010 +0200 Load cryptodev module by default to use the kernel crypto engines for nearly everything. ----------------------------------------------------------------------- Summary of changes: lfs/initscripts | 3 ++ src/initscripts/init.d/leds | 69 +++++++++++++++++++++++++++++++++++++ src/initscripts/sysconfig/modules | 4 ++ 3 files changed, 76 insertions(+), 0 deletions(-) create mode 100644 src/initscripts/init.d/leds Difference in files: diff --git a/lfs/initscripts b/lfs/initscripts index 56c4222..38870b8 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -147,6 +147,9 @@ $(TARGET) : ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc0.d/K49cyrus-sasl ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S24cyrus-sasl ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc6.d/K49cyrus-sasl + ln -sf ../init.d/leds /etc/rc.d/rc0.d/K79leds + ln -sf ../init.d/leds /etc/rc.d/rc3.d/S21leds + ln -sf ../init.d/leds /etc/rc.d/rc6.d/K79leds ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs ln -sf ../init.d/modules /etc/rc.d/rcsysinit.d/S05modules ln -sf ../init.d/udev /etc/rc.d/rcsysinit.d/S10udev diff --git a/src/initscripts/init.d/leds b/src/initscripts/init.d/leds new file mode 100644 index 0000000..4927b63 --- /dev/null +++ b/src/initscripts/init.d/leds @@ -0,0 +1,69 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/leds +# +# Description : Script to setup leds at boot. +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +# Load ethernet settings +eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) + +setup_red_modem() { + local led1=${1} + local led2=${2} + + modprobe ledtrig-netdev + + local i + for i in ${led1} ${led2}; do + echo "netdev" > ${i}/trigger + echo "${RED_DEV}" > ${i}/device_name + done + + echo "rx" > ${led1}/mode + echo "tx" > ${led2}/mode +} + +reset_trigger() { + [ -d "${1}" ] || return 0 + echo "none" > ${1}/trigger +} + +start_alix2() { + modprobe -q leds-alix2 + + local i + for i in 1 2 3; do + if [ ! -d "/sys/class/leds/alix:${i}" ]; then + return 1 + fi + done + + setup_red_modem /sys/class/leds/alix:2 /sys/class/leds/alix:3 +} + +stop_alix2() { + local i + for i in 1 2 3; do + reset_trigger /sys/class/leds/alix:${i} + done +} + +case "${1}" in + start|stop) + for i in alix2; do + ${1}_${i} + done + ;; + + *) + echo "Usage: ${0} {start|stop}" + exit 1 + ;; +esac + +# End $rc_base/init.d/leds diff --git a/src/initscripts/sysconfig/modules b/src/initscripts/sysconfig/modules index 5f8a77d..cdbcca4 100644 --- a/src/initscripts/sysconfig/modules +++ b/src/initscripts/sysconfig/modules @@ -33,4 +33,8 @@ lp ### fusion # fusion +### cryptodev +# +cryptodev + # End /etc/sysconfig/modules hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6142f9c9bb8019925cfb84c34804913803480f0a
by git＠ipfire.org 29 Apr '10

29 Apr '10

1 0

[IPFire-SCM] [git.ipfire.org] Cappie detects new hosts on a network. branch, master, updated. 54e92b606bae60e47af1739bb0d146de1769bf74
by git＠ipfire.org 29 Apr '10

29 Apr '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cappie detects new hosts on a network.". The branch, master has been updated via 54e92b606bae60e47af1739bb0d146de1769bf74 (commit) via 4eaf42980fa317423f43688ccc8c941caaa5c1e7 (commit) via b6f2a21b3fdaea9b5590e9247f614c0f1ea8ae53 (commit) via 86eda3b65c6b8bd287764e6e04ffcdf01a1d8ee0 (commit) via fdf8fd0443e9f10efd2405e09a4f82456a60b925 (commit) via fe5f16af549c45778887f0450657befa5a6d002c (commit) via 497e1b32fa24b2c407063a8f2e7dcb661b3470d4 (commit) via be750261284b471fb82f50c0b2099ce0f10524e8 (commit) via ded2591de783614b0dcaab9fc7237401795a5719 (commit) via af1f4801edfb479d83f90683dfb798f618730762 (commit) via 53fd7d33da2e486eaa0a1d02ead61d544112ed8c (commit) via 78d3013c1fa8c50586290b07b4af855639100c39 (commit) from 74e192ba1c9f30f6e5072e5532a2e766b28869b5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 54e92b606bae60e47af1739bb0d146de1769bf74 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 29 19:32:52 2010 +0200 Register some handlers to the interface callback function. commit 4eaf42980fa317423f43688ccc8c941caaa5c1e7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 29 19:32:17 2010 +0200 Add garbage collector event. commit b6f2a21b3fdaea9b5590e9247f614c0f1ea8ae53 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 29 19:31:29 2010 +0200 Add some new events (still experimental). commit 86eda3b65c6b8bd287764e6e04ffcdf01a1d8ee0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 29 19:30:42 2010 +0200 Change packet decoding by reading out ethernet type. commit fdf8fd0443e9f10efd2405e09a4f82456a60b925 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 29 19:29:42 2010 +0200 Log every database query when in debug mode. commit fe5f16af549c45778887f0450657befa5a6d002c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 29 16:52:20 2010 +0200 Add shortcut to database instance from Event class. commit 497e1b32fa24b2c407063a8f2e7dcb661b3470d4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 29 16:50:12 2010 +0200 Add shortcut for database from main class. commit be750261284b471fb82f50c0b2099ce0f10524e8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 29 16:48:55 2010 +0200 Add shortcut to add events from Event class. commit ded2591de783614b0dcaab9fc7237401795a5719 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 29 16:47:52 2010 +0200 Add shortcut to add events from main class. commit af1f4801edfb479d83f90683dfb798f618730762 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 29 16:42:27 2010 +0200 Add database interface to queue class. commit 53fd7d33da2e486eaa0a1d02ead61d544112ed8c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 29 16:40:12 2010 +0200 Remove database instance from each interface thread. commit 78d3013c1fa8c50586290b07b4af855639100c39 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 29 16:37:32 2010 +0200 Moved Database class to own file with enhancements. ----------------------------------------------------------------------- Summary of changes: cappie/__init__.py | 49 +++++++----------------- cappie/constants.py | 5 ++ cappie/database.py | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++ cappie/events.py | 91 +++++++++++++++++++++++++++++++++++++++++++++ cappie/protocol.py | 27 +++++++------ cappie/queue.py | 18 ++++++++- 6 files changed, 244 insertions(+), 48 deletions(-) create mode 100644 cappie/database.py Difference in files: diff --git a/cappie/__init__.py b/cappie/__init__.py index 1cf1e8d..4152b2f 100644 --- a/cappie/__init__.py +++ b/cappie/__init__.py @@ -31,6 +31,7 @@ import protocol import queue from errors import * +from events import * def getAllInterfaces(): filters = ("lo", "any") @@ -125,6 +126,10 @@ class Cappie(object): self.queue.shutdown() + @property + def db(self): + return self.queue.db + class Interface(Thread): heartbeat = 0.1 @@ -139,8 +144,6 @@ class Interface(Thread): self.promisc = promisc self.queue = self.cappie.queue - self.db = Database(self) - self.log.debug("Created new interface %s" % self.dev) self.__running = True @@ -160,14 +163,11 @@ class Interface(Thread): for key, val in p.items(): self.log.debug(" %s: %s" % (key, val)) - if not self.db.has(p["source_address"]): - self.db.put(p["source_address"], "SOURCE_IP_ADDRESS", p["source_ip_address"]) + self._handlePacket(p) def run(self): self.log.info("Starting interface %s" % self.dev) - self.db.open() - p = pcapy.open_live(self.dev, self.mtu, self.promisc, 0) p.setfilter(self.filter) #p.loop(0, self._callback) @@ -175,7 +175,6 @@ class Interface(Thread): p.setnonblock(1) while True: if not self.__running: - self.db.close() return if p.dispatch(1, self._callback): @@ -194,33 +193,13 @@ class Interface(Thread): def filter(self): return "arp or rarp" + def addEvent(self, event): + return self.cappie.queue.add(event) -class Database(object): - def __init__(self, interface): - self.interface = interface - self.dev = self.interface.dev - self.log = self.interface.log - - self.__data = {} - - def open(self): - self.log.debug("Opened database for %s" % self.dev) - - def close(self): - self.log.debug("Closing database for %s" % self.dev) - print self.__data - - def get(self, mac): - if self.has(mac): - return self.__data[mac] - - def has(self, mac): - return self.__data.has_key(mac) - - def put(self, mac, key, val): - if not self.has(mac): - self.__data[mac] = {} - - # TODO Check key for sanity + def _handlePacket(self, packet): + if packet.operation == OPERATION_RESPONSE: + self.addEvent(EventResponseTrigger(self, packet)) + #self.addEvent(EventCheckDuplicate(self, packet)) - self.__data[mac][key] = val + elif packet.operation == OPERATION_REQUEST: + self.addEvent(EventRequestTrigger(self, packet)) diff --git a/cappie/constants.py b/cappie/constants.py index 50fb016..d68fcc7 100644 --- a/cappie/constants.py +++ b/cappie/constants.py @@ -19,7 +19,12 @@ # # ############################################################################### +ETHERTYPE_ARP = 0x0806 + TYPE_ARP = 0 OPERATION_REQUEST = 0 OPERATION_RESPONSE = 1 + +DB_LASTSEEN_MAX = 5*60 # 5 minutes +DB_GC_INTERVAL = 60 diff --git a/cappie/database.py b/cappie/database.py new file mode 100644 index 0000000..88d57fb --- /dev/null +++ b/cappie/database.py @@ -0,0 +1,102 @@ +#!/usr/bin/python +############################################################################### +# # +# Cappie # +# Copyright (C) 2010 Michael Tremer # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +import itertools +import sqlite3 + +class Database(object): + KEYS = ("EVENTS", "ADDRESSES") + _CREATE = ["CREATE TABLE IF NOT EXISTS addresses(mac, address, lastseen);", + "CREATE TABLE IF NOT EXISTS changes(address, lastchange);"] + + counter = 0 + + def __init__(self, log): + self.log = log + + self.__connection = None + + def __del__(self): + self.close() + + def open(self): + self.log.debug("Opening database") + if self.__connection: + self.close() + self.__connection = sqlite3.connect("test.db") + for statement in self._CREATE: + self.execute(statement) + + def close(self): + self.log.debug("Closing database") + self.commit() + self.__connection.close() + self.__connection = None + + def commit(self): + self.log.debug("Committing data to database") + self.__connection.commit() + + def query(self, query, *parameters): + """Returns a row list for the given query and parameters.""" + cursor = self._cursor() + self._execute(cursor, query, parameters) + column_names = [d[0] for d in cursor.description] + return [Row(itertools.izip(column_names, row)) for row in cursor] + + def get(self, query, *parameters): + """Returns the first row returned for the given query.""" + rows = self.query(query, *parameters) + if not rows: + return None + elif len(rows) > 1: + raise Exception("Multiple rows returned for Database.get() query") + else: + return rows[0] + + def _cursor(self): + if not self.__connection: + self.open() + return self.__connection.cursor() + + def execute(self, query, *parameters): + """Executes the given query, returning the lastrowid from the query.""" + cursor = self._cursor() + self._execute(cursor, query, parameters) + return cursor.lastrowid + + def _execute(self, cursor, query, parameters): + self.log.debug("Executing query: %s" % query) + try: + return cursor.execute(query, parameters) + except sqlite3.OperationalError: + self.log.error("Error connecting to database") + self.close() + raise + + +class Row(dict): + """A dict that allows for object-like property access syntax.""" + def __getattr__(self, name): + try: + return self[name] + except KeyError: + raise AttributeError(name) diff --git a/cappie/events.py b/cappie/events.py index d403b52..236e19f 100644 --- a/cappie/events.py +++ b/cappie/events.py @@ -23,6 +23,7 @@ import os import subprocess import time +from constants import * from errors import * class Event(object): @@ -30,10 +31,14 @@ class Event(object): self.cappie = interface.cappie self.interface = interface self.log = interface.log + self.db = self.cappie.db def __str__(self): return self.__class__.__name__ + def addEvent(self, event): + return self.cappie.queue.add(event) + def run(self): raise NotImplementedError @@ -77,3 +82,89 @@ class EventShell(Event): p.returncode) return p.returncode + + +class EventRequestTrigger(Event): + def __init__(self, interface, packet): + Event.__init__(self, interface) + + self.db = interface.cappie.db + self.packet = packet + + def _updateAddress(self, mac, address): + where = "WHERE mac = '%s' AND address = '%s'" % (mac, address) + + if self.db.get("SELECT * FROM addresses %s" % where): + self.db.execute("UPDATE addresses SET lastseen='%d' %s" % \ + (time.time(), where)) + else: + self.db.execute("INSERT INTO addresses VALUES('%s', '%s', '%d')" % \ + (mac, address, time.time())) + + def _updateChanges(self, *args): + for arg in args: + where = "WHERE address = '%s'" % arg + if self.db.get("SELECT * FROM changes %s" % where): + self.db.execute("UPDATE changes SET lastchange = '%d' %s" % \ + (time.time(), where)) + else: + self.db.execute("INSERT INTO changes VALUES('%s', '%d')" % \ + (arg, time.time())) + + def run(self): + mac = self.packet.source_address + address = self.packet.source_ip_address + + self._updateAddress(mac, address) + self._updateChanges(mac, address) + + +class EventResponseTrigger(EventRequestTrigger): + pass + + +class EventGarbageCollector(Event): + def __init__(self, db, log): + self.db = db + self.log = log + + def run(self): + # Remove old addresses + self.db.execute("DELETE FROM addresses WHERE lastseen >= '%d'" % \ + (time.time() - DB_LASTSEEN_MAX)) + + self.db.commit() + + +class EventCheckDuplicate(Event): + def __init__(self, interface, packet): + Event.__init__(self, interface) + self.packet = packet + + def run(self): + entries = self.db.query("SELECT * FROM addresses WHERE address = '%s'" % \ + self.packet.source_ip_address) + + if not entries: + return + + for entry in entries: + if self.packet.source_address == entry.mac: + entries.remove(entry) + + if len(entries) > 1: + self.addEvent(EventHandleDuplicate(self.interface, self.packet)) + + +class EventHandleDuplicate(Event): + def __init__(self, interface, packet): + Event.__init__(self, interface) + self.packet = packet + + def run(self): + self.log.warning("We probably have a mac spoofing for %s" % \ + self.packet.source_address) + + +class EventCheckFlipFlop(Event): + pass diff --git a/cappie/protocol.py b/cappie/protocol.py index ed5f4a3..c4252de 100644 --- a/cappie/protocol.py +++ b/cappie/protocol.py @@ -21,6 +21,8 @@ import struct +import database + from constants import * from errors import * @@ -34,15 +36,17 @@ def val2mac(val): return ":".join(["%02x" % ord(i) for i in val]) def decode_packet(data): - for func in (decode_arp_packet,): - try: - p = func(data) - except PacketTypeError: - continue + try: + protocol = val2int(struct.unpack("!2s", data[12:14])[0]) + except: + raise DecodeError - return p + try: + d = protocol2function[protocol](data) + except KeyErrror: + raise PacketTypeError, "Could not determine type of packet" - raise PacketTypeError, "Could not determine type of packet" + return database.Row(d) def decode_arp_packet(data): operationmap = { @@ -58,15 +62,10 @@ def decode_arp_packet(data): } #"hwtype" : data[:2], - protocol = val2int(struct.unpack("!2s", data[12:14])[0]) hw_addr_size = val2int(struct.unpack("!1s", data[18:19])[0]) hw_prot_size = val2int(struct.unpack("!1s", data[19:20])[0]) operation = val2int(struct.unpack("!2s", data[20:22])[0]) - # Sanity checks - if not protocol == 0x0806: - raise PacketTypeError, "Not an ARP packet" - # TODO Must check hwtype here... try: @@ -93,3 +92,7 @@ def decode_arp_packet(data): def decode_ndp_packet(data): raise PacketTypeError + +protocol2function = { + ETHERTYPE_ARP : decode_arp_packet, +} diff --git a/cappie/queue.py b/cappie/queue.py index e2d0dd6..4d22553 100644 --- a/cappie/queue.py +++ b/cappie/queue.py @@ -23,11 +23,13 @@ import time from threading import Thread +from database import Database from errors import * +from events import * class Queue(Thread): heartbeat = 1.0 - maxitems = 100 + maxitems = 10000 def __init__(self, log): Thread.__init__(self) @@ -37,6 +39,9 @@ class Queue(Thread): self.__running = True self.__queue = [] + self.db = Database(log) + self.lastgc = None + def __len__(self): return self.length @@ -53,12 +58,16 @@ class Queue(Thread): def run(self): self.log.debug("Started event queue") + self.db.open() + while self.__running or self.__queue: if not self.__queue: #self.log.debug("Queue sleeping for %s seconds" % self.heartbeat) time.sleep(self.heartbeat) continue + self._checkGc() + event = self.__queue.pop(0) self.log.debug("Processing queue event: %s" % event) try: @@ -66,6 +75,8 @@ class Queue(Thread): except EventException, e: self.log.error("Catched event exception: %s" % e) + self.db.close() + def shutdown(self): self.__running = False self.log.debug("Shutting down queue") @@ -73,3 +84,8 @@ class Queue(Thread): # Wait until queue handled all events self.join() + + def _checkGc(self): + if not self.lastgc or self.lastgc <= (time.time() - DB_GC_INTERVAL): + self.add(EventGarbageCollector(self.db, self.log)) + self.lastgc = time.time() hooks/post-receive -- Cappie detects new hosts on a network.

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. e1cf3df51e10284e6cfd63d1a3d9f04f2d935442
by git＠ipfire.org 29 Apr '10

29 Apr '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via e1cf3df51e10284e6cfd63d1a3d9f04f2d935442 (commit) via 292a6b4e2f53e71d45104d9ee1eafda64ab1804b (commit) via e5db8f6fbba4715dc17cc1e3385cd47dcaa2cbd6 (commit) from b122df877b176fceabae4e31549847cb849c8fed (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e1cf3df51e10284e6cfd63d1a3d9f04f2d935442 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Thu Apr 29 10:21:41 2010 +0200 Resized /var/log/rrd in fstab, we dont need that much space anymore. commit 292a6b4e2f53e71d45104d9ee1eafda64ab1804b Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Thu Apr 29 10:20:11 2010 +0200 Readd collectd conf. commit e5db8f6fbba4715dc17cc1e3385cd47dcaa2cbd6 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Thu Apr 29 10:19:14 2010 +0200 Removed collectd config. ----------------------------------------------------------------------- Summary of changes: config/etc/fstab | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/etc/fstab b/config/etc/fstab index 1786028..c0f98b3 100644 --- a/config/etc/fstab +++ b/config/etc/fstab @@ -9,6 +9,6 @@ proc /proc proc defaults 0 0 sysfs /sys sysfs defaults 0 0 devpts /dev/pts devpts gid=4,mode=620 0 0 #none /tmp tmpfs defaults 0 0 -none /var/log/rrd tmpfs defaults,size=112M 0 0 -none /var/lock tmpfs defaults,size=8M 0 0 -none /var/run tmpfs defaults,size=8M 0 0 +none /var/log/rrd tmpfs defaults,size=64M 0 0 +none /var/lock tmpfs defaults,size=2M 0 0 +none /var/run tmpfs defaults,size=2M 0 0 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c9505957a1d880eb3d337a8fdb75e1db19db66d4
by git＠ipfire.org 28 Apr '10

28 Apr '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via c9505957a1d880eb3d337a8fdb75e1db19db66d4 (commit) via c518709b76e7cf9546c3e77467a6bc5094c2451d (commit) via f33ffa7b97967c6332c354c03ff717e5087fa49f (commit) via cf11569fcf06a1c1c794a3020e38f9c323ee2558 (commit) via 3dbe3d030cdebcecfb33388c6021d3dedeeec7c7 (commit) via bdacf3b368a931594fe89aa40d4b7f404f8026cd (commit) via 56ae3f82eca30cbedf25dc8a38a7f1117e15be47 (commit) via 05a4b9c485a582accb57593a5a62f91f1c31fff6 (commit) via aa32b71d6947bb48ef3078ba1f5ac5439f02b9c2 (commit) via 194542bdb645c6d5570c1dcc9d63f08ef19e1831 (commit) via 887e9fb9f3501eb1dcc5c09b5c064c994793363f (commit) via 3ff8f68ce19855795a03914c4b29cebe30ff4870 (commit) via bd390be8552cbf610f57e0779011ef6363042efd (commit) via 19978eb748ea7cda01e9927bf79530ca27b86933 (commit) via 651e72c99bedb26485753428f34809668d870c92 (commit) via 3d09dd82deb5a70f2161ac46d783c7b88da6da4b (commit) via ca98ca91bdb5c2fca35a35abc60cc8ea88c31ebf (commit) via 0a0d067e41e83889cb4ddcc5b13ca4d10da57d86 (commit) via bca980b664a9f3bb4ddc50a97819bdf105443cdf (commit) via 7711c14249db8c87bdf886302792fe44d5c97c49 (commit) via 4b923b5d72d510ab4a6708d07a6ad09d9cf09844 (commit) via f605083e2674807a108357dde23726928dae59b9 (commit) via 7ab840e628bbad8b8335c2e5080710f83bb5fb0a (commit) via 6565a5c274ee62354f75984fc831683fbeb8a528 (commit) via 23579c6fd0568d7fa4b3e7db5f7459b01350da1a (commit) via afeac1c3cfe24ffeeca4f1850674d3b61b230911 (commit) via 0d25f985d50cb4c9f0a3644d3005d4cc8206b6b0 (commit) from eeb5f8eefdc8785aa9e19d5fa655af13dc81a3fb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c9505957a1d880eb3d337a8fdb75e1db19db66d4 Merge: c518709b76e7cf9546c3e77467a6bc5094c2451d cf11569fcf06a1c1c794a3020e38f9c323ee2558 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 28 22:38:50 2010 +0200 Merge commit 'stevee/dmidecode' into next commit c518709b76e7cf9546c3e77467a6bc5094c2451d Merge: f33ffa7b97967c6332c354c03ff717e5087fa49f 651e72c99bedb26485753428f34809668d870c92 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 28 22:28:01 2010 +0200 Merge commit 'stevee/upstart-jobs' into next commit f33ffa7b97967c6332c354c03ff717e5087fa49f Merge: 3dbe3d030cdebcecfb33388c6021d3dedeeec7c7 bdacf3b368a931594fe89aa40d4b7f404f8026cd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 28 22:20:44 2010 +0200 Merge commit 'stevee/updates' into next commit cf11569fcf06a1c1c794a3020e38f9c323ee2558 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Wed Apr 28 22:16:43 2010 +0200 dmidecode: Add new package. commit 3dbe3d030cdebcecfb33388c6021d3dedeeec7c7 Merge: 05a4b9c485a582accb57593a5a62f91f1c31fff6 56ae3f82eca30cbedf25dc8a38a7f1117e15be47 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 28 18:17:57 2010 +0200 Merge commit 'stevee/coreutils' into next commit bdacf3b368a931594fe89aa40d4b7f404f8026cd Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Tue Apr 27 22:28:51 2010 +0200 pdns-recursor: Update to version 3.2. commit 56ae3f82eca30cbedf25dc8a38a7f1117e15be47 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Tue Apr 27 22:17:31 2010 +0200 coreutils: Add compatible i18n patch for version 8.5. commit 05a4b9c485a582accb57593a5a62f91f1c31fff6 Merge: aa32b71d6947bb48ef3078ba1f5ac5439f02b9c2 0d25f985d50cb4c9f0a3644d3005d4cc8206b6b0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 27 17:56:14 2010 +0200 Merge commit 'stevee/gettext' into next commit aa32b71d6947bb48ef3078ba1f5ac5439f02b9c2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 27 17:49:37 2010 +0200 initscript: Make udev-retry script compatible to latest udev release. commit 194542bdb645c6d5570c1dcc9d63f08ef19e1831 Merge: 887e9fb9f3501eb1dcc5c09b5c064c994793363f 3d09dd82deb5a70f2161ac46d783c7b88da6da4b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 27 17:48:06 2010 +0200 Merge commit 'stevee/udev-event' into next commit 887e9fb9f3501eb1dcc5c09b5c064c994793363f Merge: 3ff8f68ce19855795a03914c4b29cebe30ff4870 4b923b5d72d510ab4a6708d07a6ad09d9cf09844 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 27 17:45:29 2010 +0200 Merge commit 'stevee/vsftpd' into next commit 3ff8f68ce19855795a03914c4b29cebe30ff4870 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 27 16:20:55 2010 +0200 zlib: Update to 1.2.5. commit bd390be8552cbf610f57e0779011ef6363042efd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 27 15:46:38 2010 +0200 diffutils: The new version does come with a testsuite. Enabled. commit 19978eb748ea7cda01e9927bf79530ca27b86933 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 27 15:42:24 2010 +0200 naoki: python 2.4 does not come with the email module. So, we disable the email function here. This affects CentOS 5.4. commit 651e72c99bedb26485753428f34809668d870c92 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Tue Apr 27 10:55:40 2010 +0200 vsftpd: Add upstart job file. commit 3d09dd82deb5a70f2161ac46d783c7b88da6da4b Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Mon Apr 26 22:30:37 2010 +0200 initscripts: Add upstart jobfile to retry failed udev events. commit ca98ca91bdb5c2fca35a35abc60cc8ea88c31ebf Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Mon Apr 26 12:33:21 2010 +0200 coreutils: Remove broken i18n patch. commit 0a0d067e41e83889cb4ddcc5b13ca4d10da57d86 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Mon Apr 26 12:29:39 2010 +0200 coreutils: Remove upstream patches. These patches has been taken from coreutils git (pre-8.5) so we don't need the any more. commit bca980b664a9f3bb4ddc50a97819bdf105443cdf Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Mon Apr 26 12:28:48 2010 +0200 coreutils: Update to version 8.5. This fixes issue #627. commit 7711c14249db8c87bdf886302792fe44d5c97c49 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Mon Apr 26 11:57:03 2010 +0200 glib2: Update to version 2.25.3. commit 4b923b5d72d510ab4a6708d07a6ad09d9cf09844 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Apr 25 22:57:10 2010 +0200 vsftpd: Fix binary directory. commit f605083e2674807a108357dde23726928dae59b9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Apr 24 13:53:54 2010 +0200 openssh: Set default port to 22. commit 7ab840e628bbad8b8335c2e5080710f83bb5fb0a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Apr 24 13:52:59 2010 +0200 Remove all files in lfs/. commit 6565a5c274ee62354f75984fc831683fbeb8a528 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Apr 24 13:52:41 2010 +0200 Remove outdated coding-style file. commit 23579c6fd0568d7fa4b3e7db5f7459b01350da1a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Apr 24 13:47:06 2010 +0200 lldpd: Enable CDP protocol. commit afeac1c3cfe24ffeeca4f1850674d3b61b230911 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Apr 24 13:43:40 2010 +0200 lldpd: Add support for xml output and remove net-smnp dependency which is unused. commit 0d25f985d50cb4c9f0a3644d3005d4cc8206b6b0 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Thu Apr 8 15:07:03 2010 +0200 gettext: Remove configure_option --without-included-gettext. ----------------------------------------------------------------------- Summary of changes: doc/coding-style.txt | 56 ------ lfs/cdrom | 116 ----------- lfs/images | 130 ------------ lfs/pomona | 88 -------- lfs/pxe | 93 --------- naoki/backend.py | 16 ++- pkgs/core/coreutils/coreutils.nm | 2 +- ...ils-8.4-upstream-cp-mv-enotsup-xattr-test.patch | 127 ------------ .../patches/coreutils-8.4-upstream-xattr.patch | 48 ----- ...ils-8.4-i18n.patch => coreutils-8.5-i18n.patch} | 208 ++++++++++---------- pkgs/core/diffutils/diffutils.nm | 4 +- .../dosfstools.nm => dmidecode/dmidecode.nm} | 25 ++- ...decode-2.10-add-hewlett-packard-to-dmioem.patch | 11 + .../dmidecode-2.10-add-socket-lga1366.patch | 16 ++ .../dmidecode-2.10-recognize-more-memory.patch | 11 + .../patches/dmidecode-2.10-smbios-updates.patch | 120 +++++++++++ ...e-2.10-warn-on-unsupported-smbios-version.patch | 25 +++ pkgs/core/gettext/gettext.nm | 1 - pkgs/core/glib2/glib2.nm | 2 +- pkgs/core/initscripts/init/udev-retry.conf | 23 +++ pkgs/core/lldpd/lldpd.init | 2 +- pkgs/core/lldpd/lldpd.nm | 5 +- pkgs/core/openssh/sshd_config | 2 +- pkgs/core/pdns-recursor/pdns-recursor.nm | 2 +- pkgs/core/{cups/cups.init => vsftpd/vsftpd.init} | 4 +- pkgs/core/vsftpd/vsftpd.nm | 4 +- pkgs/core/zlib/zlib.nm | 2 +- 27 files changed, 357 insertions(+), 786 deletions(-) delete mode 100644 doc/coding-style.txt delete mode 100644 lfs/cdrom delete mode 100644 lfs/images delete mode 100644 lfs/pomona delete mode 100644 lfs/pxe delete mode 100644 pkgs/core/coreutils/patches/coreutils-8.4-upstream-cp-mv-enotsup-xattr-test.patch delete mode 100644 pkgs/core/coreutils/patches/coreutils-8.4-upstream-xattr.patch rename pkgs/core/coreutils/patches/{coreutils-8.4-i18n.patch => coreutils-8.5-i18n.patch} (95%) copy pkgs/core/{dosfstools/dosfstools.nm => dmidecode/dmidecode.nm} (74%) create mode 100644 pkgs/core/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch create mode 100644 pkgs/core/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch create mode 100644 pkgs/core/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch create mode 100644 pkgs/core/dmidecode/patches/dmidecode-2.10-smbios-updates.patch create mode 100644 pkgs/core/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch create mode 100644 pkgs/core/initscripts/init/udev-retry.conf copy pkgs/core/{cups/cups.init => vsftpd/vsftpd.init} (54%) Difference in files: diff --git a/doc/coding-style.txt b/doc/coding-style.txt deleted file mode 100644 index d441e1b..0000000 --- a/doc/coding-style.txt +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2008 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - - I. The Building System - II. Text files - III. LFS files - -############################################################################### -# I. The Building System # -############################################################################### - - - Everything on the building system is kept as it is. Nothing is changed in - any way. We have got a toolchain for anything we need. - - -############################################################################### -# II. Text files (common rules) # -############################################################################### - - - In the text files there is a limit of 80 characters per line. Because it - sometimes is hard to keep the hard limit is 120 chars. - - - A tab is as long as 8 space characters. - - - With a triple X (XXX) we introduce hacks or todos that we can grep them. - - -############################################################################### -# III. LFS files # -############################################################################### - - - Have a look at the format of the configure commands. - - - There is a variable that contains some options for parallel builds called - $(PARALLELISMFLAGS). Please comment out it if the makefile has no support - for that. - - - We don't run test suites. Sorry. - diff --git a/lfs/cdrom b/lfs/cdrom deleted file mode 100644 index 173d8a9..0000000 --- a/lfs/cdrom +++ /dev/null @@ -1,116 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -PKG_NAME = cdrom -PKG_VER = -PKG_REL = -1 - -THISAPP = $(PKG_NAME) - -OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) - -MAINTAINER = -GROUP = -CORE = no -EXTRA = no -DEBUG = no -BUILD_DEPS = -DEPS = images-core images-info images-initramfs images-overlays - -URL = -LICENSE = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = - -download: $(objects) - -info: - $(DO_PKG_INFO) - -install: $(OBJECT) - -packages: $(PACKAGES) - -$(PACKAGES): $(OBJECT) - @$(DO_PACKAGE) - -$(objects): - @$(LOAD) - -############################################################################### -# Installation Details -############################################################################### - -$(OBJECT): $(objects) - @rm -rf $(CDROM_DIR)/* $(CDROM_DIR)/.$(SNAME)info - - mkdir -pv $(CDROM_DIR)/{isolinux,doc} - - # Copy image and all overlays - cp -vf $(IMAGE_FILE) $(IMAGES_DIR)/*.overlay $(CDROM_DIR) - - # Install documentation - cp -vf $(DIR_SRC)/doc/{COPYING,ChangeLog,packages-list.txt} $(CDROM_DIR)/doc - $(INSTALL_CONFIG) $(DIR_SOURCE)/cdrom/README.txt > $(CDROM_DIR)/README - - # Install kernel and initramfs - cp -vf $(IMAGES_DIR)/initramfs-$(VERSION).img $(CDROM_DIR)/isolinux/initrd0 - cp -vf /boot/ipfirekernel-$(KVER) $(CDROM_DIR)/isolinux/$(SNAME)0 - - # If we have build the extras, we copy them on - # the disk -ifeq "$(BUILD_EXTRAS)" "1" - # Copying extra packages to cdrom - mkdir -pv $(CDROM_DIR)/packages - for package in $(PACKAGES_EXTRA); do \ - if [ -e "$$package" ]; then \ - cp -vf $$package $(CDROM_DIR)/packages; \ - fi; \ - done -endif - - # Install isolinux & configuration - cp -vf /usr/share/syslinux/{isolinux.bin,vesamenu.c32} \ - /usr/lib/memtest86+/memtest.bin \ - $(DIR_SOURCE)/bootloader/splash.{jpg,lss} \ - $(DIR_SOURCE)/bootloader/*.msg $(CDROM_DIR)/isolinux/ - $(INSTALL_CONFIG) $(DIR_SOURCE)/bootloader/installer.conf \ - > $(CDROM_DIR)/isolinux/isolinux.cfg - - # Info file - echo "Release: $(NAME)-$(VERSION)" >> $(CDROM_DIR)/.$(SNAME)info - echo "Build host: $$(hostname -f)" >> $(CDROM_DIR)/.$(SNAME)info - echo "Date: $$(date -u)" >> $(CDROM_DIR)/.$(SNAME)info - - cd $(CDROM_DIR) && mkisofs -J -r -V "$(NAME)_$(VERSION)" \ - -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot \ - -boot-load-size 4 -boot-info-table . > $(IMAGES_DIR)/$(IMAGENAME).iso - - @rm -rf $(CDROM_DIR)/* $(CDROM_DIR)/.$(SNAME)info diff --git a/lfs/images b/lfs/images deleted file mode 100644 index 6ae1cc0..0000000 --- a/lfs/images +++ /dev/null @@ -1,130 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -PKG_NAME = images -PKG_VER = -PKG_REL = -1 - -THISAPP = $(PKG_NAME) - -OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) - -MAINTAINER = -GROUP = -CORE = no -EXTRA = no -DEBUG = no -BUILD_DEPS = -DEPS = - -URL = -LICENSE = - -ifeq "$(firstword $(MAKEFILE_LIST))" "images-initramfs" - PASS = initramfs -endif - -ifeq "$(firstword $(MAKEFILE_LIST))" "images-overlays" - PASS = overlays -endif - -ifeq "$(firstword $(MAKEFILE_LIST))" "images-core" - PASS = core -endif - -ifeq "$(firstword $(MAKEFILE_LIST))" "images-info" - PASS = info -endif - -ifneq "$(PASS)" "" - PKG_NAME = images-$(PASS) -endif - -############################################################################### -# Top-level Rules -############################################################################### - -objects = - -download: $(objects) - -info: - $(DO_PKG_INFO) - -install: $(OBJECT) - -packages: $(PACKAGES) - -$(PACKAGES): $(OBJECT) - @$(DO_PACKAGE) - -$(objects): - @$(LOAD) - -############################################################################### -# Installation Details -############################################################################### - -$(OBJECT): $(objects) - -ifeq "$(PASS)" "info" - # info file - (echo "Release: $(NAME)-$(VERSION) ($(SLOGAN))"; \ - echo "Build host: $$(cat /proc/sys/kernel/hostname)"; \ - echo "Date: $$(date -u)") > $(IMAGES_DIR)/.$(SNAME)info -endif - -ifeq "$(PASS)" "initramfs" - mkliveramfs -v -f --with-net $(IMAGES_DIR)/initramfs-$(VERSION).img $(KVER) -endif - -ifeq "$(PASS)" "core" - @rm -rf /tmp/$(SNAME)-$(VERSION) - - cd $(DIR_PACKAGES) && $(DIR_SOURCE)/pakfire/decompressor \ - --root=/tmp/$(SNAME)-$(VERSION) $(PACKAGES_CORE) - - # Do some tests im the environment is sane - ldconfig -r /tmp/$(SNAME)-$(VERSION) - - # Create needed directories and device nodes - cd /tmp/$(SNAME)-$(VERSION) && mkdir -pv {dev,proc,sys} - cd /tmp/$(SNAME)-$(VERSION) && mknod -m 0666 dev/null c 1 3 - cd /tmp/$(SNAME)-$(VERSION) && mknod -m 0600 dev/console c 5 1 - cd /tmp/$(SNAME)-$(VERSION) && install -dv -m 1777 tmp var/tmp - - # Hack for bash - cd /tmp/$(SNAME)-$(VERSION) && cp -vf /bin/bash bin/bash - cd /tmp/$(SNAME)-$(VERSION) && ln -svf bash bin/sh - - cd /tmp/$(SNAME)-$(VERSION) && mksquashfs * $(IMAGE_FILE) -b 1M -noappend - rm -rf /tmp/$(SNAME)-$(VERSION) -endif - -ifeq "$(PASS)" "overlays" - # Creating installer's overlay - cd $(INSTALLER_DIR) && mksquashfs * $(IMAGES_DIR)/pomona-$(VERSION).overlay -b 1M -noappend -endif diff --git a/lfs/pomona b/lfs/pomona deleted file mode 100644 index c67dc90..0000000 --- a/lfs/pomona +++ /dev/null @@ -1,88 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -PKG_NAME = pomona -PKG_VER = ipfire -PKG_REL = 0 - -THISAPP = $(PKG_NAME) -DIR_APP = $(DIR_SOURCE)/$(THISAPP) - -OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) - -MAINTAINER = -GROUP = System/Installer -CORE = no -EXTRA = no -DEBUG = no -DEPS = popt parted python-parted e2fsprogs -BUILD_DEPS = - -LICENSE = GPLv3+ -URL = http://www.ipfire.org -SHORT_DESC = The IPFire 3.x installer. - -define LONG_DESC - Pomona is the installer for IPFire 3.x. -endef - -############################################################################### -# Top-level Rules -############################################################################### - -objects = - -download: $(objects) - -info: - $(DO_PKG_INFO) - -install: $(OBJECT) - -packages: $(PACKAGES) - -$(PACKAGES): $(OBJECT) - @$(DO_PACKAGE) - -$(objects): - @$(LOAD) - -############################################################################### -# Installation Details -############################################################################### - -$(OBJECT): $(objects) - @$(PREBUILD) - cd $(DIR_APP) && make clean - #cd $(DIR_APP) && make -C po update-po - cd $(DIR_APP) && make - #cd $(DIR_APP) && make test - cd $(DIR_APP) && make install \ - NAME=$(NAME) SNAME=$(SNAME) VERSION=$(VERSION) KVER=$(KVER) - cd $(DIR_APP) && make clean - - find $(INSTALLER_DIR)/usr/lib/pomona/ -name *.py | xargs /usr/bin/py-compile - @$(POSTBUILD) diff --git a/lfs/pxe b/lfs/pxe deleted file mode 100644 index 71039bd..0000000 --- a/lfs/pxe +++ /dev/null @@ -1,93 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -PKG_NAME = pxe -PKG_VER = -PKG_REL = -1 - -THISAPP = $(PKG_NAME) - -OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) - -MAINTAINER = -GROUP = -CORE = no -EXTRA = no -DEBUG = no -BUILD_DEPS = -DEPS = images-initramfs - -URL = -LICENSE = - -PXE_DIR = $(CDROM_DIR) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = - -download: $(objects) - -info: - $(DO_PKG_INFO) - -install: $(OBJECT) - -packages: $(PACKAGES) - -$(PACKAGES): $(OBJECT) - @$(DO_PACKAGE) - -$(objects): - @$(LOAD) - -############################################################################### -# Installation Details -############################################################################### - -$(OBJECT): $(objects) - @rm -rf $(PXE_DIR)/* && mkdir -pv $(PXE_DIR)/{pxelinux.cfg,$(SNAME)} - - # Copy image with networking support - cp -vf $(IMAGES_DIR)/initramfs-$(VERSION).img $(CDROM_DIR)/$(SNAME)/initrd0 - cp -vf /boot/ipfirekernel-$(KVER) $(CDROM_DIR)/$(SNAME)/$(SNAME)0 - cp -vf /usr/share/syslinux/vesamenu.c32 \ - $(DIR_SOURCE)/bootloader/splash.{jpg,lss} \ - $(DIR_SOURCE)/bootloader/*.msg $(CDROM_DIR)/$(SNAME)/ - - cp -vf /usr/share/syslinux/pxelinux.0 $(CDROM_DIR)/ - $(INSTALL_CONFIG) $(DIR_SOURCE)/bootloader/pxe.conf \ - > $(CDROM_DIR)/pxelinux.cfg/$(SNAME)-pxe-$(VERSION).model - - sed -e "s@splash@$(SNAME)/splash@g" \ - -i $(CDROM_DIR)/$(SNAME)/boot.msg - - cd $(CDROM_DIR) && \ - tar cfz $(IMAGES_DIR)/$(IMAGENAME).pxe.tar.gz * - - @rm -rf $(PXE_DIR)/* diff --git a/naoki/backend.py b/naoki/backend.py index 9129cc3..1c7f690 100644 --- a/naoki/backend.py +++ b/naoki/backend.py @@ -1,7 +1,6 @@ #!/usr/bin/python -import email.mime.multipart -import email.mime.text + import os import shutil import smtplib @@ -20,6 +19,15 @@ __cache = { "group_names" : None, } +# Python 2.4 does not have that email module, so +# we disable the mail function here. +try: + import email.mime.multipart + import email.mime.text + have_email = 1 +except ImportError: + have_email = 0 + try: import hashlib have_hashlib = 1 @@ -565,6 +573,10 @@ def report_error_by_mail(package): if not config["error_report_recipient"]: return + if not have_email: + log.error("Can't send mail because this python version does not support this") + return + try: connection = smtplib.SMTP(config["smtp_server"]) #connection.set_debuglevel(1) diff --git a/pkgs/core/coreutils/coreutils.nm b/pkgs/core/coreutils/coreutils.nm index f424083..900762d 100644 --- a/pkgs/core/coreutils/coreutils.nm +++ b/pkgs/core/coreutils/coreutils.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = coreutils -PKG_VER = 8.4 +PKG_VER = 8.5 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/coreutils/patches/coreutils-8.4-i18n.patch b/pkgs/core/coreutils/patches/coreutils-8.4-i18n.patch deleted file mode 100644 index a8faefe..0000000 --- a/pkgs/core/coreutils/patches/coreutils-8.4-i18n.patch +++ /dev/null @@ -1,4044 +0,0 @@ -diff -urNp coreutils-8.0-orig/lib/linebuffer.h coreutils-8.0/lib/linebuffer.h ---- coreutils-8.0-orig/lib/linebuffer.h 2009-10-06 10:59:48.000000000 +0200 -+++ coreutils-8.0/lib/linebuffer.h 2009-10-07 10:07:16.000000000 +0200 -@@ -21,6 +21,11 @@ - - # include <stdio.h> - -+/* Get mbstate_t. */ -+# if HAVE_WCHAR_H -+# include <wchar.h> -+# endif -+ - /* A `struct linebuffer' holds a line of text. */ - - struct linebuffer -@@ -28,6 +33,9 @@ struct linebuffer - size_t size; /* Allocated. */ - size_t length; /* Used. */ - char *buffer; -+# if HAVE_WCHAR_H -+ mbstate_t state; -+# endif - }; - - /* Initialize linebuffer LINEBUFFER for use. */ -diff -urNp coreutils-8.0-orig/src/cut.c coreutils-8.0/src/cut.c ---- coreutils-8.0-orig/src/cut.c 2009-09-23 10:25:44.000000000 +0200 -+++ coreutils-8.0/src/cut.c 2009-10-07 10:07:16.000000000 +0200 -@@ -28,6 +28,11 @@ - #include <assert.h> - #include <getopt.h> - #include <sys/types.h> -+ -+/* Get mbstate_t, mbrtowc(). */ -+#if HAVE_WCHAR_H -+# include <wchar.h> -+#endif - #include "system.h" - - #include "error.h" -@@ -36,6 +41,18 @@ - #include "quote.h" - #include "xstrndup.h" - -+/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC -+ installation; work around this configuration error. */ -+#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 -+# undef MB_LEN_MAX -+# define MB_LEN_MAX 16 -+#endif -+ -+/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ -+#if HAVE_MBRTOWC && defined mbstate_t -+# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) -+#endif -+ - /* The official name of this program (e.g., no `g' prefix). */ - #define PROGRAM_NAME "cut" - -@@ -71,6 +88,52 @@ - } \ - while (0) - -+/* Refill the buffer BUF to get a multibyte character. */ -+#define REFILL_BUFFER(BUF, BUFPOS, BUFLEN, STREAM) \ -+ do \ -+ { \ -+ if (BUFLEN < MB_LEN_MAX && !feof (STREAM) && !ferror (STREAM)) \ -+ { \ -+ memmove (BUF, BUFPOS, BUFLEN); \ -+ BUFLEN += fread (BUF + BUFLEN, sizeof(char), BUFSIZ, STREAM); \ -+ BUFPOS = BUF; \ -+ } \ -+ } \ -+ while (0) -+ -+/* Get wide character on BUFPOS. BUFPOS is not included after that. -+ If byte sequence is not valid as a character, CONVFAIL is 1. Otherwise 0. */ -+#define GET_NEXT_WC_FROM_BUFFER(WC, BUFPOS, BUFLEN, MBLENGTH, STATE, CONVFAIL) \ -+ do \ -+ { \ -+ mbstate_t state_bak; \ -+ \ -+ if (BUFLEN < 1) \ -+ { \ -+ WC = WEOF; \ -+ break; \ -+ } \ -+ \ -+ /* Get a wide character. */ \ -+ CONVFAIL = 0; \ -+ state_bak = STATE; \ -+ MBLENGTH = mbrtowc ((wchar_t *)&WC, BUFPOS, BUFLEN, &STATE); \ -+ \ -+ switch (MBLENGTH) \ -+ { \ -+ case (size_t)-1: \ -+ case (size_t)-2: \ -+ CONVFAIL++; \ -+ STATE = state_bak; \ -+ /* Fall througn. */ \ -+ \ -+ case 0: \ -+ MBLENGTH = 1; \ -+ break; \ -+ } \ -+ } \ -+ while (0) -+ - struct range_pair - { - size_t lo; -@@ -89,7 +152,7 @@ static char *field_1_buffer; - /* The number of bytes allocated for FIELD_1_BUFFER. */ - static size_t field_1_bufsize; - --/* The largest field or byte index used as an endpoint of a closed -+/* The largest byte, character or field index used as an endpoint of a closed - or degenerate range specification; this doesn't include the starting - index of right-open-ended ranges. For example, with either range spec - `2-5,9-', `2-3,5,9-' this variable would be set to 5. */ -@@ -101,10 +164,11 @@ static size_t eol_range_start; - - /* This is a bit vector. - In byte mode, which bytes to output. -+ In character mode, which characters to output. - In field mode, which DELIM-separated fields to output. -- Both bytes and fields are numbered starting with 1, -+ Bytes, characters and fields are numbered starting with 1, - so the zeroth bit of this array is unused. -- A field or byte K has been selected if -+ A byte, character or field K has been selected if - (K <= MAX_RANGE_ENDPOINT and is_printable_field(K)) - || (EOL_RANGE_START > 0 && K >= EOL_RANGE_START). */ - static unsigned char *printable_field; -@@ -113,15 +177,25 @@ enum operating_mode - { - undefined_mode, - -- /* Output characters that are in the given bytes. */ -+ /* Output bytes that are at the given positions. */ - byte_mode, - -+ /* Output characters that are at the given positions. */ -+ character_mode, -+ - /* Output the given delimeter-separated fields. */ - field_mode - }; - - static enum operating_mode operating_mode; - -+/* If nonzero, when in byte mode, don't split multibyte characters. */ -+static int byte_mode_character_aware; -+ -+/* If nonzero, the function for single byte locale is work -+ if this program runs on multibyte locale. */ -+static int force_singlebyte_mode; -+ - /* If true do not output lines containing no delimeter characters. - Otherwise, all such lines are printed. This option is valid only - with field mode. */ -@@ -133,6 +207,9 @@ static bool complement; - - /* The delimeter character for field mode. */ - static unsigned char delim; -+#if HAVE_WCHAR_H -+static wchar_t wcdelim; -+#endif - - /* True if the --output-delimiter=STRING option was specified. */ - static bool output_delimiter_specified; -@@ -206,7 +283,7 @@ Mandatory arguments to long options are - -f, --fields=LIST select only these fields; also print any line\n\ - that contains no delimiter character, unless\n\ - the -s option is specified\n\ -- -n (ignored)\n\ -+ -n with -b: don't split multibyte characters\n\ - "), stdout); - fputs (_("\ - --complement complement the set of selected bytes, characters\n\ -@@ -365,7 +442,7 @@ set_fields (const char *fieldstr) - in_digits = false; - /* Starting a range. */ - if (dash_found) -- FATAL_ERROR (_("invalid byte or field list")); -+ FATAL_ERROR (_("invalid byte, character or field list")); - dash_found = true; - fieldstr++; - -@@ -389,14 +466,16 @@ set_fields (const char *fieldstr) - if (!rhs_specified) - { - /* `n-'. From `initial' to end of line. */ -- eol_range_start = initial; -+ if (eol_range_start == 0 || -+ (eol_range_start != 0 && eol_range_start > initial)) -+ eol_range_start = initial; - field_found = true; - } - else - { - /* `m-n' or `-n' (1-n). */ - if (value < initial) -- FATAL_ERROR (_("invalid decreasing range")); -+ FATAL_ERROR (_("invalid byte, character or field list")); - - /* Is there already a range going to end of line? */ - if (eol_range_start != 0) -@@ -476,6 +555,9 @@ set_fields (const char *fieldstr) - if (operating_mode == byte_mode) - error (0, 0, - _("byte offset %s is too large"), quote (bad_num)); -+ else if (operating_mode == character_mode) -+ error (0, 0, -+ _("character offset %s is too large"), quote (bad_num)); - else - error (0, 0, - _("field number %s is too large"), quote (bad_num)); -@@ -486,7 +568,7 @@ set_fields (const char *fieldstr) - fieldstr++; - } - else -- FATAL_ERROR (_("invalid byte or field list")); -+ FATAL_ERROR (_("invalid byte, character or field list")); - } - - max_range_endpoint = 0; -@@ -579,6 +661,63 @@ cut_bytes (FILE *stream) - } - } - -+#if HAVE_MBRTOWC -+/* This function is in use for the following case. -+ -+ 1. Read from the stream STREAM, printing to standard output any selected -+ characters. -+ -+ 2. Read from stream STREAM, printing to standard output any selected bytes, -+ without splitting multibyte characters. */ -+ -+static void -+cut_characters_or_cut_bytes_no_split (FILE *stream) -+{ -+ int idx; /* number of bytes or characters in the line so far. */ -+ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ -+ char *bufpos; /* Next read position of BUF. */ -+ size_t buflen; /* The length of the byte sequence in buf. */ -+ wint_t wc; /* A gotten wide character. */ -+ size_t mblength; /* The byte size of a multibyte character which shows -+ as same character as WC. */ -+ mbstate_t state; /* State of the stream. */ -+ int convfail; /* 1, when conversion is failed. Otherwise 0. */ -+ -+ idx = 0; -+ buflen = 0; -+ bufpos = buf; -+ memset (&state, '\0', sizeof(mbstate_t)); -+ -+ while (1) -+ { -+ REFILL_BUFFER (buf, bufpos, buflen, stream); -+ -+ GET_NEXT_WC_FROM_BUFFER (wc, bufpos, buflen, mblength, state, convfail); -+ -+ if (wc == WEOF) -+ { -+ if (idx > 0) -+ putchar ('\n'); -+ break; -+ } -+ else if (wc == L'\n') -+ { -+ putchar ('\n'); -+ idx = 0; -+ } -+ else -+ { -+ idx += (operating_mode == byte_mode) ? mblength : 1; -+ if (print_kth (idx, NULL)) -+ fwrite (bufpos, mblength, sizeof(char), stdout); -+ } -+ -+ buflen -= mblength; -+ bufpos += mblength; -+ } -+} -+#endif -+ - /* Read from stream STREAM, printing to standard output any selected fields. */ - - static void -@@ -701,13 +840,192 @@ cut_fields (FILE *stream) - } - } - -+#if HAVE_MBRTOWC -+static void -+cut_fields_mb (FILE *stream) -+{ -+ int c; -+ unsigned int field_idx; -+ int found_any_selected_field; -+ int buffer_first_field; -+ int empty_input; -+ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ -+ char *bufpos; /* Next read position of BUF. */ -+ size_t buflen; /* The length of the byte sequence in buf. */ -+ wint_t wc = 0; /* A gotten wide character. */ -+ size_t mblength; /* The byte size of a multibyte character which shows -+ as same character as WC. */ -+ mbstate_t state; /* State of the stream. */ -+ int convfail; /* 1, when conversion is failed. Otherwise 0. */ -+ -+ found_any_selected_field = 0; -+ field_idx = 1; -+ bufpos = buf; -+ buflen = 0; -+ memset (&state, '\0', sizeof(mbstate_t)); -+ -+ c = getc (stream); -+ empty_input = (c == EOF); -+ if (c != EOF) -+ ungetc (c, stream); -+ else -+ wc = WEOF; -+ -+ /* To support the semantics of the -s flag, we may have to buffer -+ all of the first field to determine whether it is `delimited.' -+ But that is unnecessary if all non-delimited lines must be printed -+ and the first field has been selected, or if non-delimited lines -+ must be suppressed and the first field has *not* been selected. -+ That is because a non-delimited line has exactly one field. */ -+ buffer_first_field = (suppress_non_delimited ^ !print_kth (1, NULL)); -+ -+ while (1) -+ { -+ if (field_idx == 1 && buffer_first_field) -+ { -+ int len = 0; -+ -+ while (1) -+ { -+ REFILL_BUFFER (buf, bufpos, buflen, stream); -+ -+ GET_NEXT_WC_FROM_BUFFER -+ (wc, bufpos, buflen, mblength, state, convfail); -+ -+ if (wc == WEOF) -+ break; -+ -+ field_1_buffer = xrealloc (field_1_buffer, len + mblength); -+ memcpy (field_1_buffer + len, bufpos, mblength); -+ len += mblength; -+ buflen -= mblength; -+ bufpos += mblength; -+ -+ if (!convfail && (wc == L'\n' || wc == wcdelim)) -+ break; -+ } -+ -+ if (wc == WEOF) -+ break; -+ -+ /* If the first field extends to the end of line (it is not -+ delimited) and we are printing all non-delimited lines, -+ print this one. */ -+ if (convfail || (!convfail && wc != wcdelim)) -+ { -+ if (suppress_non_delimited) -+ { -+ /* Empty. */ -+ } -+ else -+ { -+ fwrite (field_1_buffer, sizeof (char), len, stdout); -+ /* Make sure the output line is newline terminated. */ -+ if (convfail || (!convfail && wc != L'\n')) -+ putchar ('\n'); -+ } -+ continue; -+ } -+ -+ if (print_kth (1, NULL)) -+ { -+ /* Print the field, but not the trailing delimiter. */ -+ fwrite (field_1_buffer, sizeof (char), len - 1, stdout); -+ found_any_selected_field = 1; -+ } -+ ++field_idx; -+ } -+ -+ if (wc != WEOF) -+ { -+ if (print_kth (field_idx, NULL)) -+ { -+ if (found_any_selected_field) -+ { -+ fwrite (output_delimiter_string, sizeof (char), -+ output_delimiter_length, stdout); -+ } -+ found_any_selected_field = 1; -+ } -+ -+ while (1) -+ { -+ REFILL_BUFFER (buf, bufpos, buflen, stream); -+ -+ GET_NEXT_WC_FROM_BUFFER -+ (wc, bufpos, buflen, mblength, state, convfail); -+ -+ if (wc == WEOF) -+ break; -+ else if (!convfail && (wc == wcdelim || wc == L'\n')) -+ { -+ buflen -= mblength; -+ bufpos += mblength; -+ break; -+ } -+ -+ if (print_kth (field_idx, NULL)) -+ fwrite (bufpos, mblength, sizeof(char), stdout); -+ -+ buflen -= mblength; -+ bufpos += mblength; -+ } -+ } -+ -+ if ((!convfail || wc == L'\n') && buflen < 1) -+ wc = WEOF; -+ -+ if (!convfail && wc == wcdelim) -+ ++field_idx; -+ else if (wc == WEOF || (!convfail && wc == L'\n')) -+ { -+ if (found_any_selected_field -+ || (!empty_input && !(suppress_non_delimited && field_idx == 1))) -+ putchar ('\n'); -+ if (wc == WEOF) -+ break; -+ field_idx = 1; -+ found_any_selected_field = 0; -+ } -+ } -+} -+#endif -+ - static void - cut_stream (FILE *stream) - { -- if (operating_mode == byte_mode) -- cut_bytes (stream); -+#if HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1 && !force_singlebyte_mode) -+ { -+ switch (operating_mode) -+ { -+ case byte_mode: -+ if (byte_mode_character_aware) -+ cut_characters_or_cut_bytes_no_split (stream); -+ else -+ cut_bytes (stream); -+ break; -+ -+ case character_mode: -+ cut_characters_or_cut_bytes_no_split (stream); -+ break; -+ -+ case field_mode: -+ cut_fields_mb (stream); -+ break; -+ -+ default: -+ abort (); -+ } -+ } - else -- cut_fields (stream); -+#endif -+ { -+ if (operating_mode == field_mode) -+ cut_fields (stream); -+ else -+ cut_bytes (stream); -+ } - } - - /* Process file FILE to standard output. -@@ -757,6 +1075,8 @@ main (int argc, char **argv) - bool ok; - bool delim_specified = false; - char *spec_list_string IF_LINT(= NULL); -+ char mbdelim[MB_LEN_MAX + 1]; -+ size_t delimlen = 0; - - initialize_main (&argc, &argv); - set_program_name (argv[0]); -@@ -779,7 +1099,6 @@ main (int argc, char **argv) - switch (optc) - { - case 'b': -- case 'c': - /* Build the byte list. */ - if (operating_mode != undefined_mode) - FATAL_ERROR (_("only one type of list may be specified")); -@@ -787,6 +1106,14 @@ main (int argc, char **argv) - spec_list_string = optarg; - break; - -+ case 'c': -+ /* Build the character list. */ -+ if (operating_mode != undefined_mode) -+ FATAL_ERROR (_("only one type of list may be specified")); -+ operating_mode = character_mode; -+ spec_list_string = optarg; -+ break; -+ - case 'f': - /* Build the field list. */ - if (operating_mode != undefined_mode) -@@ -798,10 +1125,35 @@ main (int argc, char **argv) - case 'd': - /* New delimiter. */ - /* Interpret -d '' to mean `use the NUL byte as the delimiter.' */ -- if (optarg[0] != '\0' && optarg[1] != '\0') -- FATAL_ERROR (_("the delimiter must be a single character")); -- delim = optarg[0]; -- delim_specified = true; -+ { -+#if HAVE_MBRTOWC -+ if(MB_CUR_MAX > 1) -+ { -+ mbstate_t state; -+ -+ memset (&state, '\0', sizeof(mbstate_t)); -+ delimlen = mbrtowc (&wcdelim, optarg, strnlen(optarg, MB_LEN_MAX), &state); -+ -+ if (delimlen == (size_t)-1 || delimlen == (size_t)-2) -+ ++force_singlebyte_mode; -+ else -+ { -+ delimlen = (delimlen < 1) ? 1 : delimlen; -+ if (wcdelim != L'\0' && *(optarg + delimlen) != '\0') -+ FATAL_ERROR (_("the delimiter must be a single character")); -+ memcpy (mbdelim, optarg, delimlen); -+ } -+ } -+ -+ if (MB_CUR_MAX <= 1 || force_singlebyte_mode) -+#endif -+ { -+ if (optarg[0] != '\0' && optarg[1] != '\0') -+ FATAL_ERROR (_("the delimiter must be a single character")); -+ delim = (unsigned char) optarg[0]; -+ } -+ delim_specified = true; -+ } - break; - - case OUTPUT_DELIMITER_OPTION: -@@ -814,6 +1166,7 @@ main (int argc, char **argv) - break; - - case 'n': -+ byte_mode_character_aware = 1; - break; - - case 's': -@@ -836,7 +1189,7 @@ main (int argc, char **argv) - if (operating_mode == undefined_mode) - FATAL_ERROR (_("you must specify a list of bytes, characters, or fields")); - -- if (delim != '\0' && operating_mode != field_mode) -+ if (delim_specified && operating_mode != field_mode) - FATAL_ERROR (_("an input delimiter may be specified only\ - when operating on fields")); - -@@ -863,15 +1216,34 @@ main (int argc, char **argv) - } - - if (!delim_specified) -- delim = '\t'; -+ { -+ delim = '\t'; -+#ifdef HAVE_MBRTOWC -+ wcdelim = L'\t'; -+ mbdelim[0] = '\t'; -+ mbdelim[1] = '\0'; -+ delimlen = 1; -+#endif -+ } - - if (output_delimiter_string == NULL) - { -- static char dummy[2]; -- dummy[0] = delim; -- dummy[1] = '\0'; -- output_delimiter_string = dummy; -- output_delimiter_length = 1; -+#ifdef HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1 && !force_singlebyte_mode) -+ { -+ output_delimiter_string = xstrdup(mbdelim); -+ output_delimiter_length = delimlen; -+ } -+ -+ if (MB_CUR_MAX <= 1 || force_singlebyte_mode) -+#endif -+ { -+ static char dummy[2]; -+ dummy[0] = delim; -+ dummy[1] = '\0'; -+ output_delimiter_string = dummy; -+ output_delimiter_length = 1; -+ } - } - - if (optind == argc) -diff -urNp coreutils-8.0-orig/src/expand.c coreutils-8.0/src/expand.c ---- coreutils-8.0-orig/src/expand.c 2009-09-29 15:27:54.000000000 +0200 -+++ coreutils-8.0/src/expand.c 2009-10-07 10:07:16.000000000 +0200 -@@ -37,11 +37,28 @@ - #include <stdio.h> - #include <getopt.h> - #include <sys/types.h> -+ -+/* Get mbstate_t, mbrtowc(), wcwidth(). */ -+#if HAVE_WCHAR_H -+# include <wchar.h> -+#endif -+ - #include "system.h" - #include "error.h" - #include "quote.h" - #include "xstrndup.h" - -+/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC -+ installation; work around this configuration error. */ -+#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 -+# define MB_LEN_MAX 16 -+#endif -+ -+/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ -+#if HAVE_MBRTOWC && defined mbstate_t -+# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) -+#endif -+ - /* The official name of this program (e.g., no `g' prefix). */ - #define PROGRAM_NAME "expand" - -@@ -357,6 +374,142 @@ expand (void) - } - } - -+#if HAVE_MBRTOWC -+static void -+expand_multibyte (void) -+{ -+ FILE *fp; /* Input strem. */ -+ mbstate_t i_state; /* Current shift state of the input stream. */ -+ mbstate_t i_state_bak; /* Back up the I_STATE. */ -+ mbstate_t o_state; /* Current shift state of the output stream. */ -+ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ -+ char *bufpos; /* Next read position of BUF. */ -+ size_t buflen = 0; /* The length of the byte sequence in buf. */ -+ wchar_t wc; /* A gotten wide character. */ -+ size_t mblength; /* The byte size of a multibyte character -+ which shows as same character as WC. */ -+ int tab_index = 0; /* Index in `tab_list' of next tabstop. */ -+ int column = 0; /* Column on screen of the next char. */ -+ int next_tab_column; /* Column the next tab stop is on. */ -+ int convert = 1; /* If nonzero, perform translations. */ -+ -+ fp = next_file ((FILE *) NULL); -+ if (fp == NULL) -+ return; -+ -+ memset (&o_state, '\0', sizeof(mbstate_t)); -+ memset (&i_state, '\0', sizeof(mbstate_t)); -+ -+ for (;;) -+ { -+ /* Refill the buffer BUF. */ -+ if (buflen < MB_LEN_MAX && !feof(fp) && !ferror(fp)) -+ { -+ memmove (buf, bufpos, buflen); -+ buflen += fread (buf + buflen, sizeof(char), BUFSIZ, fp); -+ bufpos = buf; -+ } -+ -+ /* No character is left in BUF. */ -+ if (buflen < 1) -+ { -+ fp = next_file (fp); -+ -+ if (fp == NULL) -+ break; /* No more files. */ -+ else -+ { -+ memset (&i_state, '\0', sizeof(mbstate_t)); -+ continue; -+ } -+ } -+ -+ /* Get a wide character. */ -+ i_state_bak = i_state; -+ mblength = mbrtowc (&wc, bufpos, buflen, &i_state); -+ -+ switch (mblength) -+ { -+ case (size_t)-1: /* illegal byte sequence. */ -+ case (size_t)-2: -+ mblength = 1; -+ i_state = i_state_bak; -+ if (convert) -+ { -+ ++column; -+ if (convert_entire_line == 0) -+ convert = 0; -+ } -+ putchar (*bufpos); -+ break; -+ -+ case 0: /* null. */ -+ mblength = 1; -+ if (convert && convert_entire_line == 0) -+ convert = 0; -+ putchar ('\0'); -+ break; -+ -+ default: -+ if (wc == L'\n') /* LF. */ -+ { -+ tab_index = 0; -+ column = 0; -+ convert = 1; -+ putchar ('\n'); -+ } -+ else if (wc == L'\t' && convert) /* Tab. */ -+ { -+ if (tab_size == 0) -+ { -+ /* Do not let tab_index == first_free_tab; -+ stop when it is 1 less. */ -+ while (tab_index < first_free_tab - 1 -+ && column >= tab_list[tab_index]) -+ tab_index++; -+ next_tab_column = tab_list[tab_index]; -+ if (tab_index < first_free_tab - 1) -+ tab_index++; -+ if (column >= next_tab_column) -+ next_tab_column = column + 1; -+ } -+ else -+ next_tab_column = column + tab_size - column % tab_size; -+ -+ while (column < next_tab_column) -+ { -+ putchar (' '); -+ ++column; -+ } -+ } -+ else /* Others. */ -+ { -+ if (convert) -+ { -+ if (wc == L'\b') -+ { -+ if (column > 0) -+ --column; -+ } -+ else -+ { -+ int width; /* The width of WC. */ -+ -+ width = wcwidth (wc); -+ column += (width > 0) ? width : 0; -+ if (convert_entire_line == 0) -+ convert = 0; -+ } -+ } -+ fwrite (bufpos, sizeof(char), mblength, stdout); -+ } -+ } -+ buflen -= mblength; -+ bufpos += mblength; -+ } -+} -+#endif -+ - int - main (int argc, char **argv) - { -@@ -421,7 +574,12 @@ main (int argc, char **argv) - - file_list = (optind < argc ? &argv[optind] : stdin_argv); - -- expand (); -+#if HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1) -+ expand_multibyte (); -+ else -+#endif -+ expand (); - - if (have_read_stdin && fclose (stdin) != 0) - error (EXIT_FAILURE, errno, "-"); -diff -urNp coreutils-8.0-orig/src/fold.c coreutils-8.0/src/fold.c ---- coreutils-8.0-orig/src/fold.c 2009-09-23 10:25:44.000000000 +0200 -+++ coreutils-8.0/src/fold.c 2009-10-07 10:07:16.000000000 +0200 -@@ -22,11 +22,33 @@ - #include <getopt.h> - #include <sys/types.h> - -+/* Get mbstate_t, mbrtowc(), wcwidth(). */ -+#if HAVE_WCHAR_H -+# include <wchar.h> -+#endif -+ -+/* Get iswprint(), iswblank(), wcwidth(). */ -+#if HAVE_WCTYPE_H -+# include <wctype.h> -+#endif -+ - #include "system.h" - #include "error.h" - #include "quote.h" - #include "xstrtol.h" - -+/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC -+ installation; work around this configuration error. */ -+#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 -+# undef MB_LEN_MAX -+# define MB_LEN_MAX 16 -+#endif -+ -+/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ -+#if HAVE_MBRTOWC && defined mbstate_t -+# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) -+#endif -+ - #define TAB_WIDTH 8 - - /* The official name of this program (e.g., no `g' prefix). */ -@@ -34,20 +56,41 @@ - - #define AUTHORS proper_name ("David MacKenzie") - -+#define FATAL_ERROR(Message) \ -+ do \ -+ { \ -+ error (0, 0, (Message)); \ -+ usage (2); \ -+ } \ -+ while (0) -+ -+enum operating_mode -+{ -+ /* Fold texts by columns that are at the given positions. */ -+ column_mode, -+ -+ /* Fold texts by bytes that are at the given positions. */ -+ byte_mode, -+ -+ /* Fold texts by characters that are at the given positions. */ -+ character_mode, -+}; -+ -+/* The argument shows current mode. (Default: column_mode) */ -+static enum operating_mode operating_mode; -+ - /* If nonzero, try to break on whitespace. */ - static bool break_spaces; - --/* If nonzero, count bytes, not column positions. */ --static bool count_bytes; -- - /* If nonzero, at least one of the files we read was standard input. */ - static bool have_read_stdin; - --static char const shortopts[] = "bsw:0::1::2::3::4::5::6::7::8::9::"; -+static char const shortopts[] = "bcsw:0::1::2::3::4::5::6::7::8::9::"; - - static struct option const longopts[] = - { - {"bytes", no_argument, NULL, 'b'}, -+ {"characters", no_argument, NULL, 'c'}, - {"spaces", no_argument, NULL, 's'}, - {"width", required_argument, NULL, 'w'}, - {GETOPT_HELP_OPTION_DECL}, -@@ -77,6 +120,7 @@ Mandatory arguments to long options are - "), stdout); - fputs (_("\ - -b, --bytes count bytes rather than columns\n\ -+ -c, --characters count characters rather than columns\n\ - -s, --spaces break at spaces\n\ - -w, --width=WIDTH use WIDTH columns instead of 80\n\ - "), stdout); -@@ -94,7 +138,7 @@ Mandatory arguments to long options are - static size_t - adjust_column (size_t column, char c) - { -- if (!count_bytes) -+ if (operating_mode != byte_mode) - { - if (c == '\b') - { -@@ -117,30 +161,14 @@ adjust_column (size_t column, char c) - to stdout, with maximum line length WIDTH. - Return true if successful. */ - --static bool --fold_file (char const *filename, size_t width) -+static void -+fold_text (FILE *istream, size_t width, int *saved_errno) - { -- FILE *istream; - int c; - size_t column = 0; /* Screen column where next char will go. */ - size_t offset_out = 0; /* Index in `line_out' for next char. */ - static char *line_out = NULL; - static size_t allocated_out = 0; -- int saved_errno; -- -- if (STREQ (filename, "-")) -- { -- istream = stdin; -- have_read_stdin = true; -- } -- else -- istream = fopen (filename, "r"); -- -- if (istream == NULL) -- { -- error (0, errno, "%s", filename); -- return false; -- } - - while ((c = getc (istream)) != EOF) - { -@@ -168,6 +196,15 @@ fold_file (char const *filename, size_t - bool found_blank = false; - size_t logical_end = offset_out; - -+ /* If LINE_OUT has no wide character, -+ put a new wide character in LINE_OUT -+ if column is bigger than width. */ -+ if (offset_out == 0) -+ { -+ line_out[offset_out++] = c; -+ continue; -+ } -+ - /* Look for the last blank. */ - while (logical_end) - { -@@ -214,11 +251,222 @@ fold_file (char const *filename, size_t - line_out[offset_out++] = c; - } - -- saved_errno = errno; -+ *saved_errno = errno; - - if (offset_out) - fwrite (line_out, sizeof (char), (size_t) offset_out, stdout); - -+} -+ -+#if HAVE_MBRTOWC -+static void -+fold_multibyte_text (FILE *istream, size_t width, int *saved_errno) -+{ -+ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ -+ size_t buflen = 0; /* The length of the byte sequence in buf. */ -+ char *bufpos = NULL; /* Next read position of BUF. */ -+ wint_t wc; /* A gotten wide character. */ -+ size_t mblength; /* The byte size of a multibyte character which shows -+ as same character as WC. */ -+ mbstate_t state, state_bak; /* State of the stream. */ -+ int convfail; /* 1, when conversion is failed. Otherwise 0. */ -+ -+ static char *line_out = NULL; -+ size_t offset_out = 0; /* Index in `line_out' for next char. */ -+ static size_t allocated_out = 0; -+ -+ int increment; -+ size_t column = 0; -+ -+ size_t last_blank_pos; -+ size_t last_blank_column; -+ int is_blank_seen; -+ int last_blank_increment = 0; -+ int is_bs_following_last_blank; -+ size_t bs_following_last_blank_num; -+ int is_cr_after_last_blank; -+ -+#define CLEAR_FLAGS \ -+ do \ -+ { \ -+ last_blank_pos = 0; \ -+ last_blank_column = 0; \ -+ is_blank_seen = 0; \ -+ is_bs_following_last_blank = 0; \ -+ bs_following_last_blank_num = 0; \ -+ is_cr_after_last_blank = 0; \ -+ } \ -+ while (0) -+ -+#define START_NEW_LINE \ -+ do \ -+ { \ -+ putchar ('\n'); \ -+ column = 0; \ -+ offset_out = 0; \ -+ CLEAR_FLAGS; \ -+ } \ -+ while (0) -+ -+ CLEAR_FLAGS; -+ memset (&state, '\0', sizeof(mbstate_t)); -+ -+ for (;; bufpos += mblength, buflen -= mblength) -+ { -+ if (buflen < MB_LEN_MAX && !feof (istream) && !ferror (istream)) -+ { -+ memmove (buf, bufpos, buflen); -+ buflen += fread (buf + buflen, sizeof(char), BUFSIZ, istream); -+ bufpos = buf; -+ } -+ -+ if (buflen < 1) -+ break; -+ -+ /* Get a wide character. */ -+ convfail = 0; -+ state_bak = state; -+ mblength = mbrtowc ((wchar_t *)&wc, bufpos, buflen, &state); -+ -+ switch (mblength) -+ { -+ case (size_t)-1: -+ case (size_t)-2: -+ convfail++; -+ state = state_bak; -+ /* Fall through. */ -+ -+ case 0: -+ mblength = 1; -+ break; -+ } -+ -+rescan: -+ if (operating_mode == byte_mode) /* byte mode */ -+ increment = mblength; -+ else if (operating_mode == character_mode) /* character mode */ -+ increment = 1; -+ else /* column mode */ -+ { -+ if (convfail) -+ increment = 1; -+ else -+ { -+ switch (wc) -+ { -+ case L'\n': -+ fwrite (line_out, sizeof(char), offset_out, stdout); -+ START_NEW_LINE; -+ continue; -+ -+ case L'\b': -+ increment = (column > 0) ? -1 : 0; -+ break; -+ -+ case L'\r': -+ increment = -1 * column; -+ break; -+ -+ case L'\t': -+ increment = 8 - column % 8; -+ break; -+ -+ default: -+ increment = wcwidth (wc); -+ increment = (increment < 0) ? 0 : increment; -+ } -+ } -+ } -+ -+ if (column + increment > width && break_spaces && last_blank_pos) -+ { -+ fwrite (line_out, sizeof(char), last_blank_pos, stdout); -+ putchar ('\n'); -+ -+ offset_out = offset_out - last_blank_pos; -+ column = column - last_blank_column + ((is_cr_after_last_blank) -+ ? last_blank_increment : bs_following_last_blank_num); -+ memmove (line_out, line_out + last_blank_pos, offset_out); -+ CLEAR_FLAGS; -+ goto rescan; -+ } -+ -+ if (column + increment > width && column != 0) -+ { -+ fwrite (line_out, sizeof(char), offset_out, stdout); -+ START_NEW_LINE; -+ goto rescan; -+ } -+ -+ if (allocated_out < offset_out + mblength) -+ { -+ line_out = X2REALLOC (line_out, &allocated_out); -+ } -+ -+ memcpy (line_out + offset_out, bufpos, mblength); -+ offset_out += mblength; -+ column += increment; -+ -+ if (is_blank_seen && !convfail && wc == L'\r') -+ is_cr_after_last_blank = 1; -+ -+ if (is_bs_following_last_blank && !convfail && wc == L'\b') -+ ++bs_following_last_blank_num; -+ else -+ is_bs_following_last_blank = 0; -+ -+ if (break_spaces && !convfail && iswblank (wc)) -+ { -+ last_blank_pos = offset_out; -+ last_blank_column = column; -+ is_blank_seen = 1; -+ last_blank_increment = increment; -+ is_bs_following_last_blank = 1; -+ bs_following_last_blank_num = 0; -+ is_cr_after_last_blank = 0; -+ } -+ } -+ -+ *saved_errno = errno; -+ -+ if (offset_out) -+ fwrite (line_out, sizeof (char), (size_t) offset_out, stdout); -+ -+} -+#endif -+ -+/* Fold file FILENAME, or standard input if FILENAME is "-", -+ to stdout, with maximum line length WIDTH. -+ Return 0 if successful, 1 if an error occurs. */ -+ -+static bool -+fold_file (char *filename, size_t width) -+{ -+ FILE *istream; -+ int saved_errno; -+ -+ if (STREQ (filename, "-")) -+ { -+ istream = stdin; -+ have_read_stdin = 1; -+ } -+ else -+ istream = fopen (filename, "r"); -+ -+ if (istream == NULL) -+ { -+ error (0, errno, "%s", filename); -+ return 1; -+ } -+ -+ /* Define how ISTREAM is being folded. */ -+#if HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1) -+ fold_multibyte_text (istream, width, &saved_errno); -+ else -+#endif -+ fold_text (istream, width, &saved_errno); -+ - if (ferror (istream)) - { - error (0, saved_errno, "%s", filename); -@@ -251,7 +499,8 @@ main (int argc, char **argv) - - atexit (close_stdout); - -- break_spaces = count_bytes = have_read_stdin = false; -+ operating_mode = column_mode; -+ break_spaces = have_read_stdin = false; - - while ((optc = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1) - { -@@ -260,7 +509,15 @@ main (int argc, char **argv) - switch (optc) - { - case 'b': /* Count bytes rather than columns. */ -- count_bytes = true; -+ if (operating_mode != column_mode) -+ FATAL_ERROR (_("only one way of folding may be specified")); -+ operating_mode = byte_mode; -+ break; -+ -+ case 'c': -+ if (operating_mode != column_mode) -+ FATAL_ERROR (_("only one way of folding may be specified")); -+ operating_mode = character_mode; - break; - - case 's': /* Break at word boundaries. */ -diff -urNp coreutils-8.0-orig/src/join.c coreutils-8.0/src/join.c ---- coreutils-8.0-orig/src/join.c 2009-09-23 10:25:44.000000000 +0200 -+++ coreutils-8.0/src/join.c 2009-10-07 10:07:16.000000000 +0200 -@@ -22,17 +22,31 @@ - #include <sys/types.h> - #include <getopt.h> - -+/* Get mbstate_t, mbrtowc(), mbrtowc(), wcwidth(). */ -+#if HAVE_WCHAR_H -+# include <wchar.h> -+#endif -+ -+/* Get iswblank(), towupper. */ -+#if HAVE_WCTYPE_H -+# include <wctype.h> -+#endif -+ - #include "system.h" - #include "error.h" - #include "hard-locale.h" - #include "linebuffer.h" --#include "memcasecmp.h" - #include "quote.h" - #include "stdio--.h" - #include "xmemcoll.h" - #include "xstrtol.h" - #include "argmatch.h" - -+/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ -+#if HAVE_MBRTOWC && defined mbstate_t -+# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) -+#endif -+ - /* The official name of this program (e.g., no `g' prefix). */ - #define PROGRAM_NAME "join" - -@@ -121,10 +135,12 @@ static struct outlist outlist_head; - /* Last element in `outlist', where a new element can be added. */ - static struct outlist *outlist_end = &outlist_head; - --/* Tab character separating fields. If negative, fields are separated -- by any nonempty string of blanks, otherwise by exactly one -- tab character whose value (when cast to unsigned char) equals TAB. */ --static int tab = -1; -+/* Tab character separating fields. If NULL, fields are separated -+ by any nonempty string of blanks. */ -+static char *tab = NULL; -+ -+/* The number of bytes used for tab. */ -+static size_t tablen = 0; - - /* If nonzero, check that the input is correctly ordered. */ - static enum -@@ -239,10 +255,11 @@ xfields (struct line *line) - if (ptr == lim) - return; - -- if (0 <= tab) -+ if (tab != NULL) - { -+ unsigned char t = tab[0]; - char *sep; -- for (; (sep = memchr (ptr, tab, lim - ptr)) != NULL; ptr = sep + 1) -+ for (; (sep = memchr (ptr, t, lim - ptr)) != NULL; ptr = sep + 1) - extract_field (line, ptr, sep - ptr); - } - else -@@ -269,6 +286,148 @@ xfields (struct line *line) - extract_field (line, ptr, lim - ptr); - } - -+#if HAVE_MBRTOWC -+static void -+xfields_multibyte (struct line *line) -+{ -+ char *ptr = line->buf.buffer; -+ char const *lim = ptr + line->buf.length - 1; -+ wchar_t wc = 0; -+ size_t mblength = 1; -+ mbstate_t state, state_bak; -+ -+ memset (&state, 0, sizeof (mbstate_t)); -+ -+ if (ptr >= lim) -+ return; -+ -+ if (tab != NULL) -+ { -+ unsigned char t = tab[0]; -+ char *sep = ptr; -+ for (; ptr < lim; ptr = sep + mblength) -+ { -+ sep = ptr; -+ while (sep < lim) -+ { -+ state_bak = state; -+ mblength = mbrtowc (&wc, sep, lim - sep + 1, &state); -+ -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) -+ { -+ mblength = 1; -+ state = state_bak; -+ } -+ mblength = (mblength < 1) ? 1 : mblength; -+ -+ if (mblength == tablen && !memcmp (sep, tab, mblength)) -+ break; -+ else -+ { -+ sep += mblength; -+ continue; -+ } -+ } -+ -+ if (sep >= lim) -+ break; -+ -+ extract_field (line, ptr, sep - ptr); -+ } -+ } -+ else -+ { -+ /* Skip leading blanks before the first field. */ -+ while(ptr < lim) -+ { -+ state_bak = state; -+ mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state); -+ -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) -+ { -+ mblength = 1; -+ state = state_bak; -+ break; -+ } -+ mblength = (mblength < 1) ? 1 : mblength; -+ -+ if (!iswblank(wc)) -+ break; -+ ptr += mblength; -+ } -+ -+ do -+ { -+ char *sep; -+ state_bak = state; -+ mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state); -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) -+ { -+ mblength = 1; -+ state = state_bak; -+ break; -+ } -+ mblength = (mblength < 1) ? 1 : mblength; -+ -+ sep = ptr + mblength; -+ while (sep < lim) -+ { -+ state_bak = state; -+ mblength = mbrtowc (&wc, sep, lim - sep + 1, &state); -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) -+ { -+ mblength = 1; -+ state = state_bak; -+ break; -+ } -+ mblength = (mblength < 1) ? 1 : mblength; -+ -+ if (iswblank (wc)) -+ break; -+ -+ sep += mblength; -+ } -+ -+ extract_field (line, ptr, sep - ptr); -+ if (sep >= lim) -+ return; -+ -+ state_bak = state; -+ mblength = mbrtowc (&wc, sep, lim - sep + 1, &state); -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) -+ { -+ mblength = 1; -+ state = state_bak; -+ break; -+ } -+ mblength = (mblength < 1) ? 1 : mblength; -+ -+ ptr = sep + mblength; -+ while (ptr < lim) -+ { -+ state_bak = state; -+ mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state); -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) -+ { -+ mblength = 1; -+ state = state_bak; -+ break; -+ } -+ mblength = (mblength < 1) ? 1 : mblength; -+ -+ if (!iswblank (wc)) -+ break; -+ -+ ptr += mblength; -+ } -+ } -+ while (ptr < lim); -+ } -+ -+ extract_field (line, ptr, lim - ptr); -+} -+#endif -+ - static void - freeline (struct line *line) - { -@@ -287,56 +446,115 @@ keycmp (struct line const *line1, struct - size_t jf_1, size_t jf_2) - { - /* Start of field to compare in each file. */ -- char *beg1; -- char *beg2; -- -- size_t len1; -- size_t len2; /* Length of fields to compare. */ -+ char *beg[2]; -+ char *copy[2]; -+ size_t len[2]; /* Length of fields to compare. */ - int diff; -+ int i, j; - - if (jf_1 < line1->nfields) - { -- beg1 = line1->fields[jf_1].beg; -- len1 = line1->fields[jf_1].len; -+ beg[0] = line1->fields[jf_1].beg; -+ len[0] = line1->fields[jf_1].len; - } - else - { -- beg1 = NULL; -- len1 = 0; -+ beg[0] = NULL; -+ len[0] = 0; - } - - if (jf_2 < line2->nfields) - { -- beg2 = line2->fields[jf_2].beg; -- len2 = line2->fields[jf_2].len; -+ beg[1] = line2->fields[jf_2].beg; -+ len[1] = line2->fields[jf_2].len; - } - else - { -- beg2 = NULL; -- len2 = 0; -+ beg[1] = NULL; -+ len[1] = 0; - } - -- if (len1 == 0) -- return len2 == 0 ? 0 : -1; -- if (len2 == 0) -+ if (len[0] == 0) -+ return len[1] == 0 ? 0 : -1; -+ if (len[1] == 0) - return 1; - - if (ignore_case) - { -- /* FIXME: ignore_case does not work with NLS (in particular, -- with multibyte chars). */ -- diff = memcasecmp (beg1, beg2, MIN (len1, len2)); -+#ifdef HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1) -+ { -+ size_t mblength; -+ wchar_t wc, uwc; -+ mbstate_t state, state_bak; -+ -+ memset (&state, '\0', sizeof (mbstate_t)); -+ -+ for (i = 0; i < 2; i++) -+ { -+ copy[i] = alloca (len[i] + 1); -+ -+ for (j = 0; j < MIN (len[0], len[1]);) -+ { -+ state_bak = state; -+ mblength = mbrtowc (&wc, beg[i] + j, len[i] - j, &state); -+ -+ switch (mblength) -+ { -+ case (size_t) -1: -+ case (size_t) -2: -+ state = state_bak; -+ /* Fall through */ -+ case 0: -+ mblength = 1; -+ break; -+ -+ default: -+ uwc = towupper (wc); -+ -+ if (uwc != wc) -+ { -+ mbstate_t state_wc; -+ -+ memset (&state_wc, '\0', sizeof (mbstate_t)); -+ wcrtomb (copy[i] + j, uwc, &state_wc); -+ } -+ else -+ memcpy (copy[i] + j, beg[i] + j, mblength); -+ } -+ j += mblength; -+ } -+ copy[i][j] = '\0'; -+ } -+ } -+ else -+#endif -+ { -+ for (i = 0; i < 2; i++) -+ { -+ copy[i] = alloca (len[i] + 1); -+ -+ for (j = 0; j < MIN (len[0], len[1]); j++) -+ copy[i][j] = toupper (beg[i][j]); -+ -+ copy[i][j] = '\0'; -+ } -+ } - } - else - { -- if (hard_LC_COLLATE) -- return xmemcoll (beg1, len1, beg2, len2); -- diff = memcmp (beg1, beg2, MIN (len1, len2)); -+ copy[0] = (unsigned char *) beg[0]; -+ copy[1] = (unsigned char *) beg[1]; - } - -+ if (hard_LC_COLLATE) -+ return xmemcoll ((char *) copy[0], len[0], (char *) copy[1], len[1]); -+ diff = memcmp (copy[0], copy[1], MIN (len[0], len[1])); -+ -+ - if (diff) - return diff; -- return len1 < len2 ? -1 : len1 != len2; -+ return len[0] - len[1]; - } - - /* Check that successive input lines PREV and CURRENT from input file -@@ -417,6 +635,11 @@ get_line (FILE *fp, struct line **linep, - return false; - } - -+#if HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1) -+ xfields_multibyte (line); -+ else -+#endif - xfields (line); - - if (prevline[which - 1]) -@@ -518,11 +741,18 @@ prfield (size_t n, struct line const *li - - /* Print the join of LINE1 and LINE2. */ - -+#define PUT_TAB_CHAR \ -+ do \ -+ { \ -+ (tab != NULL) ? \ -+ fwrite(tab, sizeof(char), tablen, stdout) : putchar (' '); \ -+ } \ -+ while (0) -+ - static void - prjoin (struct line const *line1, struct line const *line2) - { - const struct outlist *outlist; -- char output_separator = tab < 0 ? ' ' : tab; - - outlist = outlist_head.next; - if (outlist) -@@ -557,7 +787,7 @@ prjoin (struct line const *line1, struct - o = o->next; - if (o == NULL) - break; -- putchar (output_separator); -+ PUT_TAB_CHAR; - } - putchar ('\n'); - } -@@ -575,23 +805,23 @@ prjoin (struct line const *line1, struct - prfield (join_field_1, line1); - for (i = 0; i < join_field_1 && i < line1->nfields; ++i) - { -- putchar (output_separator); -+ PUT_TAB_CHAR; - prfield (i, line1); - } - for (i = join_field_1 + 1; i < line1->nfields; ++i) - { -- putchar (output_separator); -+ PUT_TAB_CHAR; - prfield (i, line1); - } - - for (i = 0; i < join_field_2 && i < line2->nfields; ++i) - { -- putchar (output_separator); -+ PUT_TAB_CHAR; - prfield (i, line2); - } - for (i = join_field_2 + 1; i < line2->nfields; ++i) - { -- putchar (output_separator); -+ PUT_TAB_CHAR; - prfield (i, line2); - } - putchar ('\n'); -@@ -1022,20 +1252,41 @@ main (int argc, char **argv) - - case 't': - { -- unsigned char newtab = optarg[0]; -- if (! newtab) -+ char *newtab; -+ size_t newtablen; -+ if (! optarg[0]) - error (EXIT_FAILURE, 0, _("empty tab")); -- if (optarg[1]) -+ newtab = xstrdup (optarg); -+#if HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1) -+ { -+ mbstate_t state; -+ -+ memset (&state, 0, sizeof (mbstate_t)); -+ newtablen = mbrtowc (NULL, newtab, -+ strnlen (newtab, MB_LEN_MAX), -+ &state); -+ if (newtablen == (size_t) 0 -+ || newtablen == (size_t) -1 -+ || newtablen == (size_t) -2) -+ newtablen = 1; -+ } -+ else -+#endif -+ newtablen = 1; -+ -+ if (newtablen == 1 && newtab[1]) -+ { -+ if (STREQ (newtab, "\\0")) -+ newtab[0] = '\0'; -+ } -+ if (tab != NULL && strcmp (tab, newtab)) - { -- if (STREQ (optarg, "\\0")) -- newtab = '\0'; -- else -- error (EXIT_FAILURE, 0, _("multi-character tab %s"), -- quote (optarg)); -+ free (newtab); -+ error (EXIT_FAILURE, 0, _("incompatible tabs")); - } -- if (0 <= tab && tab != newtab) -- error (EXIT_FAILURE, 0, _("incompatible tabs")); - tab = newtab; -+ tablen = newtablen; - } - break; - -diff -urNp coreutils-8.0-orig/src/pr.c coreutils-8.0/src/pr.c ---- coreutils-8.0-orig/src/pr.c 2009-09-29 15:27:54.000000000 +0200 -+++ coreutils-8.0/src/pr.c 2009-10-07 10:07:16.000000000 +0200 -@@ -312,6 +312,32 @@ - - #include <getopt.h> - #include <sys/types.h> -+ -+/* Get MB_LEN_MAX. */ -+#include <limits.h> -+/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC -+ installation; work around this configuration error. */ -+#if !defined MB_LEN_MAX || MB_LEN_MAX == 1 -+# define MB_LEN_MAX 16 -+#endif -+ -+/* Get MB_CUR_MAX. */ -+#include <stdlib.h> -+ -+/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */ -+/* Get mbstate_t, mbrtowc(), wcwidth(). */ -+#if HAVE_WCHAR_H -+# include <wchar.h> -+#endif -+ -+/* Get iswprint(). -- for wcwidth(). */ -+#if HAVE_WCTYPE_H -+# include <wctype.h> -+#endif -+#if !defined iswprint && !HAVE_ISWPRINT -+# define iswprint(wc) 1 -+#endif -+ - #include "system.h" - #include "error.h" - #include "hard-locale.h" -@@ -322,6 +348,18 @@ - #include "strftime.h" - #include "xstrtol.h" - -+/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ -+#if HAVE_MBRTOWC && defined mbstate_t -+# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) -+#endif -+ -+#ifndef HAVE_DECL_WCWIDTH -+"this configure-time declaration test was not run" -+#endif -+#if !HAVE_DECL_WCWIDTH -+extern int wcwidth (); -+#endif -+ - /* The official name of this program (e.g., no `g' prefix). */ - #define PROGRAM_NAME "pr" - -@@ -414,7 +452,20 @@ struct COLUMN - - typedef struct COLUMN COLUMN; - --static int char_to_clump (char c); -+/* Funtion pointers to switch functions for single byte locale or for -+ multibyte locale. If multibyte functions do not exist in your sysytem, -+ these pointers always point the function for single byte locale. */ -+static void (*print_char) (char c); -+static int (*char_to_clump) (char c); -+ -+/* Functions for single byte locale. */ -+static void print_char_single (char c); -+static int char_to_clump_single (char c); -+ -+/* Functions for multibyte locale. */ -+static void print_char_multi (char c); -+static int char_to_clump_multi (char c); -+ - static bool read_line (COLUMN *p); - static bool print_page (void); - static bool print_stored (COLUMN *p); -@@ -424,6 +475,7 @@ static void print_header (void); - static void pad_across_to (int position); - static void add_line_number (COLUMN *p); - static void getoptarg (char *arg, char switch_char, char *character, -+ int *character_length, int *character_width, - int *number); - void usage (int status); - static void print_files (int number_of_files, char **av); -@@ -438,7 +490,6 @@ static void store_char (char c); - static void pad_down (int lines); - static void read_rest_of_line (COLUMN *p); - static void skip_read (COLUMN *p, int column_number); --static void print_char (char c); - static void cleanup (void); - static void print_sep_string (void); - static void separator_string (const char *optarg_S); -@@ -450,7 +501,7 @@ static COLUMN *column_vector; - we store the leftmost columns contiguously in buff. - To print a line from buff, get the index of the first character - from line_vector[i], and print up to line_vector[i + 1]. */ --static char *buff; -+static unsigned char *buff; - - /* Index of the position in buff where the next character - will be stored. */ -@@ -554,7 +605,7 @@ static int chars_per_column; - static bool untabify_input = false; - - /* (-e) The input tab character. */ --static char input_tab_char = '\t'; -+static char input_tab_char[MB_LEN_MAX] = "\t"; - - /* (-e) Tabstops are at chars_per_tab, 2*chars_per_tab, 3*chars_per_tab, ... - where the leftmost column is 1. */ -@@ -564,7 +615,10 @@ static int chars_per_input_tab = 8; - static bool tabify_output = false; - - /* (-i) The output tab character. */ --static char output_tab_char = '\t'; -+static char output_tab_char[MB_LEN_MAX] = "\t"; -+ -+/* (-i) The byte length of output tab character. */ -+static int output_tab_char_length = 1; - - /* (-i) The width of the output tab. */ - static int chars_per_output_tab = 8; -@@ -638,7 +692,13 @@ static int power_10; - static bool numbered_lines = false; - - /* (-n) Character which follows each line number. */ --static char number_separator = '\t'; -+static char number_separator[MB_LEN_MAX] = "\t"; -+ -+/* (-n) The byte length of the character which follows each line number. */ -+static int number_separator_length = 1; -+ -+/* (-n) The character width of the character which follows each line number. */ -+static int number_separator_width = 0; - - /* (-n) line counting starts with 1st line of input file (not with 1st - line of 1st page printed). */ -@@ -691,6 +751,7 @@ static bool use_col_separator = false; - -a|COLUMN|-m is a `space' and with the -J option a `tab'. */ - static char *col_sep_string = (char *) ""; - static int col_sep_length = 0; -+static int col_sep_width = 0; - static char *column_separator = (char *) " "; - static char *line_separator = (char *) "\t"; - -@@ -847,6 +908,13 @@ separator_string (const char *optarg_S) - col_sep_length = (int) strlen (optarg_S); - col_sep_string = xmalloc (col_sep_length + 1); - strcpy (col_sep_string, optarg_S); -+ -+#if HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1) -+ col_sep_width = mbswidth (col_sep_string, 0); -+ else -+#endif -+ col_sep_width = col_sep_length; - } - - int -@@ -871,6 +939,21 @@ main (int argc, char **argv) - - atexit (close_stdout); - -+/* Define which functions are used, the ones for single byte locale or the ones -+ for multibyte locale. */ -+#if HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1) -+ { -+ print_char = print_char_multi; -+ char_to_clump = char_to_clump_multi; -+ } -+ else -+#endif -+ { -+ print_char = print_char_single; -+ char_to_clump = char_to_clump_single; -+ } -+ - n_files = 0; - file_names = (argc > 1 - ? xmalloc ((argc - 1) * sizeof (char *)) -@@ -947,8 +1030,12 @@ main (int argc, char **argv) - break; - case 'e': - if (optarg) -- getoptarg (optarg, 'e', &input_tab_char, -- &chars_per_input_tab); -+ { -+ int dummy_length, dummy_width; -+ -+ getoptarg (optarg, 'e', input_tab_char, &dummy_length, -+ &dummy_width, &chars_per_input_tab); -+ } - /* Could check tab width > 0. */ - untabify_input = true; - break; -@@ -961,8 +1048,12 @@ main (int argc, char **argv) - break; - case 'i': - if (optarg) -- getoptarg (optarg, 'i', &output_tab_char, -- &chars_per_output_tab); -+ { -+ int dummy_width; -+ -+ getoptarg (optarg, 'i', output_tab_char, &output_tab_char_length, -+ &dummy_width, &chars_per_output_tab); -+ } - /* Could check tab width > 0. */ - tabify_output = true; - break; -@@ -989,8 +1080,8 @@ main (int argc, char **argv) - case 'n': - numbered_lines = true; - if (optarg) -- getoptarg (optarg, 'n', &number_separator, -- &chars_per_number); -+ getoptarg (optarg, 'n', number_separator, &number_separator_length, -+ &number_separator_width, &chars_per_number); - break; - case 'N': - skip_count = false; -@@ -1029,7 +1120,7 @@ main (int argc, char **argv) - old_s = false; - /* Reset an additional input of -s, -S dominates -s */ - col_sep_string = bad_cast (""); -- col_sep_length = 0; -+ col_sep_length = col_sep_width = 0; - use_col_separator = true; - if (optarg) - separator_string (optarg); -@@ -1186,10 +1277,45 @@ main (int argc, char **argv) - a number. */ - - static void --getoptarg (char *arg, char switch_char, char *character, int *number) -+getoptarg (char *arg, char switch_char, char *character, int *character_length, -+ int *character_width, int *number) - { - if (!ISDIGIT (*arg)) -- *character = *arg++; -+ { -+#ifdef HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1) /* for multibyte locale. */ -+ { -+ wchar_t wc; -+ size_t mblength; -+ int width; -+ mbstate_t state = {'\0'}; -+ -+ mblength = mbrtowc (&wc, arg, strnlen(arg, MB_LEN_MAX), &state); -+ -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) -+ { -+ *character_length = 1; -+ *character_width = 1; -+ } -+ else -+ { -+ *character_length = (mblength < 1) ? 1 : mblength; -+ width = wcwidth (wc); -+ *character_width = (width < 0) ? 0 : width; -+ } -+ -+ strncpy (character, arg, *character_length); -+ arg += *character_length; -+ } -+ else /* for single byte locale. */ -+#endif -+ { -+ *character = *arg++; -+ *character_length = 1; -+ *character_width = 1; -+ } -+ } -+ - if (*arg) - { - long int tmp_long; -@@ -1248,7 +1374,7 @@ init_parameters (int number_of_files) - else - col_sep_string = column_separator; - -- col_sep_length = 1; -+ col_sep_length = col_sep_width = 1; - use_col_separator = true; - } - /* It's rather pointless to define a TAB separator with column -@@ -1279,11 +1405,11 @@ init_parameters (int number_of_files) - TAB_WIDTH (chars_per_input_tab, chars_per_number); */ - - /* Estimate chars_per_text without any margin and keep it constant. */ -- if (number_separator == '\t') -+ if (number_separator[0] == '\t') - number_width = chars_per_number + - TAB_WIDTH (chars_per_default_tab, chars_per_number); - else -- number_width = chars_per_number + 1; -+ number_width = chars_per_number + number_separator_width; - - /* The number is part of the column width unless we are - printing files in parallel. */ -@@ -1298,7 +1424,7 @@ init_parameters (int number_of_files) - } - - chars_per_column = (chars_per_line - chars_used_by_number - -- (columns - 1) * col_sep_length) / columns; -+ (columns - 1) * col_sep_width) / columns; - - if (chars_per_column < 1) - error (EXIT_FAILURE, 0, _("page width too narrow")); -@@ -1423,7 +1549,7 @@ init_funcs (void) - - /* Enlarge p->start_position of first column to use the same form of - padding_not_printed with all columns. */ -- h = h + col_sep_length; -+ h = h + col_sep_width; - - /* This loop takes care of all but the rightmost column. */ - -@@ -1457,7 +1583,7 @@ init_funcs (void) - } - else - { -- h = h_next + col_sep_length; -+ h = h_next + col_sep_width; - h_next = h + chars_per_column; - } - } -@@ -1747,9 +1873,9 @@ static void - align_column (COLUMN *p) - { - padding_not_printed = p->start_position; -- if (padding_not_printed - col_sep_length > 0) -+ if (padding_not_printed - col_sep_width > 0) - { -- pad_across_to (padding_not_printed - col_sep_length); -+ pad_across_to (padding_not_printed - col_sep_width); - padding_not_printed = ANYWHERE; - } - -@@ -2020,13 +2146,13 @@ store_char (char c) - /* May be too generous. */ - buff = X2REALLOC (buff, &buff_allocated); - } -- buff[buff_current++] = c; -+ buff[buff_current++] = (unsigned char) c; - } - - static void - add_line_number (COLUMN *p) - { -- int i; -+ int i, j; - char *s; - int left_cut; - -@@ -2049,22 +2175,24 @@ add_line_number (COLUMN *p) - /* Tabification is assumed for multiple columns, also for n-separators, - but `default n-separator = TAB' hasn't been given priority over - equal column_width also specified by POSIX. */ -- if (number_separator == '\t') -+ if (number_separator[0] == '\t') - { - i = number_width - chars_per_number; - while (i-- > 0) - (p->char_func) (' '); - } - else -- (p->char_func) (number_separator); -+ for (j = 0; j < number_separator_length; j++) -+ (p->char_func) (number_separator[j]); - } - else - /* To comply with POSIX, we avoid any expansion of default TAB - separator with a single column output. No column_width requirement - has to be considered. */ - { -- (p->char_func) (number_separator); -- if (number_separator == '\t') -+ for (j = 0; j < number_separator_length; j++) -+ (p->char_func) (number_separator[j]); -+ if (number_separator[0] == '\t') - output_position = POS_AFTER_TAB (chars_per_output_tab, - output_position); - } -@@ -2225,7 +2353,7 @@ print_white_space (void) - while (goal - h_old > 1 - && (h_new = POS_AFTER_TAB (chars_per_output_tab, h_old)) <= goal) - { -- putchar (output_tab_char); -+ fwrite (output_tab_char, sizeof(char), output_tab_char_length, stdout); - h_old = h_new; - } - while (++h_old <= goal) -@@ -2245,6 +2373,7 @@ print_sep_string (void) - { - char *s; - int l = col_sep_length; -+ int not_space_flag; - - s = col_sep_string; - -@@ -2258,6 +2387,7 @@ print_sep_string (void) - { - for (; separators_not_printed > 0; --separators_not_printed) - { -+ not_space_flag = 0; - while (l-- > 0) - { - /* 3 types of sep_strings: spaces only, spaces and chars, -@@ -2271,12 +2401,15 @@ print_sep_string (void) - } - else - { -+ not_space_flag = 1; - if (spaces_not_printed > 0) - print_white_space (); - putchar (*s++); -- ++output_position; - } - } -+ if (not_space_flag) -+ output_position += col_sep_width; -+ - /* sep_string ends with some spaces */ - if (spaces_not_printed > 0) - print_white_space (); -@@ -2304,7 +2437,7 @@ print_clump (COLUMN *p, int n, char *clu - required number of tabs and spaces. */ - - static void --print_char (char c) -+print_char_single (char c) - { - if (tabify_output) - { -@@ -2328,6 +2461,74 @@ print_char (char c) - putchar (c); - } - -+#ifdef HAVE_MBRTOWC -+static void -+print_char_multi (char c) -+{ -+ static size_t mbc_pos = 0; -+ static char mbc[MB_LEN_MAX] = {'\0'}; -+ static mbstate_t state = {'\0'}; -+ mbstate_t state_bak; -+ wchar_t wc; -+ size_t mblength; -+ int width; -+ -+ if (tabify_output) -+ { -+ state_bak = state; -+ mbc[mbc_pos++] = c; -+ mblength = mbrtowc (&wc, mbc, mbc_pos, &state); -+ -+ while (mbc_pos > 0) -+ { -+ switch (mblength) -+ { -+ case (size_t)-2: -+ state = state_bak; -+ return; -+ -+ case (size_t)-1: -+ state = state_bak; -+ ++output_position; -+ putchar (mbc[0]); -+ memmove (mbc, mbc + 1, MB_CUR_MAX - 1); -+ --mbc_pos; -+ break; -+ -+ case 0: -+ mblength = 1; -+ -+ default: -+ if (wc == L' ') -+ { -+ memmove (mbc, mbc + mblength, MB_CUR_MAX - mblength); -+ --mbc_pos; -+ ++spaces_not_printed; -+ return; -+ } -+ else if (spaces_not_printed > 0) -+ print_white_space (); -+ -+ /* Nonprintables are assumed to have width 0, except L'\b'. */ -+ if ((width = wcwidth (wc)) < 1) -+ { -+ if (wc == L'\b') -+ --output_position; -+ } -+ else -+ output_position += width; -+ -+ fwrite (mbc, sizeof(char), mblength, stdout); -+ memmove (mbc, mbc + mblength, MB_CUR_MAX - mblength); -+ mbc_pos -= mblength; -+ } -+ } -+ return; -+ } -+ putchar (c); -+} -+#endif -+ - /* Skip to page PAGE before printing. - PAGE may be larger than total number of pages. */ - -@@ -2507,9 +2708,9 @@ read_line (COLUMN *p) - align_empty_cols = false; - } - -- if (padding_not_printed - col_sep_length > 0) -+ if (padding_not_printed - col_sep_width > 0) - { -- pad_across_to (padding_not_printed - col_sep_length); -+ pad_across_to (padding_not_printed - col_sep_width); - padding_not_printed = ANYWHERE; - } - -@@ -2610,9 +2811,9 @@ print_stored (COLUMN *p) - } - } - -- if (padding_not_printed - col_sep_length > 0) -+ if (padding_not_printed - col_sep_width > 0) - { -- pad_across_to (padding_not_printed - col_sep_length); -+ pad_across_to (padding_not_printed - col_sep_width); - padding_not_printed = ANYWHERE; - } - -@@ -2625,8 +2826,8 @@ print_stored (COLUMN *p) - if (spaces_not_printed == 0) - { - output_position = p->start_position + end_vector[line]; -- if (p->start_position - col_sep_length == chars_per_margin) -- output_position -= col_sep_length; -+ if (p->start_position - col_sep_width == chars_per_margin) -+ output_position -= col_sep_width; - } - - return true; -@@ -2645,7 +2846,7 @@ print_stored (COLUMN *p) - number of characters is 1.) */ - - static int --char_to_clump (char c) -+char_to_clump_single (char c) - { - unsigned char uc = c; - char *s = clump_buff; -@@ -2655,10 +2856,10 @@ char_to_clump (char c) - int chars; - int chars_per_c = 8; - -- if (c == input_tab_char) -+ if (c == input_tab_char[0]) - chars_per_c = chars_per_input_tab; - -- if (c == input_tab_char || c == '\t') -+ if (c == input_tab_char[0] || c == '\t') - { - width = TAB_WIDTH (chars_per_c, input_position); - -@@ -2739,6 +2940,154 @@ char_to_clump (char c) - return chars; - } - -+#ifdef HAVE_MBRTOWC -+static int -+char_to_clump_multi (char c) -+{ -+ static size_t mbc_pos = 0; -+ static char mbc[MB_LEN_MAX] = {'\0'}; -+ static mbstate_t state = {'\0'}; -+ mbstate_t state_bak; -+ wchar_t wc; -+ size_t mblength; -+ int wc_width; -+ register char *s = clump_buff; -+ register int i, j; -+ char esc_buff[4]; -+ int width; -+ int chars; -+ int chars_per_c = 8; -+ -+ state_bak = state; -+ mbc[mbc_pos++] = c; -+ mblength = mbrtowc (&wc, mbc, mbc_pos, &state); -+ -+ width = 0; -+ chars = 0; -+ while (mbc_pos > 0) -+ { -+ switch (mblength) -+ { -+ case (size_t)-2: -+ state = state_bak; -+ return 0; -+ -+ case (size_t)-1: -+ state = state_bak; -+ mblength = 1; -+ -+ if (use_esc_sequence || use_cntrl_prefix) -+ { -+ width = +4; -+ chars = +4; -+ *s++ = '\\'; -+ sprintf (esc_buff, "%03o", mbc[0]); -+ for (i = 0; i <= 2; ++i) -+ *s++ = (int) esc_buff[i]; -+ } -+ else -+ { -+ width += 1; -+ chars += 1; -+ *s++ = mbc[0]; -+ } -+ break; -+ -+ case 0: -+ mblength = 1; -+ /* Fall through */ -+ -+ default: -+ if (memcmp (mbc, input_tab_char, mblength) == 0) -+ chars_per_c = chars_per_input_tab; -+ -+ if (memcmp (mbc, input_tab_char, mblength) == 0 || c == '\t') -+ { -+ int width_inc; -+ -+ width_inc = TAB_WIDTH (chars_per_c, input_position); -+ width += width_inc; -+ -+ if (untabify_input) -+ { -+ for (i = width_inc; i; --i) -+ *s++ = ' '; -+ chars += width_inc; -+ } -+ else -+ { -+ for (i = 0; i < mblength; i++) -+ *s++ = mbc[i]; -+ chars += mblength; -+ } -+ } -+ else if ((wc_width = wcwidth (wc)) < 1) -+ { -+ if (use_esc_sequence) -+ { -+ for (i = 0; i < mblength; i++) -+ { -+ width += 4; -+ chars += 4; -+ *s++ = '\\'; -+ sprintf (esc_buff, "%03o", c); -+ for (j = 0; j <= 2; ++j) -+ *s++ = (int) esc_buff[j]; -+ } -+ } -+ else if (use_cntrl_prefix) -+ { -+ if (wc < 0200) -+ { -+ width += 2; -+ chars += 2; -+ *s++ = '^'; -+ *s++ = wc ^ 0100; -+ } -+ else -+ { -+ for (i = 0; i < mblength; i++) -+ { -+ width += 4; -+ chars += 4; -+ *s++ = '\\'; -+ sprintf (esc_buff, "%03o", c); -+ for (j = 0; j <= 2; ++j) -+ *s++ = (int) esc_buff[j]; -+ } -+ } -+ } -+ else if (wc == L'\b') -+ { -+ width += -1; -+ chars += 1; -+ *s++ = c; -+ } -+ else -+ { -+ width += 0; -+ chars += mblength; -+ for (i = 0; i < mblength; i++) -+ *s++ = mbc[i]; -+ } -+ } -+ else -+ { -+ width += wc_width; -+ chars += mblength; -+ for (i = 0; i < mblength; i++) -+ *s++ = mbc[i]; -+ } -+ } -+ memmove (mbc, mbc + mblength, MB_CUR_MAX - mblength); -+ mbc_pos -= mblength; -+ } -+ -+ input_position += width; -+ return chars; -+} -+#endif -+ - /* We've just printed some files and need to clean up things before - looking for more options and printing the next batch of files. - -diff -urNp coreutils-8.0-orig/src/sort.c coreutils-8.0/src/sort.c ---- coreutils-8.0-orig/src/sort.c 2009-09-29 15:27:54.000000000 +0200 -+++ coreutils-8.0/src/sort.c 2009-10-07 10:07:16.000000000 +0200 -@@ -22,10 +22,19 @@ - - #include <config.h> - -+#include <assert.h> - #include <getopt.h> - #include <sys/types.h> - #include <sys/wait.h> - #include <signal.h> -+#if HAVE_WCHAR_H -+# include <wchar.h> -+#endif -+/* Get isw* functions. */ -+#if HAVE_WCTYPE_H -+# include <wctype.h> -+#endif -+ - #include "system.h" - #include "argmatch.h" - #include "error.h" -@@ -122,14 +131,38 @@ static int decimal_point; - /* Thousands separator; if -1, then there isn't one. */ - static int thousands_sep; - -+static int force_general_numcompare = 0; -+ - /* Nonzero if the corresponding locales are hard. */ - static bool hard_LC_COLLATE; --#if HAVE_NL_LANGINFO -+#if HAVE_LANGINFO_CODESET - static bool hard_LC_TIME; - #endif - - #define NONZERO(x) ((x) != 0) - -+/* get a multibyte character's byte length. */ -+#define GET_BYTELEN_OF_CHAR(LIM, PTR, MBLENGTH, STATE) \ -+ do \ -+ { \ -+ wchar_t wc; \ -+ mbstate_t state_bak; \ -+ \ -+ state_bak = STATE; \ -+ mblength = mbrtowc (&wc, PTR, LIM - PTR, &STATE); \ -+ \ -+ switch (MBLENGTH) \ -+ { \ -+ case (size_t)-1: \ -+ case (size_t)-2: \ -+ STATE = state_bak; \ -+ /* Fall through. */ \ -+ case 0: \ -+ MBLENGTH = 1; \ -+ } \ -+ } \ -+ while (0) -+ - /* The kind of blanks for '-b' to skip in various options. */ - enum blanktype { bl_start, bl_end, bl_both }; - -@@ -268,13 +301,11 @@ static bool reverse; - they were read if all keys compare equal. */ - static bool stable; - --/* If TAB has this value, blanks separate fields. */ --enum { TAB_DEFAULT = CHAR_MAX + 1 }; -- --/* Tab character separating fields. If TAB_DEFAULT, then fields are -+/* Tab character separating fields. If tab_length is 0, then fields are - separated by the empty string between a non-blank character and a blank - character. */ --static int tab = TAB_DEFAULT; -+static char tab[MB_LEN_MAX + 1]; -+static size_t tab_length = 0; - - /* Flag to remove consecutive duplicate lines from the output. - Only the last of a sequence of equal lines will be output. */ -@@ -712,6 +743,44 @@ reap_some (void) - update_proc (pid); - } - -+/* Function pointers. */ -+static void -+(*inittables) (void); -+static char * -+(*begfield) (const struct line*, const struct keyfield *); -+static char * -+(*limfield) (const struct line*, const struct keyfield *); -+static int -+(*getmonth) (char const *, size_t); -+static int -+(*keycompare) (const struct line *, const struct line *); -+static int -+(*numcompare) (const char *, const char *); -+ -+/* Test for white space multibyte character. -+ Set LENGTH the byte length of investigated multibyte character. */ -+#if HAVE_MBRTOWC -+static int -+ismbblank (const char *str, size_t len, size_t *length) -+{ -+ size_t mblength; -+ wchar_t wc; -+ mbstate_t state; -+ -+ memset (&state, '\0', sizeof(mbstate_t)); -+ mblength = mbrtowc (&wc, str, len, &state); -+ -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) -+ { -+ *length = 1; -+ return 0; -+ } -+ -+ *length = (mblength < 1) ? 1 : mblength; -+ return iswblank (wc); -+} -+#endif -+ - /* Clean up any remaining temporary files. */ - - static void -@@ -1093,7 +1162,7 @@ zaptemp (const char *name) - free (node); - } - --#if HAVE_NL_LANGINFO -+#if HAVE_LANGINFO_CODESET - - static int - struct_month_cmp (const void *m1, const void *m2) -@@ -1108,7 +1177,7 @@ struct_month_cmp (const void *m1, const - /* Initialize the character class tables. */ - - static void --inittables (void) -+inittables_uni (void) - { - size_t i; - -@@ -1120,7 +1189,7 @@ inittables (void) - fold_toupper[i] = toupper (i); - } - --#if HAVE_NL_LANGINFO -+#if HAVE_LANGINFO_CODESET - /* If we're not in the "C" locale, read different names for months. */ - if (hard_LC_TIME) - { -@@ -1202,6 +1271,64 @@ specify_nmerge (int oi, char c, char con - xstrtol_fatal (e, oi, c, long_options, s); - } - -+#if HAVE_MBRTOWC -+static void -+inittables_mb (void) -+{ -+ int i, j, k, l; -+ char *name, *s; -+ size_t s_len, mblength; -+ char mbc[MB_LEN_MAX]; -+ wchar_t wc, pwc; -+ mbstate_t state_mb, state_wc; -+ -+ for (i = 0; i < MONTHS_PER_YEAR; i++) -+ { -+ s = (char *) nl_langinfo (ABMON_1 + i); -+ s_len = strlen (s); -+ monthtab[i].name = name = (char *) xmalloc (s_len + 1); -+ monthtab[i].val = i + 1; -+ -+ memset (&state_mb, '\0', sizeof (mbstate_t)); -+ memset (&state_wc, '\0', sizeof (mbstate_t)); -+ -+ for (j = 0; j < s_len;) -+ { -+ if (!ismbblank (s + j, s_len - j, &mblength)) -+ break; -+ j += mblength; -+ } -+ -+ for (k = 0; j < s_len;) -+ { -+ mblength = mbrtowc (&wc, (s + j), (s_len - j), &state_mb); -+ assert (mblength != (size_t)-1 && mblength != (size_t)-2); -+ if (mblength == 0) -+ break; -+ -+ pwc = towupper (wc); -+ if (pwc == wc) -+ { -+ memcpy (mbc, s + j, mblength); -+ j += mblength; -+ } -+ else -+ { -+ j += mblength; -+ mblength = wcrtomb (mbc, pwc, &state_wc); -+ assert (mblength != (size_t)0 && mblength != (size_t)-1); -+ } -+ -+ for (l = 0; l < mblength; l++) -+ name[k++] = mbc[l]; -+ } -+ name[k] = '\0'; -+ } -+ qsort ((void *) monthtab, MONTHS_PER_YEAR, -+ sizeof (struct month), struct_month_cmp); -+} -+#endif -+ - /* Specify the amount of main memory to use when sorting. */ - static void - specify_sort_size (int oi, char c, char const *s) -@@ -1412,7 +1539,7 @@ buffer_linelim (struct buffer const *buf - by KEY in LINE. */ - - static char * --begfield (const struct line *line, const struct keyfield *key) -+begfield_uni (const struct line *line, const struct keyfield *key) - { - char *ptr = line->text, *lim = ptr + line->length - 1; - size_t sword = key->sword; -@@ -1421,10 +1548,10 @@ begfield (const struct line *line, const - /* The leading field separator itself is included in a field when -t - is absent. */ - -- if (tab != TAB_DEFAULT) -+ if (tab_length) - while (ptr < lim && sword--) - { -- while (ptr < lim && *ptr != tab) -+ while (ptr < lim && *ptr != tab[0]) - ++ptr; - if (ptr < lim) - ++ptr; -@@ -1450,11 +1577,70 @@ begfield (const struct line *line, const - return ptr; - } - -+#if HAVE_MBRTOWC -+static char * -+begfield_mb (const struct line *line, const struct keyfield *key) -+{ -+ int i; -+ char *ptr = line->text, *lim = ptr + line->length - 1; -+ size_t sword = key->sword; -+ size_t schar = key->schar; -+ size_t mblength; -+ mbstate_t state; -+ -+ memset (&state, '\0', sizeof(mbstate_t)); -+ -+ if (tab_length) -+ while (ptr < lim && sword--) -+ { -+ while (ptr < lim && memcmp (ptr, tab, tab_length) != 0) -+ { -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); -+ ptr += mblength; -+ } -+ if (ptr < lim) -+ { -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); -+ ptr += mblength; -+ } -+ } -+ else -+ while (ptr < lim && sword--) -+ { -+ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) -+ ptr += mblength; -+ if (ptr < lim) -+ { -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); -+ ptr += mblength; -+ } -+ while (ptr < lim && !ismbblank (ptr, lim - ptr, &mblength)) -+ ptr += mblength; -+ } -+ -+ if (key->skipsblanks) -+ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) -+ ptr += mblength; -+ -+ for (i = 0; i < schar; i++) -+ { -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); -+ -+ if (ptr + mblength > lim) -+ break; -+ else -+ ptr += mblength; -+ } -+ -+ return ptr; -+} -+#endif -+ - /* Return the limit of (a pointer to the first character after) the field - in LINE specified by KEY. */ - - static char * --limfield (const struct line *line, const struct keyfield *key) -+limfield_uni (const struct line *line, const struct keyfield *key) - { - char *ptr = line->text, *lim = ptr + line->length - 1; - size_t eword = key->eword, echar = key->echar; -@@ -1469,10 +1655,10 @@ limfield (const struct line *line, const - `beginning' is the first character following the delimiting TAB. - Otherwise, leave PTR pointing at the first `blank' character after - the preceding field. */ -- if (tab != TAB_DEFAULT) -+ if (tab_length) - while (ptr < lim && eword--) - { -- while (ptr < lim && *ptr != tab) -+ while (ptr < lim && *ptr != tab[0]) - ++ptr; - if (ptr < lim && (eword || echar)) - ++ptr; -@@ -1518,10 +1704,10 @@ limfield (const struct line *line, const - */ - - /* Make LIM point to the end of (one byte past) the current field. */ -- if (tab != TAB_DEFAULT) -+ if (tab_length) - { - char *newlim; -- newlim = memchr (ptr, tab, lim - ptr); -+ newlim = memchr (ptr, tab[0], lim - ptr); - if (newlim) - lim = newlim; - } -@@ -1552,6 +1738,113 @@ limfield (const struct line *line, const - return ptr; - } - -+#if HAVE_MBRTOWC -+static char * -+limfield_mb (const struct line *line, const struct keyfield *key) -+{ -+ char *ptr = line->text, *lim = ptr + line->length - 1; -+ size_t eword = key->eword, echar = key->echar; -+ int i; -+ size_t mblength; -+ mbstate_t state; -+ -+ if (echar == 0) -+ eword++; /* skip all of end field. */ -+ -+ memset (&state, '\0', sizeof(mbstate_t)); -+ -+ if (tab_length) -+ while (ptr < lim && eword--) -+ { -+ while (ptr < lim && memcmp (ptr, tab, tab_length) != 0) -+ { -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); -+ ptr += mblength; -+ } -+ if (ptr < lim && (eword | echar)) -+ { -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); -+ ptr += mblength; -+ } -+ } -+ else -+ while (ptr < lim && eword--) -+ { -+ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) -+ ptr += mblength; -+ if (ptr < lim) -+ { -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); -+ ptr += mblength; -+ } -+ while (ptr < lim && !ismbblank (ptr, lim - ptr, &mblength)) -+ ptr += mblength; -+ } -+ -+ -+# ifdef POSIX_UNSPECIFIED -+ /* Make LIM point to the end of (one byte past) the current field. */ -+ if (tab_length) -+ { -+ char *newlim, *p; -+ -+ newlim = NULL; -+ for (p = ptr; p < lim;) -+ { -+ if (memcmp (p, tab, tab_length) == 0) -+ { -+ newlim = p; -+ break; -+ } -+ -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); -+ p += mblength; -+ } -+ } -+ else -+ { -+ char *newlim; -+ newlim = ptr; -+ -+ while (newlim < lim && ismbblank (newlim, lim - newlim, &mblength)) -+ newlim += mblength; -+ if (ptr < lim) -+ { -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); -+ ptr += mblength; -+ } -+ while (newlim < lim && !ismbblank (newlim, lim - newlim, &mblength)) -+ newlim += mblength; -+ lim = newlim; -+ } -+# endif -+ -+ if (echar != 0) -+ { -+ /* If we're skipping leading blanks, don't start counting characters -+ * until after skipping past any leading blanks. */ -+ if (key->skipsblanks) -+ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) -+ ptr += mblength; -+ -+ memset (&state, '\0', sizeof(mbstate_t)); -+ -+ /* Advance PTR by ECHAR (if possible), but no further than LIM. */ -+ for (i = 0; i < echar; i++) -+ { -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); -+ -+ if (ptr + mblength > lim) -+ break; -+ else -+ ptr += mblength; -+ } -+ } -+ -+ return ptr; -+} -+#endif -+ - /* Fill BUF reading from FP, moving buf->left bytes from the end - of buf->buf to the beginning first. If EOF is reached and the - file wasn't terminated by a newline, supply one. Set up BUF's line -@@ -1634,8 +1927,24 @@ fillbuf (struct buffer *buf, FILE *fp, c - else - { - if (key->skipsblanks) -- while (blanks[to_uchar (*line_start)]) -- line_start++; -+ { -+#if HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1) -+ { -+ size_t mblength; -+ mbstate_t state; -+ memset (&state, '\0', sizeof(mbstate_t)); -+ while (line_start < line->keylim && -+ ismbblank (line_start, -+ line->keylim - line_start, -+ &mblength)) -+ line_start += mblength; -+ } -+ else -+#endif -+ while (blanks[to_uchar (*line_start)]) -+ line_start++; -+ } - line->keybeg = line_start; - } - } -@@ -1673,7 +1982,7 @@ fillbuf (struct buffer *buf, FILE *fp, c - hideously fast. */ - - static int --numcompare (const char *a, const char *b) -+numcompare_uni (const char *a, const char *b) - { - while (blanks[to_uchar (*a)]) - a++; -@@ -1782,6 +2091,25 @@ human_numcompare (const char *a, const c - : strnumcmp (a, b, decimal_point, thousands_sep)); - } - -+#if HAVE_MBRTOWC -+static int -+numcompare_mb (const char *a, const char *b) -+{ -+ size_t mblength, len; -+ len = strlen (a); /* okay for UTF-8 */ -+ while (*a && ismbblank (a, len > MB_CUR_MAX ? MB_CUR_MAX : len, &mblength)) -+ { -+ a += mblength; -+ len -= mblength; -+ } -+ len = strlen (b); /* okay for UTF-8 */ -+ while (*b && ismbblank (b, len > MB_CUR_MAX ? MB_CUR_MAX : len, &mblength)) -+ b += mblength; -+ -+ return strnumcmp (a, b, decimal_point, thousands_sep); -+} -+#endif /* HAV_EMBRTOWC */ -+ - static int - general_numcompare (const char *sa, const char *sb) - { -@@ -1815,7 +2143,7 @@ general_numcompare (const char *sa, cons - Return 0 if the name in S is not recognized. */ - - static int --getmonth (char const *month, size_t len) -+getmonth_uni (char const *month, size_t len) - { - size_t lo = 0; - size_t hi = MONTHS_PER_YEAR; -@@ -1996,11 +2324,79 @@ compare_version (char *restrict texta, s - return diff; - } - -+#if HAVE_MBRTOWC -+static int -+getmonth_mb (const char *s, size_t len) -+{ -+ char *month; -+ register size_t i; -+ register int lo = 0, hi = MONTHS_PER_YEAR, result; -+ char *tmp; -+ size_t wclength, mblength; -+ const char **pp; -+ const wchar_t **wpp; -+ wchar_t *month_wcs; -+ mbstate_t state; -+ -+ while (len > 0 && ismbblank (s, len, &mblength)) -+ { -+ s += mblength; -+ len -= mblength; -+ } -+ -+ if (len == 0) -+ return 0; -+ -+ month = (char *) alloca (len + 1); -+ -+ tmp = (char *) alloca (len + 1); -+ memcpy (tmp, s, len); -+ tmp[len] = '\0'; -+ pp = (const char **)&tmp; -+ month_wcs = (wchar_t *) alloca ((len + 1) * sizeof (wchar_t)); -+ memset (&state, '\0', sizeof(mbstate_t)); -+ -+ wclength = mbsrtowcs (month_wcs, pp, len + 1, &state); -+ assert (wclength != (size_t)-1 && *pp == NULL); -+ -+ for (i = 0; i < wclength; i++) -+ { -+ month_wcs[i] = towupper(month_wcs[i]); -+ if (iswblank (month_wcs[i])) -+ { -+ month_wcs[i] = L'\0'; -+ break; -+ } -+ } -+ -+ wpp = (const wchar_t **)&month_wcs; -+ -+ mblength = wcsrtombs (month, wpp, len + 1, &state); -+ assert (mblength != (-1) && *wpp == NULL); -+ -+ do -+ { -+ int ix = (lo + hi) / 2; -+ -+ if (strncmp (month, monthtab[ix].name, strlen (monthtab[ix].name)) < 0) -+ hi = ix; -+ else -+ lo = ix; -+ } -+ while (hi - lo > 1); -+ -+ result = (!strncmp (month, monthtab[lo].name, strlen (monthtab[lo].name)) -+ ? monthtab[lo].val : 0); -+ -+ return result; -+} -+#endif -+ - /* Compare two lines A and B trying every key in sequence until there - are no more keys or a difference is found. */ - - static int --keycompare (const struct line *a, const struct line *b) -+keycompare_uni (const struct line *a, const struct line *b) - { - struct keyfield *key = keylist; - -@@ -2180,6 +2576,179 @@ keycompare (const struct line *a, const - return key->reverse ? -diff : diff; - } - -+#if HAVE_MBRTOWC -+static int -+keycompare_mb (const struct line *a, const struct line *b) -+{ -+ struct keyfield *key = keylist; -+ -+ /* For the first iteration only, the key positions have been -+ precomputed for us. */ -+ char *texta = a->keybeg; -+ char *textb = b->keybeg; -+ char *lima = a->keylim; -+ char *limb = b->keylim; -+ -+ size_t mblength_a, mblength_b; -+ wchar_t wc_a, wc_b; -+ mbstate_t state_a, state_b; -+ -+ int diff; -+ -+ memset (&state_a, '\0', sizeof(mbstate_t)); -+ memset (&state_b, '\0', sizeof(mbstate_t)); -+ -+ for (;;) -+ { -+ char const *translate = key->translate; -+ bool const *ignore = key->ignore; -+ -+ /* Find the lengths. */ -+ size_t lena = lima <= texta ? 0 : lima - texta; -+ size_t lenb = limb <= textb ? 0 : limb - textb; -+ -+ /* Actually compare the fields. */ -+ if (key->random) -+ diff = compare_random (texta, lena, textb, lenb); -+ else if (key->numeric | key->general_numeric | key->human_numeric) -+ { -+ char savea = *lima, saveb = *limb; -+ -+ *lima = *limb = '\0'; -+ diff = (key->numeric ? numcompare (texta, textb) -+ : key->general_numeric ? general_numcompare (texta, textb) -+ : human_numcompare (texta, textb, key)); -+ *lima = savea, *limb = saveb; -+ } -+ else if (key->version) -+ diff = compare_version (texta, lena, textb, lenb); -+ else if (key->month) -+ diff = getmonth (texta, lena) - getmonth (textb, lenb); -+ else -+ { -+ if (ignore || translate) -+ { -+ char *copy_a = (char *) alloca (lena + 1 + lenb + 1); -+ char *copy_b = copy_a + lena + 1; -+ size_t new_len_a, new_len_b; -+ size_t i, j; -+ -+ /* Ignore and/or translate chars before comparing. */ -+# define IGNORE_CHARS(NEW_LEN, LEN, TEXT, COPY, WC, MBLENGTH, STATE) \ -+ do \ -+ { \ -+ wchar_t uwc; \ -+ char mbc[MB_LEN_MAX]; \ -+ mbstate_t state_wc; \ -+ \ -+ for (NEW_LEN = i = 0; i < LEN;) \ -+ { \ -+ mbstate_t state_bak; \ -+ \ -+ state_bak = STATE; \ -+ MBLENGTH = mbrtowc (&WC, TEXT + i, LEN - i, &STATE); \ -+ \ -+ if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1 \ -+ || MBLENGTH == 0) \ -+ { \ -+ if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1) \ -+ STATE = state_bak; \ -+ if (!ignore) \ -+ COPY[NEW_LEN++] = TEXT[i++]; \ -+ continue; \ -+ } \ -+ \ -+ if (ignore) \ -+ { \ -+ if ((ignore == nonprinting && !iswprint (WC)) \ -+ || (ignore == nondictionary \ -+ && !iswalnum (WC) && !iswblank (WC))) \ -+ { \ -+ i += MBLENGTH; \ -+ continue; \ -+ } \ -+ } \ -+ \ -+ if (translate) \ -+ { \ -+ \ -+ uwc = towupper(WC); \ -+ if (WC == uwc) \ -+ { \ -+ memcpy (mbc, TEXT + i, MBLENGTH); \ -+ i += MBLENGTH; \ -+ } \ -+ else \ -+ { \ -+ i += MBLENGTH; \ -+ WC = uwc; \ -+ memset (&state_wc, '\0', sizeof (mbstate_t)); \ -+ \ -+ MBLENGTH = wcrtomb (mbc, WC, &state_wc); \ -+ assert (MBLENGTH != (size_t)-1 && MBLENGTH != 0); \ -+ } \ -+ \ -+ for (j = 0; j < MBLENGTH; j++) \ -+ COPY[NEW_LEN++] = mbc[j]; \ -+ } \ -+ else \ -+ for (j = 0; j < MBLENGTH; j++) \ -+ COPY[NEW_LEN++] = TEXT[i++]; \ -+ } \ -+ COPY[NEW_LEN] = '\0'; \ -+ } \ -+ while (0) -+ IGNORE_CHARS (new_len_a, lena, texta, copy_a, -+ wc_a, mblength_a, state_a); -+ IGNORE_CHARS (new_len_b, lenb, textb, copy_b, -+ wc_b, mblength_b, state_b); -+ diff = xmemcoll (copy_a, new_len_a, copy_b, new_len_b); -+ } -+ else if (lena == 0) -+ diff = - NONZERO (lenb); -+ else if (lenb == 0) -+ goto greater; -+ else -+ diff = xmemcoll (texta, lena, textb, lenb); -+ } -+ -+ if (diff) -+ goto not_equal; -+ -+ key = key->next; -+ if (! key) -+ break; -+ -+ /* Find the beginning and limit of the next field. */ -+ if (key->eword != -1) -+ lima = limfield (a, key), limb = limfield (b, key); -+ else -+ lima = a->text + a->length - 1, limb = b->text + b->length - 1; -+ -+ if (key->sword != -1) -+ texta = begfield (a, key), textb = begfield (b, key); -+ else -+ { -+ texta = a->text, textb = b->text; -+ if (key->skipsblanks) -+ { -+ while (texta < lima && ismbblank (texta, lima - texta, &mblength_a)) -+ texta += mblength_a; -+ while (textb < limb && ismbblank (textb, limb - textb, &mblength_b)) -+ textb += mblength_b; -+ } -+ } -+ } -+ -+ return 0; -+ -+greater: -+ diff = 1; -+not_equal: -+ return key->reverse ? -diff : diff; -+} -+#endif -+ - /* Compare two lines A and B, returning negative, zero, or positive - depending on whether A compares less than, equal to, or greater than B. */ - -@@ -3178,7 +3747,7 @@ main (int argc, char **argv) - initialize_exit_failure (SORT_FAILURE); - - hard_LC_COLLATE = hard_locale (LC_COLLATE); --#if HAVE_NL_LANGINFO -+#if HAVE_LANGINFO_CODESET - hard_LC_TIME = hard_locale (LC_TIME); - #endif - -@@ -3199,6 +3768,27 @@ main (int argc, char **argv) - thousands_sep = -1; - } - -+#if HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1) -+ { -+ inittables = inittables_mb; -+ begfield = begfield_mb; -+ limfield = limfield_mb; -+ getmonth = getmonth_mb; -+ keycompare = keycompare_mb; -+ numcompare = numcompare_mb; -+ } -+ else -+#endif -+ { -+ inittables = inittables_uni; -+ begfield = begfield_uni; -+ limfield = limfield_uni; -+ getmonth = getmonth_uni; -+ keycompare = keycompare_uni; -+ numcompare = numcompare_uni; -+ } -+ - have_read_stdin = false; - inittables (); - -@@ -3459,13 +4049,35 @@ main (int argc, char **argv) - - case 't': - { -- char newtab = optarg[0]; -- if (! newtab) -+ char newtab[MB_LEN_MAX + 1]; -+ size_t newtab_length = 1; -+ strncpy (newtab, optarg, MB_LEN_MAX); -+ if (! newtab[0]) - error (SORT_FAILURE, 0, _("empty tab")); -- if (optarg[1]) -+#if HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1) -+ { -+ wchar_t wc; -+ mbstate_t state; -+ size_t i; -+ -+ memset (&state, '\0', sizeof (mbstate_t)); -+ newtab_length = mbrtowc (&wc, newtab, strnlen (newtab, -+ MB_LEN_MAX), -+ &state); -+ switch (newtab_length) -+ { -+ case (size_t) -1: -+ case (size_t) -2: -+ case 0: -+ newtab_length = 1; -+ } -+ } -+#endif -+ if (newtab_length == 1 && optarg[1]) - { - if (STREQ (optarg, "\\0")) -- newtab = '\0'; -+ newtab[0] = '\0'; - else - { - /* Provoke with `sort -txx'. Complain about -@@ -3476,9 +4088,12 @@ main (int argc, char **argv) - quote (optarg)); - } - } -- if (tab != TAB_DEFAULT && tab != newtab) -+ if (tab_length -+ && (tab_length != newtab_length -+ || memcmp (tab, newtab, tab_length) != 0)) - error (SORT_FAILURE, 0, _("incompatible tabs")); -- tab = newtab; -+ memcpy (tab, newtab, newtab_length); -+ tab_length = newtab_length; - } - break; - -diff -urNp coreutils-8.0-orig/src/unexpand.c coreutils-8.0/src/unexpand.c ---- coreutils-8.0-orig/src/unexpand.c 2009-09-29 15:27:54.000000000 +0200 -+++ coreutils-8.0/src/unexpand.c 2009-10-07 10:07:16.000000000 +0200 -@@ -38,11 +38,28 @@ - #include <stdio.h> - #include <getopt.h> - #include <sys/types.h> -+ -+/* Get mbstate_t, mbrtowc(), wcwidth(). */ -+#if HAVE_WCHAR_H -+# include <wchar.h> -+#endif -+ - #include "system.h" - #include "error.h" - #include "quote.h" - #include "xstrndup.h" - -+/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC -+ installation; work around this configuration error. */ -+#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 -+# define MB_LEN_MAX 16 -+#endif -+ -+/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ -+#if HAVE_MBRTOWC && defined mbstate_t -+# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) -+#endif -+ - /* The official name of this program (e.g., no `g' prefix). */ - #define PROGRAM_NAME "unexpand" - -@@ -102,6 +119,208 @@ static struct option const longopts[] = - {NULL, 0, NULL, 0} - }; - -+static FILE *next_file (FILE *fp); -+ -+#if HAVE_MBRTOWC -+static void -+unexpand_multibyte (void) -+{ -+ FILE *fp; /* Input stream. */ -+ mbstate_t i_state; /* Current shift state of the input stream. */ -+ mbstate_t i_state_bak; /* Back up the I_STATE. */ -+ mbstate_t o_state; /* Current shift state of the output stream. */ -+ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ -+ char *bufpos; /* Next read position of BUF. */ -+ size_t buflen = 0; /* The length of the byte sequence in buf. */ -+ wint_t wc; /* A gotten wide character. */ -+ size_t mblength; /* The byte size of a multibyte character -+ which shows as same character as WC. */ -+ -+ /* Index in `tab_list' of next tabstop: */ -+ int tab_index = 0; /* For calculating width of pending tabs. */ -+ int print_tab_index = 0; /* For printing as many tabs as possible. */ -+ unsigned int column = 0; /* Column on screen of next char. */ -+ int next_tab_column; /* Column the next tab stop is on. */ -+ int convert = 1; /* If nonzero, perform translations. */ -+ unsigned int pending = 0; /* Pending columns of blanks. */ -+ -+ fp = next_file ((FILE *) NULL); -+ if (fp == NULL) -+ return; -+ -+ memset (&o_state, '\0', sizeof(mbstate_t)); -+ memset (&i_state, '\0', sizeof(mbstate_t)); -+ -+ for (;;) -+ { -+ if (buflen < MB_LEN_MAX && !feof(fp) && !ferror(fp)) -+ { -+ memmove (buf, bufpos, buflen); -+ buflen += fread (buf + buflen, sizeof(char), BUFSIZ, fp); -+ bufpos = buf; -+ } -+ -+ /* Get a wide character. */ -+ if (buflen < 1) -+ { -+ mblength = 1; -+ wc = WEOF; -+ } -+ else -+ { -+ i_state_bak = i_state; -+ mblength = mbrtowc ((wchar_t *)&wc, bufpos, buflen, &i_state); -+ } -+ -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) -+ { -+ i_state = i_state_bak; -+ wc = L'\0'; -+ } -+ -+ if (wc == L' ' && convert && column < INT_MAX) -+ { -+ ++pending; -+ ++column; -+ } -+ else if (wc == L'\t' && convert) -+ { -+ if (tab_size == 0) -+ { -+ /* Do not let tab_index == first_free_tab; -+ stop when it is 1 less. */ -+ while (tab_index < first_free_tab - 1 -+ && column >= tab_list[tab_index]) -+ tab_index++; -+ next_tab_column = tab_list[tab_index]; -+ if (tab_index < first_free_tab - 1) -+ tab_index++; -+ if (column >= next_tab_column) -+ { -+ convert = 0; /* Ran out of tab stops. */ -+ goto flush_pend_mb; -+ } -+ } -+ else -+ { -+ next_tab_column = column + tab_size - column % tab_size; -+ } -+ pending += next_tab_column - column; -+ column = next_tab_column; -+ } -+ else -+ { -+flush_pend_mb: -+ /* Flush pending spaces. Print as many tabs as possible, -+ then print the rest as spaces. */ -+ if (pending == 1) -+ { -+ putchar (' '); -+ pending = 0; -+ } -+ column -= pending; -+ while (pending > 0) -+ { -+ if (tab_size == 0) -+ { -+ /* Do not let print_tab_index == first_free_tab; -+ stop when it is 1 less. */ -+ while (print_tab_index < first_free_tab - 1 -+ && column >= tab_list[print_tab_index]) -+ print_tab_index++; -+ next_tab_column = tab_list[print_tab_index]; -+ if (print_tab_index < first_free_tab - 1) -+ print_tab_index++; -+ } -+ else -+ { -+ next_tab_column = -+ column + tab_size - column % tab_size; -+ } -+ if (next_tab_column - column <= pending) -+ { -+ putchar ('\t'); -+ pending -= next_tab_column - column; -+ column = next_tab_column; -+ } -+ else -+ { -+ --print_tab_index; -+ column += pending; -+ while (pending != 0) -+ { -+ putchar (' '); -+ pending--; -+ } -+ } -+ } -+ -+ if (wc == WEOF) -+ { -+ fp = next_file (fp); -+ if (fp == NULL) -+ break; /* No more files. */ -+ else -+ { -+ memset (&i_state, '\0', sizeof(mbstate_t)); -+ continue; -+ } -+ } -+ -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) -+ { -+ if (convert) -+ { -+ ++column; -+ if (convert_entire_line == 0) -+ convert = 0; -+ } -+ mblength = 1; -+ putchar (buf[0]); -+ } -+ else if (mblength == 0) -+ { -+ if (convert && convert_entire_line == 0) -+ convert = 0; -+ mblength = 1; -+ putchar ('\0'); -+ } -+ else -+ { -+ if (convert) -+ { -+ if (wc == L'\b') -+ { -+ if (column > 0) -+ --column; -+ } -+ else -+ { -+ int width; /* The width of WC. */ -+ -+ width = wcwidth (wc); -+ column += (width > 0) ? width : 0; -+ if (convert_entire_line == 0) -+ convert = 0; -+ } -+ } -+ -+ if (wc == L'\n') -+ { -+ tab_index = print_tab_index = 0; -+ column = pending = 0; -+ convert = 1; -+ } -+ fwrite (bufpos, sizeof(char), mblength, stdout); -+ } -+ } -+ buflen -= mblength; -+ bufpos += mblength; -+ } -+} -+#endif -+ -+ - void - usage (int status) - { -@@ -523,7 +742,12 @@ main (int argc, char **argv) - - file_list = (optind < argc ? &argv[optind] : stdin_argv); - -- unexpand (); -+#if HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1) -+ unexpand_multibyte (); -+ else -+#endif -+ unexpand (); - - if (have_read_stdin && fclose (stdin) != 0) - error (EXIT_FAILURE, errno, "-"); -diff -urNp coreutils-8.0-orig/src/uniq.c coreutils-8.0/src/uniq.c ---- coreutils-8.0-orig/src/uniq.c 2009-09-23 10:25:44.000000000 +0200 -+++ coreutils-8.0/src/uniq.c 2009-10-07 10:07:16.000000000 +0200 -@@ -22,6 +22,16 @@ - #include <getopt.h> - #include <sys/types.h> - -+/* Get mbstate_t, mbrtowc(). */ -+#if HAVE_WCHAR_H -+# include <wchar.h> -+#endif -+ -+/* Get isw* functions. */ -+#if HAVE_WCTYPE_H -+# include <wctype.h> -+#endif -+ - #include "system.h" - #include "argmatch.h" - #include "linebuffer.h" -@@ -31,7 +41,19 @@ - #include "stdio--.h" - #include "xmemcoll.h" - #include "xstrtol.h" --#include "memcasecmp.h" -+#include "xmemcoll.h" -+ -+/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC -+ installation; work around this configuration error. */ -+#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 -+# define MB_LEN_MAX 16 -+#endif -+ -+/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ -+#if HAVE_MBRTOWC && defined mbstate_t -+# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) -+#endif -+ - - /* The official name of this program (e.g., no `g' prefix). */ - #define PROGRAM_NAME "uniq" -@@ -107,6 +129,10 @@ static enum delimit_method const delimit - /* Select whether/how to delimit groups of duplicate lines. */ - static enum delimit_method delimit_groups; - -+/* Function pointers. */ -+static char * -+(*find_field) (struct linebuffer *line); -+ - static struct option const longopts[] = - { - {"count", no_argument, NULL, 'c'}, -@@ -206,7 +232,7 @@ size_opt (char const *opt, char const *m - return a pointer to the beginning of the line's field to be compared. */ - - static char * --find_field (struct linebuffer const *line) -+find_field_uni (struct linebuffer *line) - { - size_t count; - char const *lp = line->buffer; -@@ -227,6 +253,83 @@ find_field (struct linebuffer const *lin - return line->buffer + i; - } - -+#if HAVE_MBRTOWC -+ -+# define MBCHAR_TO_WCHAR(WC, MBLENGTH, LP, POS, SIZE, STATEP, CONVFAIL) \ -+ do \ -+ { \ -+ mbstate_t state_bak; \ -+ \ -+ CONVFAIL = 0; \ -+ state_bak = *STATEP; \ -+ \ -+ MBLENGTH = mbrtowc (&WC, LP + POS, SIZE - POS, STATEP); \ -+ \ -+ switch (MBLENGTH) \ -+ { \ -+ case (size_t)-2: \ -+ case (size_t)-1: \ -+ *STATEP = state_bak; \ -+ CONVFAIL++; \ -+ /* Fall through */ \ -+ case 0: \ -+ MBLENGTH = 1; \ -+ } \ -+ } \ -+ while (0) -+ -+static char * -+find_field_multi (struct linebuffer *line) -+{ -+ size_t count; -+ char *lp = line->buffer; -+ size_t size = line->length - 1; -+ size_t pos; -+ size_t mblength; -+ wchar_t wc; -+ mbstate_t *statep; -+ int convfail; -+ -+ pos = 0; -+ statep = &(line->state); -+ -+ /* skip fields. */ -+ for (count = 0; count < skip_fields && pos < size; count++) -+ { -+ while (pos < size) -+ { -+ MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); -+ -+ if (convfail || !iswblank (wc)) -+ { -+ pos += mblength; -+ break; -+ } -+ pos += mblength; -+ } -+ -+ while (pos < size) -+ { -+ MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); -+ -+ if (!convfail && iswblank (wc)) -+ break; -+ -+ pos += mblength; -+ } -+ } -+ -+ /* skip fields. */ -+ for (count = 0; count < skip_chars && pos < size; count++) -+ { -+ MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); -+ pos += mblength; -+ } -+ -+ return lp + pos; -+} -+#endif -+ - /* Return false if two strings OLD and NEW match, true if not. - OLD and NEW point not to the beginnings of the lines - but rather to the beginnings of the fields to compare. -@@ -235,6 +338,8 @@ find_field (struct linebuffer const *lin - static bool - different (char *old, char *new, size_t oldlen, size_t newlen) - { -+ char *copy_old, *copy_new; -+ - if (check_chars < oldlen) - oldlen = check_chars; - if (check_chars < newlen) -@@ -242,14 +347,92 @@ different (char *old, char *new, size_t - - if (ignore_case) - { -- /* FIXME: This should invoke strcoll somehow. */ -- return oldlen != newlen || memcasecmp (old, new, oldlen); -+ size_t i; -+ -+ copy_old = alloca (oldlen + 1); -+ copy_new = alloca (oldlen + 1); -+ -+ for (i = 0; i < oldlen; i++) -+ { -+ copy_old[i] = toupper (old[i]); -+ copy_new[i] = toupper (new[i]); -+ } - } -- else if (hard_LC_COLLATE) -- return xmemcoll (old, oldlen, new, newlen) != 0; - else -- return oldlen != newlen || memcmp (old, new, oldlen); -+ { -+ copy_old = (char *)old; -+ copy_new = (char *)new; -+ } -+ -+ return xmemcoll (copy_old, oldlen, copy_new, newlen); -+} -+ -+#if HAVE_MBRTOWC -+static int -+different_multi (const char *old, const char *new, size_t oldlen, size_t newlen, mbstate_t oldstate, mbstate_t newstate) -+{ -+ size_t i, j, chars; -+ const char *str[2]; -+ char *copy[2]; -+ size_t len[2]; -+ mbstate_t state[2]; -+ size_t mblength; -+ wchar_t wc, uwc; -+ mbstate_t state_bak; -+ -+ str[0] = old; -+ str[1] = new; -+ len[0] = oldlen; -+ len[1] = newlen; -+ state[0] = oldstate; -+ state[1] = newstate; -+ -+ for (i = 0; i < 2; i++) -+ { -+ copy[i] = alloca (len[i] + 1); -+ -+ for (j = 0, chars = 0; j < len[i] && chars < check_chars; chars++) -+ { -+ state_bak = state[i]; -+ mblength = mbrtowc (&wc, str[i] + j, len[i] - j, &(state[i])); -+ -+ switch (mblength) -+ { -+ case (size_t)-1: -+ case (size_t)-2: -+ state[i] = state_bak; -+ /* Fall through */ -+ case 0: -+ mblength = 1; -+ break; -+ -+ default: -+ if (ignore_case) -+ { -+ uwc = towupper (wc); -+ -+ if (uwc != wc) -+ { -+ mbstate_t state_wc; -+ -+ memset (&state_wc, '\0', sizeof(mbstate_t)); -+ wcrtomb (copy[i] + j, uwc, &state_wc); -+ } -+ else -+ memcpy (copy[i] + j, str[i] + j, mblength); -+ } -+ else -+ memcpy (copy[i] + j, str[i] + j, mblength); -+ } -+ j += mblength; -+ } -+ copy[i][j] = '\0'; -+ len[i] = j; -+ } -+ -+ return xmemcoll (copy[0], len[0], copy[1], len[1]); - } -+#endif - - /* Output the line in linebuffer LINE to standard output - provided that the switches say it should be output. -@@ -303,15 +486,43 @@ check_file (const char *infile, const ch - { - char *prevfield IF_LINT (= NULL); - size_t prevlen IF_LINT (= 0); -+#if HAVE_MBRTOWC -+ mbstate_t prevstate; -+ -+ memset (&prevstate, '\0', sizeof (mbstate_t)); -+#endif - - while (!feof (stdin)) - { - char *thisfield; - size_t thislen; -+#if HAVE_MBRTOWC -+ mbstate_t thisstate; -+#endif -+ - if (readlinebuffer_delim (thisline, stdin, delimiter) == 0) - break; - thisfield = find_field (thisline); - thislen = thisline->length - 1 - (thisfield - thisline->buffer); -+#if HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1) -+ { -+ thisstate = thisline->state; -+ -+ if (prevline->length == 0 || different_multi -+ (thisfield, prevfield, thislen, prevlen, thisstate, prevstate)) -+ { -+ fwrite (thisline->buffer, sizeof (char), -+ thisline->length, stdout); -+ -+ SWAP_LINES (prevline, thisline); -+ prevfield = thisfield; -+ prevlen = thislen; -+ prevstate = thisstate; -+ } -+ } -+ else -+#endif - if (prevline->length == 0 - || different (thisfield, prevfield, thislen, prevlen)) - { -@@ -330,17 +541,26 @@ check_file (const char *infile, const ch - size_t prevlen; - uintmax_t match_count = 0; - bool first_delimiter = true; -+#if HAVE_MBRTOWC -+ mbstate_t prevstate; -+#endif - - if (readlinebuffer_delim (prevline, stdin, delimiter) == 0) - goto closefiles; - prevfield = find_field (prevline); - prevlen = prevline->length - 1 - (prevfield - prevline->buffer); -+#if HAVE_MBRTOWC -+ prevstate = prevline->state; -+#endif - - while (!feof (stdin)) - { - bool match; - char *thisfield; - size_t thislen; -+#if HAVE_MBRTOWC -+ mbstate_t thisstate; -+#endif - if (readlinebuffer_delim (thisline, stdin, delimiter) == 0) - { - if (ferror (stdin)) -@@ -349,6 +569,15 @@ check_file (const char *infile, const ch - } - thisfield = find_field (thisline); - thislen = thisline->length - 1 - (thisfield - thisline->buffer); -+#if HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1) -+ { -+ thisstate = thisline->state; -+ match = !different_multi (thisfield, prevfield, -+ thislen, prevlen, thisstate, prevstate); -+ } -+ else -+#endif - match = !different (thisfield, prevfield, thislen, prevlen); - match_count += match; - -@@ -381,6 +610,9 @@ check_file (const char *infile, const ch - SWAP_LINES (prevline, thisline); - prevfield = thisfield; - prevlen = thislen; -+#if HAVE_MBRTOWC -+ prevstate = thisstate; -+#endif - if (!match) - match_count = 0; - } -@@ -426,6 +658,19 @@ main (int argc, char **argv) - - atexit (close_stdout); - -+#if HAVE_MBRTOWC -+ if (MB_CUR_MAX > 1) -+ { -+ find_field = find_field_multi; -+ } -+ else -+#endif -+ { -+ find_field = find_field_uni; -+ } -+ -+ -+ - skip_chars = 0; - skip_fields = 0; - check_chars = SIZE_MAX; -diff -urNp coreutils-8.0-orig/tests/Makefile.am coreutils-8.0/tests/Makefile.am ---- coreutils-8.0-orig/tests/Makefile.am 2009-09-29 16:25:44.000000000 +0200 -+++ coreutils-8.0/tests/Makefile.am 2009-10-07 10:07:16.000000000 +0200 -@@ -208,6 +208,7 @@ TESTS = \ - misc/sort-compress \ - misc/sort-continue \ - misc/sort-files0-from \ -+ misc/sort-mb-tests \ - misc/sort-merge \ - misc/sort-merge-fdlimit \ - misc/sort-rand \ -@@ -452,6 +453,10 @@ TESTS = \ - $(root_tests) - - pr_data = \ -+ misc/mb1.X \ -+ misc/mb1.I \ -+ misc/mb2.X \ -+ misc/mb2.I \ - pr/0F \ - pr/0FF \ - pr/0FFnt \ -diff -urNp coreutils-8.0-orig/tests/misc/cut coreutils-8.0/tests/misc/cut ---- coreutils-8.0-orig/tests/misc/cut 2009-09-21 14:29:33.000000000 +0200 -+++ coreutils-8.0/tests/misc/cut 2009-10-07 10:07:16.000000000 +0200 -@@ -26,7 +26,7 @@ use strict; - my $prog = 'cut'; - my $try = "Try \`$prog --help' for more information.\n"; - my $from_1 = "$prog: fields and positions are numbered from 1\n$try"; --my $inval = "$prog: invalid byte or field list\n$try"; -+my $inval = "$prog: invalid byte, character or field list\n$try"; - my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try"; - - my @Tests = -@@ -141,7 +141,7 @@ my @Tests = - - # None of the following invalid ranges provoked an error up to coreutils-6.9. - ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1}, -- {ERR=>"$prog: invalid decreasing range\n$try"}], -+ {ERR=>"$prog: invalid byte, character or field list\n$try"}], - ['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], - ['inval3', '-f', '4,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], - ['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], -diff -urNp coreutils-8.0-orig/tests/misc/mb1.I coreutils-8.0/tests/misc/mb1.I ---- coreutils-8.0-orig/tests/misc/mb1.I 1970-01-01 01:00:00.000000000 +0100 -+++ coreutils-8.0/tests/misc/mb1.I 2009-10-07 10:07:16.000000000 +0200 -@@ -0,0 +1,4 @@ -+Apple＠10 -+Banana＠5 -+Citrus＠20 -+Cherry＠30 -diff -urNp coreutils-8.0-orig/tests/misc/mb1.X coreutils-8.0/tests/misc/mb1.X ---- coreutils-8.0-orig/tests/misc/mb1.X 1970-01-01 01:00:00.000000000 +0100 -+++ coreutils-8.0/tests/misc/mb1.X 2009-10-07 10:07:16.000000000 +0200 -@@ -0,0 +1,4 @@ -+Banana＠5 -+Apple＠10 -+Citrus＠20 -+Cherry＠30 -diff -urNp coreutils-8.0-orig/tests/misc/mb2.I coreutils-8.0/tests/misc/mb2.I ---- coreutils-8.0-orig/tests/misc/mb2.I 1970-01-01 01:00:00.000000000 +0100 -+++ coreutils-8.0/tests/misc/mb2.I 2009-10-07 10:07:16.000000000 +0200 -@@ -0,0 +1,4 @@ -+Apple＠ＡＡ10＠＠20 -+Banana＠ＡＡ5＠＠30 -+Citrus＠ＡＡ20＠＠5 -+Cherry＠ＡＡ30＠＠10 -diff -urNp coreutils-8.0-orig/tests/misc/mb2.X coreutils-8.0/tests/misc/mb2.X ---- coreutils-8.0-orig/tests/misc/mb2.X 1970-01-01 01:00:00.000000000 +0100 -+++ coreutils-8.0/tests/misc/mb2.X 2009-10-07 10:07:16.000000000 +0200 -@@ -0,0 +1,4 @@ -+Citrus＠ＡＡ20＠＠5 -+Cherry＠ＡＡ30＠＠10 -+Apple＠ＡＡ10＠＠20 -+Banana＠ＡＡ5＠＠30 -diff -urNp coreutils-8.0-orig/tests/misc/sort-mb-tests coreutils-8.0/tests/misc/sort-mb-tests ---- coreutils-8.0-orig/tests/misc/sort-mb-tests 1970-01-01 01:00:00.000000000 +0100 -+++ coreutils-8.0/tests/misc/sort-mb-tests 2009-10-07 10:07:16.000000000 +0200 -@@ -0,0 +1,58 @@ -+#! /bin/sh -+case $# in -+ 0) xx='../src/sort';; -+ *) xx="$1";; -+esac -+test "$VERBOSE" && echo=echo || echo=: -+$echo testing program: $xx -+errors=0 -+test "$srcdir" || srcdir=. -+test "$VERBOSE" && $xx --version 2> /dev/null -+ -+export LC_ALL=en_US.UTF-8 -+locale -k LC_CTYPE 2>&1 | grep -q charmap.*UTF-8 || exit 77 -+errors=0 -+ -+$xx -t ＠ -k2 -n misc/mb1.I > misc/mb1.O -+code=$? -+if test $code != 0; then -+ $echo "Test mb1 failed: $xx return code $code differs from expected value 0" 1>&2 -+ errors=`expr $errors + 1` -+else -+ cmp misc/mb1.O $srcdir/misc/mb1.X > /dev/null 2>&1 -+ case $? in -+ 0) if test "$VERBOSE"; then $echo "passed mb1"; fi;; -+ 1) $echo "Test mb1 failed: files misc/mb1.O and $srcdir/misc/mb1.X differ" 1>&2 -+ (diff -c misc/mb1.O $srcdir/misc/mb1.X) 2> /dev/null -+ errors=`expr $errors + 1`;; -+ 2) $echo "Test mb1 may have failed." 1>&2 -+ $echo The command "cmp misc/mb1.O $srcdir/misc/mb1.X" failed. 1>&2 -+ errors=`expr $errors + 1`;; -+ esac -+fi -+ -+$xx -t ＠ -k4 -n misc/mb2.I > misc/mb2.O -+code=$? -+if test $code != 0; then -+ $echo "Test mb2 failed: $xx return code $code differs from expected value 0" 1>&2 -+ errors=`expr $errors + 1` -+else -+ cmp misc/mb2.O $srcdir/misc/mb2.X > /dev/null 2>&1 -+ case $? in -+ 0) if test "$VERBOSE"; then $echo "passed mb2"; fi;; -+ 1) $echo "Test mb2 failed: files misc/mb2.O and $srcdir/misc/mb2.X differ" 1>&2 -+ (diff -c misc/mb2.O $srcdir/misc/mb2.X) 2> /dev/null -+ errors=`expr $errors + 1`;; -+ 2) $echo "Test mb2 may have failed." 1>&2 -+ $echo The command "cmp misc/mb2.O $srcdir/misc/mb2.X" failed. 1>&2 -+ errors=`expr $errors + 1`;; -+ esac -+fi -+ -+if test $errors = 0; then -+ $echo Passed all 113 tests. 1>&2 -+else -+ $echo Failed $errors tests. 1>&2 -+fi -+test $errors = 0 || errors=1 -+exit $errors diff --git a/pkgs/core/coreutils/patches/coreutils-8.4-upstream-cp-mv-enotsup-xattr-test.patch b/pkgs/core/coreutils/patches/coreutils-8.4-upstream-cp-mv-enotsup-xattr-test.patch deleted file mode 100644 index 1a54ba9..0000000 --- a/pkgs/core/coreutils/patches/coreutils-8.4-upstream-cp-mv-enotsup-xattr-test.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 9c566ad04a3b6b7672ab10cacea23d9f6a599c0e Mon Sep 17 00:00:00 2001 -From: Pádraig Brady <P(a)draigBrady.com> -Date: Sat, 23 Jan 2010 23:35:41 +0000 -Subject: tests: make cp-mv-enotsup-xattr independent of the host file system - -* tests/cp-mv-enotsup-xattr: Create a file system from which to copy -the xattrs so that the test is not skipped if the host file system -does not have user_xattr support. Also don't erroneously fail when -built without xattr support. ---- -diff --git a/tests/cp/cp-mv-enotsup-xattr b/tests/cp/cp-mv-enotsup-xattr -index 45f86f7..0239abb 100755 ---- a/tests/cp/cp-mv-enotsup-xattr -+++ b/tests/cp/cp-mv-enotsup-xattr -@@ -28,65 +28,81 @@ fi - require_root_ - - cwd=`pwd` --cleanup_() { cd /; umount "$cwd/mnt"; } -+cleanup_() { cd /; umount "$cwd/noxattr"; umount "$cwd/xattr"; } - - skip=0 --# Create a file system without user xattr support, then mount it. --dd if=/dev/zero of=blob bs=8192 count=200 > /dev/null 2>&1 \ -- || skip=1 --mkdir mnt || skip=1 --mkfs -t ext2 -F blob || -- skip_test_ "failed to create ext2 file system" - --mount -oloop,nouser_xattr blob mnt || skip=1 --echo test > mnt/f || skip=1 --test -s mnt/f || skip=1 -+# Mount an ext2 loopback file system at $WHERE with $OPTS -+make_fs() { -+ where="$1" -+ opts="$2" - --test $skip = 1 \ -- && skip_test_ "insufficient mount/ext2 support" -+ fs="$where.bin" -+ -+ dd if=/dev/zero of="$fs" bs=8192 count=200 > /dev/null 2>&1 \ -+ || skip=1 -+ mkdir "$where" || skip=1 -+ mkfs -t ext2 -F "$fs" || -+ skip_test_ "failed to create ext2 file system" -+ mount -oloop,$opts "$fs" "$where" || skip=1 -+ echo test > "$where"/f || skip=1 -+ test -s "$where"/f || skip=1 -+ -+ test $skip = 1 && -+ skip_test_ "insufficient mount/ext2 support" -+} -+ -+make_fs noxattr nouser_xattr -+make_fs xattr user_xattr - - # testing xattr name-value pair - xattr_name="user.foo" - xattr_value="bar" - xattr_pair="$xattr_name=\"$xattr_value\"" - --echo test > a || framework_failure --getfattr -d a >out_a || skip_test_ "failed to get xattr of file" -+echo test > xattr/a || framework_failure -+getfattr -d xattr/a >out_a || skip_test_ "failed to get xattr of file" - grep -F "$xattr_pair" out_a >/dev/null && framework_failure --setfattr -n "$xattr_name" -v "$xattr_value" a >out_a \ -+setfattr -n "$xattr_name" -v "$xattr_value" xattr/a >out_a \ - || skip_test_ "failed to set xattr of file" --getfattr -d a >out_a || skip_test_ "failed to get xattr of file" -+getfattr -d xattr/a >out_a || skip_test_ "failed to get xattr of file" - grep -F "$xattr_pair" out_a >/dev/null \ - || skip_test_ "failed to set xattr of file" - - - # This should pass without diagnostics --cp -a a mnt/ 2>err || fail=1 --test -s mnt/a || fail=1 # destination file must not be empty -+cp -a xattr/a noxattr/ 2>err || fail=1 -+test -s noxattr/a || fail=1 # destination file must not be empty - test -s err && fail=1 # there must be no stderr output - --rm -f err mnt/a -+rm -f err noxattr/a - - # This should pass without diagnostics --cp --preserve=all a mnt/ 2>err || fail=1 --test -s mnt/a || fail=1 # destination file must not be empty -+cp --preserve=all xattr/a noxattr/ 2>err || fail=1 -+test -s noxattr/a || fail=1 # destination file must not be empty - test -s err && fail=1 # there must be no stderr output - --rm -f err mnt/a -+rm -f err noxattr/a - - # This should fail with coresponding diagnostics --cp -a --preserve=xattr a mnt/ 2>err && fail=1 --cat <<\EOF > exp || fail=1 --cp: setting attributes for `mnt/a': Operation not supported -+cp -a --preserve=xattr xattr/a noxattr/ 2>err && fail=1 -+if grep '^#define USE_XATTR 1' $CONFIG_HEADER > /dev/null; then -+cat <<\EOF > exp -+cp: setting attributes for `noxattr/a': Operation not supported - EOF -+else -+cat <<\EOF > exp -+cp: cannot preserve extended attributes, cp is built without xattr support -+EOF -+fi - - compare err exp || fail=1 - --rm -f err mnt/a -+rm -f err noxattr/a - - # This should pass without diagnostics --mv a mnt/ 2>err || fail=1 --test -s mnt/a || fail=1 # destination file must not be empty --test -s err && fail=1 # there must be no stderr output -+mv xattr/a noxattr/ 2>err || fail=1 -+test -s noxattr/a || fail=1 # destination file must not be empty -+test -s err && fail=1 # there must be no stderr output - - Exit $fail --- -cgit v0.8.2.1 diff --git a/pkgs/core/coreutils/patches/coreutils-8.4-upstream-xattr.patch b/pkgs/core/coreutils/patches/coreutils-8.4-upstream-xattr.patch deleted file mode 100644 index 0c87650..0000000 --- a/pkgs/core/coreutils/patches/coreutils-8.4-upstream-xattr.patch +++ /dev/null @@ -1,48 +0,0 @@ -From e489fd04d66000829f5458843970794eccacced8 Mon Sep 17 00:00:00 2001 -From: Eric Blake <ebb9(a)byu.net> -Date: Sat, 16 Jan 2010 13:46:17 +0000 -Subject: build: fix failure from bogus USE_XATTR definition - -* m4/xattr.m4 (gl_FUNC_ADDR): Fix regression introduced in commit -6beca4248. -* THANKS: Update. -Reported by Adam Sampson. ---- -diff --git a/THANKS b/THANKS -index 583ea60..1207368 100644 ---- a/THANKS -+++ b/THANKS -@@ -12,6 +12,7 @@ Aaron Hawley ashawley(a)uvm.edu - Achim Blumensath blume(a)corona.oche.de - Adam Jimerson vendion(a)charter.net - Adam Klein aklein(a)debian.org -+Adam Sampson ats(a)offog.org - Adrian Bunk bunk(a)stusta.de - AIDA Shinra shinra(a)j10n.org - Akim Demaille demaille(a)inf.enst.fr -diff --git a/m4/xattr.m4 b/m4/xattr.m4 -index bf7e872..80fddbd 100644 ---- a/m4/xattr.m4 -+++ b/m4/xattr.m4 -@@ -1,4 +1,5 @@ - # xattr.m4 - check for Extended Attributes (Linux) -+# serial 3 - - # Copyright (C) 2003, 2008-2010 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -33,11 +34,11 @@ AC_DEFUN([gl_FUNC_XATTR], - use_xattr=yes - fi - fi -- AC_DEFINE_UNQUOTED([USE_XATTR], [$use_xattr], -- [Define if you want extended attribute support.]) - if test $use_xattr = no; then - AC_MSG_WARN([libattr development library was not found or not usable.]) - AC_MSG_WARN([AC_PACKAGE_NAME will be built without xattr support.]) - fi - fi -+ AC_DEFINE_UNQUOTED([USE_XATTR], [`test $use_xattr != yes; echo $?`], -+ [Define if you want extended attribute support.]) - ]) --- -cgit v0.8.2.1 diff --git a/pkgs/core/coreutils/patches/coreutils-8.5-i18n.patch b/pkgs/core/coreutils/patches/coreutils-8.5-i18n.patch new file mode 100644 index 0000000..d6e6c46 --- /dev/null +++ b/pkgs/core/coreutils/patches/coreutils-8.5-i18n.patch @@ -0,0 +1,4048 @@ +diff -urNp coreutils-8.5-orig/lib/linebuffer.h coreutils-8.5/lib/linebuffer.h +--- coreutils-8.5-orig/lib/linebuffer.h 2010-04-23 15:44:00.000000000 +0200 ++++ coreutils-8.5/lib/linebuffer.h 2010-04-26 14:24:33.000000000 +0200 +@@ -21,6 +21,11 @@ + + # include <stdio.h> + ++/* Get mbstate_t. */ ++# if HAVE_WCHAR_H ++# include <wchar.h> ++# endif ++ + /* A `struct linebuffer' holds a line of text. */ + + struct linebuffer +@@ -28,6 +33,9 @@ struct linebuffer + size_t size; /* Allocated. */ + size_t length; /* Used. */ + char *buffer; ++# if HAVE_WCHAR_H ++ mbstate_t state; ++# endif + }; + + /* Initialize linebuffer LINEBUFFER for use. */ +diff -urNp coreutils-8.5-orig/src/cut.c coreutils-8.5/src/cut.c +--- coreutils-8.5-orig/src/cut.c 2010-04-20 21:52:04.000000000 +0200 ++++ coreutils-8.5/src/cut.c 2010-04-26 14:24:33.000000000 +0200 +@@ -28,6 +28,11 @@ + #include <assert.h> + #include <getopt.h> + #include <sys/types.h> ++ ++/* Get mbstate_t, mbrtowc(). */ ++#if HAVE_WCHAR_H ++# include <wchar.h> ++#endif + #include "system.h" + + #include "error.h" +@@ -36,6 +41,18 @@ + #include "quote.h" + #include "xstrndup.h" + ++/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC ++ installation; work around this configuration error. */ ++#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 ++# undef MB_LEN_MAX ++# define MB_LEN_MAX 16 ++#endif ++ ++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ ++#if HAVE_MBRTOWC && defined mbstate_t ++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) ++#endif ++ + /* The official name of this program (e.g., no `g' prefix). */ + #define PROGRAM_NAME "cut" + +@@ -71,6 +88,52 @@ + } \ + while (0) + ++/* Refill the buffer BUF to get a multibyte character. */ ++#define REFILL_BUFFER(BUF, BUFPOS, BUFLEN, STREAM) \ ++ do \ ++ { \ ++ if (BUFLEN < MB_LEN_MAX && !feof (STREAM) && !ferror (STREAM)) \ ++ { \ ++ memmove (BUF, BUFPOS, BUFLEN); \ ++ BUFLEN += fread (BUF + BUFLEN, sizeof(char), BUFSIZ, STREAM); \ ++ BUFPOS = BUF; \ ++ } \ ++ } \ ++ while (0) ++ ++/* Get wide character on BUFPOS. BUFPOS is not included after that. ++ If byte sequence is not valid as a character, CONVFAIL is 1. Otherwise 0. */ ++#define GET_NEXT_WC_FROM_BUFFER(WC, BUFPOS, BUFLEN, MBLENGTH, STATE, CONVFAIL) \ ++ do \ ++ { \ ++ mbstate_t state_bak; \ ++ \ ++ if (BUFLEN < 1) \ ++ { \ ++ WC = WEOF; \ ++ break; \ ++ } \ ++ \ ++ /* Get a wide character. */ \ ++ CONVFAIL = 0; \ ++ state_bak = STATE; \ ++ MBLENGTH = mbrtowc ((wchar_t *)&WC, BUFPOS, BUFLEN, &STATE); \ ++ \ ++ switch (MBLENGTH) \ ++ { \ ++ case (size_t)-1: \ ++ case (size_t)-2: \ ++ CONVFAIL++; \ ++ STATE = state_bak; \ ++ /* Fall througn. */ \ ++ \ ++ case 0: \ ++ MBLENGTH = 1; \ ++ break; \ ++ } \ ++ } \ ++ while (0) ++ + struct range_pair + { + size_t lo; +@@ -89,7 +152,7 @@ static char *field_1_buffer; + /* The number of bytes allocated for FIELD_1_BUFFER. */ + static size_t field_1_bufsize; + +-/* The largest field or byte index used as an endpoint of a closed ++/* The largest byte, character or field index used as an endpoint of a closed + or degenerate range specification; this doesn't include the starting + index of right-open-ended ranges. For example, with either range spec + `2-5,9-', `2-3,5,9-' this variable would be set to 5. */ +@@ -101,10 +164,11 @@ static size_t eol_range_start; + + /* This is a bit vector. + In byte mode, which bytes to output. ++ In character mode, which characters to output. + In field mode, which DELIM-separated fields to output. +- Both bytes and fields are numbered starting with 1, ++ Bytes, characters and fields are numbered starting with 1, + so the zeroth bit of this array is unused. +- A field or byte K has been selected if ++ A byte, character or field K has been selected if + (K <= MAX_RANGE_ENDPOINT and is_printable_field(K)) + || (EOL_RANGE_START > 0 && K >= EOL_RANGE_START). */ + static unsigned char *printable_field; +@@ -113,15 +177,25 @@ enum operating_mode + { + undefined_mode, + +- /* Output characters that are in the given bytes. */ ++ /* Output bytes that are at the given positions. */ + byte_mode, + ++ /* Output characters that are at the given positions. */ ++ character_mode, ++ + /* Output the given delimeter-separated fields. */ + field_mode + }; + + static enum operating_mode operating_mode; + ++/* If nonzero, when in byte mode, don't split multibyte characters. */ ++static int byte_mode_character_aware; ++ ++/* If nonzero, the function for single byte locale is work ++ if this program runs on multibyte locale. */ ++static int force_singlebyte_mode; ++ + /* If true do not output lines containing no delimeter characters. + Otherwise, all such lines are printed. This option is valid only + with field mode. */ +@@ -133,6 +207,9 @@ static bool complement; + + /* The delimeter character for field mode. */ + static unsigned char delim; ++#if HAVE_WCHAR_H ++static wchar_t wcdelim; ++#endif + + /* True if the --output-delimiter=STRING option was specified. */ + static bool output_delimiter_specified; +@@ -206,7 +283,7 @@ Mandatory arguments to long options are + -f, --fields=LIST select only these fields; also print any line\n\ + that contains no delimiter character, unless\n\ + the -s option is specified\n\ +- -n (ignored)\n\ ++ -n with -b: don't split multibyte characters\n\ + "), stdout); + fputs (_("\ + --complement complement the set of selected bytes, characters\n\ +@@ -365,7 +442,7 @@ set_fields (const char *fieldstr) + in_digits = false; + /* Starting a range. */ + if (dash_found) +- FATAL_ERROR (_("invalid byte or field list")); ++ FATAL_ERROR (_("invalid byte, character or field list")); + dash_found = true; + fieldstr++; + +@@ -389,14 +466,16 @@ set_fields (const char *fieldstr) + if (!rhs_specified) + { + /* `n-'. From `initial' to end of line. */ +- eol_range_start = initial; ++ if (eol_range_start == 0 || ++ (eol_range_start != 0 && eol_range_start > initial)) ++ eol_range_start = initial; + field_found = true; + } + else + { + /* `m-n' or `-n' (1-n). */ + if (value < initial) +- FATAL_ERROR (_("invalid decreasing range")); ++ FATAL_ERROR (_("invalid byte, character or field list")); + + /* Is there already a range going to end of line? */ + if (eol_range_start != 0) +@@ -476,6 +555,9 @@ set_fields (const char *fieldstr) + if (operating_mode == byte_mode) + error (0, 0, + _("byte offset %s is too large"), quote (bad_num)); ++ else if (operating_mode == character_mode) ++ error (0, 0, ++ _("character offset %s is too large"), quote (bad_num)); + else + error (0, 0, + _("field number %s is too large"), quote (bad_num)); +@@ -486,7 +568,7 @@ set_fields (const char *fieldstr) + fieldstr++; + } + else +- FATAL_ERROR (_("invalid byte or field list")); ++ FATAL_ERROR (_("invalid byte, character or field list")); + } + + max_range_endpoint = 0; +@@ -579,6 +661,63 @@ cut_bytes (FILE *stream) + } + } + ++#if HAVE_MBRTOWC ++/* This function is in use for the following case. ++ ++ 1. Read from the stream STREAM, printing to standard output any selected ++ characters. ++ ++ 2. Read from stream STREAM, printing to standard output any selected bytes, ++ without splitting multibyte characters. */ ++ ++static void ++cut_characters_or_cut_bytes_no_split (FILE *stream) ++{ ++ int idx; /* number of bytes or characters in the line so far. */ ++ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ ++ char *bufpos; /* Next read position of BUF. */ ++ size_t buflen; /* The length of the byte sequence in buf. */ ++ wint_t wc; /* A gotten wide character. */ ++ size_t mblength; /* The byte size of a multibyte character which shows ++ as same character as WC. */ ++ mbstate_t state; /* State of the stream. */ ++ int convfail; /* 1, when conversion is failed. Otherwise 0. */ ++ ++ idx = 0; ++ buflen = 0; ++ bufpos = buf; ++ memset (&state, '\0', sizeof(mbstate_t)); ++ ++ while (1) ++ { ++ REFILL_BUFFER (buf, bufpos, buflen, stream); ++ ++ GET_NEXT_WC_FROM_BUFFER (wc, bufpos, buflen, mblength, state, convfail); ++ ++ if (wc == WEOF) ++ { ++ if (idx > 0) ++ putchar ('\n'); ++ break; ++ } ++ else if (wc == L'\n') ++ { ++ putchar ('\n'); ++ idx = 0; ++ } ++ else ++ { ++ idx += (operating_mode == byte_mode) ? mblength : 1; ++ if (print_kth (idx, NULL)) ++ fwrite (bufpos, mblength, sizeof(char), stdout); ++ } ++ ++ buflen -= mblength; ++ bufpos += mblength; ++ } ++} ++#endif ++ + /* Read from stream STREAM, printing to standard output any selected fields. */ + + static void +@@ -701,13 +840,192 @@ cut_fields (FILE *stream) + } + } + ++#if HAVE_MBRTOWC ++static void ++cut_fields_mb (FILE *stream) ++{ ++ int c; ++ unsigned int field_idx; ++ int found_any_selected_field; ++ int buffer_first_field; ++ int empty_input; ++ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ ++ char *bufpos; /* Next read position of BUF. */ ++ size_t buflen; /* The length of the byte sequence in buf. */ ++ wint_t wc = 0; /* A gotten wide character. */ ++ size_t mblength; /* The byte size of a multibyte character which shows ++ as same character as WC. */ ++ mbstate_t state; /* State of the stream. */ ++ int convfail; /* 1, when conversion is failed. Otherwise 0. */ ++ ++ found_any_selected_field = 0; ++ field_idx = 1; ++ bufpos = buf; ++ buflen = 0; ++ memset (&state, '\0', sizeof(mbstate_t)); ++ ++ c = getc (stream); ++ empty_input = (c == EOF); ++ if (c != EOF) ++ ungetc (c, stream); ++ else ++ wc = WEOF; ++ ++ /* To support the semantics of the -s flag, we may have to buffer ++ all of the first field to determine whether it is `delimited.' ++ But that is unnecessary if all non-delimited lines must be printed ++ and the first field has been selected, or if non-delimited lines ++ must be suppressed and the first field has *not* been selected. ++ That is because a non-delimited line has exactly one field. */ ++ buffer_first_field = (suppress_non_delimited ^ !print_kth (1, NULL)); ++ ++ while (1) ++ { ++ if (field_idx == 1 && buffer_first_field) ++ { ++ int len = 0; ++ ++ while (1) ++ { ++ REFILL_BUFFER (buf, bufpos, buflen, stream); ++ ++ GET_NEXT_WC_FROM_BUFFER ++ (wc, bufpos, buflen, mblength, state, convfail); ++ ++ if (wc == WEOF) ++ break; ++ ++ field_1_buffer = xrealloc (field_1_buffer, len + mblength); ++ memcpy (field_1_buffer + len, bufpos, mblength); ++ len += mblength; ++ buflen -= mblength; ++ bufpos += mblength; ++ ++ if (!convfail && (wc == L'\n' || wc == wcdelim)) ++ break; ++ } ++ ++ if (wc == WEOF) ++ break; ++ ++ /* If the first field extends to the end of line (it is not ++ delimited) and we are printing all non-delimited lines, ++ print this one. */ ++ if (convfail || (!convfail && wc != wcdelim)) ++ { ++ if (suppress_non_delimited) ++ { ++ /* Empty. */ ++ } ++ else ++ { ++ fwrite (field_1_buffer, sizeof (char), len, stdout); ++ /* Make sure the output line is newline terminated. */ ++ if (convfail || (!convfail && wc != L'\n')) ++ putchar ('\n'); ++ } ++ continue; ++ } ++ ++ if (print_kth (1, NULL)) ++ { ++ /* Print the field, but not the trailing delimiter. */ ++ fwrite (field_1_buffer, sizeof (char), len - 1, stdout); ++ found_any_selected_field = 1; ++ } ++ ++field_idx; ++ } ++ ++ if (wc != WEOF) ++ { ++ if (print_kth (field_idx, NULL)) ++ { ++ if (found_any_selected_field) ++ { ++ fwrite (output_delimiter_string, sizeof (char), ++ output_delimiter_length, stdout); ++ } ++ found_any_selected_field = 1; ++ } ++ ++ while (1) ++ { ++ REFILL_BUFFER (buf, bufpos, buflen, stream); ++ ++ GET_NEXT_WC_FROM_BUFFER ++ (wc, bufpos, buflen, mblength, state, convfail); ++ ++ if (wc == WEOF) ++ break; ++ else if (!convfail && (wc == wcdelim || wc == L'\n')) ++ { ++ buflen -= mblength; ++ bufpos += mblength; ++ break; ++ } ++ ++ if (print_kth (field_idx, NULL)) ++ fwrite (bufpos, mblength, sizeof(char), stdout); ++ ++ buflen -= mblength; ++ bufpos += mblength; ++ } ++ } ++ ++ if ((!convfail || wc == L'\n') && buflen < 1) ++ wc = WEOF; ++ ++ if (!convfail && wc == wcdelim) ++ ++field_idx; ++ else if (wc == WEOF || (!convfail && wc == L'\n')) ++ { ++ if (found_any_selected_field ++ || (!empty_input && !(suppress_non_delimited && field_idx == 1))) ++ putchar ('\n'); ++ if (wc == WEOF) ++ break; ++ field_idx = 1; ++ found_any_selected_field = 0; ++ } ++ } ++} ++#endif ++ + static void + cut_stream (FILE *stream) + { +- if (operating_mode == byte_mode) +- cut_bytes (stream); ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1 && !force_singlebyte_mode) ++ { ++ switch (operating_mode) ++ { ++ case byte_mode: ++ if (byte_mode_character_aware) ++ cut_characters_or_cut_bytes_no_split (stream); ++ else ++ cut_bytes (stream); ++ break; ++ ++ case character_mode: ++ cut_characters_or_cut_bytes_no_split (stream); ++ break; ++ ++ case field_mode: ++ cut_fields_mb (stream); ++ break; ++ ++ default: ++ abort (); ++ } ++ } + else +- cut_fields (stream); ++#endif ++ { ++ if (operating_mode == field_mode) ++ cut_fields (stream); ++ else ++ cut_bytes (stream); ++ } + } + + /* Process file FILE to standard output. +@@ -757,6 +1075,8 @@ main (int argc, char **argv) + bool ok; + bool delim_specified = false; + char *spec_list_string IF_LINT (= NULL); ++ char mbdelim[MB_LEN_MAX + 1]; ++ size_t delimlen = 0; + + initialize_main (&argc, &argv); + set_program_name (argv[0]); +@@ -779,7 +1099,6 @@ main (int argc, char **argv) + switch (optc) + { + case 'b': +- case 'c': + /* Build the byte list. */ + if (operating_mode != undefined_mode) + FATAL_ERROR (_("only one type of list may be specified")); +@@ -787,6 +1106,14 @@ main (int argc, char **argv) + spec_list_string = optarg; + break; + ++ case 'c': ++ /* Build the character list. */ ++ if (operating_mode != undefined_mode) ++ FATAL_ERROR (_("only one type of list may be specified")); ++ operating_mode = character_mode; ++ spec_list_string = optarg; ++ break; ++ + case 'f': + /* Build the field list. */ + if (operating_mode != undefined_mode) +@@ -798,10 +1125,35 @@ main (int argc, char **argv) + case 'd': + /* New delimiter. */ + /* Interpret -d '' to mean `use the NUL byte as the delimiter.' */ +- if (optarg[0] != '\0' && optarg[1] != '\0') +- FATAL_ERROR (_("the delimiter must be a single character")); +- delim = optarg[0]; +- delim_specified = true; ++ { ++#if HAVE_MBRTOWC ++ if(MB_CUR_MAX > 1) ++ { ++ mbstate_t state; ++ ++ memset (&state, '\0', sizeof(mbstate_t)); ++ delimlen = mbrtowc (&wcdelim, optarg, strnlen(optarg, MB_LEN_MAX), &state); ++ ++ if (delimlen == (size_t)-1 || delimlen == (size_t)-2) ++ ++force_singlebyte_mode; ++ else ++ { ++ delimlen = (delimlen < 1) ? 1 : delimlen; ++ if (wcdelim != L'\0' && *(optarg + delimlen) != '\0') ++ FATAL_ERROR (_("the delimiter must be a single character")); ++ memcpy (mbdelim, optarg, delimlen); ++ } ++ } ++ ++ if (MB_CUR_MAX <= 1 || force_singlebyte_mode) ++#endif ++ { ++ if (optarg[0] != '\0' && optarg[1] != '\0') ++ FATAL_ERROR (_("the delimiter must be a single character")); ++ delim = (unsigned char) optarg[0]; ++ } ++ delim_specified = true; ++ } + break; + + case OUTPUT_DELIMITER_OPTION: +@@ -814,6 +1166,7 @@ main (int argc, char **argv) + break; + + case 'n': ++ byte_mode_character_aware = 1; + break; + + case 's': +@@ -836,7 +1189,7 @@ main (int argc, char **argv) + if (operating_mode == undefined_mode) + FATAL_ERROR (_("you must specify a list of bytes, characters, or fields")); + +- if (delim != '\0' && operating_mode != field_mode) ++ if (delim_specified && operating_mode != field_mode) + FATAL_ERROR (_("an input delimiter may be specified only\ + when operating on fields")); + +@@ -863,15 +1216,34 @@ main (int argc, char **argv) + } + + if (!delim_specified) +- delim = '\t'; ++ { ++ delim = '\t'; ++#ifdef HAVE_MBRTOWC ++ wcdelim = L'\t'; ++ mbdelim[0] = '\t'; ++ mbdelim[1] = '\0'; ++ delimlen = 1; ++#endif ++ } + + if (output_delimiter_string == NULL) + { +- static char dummy[2]; +- dummy[0] = delim; +- dummy[1] = '\0'; +- output_delimiter_string = dummy; +- output_delimiter_length = 1; ++#ifdef HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1 && !force_singlebyte_mode) ++ { ++ output_delimiter_string = xstrdup(mbdelim); ++ output_delimiter_length = delimlen; ++ } ++ ++ if (MB_CUR_MAX <= 1 || force_singlebyte_mode) ++#endif ++ { ++ static char dummy[2]; ++ dummy[0] = delim; ++ dummy[1] = '\0'; ++ output_delimiter_string = dummy; ++ output_delimiter_length = 1; ++ } + } + + if (optind == argc) +diff -urNp coreutils-8.5-orig/src/expand.c coreutils-8.5/src/expand.c +--- coreutils-8.5-orig/src/expand.c 2010-01-01 14:06:47.000000000 +0100 ++++ coreutils-8.5/src/expand.c 2010-04-26 14:24:33.000000000 +0200 +@@ -38,11 +38,28 @@ + #include <stdio.h> + #include <getopt.h> + #include <sys/types.h> ++ ++/* Get mbstate_t, mbrtowc(), wcwidth(). */ ++#if HAVE_WCHAR_H ++# include <wchar.h> ++#endif ++ + #include "system.h" + #include "error.h" + #include "quote.h" + #include "xstrndup.h" + ++/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC ++ installation; work around this configuration error. */ ++#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 ++# define MB_LEN_MAX 16 ++#endif ++ ++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ ++#if HAVE_MBRTOWC && defined mbstate_t ++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) ++#endif ++ + /* The official name of this program (e.g., no `g' prefix). */ + #define PROGRAM_NAME "expand" + +@@ -358,6 +375,142 @@ expand (void) + } + } + ++#if HAVE_MBRTOWC ++static void ++expand_multibyte (void) ++{ ++ FILE *fp; /* Input strem. */ ++ mbstate_t i_state; /* Current shift state of the input stream. */ ++ mbstate_t i_state_bak; /* Back up the I_STATE. */ ++ mbstate_t o_state; /* Current shift state of the output stream. */ ++ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ ++ char *bufpos; /* Next read position of BUF. */ ++ size_t buflen = 0; /* The length of the byte sequence in buf. */ ++ wchar_t wc; /* A gotten wide character. */ ++ size_t mblength; /* The byte size of a multibyte character ++ which shows as same character as WC. */ ++ int tab_index = 0; /* Index in `tab_list' of next tabstop. */ ++ int column = 0; /* Column on screen of the next char. */ ++ int next_tab_column; /* Column the next tab stop is on. */ ++ int convert = 1; /* If nonzero, perform translations. */ ++ ++ fp = next_file ((FILE *) NULL); ++ if (fp == NULL) ++ return; ++ ++ memset (&o_state, '\0', sizeof(mbstate_t)); ++ memset (&i_state, '\0', sizeof(mbstate_t)); ++ ++ for (;;) ++ { ++ /* Refill the buffer BUF. */ ++ if (buflen < MB_LEN_MAX && !feof(fp) && !ferror(fp)) ++ { ++ memmove (buf, bufpos, buflen); ++ buflen += fread (buf + buflen, sizeof(char), BUFSIZ, fp); ++ bufpos = buf; ++ } ++ ++ /* No character is left in BUF. */ ++ if (buflen < 1) ++ { ++ fp = next_file (fp); ++ ++ if (fp == NULL) ++ break; /* No more files. */ ++ else ++ { ++ memset (&i_state, '\0', sizeof(mbstate_t)); ++ continue; ++ } ++ } ++ ++ /* Get a wide character. */ ++ i_state_bak = i_state; ++ mblength = mbrtowc (&wc, bufpos, buflen, &i_state); ++ ++ switch (mblength) ++ { ++ case (size_t)-1: /* illegal byte sequence. */ ++ case (size_t)-2: ++ mblength = 1; ++ i_state = i_state_bak; ++ if (convert) ++ { ++ ++column; ++ if (convert_entire_line == 0) ++ convert = 0; ++ } ++ putchar (*bufpos); ++ break; ++ ++ case 0: /* null. */ ++ mblength = 1; ++ if (convert && convert_entire_line == 0) ++ convert = 0; ++ putchar ('\0'); ++ break; ++ ++ default: ++ if (wc == L'\n') /* LF. */ ++ { ++ tab_index = 0; ++ column = 0; ++ convert = 1; ++ putchar ('\n'); ++ } ++ else if (wc == L'\t' && convert) /* Tab. */ ++ { ++ if (tab_size == 0) ++ { ++ /* Do not let tab_index == first_free_tab; ++ stop when it is 1 less. */ ++ while (tab_index < first_free_tab - 1 ++ && column >= tab_list[tab_index]) ++ tab_index++; ++ next_tab_column = tab_list[tab_index]; ++ if (tab_index < first_free_tab - 1) ++ tab_index++; ++ if (column >= next_tab_column) ++ next_tab_column = column + 1; ++ } ++ else ++ next_tab_column = column + tab_size - column % tab_size; ++ ++ while (column < next_tab_column) ++ { ++ putchar (' '); ++ ++column; ++ } ++ } ++ else /* Others. */ ++ { ++ if (convert) ++ { ++ if (wc == L'\b') ++ { ++ if (column > 0) ++ --column; ++ } ++ else ++ { ++ int width; /* The width of WC. */ ++ ++ width = wcwidth (wc); ++ column += (width > 0) ? width : 0; ++ if (convert_entire_line == 0) ++ convert = 0; ++ } ++ } ++ fwrite (bufpos, sizeof(char), mblength, stdout); ++ } ++ } ++ buflen -= mblength; ++ bufpos += mblength; ++ } ++} ++#endif ++ + int + main (int argc, char **argv) + { +@@ -422,7 +575,12 @@ main (int argc, char **argv) + + file_list = (optind < argc ? &argv[optind] : stdin_argv); + +- expand (); ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1) ++ expand_multibyte (); ++ else ++#endif ++ expand (); + + if (have_read_stdin && fclose (stdin) != 0) + error (EXIT_FAILURE, errno, "-"); +diff -urNp coreutils-8.5-orig/src/fold.c coreutils-8.5/src/fold.c +--- coreutils-8.5-orig/src/fold.c 2010-01-01 14:06:47.000000000 +0100 ++++ coreutils-8.5/src/fold.c 2010-04-26 14:24:33.000000000 +0200 +@@ -22,11 +22,33 @@ + #include <getopt.h> + #include <sys/types.h> + ++/* Get mbstate_t, mbrtowc(), wcwidth(). */ ++#if HAVE_WCHAR_H ++# include <wchar.h> ++#endif ++ ++/* Get iswprint(), iswblank(), wcwidth(). */ ++#if HAVE_WCTYPE_H ++# include <wctype.h> ++#endif ++ + #include "system.h" + #include "error.h" + #include "quote.h" + #include "xstrtol.h" + ++/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC ++ installation; work around this configuration error. */ ++#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 ++# undef MB_LEN_MAX ++# define MB_LEN_MAX 16 ++#endif ++ ++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ ++#if HAVE_MBRTOWC && defined mbstate_t ++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) ++#endif ++ + #define TAB_WIDTH 8 + + /* The official name of this program (e.g., no `g' prefix). */ +@@ -34,20 +56,41 @@ + + #define AUTHORS proper_name ("David MacKenzie") + ++#define FATAL_ERROR(Message) \ ++ do \ ++ { \ ++ error (0, 0, (Message)); \ ++ usage (2); \ ++ } \ ++ while (0) ++ ++enum operating_mode ++{ ++ /* Fold texts by columns that are at the given positions. */ ++ column_mode, ++ ++ /* Fold texts by bytes that are at the given positions. */ ++ byte_mode, ++ ++ /* Fold texts by characters that are at the given positions. */ ++ character_mode, ++}; ++ ++/* The argument shows current mode. (Default: column_mode) */ ++static enum operating_mode operating_mode; ++ + /* If nonzero, try to break on whitespace. */ + static bool break_spaces; + +-/* If nonzero, count bytes, not column positions. */ +-static bool count_bytes; +- + /* If nonzero, at least one of the files we read was standard input. */ + static bool have_read_stdin; + +-static char const shortopts[] = "bsw:0::1::2::3::4::5::6::7::8::9::"; ++static char const shortopts[] = "bcsw:0::1::2::3::4::5::6::7::8::9::"; + + static struct option const longopts[] = + { + {"bytes", no_argument, NULL, 'b'}, ++ {"characters", no_argument, NULL, 'c'}, + {"spaces", no_argument, NULL, 's'}, + {"width", required_argument, NULL, 'w'}, + {GETOPT_HELP_OPTION_DECL}, +@@ -77,6 +120,7 @@ Mandatory arguments to long options are + "), stdout); + fputs (_("\ + -b, --bytes count bytes rather than columns\n\ ++ -c, --characters count characters rather than columns\n\ + -s, --spaces break at spaces\n\ + -w, --width=WIDTH use WIDTH columns instead of 80\n\ + "), stdout); +@@ -94,7 +138,7 @@ Mandatory arguments to long options are + static size_t + adjust_column (size_t column, char c) + { +- if (!count_bytes) ++ if (operating_mode != byte_mode) + { + if (c == '\b') + { +@@ -117,30 +161,14 @@ adjust_column (size_t column, char c) + to stdout, with maximum line length WIDTH. + Return true if successful. */ + +-static bool +-fold_file (char const *filename, size_t width) ++static void ++fold_text (FILE *istream, size_t width, int *saved_errno) + { +- FILE *istream; + int c; + size_t column = 0; /* Screen column where next char will go. */ + size_t offset_out = 0; /* Index in `line_out' for next char. */ + static char *line_out = NULL; + static size_t allocated_out = 0; +- int saved_errno; +- +- if (STREQ (filename, "-")) +- { +- istream = stdin; +- have_read_stdin = true; +- } +- else +- istream = fopen (filename, "r"); +- +- if (istream == NULL) +- { +- error (0, errno, "%s", filename); +- return false; +- } + + while ((c = getc (istream)) != EOF) + { +@@ -168,6 +196,15 @@ fold_file (char const *filename, size_t + bool found_blank = false; + size_t logical_end = offset_out; + ++ /* If LINE_OUT has no wide character, ++ put a new wide character in LINE_OUT ++ if column is bigger than width. */ ++ if (offset_out == 0) ++ { ++ line_out[offset_out++] = c; ++ continue; ++ } ++ + /* Look for the last blank. */ + while (logical_end) + { +@@ -214,11 +251,222 @@ fold_file (char const *filename, size_t + line_out[offset_out++] = c; + } + +- saved_errno = errno; ++ *saved_errno = errno; + + if (offset_out) + fwrite (line_out, sizeof (char), (size_t) offset_out, stdout); + ++} ++ ++#if HAVE_MBRTOWC ++static void ++fold_multibyte_text (FILE *istream, size_t width, int *saved_errno) ++{ ++ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ ++ size_t buflen = 0; /* The length of the byte sequence in buf. */ ++ char *bufpos = NULL; /* Next read position of BUF. */ ++ wint_t wc; /* A gotten wide character. */ ++ size_t mblength; /* The byte size of a multibyte character which shows ++ as same character as WC. */ ++ mbstate_t state, state_bak; /* State of the stream. */ ++ int convfail; /* 1, when conversion is failed. Otherwise 0. */ ++ ++ static char *line_out = NULL; ++ size_t offset_out = 0; /* Index in `line_out' for next char. */ ++ static size_t allocated_out = 0; ++ ++ int increment; ++ size_t column = 0; ++ ++ size_t last_blank_pos; ++ size_t last_blank_column; ++ int is_blank_seen; ++ int last_blank_increment = 0; ++ int is_bs_following_last_blank; ++ size_t bs_following_last_blank_num; ++ int is_cr_after_last_blank; ++ ++#define CLEAR_FLAGS \ ++ do \ ++ { \ ++ last_blank_pos = 0; \ ++ last_blank_column = 0; \ ++ is_blank_seen = 0; \ ++ is_bs_following_last_blank = 0; \ ++ bs_following_last_blank_num = 0; \ ++ is_cr_after_last_blank = 0; \ ++ } \ ++ while (0) ++ ++#define START_NEW_LINE \ ++ do \ ++ { \ ++ putchar ('\n'); \ ++ column = 0; \ ++ offset_out = 0; \ ++ CLEAR_FLAGS; \ ++ } \ ++ while (0) ++ ++ CLEAR_FLAGS; ++ memset (&state, '\0', sizeof(mbstate_t)); ++ ++ for (;; bufpos += mblength, buflen -= mblength) ++ { ++ if (buflen < MB_LEN_MAX && !feof (istream) && !ferror (istream)) ++ { ++ memmove (buf, bufpos, buflen); ++ buflen += fread (buf + buflen, sizeof(char), BUFSIZ, istream); ++ bufpos = buf; ++ } ++ ++ if (buflen < 1) ++ break; ++ ++ /* Get a wide character. */ ++ convfail = 0; ++ state_bak = state; ++ mblength = mbrtowc ((wchar_t *)&wc, bufpos, buflen, &state); ++ ++ switch (mblength) ++ { ++ case (size_t)-1: ++ case (size_t)-2: ++ convfail++; ++ state = state_bak; ++ /* Fall through. */ ++ ++ case 0: ++ mblength = 1; ++ break; ++ } ++ ++rescan: ++ if (operating_mode == byte_mode) /* byte mode */ ++ increment = mblength; ++ else if (operating_mode == character_mode) /* character mode */ ++ increment = 1; ++ else /* column mode */ ++ { ++ if (convfail) ++ increment = 1; ++ else ++ { ++ switch (wc) ++ { ++ case L'\n': ++ fwrite (line_out, sizeof(char), offset_out, stdout); ++ START_NEW_LINE; ++ continue; ++ ++ case L'\b': ++ increment = (column > 0) ? -1 : 0; ++ break; ++ ++ case L'\r': ++ increment = -1 * column; ++ break; ++ ++ case L'\t': ++ increment = 8 - column % 8; ++ break; ++ ++ default: ++ increment = wcwidth (wc); ++ increment = (increment < 0) ? 0 : increment; ++ } ++ } ++ } ++ ++ if (column + increment > width && break_spaces && last_blank_pos) ++ { ++ fwrite (line_out, sizeof(char), last_blank_pos, stdout); ++ putchar ('\n'); ++ ++ offset_out = offset_out - last_blank_pos; ++ column = column - last_blank_column + ((is_cr_after_last_blank) ++ ? last_blank_increment : bs_following_last_blank_num); ++ memmove (line_out, line_out + last_blank_pos, offset_out); ++ CLEAR_FLAGS; ++ goto rescan; ++ } ++ ++ if (column + increment > width && column != 0) ++ { ++ fwrite (line_out, sizeof(char), offset_out, stdout); ++ START_NEW_LINE; ++ goto rescan; ++ } ++ ++ if (allocated_out < offset_out + mblength) ++ { ++ line_out = X2REALLOC (line_out, &allocated_out); ++ } ++ ++ memcpy (line_out + offset_out, bufpos, mblength); ++ offset_out += mblength; ++ column += increment; ++ ++ if (is_blank_seen && !convfail && wc == L'\r') ++ is_cr_after_last_blank = 1; ++ ++ if (is_bs_following_last_blank && !convfail && wc == L'\b') ++ ++bs_following_last_blank_num; ++ else ++ is_bs_following_last_blank = 0; ++ ++ if (break_spaces && !convfail && iswblank (wc)) ++ { ++ last_blank_pos = offset_out; ++ last_blank_column = column; ++ is_blank_seen = 1; ++ last_blank_increment = increment; ++ is_bs_following_last_blank = 1; ++ bs_following_last_blank_num = 0; ++ is_cr_after_last_blank = 0; ++ } ++ } ++ ++ *saved_errno = errno; ++ ++ if (offset_out) ++ fwrite (line_out, sizeof (char), (size_t) offset_out, stdout); ++ ++} ++#endif ++ ++/* Fold file FILENAME, or standard input if FILENAME is "-", ++ to stdout, with maximum line length WIDTH. ++ Return 0 if successful, 1 if an error occurs. */ ++ ++static bool ++fold_file (char *filename, size_t width) ++{ ++ FILE *istream; ++ int saved_errno; ++ ++ if (STREQ (filename, "-")) ++ { ++ istream = stdin; ++ have_read_stdin = 1; ++ } ++ else ++ istream = fopen (filename, "r"); ++ ++ if (istream == NULL) ++ { ++ error (0, errno, "%s", filename); ++ return 1; ++ } ++ ++ /* Define how ISTREAM is being folded. */ ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1) ++ fold_multibyte_text (istream, width, &saved_errno); ++ else ++#endif ++ fold_text (istream, width, &saved_errno); ++ + if (ferror (istream)) + { + error (0, saved_errno, "%s", filename); +@@ -251,7 +499,8 @@ main (int argc, char **argv) + + atexit (close_stdout); + +- break_spaces = count_bytes = have_read_stdin = false; ++ operating_mode = column_mode; ++ break_spaces = have_read_stdin = false; + + while ((optc = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1) + { +@@ -260,7 +509,15 @@ main (int argc, char **argv) + switch (optc) + { + case 'b': /* Count bytes rather than columns. */ +- count_bytes = true; ++ if (operating_mode != column_mode) ++ FATAL_ERROR (_("only one way of folding may be specified")); ++ operating_mode = byte_mode; ++ break; ++ ++ case 'c': ++ if (operating_mode != column_mode) ++ FATAL_ERROR (_("only one way of folding may be specified")); ++ operating_mode = character_mode; + break; + + case 's': /* Break at word boundaries. */ +diff -urNp coreutils-8.5-orig/src/join.c coreutils-8.5/src/join.c +--- coreutils-8.5-orig/src/join.c 2010-04-20 21:52:04.000000000 +0200 ++++ coreutils-8.5/src/join.c 2010-04-26 14:24:33.000000000 +0200 +@@ -22,17 +22,31 @@ + #include <sys/types.h> + #include <getopt.h> + ++/* Get mbstate_t, mbrtowc(), mbrtowc(), wcwidth(). */ ++#if HAVE_WCHAR_H ++# include <wchar.h> ++#endif ++ ++/* Get iswblank(), towupper. */ ++#if HAVE_WCTYPE_H ++# include <wctype.h> ++#endif ++ + #include "system.h" + #include "error.h" + #include "hard-locale.h" + #include "linebuffer.h" +-#include "memcasecmp.h" + #include "quote.h" + #include "stdio--.h" + #include "xmemcoll.h" + #include "xstrtol.h" + #include "argmatch.h" + ++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ ++#if HAVE_MBRTOWC && defined mbstate_t ++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) ++#endif ++ + /* The official name of this program (e.g., no `g' prefix). */ + #define PROGRAM_NAME "join" + +@@ -121,10 +135,12 @@ static struct outlist outlist_head; + /* Last element in `outlist', where a new element can be added. */ + static struct outlist *outlist_end = &outlist_head; + +-/* Tab character separating fields. If negative, fields are separated +- by any nonempty string of blanks, otherwise by exactly one +- tab character whose value (when cast to unsigned char) equals TAB. */ +-static int tab = -1; ++/* Tab character separating fields. If NULL, fields are separated ++ by any nonempty string of blanks. */ ++static char *tab = NULL; ++ ++/* The number of bytes used for tab. */ ++static size_t tablen = 0; + + /* If nonzero, check that the input is correctly ordered. */ + static enum +@@ -248,10 +264,11 @@ xfields (struct line *line) + if (ptr == lim) + return; + +- if (0 <= tab) ++ if (tab != NULL) + { ++ unsigned char t = tab[0]; + char *sep; +- for (; (sep = memchr (ptr, tab, lim - ptr)) != NULL; ptr = sep + 1) ++ for (; (sep = memchr (ptr, t, lim - ptr)) != NULL; ptr = sep + 1) + extract_field (line, ptr, sep - ptr); + } + else +@@ -278,6 +295,148 @@ xfields (struct line *line) + extract_field (line, ptr, lim - ptr); + } + ++#if HAVE_MBRTOWC ++static void ++xfields_multibyte (struct line *line) ++{ ++ char *ptr = line->buf.buffer; ++ char const *lim = ptr + line->buf.length - 1; ++ wchar_t wc = 0; ++ size_t mblength = 1; ++ mbstate_t state, state_bak; ++ ++ memset (&state, 0, sizeof (mbstate_t)); ++ ++ if (ptr >= lim) ++ return; ++ ++ if (tab != NULL) ++ { ++ unsigned char t = tab[0]; ++ char *sep = ptr; ++ for (; ptr < lim; ptr = sep + mblength) ++ { ++ sep = ptr; ++ while (sep < lim) ++ { ++ state_bak = state; ++ mblength = mbrtowc (&wc, sep, lim - sep + 1, &state); ++ ++ if (mblength == (size_t)-1 || mblength == (size_t)-2) ++ { ++ mblength = 1; ++ state = state_bak; ++ } ++ mblength = (mblength < 1) ? 1 : mblength; ++ ++ if (mblength == tablen && !memcmp (sep, tab, mblength)) ++ break; ++ else ++ { ++ sep += mblength; ++ continue; ++ } ++ } ++ ++ if (sep >= lim) ++ break; ++ ++ extract_field (line, ptr, sep - ptr); ++ } ++ } ++ else ++ { ++ /* Skip leading blanks before the first field. */ ++ while(ptr < lim) ++ { ++ state_bak = state; ++ mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state); ++ ++ if (mblength == (size_t)-1 || mblength == (size_t)-2) ++ { ++ mblength = 1; ++ state = state_bak; ++ break; ++ } ++ mblength = (mblength < 1) ? 1 : mblength; ++ ++ if (!iswblank(wc)) ++ break; ++ ptr += mblength; ++ } ++ ++ do ++ { ++ char *sep; ++ state_bak = state; ++ mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state); ++ if (mblength == (size_t)-1 || mblength == (size_t)-2) ++ { ++ mblength = 1; ++ state = state_bak; ++ break; ++ } ++ mblength = (mblength < 1) ? 1 : mblength; ++ ++ sep = ptr + mblength; ++ while (sep < lim) ++ { ++ state_bak = state; ++ mblength = mbrtowc (&wc, sep, lim - sep + 1, &state); ++ if (mblength == (size_t)-1 || mblength == (size_t)-2) ++ { ++ mblength = 1; ++ state = state_bak; ++ break; ++ } ++ mblength = (mblength < 1) ? 1 : mblength; ++ ++ if (iswblank (wc)) ++ break; ++ ++ sep += mblength; ++ } ++ ++ extract_field (line, ptr, sep - ptr); ++ if (sep >= lim) ++ return; ++ ++ state_bak = state; ++ mblength = mbrtowc (&wc, sep, lim - sep + 1, &state); ++ if (mblength == (size_t)-1 || mblength == (size_t)-2) ++ { ++ mblength = 1; ++ state = state_bak; ++ break; ++ } ++ mblength = (mblength < 1) ? 1 : mblength; ++ ++ ptr = sep + mblength; ++ while (ptr < lim) ++ { ++ state_bak = state; ++ mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state); ++ if (mblength == (size_t)-1 || mblength == (size_t)-2) ++ { ++ mblength = 1; ++ state = state_bak; ++ break; ++ } ++ mblength = (mblength < 1) ? 1 : mblength; ++ ++ if (!iswblank (wc)) ++ break; ++ ++ ptr += mblength; ++ } ++ } ++ while (ptr < lim); ++ } ++ ++ extract_field (line, ptr, lim - ptr); ++} ++#endif ++ + static void + freeline (struct line *line) + { +@@ -299,56 +458,115 @@ keycmp (struct line const *line1, struct + size_t jf_1, size_t jf_2) + { + /* Start of field to compare in each file. */ +- char *beg1; +- char *beg2; +- +- size_t len1; +- size_t len2; /* Length of fields to compare. */ ++ char *beg[2]; ++ char *copy[2]; ++ size_t len[2]; /* Length of fields to compare. */ + int diff; ++ int i, j; + + if (jf_1 < line1->nfields) + { +- beg1 = line1->fields[jf_1].beg; +- len1 = line1->fields[jf_1].len; ++ beg[0] = line1->fields[jf_1].beg; ++ len[0] = line1->fields[jf_1].len; + } + else + { +- beg1 = NULL; +- len1 = 0; ++ beg[0] = NULL; ++ len[0] = 0; + } + + if (jf_2 < line2->nfields) + { +- beg2 = line2->fields[jf_2].beg; +- len2 = line2->fields[jf_2].len; ++ beg[1] = line2->fields[jf_2].beg; ++ len[1] = line2->fields[jf_2].len; + } + else + { +- beg2 = NULL; +- len2 = 0; ++ beg[1] = NULL; ++ len[1] = 0; + } + +- if (len1 == 0) +- return len2 == 0 ? 0 : -1; +- if (len2 == 0) ++ if (len[0] == 0) ++ return len[1] == 0 ? 0 : -1; ++ if (len[1] == 0) + return 1; + + if (ignore_case) + { +- /* FIXME: ignore_case does not work with NLS (in particular, +- with multibyte chars). */ +- diff = memcasecmp (beg1, beg2, MIN (len1, len2)); ++#ifdef HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1) ++ { ++ size_t mblength; ++ wchar_t wc, uwc; ++ mbstate_t state, state_bak; ++ ++ memset (&state, '\0', sizeof (mbstate_t)); ++ ++ for (i = 0; i < 2; i++) ++ { ++ copy[i] = alloca (len[i] + 1); ++ ++ for (j = 0; j < MIN (len[0], len[1]);) ++ { ++ state_bak = state; ++ mblength = mbrtowc (&wc, beg[i] + j, len[i] - j, &state); ++ ++ switch (mblength) ++ { ++ case (size_t) -1: ++ case (size_t) -2: ++ state = state_bak; ++ /* Fall through */ ++ case 0: ++ mblength = 1; ++ break; ++ ++ default: ++ uwc = towupper (wc); ++ ++ if (uwc != wc) ++ { ++ mbstate_t state_wc; ++ ++ memset (&state_wc, '\0', sizeof (mbstate_t)); ++ wcrtomb (copy[i] + j, uwc, &state_wc); ++ } ++ else ++ memcpy (copy[i] + j, beg[i] + j, mblength); ++ } ++ j += mblength; ++ } ++ copy[i][j] = '\0'; ++ } ++ } ++ else ++#endif ++ { ++ for (i = 0; i < 2; i++) ++ { ++ copy[i] = alloca (len[i] + 1); ++ ++ for (j = 0; j < MIN (len[0], len[1]); j++) ++ copy[i][j] = toupper (beg[i][j]); ++ ++ copy[i][j] = '\0'; ++ } ++ } + } + else + { +- if (hard_LC_COLLATE) +- return xmemcoll (beg1, len1, beg2, len2); +- diff = memcmp (beg1, beg2, MIN (len1, len2)); ++ copy[0] = (unsigned char *) beg[0]; ++ copy[1] = (unsigned char *) beg[1]; + } + ++ if (hard_LC_COLLATE) ++ return xmemcoll ((char *) copy[0], len[0], (char *) copy[1], len[1]); ++ diff = memcmp (copy[0], copy[1], MIN (len[0], len[1])); ++ ++ + if (diff) + return diff; +- return len1 < len2 ? -1 : len1 != len2; ++ return len[0] - len[1]; + } + + /* Check that successive input lines PREV and CURRENT from input file +@@ -429,6 +647,11 @@ get_line (FILE *fp, struct line **linep, + return false; + } + ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1) ++ xfields_multibyte (line); ++ else ++#endif + xfields (line); + + if (prevline[which - 1]) +@@ -528,11 +751,18 @@ prfield (size_t n, struct line const *li + + /* Print the join of LINE1 and LINE2. */ + ++#define PUT_TAB_CHAR \ ++ do \ ++ { \ ++ (tab != NULL) ? \ ++ fwrite(tab, sizeof(char), tablen, stdout) : putchar (' '); \ ++ } \ ++ while (0) ++ + static void + prjoin (struct line const *line1, struct line const *line2) + { + const struct outlist *outlist; +- char output_separator = tab < 0 ? ' ' : tab; + + outlist = outlist_head.next; + if (outlist) +@@ -567,7 +797,7 @@ prjoin (struct line const *line1, struct + o = o->next; + if (o == NULL) + break; +- putchar (output_separator); ++ PUT_TAB_CHAR; + } + putchar ('\n'); + } +@@ -585,23 +815,23 @@ prjoin (struct line const *line1, struct + prfield (join_field_1, line1); + for (i = 0; i < join_field_1 && i < line1->nfields; ++i) + { +- putchar (output_separator); ++ PUT_TAB_CHAR; + prfield (i, line1); + } + for (i = join_field_1 + 1; i < line1->nfields; ++i) + { +- putchar (output_separator); ++ PUT_TAB_CHAR; + prfield (i, line1); + } + + for (i = 0; i < join_field_2 && i < line2->nfields; ++i) + { +- putchar (output_separator); ++ PUT_TAB_CHAR; + prfield (i, line2); + } + for (i = join_field_2 + 1; i < line2->nfields; ++i) + { +- putchar (output_separator); ++ PUT_TAB_CHAR; + prfield (i, line2); + } + putchar ('\n'); +@@ -1039,21 +1269,46 @@ main (int argc, char **argv) + + case 't': + { +- unsigned char newtab = optarg[0]; ++ char *newtab; ++ size_t newtablen; ++ newtab = xstrdup (optarg); ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1) ++ { ++ mbstate_t state; ++ ++ memset (&state, 0, sizeof (mbstate_t)); ++ newtablen = mbrtowc (NULL, newtab, ++ strnlen (newtab, MB_LEN_MAX), ++ &state); ++ if (newtablen == (size_t) 0 ++ || newtablen == (size_t) -1 ++ || newtablen == (size_t) -2) ++ newtablen = 1; ++ } ++ else ++#endif ++ newtablen = 1; + if (! newtab) ++ { + newtab = '\n'; /* '' => process the whole line. */ ++ } + else if (optarg[1]) + { +- if (STREQ (optarg, "\\0")) +- newtab = '\0'; +- else +- error (EXIT_FAILURE, 0, _("multi-character tab %s"), +- quote (optarg)); ++ if (newtablen == 1 && newtab[1]) ++ { ++ if (STREQ (newtab, "\\0")) ++ newtab[0] = '\0'; ++ } ++ } ++ if (tab != NULL && strcmp (tab, newtab)) ++ { ++ free (newtab); ++ error (EXIT_FAILURE, 0, _("incompatible tabs")); + } +- if (0 <= tab && tab != newtab) +- error (EXIT_FAILURE, 0, _("incompatible tabs")); + tab = newtab; +- } ++ tablen = newtablen; ++ } + break; + + case NOCHECK_ORDER_OPTION: +diff -urNp coreutils-8.5-orig/src/pr.c coreutils-8.5/src/pr.c +--- coreutils-8.5-orig/src/pr.c 2010-03-13 16:14:09.000000000 +0100 ++++ coreutils-8.5/src/pr.c 2010-04-26 14:24:33.000000000 +0200 +@@ -312,6 +312,32 @@ + + #include <getopt.h> + #include <sys/types.h> ++ ++/* Get MB_LEN_MAX. */ ++#include <limits.h> ++/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC ++ installation; work around this configuration error. */ ++#if !defined MB_LEN_MAX || MB_LEN_MAX == 1 ++# define MB_LEN_MAX 16 ++#endif ++ ++/* Get MB_CUR_MAX. */ ++#include <stdlib.h> ++ ++/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */ ++/* Get mbstate_t, mbrtowc(), wcwidth(). */ ++#if HAVE_WCHAR_H ++# include <wchar.h> ++#endif ++ ++/* Get iswprint(). -- for wcwidth(). */ ++#if HAVE_WCTYPE_H ++# include <wctype.h> ++#endif ++#if !defined iswprint && !HAVE_ISWPRINT ++# define iswprint(wc) 1 ++#endif ++ + #include "system.h" + #include "error.h" + #include "hard-locale.h" +@@ -322,6 +348,18 @@ + #include "strftime.h" + #include "xstrtol.h" + ++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ ++#if HAVE_MBRTOWC && defined mbstate_t ++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) ++#endif ++ ++#ifndef HAVE_DECL_WCWIDTH ++"this configure-time declaration test was not run" ++#endif ++#if !HAVE_DECL_WCWIDTH ++extern int wcwidth (); ++#endif ++ + /* The official name of this program (e.g., no `g' prefix). */ + #define PROGRAM_NAME "pr" + +@@ -414,7 +452,20 @@ struct COLUMN + + typedef struct COLUMN COLUMN; + +-static int char_to_clump (char c); ++/* Funtion pointers to switch functions for single byte locale or for ++ multibyte locale. If multibyte functions do not exist in your sysytem, ++ these pointers always point the function for single byte locale. */ ++static void (*print_char) (char c); ++static int (*char_to_clump) (char c); ++ ++/* Functions for single byte locale. */ ++static void print_char_single (char c); ++static int char_to_clump_single (char c); ++ ++/* Functions for multibyte locale. */ ++static void print_char_multi (char c); ++static int char_to_clump_multi (char c); ++ + static bool read_line (COLUMN *p); + static bool print_page (void); + static bool print_stored (COLUMN *p); +@@ -424,6 +475,7 @@ static void print_header (void); + static void pad_across_to (int position); + static void add_line_number (COLUMN *p); + static void getoptarg (char *arg, char switch_char, char *character, ++ int *character_length, int *character_width, + int *number); + void usage (int status); + static void print_files (int number_of_files, char **av); +@@ -438,7 +490,6 @@ static void store_char (char c); + static void pad_down (int lines); + static void read_rest_of_line (COLUMN *p); + static void skip_read (COLUMN *p, int column_number); +-static void print_char (char c); + static void cleanup (void); + static void print_sep_string (void); + static void separator_string (const char *optarg_S); +@@ -450,7 +501,7 @@ static COLUMN *column_vector; + we store the leftmost columns contiguously in buff. + To print a line from buff, get the index of the first character + from line_vector[i], and print up to line_vector[i + 1]. */ +-static char *buff; ++static unsigned char *buff; + + /* Index of the position in buff where the next character + will be stored. */ +@@ -554,7 +605,7 @@ static int chars_per_column; + static bool untabify_input = false; + + /* (-e) The input tab character. */ +-static char input_tab_char = '\t'; ++static char input_tab_char[MB_LEN_MAX] = "\t"; + + /* (-e) Tabstops are at chars_per_tab, 2*chars_per_tab, 3*chars_per_tab, ... + where the leftmost column is 1. */ +@@ -564,7 +615,10 @@ static int chars_per_input_tab = 8; + static bool tabify_output = false; + + /* (-i) The output tab character. */ +-static char output_tab_char = '\t'; ++static char output_tab_char[MB_LEN_MAX] = "\t"; ++ ++/* (-i) The byte length of output tab character. */ ++static int output_tab_char_length = 1; + + /* (-i) The width of the output tab. */ + static int chars_per_output_tab = 8; +@@ -638,7 +692,13 @@ static int power_10; + static bool numbered_lines = false; + + /* (-n) Character which follows each line number. */ +-static char number_separator = '\t'; ++static char number_separator[MB_LEN_MAX] = "\t"; ++ ++/* (-n) The byte length of the character which follows each line number. */ ++static int number_separator_length = 1; ++ ++/* (-n) The character width of the character which follows each line number. */ ++static int number_separator_width = 0; + + /* (-n) line counting starts with 1st line of input file (not with 1st + line of 1st page printed). */ +@@ -691,6 +751,7 @@ static bool use_col_separator = false; + -a|COLUMN|-m is a `space' and with the -J option a `tab'. */ + static char *col_sep_string = (char *) ""; + static int col_sep_length = 0; ++static int col_sep_width = 0; + static char *column_separator = (char *) " "; + static char *line_separator = (char *) "\t"; + +@@ -847,6 +908,13 @@ separator_string (const char *optarg_S) + col_sep_length = (int) strlen (optarg_S); + col_sep_string = xmalloc (col_sep_length + 1); + strcpy (col_sep_string, optarg_S); ++ ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1) ++ col_sep_width = mbswidth (col_sep_string, 0); ++ else ++#endif ++ col_sep_width = col_sep_length; + } + + int +@@ -871,6 +939,21 @@ main (int argc, char **argv) + + atexit (close_stdout); + ++/* Define which functions are used, the ones for single byte locale or the ones ++ for multibyte locale. */ ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1) ++ { ++ print_char = print_char_multi; ++ char_to_clump = char_to_clump_multi; ++ } ++ else ++#endif ++ { ++ print_char = print_char_single; ++ char_to_clump = char_to_clump_single; ++ } ++ + n_files = 0; + file_names = (argc > 1 + ? xmalloc ((argc - 1) * sizeof (char *)) +@@ -947,8 +1030,12 @@ main (int argc, char **argv) + break; + case 'e': + if (optarg) +- getoptarg (optarg, 'e', &input_tab_char, +- &chars_per_input_tab); ++ { ++ int dummy_length, dummy_width; ++ ++ getoptarg (optarg, 'e', input_tab_char, &dummy_length, ++ &dummy_width, &chars_per_input_tab); ++ } + /* Could check tab width > 0. */ + untabify_input = true; + break; +@@ -961,8 +1048,12 @@ main (int argc, char **argv) + break; + case 'i': + if (optarg) +- getoptarg (optarg, 'i', &output_tab_char, +- &chars_per_output_tab); ++ { ++ int dummy_width; ++ ++ getoptarg (optarg, 'i', output_tab_char, &output_tab_char_length, ++ &dummy_width, &chars_per_output_tab); ++ } + /* Could check tab width > 0. */ + tabify_output = true; + break; +@@ -989,8 +1080,8 @@ main (int argc, char **argv) + case 'n': + numbered_lines = true; + if (optarg) +- getoptarg (optarg, 'n', &number_separator, +- &chars_per_number); ++ getoptarg (optarg, 'n', number_separator, &number_separator_length, ++ &number_separator_width, &chars_per_number); + break; + case 'N': + skip_count = false; +@@ -1029,7 +1120,7 @@ main (int argc, char **argv) + old_s = false; + /* Reset an additional input of -s, -S dominates -s */ + col_sep_string = bad_cast (""); +- col_sep_length = 0; ++ col_sep_length = col_sep_width = 0; + use_col_separator = true; + if (optarg) + separator_string (optarg); +@@ -1186,10 +1277,45 @@ main (int argc, char **argv) + a number. */ + + static void +-getoptarg (char *arg, char switch_char, char *character, int *number) ++getoptarg (char *arg, char switch_char, char *character, int *character_length, ++ int *character_width, int *number) + { + if (!ISDIGIT (*arg)) +- *character = *arg++; ++ { ++#ifdef HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1) /* for multibyte locale. */ ++ { ++ wchar_t wc; ++ size_t mblength; ++ int width; ++ mbstate_t state = {'\0'}; ++ ++ mblength = mbrtowc (&wc, arg, strnlen(arg, MB_LEN_MAX), &state); ++ ++ if (mblength == (size_t)-1 || mblength == (size_t)-2) ++ { ++ *character_length = 1; ++ *character_width = 1; ++ } ++ else ++ { ++ *character_length = (mblength < 1) ? 1 : mblength; ++ width = wcwidth (wc); ++ *character_width = (width < 0) ? 0 : width; ++ } ++ ++ strncpy (character, arg, *character_length); ++ arg += *character_length; ++ } ++ else /* for single byte locale. */ ++#endif ++ { ++ *character = *arg++; ++ *character_length = 1; ++ *character_width = 1; ++ } ++ } ++ + if (*arg) + { + long int tmp_long; +@@ -1248,7 +1374,7 @@ init_parameters (int number_of_files) + else + col_sep_string = column_separator; + +- col_sep_length = 1; ++ col_sep_length = col_sep_width = 1; + use_col_separator = true; + } + /* It's rather pointless to define a TAB separator with column +@@ -1279,11 +1405,11 @@ init_parameters (int number_of_files) + TAB_WIDTH (chars_per_input_tab, chars_per_number); */ + + /* Estimate chars_per_text without any margin and keep it constant. */ +- if (number_separator == '\t') ++ if (number_separator[0] == '\t') + number_width = chars_per_number + + TAB_WIDTH (chars_per_default_tab, chars_per_number); + else +- number_width = chars_per_number + 1; ++ number_width = chars_per_number + number_separator_width; + + /* The number is part of the column width unless we are + printing files in parallel. */ +@@ -1298,7 +1424,7 @@ init_parameters (int number_of_files) + } + + chars_per_column = (chars_per_line - chars_used_by_number - +- (columns - 1) * col_sep_length) / columns; ++ (columns - 1) * col_sep_width) / columns; + + if (chars_per_column < 1) + error (EXIT_FAILURE, 0, _("page width too narrow")); +@@ -1423,7 +1549,7 @@ init_funcs (void) + + /* Enlarge p->start_position of first column to use the same form of + padding_not_printed with all columns. */ +- h = h + col_sep_length; ++ h = h + col_sep_width; + + /* This loop takes care of all but the rightmost column. */ + +@@ -1457,7 +1583,7 @@ init_funcs (void) + } + else + { +- h = h_next + col_sep_length; ++ h = h_next + col_sep_width; + h_next = h + chars_per_column; + } + } +@@ -1747,9 +1873,9 @@ static void + align_column (COLUMN *p) + { + padding_not_printed = p->start_position; +- if (padding_not_printed - col_sep_length > 0) ++ if (padding_not_printed - col_sep_width > 0) + { +- pad_across_to (padding_not_printed - col_sep_length); ++ pad_across_to (padding_not_printed - col_sep_width); + padding_not_printed = ANYWHERE; + } + +@@ -2020,13 +2146,13 @@ store_char (char c) + /* May be too generous. */ + buff = X2REALLOC (buff, &buff_allocated); + } +- buff[buff_current++] = c; ++ buff[buff_current++] = (unsigned char) c; + } + + static void + add_line_number (COLUMN *p) + { +- int i; ++ int i, j; + char *s; + int left_cut; + +@@ -2049,22 +2175,24 @@ add_line_number (COLUMN *p) + /* Tabification is assumed for multiple columns, also for n-separators, + but `default n-separator = TAB' hasn't been given priority over + equal column_width also specified by POSIX. */ +- if (number_separator == '\t') ++ if (number_separator[0] == '\t') + { + i = number_width - chars_per_number; + while (i-- > 0) + (p->char_func) (' '); + } + else +- (p->char_func) (number_separator); ++ for (j = 0; j < number_separator_length; j++) ++ (p->char_func) (number_separator[j]); + } + else + /* To comply with POSIX, we avoid any expansion of default TAB + separator with a single column output. No column_width requirement + has to be considered. */ + { +- (p->char_func) (number_separator); +- if (number_separator == '\t') ++ for (j = 0; j < number_separator_length; j++) ++ (p->char_func) (number_separator[j]); ++ if (number_separator[0] == '\t') + output_position = POS_AFTER_TAB (chars_per_output_tab, + output_position); + } +@@ -2225,7 +2353,7 @@ print_white_space (void) + while (goal - h_old > 1 + && (h_new = POS_AFTER_TAB (chars_per_output_tab, h_old)) <= goal) + { +- putchar (output_tab_char); ++ fwrite (output_tab_char, sizeof(char), output_tab_char_length, stdout); + h_old = h_new; + } + while (++h_old <= goal) +@@ -2245,6 +2373,7 @@ print_sep_string (void) + { + char *s; + int l = col_sep_length; ++ int not_space_flag; + + s = col_sep_string; + +@@ -2258,6 +2387,7 @@ print_sep_string (void) + { + for (; separators_not_printed > 0; --separators_not_printed) + { ++ not_space_flag = 0; + while (l-- > 0) + { + /* 3 types of sep_strings: spaces only, spaces and chars, +@@ -2271,12 +2401,15 @@ print_sep_string (void) + } + else + { ++ not_space_flag = 1; + if (spaces_not_printed > 0) + print_white_space (); + putchar (*s++); +- ++output_position; + } + } ++ if (not_space_flag) ++ output_position += col_sep_width; ++ + /* sep_string ends with some spaces */ + if (spaces_not_printed > 0) + print_white_space (); +@@ -2304,7 +2437,7 @@ print_clump (COLUMN *p, int n, char *clu + required number of tabs and spaces. */ + + static void +-print_char (char c) ++print_char_single (char c) + { + if (tabify_output) + { +@@ -2328,6 +2461,74 @@ print_char (char c) + putchar (c); + } + ++#ifdef HAVE_MBRTOWC ++static void ++print_char_multi (char c) ++{ ++ static size_t mbc_pos = 0; ++ static char mbc[MB_LEN_MAX] = {'\0'}; ++ static mbstate_t state = {'\0'}; ++ mbstate_t state_bak; ++ wchar_t wc; ++ size_t mblength; ++ int width; ++ ++ if (tabify_output) ++ { ++ state_bak = state; ++ mbc[mbc_pos++] = c; ++ mblength = mbrtowc (&wc, mbc, mbc_pos, &state); ++ ++ while (mbc_pos > 0) ++ { ++ switch (mblength) ++ { ++ case (size_t)-2: ++ state = state_bak; ++ return; ++ ++ case (size_t)-1: ++ state = state_bak; ++ ++output_position; ++ putchar (mbc[0]); ++ memmove (mbc, mbc + 1, MB_CUR_MAX - 1); ++ --mbc_pos; ++ break; ++ ++ case 0: ++ mblength = 1; ++ ++ default: ++ if (wc == L' ') ++ { ++ memmove (mbc, mbc + mblength, MB_CUR_MAX - mblength); ++ --mbc_pos; ++ ++spaces_not_printed; ++ return; ++ } ++ else if (spaces_not_printed > 0) ++ print_white_space (); ++ ++ /* Nonprintables are assumed to have width 0, except L'\b'. */ ++ if ((width = wcwidth (wc)) < 1) ++ { ++ if (wc == L'\b') ++ --output_position; ++ } ++ else ++ output_position += width; ++ ++ fwrite (mbc, sizeof(char), mblength, stdout); ++ memmove (mbc, mbc + mblength, MB_CUR_MAX - mblength); ++ mbc_pos -= mblength; ++ } ++ } ++ return; ++ } ++ putchar (c); ++} ++#endif ++ + /* Skip to page PAGE before printing. + PAGE may be larger than total number of pages. */ + +@@ -2507,9 +2708,9 @@ read_line (COLUMN *p) + align_empty_cols = false; + } + +- if (padding_not_printed - col_sep_length > 0) ++ if (padding_not_printed - col_sep_width > 0) + { +- pad_across_to (padding_not_printed - col_sep_length); ++ pad_across_to (padding_not_printed - col_sep_width); + padding_not_printed = ANYWHERE; + } + +@@ -2610,9 +2811,9 @@ print_stored (COLUMN *p) + } + } + +- if (padding_not_printed - col_sep_length > 0) ++ if (padding_not_printed - col_sep_width > 0) + { +- pad_across_to (padding_not_printed - col_sep_length); ++ pad_across_to (padding_not_printed - col_sep_width); + padding_not_printed = ANYWHERE; + } + +@@ -2625,8 +2826,8 @@ print_stored (COLUMN *p) + if (spaces_not_printed == 0) + { + output_position = p->start_position + end_vector[line]; +- if (p->start_position - col_sep_length == chars_per_margin) +- output_position -= col_sep_length; ++ if (p->start_position - col_sep_width == chars_per_margin) ++ output_position -= col_sep_width; + } + + return true; +@@ -2645,7 +2846,7 @@ print_stored (COLUMN *p) + number of characters is 1.) */ + + static int +-char_to_clump (char c) ++char_to_clump_single (char c) + { + unsigned char uc = c; + char *s = clump_buff; +@@ -2655,10 +2856,10 @@ char_to_clump (char c) + int chars; + int chars_per_c = 8; + +- if (c == input_tab_char) ++ if (c == input_tab_char[0]) + chars_per_c = chars_per_input_tab; + +- if (c == input_tab_char || c == '\t') ++ if (c == input_tab_char[0] || c == '\t') + { + width = TAB_WIDTH (chars_per_c, input_position); + +@@ -2739,6 +2940,154 @@ char_to_clump (char c) + return chars; + } + ++#ifdef HAVE_MBRTOWC ++static int ++char_to_clump_multi (char c) ++{ ++ static size_t mbc_pos = 0; ++ static char mbc[MB_LEN_MAX] = {'\0'}; ++ static mbstate_t state = {'\0'}; ++ mbstate_t state_bak; ++ wchar_t wc; ++ size_t mblength; ++ int wc_width; ++ register char *s = clump_buff; ++ register int i, j; ++ char esc_buff[4]; ++ int width; ++ int chars; ++ int chars_per_c = 8; ++ ++ state_bak = state; ++ mbc[mbc_pos++] = c; ++ mblength = mbrtowc (&wc, mbc, mbc_pos, &state); ++ ++ width = 0; ++ chars = 0; ++ while (mbc_pos > 0) ++ { ++ switch (mblength) ++ { ++ case (size_t)-2: ++ state = state_bak; ++ return 0; ++ ++ case (size_t)-1: ++ state = state_bak; ++ mblength = 1; ++ ++ if (use_esc_sequence || use_cntrl_prefix) ++ { ++ width = +4; ++ chars = +4; ++ *s++ = '\\'; ++ sprintf (esc_buff, "%03o", mbc[0]); ++ for (i = 0; i <= 2; ++i) ++ *s++ = (int) esc_buff[i]; ++ } ++ else ++ { ++ width += 1; ++ chars += 1; ++ *s++ = mbc[0]; ++ } ++ break; ++ ++ case 0: ++ mblength = 1; ++ /* Fall through */ ++ ++ default: ++ if (memcmp (mbc, input_tab_char, mblength) == 0) ++ chars_per_c = chars_per_input_tab; ++ ++ if (memcmp (mbc, input_tab_char, mblength) == 0 || c == '\t') ++ { ++ int width_inc; ++ ++ width_inc = TAB_WIDTH (chars_per_c, input_position); ++ width += width_inc; ++ ++ if (untabify_input) ++ { ++ for (i = width_inc; i; --i) ++ *s++ = ' '; ++ chars += width_inc; ++ } ++ else ++ { ++ for (i = 0; i < mblength; i++) ++ *s++ = mbc[i]; ++ chars += mblength; ++ } ++ } ++ else if ((wc_width = wcwidth (wc)) < 1) ++ { ++ if (use_esc_sequence) ++ { ++ for (i = 0; i < mblength; i++) ++ { ++ width += 4; ++ chars += 4; ++ *s++ = '\\'; ++ sprintf (esc_buff, "%03o", c); ++ for (j = 0; j <= 2; ++j) ++ *s++ = (int) esc_buff[j]; ++ } ++ } ++ else if (use_cntrl_prefix) ++ { ++ if (wc < 0200) ++ { ++ width += 2; ++ chars += 2; ++ *s++ = '^'; ++ *s++ = wc ^ 0100; ++ } ++ else ++ { ++ for (i = 0; i < mblength; i++) ++ { ++ width += 4; ++ chars += 4; ++ *s++ = '\\'; ++ sprintf (esc_buff, "%03o", c); ++ for (j = 0; j <= 2; ++j) ++ *s++ = (int) esc_buff[j]; ++ } ++ } ++ } ++ else if (wc == L'\b') ++ { ++ width += -1; ++ chars += 1; ++ *s++ = c; ++ } ++ else ++ { ++ width += 0; ++ chars += mblength; ++ for (i = 0; i < mblength; i++) ++ *s++ = mbc[i]; ++ } ++ } ++ else ++ { ++ width += wc_width; ++ chars += mblength; ++ for (i = 0; i < mblength; i++) ++ *s++ = mbc[i]; ++ } ++ } ++ memmove (mbc, mbc + mblength, MB_CUR_MAX - mblength); ++ mbc_pos -= mblength; ++ } ++ ++ input_position += width; ++ return chars; ++} ++#endif ++ + /* We've just printed some files and need to clean up things before + looking for more options and printing the next batch of files. + +diff -urNp coreutils-8.5-orig/src/sort.c coreutils-8.5/src/sort.c +--- coreutils-8.5-orig/src/sort.c 2010-04-21 09:06:17.000000000 +0200 ++++ coreutils-8.5/src/sort.c 2010-04-26 14:24:33.000000000 +0200 +@@ -22,10 +22,19 @@ + + #include <config.h> + ++#include <assert.h> + #include <getopt.h> + #include <sys/types.h> + #include <sys/wait.h> + #include <signal.h> ++#if HAVE_WCHAR_H ++# include <wchar.h> ++#endif ++/* Get isw* functions. */ ++#if HAVE_WCTYPE_H ++# include <wctype.h> ++#endif ++ + #include "system.h" + #include "argmatch.h" + #include "error.h" +@@ -124,14 +133,38 @@ static int decimal_point; + /* Thousands separator; if -1, then there isn't one. */ + static int thousands_sep; + ++static int force_general_numcompare = 0; ++ + /* Nonzero if the corresponding locales are hard. */ + static bool hard_LC_COLLATE; +-#if HAVE_NL_LANGINFO ++#if HAVE_LANGINFO_CODESET + static bool hard_LC_TIME; + #endif + + #define NONZERO(x) ((x) != 0) + ++/* get a multibyte character's byte length. */ ++#define GET_BYTELEN_OF_CHAR(LIM, PTR, MBLENGTH, STATE) \ ++ do \ ++ { \ ++ wchar_t wc; \ ++ mbstate_t state_bak; \ ++ \ ++ state_bak = STATE; \ ++ mblength = mbrtowc (&wc, PTR, LIM - PTR, &STATE); \ ++ \ ++ switch (MBLENGTH) \ ++ { \ ++ case (size_t)-1: \ ++ case (size_t)-2: \ ++ STATE = state_bak; \ ++ /* Fall through. */ \ ++ case 0: \ ++ MBLENGTH = 1; \ ++ } \ ++ } \ ++ while (0) ++ + /* The kind of blanks for '-b' to skip in various options. */ + enum blanktype { bl_start, bl_end, bl_both }; + +@@ -270,13 +303,11 @@ static bool reverse; + they were read if all keys compare equal. */ + static bool stable; + +-/* If TAB has this value, blanks separate fields. */ +-enum { TAB_DEFAULT = CHAR_MAX + 1 }; +- +-/* Tab character separating fields. If TAB_DEFAULT, then fields are ++/* Tab character separating fields. If tab_length is 0, then fields are + separated by the empty string between a non-blank character and a blank + character. */ +-static int tab = TAB_DEFAULT; ++static char tab[MB_LEN_MAX + 1]; ++static size_t tab_length = 0; + + /* Flag to remove consecutive duplicate lines from the output. + Only the last of a sequence of equal lines will be output. */ +@@ -714,6 +745,44 @@ reap_some (void) + update_proc (pid); + } + ++/* Function pointers. */ ++static void ++(*inittables) (void); ++static char * ++(*begfield) (const struct line*, const struct keyfield *); ++static char * ++(*limfield) (const struct line*, const struct keyfield *); ++static int ++(*getmonth) (char const *, size_t); ++static int ++(*keycompare) (const struct line *, const struct line *); ++static int ++(*numcompare) (const char *, const char *); ++ ++/* Test for white space multibyte character. ++ Set LENGTH the byte length of investigated multibyte character. */ ++#if HAVE_MBRTOWC ++static int ++ismbblank (const char *str, size_t len, size_t *length) ++{ ++ size_t mblength; ++ wchar_t wc; ++ mbstate_t state; ++ ++ memset (&state, '\0', sizeof(mbstate_t)); ++ mblength = mbrtowc (&wc, str, len, &state); ++ ++ if (mblength == (size_t)-1 || mblength == (size_t)-2) ++ { ++ *length = 1; ++ return 0; ++ } ++ ++ *length = (mblength < 1) ? 1 : mblength; ++ return iswblank (wc); ++} ++#endif ++ + /* Clean up any remaining temporary files. */ + + static void +@@ -1158,7 +1227,7 @@ zaptemp (const char *name) + free (node); + } + +-#if HAVE_NL_LANGINFO ++#if HAVE_LANGINFO_CODESET + + static int + struct_month_cmp (const void *m1, const void *m2) +@@ -1173,7 +1242,7 @@ struct_month_cmp (const void *m1, const + /* Initialize the character class tables. */ + + static void +-inittables (void) ++inittables_uni (void) + { + size_t i; + +@@ -1185,7 +1254,7 @@ inittables (void) + fold_toupper[i] = toupper (i); + } + +-#if HAVE_NL_LANGINFO ++#if HAVE_LANGINFO_CODESET + /* If we're not in the "C" locale, read different names for months. */ + if (hard_LC_TIME) + { +@@ -1268,6 +1337,64 @@ specify_nmerge (int oi, char c, char con + xstrtol_fatal (e, oi, c, long_options, s); + } + ++#if HAVE_MBRTOWC ++static void ++inittables_mb (void) ++{ ++ int i, j, k, l; ++ char *name, *s; ++ size_t s_len, mblength; ++ char mbc[MB_LEN_MAX]; ++ wchar_t wc, pwc; ++ mbstate_t state_mb, state_wc; ++ ++ for (i = 0; i < MONTHS_PER_YEAR; i++) ++ { ++ s = (char *) nl_langinfo (ABMON_1 + i); ++ s_len = strlen (s); ++ monthtab[i].name = name = (char *) xmalloc (s_len + 1); ++ monthtab[i].val = i + 1; ++ ++ memset (&state_mb, '\0', sizeof (mbstate_t)); ++ memset (&state_wc, '\0', sizeof (mbstate_t)); ++ ++ for (j = 0; j < s_len;) ++ { ++ if (!ismbblank (s + j, s_len - j, &mblength)) ++ break; ++ j += mblength; ++ } ++ ++ for (k = 0; j < s_len;) ++ { ++ mblength = mbrtowc (&wc, (s + j), (s_len - j), &state_mb); ++ assert (mblength != (size_t)-1 && mblength != (size_t)-2); ++ if (mblength == 0) ++ break; ++ ++ pwc = towupper (wc); ++ if (pwc == wc) ++ { ++ memcpy (mbc, s + j, mblength); ++ j += mblength; ++ } ++ else ++ { ++ j += mblength; ++ mblength = wcrtomb (mbc, pwc, &state_wc); ++ assert (mblength != (size_t)0 && mblength != (size_t)-1); ++ } ++ ++ for (l = 0; l < mblength; l++) ++ name[k++] = mbc[l]; ++ } ++ name[k] = '\0'; ++ } ++ qsort ((void *) monthtab, MONTHS_PER_YEAR, ++ sizeof (struct month), struct_month_cmp); ++} ++#endif ++ + /* Specify the amount of main memory to use when sorting. */ + static void + specify_sort_size (int oi, char c, char const *s) +@@ -1478,7 +1605,7 @@ buffer_linelim (struct buffer const *buf + by KEY in LINE. */ + + static char * +-begfield (const struct line *line, const struct keyfield *key) ++begfield_uni (const struct line *line, const struct keyfield *key) + { + char *ptr = line->text, *lim = ptr + line->length - 1; + size_t sword = key->sword; +@@ -1487,10 +1614,10 @@ begfield (const struct line *line, const + /* The leading field separator itself is included in a field when -t + is absent. */ + +- if (tab != TAB_DEFAULT) ++ if (tab_length) + while (ptr < lim && sword--) + { +- while (ptr < lim && *ptr != tab) ++ while (ptr < lim && *ptr != tab[0]) + ++ptr; + if (ptr < lim) + ++ptr; +@@ -1516,11 +1643,70 @@ begfield (const struct line *line, const + return ptr; + } + ++#if HAVE_MBRTOWC ++static char * ++begfield_mb (const struct line *line, const struct keyfield *key) ++{ ++ int i; ++ char *ptr = line->text, *lim = ptr + line->length - 1; ++ size_t sword = key->sword; ++ size_t schar = key->schar; ++ size_t mblength; ++ mbstate_t state; ++ ++ memset (&state, '\0', sizeof(mbstate_t)); ++ ++ if (tab_length) ++ while (ptr < lim && sword--) ++ { ++ while (ptr < lim && memcmp (ptr, tab, tab_length) != 0) ++ { ++ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); ++ ptr += mblength; ++ } ++ if (ptr < lim) ++ { ++ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); ++ ptr += mblength; ++ } ++ } ++ else ++ while (ptr < lim && sword--) ++ { ++ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) ++ ptr += mblength; ++ if (ptr < lim) ++ { ++ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); ++ ptr += mblength; ++ } ++ while (ptr < lim && !ismbblank (ptr, lim - ptr, &mblength)) ++ ptr += mblength; ++ } ++ ++ if (key->skipsblanks) ++ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) ++ ptr += mblength; ++ ++ for (i = 0; i < schar; i++) ++ { ++ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); ++ ++ if (ptr + mblength > lim) ++ break; ++ else ++ ptr += mblength; ++ } ++ ++ return ptr; ++} ++#endif ++ + /* Return the limit of (a pointer to the first character after) the field + in LINE specified by KEY. */ + + static char * +-limfield (const struct line *line, const struct keyfield *key) ++limfield_uni (const struct line *line, const struct keyfield *key) + { + char *ptr = line->text, *lim = ptr + line->length - 1; + size_t eword = key->eword, echar = key->echar; +@@ -1535,10 +1721,10 @@ limfield (const struct line *line, const + `beginning' is the first character following the delimiting TAB. + Otherwise, leave PTR pointing at the first `blank' character after + the preceding field. */ +- if (tab != TAB_DEFAULT) ++ if (tab_length) + while (ptr < lim && eword--) + { +- while (ptr < lim && *ptr != tab) ++ while (ptr < lim && *ptr != tab[0]) + ++ptr; + if (ptr < lim && (eword || echar)) + ++ptr; +@@ -1584,10 +1770,10 @@ limfield (const struct line *line, const + */ + + /* Make LIM point to the end of (one byte past) the current field. */ +- if (tab != TAB_DEFAULT) ++ if (tab_length) + { + char *newlim; +- newlim = memchr (ptr, tab, lim - ptr); ++ newlim = memchr (ptr, tab[0], lim - ptr); + if (newlim) + lim = newlim; + } +@@ -1618,6 +1804,113 @@ limfield (const struct line *line, const + return ptr; + } + ++#if HAVE_MBRTOWC ++static char * ++limfield_mb (const struct line *line, const struct keyfield *key) ++{ ++ char *ptr = line->text, *lim = ptr + line->length - 1; ++ size_t eword = key->eword, echar = key->echar; ++ int i; ++ size_t mblength; ++ mbstate_t state; ++ ++ if (echar == 0) ++ eword++; /* skip all of end field. */ ++ ++ memset (&state, '\0', sizeof(mbstate_t)); ++ ++ if (tab_length) ++ while (ptr < lim && eword--) ++ { ++ while (ptr < lim && memcmp (ptr, tab, tab_length) != 0) ++ { ++ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); ++ ptr += mblength; ++ } ++ if (ptr < lim && (eword | echar)) ++ { ++ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); ++ ptr += mblength; ++ } ++ } ++ else ++ while (ptr < lim && eword--) ++ { ++ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) ++ ptr += mblength; ++ if (ptr < lim) ++ { ++ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); ++ ptr += mblength; ++ } ++ while (ptr < lim && !ismbblank (ptr, lim - ptr, &mblength)) ++ ptr += mblength; ++ } ++ ++ ++# ifdef POSIX_UNSPECIFIED ++ /* Make LIM point to the end of (one byte past) the current field. */ ++ if (tab_length) ++ { ++ char *newlim, *p; ++ ++ newlim = NULL; ++ for (p = ptr; p < lim;) ++ { ++ if (memcmp (p, tab, tab_length) == 0) ++ { ++ newlim = p; ++ break; ++ } ++ ++ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); ++ p += mblength; ++ } ++ } ++ else ++ { ++ char *newlim; ++ newlim = ptr; ++ ++ while (newlim < lim && ismbblank (newlim, lim - newlim, &mblength)) ++ newlim += mblength; ++ if (ptr < lim) ++ { ++ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); ++ ptr += mblength; ++ } ++ while (newlim < lim && !ismbblank (newlim, lim - newlim, &mblength)) ++ newlim += mblength; ++ lim = newlim; ++ } ++# endif ++ ++ if (echar != 0) ++ { ++ /* If we're skipping leading blanks, don't start counting characters ++ * until after skipping past any leading blanks. */ ++ if (key->skipsblanks) ++ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) ++ ptr += mblength; ++ ++ memset (&state, '\0', sizeof(mbstate_t)); ++ ++ /* Advance PTR by ECHAR (if possible), but no further than LIM. */ ++ for (i = 0; i < echar; i++) ++ { ++ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); ++ ++ if (ptr + mblength > lim) ++ break; ++ else ++ ptr += mblength; ++ } ++ } ++ ++ return ptr; ++} ++#endif ++ + /* Fill BUF reading from FP, moving buf->left bytes from the end + of buf->buf to the beginning first. If EOF is reached and the + file wasn't terminated by a newline, supply one. Set up BUF's line +@@ -1700,8 +1993,24 @@ fillbuf (struct buffer *buf, FILE *fp, c + else + { + if (key->skipsblanks) +- while (blanks[to_uchar (*line_start)]) +- line_start++; ++ { ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1) ++ { ++ size_t mblength; ++ mbstate_t state; ++ memset (&state, '\0', sizeof(mbstate_t)); ++ while (line_start < line->keylim && ++ ismbblank (line_start, ++ line->keylim - line_start, ++ &mblength)) ++ line_start += mblength; ++ } ++ else ++#endif ++ while (blanks[to_uchar (*line_start)]) ++ line_start++; ++ } + line->keybeg = line_start; + } + } +@@ -1739,7 +2048,7 @@ fillbuf (struct buffer *buf, FILE *fp, c + hideously fast. */ + + static int +-numcompare (const char *a, const char *b) ++numcompare_uni (const char *a, const char *b) + { + while (blanks[to_uchar (*a)]) + a++; +@@ -1848,6 +2157,25 @@ human_numcompare (const char *a, const c + : strnumcmp (a, b, decimal_point, thousands_sep)); + } + ++#if HAVE_MBRTOWC ++static int ++numcompare_mb (const char *a, const char *b) ++{ ++ size_t mblength, len; ++ len = strlen (a); /* okay for UTF-8 */ ++ while (*a && ismbblank (a, len > MB_CUR_MAX ? MB_CUR_MAX : len, &mblength)) ++ { ++ a += mblength; ++ len -= mblength; ++ } ++ len = strlen (b); /* okay for UTF-8 */ ++ while (*b && ismbblank (b, len > MB_CUR_MAX ? MB_CUR_MAX : len, &mblength)) ++ b += mblength; ++ ++ return strnumcmp (a, b, decimal_point, thousands_sep); ++} ++#endif /* HAV_EMBRTOWC */ ++ + static int + general_numcompare (const char *sa, const char *sb) + { +@@ -1881,7 +2209,7 @@ general_numcompare (const char *sa, cons + Return 0 if the name in S is not recognized. */ + + static int +-getmonth (char const *month, size_t len) ++getmonth_uni (char const *month, size_t len) + { + size_t lo = 0; + size_t hi = MONTHS_PER_YEAR; +@@ -2062,11 +2390,79 @@ compare_version (char *restrict texta, s + return diff; + } + ++#if HAVE_MBRTOWC ++static int ++getmonth_mb (const char *s, size_t len) ++{ ++ char *month; ++ register size_t i; ++ register int lo = 0, hi = MONTHS_PER_YEAR, result; ++ char *tmp; ++ size_t wclength, mblength; ++ const char **pp; ++ const wchar_t **wpp; ++ wchar_t *month_wcs; ++ mbstate_t state; ++ ++ while (len > 0 && ismbblank (s, len, &mblength)) ++ { ++ s += mblength; ++ len -= mblength; ++ } ++ ++ if (len == 0) ++ return 0; ++ ++ month = (char *) alloca (len + 1); ++ ++ tmp = (char *) alloca (len + 1); ++ memcpy (tmp, s, len); ++ tmp[len] = '\0'; ++ pp = (const char **)&tmp; ++ month_wcs = (wchar_t *) alloca ((len + 1) * sizeof (wchar_t)); ++ memset (&state, '\0', sizeof(mbstate_t)); ++ ++ wclength = mbsrtowcs (month_wcs, pp, len + 1, &state); ++ assert (wclength != (size_t)-1 && *pp == NULL); ++ ++ for (i = 0; i < wclength; i++) ++ { ++ month_wcs[i] = towupper(month_wcs[i]); ++ if (iswblank (month_wcs[i])) ++ { ++ month_wcs[i] = L'\0'; ++ break; ++ } ++ } ++ ++ wpp = (const wchar_t **)&month_wcs; ++ ++ mblength = wcsrtombs (month, wpp, len + 1, &state); ++ assert (mblength != (-1) && *wpp == NULL); ++ ++ do ++ { ++ int ix = (lo + hi) / 2; ++ ++ if (strncmp (month, monthtab[ix].name, strlen (monthtab[ix].name)) < 0) ++ hi = ix; ++ else ++ lo = ix; ++ } ++ while (hi - lo > 1); ++ ++ result = (!strncmp (month, monthtab[lo].name, strlen (monthtab[lo].name)) ++ ? monthtab[lo].val : 0); ++ ++ return result; ++} ++#endif ++ + /* Compare two lines A and B trying every key in sequence until there + are no more keys or a difference is found. */ + + static int +-keycompare (const struct line *a, const struct line *b) ++keycompare_uni (const struct line *a, const struct line *b) + { + struct keyfield *key = keylist; + +@@ -2246,6 +2642,179 @@ keycompare (const struct line *a, const + return key->reverse ? -diff : diff; + } + ++#if HAVE_MBRTOWC ++static int ++keycompare_mb (const struct line *a, const struct line *b) ++{ ++ struct keyfield *key = keylist; ++ ++ /* For the first iteration only, the key positions have been ++ precomputed for us. */ ++ char *texta = a->keybeg; ++ char *textb = b->keybeg; ++ char *lima = a->keylim; ++ char *limb = b->keylim; ++ ++ size_t mblength_a, mblength_b; ++ wchar_t wc_a, wc_b; ++ mbstate_t state_a, state_b; ++ ++ int diff; ++ ++ memset (&state_a, '\0', sizeof(mbstate_t)); ++ memset (&state_b, '\0', sizeof(mbstate_t)); ++ ++ for (;;) ++ { ++ char const *translate = key->translate; ++ bool const *ignore = key->ignore; ++ ++ /* Find the lengths. */ ++ size_t lena = lima <= texta ? 0 : lima - texta; ++ size_t lenb = limb <= textb ? 0 : limb - textb; ++ ++ /* Actually compare the fields. */ ++ if (key->random) ++ diff = compare_random (texta, lena, textb, lenb); ++ else if (key->numeric | key->general_numeric | key->human_numeric) ++ { ++ char savea = *lima, saveb = *limb; ++ ++ *lima = *limb = '\0'; ++ diff = (key->numeric ? numcompare (texta, textb) ++ : key->general_numeric ? general_numcompare (texta, textb) ++ : human_numcompare (texta, textb, key)); ++ *lima = savea, *limb = saveb; ++ } ++ else if (key->version) ++ diff = compare_version (texta, lena, textb, lenb); ++ else if (key->month) ++ diff = getmonth (texta, lena) - getmonth (textb, lenb); ++ else ++ { ++ if (ignore || translate) ++ { ++ char *copy_a = (char *) alloca (lena + 1 + lenb + 1); ++ char *copy_b = copy_a + lena + 1; ++ size_t new_len_a, new_len_b; ++ size_t i, j; ++ ++ /* Ignore and/or translate chars before comparing. */ ++# define IGNORE_CHARS(NEW_LEN, LEN, TEXT, COPY, WC, MBLENGTH, STATE) \ ++ do \ ++ { \ ++ wchar_t uwc; \ ++ char mbc[MB_LEN_MAX]; \ ++ mbstate_t state_wc; \ ++ \ ++ for (NEW_LEN = i = 0; i < LEN;) \ ++ { \ ++ mbstate_t state_bak; \ ++ \ ++ state_bak = STATE; \ ++ MBLENGTH = mbrtowc (&WC, TEXT + i, LEN - i, &STATE); \ ++ \ ++ if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1 \ ++ || MBLENGTH == 0) \ ++ { \ ++ if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1) \ ++ STATE = state_bak; \ ++ if (!ignore) \ ++ COPY[NEW_LEN++] = TEXT[i++]; \ ++ continue; \ ++ } \ ++ \ ++ if (ignore) \ ++ { \ ++ if ((ignore == nonprinting && !iswprint (WC)) \ ++ || (ignore == nondictionary \ ++ && !iswalnum (WC) && !iswblank (WC))) \ ++ { \ ++ i += MBLENGTH; \ ++ continue; \ ++ } \ ++ } \ ++ \ ++ if (translate) \ ++ { \ ++ \ ++ uwc = towupper(WC); \ ++ if (WC == uwc) \ ++ { \ ++ memcpy (mbc, TEXT + i, MBLENGTH); \ ++ i += MBLENGTH; \ ++ } \ ++ else \ ++ { \ ++ i += MBLENGTH; \ ++ WC = uwc; \ ++ memset (&state_wc, '\0', sizeof (mbstate_t)); \ ++ \ ++ MBLENGTH = wcrtomb (mbc, WC, &state_wc); \ ++ assert (MBLENGTH != (size_t)-1 && MBLENGTH != 0); \ ++ } \ ++ \ ++ for (j = 0; j < MBLENGTH; j++) \ ++ COPY[NEW_LEN++] = mbc[j]; \ ++ } \ ++ else \ ++ for (j = 0; j < MBLENGTH; j++) \ ++ COPY[NEW_LEN++] = TEXT[i++]; \ ++ } \ ++ COPY[NEW_LEN] = '\0'; \ ++ } \ ++ while (0) ++ IGNORE_CHARS (new_len_a, lena, texta, copy_a, ++ wc_a, mblength_a, state_a); ++ IGNORE_CHARS (new_len_b, lenb, textb, copy_b, ++ wc_b, mblength_b, state_b); ++ diff = xmemcoll (copy_a, new_len_a, copy_b, new_len_b); ++ } ++ else if (lena == 0) ++ diff = - NONZERO (lenb); ++ else if (lenb == 0) ++ goto greater; ++ else ++ diff = xmemcoll (texta, lena, textb, lenb); ++ } ++ ++ if (diff) ++ goto not_equal; ++ ++ key = key->next; ++ if (! key) ++ break; ++ ++ /* Find the beginning and limit of the next field. */ ++ if (key->eword != -1) ++ lima = limfield (a, key), limb = limfield (b, key); ++ else ++ lima = a->text + a->length - 1, limb = b->text + b->length - 1; ++ ++ if (key->sword != -1) ++ texta = begfield (a, key), textb = begfield (b, key); ++ else ++ { ++ texta = a->text, textb = b->text; ++ if (key->skipsblanks) ++ { ++ while (texta < lima && ismbblank (texta, lima - texta, &mblength_a)) ++ texta += mblength_a; ++ while (textb < limb && ismbblank (textb, limb - textb, &mblength_b)) ++ textb += mblength_b; ++ } ++ } ++ } ++ ++ return 0; ++ ++greater: ++ diff = 1; ++not_equal: ++ return key->reverse ? -diff : diff; ++} ++#endif ++ + /* Compare two lines A and B, returning negative, zero, or positive + depending on whether A compares less than, equal to, or greater than B. */ + +@@ -3244,7 +3813,7 @@ main (int argc, char **argv) + initialize_exit_failure (SORT_FAILURE); + + hard_LC_COLLATE = hard_locale (LC_COLLATE); +-#if HAVE_NL_LANGINFO ++#if HAVE_LANGINFO_CODESET + hard_LC_TIME = hard_locale (LC_TIME); + #endif + +@@ -3265,6 +3834,27 @@ main (int argc, char **argv) + thousands_sep = -1; + } + ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1) ++ { ++ inittables = inittables_mb; ++ begfield = begfield_mb; ++ limfield = limfield_mb; ++ getmonth = getmonth_mb; ++ keycompare = keycompare_mb; ++ numcompare = numcompare_mb; ++ } ++ else ++#endif ++ { ++ inittables = inittables_uni; ++ begfield = begfield_uni; ++ limfield = limfield_uni; ++ getmonth = getmonth_uni; ++ keycompare = keycompare_uni; ++ numcompare = numcompare_uni; ++ } ++ + have_read_stdin = false; + inittables (); + +@@ -3536,13 +4126,35 @@ main (int argc, char **argv) + + case 't': + { +- char newtab = optarg[0]; +- if (! newtab) ++ char newtab[MB_LEN_MAX + 1]; ++ size_t newtab_length = 1; ++ strncpy (newtab, optarg, MB_LEN_MAX); ++ if (! newtab[0]) + error (SORT_FAILURE, 0, _("empty tab")); +- if (optarg[1]) ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1) ++ { ++ wchar_t wc; ++ mbstate_t state; ++ size_t i; ++ ++ memset (&state, '\0', sizeof (mbstate_t)); ++ newtab_length = mbrtowc (&wc, newtab, strnlen (newtab, ++ MB_LEN_MAX), ++ &state); ++ switch (newtab_length) ++ { ++ case (size_t) -1: ++ case (size_t) -2: ++ case 0: ++ newtab_length = 1; ++ } ++ } ++#endif ++ if (newtab_length == 1 && optarg[1]) + { + if (STREQ (optarg, "\\0")) +- newtab = '\0'; ++ newtab[0] = '\0'; + else + { + /* Provoke with `sort -txx'. Complain about +@@ -3553,9 +4165,12 @@ main (int argc, char **argv) + quote (optarg)); + } + } +- if (tab != TAB_DEFAULT && tab != newtab) ++ if (tab_length ++ && (tab_length != newtab_length ++ || memcmp (tab, newtab, tab_length) != 0)) + error (SORT_FAILURE, 0, _("incompatible tabs")); +- tab = newtab; ++ memcpy (tab, newtab, newtab_length); ++ tab_length = newtab_length; + } + break; + +diff -urNp coreutils-8.5-orig/src/unexpand.c coreutils-8.5/src/unexpand.c +--- coreutils-8.5-orig/src/unexpand.c 2010-01-01 14:06:47.000000000 +0100 ++++ coreutils-8.5/src/unexpand.c 2010-04-26 14:24:33.000000000 +0200 +@@ -39,11 +39,28 @@ + #include <stdio.h> + #include <getopt.h> + #include <sys/types.h> ++ ++/* Get mbstate_t, mbrtowc(), wcwidth(). */ ++#if HAVE_WCHAR_H ++# include <wchar.h> ++#endif ++ + #include "system.h" + #include "error.h" + #include "quote.h" + #include "xstrndup.h" + ++/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC ++ installation; work around this configuration error. */ ++#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 ++# define MB_LEN_MAX 16 ++#endif ++ ++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ ++#if HAVE_MBRTOWC && defined mbstate_t ++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) ++#endif ++ + /* The official name of this program (e.g., no `g' prefix). */ + #define PROGRAM_NAME "unexpand" + +@@ -103,6 +120,208 @@ static struct option const longopts[] = + {NULL, 0, NULL, 0} + }; + ++static FILE *next_file (FILE *fp); ++ ++#if HAVE_MBRTOWC ++static void ++unexpand_multibyte (void) ++{ ++ FILE *fp; /* Input stream. */ ++ mbstate_t i_state; /* Current shift state of the input stream. */ ++ mbstate_t i_state_bak; /* Back up the I_STATE. */ ++ mbstate_t o_state; /* Current shift state of the output stream. */ ++ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ ++ char *bufpos; /* Next read position of BUF. */ ++ size_t buflen = 0; /* The length of the byte sequence in buf. */ ++ wint_t wc; /* A gotten wide character. */ ++ size_t mblength; /* The byte size of a multibyte character ++ which shows as same character as WC. */ ++ ++ /* Index in `tab_list' of next tabstop: */ ++ int tab_index = 0; /* For calculating width of pending tabs. */ ++ int print_tab_index = 0; /* For printing as many tabs as possible. */ ++ unsigned int column = 0; /* Column on screen of next char. */ ++ int next_tab_column; /* Column the next tab stop is on. */ ++ int convert = 1; /* If nonzero, perform translations. */ ++ unsigned int pending = 0; /* Pending columns of blanks. */ ++ ++ fp = next_file ((FILE *) NULL); ++ if (fp == NULL) ++ return; ++ ++ memset (&o_state, '\0', sizeof(mbstate_t)); ++ memset (&i_state, '\0', sizeof(mbstate_t)); ++ ++ for (;;) ++ { ++ if (buflen < MB_LEN_MAX && !feof(fp) && !ferror(fp)) ++ { ++ memmove (buf, bufpos, buflen); ++ buflen += fread (buf + buflen, sizeof(char), BUFSIZ, fp); ++ bufpos = buf; ++ } ++ ++ /* Get a wide character. */ ++ if (buflen < 1) ++ { ++ mblength = 1; ++ wc = WEOF; ++ } ++ else ++ { ++ i_state_bak = i_state; ++ mblength = mbrtowc ((wchar_t *)&wc, bufpos, buflen, &i_state); ++ } ++ ++ if (mblength == (size_t)-1 || mblength == (size_t)-2) ++ { ++ i_state = i_state_bak; ++ wc = L'\0'; ++ } ++ ++ if (wc == L' ' && convert && column < INT_MAX) ++ { ++ ++pending; ++ ++column; ++ } ++ else if (wc == L'\t' && convert) ++ { ++ if (tab_size == 0) ++ { ++ /* Do not let tab_index == first_free_tab; ++ stop when it is 1 less. */ ++ while (tab_index < first_free_tab - 1 ++ && column >= tab_list[tab_index]) ++ tab_index++; ++ next_tab_column = tab_list[tab_index]; ++ if (tab_index < first_free_tab - 1) ++ tab_index++; ++ if (column >= next_tab_column) ++ { ++ convert = 0; /* Ran out of tab stops. */ ++ goto flush_pend_mb; ++ } ++ } ++ else ++ { ++ next_tab_column = column + tab_size - column % tab_size; ++ } ++ pending += next_tab_column - column; ++ column = next_tab_column; ++ } ++ else ++ { ++flush_pend_mb: ++ /* Flush pending spaces. Print as many tabs as possible, ++ then print the rest as spaces. */ ++ if (pending == 1) ++ { ++ putchar (' '); ++ pending = 0; ++ } ++ column -= pending; ++ while (pending > 0) ++ { ++ if (tab_size == 0) ++ { ++ /* Do not let print_tab_index == first_free_tab; ++ stop when it is 1 less. */ ++ while (print_tab_index < first_free_tab - 1 ++ && column >= tab_list[print_tab_index]) ++ print_tab_index++; ++ next_tab_column = tab_list[print_tab_index]; ++ if (print_tab_index < first_free_tab - 1) ++ print_tab_index++; ++ } ++ else ++ { ++ next_tab_column = ++ column + tab_size - column % tab_size; ++ } ++ if (next_tab_column - column <= pending) ++ { ++ putchar ('\t'); ++ pending -= next_tab_column - column; ++ column = next_tab_column; ++ } ++ else ++ { ++ --print_tab_index; ++ column += pending; ++ while (pending != 0) ++ { ++ putchar (' '); ++ pending--; ++ } ++ } ++ } ++ ++ if (wc == WEOF) ++ { ++ fp = next_file (fp); ++ if (fp == NULL) ++ break; /* No more files. */ ++ else ++ { ++ memset (&i_state, '\0', sizeof(mbstate_t)); ++ continue; ++ } ++ } ++ ++ if (mblength == (size_t)-1 || mblength == (size_t)-2) ++ { ++ if (convert) ++ { ++ ++column; ++ if (convert_entire_line == 0) ++ convert = 0; ++ } ++ mblength = 1; ++ putchar (buf[0]); ++ } ++ else if (mblength == 0) ++ { ++ if (convert && convert_entire_line == 0) ++ convert = 0; ++ mblength = 1; ++ putchar ('\0'); ++ } ++ else ++ { ++ if (convert) ++ { ++ if (wc == L'\b') ++ { ++ if (column > 0) ++ --column; ++ } ++ else ++ { ++ int width; /* The width of WC. */ ++ ++ width = wcwidth (wc); ++ column += (width > 0) ? width : 0; ++ if (convert_entire_line == 0) ++ convert = 0; ++ } ++ } ++ ++ if (wc == L'\n') ++ { ++ tab_index = print_tab_index = 0; ++ column = pending = 0; ++ convert = 1; ++ } ++ fwrite (bufpos, sizeof(char), mblength, stdout); ++ } ++ } ++ buflen -= mblength; ++ bufpos += mblength; ++ } ++} ++#endif ++ ++ + void + usage (int status) + { +@@ -524,7 +743,12 @@ main (int argc, char **argv) + + file_list = (optind < argc ? &argv[optind] : stdin_argv); + +- unexpand (); ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1) ++ unexpand_multibyte (); ++ else ++#endif ++ unexpand (); + + if (have_read_stdin && fclose (stdin) != 0) + error (EXIT_FAILURE, errno, "-"); +diff -urNp coreutils-8.5-orig/src/uniq.c coreutils-8.5/src/uniq.c +--- coreutils-8.5-orig/src/uniq.c 2010-03-13 16:14:09.000000000 +0100 ++++ coreutils-8.5/src/uniq.c 2010-04-26 14:24:33.000000000 +0200 +@@ -21,6 +21,16 @@ + #include <getopt.h> + #include <sys/types.h> + ++/* Get mbstate_t, mbrtowc(). */ ++#if HAVE_WCHAR_H ++# include <wchar.h> ++#endif ++ ++/* Get isw* functions. */ ++#if HAVE_WCTYPE_H ++# include <wctype.h> ++#endif ++ + #include "system.h" + #include "argmatch.h" + #include "linebuffer.h" +@@ -31,7 +41,19 @@ + #include "stdio--.h" + #include "xmemcoll.h" + #include "xstrtol.h" +-#include "memcasecmp.h" ++#include "xmemcoll.h" ++ ++/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC ++ installation; work around this configuration error. */ ++#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 ++# define MB_LEN_MAX 16 ++#endif ++ ++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ ++#if HAVE_MBRTOWC && defined mbstate_t ++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) ++#endif ++ + + /* The official name of this program (e.g., no `g' prefix). */ + #define PROGRAM_NAME "uniq" +@@ -107,6 +129,10 @@ static enum delimit_method const delimit + /* Select whether/how to delimit groups of duplicate lines. */ + static enum delimit_method delimit_groups; + ++/* Function pointers. */ ++static char * ++(*find_field) (struct linebuffer *line); ++ + static struct option const longopts[] = + { + {"count", no_argument, NULL, 'c'}, +@@ -206,7 +232,7 @@ size_opt (char const *opt, char const *m + return a pointer to the beginning of the line's field to be compared. */ + + static char * +-find_field (struct linebuffer const *line) ++find_field_uni (struct linebuffer *line) + { + size_t count; + char const *lp = line->buffer; +@@ -227,6 +253,83 @@ find_field (struct linebuffer const *lin + return line->buffer + i; + } + ++#if HAVE_MBRTOWC ++ ++# define MBCHAR_TO_WCHAR(WC, MBLENGTH, LP, POS, SIZE, STATEP, CONVFAIL) \ ++ do \ ++ { \ ++ mbstate_t state_bak; \ ++ \ ++ CONVFAIL = 0; \ ++ state_bak = *STATEP; \ ++ \ ++ MBLENGTH = mbrtowc (&WC, LP + POS, SIZE - POS, STATEP); \ ++ \ ++ switch (MBLENGTH) \ ++ { \ ++ case (size_t)-2: \ ++ case (size_t)-1: \ ++ *STATEP = state_bak; \ ++ CONVFAIL++; \ ++ /* Fall through */ \ ++ case 0: \ ++ MBLENGTH = 1; \ ++ } \ ++ } \ ++ while (0) ++ ++static char * ++find_field_multi (struct linebuffer *line) ++{ ++ size_t count; ++ char *lp = line->buffer; ++ size_t size = line->length - 1; ++ size_t pos; ++ size_t mblength; ++ wchar_t wc; ++ mbstate_t *statep; ++ int convfail; ++ ++ pos = 0; ++ statep = &(line->state); ++ ++ /* skip fields. */ ++ for (count = 0; count < skip_fields && pos < size; count++) ++ { ++ while (pos < size) ++ { ++ MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); ++ ++ if (convfail || !iswblank (wc)) ++ { ++ pos += mblength; ++ break; ++ } ++ pos += mblength; ++ } ++ ++ while (pos < size) ++ { ++ MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); ++ ++ if (!convfail && iswblank (wc)) ++ break; ++ ++ pos += mblength; ++ } ++ } ++ ++ /* skip fields. */ ++ for (count = 0; count < skip_chars && pos < size; count++) ++ { ++ MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); ++ pos += mblength; ++ } ++ ++ return lp + pos; ++} ++#endif ++ + /* Return false if two strings OLD and NEW match, true if not. + OLD and NEW point not to the beginnings of the lines + but rather to the beginnings of the fields to compare. +@@ -235,6 +338,8 @@ find_field (struct linebuffer const *lin + static bool + different (char *old, char *new, size_t oldlen, size_t newlen) + { ++ char *copy_old, *copy_new; ++ + if (check_chars < oldlen) + oldlen = check_chars; + if (check_chars < newlen) +@@ -242,14 +347,92 @@ different (char *old, char *new, size_t + + if (ignore_case) + { +- /* FIXME: This should invoke strcoll somehow. */ +- return oldlen != newlen || memcasecmp (old, new, oldlen); ++ size_t i; ++ ++ copy_old = alloca (oldlen + 1); ++ copy_new = alloca (oldlen + 1); ++ ++ for (i = 0; i < oldlen; i++) ++ { ++ copy_old[i] = toupper (old[i]); ++ copy_new[i] = toupper (new[i]); ++ } + } +- else if (hard_LC_COLLATE) +- return xmemcoll (old, oldlen, new, newlen) != 0; + else +- return oldlen != newlen || memcmp (old, new, oldlen); ++ { ++ copy_old = (char *)old; ++ copy_new = (char *)new; ++ } ++ ++ return xmemcoll (copy_old, oldlen, copy_new, newlen); ++} ++ ++#if HAVE_MBRTOWC ++static int ++different_multi (const char *old, const char *new, size_t oldlen, size_t newlen, mbstate_t oldstate, mbstate_t newstate) ++{ ++ size_t i, j, chars; ++ const char *str[2]; ++ char *copy[2]; ++ size_t len[2]; ++ mbstate_t state[2]; ++ size_t mblength; ++ wchar_t wc, uwc; ++ mbstate_t state_bak; ++ ++ str[0] = old; ++ str[1] = new; ++ len[0] = oldlen; ++ len[1] = newlen; ++ state[0] = oldstate; ++ state[1] = newstate; ++ ++ for (i = 0; i < 2; i++) ++ { ++ copy[i] = alloca (len[i] + 1); ++ ++ for (j = 0, chars = 0; j < len[i] && chars < check_chars; chars++) ++ { ++ state_bak = state[i]; ++ mblength = mbrtowc (&wc, str[i] + j, len[i] - j, &(state[i])); ++ ++ switch (mblength) ++ { ++ case (size_t)-1: ++ case (size_t)-2: ++ state[i] = state_bak; ++ /* Fall through */ ++ case 0: ++ mblength = 1; ++ break; ++ ++ default: ++ if (ignore_case) ++ { ++ uwc = towupper (wc); ++ ++ if (uwc != wc) ++ { ++ mbstate_t state_wc; ++ ++ memset (&state_wc, '\0', sizeof(mbstate_t)); ++ wcrtomb (copy[i] + j, uwc, &state_wc); ++ } ++ else ++ memcpy (copy[i] + j, str[i] + j, mblength); ++ } ++ else ++ memcpy (copy[i] + j, str[i] + j, mblength); ++ } ++ j += mblength; ++ } ++ copy[i][j] = '\0'; ++ len[i] = j; ++ } ++ ++ return xmemcoll (copy[0], len[0], copy[1], len[1]); + } ++#endif + + /* Output the line in linebuffer LINE to standard output + provided that the switches say it should be output. +@@ -303,15 +486,43 @@ check_file (const char *infile, const ch + { + char *prevfield IF_LINT (= NULL); + size_t prevlen IF_LINT (= 0); ++#if HAVE_MBRTOWC ++ mbstate_t prevstate; ++ ++ memset (&prevstate, '\0', sizeof (mbstate_t)); ++#endif + + while (!feof (stdin)) + { + char *thisfield; + size_t thislen; ++#if HAVE_MBRTOWC ++ mbstate_t thisstate; ++#endif ++ + if (readlinebuffer_delim (thisline, stdin, delimiter) == 0) + break; + thisfield = find_field (thisline); + thislen = thisline->length - 1 - (thisfield - thisline->buffer); ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1) ++ { ++ thisstate = thisline->state; ++ ++ if (prevline->length == 0 || different_multi ++ (thisfield, prevfield, thislen, prevlen, thisstate, prevstate)) ++ { ++ fwrite (thisline->buffer, sizeof (char), ++ thisline->length, stdout); ++ ++ SWAP_LINES (prevline, thisline); ++ prevfield = thisfield; ++ prevlen = thislen; ++ prevstate = thisstate; ++ } ++ } ++ else ++#endif + if (prevline->length == 0 + || different (thisfield, prevfield, thislen, prevlen)) + { +@@ -330,17 +541,26 @@ check_file (const char *infile, const ch + size_t prevlen; + uintmax_t match_count = 0; + bool first_delimiter = true; ++#if HAVE_MBRTOWC ++ mbstate_t prevstate; ++#endif + + if (readlinebuffer_delim (prevline, stdin, delimiter) == 0) + goto closefiles; + prevfield = find_field (prevline); + prevlen = prevline->length - 1 - (prevfield - prevline->buffer); ++#if HAVE_MBRTOWC ++ prevstate = prevline->state; ++#endif + + while (!feof (stdin)) + { + bool match; + char *thisfield; + size_t thislen; ++#if HAVE_MBRTOWC ++ mbstate_t thisstate; ++#endif + if (readlinebuffer_delim (thisline, stdin, delimiter) == 0) + { + if (ferror (stdin)) +@@ -349,6 +569,15 @@ check_file (const char *infile, const ch + } + thisfield = find_field (thisline); + thislen = thisline->length - 1 - (thisfield - thisline->buffer); ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1) ++ { ++ thisstate = thisline->state; ++ match = !different_multi (thisfield, prevfield, ++ thislen, prevlen, thisstate, prevstate); ++ } ++ else ++#endif + match = !different (thisfield, prevfield, thislen, prevlen); + match_count += match; + +@@ -381,6 +610,9 @@ check_file (const char *infile, const ch + SWAP_LINES (prevline, thisline); + prevfield = thisfield; + prevlen = thislen; ++#if HAVE_MBRTOWC ++ prevstate = thisstate; ++#endif + if (!match) + match_count = 0; + } +@@ -426,6 +658,19 @@ main (int argc, char **argv) + + atexit (close_stdout); + ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1) ++ { ++ find_field = find_field_multi; ++ } ++ else ++#endif ++ { ++ find_field = find_field_uni; ++ } ++ ++ ++ + skip_chars = 0; + skip_fields = 0; + check_chars = SIZE_MAX; +diff -urNp coreutils-8.5-orig/tests/Makefile.am coreutils-8.5/tests/Makefile.am +--- coreutils-8.5-orig/tests/Makefile.am 2010-04-26 14:24:10.000000000 +0200 ++++ coreutils-8.5/tests/Makefile.am 2010-04-26 14:24:33.000000000 +0200 +@@ -224,6 +224,7 @@ TESTS = \ + misc/sort-compress \ + misc/sort-continue \ + misc/sort-files0-from \ ++ misc/sort-mb-tests \ + misc/sort-merge \ + misc/sort-merge-fdlimit \ + misc/sort-month \ +@@ -475,6 +476,10 @@ TESTS = \ + $(root_tests) + + pr_data = \ ++ misc/mb1.X \ ++ misc/mb1.I \ ++ misc/mb2.X \ ++ misc/mb2.I \ + pr/0F \ + pr/0FF \ + pr/0FFnt \ +diff -urNp coreutils-8.5-orig/tests/misc/cut coreutils-8.5/tests/misc/cut +--- coreutils-8.5-orig/tests/misc/cut 2010-01-01 14:06:47.000000000 +0100 ++++ coreutils-8.5/tests/misc/cut 2010-04-26 14:24:33.000000000 +0200 +@@ -26,7 +26,7 @@ use strict; + my $prog = 'cut'; + my $try = "Try \`$prog --help' for more information.\n"; + my $from_1 = "$prog: fields and positions are numbered from 1\n$try"; +-my $inval = "$prog: invalid byte or field list\n$try"; ++my $inval = "$prog: invalid byte, character or field list\n$try"; + my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try"; + + my @Tests = +@@ -141,7 +141,7 @@ my @Tests = + + # None of the following invalid ranges provoked an error up to coreutils-6.9. + ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1}, +- {ERR=>"$prog: invalid decreasing range\n$try"}], ++ {ERR=>"$prog: invalid byte, character or field list\n$try"}], + ['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], + ['inval3', '-f', '4,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], + ['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], +diff -urNp coreutils-8.5-orig/tests/misc/mb1.I coreutils-8.5/tests/misc/mb1.I +--- coreutils-8.5-orig/tests/misc/mb1.I 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-8.5/tests/misc/mb1.I 2010-04-26 14:24:33.000000000 +0200 +@@ -0,0 +1,4 @@ ++Apple＠10 ++Banana＠5 ++Citrus＠20 ++Cherry＠30 +diff -urNp coreutils-8.5-orig/tests/misc/mb1.X coreutils-8.5/tests/misc/mb1.X +--- coreutils-8.5-orig/tests/misc/mb1.X 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-8.5/tests/misc/mb1.X 2010-04-26 14:24:33.000000000 +0200 +@@ -0,0 +1,4 @@ ++Banana＠5 ++Apple＠10 ++Citrus＠20 ++Cherry＠30 +diff -urNp coreutils-8.5-orig/tests/misc/mb2.I coreutils-8.5/tests/misc/mb2.I +--- coreutils-8.5-orig/tests/misc/mb2.I 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-8.5/tests/misc/mb2.I 2010-04-26 14:24:33.000000000 +0200 +@@ -0,0 +1,4 @@ ++Apple＠ＡＡ10＠＠20 ++Banana＠ＡＡ5＠＠30 ++Citrus＠ＡＡ20＠＠5 ++Cherry＠ＡＡ30＠＠10 +diff -urNp coreutils-8.5-orig/tests/misc/mb2.X coreutils-8.5/tests/misc/mb2.X +--- coreutils-8.5-orig/tests/misc/mb2.X 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-8.5/tests/misc/mb2.X 2010-04-26 14:24:33.000000000 +0200 +@@ -0,0 +1,4 @@ ++Citrus＠ＡＡ20＠＠5 ++Cherry＠ＡＡ30＠＠10 ++Apple＠ＡＡ10＠＠20 ++Banana＠ＡＡ5＠＠30 +diff -urNp coreutils-8.5-orig/tests/misc/sort-mb-tests coreutils-8.5/tests/misc/sort-mb-tests +--- coreutils-8.5-orig/tests/misc/sort-mb-tests 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-8.5/tests/misc/sort-mb-tests 2010-04-26 14:24:33.000000000 +0200 +@@ -0,0 +1,58 @@ ++#! /bin/sh ++case $# in ++ 0) xx='../src/sort';; ++ *) xx="$1";; ++esac ++test "$VERBOSE" && echo=echo || echo=: ++$echo testing program: $xx ++errors=0 ++test "$srcdir" || srcdir=. ++test "$VERBOSE" && $xx --version 2> /dev/null ++ ++export LC_ALL=en_US.UTF-8 ++locale -k LC_CTYPE 2>&1 | grep -q charmap.*UTF-8 || exit 77 ++errors=0 ++ ++$xx -t ＠ -k2 -n misc/mb1.I > misc/mb1.O ++code=$? ++if test $code != 0; then ++ $echo "Test mb1 failed: $xx return code $code differs from expected value 0" 1>&2 ++ errors=`expr $errors + 1` ++else ++ cmp misc/mb1.O $srcdir/misc/mb1.X > /dev/null 2>&1 ++ case $? in ++ 0) if test "$VERBOSE"; then $echo "passed mb1"; fi;; ++ 1) $echo "Test mb1 failed: files misc/mb1.O and $srcdir/misc/mb1.X differ" 1>&2 ++ (diff -c misc/mb1.O $srcdir/misc/mb1.X) 2> /dev/null ++ errors=`expr $errors + 1`;; ++ 2) $echo "Test mb1 may have failed." 1>&2 ++ $echo The command "cmp misc/mb1.O $srcdir/misc/mb1.X" failed. 1>&2 ++ errors=`expr $errors + 1`;; ++ esac ++fi ++ ++$xx -t ＠ -k4 -n misc/mb2.I > misc/mb2.O ++code=$? ++if test $code != 0; then ++ $echo "Test mb2 failed: $xx return code $code differs from expected value 0" 1>&2 ++ errors=`expr $errors + 1` ++else ++ cmp misc/mb2.O $srcdir/misc/mb2.X > /dev/null 2>&1 ++ case $? in ++ 0) if test "$VERBOSE"; then $echo "passed mb2"; fi;; ++ 1) $echo "Test mb2 failed: files misc/mb2.O and $srcdir/misc/mb2.X differ" 1>&2 ++ (diff -c misc/mb2.O $srcdir/misc/mb2.X) 2> /dev/null ++ errors=`expr $errors + 1`;; ++ 2) $echo "Test mb2 may have failed." 1>&2 ++ $echo The command "cmp misc/mb2.O $srcdir/misc/mb2.X" failed. 1>&2 ++ errors=`expr $errors + 1`;; ++ esac ++fi ++ ++if test $errors = 0; then ++ $echo Passed all 113 tests. 1>&2 ++else ++ $echo Failed $errors tests. 1>&2 ++fi ++test $errors = 0 || errors=1 ++exit $errors diff --git a/pkgs/core/diffutils/diffutils.nm b/pkgs/core/diffutils/diffutils.nm index 5b0f0cc..8fb4714 100644 --- a/pkgs/core/diffutils/diffutils.nm +++ b/pkgs/core/diffutils/diffutils.nm @@ -46,4 +46,6 @@ PKG_TARBALL = $(THISAPP).tar.gz CONFIGURE_OPTIONS += \ --mandir=/usr/share -# This package doesn't have a testsuite. +define STAGE_TEST + cd $(DIR_APP) && make check +endef diff --git a/pkgs/core/dmidecode/dmidecode.nm b/pkgs/core/dmidecode/dmidecode.nm new file mode 100644 index 0000000..f2fa79c --- /dev/null +++ b/pkgs/core/dmidecode/dmidecode.nm @@ -0,0 +1,55 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = dmidecode +PKG_VER = 2.10 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Applications/System +PKG_URL = http://www.nongnu.org/dmidecode/ +PKG_LICENSE = GPLv2+ +PKG_SUMMARY = Tool to analyse BIOS DMI data. + +define PKG_DESCRIPTION + dmidecode reports information about x86 & ia64 hardware as described \ + in the system BIOS according to the SMBIOS/DMI standard. This \ + information typically includes system manufacturer, model name, \ + serial number, BIOS version, asset tag as well as a lot of other \ + details of varying level of interest and reliability depending on the \ + manufacturer. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +define STAGE_BUILD + $(DO_FIX_LIBTOOL) + cd $(DIR_APP) && make $(PARALLELISMFLAGS) +endef + +define STAGE_INSTALL + cd $(DIR_APP) && make install-bin install-man prefix=/usr DESTDIR=$(BUILDROOT) +endef diff --git a/pkgs/core/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch b/pkgs/core/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch new file mode 100644 index 0000000..e1dab91 --- /dev/null +++ b/pkgs/core/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch @@ -0,0 +1,11 @@ +--- dmidecode/dmioem.c~ 2008/10/28 09:41:07 1.9 ++++ dmidecode/dmioem.c 2009/07/27 12:07:39 1.10 +@@ -41,7 +41,7 @@ + */ + void dmi_set_vendor(const char *s) + { +- if (strcmp(s, "HP") == 0) ++ if (strcmp(s, "HP") == 0 || strcmp(s, "Hewlett-Packard") == 0) + dmi_vendor = VENDOR_HP; + } + diff --git a/pkgs/core/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch b/pkgs/core/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch new file mode 100644 index 0000000..ee86ddf --- /dev/null +++ b/pkgs/core/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch @@ -0,0 +1,16 @@ +--- dmidecode/dmidecode.c~ 2009/06/19 11:55:35 1.142 ++++ dmidecode/dmidecode.c 2009/07/27 12:20:01 1.143 +@@ -1042,10 +1042,11 @@ + "Socket LGA775", + "Socket S1", + "Socket AM2", +- "Socket F (1207)" /* 0x18 */ ++ "Socket F (1207)", ++ "Socket LGA1366" /* 0x19 */ + }; + +- if (code >= 0x01 && code <= 0x18) ++ if (code >= 0x01 && code <= 0x19) + return upgrade[code - 0x01]; + return out_of_spec; + } diff --git a/pkgs/core/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch b/pkgs/core/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch new file mode 100644 index 0000000..19d18d7 --- /dev/null +++ b/pkgs/core/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch @@ -0,0 +1,11 @@ +--- dmidecode/dmidecode.c~ 2009/04/30 08:19:37 1.141 ++++ dmidecode/dmidecode.c 2009/06/19 11:55:35 1.142 +@@ -2007,7 +2007,7 @@ + + static void dmi_memory_array_capacity(u32 code) + { +- if (code == 0x8000000) ++ if (code == 0x80000000) + printf(" Unknown"); + else + { diff --git a/pkgs/core/dmidecode/patches/dmidecode-2.10-smbios-updates.patch b/pkgs/core/dmidecode/patches/dmidecode-2.10-smbios-updates.patch new file mode 100644 index 0000000..8c1e48f --- /dev/null +++ b/pkgs/core/dmidecode/patches/dmidecode-2.10-smbios-updates.patch @@ -0,0 +1,120 @@ +dmidecode: additions from smbios 2.6.1 spec update + +Tested on an HP DL360G6 with LGA1366 socket cpus, PCI-E Gen 2 slots +and DDR3 memory, no longer returns any <OUT OF SPEC> info. + +Signed-off-by: Jarod Wilson <jarod(a)redhat.com> + +--- + dmidecode.c | 49 ++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 42 insertions(+), 7 deletions(-) + +diff -Naurp dmidecode-2.10.orig/dmidecode.c dmidecode-2.10/dmidecode.c +--- dmidecode-2.10.orig/dmidecode.c 2009-08-27 09:20:45.933991764 -0400 ++++ dmidecode-2.10/dmidecode.c 2009-08-27 09:21:15.516869134 -0400 +@@ -361,7 +361,7 @@ static void dmi_system_uuid(const u8 *p, + + static const char *dmi_system_wake_up_type(u8 code) + { +- /* 3.3.2.1 */ ++ /* 3.3.2.2 */ + static const char *type[] = { + "Reserved", /* 0x00 */ + "Other", +@@ -719,6 +719,12 @@ static const char *dmi_processor_family( + { 0xA9, "Quad-Core Xeon 5400" }, /* From CIM_Processor.Family */ + { 0xAA, "Quad-Core Xeon" }, /* From CIM_Processor.Family */ + ++ { 0xAB, "Dual-Core Xeon 5200" }, ++ { 0xAC, "Dual-Core Xeon 7200" }, ++ { 0xAD, "Quad-Core Xeon 7300" }, ++ { 0xAE, "Quad-Core Xeon 7400" }, ++ { 0xAF, "Multi-Core Xeon 7400" }, ++ + { 0xB0, "Pentium III Xeon" }, + { 0xB1, "Pentium III Speedstep" }, + { 0xB2, "Pentium 4" }, +@@ -741,6 +747,8 @@ static const char *dmi_processor_family( + { 0xC3, "Core 2 Extreme Mobile" }, /* From CIM_Processor.Family */ + { 0xC4, "Core 2 Duo Mobile" }, /* From CIM_Processor.Family */ + { 0xC5, "Core 2 Solo Mobile" }, /* From CIM_Processor.Family */ ++ { 0xC6, "Core i7" }, ++ { 0xC7, "Dual-Core Celeron" }, + + { 0xC8, "IBM390" }, + { 0xC9, "G4" }, +@@ -753,6 +761,17 @@ static const char *dmi_processor_family( + { 0xD4, "C7" }, + { 0xD5, "Eden" }, + ++ { 0xD6, "Multi-Core Xeon" }, ++ { 0xD7, "Dual-Core Xeon 3xxx" }, ++ { 0xD8, "Quad-Core Xeon 3xxx" }, ++ ++ { 0xDA, "Dual-Core Xeon 5xxx" }, ++ { 0xDB, "Quad-Core Xeon 5xxx" }, ++ ++ { 0xDD, "Dual-Core Xeon 7xxx" }, ++ { 0xDD, "Quad-Core Xeon 7xxx" }, ++ { 0xDD, "Multi-Core Xeon 7xxx" }, ++ + { 0xE6, "Embedded Opteron Quad-Core" }, /* From CIM_Processor.Family */ + { 0xE7, "Phenom Triple-Core" }, /* From CIM_Processor.Family */ + { 0xE8, "Turion Ultra Dual-Core Mobile" }, /* From CIM_Processor.Family */ +@@ -1383,10 +1402,15 @@ static const char *dmi_cache_associativi + "4-way Set-associative", + "Fully Associative", + "8-way Set-associative", +- "16-way Set-associative" /* 0x08 */ ++ "16-way Set-associative", ++ "12-way Set-associative", ++ "24-way Set-associative", ++ "32-way Set-associative", ++ "48-way Set-associative", ++ "64-way Set-associative" /* 0x0D */ + }; + +- if (code >= 0x01 && code <= 0x08) ++ if (code >= 0x01 && code <= 0x0D) + return type[code - 0x01]; + return out_of_spec; + } +@@ -1544,12 +1568,18 @@ static const char *dmi_slot_type(u8 code + "PCI Express x2", + "PCI Express x4", + "PCI Express x8", +- "PCI Express x16" /* 0xAA */ ++ "PCI Express x16", /* 0xAA */ ++ "PCI Express Gen 2", ++ "PCI Express Gen 2 x1", ++ "PCI Express Gen 2 x2", ++ "PCI Express Gen 2 x4", ++ "PCI Express Gen 2 x8", ++ "PCI Express Gen 2 x16", /* 0xB0 */ + }; + + if (code >= 0x01 && code <= 0x13) + return type[code - 0x01]; +- if (code >= 0xA0 && code <= 0xAA) ++ if (code >= 0xA0 && code <= 0xB0) + return type_0xA0[code - 0xA0]; + return out_of_spec; + } +@@ -2120,10 +2150,15 @@ static const char *dmi_memory_device_typ + "RDRAM", + "DDR", + "DDR2", +- "DDR2 FB-DIMM" /* 0x14 */ ++ "DDR2 FB-DIMM", ++ "Reserved", ++ "Reserved", ++ "Reserved", ++ "DDR3", ++ "FBD2", /* 0x19 */ + }; + +- if (code >= 0x01 && code <= 0x14) ++ if (code >= 0x01 && code <= 0x19) + return type[code - 0x01]; + return out_of_spec; + } diff --git a/pkgs/core/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch b/pkgs/core/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch new file mode 100644 index 0000000..896c29f --- /dev/null +++ b/pkgs/core/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch @@ -0,0 +1,25 @@ +--- dmidecode/dmidecode.c~ 2008/11/14 10:27:31 1.140 ++++ dmidecode/dmidecode.c 2009/04/30 08:19:37 1.141 +@@ -66,6 +66,8 @@ + #define out_of_spec "<OUT OF SPEC>" + static const char *bad_index = "<BAD INDEX>"; + ++#define SUPPORTED_SMBIOS_VER 0x0206 ++ + /* + * Type-independant Stuff + */ +@@ -4005,6 +4007,13 @@ + u8 *data; + int i = 0; + ++ if (ver > SUPPORTED_SMBIOS_VER) ++ { ++ printf("# SMBIOS implementations newer than version %u.%u are not\n" ++ "# fully supported by this version of dmidecode.\n", ++ SUPPORTED_SMBIOS_VER >> 8, SUPPORTED_SMBIOS_VER & 0xFF); ++ } ++ + if (opt.flags & FLAG_DUMP_BIN) + { + dmi_table_dump(base, len, devmem); diff --git a/pkgs/core/gettext/gettext.nm b/pkgs/core/gettext/gettext.nm index 69783a6..b969ce0 100644 --- a/pkgs/core/gettext/gettext.nm +++ b/pkgs/core/gettext/gettext.nm @@ -54,7 +54,6 @@ PKG_BUILD_DEPS+= autoconf automake PKG_TARBALL = $(THISAPP).tar.gz CONFIGURE_OPTIONS += \ - --without-included-gettext \ --disable-static \ --enable-shared \ --disable-rpath diff --git a/pkgs/core/glib2/glib2.nm b/pkgs/core/glib2/glib2.nm index b8b2a35..471acd2 100644 --- a/pkgs/core/glib2/glib2.nm +++ b/pkgs/core/glib2/glib2.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = glib -PKG_VER = 2.24.0 +PKG_VER = 2.25.3 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/initscripts/init/udev-retry.conf b/pkgs/core/initscripts/init/udev-retry.conf new file mode 100644 index 0000000..e3070d4 --- /dev/null +++ b/pkgs/core/initscripts/init/udev-retry.conf @@ -0,0 +1,23 @@ +description "Retry failed udev events" +author "IPFire Team" + +start on stopped udevtrigger + +console output + +script + # From Debian: "copy the rules generated before / was mounted + # read-write": + for file in /dev/.udev/tmp-rules--*; do + dest=${file##*tmp-rules--} + [ "$dest" = '*' ] && break + cat $file >> /etc/udev/rules.d/$dest + rm -f $file + done + + # Re-trigger the failed uevents in hope they will succeed now + /sbin/udevadm trigger --action=add --retry-failed + + # Now wait for udevd to process the uevents we triggered + /sbin/udevadm settle +end script diff --git a/pkgs/core/lldpd/lldpd.init b/pkgs/core/lldpd/lldpd.init index dcb92b1..4f25e0d 100644 --- a/pkgs/core/lldpd/lldpd.init +++ b/pkgs/core/lldpd/lldpd.init @@ -4,5 +4,5 @@ author "IPFire Team" start on started network stop on stopping network -exec /usr/sbin/lldpd +exec /usr/sbin/lldpd -c respawn diff --git a/pkgs/core/lldpd/lldpd.nm b/pkgs/core/lldpd/lldpd.nm index 2117fcb..671b374 100644 --- a/pkgs/core/lldpd/lldpd.nm +++ b/pkgs/core/lldpd/lldpd.nm @@ -34,7 +34,7 @@ PKG_URL = https://trac.luffy.cx/lldpd/ PKG_LICENSE = GPL PKG_SUMMARY = Utilities for the Link Layer Discovery Protocol. -PKG_DEPS += net-snmp +PKG_DEPS += libxml2 define PKG_DESCRIPTION The LLDPD project aims to provide a comprehensive implementation of \ @@ -42,3 +42,6 @@ define PKG_DESCRIPTION endef PKG_TARBALL = $(THISAPP).tar.gz + +CONFIGURE_OPTIONS += \ + --with-xml diff --git a/pkgs/core/openssh/sshd_config b/pkgs/core/openssh/sshd_config index a44be8c..dbf3228 100644 --- a/pkgs/core/openssh/sshd_config +++ b/pkgs/core/openssh/sshd_config @@ -8,7 +8,7 @@ # possible, but leave them commented. Uncommented options change a # default value. -Port 222 +Port 22 #AddressFamily any #ListenAddress 0.0.0.0 #ListenAddress :: diff --git a/pkgs/core/pdns-recursor/pdns-recursor.nm b/pkgs/core/pdns-recursor/pdns-recursor.nm index 1ce372f..5da6f65 100644 --- a/pkgs/core/pdns-recursor/pdns-recursor.nm +++ b/pkgs/core/pdns-recursor/pdns-recursor.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = pdns-recursor -PKG_VER = 3.1.7.1 +PKG_VER = 3.2 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/vsftpd/vsftpd.init b/pkgs/core/vsftpd/vsftpd.init new file mode 100644 index 0000000..e21e27f --- /dev/null +++ b/pkgs/core/vsftpd/vsftpd.init @@ -0,0 +1,9 @@ +description "Very secure FTP daemon" +author "IPFire Team" + +start on started network +stop on stopping network + +exec /usr/sbin/vsftpd +expect daemon +respawn diff --git a/pkgs/core/vsftpd/vsftpd.nm b/pkgs/core/vsftpd/vsftpd.nm index 9f81196..54e9539 100644 --- a/pkgs/core/vsftpd/vsftpd.nm +++ b/pkgs/core/vsftpd/vsftpd.nm @@ -52,8 +52,8 @@ define STAGE_BUILD endef define STAGE_INSTALL - -mkdir -pv $(BUILDROOT)/usr/bin/vsftpd - cd $(DIR_APP) && install -v -m 755 vsftpd $(BUILDROOT)/usr/bin/vsftpd + -mkdir -pv $(BUILDROOT)/usr/bin + cd $(DIR_APP) && install -v -m 755 vsftpd $(BUILDROOT)/usr/bin -mkdir -pv $(BUILDROOT)/usr/share/man/man8 cd $(DIR_APP) && install -v -m 644 vsftpd.8 $(BUILDROOT)/usr/share/man/man8 -mkdir -pv $(BUILDROOT)/usr/share/man/man5 diff --git a/pkgs/core/zlib/zlib.nm b/pkgs/core/zlib/zlib.nm index 05fd60b..76f728d 100644 --- a/pkgs/core/zlib/zlib.nm +++ b/pkgs/core/zlib/zlib.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = zlib -PKG_VER = 1.2.4 +PKG_VER = 1.2.5 PKG_REL = 0 PKG_MAINTAINER = hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. b122df877b176fceabae4e31549847cb849c8fed
by git＠ipfire.org 28 Apr '10

28 Apr '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via b122df877b176fceabae4e31549847cb849c8fed (commit) via 33d8921fe3c3dfdce574ce4115a5b692d0baf47a (commit) from 841323bc3ecd3ebf3a0c129a8ffd8d407d5c8cdf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b122df877b176fceabae4e31549847cb849c8fed Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Wed Apr 28 21:00:34 2010 +0200 Once again collectd config files. commit 33d8921fe3c3dfdce574ce4115a5b692d0baf47a Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Wed Apr 28 20:58:45 2010 +0200 Updated snort to stable 2.8.5.3. This fixes bug #0000628 Rule Url will change the next 30 days because of the 2.8.6 release. ----------------------------------------------------------------------- Summary of changes: config/collectd/collectd.conf | 2 +- config/collectd/collectd.custom | 4 +- config/collectd/collectd.precache | 2 - config/rootfiles/common/snort | 658 +------------------------------------ doc/packages-list.txt | 3 +- html/cgi-bin/ids.cgi | 6 +- lfs/snort | 4 +- 7 files changed, 20 insertions(+), 659 deletions(-) Difference in files: diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index 0c9aa12..530c81e 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -90,4 +90,4 @@ include "/etc/collectd.precache" </Plugin> #include "/etc/collectd.thermal" -include "/etc/collectd.custom" \ No newline at end of file +include "/etc/collectd.custom" diff --git a/config/collectd/collectd.custom b/config/collectd/collectd.custom index b28b04f..7443bf3 100644 --- a/config/collectd/collectd.custom +++ b/config/collectd/collectd.custom @@ -1,3 +1 @@ - - - +# Use this file to add custom configs and rules for collectd diff --git a/config/collectd/collectd.precache b/config/collectd/collectd.precache index 30d8d75..8c4a5bb 100644 --- a/config/collectd/collectd.precache +++ b/config/collectd/collectd.precache @@ -74,5 +74,3 @@ PreCacheChain "PreCache" Plugin "rrdtool" </Target> </Chain> - - diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort index ac635dc..a941019 100644 --- a/config/rootfiles/common/snort +++ b/config/rootfiles/common/snort @@ -1,648 +1,10 @@ #etc/snort -#etc/snort/docs -#etc/snort/docs/100000100.txt -#etc/snort/docs/100000101.txt -#etc/snort/docs/100000102.txt -#etc/snort/docs/100000103.txt -#etc/snort/docs/100000104.txt -#etc/snort/docs/100000105.txt -#etc/snort/docs/100000106.txt -#etc/snort/docs/100000107.txt -#etc/snort/docs/100000108.txt -#etc/snort/docs/100000109.txt -#etc/snort/docs/100000110.txt -#etc/snort/docs/100000111.txt -#etc/snort/docs/100000112.txt -#etc/snort/docs/100000113.txt -#etc/snort/docs/100000114.txt -#etc/snort/docs/100000115.txt -#etc/snort/docs/100000116.txt -#etc/snort/docs/100000117.txt -#etc/snort/docs/100000118.txt -#etc/snort/docs/100000119.txt -#etc/snort/docs/100000121.txt -#etc/snort/docs/100000122.txt -#etc/snort/docs/100000123.txt -#etc/snort/docs/100000124.txt -#etc/snort/docs/100000125.txt -#etc/snort/docs/100000126.txt -#etc/snort/docs/100000127.txt -#etc/snort/docs/100000128.txt -#etc/snort/docs/100000129.txt -#etc/snort/docs/100000130.txt -#etc/snort/docs/100000131.txt -#etc/snort/docs/100000132.txt -#etc/snort/docs/100000133.txt -#etc/snort/docs/100000134.txt -#etc/snort/docs/100000135.txt -#etc/snort/docs/100000136.txt -#etc/snort/docs/100000138.txt -#etc/snort/docs/100000139.txt -#etc/snort/docs/100000140.txt -#etc/snort/docs/100000141.txt -#etc/snort/docs/100000142.txt -#etc/snort/docs/100000143.txt -#etc/snort/docs/100000144.txt -#etc/snort/docs/100000145.txt -#etc/snort/docs/100000146.txt -#etc/snort/docs/100000148.txt -#etc/snort/docs/100000152.txt -#etc/snort/docs/100000153.txt -#etc/snort/docs/100000154.txt -#etc/snort/docs/100000155.txt -#etc/snort/docs/100000158.txt -#etc/snort/docs/100000159.txt -#etc/snort/docs/100000160.txt -#etc/snort/docs/100000161.txt -#etc/snort/docs/100000162.txt -#etc/snort/docs/100000163.txt -#etc/snort/docs/100000164.txt -#etc/snort/docs/100000165.txt -#etc/snort/docs/100000166.txt -#etc/snort/docs/100000167.txt -#etc/snort/docs/100000168.txt -#etc/snort/docs/100000169.txt -#etc/snort/docs/100000170.txt -#etc/snort/docs/100000171.txt -#etc/snort/docs/100000172.txt -#etc/snort/docs/100000173.txt -#etc/snort/docs/100000174.txt -#etc/snort/docs/100000175.txt -#etc/snort/docs/100000176.txt -#etc/snort/docs/100000177.txt -#etc/snort/docs/100000178.txt -#etc/snort/docs/100000179.txt -#etc/snort/docs/100000226.txt -#etc/snort/docs/100000315.txt -#etc/snort/docs/100000316.txt -#etc/snort/docs/100000317.txt -#etc/snort/docs/100000318.txt -#etc/snort/docs/100000319.txt -#etc/snort/docs/100000320.txt -#etc/snort/docs/100000321.txt -#etc/snort/docs/100000322.txt -#etc/snort/docs/100000323.txt -#etc/snort/docs/100000324.txt -#etc/snort/docs/100000325.txt -#etc/snort/docs/100000326.txt -#etc/snort/docs/100000327.txt -#etc/snort/docs/100000328.txt -#etc/snort/docs/100000329.txt -#etc/snort/docs/100000330.txt -#etc/snort/docs/100000331.txt -#etc/snort/docs/100000332.txt -#etc/snort/docs/100000333.txt -#etc/snort/docs/100000334.txt -#etc/snort/docs/100000335.txt -#etc/snort/docs/100000336.txt -#etc/snort/docs/100000337.txt -#etc/snort/docs/100000338.txt -#etc/snort/docs/100000339.txt -#etc/snort/docs/100000340.txt -#etc/snort/docs/100000341.txt -#etc/snort/docs/100000342.txt -#etc/snort/docs/100000343.txt -#etc/snort/docs/100000344.txt -#etc/snort/docs/100000345.txt -#etc/snort/docs/100000346.txt -#etc/snort/docs/100000347.txt -#etc/snort/docs/100000348.txt -#etc/snort/docs/100000349.txt -#etc/snort/docs/100000350.txt -#etc/snort/docs/100000351.txt -#etc/snort/docs/100000352.txt -#etc/snort/docs/100000353.txt -#etc/snort/docs/100000354.txt -#etc/snort/docs/100000355.txt -#etc/snort/docs/100000356.txt -#etc/snort/docs/100000357.txt -#etc/snort/docs/100000358.txt -#etc/snort/docs/100000359.txt -#etc/snort/docs/100000360.txt -#etc/snort/docs/100000361.txt -#etc/snort/docs/100000362.txt -#etc/snort/docs/100000363.txt -#etc/snort/docs/100000364.txt -#etc/snort/docs/100000365.txt -#etc/snort/docs/100000366.txt -#etc/snort/docs/100000367.txt -#etc/snort/docs/100000368.txt -#etc/snort/docs/100000369.txt -#etc/snort/docs/100000370.txt -#etc/snort/docs/100000371.txt -#etc/snort/docs/100000372.txt -#etc/snort/docs/100000373.txt -#etc/snort/docs/100000374.txt -#etc/snort/docs/100000375.txt -#etc/snort/docs/100000376.txt -#etc/snort/docs/100000377.txt -#etc/snort/docs/100000378.txt -#etc/snort/docs/100000379.txt -#etc/snort/docs/100000380.txt -#etc/snort/docs/100000381.txt -#etc/snort/docs/100000382.txt -#etc/snort/docs/100000383.txt -#etc/snort/docs/100000384.txt -#etc/snort/docs/100000385.txt -#etc/snort/docs/100000386.txt -#etc/snort/docs/100000387.txt -#etc/snort/docs/100000388.txt -#etc/snort/docs/100000389.txt -#etc/snort/docs/100000390.txt -#etc/snort/docs/100000391.txt -#etc/snort/docs/100000392.txt -#etc/snort/docs/100000393.txt -#etc/snort/docs/100000394.txt -#etc/snort/docs/100000395.txt -#etc/snort/docs/100000396.txt -#etc/snort/docs/100000397.txt -#etc/snort/docs/100000398.txt -#etc/snort/docs/100000399.txt -#etc/snort/docs/100000400.txt -#etc/snort/docs/100000401.txt -#etc/snort/docs/100000402.txt -#etc/snort/docs/100000403.txt -#etc/snort/docs/100000404.txt -#etc/snort/docs/100000405.txt -#etc/snort/docs/100000406.txt -#etc/snort/docs/100000407.txt -#etc/snort/docs/100000408.txt -#etc/snort/docs/100000409.txt -#etc/snort/docs/100000410.txt -#etc/snort/docs/100000411.txt -#etc/snort/docs/100000412.txt -#etc/snort/docs/100000413.txt -#etc/snort/docs/100000414.txt -#etc/snort/docs/100000415.txt -#etc/snort/docs/100000416.txt -#etc/snort/docs/100000417.txt -#etc/snort/docs/100000418.txt -#etc/snort/docs/100000419.txt -#etc/snort/docs/100000420.txt -#etc/snort/docs/100000421.txt -#etc/snort/docs/100000422.txt -#etc/snort/docs/100000423.txt -#etc/snort/docs/100000424.txt -#etc/snort/docs/100000425.txt -#etc/snort/docs/100000426.txt -#etc/snort/docs/100000430.txt -#etc/snort/docs/100000431.txt -#etc/snort/docs/100000432.txt -#etc/snort/docs/100000433.txt -#etc/snort/docs/100000434.txt -#etc/snort/docs/100000435.txt -#etc/snort/docs/100000436.txt -#etc/snort/docs/100000437.txt -#etc/snort/docs/100000438.txt -#etc/snort/docs/100000439.txt -#etc/snort/docs/100000440.txt -#etc/snort/docs/100000441.txt -#etc/snort/docs/100000442.txt -#etc/snort/docs/100000443.txt -#etc/snort/docs/100000444.txt -#etc/snort/docs/100000445.txt -#etc/snort/docs/100000446.txt -#etc/snort/docs/100000448.txt -#etc/snort/docs/100000449.txt -#etc/snort/docs/100000450.txt -#etc/snort/docs/100000451.txt -#etc/snort/docs/100000452.txt -#etc/snort/docs/100000453.txt -#etc/snort/docs/100000454.txt -#etc/snort/docs/100000455.txt -#etc/snort/docs/100000456.txt -#etc/snort/docs/100000457.txt -#etc/snort/docs/100000458.txt -#etc/snort/docs/100000459.txt -#etc/snort/docs/100000461.txt -#etc/snort/docs/100000462.txt -#etc/snort/docs/100000463.txt -#etc/snort/docs/100000464.txt -#etc/snort/docs/100000465.txt -#etc/snort/docs/100000466.txt -#etc/snort/docs/100000467.txt -#etc/snort/docs/100000468.txt -#etc/snort/docs/100000469.txt -#etc/snort/docs/100000470.txt -#etc/snort/docs/100000471.txt -#etc/snort/docs/100000472.txt -#etc/snort/docs/100000473.txt -#etc/snort/docs/100000474.txt -#etc/snort/docs/100000475.txt -#etc/snort/docs/100000476.txt -#etc/snort/docs/100000477.txt -#etc/snort/docs/100000478.txt -#etc/snort/docs/100000479.txt -#etc/snort/docs/100000480.txt -#etc/snort/docs/100000481.txt -#etc/snort/docs/100000482.txt -#etc/snort/docs/100000483.txt -#etc/snort/docs/100000484.txt -#etc/snort/docs/100000485.txt -#etc/snort/docs/100000486.txt -#etc/snort/docs/100000487.txt -#etc/snort/docs/100000488.txt -#etc/snort/docs/100000489.txt -#etc/snort/docs/100000490.txt -#etc/snort/docs/100000491.txt -#etc/snort/docs/100000492.txt -#etc/snort/docs/100000493.txt -#etc/snort/docs/100000494.txt -#etc/snort/docs/100000495.txt -#etc/snort/docs/100000496.txt -#etc/snort/docs/100000497.txt -#etc/snort/docs/100000498.txt -#etc/snort/docs/100000499.txt -#etc/snort/docs/100000500.txt -#etc/snort/docs/100000501.txt -#etc/snort/docs/100000502.txt -#etc/snort/docs/100000503.txt -#etc/snort/docs/100000504.txt -#etc/snort/docs/100000505.txt -#etc/snort/docs/100000506.txt -#etc/snort/docs/100000507.txt -#etc/snort/docs/100000508.txt -#etc/snort/docs/100000509.txt -#etc/snort/docs/100000510.txt -#etc/snort/docs/100000511.txt -#etc/snort/docs/100000512.txt -#etc/snort/docs/100000513.txt -#etc/snort/docs/100000514.txt -#etc/snort/docs/100000515.txt -#etc/snort/docs/100000516.txt -#etc/snort/docs/100000517.txt -#etc/snort/docs/100000518.txt -#etc/snort/docs/100000519.txt -#etc/snort/docs/100000520.txt -#etc/snort/docs/100000521.txt -#etc/snort/docs/100000522.txt -#etc/snort/docs/100000523.txt -#etc/snort/docs/100000524.txt -#etc/snort/docs/100000525.txt -#etc/snort/docs/100000526.txt -#etc/snort/docs/100000527.txt -#etc/snort/docs/100000528.txt -#etc/snort/docs/100000529.txt -#etc/snort/docs/100000530.txt -#etc/snort/docs/100000531.txt -#etc/snort/docs/100000532.txt -#etc/snort/docs/100000533.txt -#etc/snort/docs/100000534.txt -#etc/snort/docs/100000535.txt -#etc/snort/docs/100000536.txt -#etc/snort/docs/100000537.txt -#etc/snort/docs/100000538.txt -#etc/snort/docs/100000539.txt -#etc/snort/docs/100000540.txt -#etc/snort/docs/100000541.txt -#etc/snort/docs/100000542.txt -#etc/snort/docs/100000543.txt -#etc/snort/docs/100000544.txt -#etc/snort/docs/100000545.txt -#etc/snort/docs/100000546.txt -#etc/snort/docs/100000547.txt -#etc/snort/docs/100000548.txt -#etc/snort/docs/100000549.txt -#etc/snort/docs/100000550.txt -#etc/snort/docs/100000551.txt -#etc/snort/docs/100000552.txt -#etc/snort/docs/100000553.txt -#etc/snort/docs/100000554.txt -#etc/snort/docs/100000555.txt -#etc/snort/docs/100000556.txt -#etc/snort/docs/100000557.txt -#etc/snort/docs/100000558.txt -#etc/snort/docs/100000559.txt -#etc/snort/docs/100000560.txt -#etc/snort/docs/100000561.txt -#etc/snort/docs/100000562.txt -#etc/snort/docs/100000563.txt -#etc/snort/docs/100000564.txt -#etc/snort/docs/100000565.txt -#etc/snort/docs/100000566.txt -#etc/snort/docs/100000567.txt -#etc/snort/docs/100000568.txt -#etc/snort/docs/100000569.txt -#etc/snort/docs/100000570.txt -#etc/snort/docs/100000571.txt -#etc/snort/docs/100000572.txt -#etc/snort/docs/100000573.txt -#etc/snort/docs/100000574.txt -#etc/snort/docs/100000575.txt -#etc/snort/docs/100000576.txt -#etc/snort/docs/100000577.txt -#etc/snort/docs/100000578.txt -#etc/snort/docs/100000579.txt -#etc/snort/docs/100000580.txt -#etc/snort/docs/100000581.txt -#etc/snort/docs/100000582.txt -#etc/snort/docs/100000583.txt -#etc/snort/docs/100000584.txt -#etc/snort/docs/100000585.txt -#etc/snort/docs/100000586.txt -#etc/snort/docs/100000587.txt -#etc/snort/docs/100000588.txt -#etc/snort/docs/100000589.txt -#etc/snort/docs/100000590.txt -#etc/snort/docs/100000591.txt -#etc/snort/docs/100000592.txt -#etc/snort/docs/100000593.txt -#etc/snort/docs/100000594.txt -#etc/snort/docs/100000595.txt -#etc/snort/docs/100000596.txt -#etc/snort/docs/100000597.txt -#etc/snort/docs/100000598.txt -#etc/snort/docs/100000599.txt -#etc/snort/docs/100000600.txt -#etc/snort/docs/100000601.txt -#etc/snort/docs/100000602.txt -#etc/snort/docs/100000603.txt -#etc/snort/docs/100000604.txt -#etc/snort/docs/100000605.txt -#etc/snort/docs/100000606.txt -#etc/snort/docs/100000607.txt -#etc/snort/docs/100000608.txt -#etc/snort/docs/100000609.txt -#etc/snort/docs/100000610.txt -#etc/snort/docs/100000611.txt -#etc/snort/docs/100000612.txt -#etc/snort/docs/100000613.txt -#etc/snort/docs/100000614.txt -#etc/snort/docs/100000615.txt -#etc/snort/docs/100000616.txt -#etc/snort/docs/100000617.txt -#etc/snort/docs/100000618.txt -#etc/snort/docs/100000619.txt -#etc/snort/docs/100000620.txt -#etc/snort/docs/100000621.txt -#etc/snort/docs/100000622.txt -#etc/snort/docs/100000623.txt -#etc/snort/docs/100000624.txt -#etc/snort/docs/100000625.txt -#etc/snort/docs/100000626.txt -#etc/snort/docs/100000627.txt -#etc/snort/docs/100000628.txt -#etc/snort/docs/100000629.txt -#etc/snort/docs/100000630.txt -#etc/snort/docs/100000631.txt -#etc/snort/docs/100000632.txt -#etc/snort/docs/100000633.txt -#etc/snort/docs/100000634.txt -#etc/snort/docs/100000635.txt -#etc/snort/docs/100000636.txt -#etc/snort/docs/100000637.txt -#etc/snort/docs/100000638.txt -#etc/snort/docs/100000639.txt -#etc/snort/docs/100000640.txt -#etc/snort/docs/100000641.txt -#etc/snort/docs/100000642.txt -#etc/snort/docs/100000643.txt -#etc/snort/docs/100000644.txt -#etc/snort/docs/100000645.txt -#etc/snort/docs/100000646.txt -#etc/snort/docs/100000647.txt -#etc/snort/docs/100000648.txt -#etc/snort/docs/100000649.txt -#etc/snort/docs/100000650.txt -#etc/snort/docs/100000651.txt -#etc/snort/docs/100000652.txt -#etc/snort/docs/100000653.txt -#etc/snort/docs/100000654.txt -#etc/snort/docs/100000655.txt -#etc/snort/docs/100000656.txt -#etc/snort/docs/100000657.txt -#etc/snort/docs/100000658.txt -#etc/snort/docs/100000659.txt -#etc/snort/docs/100000660.txt -#etc/snort/docs/100000661.txt -#etc/snort/docs/100000662.txt -#etc/snort/docs/100000663.txt -#etc/snort/docs/100000664.txt -#etc/snort/docs/100000665.txt -#etc/snort/docs/100000666.txt -#etc/snort/docs/100000667.txt -#etc/snort/docs/100000668.txt -#etc/snort/docs/100000669.txt -#etc/snort/docs/100000670.txt -#etc/snort/docs/100000671.txt -#etc/snort/docs/100000672.txt -#etc/snort/docs/100000673.txt -#etc/snort/docs/100000674.txt -#etc/snort/docs/100000675.txt -#etc/snort/docs/100000676.txt -#etc/snort/docs/100000677.txt -#etc/snort/docs/100000678.txt -#etc/snort/docs/100000679.txt -#etc/snort/docs/100000680.txt -#etc/snort/docs/100000681.txt -#etc/snort/docs/100000682.txt -#etc/snort/docs/100000683.txt -#etc/snort/docs/100000686.txt -#etc/snort/docs/100000687.txt -#etc/snort/docs/100000690.txt -#etc/snort/docs/100000691.txt -#etc/snort/docs/100000694.txt -#etc/snort/docs/100000695.txt -#etc/snort/docs/100000696.txt -#etc/snort/docs/100000697.txt -#etc/snort/docs/100000698.txt -#etc/snort/docs/100000699.txt -#etc/snort/docs/100000700.txt -#etc/snort/docs/100000701.txt -#etc/snort/docs/100000702.txt -#etc/snort/docs/100000704.txt -#etc/snort/docs/100000705.txt -#etc/snort/docs/100000706.txt -#etc/snort/docs/100000707.txt -#etc/snort/docs/100000708.txt -#etc/snort/docs/100000709.txt -#etc/snort/docs/100000710.txt -#etc/snort/docs/100000711.txt -#etc/snort/docs/100000712.txt -#etc/snort/docs/100000713.txt -#etc/snort/docs/100000714.txt -#etc/snort/docs/100000715.txt -#etc/snort/docs/100000716.txt -#etc/snort/docs/100000717.txt -#etc/snort/docs/100000718.txt -#etc/snort/docs/100000719.txt -#etc/snort/docs/100000720.txt -#etc/snort/docs/100000721.txt -#etc/snort/docs/100000722.txt -#etc/snort/docs/100000723.txt -#etc/snort/docs/100000724.txt -#etc/snort/docs/100000725.txt -#etc/snort/docs/100000726.txt -#etc/snort/docs/100000727.txt -#etc/snort/docs/100000728.txt -#etc/snort/docs/100000729.txt -#etc/snort/docs/100000730.txt -#etc/snort/docs/100000731.txt -#etc/snort/docs/100000732.txt -#etc/snort/docs/100000733.txt -#etc/snort/docs/100000734.txt -#etc/snort/docs/100000735.txt -#etc/snort/docs/100000736.txt -#etc/snort/docs/100000737.txt -#etc/snort/docs/100000738.txt -#etc/snort/docs/100000739.txt -#etc/snort/docs/100000740.txt -#etc/snort/docs/100000741.txt -#etc/snort/docs/100000742.txt -#etc/snort/docs/100000743.txt -#etc/snort/docs/100000744.txt -#etc/snort/docs/100000745.txt -#etc/snort/docs/100000746.txt -#etc/snort/docs/100000747.txt -#etc/snort/docs/100000748.txt -#etc/snort/docs/100000749.txt -#etc/snort/docs/100000750.txt -#etc/snort/docs/100000751.txt -#etc/snort/docs/100000752.txt -#etc/snort/docs/100000753.txt -#etc/snort/docs/100000754.txt -#etc/snort/docs/100000755.txt -#etc/snort/docs/100000756.txt -#etc/snort/docs/100000757.txt -#etc/snort/docs/100000758.txt -#etc/snort/docs/100000759.txt -#etc/snort/docs/100000760.txt -#etc/snort/docs/100000761.txt -#etc/snort/docs/100000762.txt -#etc/snort/docs/100000763.txt -#etc/snort/docs/100000764.txt -#etc/snort/docs/100000765.txt -#etc/snort/docs/100000766.txt -#etc/snort/docs/100000767.txt -#etc/snort/docs/100000768.txt -#etc/snort/docs/100000769.txt -#etc/snort/docs/100000770.txt -#etc/snort/docs/100000771.txt -#etc/snort/docs/100000772.txt -#etc/snort/docs/100000773.txt -#etc/snort/docs/100000774.txt -#etc/snort/docs/100000775.txt -#etc/snort/docs/100000776.txt -#etc/snort/docs/100000777.txt -#etc/snort/docs/100000778.txt -#etc/snort/docs/100000779.txt -#etc/snort/docs/100000780.txt -#etc/snort/docs/100000781.txt -#etc/snort/docs/100000782.txt -#etc/snort/docs/100000783.txt -#etc/snort/docs/100000784.txt -#etc/snort/docs/100000785.txt -#etc/snort/docs/100000786.txt -#etc/snort/docs/100000787.txt -#etc/snort/docs/100000788.txt -#etc/snort/docs/100000789.txt -#etc/snort/docs/100000790.txt -#etc/snort/docs/100000791.txt -#etc/snort/docs/100000792.txt -#etc/snort/docs/100000793.txt -#etc/snort/docs/100000794.txt -#etc/snort/docs/100000795.txt -#etc/snort/docs/100000796.txt -#etc/snort/docs/100000797.txt -#etc/snort/docs/100000798.txt -#etc/snort/docs/100000799.txt -#etc/snort/docs/100000800.txt -#etc/snort/docs/100000801.txt -#etc/snort/docs/100000802.txt -#etc/snort/docs/100000803.txt -#etc/snort/docs/100000804.txt -#etc/snort/docs/100000805.txt -#etc/snort/docs/100000806.txt -#etc/snort/docs/100000807.txt -#etc/snort/docs/100000808.txt -#etc/snort/docs/100000809.txt -#etc/snort/docs/100000810.txt -#etc/snort/docs/100000811.txt -#etc/snort/docs/100000812.txt -#etc/snort/docs/100000813.txt -#etc/snort/docs/100000814.txt -#etc/snort/docs/100000815.txt -#etc/snort/docs/100000816.txt -#etc/snort/docs/100000817.txt -#etc/snort/docs/100000818.txt -#etc/snort/docs/100000820.txt -#etc/snort/docs/100000821.txt -#etc/snort/docs/100000822.txt -#etc/snort/docs/100000823.txt -#etc/snort/docs/100000824.txt -#etc/snort/docs/100000825.txt -#etc/snort/docs/100000826.txt -#etc/snort/docs/100000827.txt -#etc/snort/docs/100000828.txt -#etc/snort/docs/100000829.txt -#etc/snort/docs/100000830.txt -#etc/snort/docs/100000831.txt -#etc/snort/docs/100000832.txt -#etc/snort/docs/100000833.txt -#etc/snort/docs/100000834.txt -#etc/snort/docs/100000835.txt -#etc/snort/docs/100000836.txt -#etc/snort/docs/100000837.txt -#etc/snort/docs/100000838.txt -#etc/snort/docs/100000839.txt -#etc/snort/docs/100000840.txt -#etc/snort/docs/100000841.txt -#etc/snort/docs/100000842.txt -#etc/snort/docs/100000843.txt -#etc/snort/docs/100000844.txt -#etc/snort/docs/100000845.txt -#etc/snort/docs/100000846.txt -#etc/snort/docs/100000847.txt -#etc/snort/docs/100000848.txt -#etc/snort/docs/100000849.txt -#etc/snort/docs/100000850.txt -#etc/snort/docs/100000851.txt -#etc/snort/docs/100000852.txt -#etc/snort/docs/100000853.txt -#etc/snort/docs/100000854.txt -#etc/snort/docs/100000855.txt -#etc/snort/docs/100000856.txt -#etc/snort/docs/100000857.txt -#etc/snort/docs/100000858.txt -#etc/snort/docs/100000859.txt -#etc/snort/docs/100000860.txt -#etc/snort/docs/100000861.txt -#etc/snort/docs/100000862.txt -#etc/snort/docs/100000863.txt -#etc/snort/docs/100000923.txt -#etc/snort/docs/100000927.txt etc/snort/rules -#etc/snort/rules/LICENSE #etc/snort/rules/classification.config -#etc/snort/rules/community-bot.rules -#etc/snort/rules/community-deleted.rules -#etc/snort/rules/community-dos.rules -#etc/snort/rules/community-exploit.rules -#etc/snort/rules/community-ftp.rules -#etc/snort/rules/community-game.rules -#etc/snort/rules/community-icmp.rules -#etc/snort/rules/community-imap.rules -#etc/snort/rules/community-inappropriate.rules -#etc/snort/rules/community-mail-client.rules -#etc/snort/rules/community-misc.rules -#etc/snort/rules/community-nntp.rules -#etc/snort/rules/community-oracle.rules -#etc/snort/rules/community-policy.rules -#etc/snort/rules/community-sid-msg.map -#etc/snort/rules/community-sip.rules -#etc/snort/rules/community-smtp.rules -#etc/snort/rules/community-sql-injection.rules -#etc/snort/rules/community-virus.rules -#etc/snort/rules/community-web-attacks.rules -#etc/snort/rules/community-web-cgi.rules -#etc/snort/rules/community-web-client.rules -#etc/snort/rules/community-web-dos.rules -#etc/snort/rules/community-web-iis.rules -#etc/snort/rules/community-web-misc.rules -#etc/snort/rules/community-web-php.rules #etc/snort/rules/reference.config etc/snort/snort.conf etc/snort/unicode.map +usr/lib/pkgconfig/snort.pc usr/lib/snort_dynamicengine #usr/lib/snort_dynamicengine/libsf_engine.a #usr/lib/snort_dynamicengine/libsf_engine.la @@ -655,6 +17,11 @@ usr/lib/snort_dynamicpreprocessor #usr/lib/snort_dynamicpreprocessor/lib_sfdynamic_preprocessor_example.so #usr/lib/snort_dynamicpreprocessor/lib_sfdynamic_preprocessor_example.so.0 #usr/lib/snort_dynamicpreprocessor/lib_sfdynamic_preprocessor_example.so.0.0.0 +#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.a +#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.la +#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so +#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so.0 +#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so.0.0.0 #usr/lib/snort_dynamicpreprocessor/libsf_dcerpc_preproc.a #usr/lib/snort_dynamicpreprocessor/libsf_dcerpc_preproc.la #usr/lib/snort_dynamicpreprocessor/libsf_dcerpc_preproc.so @@ -691,11 +58,7 @@ usr/lib/snort_dynamicrules #usr/lib/snort_dynamicrules/lib_sfdynamic_example_rule.so #usr/lib/snort_dynamicrules/lib_sfdynamic_example_rule.so.0 #usr/lib/snort_dynamicrules/lib_sfdynamic_example_rule.so.0.0.0 -#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.a -#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.la -#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so -#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so.0 -#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so.0.0.0 +#usr/man/man8/snort.8 usr/sbin/snort #usr/share/doc/snort #usr/share/doc/snort/AUTHORS @@ -724,8 +87,7 @@ usr/sbin/snort #usr/share/doc/snort/README.decoder_preproc_rules #usr/share/doc/snort/README.dns #usr/share/doc/snort/README.event_queue -#usr/share/doc/snort/README.flow -#usr/share/doc/snort/README.flow-portscan +#usr/share/doc/snort/README.filters #usr/share/doc/snort/README.flowbits #usr/share/doc/snort/README.frag3 #usr/share/doc/snort/README.ftptelnet @@ -733,12 +95,13 @@ usr/sbin/snort #usr/share/doc/snort/README.http_inspect #usr/share/doc/snort/README.ipip #usr/share/doc/snort/README.ipv6 +#usr/share/doc/snort/README.multipleconfigs #usr/share/doc/snort/README.pcap_readmode #usr/share/doc/snort/README.ppm +#usr/share/doc/snort/README.reload #usr/share/doc/snort/README.sfportscan #usr/share/doc/snort/README.ssh #usr/share/doc/snort/README.ssl -#usr/share/doc/snort/README.stream4 #usr/share/doc/snort/README.stream5 #usr/share/doc/snort/README.tag #usr/share/doc/snort/README.thresholding @@ -748,5 +111,4 @@ usr/sbin/snort #usr/share/doc/snort/USAGE #usr/share/doc/snort/WISHLIST #usr/share/doc/snort/generators -#usr/share/man/man8/snort.8 var/log/snort diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 4f68ba9..0519d74 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -62,6 +62,7 @@ * cacti-0.8.7e * calamaris-2.59 * capi4k-utils-2005-07-18 +* ccache-2.4 * ccache-3.0pre0 * cdrtools-2.01.01 * centerim-4.22.1 @@ -293,7 +294,7 @@ * shadow-4.0.15 * slang-1.4.9 * smartmontools-5.39 -* snort-2.8.4 +* snort-2.8.5.3 * sox-12.18.1 * spandsp-0.0.6pre12 * splix-2.0.0-rc2 diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 0118783..52a57fd 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -26,8 +26,8 @@ use File::Temp qw/ tempfile tempdir /; use strict; # enable only the following on debugging purpose -#use warnings; -#use CGI::Carp 'fatalsToBrowser'; +use warnings; +use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; @@ -264,9 +264,11 @@ if (-e "/etc/snort/snort.conf") { if ($snortsettings{'RULES'} eq 'subscripted') { $url="http://dl.snort.org/sub-rules/snortrules-snapshot-2.8_s.tar.gz?oink_code=$s…'OINKCODE'}"; + #$url="http://dl.snort.org/sub-rules/snortrules-snapshot-2853_s.tar.gz?oink_code=$…'OINKCODE'}"; #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8_s.tar.gz"; } elsif ($snortsettings{'RULES'} eq 'registered') { $url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz?oink_code=$sno…'OINKCODE'}"; + #$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2853.tar.gz?oink_code=$sn…'OINKCODE'}"; #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8.tar.gz"; } else { $url="http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Ru…"; diff --git a/lfs/snort b/lfs/snort index 3955ab6..f05383c 100644 --- a/lfs/snort +++ b/lfs/snort @@ -24,7 +24,7 @@ include Config -VER = 2.8.4 +VER = 2.8.5.3 THISAPP = snort-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 193179da8db8aac5ee6b0a751ce7b76d +$(DL_FILE)_MD5 = 351d7d337c1d6ce0eb368d09ebf0483f install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 841323bc3ecd3ebf3a0c129a8ffd8d407d5c8cdf
by git＠ipfire.org 26 Apr '10

26 Apr '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 841323bc3ecd3ebf3a0c129a8ffd8d407d5c8cdf (commit) from cebf16f471fe55591051d928526e293c7d7e0a23 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 841323bc3ecd3ebf3a0c129a8ffd8d407d5c8cdf Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Mon Apr 26 19:01:17 2010 +0200 Fixed my syntax error. ----------------------------------------------------------------------- Summary of changes: src/install+setup/install/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 4038f7c..57cfd5a 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -302,9 +302,9 @@ int main(int argc, char *argv[]) fprintf(flog, "Disksize = %ld, memory = %ld", disk, memory); /* Calculating Swap-Size dependend of Ram Size */ - if (memory =< 256) + if (memory <= 256) swap_file = 128; - else if (memory =< 1024 && memory > 256) + else if (memory <= 1024 && memory > 256) swap_file = 256; else swap_file = memory / 4; hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM April 2010