# FIXME: is hwclock here newer than the hwclock package?
Package-Name: util-linux
Gentoo-Package: sys-apps/util-linux
Requires: glibc
Compile-Requires: gcc binutils make
# ncurses is needed for cfdisk
Suggests: ncurses|ncurses4
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/util-linux-(\d+.\d+\w?).tar.gz $1
#Source: ftp://ftp.cwi.nl/pub/aeb/util-linux/util-linux-(\d+.\d+\w?).tar.gz $1
Repack:
	tar xzvfp "$(SOURCE)"
Compile:
	cp -p HISTORY MAINTAINER README "$(PREFIX)/"
	CC="gcc -I/usr/include/ncurses" CFLAGS="-O2 $(GCC_OPT_FLAGS) -fno-strict-aliasing" ./configure
	$(MAKE) PREFIX="$(PREFIX)"
	$(MAKE) PREFIX="$(PREFIX)" install
	rm -f "$(PREFIX)"/sbin/readprofile "$(PREFIX)"/man/man1/readprofile.1 "$(PREFIX)"/man/man8/sln.8
#FIXME: how should these all be split up? (bin vs sbin, man1 vs man8)
	mv -f "$(PREFIX)"/bin/root/{dmesg,mount,umount} "$(PREFIX)"/sbin/root/
	mv -f "$(PREFIX)"/bin/{cytune,fdformat,ipcrm,ipcs,isosize,raw,renice,setfdprm,setsid} "$(PREFIX)"/sbin/
Install:
	mv -f "$(PREFIX)"/bin/root/{arch,more} /bin/
	mv -f "$(PREFIX)"/sbin/root/{agetty,blockdev,cfdisk,ctrlaltdel,dmesg,fdisk,fsck.cramfs,fsck.minix,losetup,mkfs,mkfs.bfs,mkfs.cramfs,mkfs.minix,mkswap,mount,pivot_root,sfdisk,swapoff,swapon,umount} "$(PREFIX)"/sbin/{ramsize,rdev,rootflags,vidmode} /sbin/
	ln -fs /sbin/{,u}mount /bin/
	rm -rf "$(PREFIX)"/{bin,sbin}/root
	chmod 4711 /sbin/{mount,umount}
	$(MAKE) instbin BIN="cal chkdupexe col colcrt colrm column ddate getopt hexdump last line logger look mcookie mesg namei pg rename rev script setterm tailf ul wall whereis write"
	$(MAKE) instsbin SBIN="cytune fdformat ipcrm ipcs isosize raw renice setfdprm setsid tunelp"
	$(MAKE) instinfo INFO=ipc
	$(MAKE) instman SECTION=1 MAN="arch cal chkdupexe col colcrt colrm column ddate getopt hexdump last line logger look mcookie mesg more namei pg rename rev script setterm tailf ul wall whereis write"
	$(MAKE) instman SECTION=5 MAN="fstab nfs"
# FIXME: fsck.cramfs, mkfs.cramfs missing
	$(MAKE) instman SECTION=8 MAN="agetty blockdev cfdisk ctrlaltdel cytune dmesg fdformat fdisk fsck.minix ipcrm ipcs isosize losetup mkfs mkfs.bfs mkfs.minix mkswap mount pivot_root ramsize raw rdev renice rootflags setfdprm setsid sfdisk swapoff swapon tunelp umount vidmode"
	$(MAKE) instlocale FILE=util-linux
Patch: <<EOT
######## begin lomount-32-byte-key-fix.diff
--- ../util-linux-2.12r-orig/mount/lomount.c	2004-12-21 07:11:04 +0900
+++ mount/lomount.c	2007-11-25 01:15:44 +0900
@@ -300,8 +300,13 @@
 		pass = xgetpass(pfd, _("Password: "));
 	gotpass:
 		memset(loopinfo64.lo_encrypt_key, 0, LO_KEY_SIZE);
-		xstrncpy(loopinfo64.lo_encrypt_key, pass, LO_KEY_SIZE);
-		memset(pass, 0, strlen(pass));
+		/* We can't use xstrncpy: it would cut off the last byte of
+		 * an LO_KEY_SIZE key */
+		i = strlen(pass);
+		if (i > LO_KEY_SIZE)
+			i = LO_KEY_SIZE;
+		memcpy(loopinfo64.lo_encrypt_key, pass, i);
+		memset(pass, 0, i);
 		loopinfo64.lo_encrypt_key_size = LO_KEY_SIZE;
 	}
 
######## end lomount-32-byte-key-fix.diff
######## begin 2.6.18+ kernel headers fix
Submitted By: Dan Nicholson <dbn_dot_lists_at_gmail_dot_com>
Date: 2006-07-08
Initial Package Version: 2.12r
Origin: Upstream
Upstream Status: Applied in util-linux-2.13-pre6.tar.bz2
Description: Replaces uses of *llseek with lseek. Fixes an issue
	compiling util-linux with kernel headers from linux-2.6.18-rc1
	headers_install.

diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/Makefile util-linux-2.12r/fdisk/Makefile
--- util-linux-2.12r.orig/fdisk/Makefile	2004-09-06 20:28:58.000000000 +0000
+++ fdisk/Makefile	2006-07-08 15:40:57.140375072 +0000
@@ -39,7 +39,7 @@ else
 endif
 endif
 
-cfdisk: cfdisk.o llseek.o disksize.o i386_sys_types.o $(LIB)/xstrncpy.o
+cfdisk: cfdisk.o disksize.o i386_sys_types.o $(LIB)/xstrncpy.o
 ifeq "$(HAVE_SLANG)" "yes"
 	$(CC) $(LDFLAGS) $^ -o $@ $(LIBSLANG)
 else
@@ -55,7 +55,7 @@ activate: sfdisk
 	rm -f activate
 	ln -s sfdisk activate
 
-fdisk: fdisk.o llseek.o disksize.o fdiskbsdlabel.o fdisksgilabel.o \
+fdisk: fdisk.o disksize.o fdiskbsdlabel.o fdisksgilabel.o \
 	fdisksunlabel.o fdiskaixlabel.o i386_sys_types.o partname.o
 fdisk.o: fdisk.c fdisk.h
 fdiskbsdlabel.o: fdiskbsdlabel.c fdisk.h fdiskbsdlabel.h
diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/cfdisk.c util-linux-2.12r/fdisk/cfdisk.c
--- util-linux-2.12r.orig/fdisk/cfdisk.c	2005-09-09 21:44:57.000000000 +0000
+++ fdisk/cfdisk.c	2006-07-08 15:40:23.458901045 +0000
@@ -84,9 +84,6 @@
 #include "xstrncpy.h"
 #include "common.h"
 
-extern long long ext2_llseek(unsigned int fd, long long offset,
-			     unsigned int origin);
-
 #define VERSION UTIL_LINUX_VERSION
 
 #define DEFAULT_DEVICE "/dev/hda"
@@ -552,7 +549,7 @@ die_x(int ret) {
 
 static void
 read_sector(char *buffer, long long sect_num) {
-    if (ext2_llseek(fd, sect_num*SECTOR_SIZE, SEEK_SET) < 0)
+    if (lseek(fd, sect_num*SECTOR_SIZE, SEEK_SET) < 0)
 	fatal(_("Cannot seek on disk drive"), 2);
     if (read(fd, buffer, SECTOR_SIZE) != SECTOR_SIZE)
 	fatal(_("Cannot read disk drive"), 2);
@@ -560,7 +557,7 @@ read_sector(char *buffer, long long sect
 
 static void
 write_sector(char *buffer, long long sect_num) {
-    if (ext2_llseek(fd, sect_num*SECTOR_SIZE, SEEK_SET) < 0)
+    if (lseek(fd, sect_num*SECTOR_SIZE, SEEK_SET) < 0)
 	fatal(_("Cannot seek on disk drive"), 2);
     if (write(fd, buffer, SECTOR_SIZE) != SECTOR_SIZE)
 	fatal(_("Cannot write disk drive"), 2);
@@ -587,7 +584,7 @@ get_dos_label(int i) {
 	long long offset;
 
 	offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE;
-	if (ext2_llseek(fd, offset, SEEK_SET) == offset
+	if (lseek(fd, offset, SEEK_SET) == offset
 	    && read(fd, &sector, sizeof(sector)) == sizeof(sector)) {
 		dos_copy_to_info(p_info[i].ostype, OSTYPESZ,
 				 sector+DOS_OSTYPE_OFFSET, DOS_OSTYPE_SZ);
@@ -672,7 +669,7 @@ get_linux_label(int i) {
 
 	offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE
 		+ 1024;
-	if (ext2_llseek(fd, offset, SEEK_SET) == offset
+	if (lseek(fd, offset, SEEK_SET) == offset
 	    && read(fd, &e2fsb, sizeof(e2fsb)) == sizeof(e2fsb)
 	    && e2fsb.s_magic[0] + (e2fsb.s_magic[1]<<8) == EXT2_SUPER_MAGIC) {
 		label = e2fsb.s_volume_name;
@@ -688,7 +685,7 @@ get_linux_label(int i) {
 	}
 
 	offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE + 0;
-	if (ext2_llseek(fd, offset, SEEK_SET) == offset
+	if (lseek(fd, offset, SEEK_SET) == offset
 	    && read(fd, &xfsb, sizeof(xfsb)) == sizeof(xfsb)
 	    && !strncmp(xfsb.s_magic, XFS_SUPER_MAGIC, 4)) {
 		label = xfsb.s_fname;
@@ -702,7 +699,7 @@ get_linux_label(int i) {
 	/* jfs? */
 	offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE
 		+ JFS_SUPER1_OFF;
-	if (ext2_llseek(fd, offset, SEEK_SET) == offset
+	if (lseek(fd, offset, SEEK_SET) == offset
 	    && read(fd, &jfsb, sizeof(jfsb)) == sizeof(jfsb)
 	    && !strncmp(jfsb.s_magic, JFS_MAGIC, strlen(JFS_MAGIC))) {
 		label = jfsb.s_label;
@@ -716,7 +713,7 @@ get_linux_label(int i) {
 	/* reiserfs? */
 	offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE
 		+ REISERFS_DISK_OFFSET_IN_BYTES;
-	if (ext2_llseek(fd, offset, SEEK_SET) == offset
+	if (lseek(fd, offset, SEEK_SET) == offset
 	    && read(fd, &reiserfsb, sizeof(reiserfsb)) == sizeof(reiserfsb)
 	    && has_reiserfs_magic_string(&reiserfsb, &reiserfs_is_3_6)) {
 		if (reiserfs_is_3_6) {
@@ -1860,7 +1857,7 @@ write_part_table(void) {
 
 	 while (!done) {
 	      mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X,
-		       _("Are you sure you want write the partition table "
+		       _("Are you sure you want to write the partition table "
 		       "to disk? (yes or no): "));
 	      len = get_string(response, LINE_LENGTH, NULL);
 	      clear_warning();
diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/fdisk.c util-linux-2.12r/fdisk/fdisk.c
--- util-linux-2.12r.orig/fdisk/fdisk.c	2004-12-18 02:00:31.000000000 +0000
+++ fdisk/fdisk.c	2006-07-08 15:40:23.461899841 +0000
@@ -239,8 +239,8 @@ void fatal(enum failure why) {
 
 static void
 seek_sector(int fd, unsigned int secno) {
-	long long offset = (long long) secno * sector_size;
-	if (ext2_llseek(fd, offset, SEEK_SET) == (long long) -1)
+	off_t offset = (off_t) secno * sector_size;
+	if (lseek(fd, offset, SEEK_SET) == (off_t) -1)
 		fatal(unable_to_seek);
 }
 
diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/fdisk.h util-linux-2.12r/fdisk/fdisk.h
--- util-linux-2.12r.orig/fdisk/fdisk.h	2004-12-15 18:19:06.000000000 +0000
+++ fdisk/fdisk.h	2006-07-08 15:40:23.462899439 +0000
@@ -26,9 +26,6 @@
 #define cround(n)	(display_in_cyl_units ? ((n)/units_per_sector)+1 : (n))
 #define scround(x)	(((x)+units_per_sector-1)/units_per_sector)
 
-extern long long ext2_llseek(unsigned int fd, long long offset,
-			     unsigned int origin);
-
 #if defined(__GNUC__) && (defined(__arm__) || defined(__alpha__))
 # define PACKED __attribute__ ((packed))
 #else
diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/fdiskbsdlabel.c util-linux-2.12r/fdisk/fdiskbsdlabel.c
--- util-linux-2.12r.orig/fdisk/fdiskbsdlabel.c	2003-07-13 21:12:47.000000000 +0000
+++ fdisk/fdiskbsdlabel.c	2006-07-08 15:40:23.463899038 +0000
@@ -566,7 +566,7 @@ xbsd_write_bootstrap (void)
   sector = get_start_sect(xbsd_part);
 #endif
 
-  if (ext2_llseek (fd, (long long) sector * SECTOR_SIZE, SEEK_SET) == -1)
+  if (lseek (fd, (off_t) sector * SECTOR_SIZE, SEEK_SET) == -1)
     fatal (unable_to_seek);
   if (BSD_BBSIZE != write (fd, disklabelbuffer, BSD_BBSIZE))
     fatal (unable_to_write);
@@ -735,7 +735,7 @@ xbsd_readlabel (struct partition *p, str
 	sector = 0;
 #endif
 
-	if (ext2_llseek (fd, (long long) sector * SECTOR_SIZE, SEEK_SET) == -1)
+	if (lseek (fd, (off_t) sector * SECTOR_SIZE, SEEK_SET) == -1)
 		fatal (unable_to_seek);
 	if (BSD_BBSIZE != read (fd, disklabelbuffer, BSD_BBSIZE))
 		fatal (unable_to_read);
@@ -781,12 +781,12 @@ xbsd_writelabel (struct partition *p, st
 
 #if defined (__alpha__) && BSD_LABELSECTOR == 0
   alpha_bootblock_checksum (disklabelbuffer);
-  if (ext2_llseek (fd, (long long) 0, SEEK_SET) == -1)
+  if (lseek (fd, (off_t) 0, SEEK_SET) == -1)
     fatal (unable_to_seek);
   if (BSD_BBSIZE != write (fd, disklabelbuffer, BSD_BBSIZE))
     fatal (unable_to_write);
 #else
-  if (ext2_llseek (fd, (long long) sector * SECTOR_SIZE + BSD_LABELOFFSET,
+  if (lseek (fd, (off_t) sector * SECTOR_SIZE + BSD_LABELOFFSET,
 		   SEEK_SET) == -1)
     fatal (unable_to_seek);
   if (sizeof (struct xbsd_disklabel) != write (fd, d, sizeof (struct xbsd_disklabel)))
diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/fdisksgilabel.c util-linux-2.12r/fdisk/fdisksgilabel.c
--- util-linux-2.12r.orig/fdisk/fdisksgilabel.c	2004-12-18 01:53:45.000000000 +0000
+++ fdisk/fdisksgilabel.c	2006-07-08 15:40:23.464898637 +0000
@@ -379,7 +379,7 @@ sgi_write_table(void) {
 		 */
 		sgiinfo *info = fill_sgiinfo();
 		int infostartblock = SSWAP32(sgilabel->directory[0].vol_file_start);
-		if (ext2_llseek(fd, (long long)infostartblock*
+		if (lseek(fd, (off_t) infostartblock*
 				SECTOR_SIZE, SEEK_SET) < 0)
 			fatal(unable_to_seek);
 		if (write(fd, info, SECTOR_SIZE) != SECTOR_SIZE)
diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/sfdisk.c util-linux-2.12r/fdisk/sfdisk.c
--- util-linux-2.12r.orig/fdisk/sfdisk.c	2005-01-04 22:31:57.000000000 +0000
+++ fdisk/sfdisk.c	2006-07-08 15:40:23.467897432 +0000
@@ -164,36 +164,17 @@ fatal(char *s, ...) {
 /*
  * sseek: seek to specified sector - return 0 on failure
  *
- * For >4GB disks lseek needs a > 32bit arg, and we have to use llseek.
- * On the other hand, a 32 bit sector number is OK until 2TB.
- * The routines _llseek and sseek below are the only ones that
- * know about the loff_t type.
- *
  * Note: we use 512-byte sectors here, irrespective of the hardware ss.
  */
-#undef use_lseek
-#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (__s390x__)
-#define use_lseek
-#endif
-
-#ifndef use_lseek
-static __attribute__used
-_syscall5(int,  _llseek,  unsigned int,  fd, ulong, hi, ulong, lo,
-       loff_t *, res, unsigned int, wh);
-#endif
 
 static int
 sseek(char *dev, unsigned int fd, unsigned long s) {
-    loff_t in, out;
-    in = ((loff_t) s << 9);
+    off_t in, out;
+    in = ((off_t) s << 9);
     out = 1;
 
-#ifndef use_lseek
-    if (_llseek (fd, in>>32, in & 0xffffffff, &out, SEEK_SET) != 0) {
-#else
     if ((out = lseek(fd, in, SEEK_SET)) != in) {
-#endif
-	perror("llseek");
+	perror("lseek");
 	error(_("seek error on %s - cannot seek to %lu\n"), dev, s);
 	return 0;
     }
diff -pur -x '*.rej' util-linux-2.12r.orig/partx/partx.c util-linux-2.12r/partx/partx.c
--- util-linux-2.12r.orig/partx/partx.c	2004-08-23 20:13:27.000000000 +0000
+++ partx/partx.c	2006-07-08 15:40:23.469896630 +0000
@@ -330,34 +330,15 @@ xmalloc (size_t size) {
 	return t;
 }
 
-/*
- * sseek: seek to specified sector
- */
-#if !defined (__alpha__) && !defined (__ia64__) && !defined (__s390x__) && !defined(__x86_64__)
-#define NEED__llseek
-#endif
-
-#ifdef NEED__llseek
-#include <linux/unistd.h>       /* _syscall */
-static
-_syscall5(int,  _llseek,  uint,  fd, ulong, hi, ulong, lo,
-	  long long *, res, uint, wh);
-#endif
-
 static int
 sseek(int fd, unsigned int secnr) {
 	long long in, out;
 	in = ((long long) secnr << 9);
 	out = 1;
 
-#ifdef NEED__llseek
-	if (_llseek (fd, in>>32, in & 0xffffffff, &out, SEEK_SET) != 0
-	    || out != in)
-#else
 	if ((out = lseek(fd, in, SEEK_SET)) != in)
-#endif
 	{
-		fprintf(stderr, "llseek error\n");
+		fprintf(stderr, "lseek error\n");
 		return -1;
 	}
 	return 0;
######## end 2.6.18+ kernel headers fix
######## begin K=1024 patch
diff -urN ../util-linux-2.12p-orig/fdisk/cfdisk.c fdisk/cfdisk.c
--- ../util-linux-2.12p-orig/fdisk/cfdisk.c	2004-12-23 03:06:01 +0900
+++ fdisk/cfdisk.c	2005-01-02 13:29:54 +0900
@@ -93,7 +93,7 @@
 #define ALTERNATE_DEVICE "/dev/sda"
 
 /* With K=1024 we have `binary' megabytes, gigabytes, etc.
-   Some misguided hackers like that.
+   Some hackers like that.
    With K=1000 we have MB and GB that follow the standards
    [SI, ATA, IEEE etc] and the disk manufacturers and the law. */
 #define K	1000
diff -urN ../util-linux-2.12p-orig/fdisk/fdisk.c fdisk/fdisk.c
--- ../util-linux-2.12p-orig/fdisk/fdisk.c	2004-12-18 11:00:31 +0900
+++ fdisk/fdisk.c	2005-01-02 13:29:54 +0900
@@ -34,6 +34,12 @@
 
 static void delete_partition(int i);
 
+/* With K=1024 we have `binary' megabytes, gigabytes, etc.
+   Some hackers like that.
+   With K=1000 we have MB and GB that follow the standards
+   [SI, ATA, IEEE etc] and the disk manufacturers and the law. */
+#define K	1000
+
 #define hex_val(c)	({ \
 				char _c = (c); \
 				isdigit(_c) ? _c - '0' : \
@@ -1132,18 +1138,16 @@
 						i *= heads * sectors;
 					break;
 				case 'K':
-					absolute = 1024;
-					break;
 				case 'k':
-					absolute = 1000;
+					absolute = K;
 					break;
 				case 'm':
 				case 'M':
-					absolute = 1000000;
+					absolute = K*K;
 					break;
 				case 'g':
 				case 'G':
-					absolute = 1000000000;
+					absolute = K*K*K;
 					break;
 				default:
 					break;
@@ -1526,14 +1530,15 @@
 static void
 list_disk_geometry(void) {
 	long long bytes = (total_number_of_sectors << 9);
-	long megabytes = bytes/1000000;
+	long megabytes = bytes/K/K;
 
-	if (megabytes < 10000)
+	if (megabytes < 10*K)
 		printf(_("\nDisk %s: %ld MB, %lld bytes\n"),
 		       disk_device, megabytes, bytes);
 	else
 		printf(_("\nDisk %s: %ld.%ld GB, %lld bytes\n"),
-		       disk_device, megabytes/1000, (megabytes/100)%10, bytes);
+		       disk_device, (megabytes*10/K)/10, (megabytes*10/K)%10,
+		       bytes);
 	printf(_("%d heads, %d sectors/track, %d cylinders"),
 	       heads, sectors, cylinders);
 	if (units_per_sector == 1)
######## end K=1024 patch
######## remainder is local stuff
--- ../util-linux-2.12p-orig/MCONFIG	2004-12-13 08:15:48 +0900
+++ MCONFIG	2005-01-02 13:30:54 +0900
@@ -59,7 +59,7 @@
 # not be built or installed from the login-utils subdirectory.  (The
 # shutdown and init from the SysVinit package do not depend on the last,
 # mesg, and wall from that package.)
-HAVE_SYSVINIT_UTILS=yes
+HAVE_SYSVINIT_UTILS=no
 
 # If HAVE_WRITE is set to "yes", then write will not be built or
 # installed from the misc-utils subdirectory.
@@ -77,18 +77,18 @@
 # user's tty to "tty" [The login in util-linux does this correctly, and
 # xterm will do it correctly if X is compiled with USE_TTY_GROUP set
 # properly.]
-USE_TTY_GROUP=yes
+USE_TTY_GROUP=no
 
 # If HAVE_KILL is set to "yes", then kill will not be built or
 # installed from the misc-utils subdirectory.
 # (There is also a kill in the procps package.)
-HAVE_KILL=no
+HAVE_KILL=yes
 
 # If ALLOW_VCS_USE is set to "yes", then login will chown /dev/vcsN
 # to the current user, allowing her to make a screendump and do other
 # nifty things on the console, but also allowing him to keep an open
 # file descriptor after logging out to trick the next user.
-ALLOW_VCS_USE=yes
+ALLOW_VCS_USE=no
 
 # If DO_STAT_MAIL is set to "yes", then login will stat() the mailbox
 # and tell the user that she has new mail. This can hang the login if
@@ -102,7 +102,7 @@
 # If HAVE_SLN is set to "yes", then sln won't be installed
 # (but the man page sln.8 will be installed anyway).
 # sln also comes with libc and glibc.
-HAVE_SLN=no
+HAVE_SLN=yes
 
 # If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed.
 HAVE_FDUTILS=no
@@ -172,36 +172,37 @@
 USRLIB_DIR=	/usr/lib
 USRBIN_DIR=	/usr/bin
 USRGAMES_DIR=	/usr/games
-USRSHAREMISC_DIR=/usr/share/misc
+USRSHAREMISC_DIR=$(PREFIX)/share
 LOCALE_DIR=	/usr/share/locale
 BIN_DIR=        /bin
 VAR_PATH=	/var
 LOG_DIR=	/var/log
-MAN_DIR=	/usr/share/man
-INFO_DIR=	/usr/share/info
+MAN_DIR=	/usr/man
+INFO_DIR=	/usr/info
 
 #
 # Paths used for install
 #
-DEVDIR=		$(DESTDIR)$(DEV_DIR)
-ETCDIR=		$(DESTDIR)$(ETC_DIR)
-SBINDIR=	$(DESTDIR)$(SBIN_DIR)
-USRSBINDIR=	$(DESTDIR)$(USRSBIN_DIR)
-USRLIBDIR=      $(DESTDIR)$(USRLIB_DIR)
-USRBINDIR=      $(DESTDIR)$(USRBIN_DIR)
-USRGAMESDIR=    $(DESTDIR)$(USRGAMES_DIR)
-USRSHAREMISCDIR=$(DESTDIR)$(USRSHAREMISC_DIR)
-LOCALEDIR=      $(DESTDIR)$(LOCALE_DIR)
-BINDIR=         $(DESTDIR)$(BIN_DIR)
-VARPATH=	$(DESTDIR)$(VAR_PATH)
-LOGDIR=		$(DESTDIR)$(LOG_DIR)
-MANDIR=		$(DESTDIR)$(MAN_DIR)
+PREFIX=/dev/null
+DEVDIR=		$(PREFIX)/dev
+ETCDIR=		$(PREFIX)/etc
+SBINDIR=	$(PREFIX)/sbin/root
+USRSBINDIR=	$(PREFIX)/sbin
+USRLIBDIR=      $(PREFIX)/lib
+USRBINDIR=      $(PREFIX)/bin
+USRGAMESDIR=    $(PREFIX)/games
+USRSHAREMISCDIR=$(USRSHAREMISC_DIR)
+LOCALEDIR=      $(PREFIX)/share/locale
+BINDIR=         $(PREFIX)/bin/root
+VARPATH=	$(PREFIX)/var
+LOGDIR=		$(PREFIX)/var/log
+MANDIR=		$(PREFIX)/man
 MAN1DIR=	$(MANDIR)/man1
 MAN3DIR=	$(MANDIR)/man3
 MAN5DIR=	$(MANDIR)/man5
 MAN6DIR=	$(MANDIR)/man6
 MAN8DIR=	$(MANDIR)/man8
-INFODIR=	$(DESTDIR)$(INFO_DIR)
+INFODIR=	$(PREFIX)/info
 
 # Directory for shutdown, halt, reboot, etc.
 SHUTDOWNDIR=	$(SBINDIR)
diff -urN ../util-linux-2.12p-orig/disk-utils/blockdev.c disk-utils/blockdev.c
--- ../util-linux-2.12p-orig/disk-utils/blockdev.c	2004-08-19 02:52:20 +0900
+++ disk-utils/blockdev.c	2005-01-02 13:30:54 +0900
@@ -162,9 +162,11 @@
 	if ((p = strrchr(progname, '/')) != NULL)
 		progname = p+1;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	if (argc < 2)
 		usage();
diff -urN ../util-linux-2.12p-orig/disk-utils/fdformat.c disk-utils/fdformat.c
--- ../util-linux-2.12p-orig/disk-utils/fdformat.c	2002-07-07 21:38:24 +0900
+++ disk-utils/fdformat.c	2005-01-02 13:30:54 +0900
@@ -107,9 +107,11 @@
     if ((p = strrchr(progname, '/')) != NULL)
 	    progname = p+1;
 
+#ifndef DISABLE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+#endif
 
     if (argc == 2 &&
 	(!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
diff -urN ../util-linux-2.12p-orig/disk-utils/fsck.minix.c disk-utils/fsck.minix.c
--- ../util-linux-2.12p-orig/disk-utils/fsck.minix.c	2004-08-25 07:21:39 +0900
+++ disk-utils/fsck.minix.c	2005-01-02 13:30:54 +0900
@@ -1240,9 +1240,11 @@
 	if ((p = strrchr(program_name, '/')) != NULL)
 		program_name = p+1;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	if (argc == 2 &&
 	    (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
diff -urN ../util-linux-2.12p-orig/disk-utils/isosize.c disk-utils/isosize.c
--- ../util-linux-2.12p-orig/disk-utils/isosize.c	2002-03-09 07:57:57 +0900
+++ disk-utils/isosize.c	2005-01-02 13:30:54 +0900
@@ -170,9 +170,11 @@
 	if ((p = strrchr(progname, '/')) != NULL)
 		progname = p+1;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	if (argc >= 2 &&
 	    (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
diff -urN ../util-linux-2.12p-orig/disk-utils/mkfs.c disk-utils/mkfs.c
--- ../util-linux-2.12p-orig/disk-utils/mkfs.c	2004-12-23 06:04:43 +0900
+++ disk-utils/mkfs.c	2005-01-02 13:30:54 +0900
@@ -45,9 +45,11 @@
   if ((p = strrchr(program_name, '/')) != NULL)
 	  program_name = p+1;
 
+#ifndef DISABLE_NLS
   setlocale(LC_ALL, "");
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
+#endif
 
   if (argc == 2 &&
       (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
diff -urN ../util-linux-2.12p-orig/disk-utils/mkfs.minix.c disk-utils/mkfs.minix.c
--- ../util-linux-2.12p-orig/disk-utils/mkfs.minix.c	2004-08-25 07:32:36 +0900
+++ disk-utils/mkfs.minix.c	2005-01-02 13:30:54 +0900
@@ -617,9 +617,11 @@
   if ((p = strrchr(program_name, '/')) != NULL)
     program_name = p+1;
 
+#ifndef DISABLE_NLS
   setlocale(LC_ALL, "");
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
+#endif
 
   if (argc == 2 &&
       (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
diff -urN ../util-linux-2.12p-orig/disk-utils/mkswap.c disk-utils/mkswap.c
--- ../util-linux-2.12p-orig/disk-utils/mkswap.c	2004-12-22 02:21:24 +0900
+++ disk-utils/mkswap.c	2005-01-02 13:30:54 +0900
@@ -514,9 +514,11 @@
 	if ((pp = strrchr(program_name, '/')) != NULL)
 		program_name = pp+1;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	if (argc == 2 &&
 	    (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
diff -urN ../util-linux-2.12p-orig/disk-utils/setfdprm.c disk-utils/setfdprm.c
--- ../util-linux-2.12p-orig/disk-utils/setfdprm.c	2001-10-21 19:32:27 +0900
+++ disk-utils/setfdprm.c	2005-01-02 13:30:54 +0900
@@ -119,9 +119,11 @@
     if ((p = strrchr(progname, '/')) != NULL)
 	    progname = p+1;
 
+#ifndef DISABLE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+#endif
 
     if (argc == 2 &&
 	(!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
diff -urN ../util-linux-2.12p-orig/fdisk/cfdisk.c fdisk/cfdisk.c
--- ../util-linux-2.12p-orig/fdisk/cfdisk.c	2005-01-02 13:29:54 +0900
+++ fdisk/cfdisk.c	2005-01-02 13:30:54 +0900
@@ -96,7 +96,7 @@
    Some hackers like that.
    With K=1000 we have MB and GB that follow the standards
    [SI, ATA, IEEE etc] and the disk manufacturers and the law. */
-#define K	1000
+#define K	1024
 
 #define LINE_LENGTH 80
 #define MAXIMUM_PARTS 60
@@ -2921,9 +2921,11 @@
     int c;
     int i, len;
 
+#ifndef DISABLE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+#endif
 
     while ((c = getopt(argc, argv, "ac:gh:s:vzP:")) != -1)
 	switch (c) {
diff -urN ../util-linux-2.12p-orig/fdisk/fdisk.c fdisk/fdisk.c
--- ../util-linux-2.12p-orig/fdisk/fdisk.c	2005-01-02 13:29:54 +0900
+++ fdisk/fdisk.c	2005-01-02 13:30:54 +0900
@@ -38,7 +38,7 @@
    Some hackers like that.
    With K=1000 we have MB and GB that follow the standards
    [SI, ATA, IEEE etc] and the disk manufacturers and the law. */
-#define K	1000
+#define K	1024
 
 #define hex_val(c)	({ \
 				char _c = (c); \
@@ -2468,9 +2468,11 @@
 	int j, c;
 	int optl = 0, opts = 0;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	/*
 	 * Calls:
diff -urN ../util-linux-2.12p-orig/fdisk/sfdisk.c fdisk/sfdisk.c
--- ../util-linux-2.12p-orig/fdisk/sfdisk.c	2004-12-16 03:18:30 +0900
+++ fdisk/sfdisk.c	2005-01-02 13:30:54 +0900
@@ -2503,9 +2503,11 @@
     char *activatearg = 0;
     char *unhidearg = 0;
 
+#ifndef DISABLE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+#endif
 
     if (argc < 1)
       fatal(_("no command?\n"));
diff -urN ../util-linux-2.12p-orig/getopt/getopt.c getopt/getopt.c
--- ../util-linux-2.12p-orig/getopt/getopt.c	2003-01-24 05:55:00 +0900
+++ getopt/getopt.c	2005-01-02 13:30:54 +0900
@@ -371,7 +371,7 @@
 	int opt;
 	int compatible=0;
 
-#if WITHOUT_GETTEXT
+#if WITHOUT_GETTEXT || defined(DISABLE_NLS)
 #else
 	setlocale(LC_ALL,"");
 	bindtextdomain(PACKAGE, LOCALEDIR);
diff -urN ../util-linux-2.12p-orig/hwclock/hwclock.c hwclock/hwclock.c
--- ../util-linux-2.12p-orig/hwclock/hwclock.c	2004-12-16 04:13:48 +0900
+++ hwclock/hwclock.c	2005-01-02 13:30:54 +0900
@@ -1299,6 +1299,7 @@
 	/* Remember what time we were invoked */
 	gettimeofday(&startup_time, NULL);
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 #ifdef LC_NUMERIC
 	/* We need LC_CTYPE and LC_TIME and LC_MESSAGES, but must avoid
@@ -1308,6 +1309,7 @@
 #endif
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	/* Set option defaults */
 	show = set = systohc = hctosys = adjust = noadjfile = FALSE;
diff -urN ../util-linux-2.12p-orig/login-utils/agetty.c login-utils/agetty.c
--- ../util-linux-2.12p-orig/login-utils/agetty.c	2002-07-29 16:36:42 +0900
+++ login-utils/agetty.c	2005-01-02 13:30:54 +0900
@@ -267,9 +267,11 @@
 	0,				/* no baud rates known yet */
     };
 
+#ifndef DISABLE_NLS
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
+#endif
     
     /* The BSD-style init command passes us a useless process name. */
 
diff -urN ../util-linux-2.12p-orig/login-utils/chfn.c login-utils/chfn.c
--- ../util-linux-2.12p-orig/login-utils/chfn.c	2004-11-05 03:43:43 +0900
+++ login-utils/chfn.c	2005-01-02 13:30:54 +0900
@@ -97,9 +97,11 @@
 #endif
 
     sanitize_env();
+#ifndef DISABLE_NLS
     setlocale(LC_ALL, "");	/* both for messages and for iscntrl() below */
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+#endif
 
     /* whoami is the program name for error messages */
     whoami = argv[0];
diff -urN ../util-linux-2.12p-orig/login-utils/chsh.c login-utils/chsh.c
--- ../util-linux-2.12p-orig/login-utils/chsh.c	2004-11-05 03:44:31 +0900
+++ login-utils/chsh.c	2005-01-02 13:30:54 +0900
@@ -92,9 +92,11 @@
 #endif
 
     sanitize_env();
+#ifndef DISABLE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+#endif
 
     /* whoami is the program name for error messages */
     whoami = argv[0];
diff -urN ../util-linux-2.12p-orig/login-utils/last.c login-utils/last.c
--- ../util-linux-2.12p-orig/login-utils/last.c	2002-03-09 07:59:41 +0900
+++ login-utils/last.c	2005-01-02 13:30:54 +0900
@@ -109,9 +109,11 @@
 	extern char	*optarg;
 	int	ch;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	while ((ch = getopt(argc, argv, "0123456789yli:f:h:t:")) != -1)
 		switch((char)ch) {
diff -urN ../util-linux-2.12p-orig/login-utils/login.c login-utils/login.c
--- ../util-linux-2.12p-orig/login-utils/login.c	2004-12-05 11:37:12 +0900
+++ login-utils/login.c	2005-01-02 13:30:54 +0900
@@ -380,9 +380,11 @@
     signal(SIGQUIT, SIG_IGN);
     signal(SIGINT, SIG_IGN);
 
+#ifndef DISABLE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+#endif
     
     setpriority(PRIO_PROCESS, 0, 0);
 #ifdef HAVE_QUOTA
diff -urN ../util-linux-2.12p-orig/login-utils/mesg.c login-utils/mesg.c
--- ../util-linux-2.12p-orig/login-utils/mesg.c	2002-03-09 07:59:59 +0900
+++ login-utils/mesg.c	2005-01-02 13:30:54 +0900
@@ -65,9 +65,11 @@
 	char *tty;
 	int ch;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 
 	while ((ch = getopt(argc, argv, "")) != -1)
diff -urN ../util-linux-2.12p-orig/login-utils/newgrp.c login-utils/newgrp.c
--- ../util-linux-2.12p-orig/login-utils/newgrp.c	2001-03-15 19:09:58 +0900
+++ login-utils/newgrp.c	2005-01-02 13:30:54 +0900
@@ -60,9 +60,11 @@
     struct group *gr_entry;
     char *shell;
 
+#ifndef DISABLE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+#endif
     
     if (!(pw_entry = getpwuid(getuid()))) {
 	perror(_("newgrp: Who are you?"));
diff -urN ../util-linux-2.12p-orig/login-utils/passwd.c login-utils/passwd.c
--- ../util-linux-2.12p-orig/login-utils/passwd.c	2002-03-09 08:00:11 +0900
+++ login-utils/passwd.c	2005-01-02 13:30:54 +0900
@@ -252,9 +252,11 @@
 	};
 
     sanitize_env();
+#ifndef DISABLE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+#endif
 
     optind = 0;
     while ((c = getopt_long(argc, argv, "foqsvV",
diff -urN ../util-linux-2.12p-orig/login-utils/shutdown.c login-utils/shutdown.c
--- ../util-linux-2.12p-orig/login-utils/shutdown.c	2004-09-17 07:38:16 +0900
+++ login-utils/shutdown.c	2005-01-02 13:30:54 +0900
@@ -153,9 +153,11 @@
 	sigsetmask (0); /*  simpleinit(8) blocks all signals: undo for ALRM  */
 	for (i = 1; i < NSIG; i++) signal (i, SIG_DFL);
 
+#ifndef DISABLE_NLS
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
+#endif
 
 #ifndef DEBUGGING
 	if(setreuid (0, 0)) {
diff -urN ../util-linux-2.12p-orig/login-utils/simpleinit.c login-utils/simpleinit.c
--- ../util-linux-2.12p-orig/login-utils/simpleinit.c	2004-12-16 05:23:25 +0900
+++ login-utils/simpleinit.c	2005-01-02 13:30:54 +0900
@@ -167,9 +167,11 @@
 	sa.sa_handler = sigquit_handler;
 	sigaction (SIGQUIT, &sa, NULL);
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	my_reboot (LINUX_REBOOT_CMD_CAD_OFF);
 	/*  Find script to run. Command-line overrides config file overrides
diff -urN ../util-linux-2.12p-orig/login-utils/vipw.c login-utils/vipw.c
--- ../util-linux-2.12p-orig/login-utils/vipw.c	2004-03-05 06:54:44 +0900
+++ login-utils/vipw.c	2005-01-02 13:30:54 +0900
@@ -309,9 +309,11 @@
 
 int main(int argc, char *argv[]) {
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	bzero(tmp_file, FILENAMELEN);
 	progname = (rindex(argv[0], '/')) ? rindex(argv[0], '/') + 1 : argv[0];
diff -urN ../util-linux-2.12p-orig/login-utils/wall.c login-utils/wall.c
--- ../util-linux-2.12p-orig/login-utils/wall.c	2002-03-09 08:00:19 +0900
+++ login-utils/wall.c	2005-01-02 13:30:54 +0900
@@ -82,9 +82,11 @@
 	char *p;
 	char line[sizeof(utmpptr->ut_line) + 1];
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
+#endif
 
 	progname = argv[0];
 	p = rindex(progname, '/');
diff -urN ../util-linux-2.12p-orig/misc-utils/cal.c misc-utils/cal.c
--- ../util-linux-2.12p-orig/misc-utils/cal.c	2004-12-06 04:20:36 +0900
+++ misc-utils/cal.c	2005-01-02 13:30:54 +0900
@@ -251,9 +251,11 @@
 		progname = p+1;
 	__progname = progname;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 #if defined(HAVE_ncurses) || defined(HAVE_termcap)
 	if ((term = getenv("TERM"))) {
diff -urN ../util-linux-2.12p-orig/misc-utils/ddate.c misc-utils/ddate.c
--- ../util-linux-2.12p-orig/misc-utils/ddate.c	2004-09-07 06:12:40 +0900
+++ misc-utils/ddate.c	2005-01-02 13:30:54 +0900
@@ -165,9 +165,12 @@
     if ((p = strrchr(progname, '/')) != NULL)
 	progname = p+1;
 
+#ifndef DISABLE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+#endif
+
 
     srandom(time(NULL));
     /* do args here */
diff -urN ../util-linux-2.12p-orig/misc-utils/kill.c misc-utils/kill.c
--- ../util-linux-2.12p-orig/misc-utils/kill.c	2004-12-03 07:35:35 +0900
+++ misc-utils/kill.c	2005-01-02 13:30:54 +0900
@@ -163,9 +163,11 @@
     if ((p = strrchr(progname, '/')) != NULL)
 	    progname = p+1;
 
+#ifndef DISABLE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+#endif
 
     numsig = SIGTERM;
     do_pid = (! strcmp (progname, "pid")); 	/* Yecch */
diff -urN ../util-linux-2.12p-orig/misc-utils/logger.c misc-utils/logger.c
--- ../util-linux-2.12p-orig/misc-utils/logger.c	2004-09-07 06:13:49 +0900
+++ misc-utils/logger.c	2005-01-02 13:30:54 +0900
@@ -126,9 +126,11 @@
 	char *usock = NULL;
 	int LogSock = -1;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	tag = NULL;
 	pri = LOG_NOTICE;
diff -urN ../util-linux-2.12p-orig/misc-utils/look.c misc-utils/look.c
--- ../util-linux-2.12p-orig/misc-utils/look.c	2004-09-07 06:04:52 +0900
+++ misc-utils/look.c	2005-01-02 13:30:54 +0900
@@ -89,11 +89,13 @@
 	int ch, fd, termchar;
 	char *back, *file, *front, *p;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 	
 	setlocale(LC_ALL, "");
+#endif
 
 	file = _PATH_WORDS;
 	termchar = '\0';
diff -urN ../util-linux-2.12p-orig/misc-utils/mcookie.c misc-utils/mcookie.c
--- ../util-linux-2.12p-orig/misc-utils/mcookie.c	2002-03-09 08:00:52 +0900
+++ misc-utils/mcookie.c	2005-01-02 13:30:54 +0900
@@ -86,9 +86,11 @@
    long int          t;
 #endif
 
+#ifndef DISABLE_NLS
    setlocale(LC_ALL, "");
    bindtextdomain(PACKAGE, LOCALEDIR);
    textdomain(PACKAGE);
+#endif
 
    while ((c = getopt( argc, argv, "vf:" )) != -1)
       switch (c) {
diff -urN ../util-linux-2.12p-orig/misc-utils/namei.c misc-utils/namei.c
--- ../util-linux-2.12p-orig/misc-utils/namei.c	2004-12-23 08:03:39 +0900
+++ misc-utils/namei.c	2005-01-02 13:30:54 +0900
@@ -75,9 +75,11 @@
     int c;
     char curdir[MAXPATHLEN];
 
+#ifndef DISABLE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+#endif
     
     if(argc < 2)
 	usage();
diff -urN ../util-linux-2.12p-orig/misc-utils/rename.c misc-utils/rename.c
--- ../util-linux-2.12p-orig/misc-utils/rename.c	2000-05-10 06:39:03 +0900
+++ misc-utils/rename.c	2005-01-02 13:30:54 +0900
@@ -70,9 +70,11 @@
 	if ((p = strrchr(progname, '/')) != NULL)
 		progname = p+1;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	if (argc == 2) {
 		if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
diff -urN ../util-linux-2.12p-orig/misc-utils/script.c misc-utils/script.c
--- ../util-linux-2.12p-orig/misc-utils/script.c	2004-03-27 02:07:16 +0900
+++ misc-utils/script.c	2005-01-02 13:30:54 +0900
@@ -133,10 +133,12 @@
 		progname = p+1;
 
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	setlocale(LC_NUMERIC, "C");	/* see comment above */
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 	
 	if (argc == 2) {
 		if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
diff -urN ../util-linux-2.12p-orig/misc-utils/setterm.c misc-utils/setterm.c
--- ../util-linux-2.12p-orig/misc-utils/setterm.c	2003-10-18 01:17:51 +0900
+++ misc-utils/setterm.c	2005-01-02 13:30:54 +0900
@@ -1201,9 +1201,11 @@
 	char *term;			/* Terminal type. */
 	int vcterm;			/* Set if terminal is a virtual console. */
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
   
 	if (argc < 2)
 		bad_arg = TRUE;
diff -urN ../util-linux-2.12p-orig/misc-utils/whereis.c misc-utils/whereis.c
--- ../util-linux-2.12p-orig/misc-utils/whereis.c	2001-03-15 19:09:58 +0900
+++ misc-utils/whereis.c	2005-01-02 13:30:54 +0900
@@ -146,9 +146,11 @@
  */
 int
 main(int argc, char **argv) {
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 	
 
 	argc--, argv++;
diff -urN ../util-linux-2.12p-orig/misc-utils/write.c misc-utils/write.c
--- ../util-linux-2.12p-orig/misc-utils/write.c	2001-03-15 19:09:58 +0900
+++ misc-utils/write.c	2005-01-02 13:30:54 +0900
@@ -80,9 +80,11 @@
 	int msgsok, myttyfd;
 	char tty[MAXPATHLEN], *mytty;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	/* check that sender has write enabled */
 	if (isatty(fileno(stdin)))
diff -urN ../util-linux-2.12p-orig/mount/lomount.c mount/lomount.c
--- ../util-linux-2.12p-orig/mount/lomount.c	2004-12-21 07:11:04 +0900
+++ mount/lomount.c	2005-01-02 13:30:54 +0900
@@ -448,9 +448,11 @@
 	int pfd = -1;
 	unsigned long long off;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	delete = find = 0;
 	off = 0;
diff -urN ../util-linux-2.12p-orig/mount/mount.c mount/mount.c
--- ../util-linux-2.12p-orig/mount/mount.c	2004-12-22 07:00:36 +0900
+++ mount/mount.c	2005-01-02 13:30:54 +0900
@@ -1468,9 +1468,11 @@
 	int fd;
 
 	sanitize_env();
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	progname = argv[0];
 	if ((p = strrchr(progname, '/')) != NULL)
diff -urN ../util-linux-2.12p-orig/mount/swapon.c mount/swapon.c
--- ../util-linux-2.12p-orig/mount/swapon.c	2004-12-22 18:50:19 +0900
+++ mount/swapon.c	2005-01-02 13:30:54 +0900
@@ -518,9 +518,11 @@
 main(int argc, char *argv[]) {
 	char *p;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	progname = argv[0];
 	p = strrchr(progname, '/');
diff -urN ../util-linux-2.12p-orig/mount/umount.c mount/umount.c
--- ../util-linux-2.12p-orig/mount/umount.c	2004-12-21 07:03:45 +0900
+++ mount/umount.c	2005-01-02 13:30:54 +0900
@@ -655,9 +655,11 @@
 	int result = 0;
 
 	sanitize_env();
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	progname = argv[0];
 	if ((p = strrchr(progname, '/')) != NULL)
diff -urN ../util-linux-2.12p-orig/sys-utils/ctrlaltdel.c sys-utils/ctrlaltdel.c
--- ../util-linux-2.12p-orig/sys-utils/ctrlaltdel.c	2001-03-15 19:09:59 +0900
+++ sys-utils/ctrlaltdel.c	2005-01-02 13:30:54 +0900
@@ -17,9 +17,11 @@
 int
 main(int argc, char *argv[]) {
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 	
 
 	if(geteuid()) {
diff -urN ../util-linux-2.12p-orig/sys-utils/cytune.c sys-utils/cytune.c
--- ../util-linux-2.12p-orig/sys-utils/cytune.c	2004-11-05 01:59:27 +0900
+++ sys-utils/cytune.c	2005-01-02 13:30:54 +0900
@@ -175,9 +175,11 @@
   global_argc = argc;		/* For signal routine. */
   global_argv = &argv;		/* For signal routine. */
 
+#ifndef DISABLE_NLS
   setlocale(LC_ALL, "");
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
+#endif
 
   while ((i = getopt(argc, argv, "qs:S:t:T:gGi:")) != -1) {
     switch (i) {
diff -urN ../util-linux-2.12p-orig/sys-utils/dmesg.c sys-utils/dmesg.c
--- ../util-linux-2.12p-orig/sys-utils/dmesg.c	2004-05-05 01:38:12 +0900
+++ sys-utils/dmesg.c	2005-01-02 13:30:54 +0900
@@ -68,9 +68,11 @@
 	int  lastc;
 	int  cmd = 3;		/* Read all messages in the ring buffer */
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	progname = argv[0];
 	while ((c = getopt(argc, argv, "cn:s:")) != -1) {
diff -urN ../util-linux-2.12p-orig/sys-utils/ipcrm.c sys-utils/ipcrm.c
--- ../util-linux-2.12p-orig/sys-utils/ipcrm.c	2002-04-24 23:42:54 +0900
+++ sys-utils/ipcrm.c	2005-01-02 13:30:54 +0900
@@ -152,9 +152,11 @@
 	if (argc == 1)
 		return 0;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	/* check to see if the command is being invoked in the old way if so
 	   then run the old code */
diff -urN ../util-linux-2.12p-orig/sys-utils/ipcs.c sys-utils/ipcs.c
--- ../util-linux-2.12p-orig/sys-utils/ipcs.c	2004-03-05 04:28:42 +0900
+++ sys-utils/ipcs.c	2005-01-02 13:30:54 +0900
@@ -143,9 +143,11 @@
 	char format = 0;
 	char options[] = "atcluphsmqi:";
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	progname = argv[0];
 	while ((opt = getopt (argc, argv, options)) != -1) {
diff -urN ../util-linux-2.12p-orig/sys-utils/rdev.c sys-utils/rdev.c
--- ../util-linux-2.12p-orig/sys-utils/rdev.c	2001-09-30 04:18:35 +0900
+++ sys-utils/rdev.c	2005-01-02 13:30:54 +0900
@@ -165,9 +165,11 @@
 	struct stat s;
 	int cmd;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	/* use the command name to figure out what we have to do - ugly */
 	cmd = RDEV;
diff -urN ../util-linux-2.12p-orig/sys-utils/readprofile.c sys-utils/readprofile.c
--- ../util-linux-2.12p-orig/sys-utils/readprofile.c	2004-12-11 09:11:09 +0900
+++ sys-utils/readprofile.c	2005-01-02 13:30:54 +0900
@@ -153,9 +153,11 @@
 
 #define next (current^1)
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	prgname = argv[0];
 	proFile = defaultpro;
diff -urN ../util-linux-2.12p-orig/sys-utils/renice.c sys-utils/renice.c
--- ../util-linux-2.12p-orig/sys-utils/renice.c	2001-10-05 10:11:23 +0900
+++ sys-utils/renice.c	2005-01-02 13:30:54 +0900
@@ -59,9 +59,11 @@
 	int which = PRIO_PROCESS;
 	int who = 0, prio, errs = 0;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	argc--, argv++;
 	if (argc < 2) {
diff -urN ../util-linux-2.12p-orig/sys-utils/setsid.c sys-utils/setsid.c
--- ../util-linux-2.12p-orig/sys-utils/setsid.c	2001-03-15 19:09:59 +0900
+++ sys-utils/setsid.c	2005-01-02 13:30:54 +0900
@@ -18,9 +18,11 @@
 
 int
 main(int argc, char *argv[]) {
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 	
 	if (argc < 2) {
 		fprintf(stderr, _("usage: %s program [arg ...]\n"),
diff -urN ../util-linux-2.12p-orig/sys-utils/tunelp.c sys-utils/tunelp.c
--- ../util-linux-2.12p-orig/sys-utils/tunelp.c	2002-03-09 08:05:04 +0900
+++ sys-utils/tunelp.c	2005-01-02 13:30:54 +0900
@@ -125,9 +125,11 @@
   if ((p = strrchr(progname, '/')) != NULL)
 	  progname = p+1;
 
+#ifndef DISABLE_NLS
   setlocale(LC_ALL, "");
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
+#endif
 
   if (argc < 2) print_usage(progname);
 
diff -urN ../util-linux-2.12p-orig/text-utils/col.c text-utils/col.c
--- ../util-linux-2.12p-orig/text-utils/col.c	2002-03-09 08:05:12 +0900
+++ text-utils/col.c	2005-01-02 13:30:54 +0900
@@ -129,9 +129,11 @@
 	int nflushd_lines;		/* number of lines that were flushed */
 	int adjust, opt, warned;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 	
 	max_bufd_lines = 128;
 	compress_spaces = 1;		/* compress spaces into tabs */
diff -urN ../util-linux-2.12p-orig/text-utils/colcrt.c text-utils/colcrt.c
--- ../util-linux-2.12p-orig/text-utils/colcrt.c	2001-03-15 19:09:59 +0900
+++ text-utils/colcrt.c	2005-01-02 13:30:54 +0900
@@ -79,9 +79,11 @@
 main(int argc, char **argv) {
 	FILE *f;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	argc--;
 	progname = *argv++;
diff -urN ../util-linux-2.12p-orig/text-utils/colrm.c text-utils/colrm.c
--- ../util-linux-2.12p-orig/text-utils/colrm.c	2001-12-31 09:14:59 +0900
+++ text-utils/colrm.c	2005-01-02 13:30:54 +0900
@@ -57,7 +57,9 @@
 	int i, w;
 	int padding;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
+#endif
 
 	first = 0;
 	last = 0;
diff -urN ../util-linux-2.12p-orig/text-utils/column.c text-utils/column.c
--- ../util-linux-2.12p-orig/text-utils/column.c	2002-07-04 21:53:43 +0900
+++ text-utils/column.c	2005-01-02 13:30:54 +0900
@@ -90,9 +90,11 @@
 	extern char *__progname;
 	__progname = argv[0];
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	if (ioctl(1, TIOCGWINSZ, &win) == -1 || !win.ws_col) {
 		if ((p = getenv("COLUMNS")) != NULL)
diff -urN ../util-linux-2.12p-orig/text-utils/hexdump.c text-utils/hexdump.c
--- ../util-linux-2.12p-orig/text-utils/hexdump.c	2002-03-09 08:06:08 +0900
+++ text-utils/hexdump.c	2005-01-02 13:30:54 +0900
@@ -51,9 +51,11 @@
 	FS *tfs;
 	char *p;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	if (!(p = strrchr(argv[0], 'o')) || strcmp(p, "od"))
 		newsyntax(argc, &argv);
diff -urN ../util-linux-2.12p-orig/text-utils/more.c text-utils/more.c
--- ../util-linux-2.12p-orig/text-utils/more.c	2004-12-22 19:46:25 +0900
+++ text-utils/more.c	2005-01-02 13:30:54 +0900
@@ -275,9 +275,11 @@
     int		initline = 0;
     char	initbuf[80];
 
+#ifndef DISABLE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+#endif
     
     /* avoid gcc complaints about register variables that
        may be clobbered by a longjmp, by forcing our variables here
@@ -287,7 +289,9 @@
 
     nfiles = argc;
     fnames = argv;
+#ifndef DISABLE_NLS
     setlocale(LC_ALL, "");
+#endif
     initterm ();
     nscroll = Lpp/2 - 1;
     if (nscroll <= 0)
diff -urN ../util-linux-2.12p-orig/text-utils/pg.c text-utils/pg.c
--- ../util-linux-2.12p-orig/text-utils/pg.c	2002-11-25 09:43:32 +0900
+++ text-utils/pg.c	2005-01-02 13:30:54 +0900
@@ -1601,17 +1601,21 @@
 
 	progname = basename(argv[0]);
 
+#ifndef DISABLE_NLS
 	setlocale(LC_MESSAGES, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	if (tcgetattr(1, &otio) == 0) {
 		ontty = 1;
 		oldint = my_sigset(SIGINT, sighandler);
 		oldquit = my_sigset(SIGQUIT, sighandler);
 		oldterm = my_sigset(SIGTERM, sighandler);
+#ifndef DISABLE_NLS
 		setlocale(LC_CTYPE, "");
 		setlocale(LC_COLLATE, "");
+#endif
 		tty = ttyname(1);
 		setupterm(NULL, 1, &tinfostat);
 		getwinsize();
diff -urN ../util-linux-2.12p-orig/text-utils/rev.c text-utils/rev.c
--- ../util-linux-2.12p-orig/text-utils/rev.c	2002-03-09 08:07:19 +0900
+++ text-utils/rev.c	2005-01-02 13:30:54 +0900
@@ -69,9 +69,11 @@
   FILE *fp;
   int ch, rval;
 
+#ifndef DISABLE_NLS
   setlocale(LC_ALL, "");
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
+#endif
 
   while ((ch = getopt(argc, argv, "")) != -1)
     switch(ch) {
diff -urN ../util-linux-2.12p-orig/text-utils/tailf.c text-utils/tailf.c
--- ../util-linux-2.12p-orig/text-utils/tailf.c	2003-03-03 08:32:04 +0900
+++ text-utils/tailf.c	2005-01-02 13:30:54 +0900
@@ -85,9 +85,11 @@
     const char *filename;
     int        count;
 
+#ifndef DISABLE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+#endif
 
     if (argc != 2) {
 	fprintf(stderr, _("Usage: tailf logfile\n"));
diff -urN ../util-linux-2.12p-orig/text-utils/ul.c text-utils/ul.c
--- ../util-linux-2.12p-orig/text-utils/ul.c	2002-03-09 08:07:31 +0900
+++ text-utils/ul.c	2005-01-02 13:30:54 +0900
@@ -118,9 +118,11 @@
 	char *termtype;
 	FILE *f;
 
+#ifndef DISABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	termtype = getenv("TERM");
 	if (termtype == NULL || (argv[0][0] == 'c' && !isatty(1)))
EOT

-/etc/fstab
/bin/arch
/bin/more
/bin/mount
/bin/umount
/etc/fstab
/etc/mtab*
/pkg/util-linux/
/sbin/agetty
/sbin/blockdev
/sbin/cfdisk
/sbin/ctrlaltdel
/sbin/dmesg
/sbin/fdisk
/sbin/fsck.cramfs
/sbin/fsck.minix
/sbin/losetup
/sbin/mkfs
/sbin/mkfs.bfs
/sbin/mkfs.cramfs
/sbin/mkfs.minix
/sbin/mkswap
/sbin/mount
/sbin/pivot_root
/sbin/ramsize
/sbin/rdev
/sbin/rootflags
/sbin/sfdisk
/sbin/swapoff
/sbin/swapon
/sbin/umount
/sbin/vidmode
/usr/bin/cal
/usr/bin/chkdupexe
/usr/bin/col
/usr/bin/colcrt
/usr/bin/colrm
/usr/bin/column
/usr/bin/ddate
/usr/bin/getopt
/usr/bin/hexdump
/usr/bin/last
/usr/bin/line
/usr/bin/logger
/usr/bin/look
/usr/bin/mcookie
/usr/bin/mesg
/usr/bin/namei
/usr/bin/pg
/usr/bin/rename
/usr/bin/rev
/usr/bin/script
/usr/bin/setterm
/usr/bin/tailf
/usr/bin/ul
/usr/bin/wall
/usr/bin/whereis
/usr/bin/write
/usr/info/ipc.info.gz
/usr/man/man1/arch.1.gz
/usr/man/man1/cal.1.gz
/usr/man/man1/chkdupexe.1.gz
/usr/man/man1/col.1.gz
/usr/man/man1/colcrt.1.gz
/usr/man/man1/colrm.1.gz
/usr/man/man1/column.1.gz
/usr/man/man1/ddate.1.gz
/usr/man/man1/getopt.1.gz
/usr/man/man1/hexdump.1.gz
/usr/man/man1/last.1.gz
/usr/man/man1/line.1.gz
/usr/man/man1/logger.1.gz
/usr/man/man1/look.1.gz
/usr/man/man1/mcookie.1.gz
/usr/man/man1/mesg.1.gz
/usr/man/man1/more.1.gz
/usr/man/man1/namei.1.gz
/usr/man/man1/pg.1.gz
/usr/man/man1/rename.1.gz
/usr/man/man1/rev.1.gz
/usr/man/man1/script.1.gz
/usr/man/man1/setterm.1.gz
/usr/man/man1/tailf.1.gz
/usr/man/man1/ul.1.gz
/usr/man/man1/wall.1.gz
/usr/man/man1/whereis.1.gz
/usr/man/man1/write.1.gz
/usr/man/man5/fstab.5.gz
/usr/man/man5/nfs.5.gz
/usr/man/man8/agetty.8.gz
/usr/man/man8/blockdev.8.gz
/usr/man/man8/cfdisk.8.gz
/usr/man/man8/ctrlaltdel.8.gz
/usr/man/man8/cytune.8.gz
/usr/man/man8/dmesg.8.gz
/usr/man/man8/fdformat.8.gz
/usr/man/man8/fdisk.8.gz
/usr/man/man8/fsck.cramfs.8.gz
/usr/man/man8/fsck.minix.8.gz
/usr/man/man8/ipcrm.8.gz
/usr/man/man8/ipcs.8.gz
/usr/man/man8/isosize.8.gz
/usr/man/man8/losetup.8.gz
/usr/man/man8/mkfs.8.gz
/usr/man/man8/mkfs.bfs.8.gz
/usr/man/man8/mkfs.cramfs.8.gz
/usr/man/man8/mkfs.minix.8.gz
/usr/man/man8/mkswap.8.gz
/usr/man/man8/mount.8.gz
/usr/man/man8/pivot_root.8.gz
/usr/man/man8/ramsize.8.gz
/usr/man/man8/raw.8.gz
/usr/man/man8/rdev.8.gz
/usr/man/man8/renice.8.gz
/usr/man/man8/rootflags.8.gz
/usr/man/man8/setfdprm.8.gz
/usr/man/man8/setsid.8.gz
/usr/man/man8/sfdisk.8.gz
/usr/man/man8/swapoff.8.gz
/usr/man/man8/swapon.8.gz
/usr/man/man8/tunelp.8.gz
/usr/man/man8/umount.8.gz
/usr/man/man8/vidmode.8.gz
/usr/sbin/cytune
/usr/sbin/fdformat
/usr/sbin/ipcrm
/usr/sbin/ipcs
/usr/sbin/isosize
/usr/sbin/raw
/usr/sbin/renice
/usr/sbin/setfdprm
/usr/sbin/setsid
/usr/sbin/tunelp
/usr/share/locale/*/LC_MESSAGES/util-linux.mo
