From 6f58e88ce0c721c8954898f81c9fbf8088fcba13 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 25 Jun 2009 21:00:09 +0200
Subject: update util-linux to util-linux-ng

- disable some packages not usable for mips/rb532
---
 package/Config.in                                  |  2 +-
 package/Makefile                                   |  2 +-
 package/udev/Config.in                             |  2 +-
 package/util-linux-ng/Config.in                    | 32 ++++++++++
 package/util-linux-ng/Makefile                     | 42 +++++++++++++
 package/util-linux-ng/patches/patch-fdisk_cfdisk_c | 11 ++++
 .../patches/patch-fdisk_fdiskbsdlabel_c            | 53 +++++++++++++++++
 package/util-linux-ng/patches/patch-fdisk_sfdisk_c | 35 +++++++++++
 .../patches/patch-login-utils_Makefile_in          | 13 ++++
 .../patches/patch-login-utils_ttymsg_c             | 11 ++++
 .../util-linux-ng/patches/patch-login-utils_wall_c | 11 ++++
 .../util-linux-ng/patches/patch-misc-utils_cal_c   | 18 ++++++
 .../patches/patch-misc-utils_logger_c              | 11 ++++
 .../patches/patch-misc-utils_whereis_c             | 19 ++++++
 package/util-linux-ng/patches/patch-mount_mount_c  | 16 +++++
 .../patches/patch-mount_mount_mntent_c             | 20 +++++++
 .../util-linux-ng/patches/patch-mount_sundries_c   | 11 ++++
 .../patches/patch-text-utils_colcrt_c              | 13 ++++
 .../patches/patch-text-utils_display_c             | 11 ++++
 .../util-linux-ng/patches/patch-text-utils_parse_c | 33 +++++++++++
 package/util-linux/Config.in                       | 38 ------------
 package/util-linux/Makefile                        | 41 -------------
 package/util-linux/patches/patch-MCONFIG           | 69 ----------------------
 .../patches/patch-disk-utils_fsck_cramfs_c         | 11 ----
 package/util-linux/patches/patch-fdisk_cfdisk_c    | 12 ----
 .../util-linux/patches/patch-fdisk_fdiskbsdlabel_c | 54 -----------------
 package/util-linux/patches/patch-fdisk_llseek_c    | 11 ----
 package/util-linux/patches/patch-fdisk_sfdisk_c    | 68 ---------------------
 .../util-linux/patches/patch-fdisk_sfdisk_c.orig   | 12 ----
 .../util-linux/patches/patch-misc-utils_logger_c   | 12 ----
 .../util-linux/patches/patch-misc-utils_namei_c    | 12 ----
 .../util-linux/patches/patch-misc-utils_whereis_c  | 20 -------
 package/util-linux/patches/patch-mount_mntent_c    | 30 ----------
 .../patches/patch-mount_mount_by_label_c           | 12 ----
 package/util-linux/patches/patch-mount_mount_c     | 17 ------
 package/util-linux/patches/patch-mount_sundries_c  | 12 ----
 package/util-linux/patches/patch-mount_umount_c    | 12 ----
 .../util-linux/patches/patch-text-utils_colcrt_c   | 14 -----
 .../util-linux/patches/patch-text-utils_display_c  | 12 ----
 .../util-linux/patches/patch-text-utils_parse_c    | 34 -----------
 package/valgrind/Config.in                         |  2 +
 package/xf86-video-geode/Config.in                 |  1 +
 42 files changed, 366 insertions(+), 506 deletions(-)
 create mode 100644 package/util-linux-ng/Config.in
 create mode 100644 package/util-linux-ng/Makefile
 create mode 100644 package/util-linux-ng/patches/patch-fdisk_cfdisk_c
 create mode 100644 package/util-linux-ng/patches/patch-fdisk_fdiskbsdlabel_c
 create mode 100644 package/util-linux-ng/patches/patch-fdisk_sfdisk_c
 create mode 100644 package/util-linux-ng/patches/patch-login-utils_Makefile_in
 create mode 100644 package/util-linux-ng/patches/patch-login-utils_ttymsg_c
 create mode 100644 package/util-linux-ng/patches/patch-login-utils_wall_c
 create mode 100644 package/util-linux-ng/patches/patch-misc-utils_cal_c
 create mode 100644 package/util-linux-ng/patches/patch-misc-utils_logger_c
 create mode 100644 package/util-linux-ng/patches/patch-misc-utils_whereis_c
 create mode 100644 package/util-linux-ng/patches/patch-mount_mount_c
 create mode 100644 package/util-linux-ng/patches/patch-mount_mount_mntent_c
 create mode 100644 package/util-linux-ng/patches/patch-mount_sundries_c
 create mode 100644 package/util-linux-ng/patches/patch-text-utils_colcrt_c
 create mode 100644 package/util-linux-ng/patches/patch-text-utils_display_c
 create mode 100644 package/util-linux-ng/patches/patch-text-utils_parse_c
 delete mode 100644 package/util-linux/Config.in
 delete mode 100644 package/util-linux/Makefile
 delete mode 100644 package/util-linux/patches/patch-MCONFIG
 delete mode 100644 package/util-linux/patches/patch-disk-utils_fsck_cramfs_c
 delete mode 100644 package/util-linux/patches/patch-fdisk_cfdisk_c
 delete mode 100644 package/util-linux/patches/patch-fdisk_fdiskbsdlabel_c
 delete mode 100644 package/util-linux/patches/patch-fdisk_llseek_c
 delete mode 100644 package/util-linux/patches/patch-fdisk_sfdisk_c
 delete mode 100644 package/util-linux/patches/patch-fdisk_sfdisk_c.orig
 delete mode 100644 package/util-linux/patches/patch-misc-utils_logger_c
 delete mode 100644 package/util-linux/patches/patch-misc-utils_namei_c
 delete mode 100644 package/util-linux/patches/patch-misc-utils_whereis_c
 delete mode 100644 package/util-linux/patches/patch-mount_mntent_c
 delete mode 100644 package/util-linux/patches/patch-mount_mount_by_label_c
 delete mode 100644 package/util-linux/patches/patch-mount_mount_c
 delete mode 100644 package/util-linux/patches/patch-mount_sundries_c
 delete mode 100644 package/util-linux/patches/patch-mount_umount_c
 delete mode 100644 package/util-linux/patches/patch-text-utils_colcrt_c
 delete mode 100644 package/util-linux/patches/patch-text-utils_display_c
 delete mode 100644 package/util-linux/patches/patch-text-utils_parse_c

(limited to 'package')

diff --git a/package/Config.in b/package/Config.in
index d080a2d3c..56e4a5f0c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -49,7 +49,7 @@ source "package/dosfstools/Config.in"
 source "package/e2fsprogs/Config.in"
 source "package/fuse/Config.in"
 source "package/lvm/Config.in"
-source "package/util-linux/Config.in"
+source "package/util-linux-ng/Config.in"
 source "package/wdfs/Config.in"
 source "package/xfsprogs/Config.in"
 endmenu
diff --git a/package/Makefile b/package/Makefile
index 9e3209630..ad82261bf 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -369,7 +369,7 @@ package-$(ADK_PACKAGE_UPDATEDD) += updatedd
 package-$(ADK_COMPILE_USBUTILS) += usbutils
 package-$(ADK_PACKAGE_USSP_PUSH) += ussp-push
 package-$(ADK_PACKAGE_USTL) += ustl
-package-$(ADK_COMPILE_UTIL_LINUX) += util-linux
+package-$(ADK_COMPILE_UTIL_LINUX_NG) += util-linux-ng
 package-$(ADK_PACKAGE_VALGRIND) += valgrind
 package-$(ADK_PACKAGE_VGP) += vgp
 package-$(ADK_PACKAGE_VIDEOPROTO) += videoproto
diff --git a/package/udev/Config.in b/package/udev/Config.in
index b3f01cb65..012732efd 100644
--- a/package/udev/Config.in
+++ b/package/udev/Config.in
@@ -2,7 +2,7 @@ config ADK_PACKAGE_UDEV
 	prompt "udev.............................. Dynamic device management subsystem"
 	tristate
 	default n
-	select ADK_COMPILE_UTIL_LINUX
+	select ADK_COMPILE_UTIL_LINUX_NG
 	help
 	  udev provides a dynamic device directory containing only the files for 
 	  actually present devices. It creates or removes device node files in 
diff --git a/package/util-linux-ng/Config.in b/package/util-linux-ng/Config.in
new file mode 100644
index 000000000..705c3cbff
--- /dev/null
+++ b/package/util-linux-ng/Config.in
@@ -0,0 +1,32 @@
+config ADK_COMPILE_UTIL_LINUX_NG
+	tristate
+	default n
+	depends ADK_PACKAGE_FDISK || ADK_PACKAGE_SWAP_UTILS
+
+config ADK_PACKAGE_FDISK
+	prompt "fdisk............................. Partition table manipulation utility"
+	tristate
+	default n
+	select ADK_COMPILE_UTIL_LINUX_NG
+	help
+	  A partition table manipulation utility
+	  
+config ADK_PACKAGE_LOSETUP
+	prompt "losetup........................... Loop devices setup and control utility"
+	tristate
+	default n
+	select ADK_COMPILE_UTIL_LINUX_NG
+	select ADK_KPACKAGE_KMOD_BLK_DEV_LOOP
+	help
+	  A loop devices setup and control utility
+	  
+config ADK_PACKAGE_SWAP_UTILS
+	prompt "swap-utils........................ Swap space management utilities"
+	tristate
+	default n
+	select ADK_COMPILE_UTIL_LINUX_NG
+	help
+	  A collection of tools to manage swap space :
+	    * mkswap
+	    * swapon
+	    * swapoff
diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
new file mode 100644
index 000000000..397fdd572
--- /dev/null
+++ b/package/util-linux-ng/Makefile
@@ -0,0 +1,42 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		util-linux-ng
+PKG_VERSION:=		2.15
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		18c9f263a44db67a73c12caf49b03e22
+PKG_DESCR:=		Linux utilities
+PKG_SECTION:=		admin
+PKG_URL:=		http://userweb.kernel.org/~kzak/util-linux-ng
+PKG_SITES:=		${MASTER_SITE_KERNEL:=utils/util-linux-ng/v2.15/}
+
+PKG_DESCR_1:=		Partition table manipulation utility
+PKG_DESCR_2:=		Swap space management utilities
+PKG_DESCR_3:=		Loop devices setup and control utility
+PKG_DEPENDS_3:=		kmod-loop
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION}))
+$(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_3},${PKG_DESCR_3},${PKG_SECTION}))
+
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+MAKE_FLAGS+=		OPT="${TCFLAGS}" ARCH="${ARCH}"
+FAKE_FLAGS+=		INSTALLSUID="install -m 4755"
+TCFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK
+
+post-install:
+	${INSTALL_DIR} ${IDIR_FDISK}/usr/sbin
+	${CP} ${WRKINST}/sbin/fdisk ${IDIR_FDISK}/usr/sbin/
+	${INSTALL_DIR} ${IDIR_LOSETUP}/usr/sbin
+	${CP} ${WRKINST}/sbin/losetup ${IDIR_LOSETUP}/usr/sbin/
+	${INSTALL_DIR} ${IDIR_SWAP_UTILS}/usr/sbin
+	${CP} ${WRKINST}/sbin/mkswap ${IDIR_SWAP_UTILS}/usr/sbin/
+	${CP} ${WRKINST}/sbin/swap{on,off} ${IDIR_SWAP_UTILS}/usr/sbin/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/util-linux-ng/patches/patch-fdisk_cfdisk_c b/package/util-linux-ng/patches/patch-fdisk_cfdisk_c
new file mode 100644
index 000000000..8e5678d71
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-fdisk_cfdisk_c
@@ -0,0 +1,11 @@
+--- util-linux-ng-2.15.orig/fdisk/cfdisk.c	2009-05-05 21:16:45.000000000 +0200
++++ util-linux-ng-2.15/fdisk/cfdisk.c	2009-06-22 22:42:23.000000000 +0200
+@@ -357,7 +357,7 @@ xmalloc (size_t size) {
+ /* Some libc's have their own basename() */
+ static char *
+ my_basename(char *devname) {
+-    char *s = rindex(devname, '/');
++    char *s = strrchr(devname, '/');
+     return s ? s+1 : devname;
+ }
+ 
diff --git a/package/util-linux-ng/patches/patch-fdisk_fdiskbsdlabel_c b/package/util-linux-ng/patches/patch-fdisk_fdiskbsdlabel_c
new file mode 100644
index 000000000..f54a530dd
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-fdisk_fdiskbsdlabel_c
@@ -0,0 +1,53 @@
+--- util-linux-ng-2.15.orig/fdisk/fdiskbsdlabel.c	2009-02-24 16:39:30.000000000 +0100
++++ util-linux-ng-2.15/fdisk/fdiskbsdlabel.c	2009-06-22 22:42:04.000000000 +0200
+@@ -538,10 +538,10 @@ xbsd_write_bootstrap (void)
+ 
+   /* We need a backup of the disklabel (xbsd_dlabel might have changed). */
+   d = &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE];
+-  bcopy (d, &dl, sizeof (struct xbsd_disklabel));
++  memcpy (&dl, d, sizeof (struct xbsd_disklabel));
+ 
+   /* The disklabel will be overwritten by 0's from bootxx anyway */
+-  bzero (d, sizeof (struct xbsd_disklabel));
++  memset (d, 0, sizeof (struct xbsd_disklabel));
+ 
+   snprintf (path, sizeof(path), "%s/boot%s", bootdir, dkbasename);
+   if (!xbsd_get_bootstrap (path, &disklabelbuffer[xbsd_dlabel.d_secsize],
+@@ -555,7 +555,7 @@ xbsd_write_bootstrap (void)
+       exit ( EXIT_FAILURE );
+     }
+ 
+-  bcopy (&dl, d, sizeof (struct xbsd_disklabel));
++  memcpy (d, &dl, sizeof (struct xbsd_disklabel));
+ 
+ #if defined (__powerpc__) || defined (__hppa__)
+   sector = 0;
+@@ -657,7 +657,7 @@ xbsd_initlabel (struct partition *p, str
+ 	struct geom g;
+ 
+ 	get_geometry (fd, &g);
+-	bzero (d, sizeof (struct xbsd_disklabel));
++	memset (d, 0, sizeof (struct xbsd_disklabel));
+ 
+ 	d -> d_magic = BSD_DISKMAGIC;
+ 
+@@ -740,8 +740,8 @@ xbsd_readlabel (struct partition *p, str
+ 	if (BSD_BBSIZE != read (fd, disklabelbuffer, BSD_BBSIZE))
+ 		fatal (unable_to_read);
+ 
+-	bcopy (&disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
+-	       d, sizeof (struct xbsd_disklabel));
++	memcpy (d, &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
++	       sizeof (struct xbsd_disklabel));
+ 
+ 	if (d -> d_magic != BSD_DISKMAGIC || d -> d_magic2 != BSD_DISKMAGIC)
+ 		return 0;
+@@ -776,7 +776,7 @@ xbsd_writelabel (struct partition *p, st
+   /* This is necessary if we want to write the bootstrap later,
+      otherwise we'd write the old disklabel with the bootstrap.
+   */
+-  bcopy (d, &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
++  memcpy (&disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET], d,
+ 	 sizeof (struct xbsd_disklabel));
+ 
+ #if defined (__alpha__) && BSD_LABELSECTOR == 0
diff --git a/package/util-linux-ng/patches/patch-fdisk_sfdisk_c b/package/util-linux-ng/patches/patch-fdisk_sfdisk_c
new file mode 100644
index 000000000..a4778b60c
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-fdisk_sfdisk_c
@@ -0,0 +1,35 @@
+--- util-linux-ng-2.15.orig/fdisk/sfdisk.c	2009-05-05 21:16:46.000000000 +0200
++++ util-linux-ng-2.15/fdisk/sfdisk.c	2009-06-22 22:41:09.000000000 +0200
+@@ -1725,12 +1725,12 @@ read_stdin(char **fields, char *line, in
+ 	eof = 1;
+ 	return RD_EOF;
+     }
+-    if (!(lp = index(lp, '\n')))
++    if (!(lp = strchr(lp, '\n')))
+       fatal(_("long or incomplete input line - quitting\n"));
+     *lp = 0;
+ 
+     /* remove comments, if any */
+-    if ((lp = index(line+2, '#')) != 0)
++    if ((lp = strchr(line+2, '#')) != 0)
+       *lp = 0;
+ 
+     /* recognize a few commands - to be expanded */
+@@ -1740,7 +1740,7 @@ read_stdin(char **fields, char *line, in
+     }
+ 
+     /* dump style? - then bad input is fatal */
+-    if ((ip = index(line+2, ':')) != 0) {
++    if ((ip = strchr(line+2, ':')) != 0) {
+ 	struct dumpfld *d;
+ 
+       nxtfld:
+@@ -2503,7 +2503,7 @@ main(int argc, char **argv) {
+ 
+     if (argc < 1)
+       fatal(_("no command?\n"));
+-    if ((progn = rindex(argv[0], '/')) == NULL)
++    if ((progn = strrchr(argv[0], '/')) == NULL)
+       progn = argv[0];
+     else
+       progn++;
diff --git a/package/util-linux-ng/patches/patch-login-utils_Makefile_in b/package/util-linux-ng/patches/patch-login-utils_Makefile_in
new file mode 100644
index 000000000..b25c3dca4
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-login-utils_Makefile_in
@@ -0,0 +1,13 @@
+--- util-linux-ng-2.15.orig/login-utils/Makefile.in	2009-05-05 23:21:34.000000000 +0200
++++ util-linux-ng-2.15/login-utils/Makefile.in	2009-06-22 23:05:58.000000000 +0200
+@@ -1164,10 +1164,6 @@ $(ul_libblkid_la):
+ @BUILD_LOGIN_UTILS_TRUE@install-exec-hook::
+ @BUILD_LOGIN_UTILS_TRUE@	cd $(DESTDIR)$(usrsbinexecdir) && ln -sf vipw vigr
+ 
+-@BUILD_WALL_TRUE@@MAKEINSTALL_DO_CHOWN_TRUE@@USE_TTY_GROUP_TRUE@install-exec-hook::
+-@BUILD_WALL_TRUE@@MAKEINSTALL_DO_CHOWN_TRUE@@USE_TTY_GROUP_TRUE@	chgrp tty $(DESTDIR)$(usrbinexecdir)/wall
+-@BUILD_WALL_TRUE@@MAKEINSTALL_DO_CHOWN_TRUE@@USE_TTY_GROUP_TRUE@	chmod g+s $(DESTDIR)$(usrbinexecdir)/wall
+-
+ @BUILD_INIT_TRUE@install-exec-hook::
+ @BUILD_INIT_TRUE@	cd $(DESTDIR)$(sbindir) && ln -sf shutdown reboot
+ @BUILD_INIT_TRUE@	cd $(DESTDIR)$(sbindir) && ln -sf shutdown fastboot
diff --git a/package/util-linux-ng/patches/patch-login-utils_ttymsg_c b/package/util-linux-ng/patches/patch-login-utils_ttymsg_c
new file mode 100644
index 000000000..ba78aa01b
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-login-utils_ttymsg_c
@@ -0,0 +1,11 @@
+--- util-linux-ng-2.15.orig/login-utils/ttymsg.c	2009-02-24 16:39:30.000000000 +0100
++++ util-linux-ng-2.15/login-utils/ttymsg.c	2009-06-22 22:44:07.000000000 +0200
+@@ -111,7 +111,7 @@ ttymsg(struct iovec *iov, int iovcnt, ch
+ 		if (wret >= 0) {
+ 			left -= wret;
+ 			if (iov != localiov) {
+-				bcopy(iov, localiov,
++				memcpy(localiov, iov,
+ 				    iovcnt * sizeof(struct iovec));
+ 				iov = localiov;
+ 			}
diff --git a/package/util-linux-ng/patches/patch-login-utils_wall_c b/package/util-linux-ng/patches/patch-login-utils_wall_c
new file mode 100644
index 000000000..b30da5c65
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-login-utils_wall_c
@@ -0,0 +1,11 @@
+--- util-linux-ng-2.15.orig/login-utils/wall.c	2009-02-24 16:39:30.000000000 +0100
++++ util-linux-ng-2.15/login-utils/wall.c	2009-06-22 22:43:36.000000000 +0200
+@@ -95,7 +95,7 @@ main(int argc, char **argv) {
+         textdomain(PACKAGE);
+ 
+ 	progname = argv[0];
+-	p = rindex(progname, '/');
++	p = strrchr(progname, '/');
+ 	if (p)
+ 	     progname = p+1;
+ 
diff --git a/package/util-linux-ng/patches/patch-misc-utils_cal_c b/package/util-linux-ng/patches/patch-misc-utils_cal_c
new file mode 100644
index 000000000..0f8df6815
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-misc-utils_cal_c
@@ -0,0 +1,18 @@
+--- util-linux-ng-2.15.orig/misc-utils/cal.c	2009-03-25 13:20:18.000000000 +0100
++++ util-linux-ng-2.15/misc-utils/cal.c	2009-06-22 22:49:19.000000000 +0200
+@@ -291,6 +291,7 @@ main(int argc, char **argv) {
+  * the locale database, which can be overridden with the
+  * -s (Sunday) or -m (Monday) options.
+  */
++#if 0
+ #ifdef HAVE_LANGINFO_H
+ 	/*
+ 	 * You need to use 2 locale variables to get the first day of the week.
+@@ -315,6 +316,7 @@ main(int argc, char **argv) {
+ 		weekstart = (wfd + *nl_langinfo(_NL_TIME_FIRST_WEEKDAY) - 1) % 7;
+ 	}
+ #endif
++#endif
+ 
+ 	yflag = 0;
+ 	while ((ch = getopt(argc, argv, "13mjsyV")) != -1)
diff --git a/package/util-linux-ng/patches/patch-misc-utils_logger_c b/package/util-linux-ng/patches/patch-misc-utils_logger_c
new file mode 100644
index 000000000..6a65e3ac3
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-misc-utils_logger_c
@@ -0,0 +1,11 @@
+--- util-linux-ng-2.15.orig/misc-utils/logger.c	2009-02-24 16:39:30.000000000 +0100
++++ util-linux-ng-2.15/misc-utils/logger.c	2009-06-22 22:50:36.000000000 +0200
+@@ -196,7 +196,7 @@ main(int argc, char **argv) {
+ 			} else {
+ 				if (p != buf)
+ 					*p++ = ' ';
+-				bcopy(*argv++, p, len);
++				memcpy(p, *argv++, len);
+ 				*(p += len) = '\0';
+ 			}
+ 		}
diff --git a/package/util-linux-ng/patches/patch-misc-utils_whereis_c b/package/util-linux-ng/patches/patch-misc-utils_whereis_c
new file mode 100644
index 000000000..6e6edcee5
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-misc-utils_whereis_c
@@ -0,0 +1,19 @@
+--- util-linux-ng-2.15.orig/misc-utils/whereis.c	2009-03-25 13:19:08.000000000 +0100
++++ util-linux-ng-2.15/misc-utils/whereis.c	2009-06-22 22:51:39.000000000 +0200
+@@ -325,14 +325,14 @@ findin(char *dir, char *cp) {
+ 	char dirbuf[1024];
+ 	struct stat statbuf;
+ 
+-	dd = index(dir, '*');
++	dd = strchr(dir, '*');
+ 	if (!dd)
+ 		goto noglob;
+ 
+ 	l = strlen(dir);
+ 	if (l < sizeof(dirbuf)) {	/* refuse excessively long names */
+ 		strcpy (dirbuf, dir);
+-		d = index(dirbuf, '*');
++		d = strchr(dirbuf, '*');
+ 		*d = 0;
+ 		dirp = opendir(dirbuf);
+ 		if (dirp == NULL)
diff --git a/package/util-linux-ng/patches/patch-mount_mount_c b/package/util-linux-ng/patches/patch-mount_mount_c
new file mode 100644
index 000000000..7335765f2
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-mount_mount_c
@@ -0,0 +1,16 @@
+--- util-linux-ng-2.15.orig/mount/mount.c	2009-03-27 13:13:20.000000000 +0100
++++ util-linux-ng-2.15/mount/mount.c	2009-06-22 22:58:48.000000000 +0200
+@@ -914,11 +914,11 @@ guess_fstype_and_mount(const char *spec,
+ 
+    /* Accept a comma-separated list of types, and try them one by one */
+    /* A list like "nonfs,.." indicates types not to use */
+-   if (*types && strncmp(*types, "no", 2) && index(*types,',')) {
++   if (*types && strncmp(*types, "no", 2) && strchr(*types,',')) {
+       char *t = strdup(*types);
+       char *p;
+ 
+-      while((p = index(t,',')) != NULL) {
++      while((p = strchr(t,',')) != NULL) {
+ 	 *p = 0;
+ 	 args.type = *types = t;
+ 	 if (do_mount (&args, special, status) == 0)
diff --git a/package/util-linux-ng/patches/patch-mount_mount_mntent_c b/package/util-linux-ng/patches/patch-mount_mount_mntent_c
new file mode 100644
index 000000000..4e0f05735
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-mount_mount_mntent_c
@@ -0,0 +1,20 @@
+--- util-linux-ng-2.15.orig/mount/mount_mntent.c	2009-02-24 16:39:30.000000000 +0100
++++ util-linux-ng-2.15/mount/mount_mntent.c	2009-06-22 22:59:15.000000000 +0200
+@@ -157,7 +157,7 @@ my_getmntent (mntFILE *mfp) {
+ 			return NULL;
+ 
+ 		mfp->mntent_lineno++;
+-		s = index (buf, '\n');
++		s = strchr (buf, '\n');
+ 		if (s == NULL) {
+ 			/* Missing final newline?  Otherwise extremely */
+ 			/* long line - assume file was corrupted */
+@@ -165,7 +165,7 @@ my_getmntent (mntFILE *mfp) {
+ 				fprintf(stderr, _("[mntent]: warning: no final "
+ 					"newline at the end of %s\n"),
+ 					mfp->mntent_file);
+-				s = index (buf, 0);
++				s = strchr (buf, 0);
+ 			} else {
+ 				mfp->mntent_errs = 1;
+ 				goto err;
diff --git a/package/util-linux-ng/patches/patch-mount_sundries_c b/package/util-linux-ng/patches/patch-mount_sundries_c
new file mode 100644
index 000000000..640b2e2aa
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-mount_sundries_c
@@ -0,0 +1,11 @@
+--- util-linux-ng-2.15.orig/mount/sundries.c	2009-03-25 13:20:18.000000000 +0100
++++ util-linux-ng-2.15/mount/sundries.c	2009-06-22 22:59:31.000000000 +0200
+@@ -157,7 +157,7 @@ matching_type (const char *type, const c
+ 	     if (strncmp(p, type, len) == 0 &&
+ 		 (p[len] == 0 || p[len] == ','))
+ 		     return !no;
+-	     p = index(p,',');
++	     p = strchr(p,',');
+ 	     if (!p)
+ 		     break;
+ 	     p++;
diff --git a/package/util-linux-ng/patches/patch-text-utils_colcrt_c b/package/util-linux-ng/patches/patch-text-utils_colcrt_c
new file mode 100644
index 000000000..122e5b23e
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-text-utils_colcrt_c
@@ -0,0 +1,13 @@
+--- util-linux-ng-2.15.orig/text-utils/colcrt.c	2009-02-24 16:39:30.000000000 +0100
++++ util-linux-ng-2.15/text-utils/colcrt.c	2009-06-22 22:53:15.000000000 +0200
+@@ -252,8 +252,8 @@ void pflush(int ol)
+ 		}
+ 		putwchar('\n');
+ 	}
+-	bcopy(page[ol], page, (267 - ol) * 132 * sizeof(wchar_t));
+-	bzero(page[267- ol], ol * 132 * sizeof(wchar_t));
++	memcpy(page, page[ol], (267 - ol) * 132 * sizeof(wchar_t));
++	memset(page[267- ol], 0, ol * 132 * sizeof(wchar_t));
+ 	outline -= ol;
+ 	outcol = 0;
+ 	first = 1;
diff --git a/package/util-linux-ng/patches/patch-text-utils_display_c b/package/util-linux-ng/patches/patch-text-utils_display_c
new file mode 100644
index 000000000..ecb8069ff
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-text-utils_display_c
@@ -0,0 +1,11 @@
+--- util-linux-ng-2.15.orig/text-utils/display.c	2009-02-24 16:39:30.000000000 +0100
++++ util-linux-ng-2.15/text-utils/display.c	2009-06-22 22:56:12.000000000 +0200
+@@ -163,7 +163,7 @@ static void bpad(PR *pr)
+ 	pr->cchar[0] = 's';
+ 	pr->cchar[1] = 0;
+ 	for (p1 = pr->fmt; *p1 != '%'; ++p1);
+-	for (p2 = ++p1; *p1 && index(spec, *p1); ++p1);
++	for (p2 = ++p1; *p1 && strchr(spec, *p1); ++p1);
+ 	while ((*p2++ = *p1++) != 0) ;
+ }
+ 
diff --git a/package/util-linux-ng/patches/patch-text-utils_parse_c b/package/util-linux-ng/patches/patch-text-utils_parse_c
new file mode 100644
index 000000000..683e6f279
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-text-utils_parse_c
@@ -0,0 +1,33 @@
+--- util-linux-ng-2.15.orig/text-utils/parse.c	2009-02-24 16:39:30.000000000 +0100
++++ util-linux-ng-2.15/text-utils/parse.c	2009-06-22 22:54:37.000000000 +0200
+@@ -64,7 +64,7 @@ void addfile(char *name)
+ 		exit(1);
+ 	}
+ 	while (fgets(buf, sizeof(buf), fp)) {
+-		if ((p = index(buf, '\n')) == NULL) {
++		if ((p = strchr(buf, '\n')) == NULL) {
+ 			(void)fprintf(stderr, _("hexdump: line too long.\n"));
+ 			while ((ch = getchar()) != '\n' && ch != EOF);
+ 			continue;
+@@ -171,7 +171,7 @@ int size(FS *fs)
+ 			 * skip any special chars -- save precision in
+ 			 * case it's a %s format.
+ 			 */
+-			while (index(spec + 1, *++fmt));
++			while (strchr(spec + 1, *++fmt));
+ 			if (*fmt == '.' && isdigit((unsigned char)*++fmt)) {
+ 				prec = atoi(fmt);
+ 				while (isdigit((unsigned char)*++fmt));
+@@ -244,10 +244,10 @@ void rewrite(FS *fs)
+ 			if (fu->bcnt) {
+ 				sokay = USEBCNT;
+ 				/* skip to conversion character */
+-				for (++p1; index(spec, *p1); ++p1);
++				for (++p1; strchr(spec, *p1); ++p1);
+ 			} else {
+ 				/* skip any special chars, field width */
+-				while (index(spec + 1, *++p1));
++				while (strchr(spec + 1, *++p1));
+ 				if (*p1 == '.' &&
+ 				    isdigit((unsigned char)*++p1)) {
+ 					sokay = USEPREC;
diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
deleted file mode 100644
index 2de091d4c..000000000
--- a/package/util-linux/Config.in
+++ /dev/null
@@ -1,38 +0,0 @@
-config ADK_COMPILE_UTIL_LINUX
-	tristate
-	default n
-	depends ADK_PACKAGE_FDISK || ADK_PACKAGE_SWAP_UTILS
-
-config ADK_PACKAGE_FDISK
-	prompt "fdisk............................. Partition table manipulation utility"
-	tristate
-	default n
-	select ADK_COMPILE_UTIL_LINUX
-	help
-	  A partition table manipulation utility
-	  
-	  http://www.kernel.org/pub/linux/utils/util-linux/
-
-config ADK_PACKAGE_LOSETUP
-	prompt "losetup........................... Loop devices setup and control utility"
-	tristate
-	default n
-	select ADK_COMPILE_UTIL_LINUX
-	select ADK_KPACKAGE_KMOD_BLK_DEV_LOOP
-	help
-	  A loop devices setup and control utility
-	  
-	  http://www.kernel.org/pub/linux/utils/util-linux/
-
-config ADK_PACKAGE_SWAP_UTILS
-	prompt "swap-utils........................ Swap space management utilities"
-	tristate
-	default n
-	select ADK_COMPILE_UTIL_LINUX
-	help
-	  A collection of tools to manage swap space :
-	    * mkswap
-	    * swapon
-	    * swapoff
-	  
-	  http://www.kernel.org/pub/linux/utils/util-linux/
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
deleted file mode 100644
index ccf9e2677..000000000
--- a/package/util-linux/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:=		util-linux
-PKG_VERSION:=		2.12r
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		c261230b27fc0fbcc287c76884caf2d3
-PKG_DESCR:=		Linux utilities
-PKG_SECTION:=		admin
-PKG_SITES:=		${MASTER_SITE_KERNEL:=utils/util-linux/}
-
-PKG_DESCR_1:=		Partition table manipulation utility
-PKG_DESCR_2:=		Swap space management utilities
-PKG_DESCR_3:=		Loop devices setup and control utility
-PKG_DEPENDS_3:=		kmod-loop
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
-$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION}))
-$(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_3},${PKG_DESCR_3},${PKG_SECTION}))
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-MAKE_FLAGS+=		OPT="${TCFLAGS}" ARCH="${ARCH}"
-FAKE_FLAGS+=		INSTALLSUID="install -m 4755"
-TCFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK
-
-post-install:
-	${INSTALL_DIR} ${IDIR_FDISK}/usr/sbin
-	${CP} ${WRKINST}/sbin/fdisk ${IDIR_FDISK}/usr/sbin/
-	${INSTALL_DIR} ${IDIR_LOSETUP}/usr/sbin
-	${CP} ${WRKINST}/sbin/losetup ${IDIR_LOSETUP}/usr/sbin/
-	${INSTALL_DIR} ${IDIR_SWAP_UTILS}/usr/sbin
-	${CP} ${WRKINST}/sbin/mkswap ${IDIR_SWAP_UTILS}/usr/sbin/
-	${CP} ${WRKINST}/sbin/swap{on,off} ${IDIR_SWAP_UTILS}/usr/sbin/
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/util-linux/patches/patch-MCONFIG b/package/util-linux/patches/patch-MCONFIG
deleted file mode 100644
index 494d2119c..000000000
--- a/package/util-linux/patches/patch-MCONFIG
+++ /dev/null
@@ -1,69 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/MCONFIG	2004-12-13 00:15:48.000000000 +0100
-+++ util-linux-2.12r/MCONFIG	2008-10-16 11:46:07.000000000 +0200
-@@ -16,8 +16,8 @@
- # Select for ARCH one of intel, alpha, sparc, arm, m68k, mips
- # Select for CPU i386 if the binaries must be able to run on an intel 386
- # (by default i486 code is generated, see below)
--CPU=$(shell uname -m)
--ARCH=$(shell echo $(CPU) | sed 's/i.86/intel/;s/arm.*/arm/')
-+CPU=
-+ARCH=
- 
- # If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp
- # will use PAM for authentication. Additionally, passwd will not be
-@@ -64,12 +64,12 @@ HAVE_SYSVINIT_UTILS=yes
- # If HAVE_WRITE is set to "yes", then write will not be built or
- # installed from the misc-utils subdirectory.
- # (There is a network aware write in netwrite from NetKit 0.16 or later.)
--HAVE_WRITE=no
-+HAVE_WRITE=yes
- 
- # If HAVE_GETTY is set to "yes", then agetty will not be built or
- # installed from the login-utils subdirectory.  Note that agetty can
- # co-exist with other gettys, so this option should never be used.
--HAVE_GETTY=no
-+HAVE_GETTY=yes
- 
- # If USE_TTY_GROUP is set to "yes", then wall and write will be installed
- # setgid to the "tty" group, and mesg will only set the group write bit.
-@@ -82,13 +82,13 @@ USE_TTY_GROUP=yes
- # 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,19 +102,19 @@ HAVE_RESET=yes
- # 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
-+HAVE_FDUTILS=yes
- 
- # If SILENT_PG is set to "yes", then pg will not ring the bell
- # when an invalid key is pressed
--SILENT_PG=no
-+SILENT_PG=yes
- 
- # If configure decides that Native Language Support (NLS) is available,
- # it sets MAY_ENABLE_NLS in defines.h. If you don't want NLS, set
- # DISABLE_NLS to "yes".
--DISABLE_NLS=no
-+DISABLE_NLS=yes
- 
- # Different optimizations for different cpus.
- # Before gcc 2.8.0 only -m486
diff --git a/package/util-linux/patches/patch-disk-utils_fsck_cramfs_c b/package/util-linux/patches/patch-disk-utils_fsck_cramfs_c
deleted file mode 100644
index ad2a5f314..000000000
--- a/package/util-linux/patches/patch-disk-utils_fsck_cramfs_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/disk-utils/fsck.cramfs.c	2004-12-11 15:53:16.000000000 +0100
-+++ util-linux-2.12r/disk-utils/fsck.cramfs.c	2008-10-16 11:44:16.000000000 +0200
-@@ -76,7 +76,6 @@ static uid_t euid;			/* effective UID */
- 
- #define PAD_SIZE 512
- 
--#include <asm/page.h>
- #ifdef PAGE_SIZE
- #define PAGE_CACHE_SIZE ((int) PAGE_SIZE)
- #elif defined __ia64__
diff --git a/package/util-linux/patches/patch-fdisk_cfdisk_c b/package/util-linux/patches/patch-fdisk_cfdisk_c
deleted file mode 100644
index 7ae258710..000000000
--- a/package/util-linux/patches/patch-fdisk_cfdisk_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/fdisk/cfdisk.c	2005-09-09 23:44:57.000000000 +0200
-+++ util-linux-2.12r/fdisk/cfdisk.c	2008-10-16 12:30:58.000000000 +0200
-@@ -353,7 +353,7 @@ xmalloc (size_t size) {
- /* Some libc's have their own basename() */
- static char *
- my_basename(char *devname) {
--    char *s = rindex(devname, '/');
-+    char *s = strrchr(devname, '/');
-     return s ? s+1 : devname;
- }
- 
diff --git a/package/util-linux/patches/patch-fdisk_fdiskbsdlabel_c b/package/util-linux/patches/patch-fdisk_fdiskbsdlabel_c
deleted file mode 100644
index 7c57b9e40..000000000
--- a/package/util-linux/patches/patch-fdisk_fdiskbsdlabel_c
+++ /dev/null
@@ -1,54 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/fdisk/fdiskbsdlabel.c	2003-07-13 23:12:47.000000000 +0200
-+++ util-linux-2.12r/fdisk/fdiskbsdlabel.c	2008-10-16 12:28:32.000000000 +0200
-@@ -538,10 +538,10 @@ xbsd_write_bootstrap (void)
- 
-   /* We need a backup of the disklabel (xbsd_dlabel might have changed). */
-   d = &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE];
--  bcopy (d, &dl, sizeof (struct xbsd_disklabel));
-+  memcpy (&dl, d, sizeof (struct xbsd_disklabel));
- 
-   /* The disklabel will be overwritten by 0's from bootxx anyway */
--  bzero (d, sizeof (struct xbsd_disklabel));
-+  memset (d, 0 ,sizeof (struct xbsd_disklabel));
- 
-   snprintf (path, sizeof(path), "%s/boot%s", bootdir, dkbasename);
-   if (!xbsd_get_bootstrap (path, &disklabelbuffer[xbsd_dlabel.d_secsize],
-@@ -555,7 +555,7 @@ xbsd_write_bootstrap (void)
-       exit ( EXIT_FAILURE );
-     }
- 
--  bcopy (&dl, d, sizeof (struct xbsd_disklabel));
-+  memcpy (d, &dl, sizeof (struct xbsd_disklabel));
- 
- #if defined (__powerpc__) || defined (__hppa__)
-   sector = 0;
-@@ -657,7 +657,7 @@ xbsd_initlabel (struct partition *p, str
- 	struct geom g;
- 
- 	get_geometry (fd, &g);
--	bzero (d, sizeof (struct xbsd_disklabel));
-+	memset (d, 0, sizeof (struct xbsd_disklabel));
- 
- 	d -> d_magic = BSD_DISKMAGIC;
- 
-@@ -740,8 +740,8 @@ xbsd_readlabel (struct partition *p, str
- 	if (BSD_BBSIZE != read (fd, disklabelbuffer, BSD_BBSIZE))
- 		fatal (unable_to_read);
- 
--	bcopy (&disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
--	       d, sizeof (struct xbsd_disklabel));
-+	memcpy (d, &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
-+	       sizeof (struct xbsd_disklabel));
- 
- 	if (d -> d_magic != BSD_DISKMAGIC || d -> d_magic2 != BSD_DISKMAGIC)
- 		return 0;
-@@ -776,7 +776,7 @@ xbsd_writelabel (struct partition *p, st
-   /* This is necessary if we want to write the bootstrap later,
-      otherwise we'd write the old disklabel with the bootstrap.
-   */
--  bcopy (d, &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
-+  memcpy (&disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET], d,
- 	 sizeof (struct xbsd_disklabel));
- 
- #if defined (__alpha__) && BSD_LABELSECTOR == 0
diff --git a/package/util-linux/patches/patch-fdisk_llseek_c b/package/util-linux/patches/patch-fdisk_llseek_c
deleted file mode 100644
index a067c34e7..000000000
--- a/package/util-linux/patches/patch-fdisk_llseek_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/fdisk/llseek.c	2003-07-13 23:13:33.000000000 +0200
-+++ util-linux-2.12r/fdisk/llseek.c	2008-10-16 12:30:16.000000000 +0200
-@@ -16,6 +16,7 @@ extern long long ext2_llseek (unsigned i
- 
- #ifdef HAVE_LLSEEK
- #include <syscall.h>
-+#define my_llseek lseek
- 
- #else	/* HAVE_LLSEEK */
- 
diff --git a/package/util-linux/patches/patch-fdisk_sfdisk_c b/package/util-linux/patches/patch-fdisk_sfdisk_c
deleted file mode 100644
index 02f0358fe..000000000
--- a/package/util-linux/patches/patch-fdisk_sfdisk_c
+++ /dev/null
@@ -1,68 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/fdisk/sfdisk.c	2005-01-04 23:31:57.000000000 +0100
-+++ util-linux-2.12r/fdisk/sfdisk.c	2008-10-16 12:42:16.000000000 +0200
-@@ -171,16 +171,6 @@ fatal(char *s, ...) {
-  *
-  * 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) {
-@@ -188,12 +178,8 @@ sseek(char *dev, unsigned int fd, unsign
-     in = ((loff_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");
-+    if ((out = lseek64(fd, in, SEEK_SET)) != in) {
-+	perror("lseek64");
- 	error(_("seek error on %s - cannot seek to %lu\n"), dev, s);
- 	return 0;
-     }
-@@ -1730,12 +1716,12 @@ read_stdin(unsigned char **fields, unsig
- 	eof = 1;
- 	return RD_EOF;
-     }
--    if (!(lp = index(lp, '\n')))
-+    if (!(lp = strchr(lp, '\n')))
-       fatal(_("long or incomplete input line - quitting\n"));
-     *lp = 0;
- 
-     /* remove comments, if any */
--    if ((lp = index(line+2, '#')) != 0)
-+    if ((lp = strchr(line+2, '#')) != 0)
-       *lp = 0;
- 
-     /* recognize a few commands - to be expanded */
-@@ -1745,7 +1731,7 @@ read_stdin(unsigned char **fields, unsig
-     }
- 
-     /* dump style? - then bad input is fatal */
--    if ((ip = index(line+2, ':')) != 0) {
-+    if ((ip = strchr(line+2, ':')) != 0) {
- 	struct dumpfld *d;
- 
-       nxtfld:
-@@ -2514,7 +2500,7 @@ main(int argc, char **argv) {
- 
-     if (argc < 1)
-       fatal(_("no command?\n"));
--    if ((progn = rindex(argv[0], '/')) == NULL)
-+    if ((progn = strrchr(argv[0], '/')) == NULL)
-       progn = argv[0];
-     else
-       progn++;
diff --git a/package/util-linux/patches/patch-fdisk_sfdisk_c.orig b/package/util-linux/patches/patch-fdisk_sfdisk_c.orig
deleted file mode 100644
index 9b9560f00..000000000
--- a/package/util-linux/patches/patch-fdisk_sfdisk_c.orig
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/fdisk/sfdisk.c	2005-01-04 23:31:57.000000000 +0100
-+++ util-linux-2.12r/fdisk/sfdisk.c	2008-10-16 12:32:33.000000000 +0200
-@@ -2514,7 +2514,7 @@ main(int argc, char **argv) {
- 
-     if (argc < 1)
-       fatal(_("no command?\n"));
--    if ((progn = rindex(argv[0], '/')) == NULL)
-+    if ((progn = strrchr(argv[0], '/')) == NULL)
-       progn = argv[0];
-     else
-       progn++;
diff --git a/package/util-linux/patches/patch-misc-utils_logger_c b/package/util-linux/patches/patch-misc-utils_logger_c
deleted file mode 100644
index 59fba39b7..000000000
--- a/package/util-linux/patches/patch-misc-utils_logger_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/misc-utils/logger.c	2004-09-06 23:13:49.000000000 +0200
-+++ util-linux-2.12r/misc-utils/logger.c	2008-10-16 11:47:36.000000000 +0200
-@@ -198,7 +198,7 @@ main(int argc, char **argv) {
- 			} else {
- 				if (p != buf)
- 					*p++ = ' ';
--				bcopy(*argv++, p, len);
-+				memcpy(p, *argv++, len);
- 				*(p += len) = '\0';
- 			}
- 		}
diff --git a/package/util-linux/patches/patch-misc-utils_namei_c b/package/util-linux/patches/patch-misc-utils_namei_c
deleted file mode 100644
index 07945d906..000000000
--- a/package/util-linux/patches/patch-misc-utils_namei_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/misc-utils/namei.c	2004-12-23 00:03:39.000000000 +0100
-+++ util-linux-2.12r/misc-utils/namei.c	2008-10-16 11:48:55.000000000 +0200
-@@ -242,7 +242,7 @@ namei(char *file, int lev) {
- 		 * call namei()
- 		 */
- 		
--		bzero(sym, BUFSIZ);
-+		memset(sym, 0, BUFSIZ);
- 		if(readlink(buf, sym, BUFSIZ) == -1){
- 		    (void)printf(_(" ? problems reading symlink %s - %s (%d)\n"), buf, ERR);
- 		    return;
diff --git a/package/util-linux/patches/patch-misc-utils_whereis_c b/package/util-linux/patches/patch-misc-utils_whereis_c
deleted file mode 100644
index 4c1f25868..000000000
--- a/package/util-linux/patches/patch-misc-utils_whereis_c
+++ /dev/null
@@ -1,20 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/misc-utils/whereis.c	2001-03-15 11:09:58.000000000 +0100
-+++ util-linux-2.12r/misc-utils/whereis.c	2008-10-16 11:50:03.000000000 +0200
-@@ -323,14 +323,14 @@ findin(char *dir, char *cp) {
- 	char dirbuf[1024];
- 	struct stat statbuf;
- 
--	dd = index(dir, '*');
-+	dd = strchr(dir, '*');
- 	if (!dd)
- 		goto noglob;
- 
- 	l = strlen(dir);
- 	if (l < sizeof(dirbuf)) { 	/* refuse excessively long names */
- 		strcpy (dirbuf, dir);
--		d = index(dirbuf, '*');
-+		d = strchr(dirbuf, '*');
- 		*d = 0;
- 		dirp = opendir(dirbuf);
- 		if (dirp == NULL)
diff --git a/package/util-linux/patches/patch-mount_mntent_c b/package/util-linux/patches/patch-mount_mntent_c
deleted file mode 100644
index 7445e1bf4..000000000
--- a/package/util-linux/patches/patch-mount_mntent_c
+++ /dev/null
@@ -1,30 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/mount/mntent.c	2004-10-13 22:57:34.000000000 +0200
-+++ util-linux-2.12r/mount/mntent.c	2008-10-16 12:00:45.000000000 +0200
-@@ -6,7 +6,7 @@
-  */
- 
- #include <stdio.h>
--#include <string.h>		/* for index */
-+#include <string.h>		/* for strchr */
- #include <ctype.h>		/* for isdigit */
- #include <sys/stat.h>		/* for umask */
- #include "mntent.h"
-@@ -158,7 +158,7 @@ my_getmntent (mntFILE *mfp) {
- 			return NULL;
- 
- 		mfp->mntent_lineno++;
--		s = index (buf, '\n');
-+		s = strchr (buf, '\n');
- 		if (s == NULL) {
- 			/* Missing final newline?  Otherwise extremely */
- 			/* long line - assume file was corrupted */
-@@ -166,7 +166,7 @@ my_getmntent (mntFILE *mfp) {
- 				fprintf(stderr, _("[mntent]: warning: no final "
- 					"newline at the end of %s\n"),
- 					mfp->mntent_file);
--				s = index (buf, 0);
-+				s = strchr (buf, 0);
- 			} else {
- 				mfp->mntent_errs = 1;
- 				goto err;
diff --git a/package/util-linux/patches/patch-mount_mount_by_label_c b/package/util-linux/patches/patch-mount_mount_by_label_c
deleted file mode 100644
index dd40fc7c4..000000000
--- a/package/util-linux/patches/patch-mount_mount_by_label_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/mount/mount_by_label.c	2004-12-22 00:15:33.000000000 +0100
-+++ util-linux-2.12r/mount/mount_by_label.c	2008-10-16 12:01:50.000000000 +0200
-@@ -213,7 +213,7 @@ uuidcache_init(void) {
- 	    fseek(procpt, 0, SEEK_SET);
- 
- 	    while (fgets(line, sizeof(line), procpt)) {
--		if (!index(line, '\n'))
-+		if (!strchr(line, '\n'))
- 			break;
- 
- 		if (sscanf (line, " %d %d %d %[^\n ]",
diff --git a/package/util-linux/patches/patch-mount_mount_c b/package/util-linux/patches/patch-mount_mount_c
deleted file mode 100644
index 8ffdf8ee0..000000000
--- a/package/util-linux/patches/patch-mount_mount_c
+++ /dev/null
@@ -1,17 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/mount/mount.c	2004-12-21 23:00:36.000000000 +0100
-+++ util-linux-2.12r/mount/mount.c	2008-10-16 12:00:29.000000000 +0200
-@@ -488,11 +488,11 @@ guess_fstype_and_mount(const char *spec,
- 
-    /* Accept a comma-separated list of types, and try them one by one */
-    /* A list like "nonfs,.." indicates types not to use */
--   if (*types && strncmp(*types, "no", 2) && index(*types,',')) {
-+   if (*types && strncmp(*types, "no", 2) && strchr(*types,',')) {
-       char *t = strdup(*types);
-       char *p;
- 
--      while((p = index(t,',')) != NULL) {
-+      while((p = strchr(t,',')) != NULL) {
- 	 *p = 0;
- 	 args.type = *types = t;
- 	 if(do_mount_syscall (&args) == 0)
diff --git a/package/util-linux/patches/patch-mount_sundries_c b/package/util-linux/patches/patch-mount_sundries_c
deleted file mode 100644
index 860b8c10b..000000000
--- a/package/util-linux/patches/patch-mount_sundries_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/mount/sundries.c	2004-12-21 20:12:31.000000000 +0100
-+++ util-linux-2.12r/mount/sundries.c	2008-10-16 12:00:59.000000000 +0200
-@@ -138,7 +138,7 @@ matching_type (const char *type, const c
- 	     if (strncmp(p, type, len) == 0 &&
- 		 (p[len] == 0 || p[len] == ','))
- 		     return !no;
--	     p = index(p,',');
-+	     p = strchr(p,',');
- 	     if (!p)
- 		     break;
- 	     p++;
diff --git a/package/util-linux/patches/patch-mount_umount_c b/package/util-linux/patches/patch-mount_umount_c
deleted file mode 100644
index ee0eb3920..000000000
--- a/package/util-linux/patches/patch-mount_umount_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/mount/umount.c	2005-09-10 20:07:38.000000000 +0200
-+++ util-linux-2.12r/mount/umount.c	2008-10-16 12:02:22.000000000 +0200
-@@ -338,7 +338,7 @@ umount_one (const char *spec, const char
- 			if (res < 0)
- 				umnt_err2 = errno;
- 			/* Do not complain about remote NFS mount points */
--			if (errno == ENOENT && index(spec, ':'))
-+			if (errno == ENOENT && strchr(spec, ':'))
- 				umnt_err2 = 0;
- 		}
- 	}
diff --git a/package/util-linux/patches/patch-text-utils_colcrt_c b/package/util-linux/patches/patch-text-utils_colcrt_c
deleted file mode 100644
index 3e2b90e94..000000000
--- a/package/util-linux/patches/patch-text-utils_colcrt_c
+++ /dev/null
@@ -1,14 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/text-utils/colcrt.c	2001-03-15 11:09:59.000000000 +0100
-+++ util-linux-2.12r/text-utils/colcrt.c	2008-10-16 12:49:47.000000000 +0200
-@@ -252,8 +252,8 @@ void pflush(int ol)
- 		}
- 		putwchar('\n');
- 	}
--	bcopy(page[ol], page, (267 - ol) * 132 * sizeof(wchar_t));
--	bzero(page[267- ol], ol * 132 * sizeof(wchar_t));
-+	memcpy(page, page[ol], (267 - ol) * 132 * sizeof(wchar_t));
-+	memset(page[267- ol], 0, ol * 132 * sizeof(wchar_t));
- 	outline -= ol;
- 	outcol = 0;
- 	first = 1;
diff --git a/package/util-linux/patches/patch-text-utils_display_c b/package/util-linux/patches/patch-text-utils_display_c
deleted file mode 100644
index f1b17a774..000000000
--- a/package/util-linux/patches/patch-text-utils_display_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/text-utils/display.c	2002-03-09 00:05:39.000000000 +0100
-+++ util-linux-2.12r/text-utils/display.c	2008-10-16 12:52:48.000000000 +0200
-@@ -163,7 +163,7 @@ static void bpad(PR *pr)
- 	pr->cchar[0] = 's';
- 	pr->cchar[1] = 0;
- 	for (p1 = pr->fmt; *p1 != '%'; ++p1);
--	for (p2 = ++p1; *p1 && index(spec, *p1); ++p1);
-+	for (p2 = ++p1; *p1 && strchr(spec, *p1); ++p1);
- 	while ((*p2++ = *p1++) != 0) ;
- }
- 
diff --git a/package/util-linux/patches/patch-text-utils_parse_c b/package/util-linux/patches/patch-text-utils_parse_c
deleted file mode 100644
index d94a81851..000000000
--- a/package/util-linux/patches/patch-text-utils_parse_c
+++ /dev/null
@@ -1,34 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/text-utils/parse.c	2002-03-09 00:07:00.000000000 +0100
-+++ util-linux-2.12r/text-utils/parse.c	2008-10-16 12:51:11.000000000 +0200
-@@ -64,7 +64,7 @@ void addfile(char *name)
- 		exit(1);
- 	}
- 	while (fgets(buf, sizeof(buf), fp)) {
--		if ((p = index(buf, '\n')) == NULL) {
-+		if ((p = strchr(buf, '\n')) == NULL) {
- 			(void)fprintf(stderr, _("hexdump: line too long.\n"));
- 			while ((ch = getchar()) != '\n' && ch != EOF);
- 			continue;
-@@ -171,7 +171,7 @@ int size(FS *fs)
- 			 * skip any special chars -- save precision in
- 			 * case it's a %s format.
- 			 */
--			while (index(spec + 1, *++fmt));
-+			while (strchr(spec + 1, *++fmt));
- 			if (*fmt == '.' && isdigit((unsigned char)*++fmt)) {
- 				prec = atoi(fmt);
- 				while (isdigit((unsigned char)*++fmt));
-@@ -244,10 +244,10 @@ void rewrite(FS *fs)
- 			if (fu->bcnt) {
- 				sokay = USEBCNT;
- 				/* skip to conversion character */
--				for (++p1; index(spec, *p1); ++p1);
-+				for (++p1; strchr(spec, *p1); ++p1);
- 			} else {
- 				/* skip any special chars, field width */
--				while (index(spec + 1, *++p1));
-+				while (strchr(spec + 1, *++p1));
- 				if (*p1 == '.' &&
- 				    isdigit((unsigned char)*++p1)) {
- 					sokay = USEPREC;
diff --git a/package/valgrind/Config.in b/package/valgrind/Config.in
index f9b7e51da..dbb743a1c 100644
--- a/package/valgrind/Config.in
+++ b/package/valgrind/Config.in
@@ -2,5 +2,7 @@ config ADK_PACKAGE_VALGRIND
 	prompt "valgrind.......................... a memory error detector and more"
 	tristate
 	default n
+	depends on ADK_LINUX_X86_ALIX1C || \
+		   ADK_LINUX_X86_QEMU
 	help
 	  http://valgrind.org/
diff --git a/package/xf86-video-geode/Config.in b/package/xf86-video-geode/Config.in
index d809a8570..ca59cab42 100644
--- a/package/xf86-video-geode/Config.in
+++ b/package/xf86-video-geode/Config.in
@@ -2,6 +2,7 @@ config ADK_PACKAGE_XF86_VIDEO_GEODE
 	prompt "xf86-video-geode........................... X11 driver for AMD Geode"
 	tristate
 	default n
+	depends on ADK_LINUX_X86_ALIX1C
 	select ADK_PACKAGE_XORG_SERVER
 	help
          http://www.x.org
-- 
cgit v1.2.3