old

24 files changed, 0 insertions, 1058 deletions

diff --git a/sys-apps/util-linux/files/no-symlink-resolve.patch b/sys-apps/util-linux/files/no-symlink-resolve.patch
deleted file mode 100644
index 9d64310f4d93..000000000000
--- a/sys-apps/util-linux/files/no-symlink-resolve.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- old/mount/realpath.c	2003-01-28 11:57:20.000000000 -0500
-+++ new/mount/realpath.c	2003-02-07 21:56:46.000000000 -0500
-@@ -13,7 +13,7 @@
-  * GNU Library Public License for more details.
-  */
- 
--#define resolve_symlinks
-+#undef resolve_symlinks
- 
- /*
-  * This routine is part of libc.  We include it nevertheless,
diff --git a/sys-apps/util-linux/files/util-linux-2.11z-agetty-domainname-option.patch b/sys-apps/util-linux/files/util-linux-2.11z-agetty-domainname-option.patch
deleted file mode 100644
index d94d8b81c2a1..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.11z-agetty-domainname-option.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- util-linux-2.11z/login-utils/agetty.c	2002-07-29 09:36:42.000000000 +0200
-+++ util-linux-2.11z.O/login-utils/agetty-with-dns.c	2003-07-13 04:24:01.000000000 +0200
-@@ -30,6 +30,7 @@
- #include <getopt.h>
- #include <time.h>
- #include <sys/file.h>
-+#include <netdb.h>
- #include "xstrncpy.h"
- #include "nls.h"
- 
-@@ -122,6 +123,17 @@
- #define	BUFSIZ		1024
- #endif
- 
-+/* set a maximum length for the hostname,  */
-+#ifdef HOST_NAME_MAX			
-+	/* defined by POSIX */
-+	#define HOSTNAME_LENGTH HOST_NAME_MAX
-+#elif defined(MAXHOSTNAMELEN)		
-+	/* implemented in current Unix-versions */
-+	#define HOSTNAME_LENGTH MAXHOSTNAMELEN
-+#else
-+	#define HOSTNAME_LENGTH 500
-+#endif
-+
-  /*
-   * When multiple baud rates are specified on the command line, the first one
-   * we will try is the first one specified.
-@@ -878,7 +890,25 @@
- 		     printf ("%s", domainname);
- 		   }
- 		  break;
--
-+		  
-+		  case 'O':
-+		  {
-+			char *domain = NULL;
-+			char host[HOSTNAME_LENGTH + 1];
-+			struct hostent *hp = NULL;
-+			
-+			if (gethostname(host, HOSTNAME_LENGTH) || !(hp = gethostbyname(host))) {
-+				domain = " unknown_domain";
-+			} else {
-+				/* get the substring after the first . */
-+				domain = strchr(hp->h_name, '.');
-+				if (domain == NULL)
-+					domain = ".(none)";
-+			}
-+			printf("%s", ++domain);
-+		  }  
-+		  break;
-+		  
- 		  case 'd':
- 		  case 't':
- 		    {
---- util-linux-2.11z/login-utils/agetty.8	1999-11-03 00:28:11.000000000 +0100
-+++ util-linux-2.11z.O/login-utils/agetty-with-dns.8	2003-07-13 04:27:17.000000000 +0200
-@@ -217,7 +217,10 @@
- Insert the nodename of the machine, also known as the hostname.
- .TP
- o
--Insert the domainname of the machine.
-+Insert the NIS domainname of the machine.
-+.TP
-+O
-+Insert the DNS domainname of the machine.
- .TP
- r
- Insert the release number of the OS, eg. 1.1.9.
diff --git a/sys-apps/util-linux/files/util-linux-2.11z-parallel-make.patch b/sys-apps/util-linux/files/util-linux-2.11z-parallel-make.patch
deleted file mode 100644
index 65c5166ebee2..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.11z-parallel-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- util-linux-2.11y/mount/Makefile.orig	2002-12-16 17:46:29.000000000 +0000
-+++ util-linux-2.11y/mount/Makefile	2002-12-16 17:46:59.000000000 +0000
-@@ -78,7 +78,7 @@
- 
- sundries.o nfsmount.o nfsmount_xdr.o nfsmount_clnt.o: nfsmount.h
- 
--umount.o: mount_constants.h
-+umount.o: mount_constants.h nfsmount.h
- 
- mount.o mount_by_label.o mount_guess_fstype.o: linux_fs.h
- 
diff --git a/sys-apps/util-linux/files/util-linux-2.12-mips-lseek.patch b/sys-apps/util-linux/files/util-linux-2.12-mips-lseek.patch
deleted file mode 100644
index 3fcd5b554a31..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12-mips-lseek.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Because there is no llseek defined for mips n32, we will use lseek instead.
-
---- util-linux-2.12r/fdisk/sfdisk.c.orig
-+++ util-linux-2.12r/fdisk/sfdisk.c
-@@ -172,7 +172,7 @@
-  * 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__)
-+#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (__s390x__) || defined (__mips__)
- #define use_lseek
- #endif
- 
---- util-linux-2.12r/partx/partx.c.orig
-+++ util-linux-2.12r/partx/partx.c
-@@ -333,7 +333,7 @@
- /*
-  * sseek: seek to specified sector
-  */
--#if !defined (__alpha__) && !defined (__ia64__) && !defined (__s390x__) && !defined(__x86_64__)
-+#if !defined (__alpha__) && !defined (__ia64__) && !defined (__s390x__) && !defined(__x86_64__) && !defined(__mips__)
- #define NEED__llseek
- #endif
- 
diff --git a/sys-apps/util-linux/files/util-linux-2.12i-ignore-managed.patch b/sys-apps/util-linux/files/util-linux-2.12i-ignore-managed.patch
deleted file mode 100644
index b6cb5670c496..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12i-ignore-managed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- util-linux-2.12a/mount/mount.c.sopwith	2004-03-04 20:28:22.000000000 -0500
-+++ util-linux-2.12a/mount/mount.c	2004-07-16 16:50:18.792814782 -0400
-@@ -191,6 +191,8 @@
-   { "diratime",	0, 1, MS_NODIRATIME },	/* Update dir access times */
-   { "nodiratime", 0, 0, MS_NODIRATIME },/* Do not update dir access times */
- #endif
-+  { "kudzu", 0, 0, 0 },			/* Silently remove this option (backwards compat use only) */
-+  { "managed", 0, 0, 0 },			/* Silently remove this option */
-   { NULL,	0, 0, 0		}
- };
- 
diff --git a/sys-apps/util-linux/files/util-linux-2.12i-nfsv4.patch b/sys-apps/util-linux/files/util-linux-2.12i-nfsv4.patch
deleted file mode 100644
index 864449b17767..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12i-nfsv4.patch
+++ /dev/null
@@ -1,456 +0,0 @@
-diff -ur util-linux-2.12i.orig/mount/Makefile util-linux-2.12i/mount/Makefile
---- util-linux-2.12i.orig/mount/Makefile	2004-11-11 20:03:33.032897551 -0500
-+++ util-linux-2.12i/mount/Makefile	2004-11-11 20:04:38.279986828 -0500
-@@ -29,2 +29,4 @@
- 
-+NFS_OBJS += nfs4mount.o
-+GEN_FILES += nfs4mount.c
- all: $(PROGS)
-diff -ur util-linux-2.12i.orig/mount/mount.c util-linux-2.12i/mount/mount.c
---- util-linux-2.12i.orig/mount/mount.c	2004-11-11 20:03:33.033897369 -0500
-+++ util-linux-2.12i/mount/mount.c	2004-11-11 20:03:40.384555521 -0500
-@@ -810,6 +810,19 @@
- 		      "without support for the type `nfs'"));
- #endif
-   }
-+#ifdef HAVE_NFS
-+  /*
-+   * NFSv4 support
-+   */
-+  if (!fake && types && streq (types, "nfs4")) {
-+    mnt_err = nfs4mount(spec, node, &flags, &extra_opts, &mount_opts, bg);
-+    if (mnt_err)
-+      return mnt_err;
-+#else
-+    die (EX_SOFTWARE, _("mount: this version was compiled "
-+	              "without support for the type `nfs4'"));
-+#endif
-+  }
- 
-   block_signals (SIG_BLOCK);
- 
-diff -ur util-linux-2.12i.orig/mount/sundries.h util-linux-2.12i/mount/sundries.h
---- util-linux-2.12i.orig/mount/sundries.h	2004-11-11 20:03:33.034897186 -0500
-+++ util-linux-2.12i/mount/sundries.h	2004-11-11 20:03:40.386555156 -0500
-@@ -37,6 +37,8 @@
- #ifdef HAVE_NFS
- int nfsmount (const char *spec, const char *node, int *flags,
- 	      char **orig_opts, char **opt_args, int *version, int running_bg);
-+int nfs4mount (const char *spec, const char *node, int *flags,
-+	       char **orig_opts, char **opt_args, int running_bg);
- #endif
- 
- /* exit status - bits below are ORed */
-diff -puN /dev/null mount/nfs4_mount.h
---- /dev/null	2003-01-08 17:56:04.000000000 -0500
-+++ util-linux-2.11z-bfields/mount/nfs4_mount.h	2003-04-23 16:40:57.000000000 -0400
-@@ -0,0 +1,82 @@
-+#ifndef _LINUX_NFS4_MOUNT_H
-+#define _LINUX_NFS4_MOUNT_H
-+
-+/*
-+ *  linux/include/linux/nfs4_mount.h
-+ *
-+ *  Copyright (C) 2002  Trond Myklebust
-+ *
-+ *  structure passed from user-space to kernel-space during an nfsv4 mount
-+ */
-+
-+/*
-+ * WARNING!  Do not delete or change the order of these fields.  If
-+ * a new field is required then add it to the end.  The version field
-+ * tracks which fields are present.  This will ensure some measure of
-+ * mount-to-kernel version compatibility.  Some of these aren't used yet
-+ * but here they are anyway.
-+ */
-+#define NFS4_MOUNT_VERSION	1
-+
-+struct nfs_string {
-+	unsigned int len;
-+	const char* data;
-+};
-+
-+struct nfs4_mount_data {
-+	int version;				/* 1 */
-+	int flags;				/* 1 */
-+	int rsize;				/* 1 */
-+	int wsize;				/* 1 */
-+	int timeo;				/* 1 */
-+	int retrans;				/* 1 */
-+	int acregmin;				/* 1 */
-+	int acregmax;				/* 1 */
-+	int acdirmin;				/* 1 */
-+	int acdirmax;				/* 1 */
-+
-+	/* see the definition of 'struct clientaddr4' in RFC3010 */
-+	struct nfs_string client_addr;		/* 1 */
-+
-+	/* Mount path */
-+	struct nfs_string mnt_path;		/* 1 */
-+
-+	/* Server details */
-+	struct nfs_string hostname;		/* 1 */
-+	/* Server IP address */
-+	unsigned int host_addrlen;		/* 1 */
-+	struct sockaddr* host_addr;		/* 1 */
-+
-+	/* Transport protocol to use */
-+	int proto;				/* 1 */
-+
-+	/* Pseudo-flavours to use for authentication. See RFC2623 */
-+	int auth_flavourlen;			/* 1 */
-+	int *auth_flavours;			/* 1 */
-+};
-+
-+/* bits in the flags field */
-+/* Note: the fields that correspond to existing NFSv2/v3 mount options
-+ * 	 should mirror the values from include/linux/nfs_mount.h
-+ */
-+
-+#define NFS4_MOUNT_SOFT		0x0001	/* 1 */
-+#define NFS4_MOUNT_INTR		0x0002	/* 1 */
-+#define NFS4_MOUNT_NOCTO	0x0010	/* 1 */
-+#define NFS4_MOUNT_NOAC		0x0020	/* 1 */
-+#define NFS4_MOUNT_STRICTLOCK	0x1000	/* 1 */
-+#define NFS4_MOUNT_FLAGMASK	0xFFFF
-+
-+/* pseudoflavors: */
-+
-+#define RPC_AUTH_GSS_KRB5       390003
-+#define RPC_AUTH_GSS_KRB5I      390004
-+#define RPC_AUTH_GSS_KRB5P      390005
-+#define RPC_AUTH_GSS_LKEY       390006
-+#define RPC_AUTH_GSS_LKEYI      390007
-+#define RPC_AUTH_GSS_LKEYP      390008
-+#define RPC_AUTH_GSS_SPKM       390009
-+#define RPC_AUTH_GSS_SPKMI      390010
-+#define RPC_AUTH_GSS_SPKMP      390011
-+
-+#endif
-diff -puN /dev/null mount/nfs4mount.c
---- /dev/null	2003-01-08 17:56:04.000000000 -0500
-+++ util-linux-2.11z-bfields/mount/nfs4mount.c	2003-04-23 17:28:54.000000000 -0400
-@@ -0,0 +1,323 @@
-+/*
-+ * nfs4mount.c -- Linux NFS mount
-+ * Copyright (C) 2002 Trond Myklebust <trond.myklebust@fys.uio.no>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * Note: this file based on the original nfsmount.c
-+ */
-+
-+#include "../defines.h"	/* for HAVE_rpcsvc_nfs_prot_h and HAVE_inet_aton */
-+
-+#include <linux/posix_types.h>
-+#include <asm/posix_types.h>
-+#undef __FD_CLR
-+#undef __FD_SET
-+#undef __FD_ISSET
-+#undef __FD_ZERO
-+
-+#include <unistd.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <netdb.h>
-+#include <time.h>
-+#include <sys/socket.h>
-+#include <sys/time.h>
-+#include <sys/utsname.h>
-+#include <sys/stat.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+
-+#include "sundries.h"
-+
-+#include "mount_constants.h"
-+#include "nfs4_mount.h"
-+
-+#include "nls.h"
-+
-+#ifndef NFS_PORT
-+#define NFS_PORT 2049
-+#endif
-+
-+static int parse_devname(char *hostdir, char **hostname, char **dirname)
-+{
-+	char *s;
-+
-+	if (!(s = strchr(hostdir, ':'))) {
-+		fprintf(stderr,
-+			_("mount: "
-+			  "directory to mount not in host:dir format\n"));
-+		return -1;
-+	}
-+	*hostname = hostdir;
-+	*dirname = s + 1;
-+	*s = '\0';
-+	/* Ignore all but first hostname in replicated mounts
-+	   until they can be fully supported. (mack@sgi.com) */
-+	if ((s = strchr(hostdir, ','))) {
-+		*s = '\0';
-+		fprintf(stderr,
-+			_("mount: warning: "
-+			  "multiple hostnames not supported\n"));
-+	}
-+	return 0;
-+}
-+
-+static int fill_ipv4_sockaddr(const char *hostname, struct sockaddr_in *addr)
-+{
-+	struct hostent *hp;
-+	addr->sin_family = AF_INET;
-+
-+	if (inet_aton(hostname, &addr->sin_addr))
-+		return 0;
-+	if ((hp = gethostbyname(hostname)) == NULL) {
-+		fprintf(stderr, _("mount: can't get address for %s\n"),
-+			hostname);
-+		return -1;
-+	}
-+	if (hp->h_length > sizeof(struct in_addr)) {
-+		fprintf(stderr,
-+			_("mount: got bad hp->h_length\n"));
-+		hp->h_length = sizeof(struct in_addr);
-+	}
-+	memcpy(&addr->sin_addr, hp->h_addr, hp->h_length);
-+	return 0;
-+}
-+
-+static int get_my_ipv4addr(char *ip_addr, int len)
-+{
-+	char myname[1024];
-+	struct sockaddr_in myaddr;
-+
-+	if (gethostname(myname, sizeof(myname))) {
-+		fprintf(stderr, _("mount: can't determine client address\n"));
-+		return -1;
-+	}
-+	if (fill_ipv4_sockaddr(myname, &myaddr))
-+		return -1;
-+	snprintf(ip_addr, len, "%s", inet_ntoa(myaddr.sin_addr));
-+	ip_addr[len-1] = '\0';
-+	return 0;
-+}
-+
-+int nfs4mount(const char *spec, const char *node, int *flags,
-+	      char **extra_opts, char **mount_opts,
-+	      int running_bg)
-+{
-+	static struct nfs4_mount_data data;
-+	static char hostdir[1024];
-+	static char ip_addr[16] = "127.0.0.1";
-+	static struct sockaddr_in server_addr;
-+	static int pseudoflavour = 0;
-+
-+	char *hostname, *dirname, *old_opts;
-+	char new_opts[1024];
-+	char *opt, *opteq;
-+	char *s;
-+	int val;
-+	int port, bg, soft, intr;
-+	int nocto, noac;
-+	int retry;
-+	int retval;
-+
-+	retval = EX_FAIL;
-+	if (strlen(spec) >= sizeof(hostdir)) {
-+		fprintf(stderr, _("mount: "
-+				  "excessively long host:dir argument\n"));
-+		goto fail;
-+	}
-+	strcpy(hostdir, spec);
-+	if (parse_devname(hostdir, &hostname, &dirname))
-+		goto fail;
-+
-+	if (fill_ipv4_sockaddr(hostname, &server_addr))
-+		goto fail;
-+	if (get_my_ipv4addr(ip_addr, sizeof(ip_addr)))
-+		goto fail;
-+
-+	/* add IP address to mtab options for use when unmounting */
-+	s = inet_ntoa(server_addr.sin_addr);
-+	old_opts = *extra_opts;
-+	if (!old_opts)
-+		old_opts = "";
-+	if (strlen(old_opts) + strlen(s) + 10 >= sizeof(new_opts)) {
-+		fprintf(stderr, _("mount: "
-+				  "excessively long option argument\n"));
-+		goto fail;
-+	}
-+	snprintf(new_opts, sizeof(new_opts), "%s%saddr=%s",
-+		 old_opts, *old_opts ? "," : "", s);
-+	*extra_opts = xstrdup(new_opts);
-+
-+	/* Set default options.
-+	 * rsize/wsize and timeo are left 0 in order to
-+	 * let the kernel decide.
-+	 */
-+	memset(&data, 0, sizeof(data));
-+	data.retrans	= 3;
-+	data.acregmin	= 3;
-+	data.acregmax	= 60;
-+	data.acdirmin	= 30;
-+	data.acdirmax	= 60;
-+	data.proto	= IPPROTO_TCP;
-+
-+	bg = 0;
-+	soft = 0;
-+	intr = 0;
-+	nocto = 0;
-+	noac = 0;
-+	retry = 10000;		/* 10000 minutes ~ 1 week */
-+
-+	/*
-+	 * NFSv4 specifies that the default port should be 2049
-+	 */
-+	port = NFS_PORT;
-+
-+	/* parse options */
-+
-+	for (opt = strtok(old_opts, ","); opt; opt = strtok(NULL, ",")) {
-+		if ((opteq = strchr(opt, '='))) {
-+			val = atoi(opteq + 1);	
-+			*opteq = '\0';
-+			if (!strcmp(opt, "rsize"))
-+				data.rsize = val;
-+			else if (!strcmp(opt, "wsize"))
-+				data.wsize = val;
-+			else if (!strcmp(opt, "timeo"))
-+				data.timeo = val;
-+			else if (!strcmp(opt, "retrans"))
-+				data.retrans = val;
-+			else if (!strcmp(opt, "acregmin"))
-+				data.acregmin = val;
-+			else if (!strcmp(opt, "acregmax"))
-+				data.acregmax = val;
-+			else if (!strcmp(opt, "acdirmin"))
-+				data.acdirmin = val;
-+			else if (!strcmp(opt, "acdirmax"))
-+				data.acdirmax = val;
-+			else if (!strcmp(opt, "actimeo")) {
-+				data.acregmin = val;
-+				data.acregmax = val;
-+				data.acdirmin = val;
-+				data.acdirmax = val;
-+			}
-+			else if (!strcmp(opt, "retry"))
-+				retry = val;
-+			else if (!strcmp(opt, "port"))
-+				port = val;
-+			else if (!strcmp(opt, "proto")) {
-+				if (!strncmp(opteq+1, "tcp", 3))
-+					data.proto = IPPROTO_TCP;
-+				else if (!strncmp(opteq+1, "udp", 3))
-+					data.proto = IPPROTO_UDP;
-+				else
-+					printf(_("Warning: Unrecognized proto= option.\n"));
-+			} else if (!strcmp(opt, "clientaddr")) {
-+				if (strlen(opteq+1) >= sizeof(ip_addr))
-+					printf(_("Invalid client address %s"),
-+								opteq+1);
-+				strncpy(ip_addr,opteq+1, sizeof(ip_addr));
-+				ip_addr[sizeof(ip_addr)-1] = '\0';
-+			} else if (!strcmp(opt, "sec")) {
-+				if (!strncmp(opteq+1, "krb5i",5))
-+					pseudoflavour = 390004;
-+				else if (!strncmp(opteq+1, "krb5p",5))
-+					pseudoflavour = 390005;
-+				else if (!strncmp(opteq+1, "krb5",4))
-+					pseudoflavour = 390003;
-+				else {
-+					printf(_("unknown security type %s\n"),
-+							opteq+1);
-+					goto fail;
-+				}
-+			} else if (!strcmp(opt, "addr")) {
-+				/* ignore */;
-+			} else {
-+				printf(_("unknown nfs mount parameter: "
-+					 "%s=%d\n"), opt, val);
-+				goto fail;
-+			}
-+		} else {
-+			val = 1;
-+			if (!strncmp(opt, "no", 2)) {
-+				val = 0;
-+				opt += 2;
-+			}
-+			if (!strcmp(opt, "bg")) 
-+				bg = val;
-+			else if (!strcmp(opt, "fg")) 
-+				bg = !val;
-+			else if (!strcmp(opt, "soft"))
-+				soft = val;
-+			else if (!strcmp(opt, "hard"))
-+				soft = !val;
-+			else if (!strcmp(opt, "intr"))
-+				intr = val;
-+			else if (!strcmp(opt, "cto"))
-+				nocto = !val;
-+			else if (!strcmp(opt, "ac"))
-+				noac = !val;
-+			else {
-+				if (!sloppy) {
-+					printf(_("unknown nfs mount option: "
-+						 "%s%s\n"), val ? "" : "no", opt);
-+					goto fail;
-+				}
-+			}
-+		}
-+	}
-+
-+	data.flags = (soft ? NFS4_MOUNT_SOFT : 0)
-+		| (intr ? NFS4_MOUNT_INTR : 0)
-+		| (nocto ? NFS4_MOUNT_NOCTO : 0)
-+		| (noac ? NFS4_MOUNT_NOAC : 0);
-+
-+	if (pseudoflavour != 0) {
-+		data.auth_flavourlen = 1;
-+		data.auth_flavours = &pseudoflavour;
-+	}
-+
-+	data.client_addr.data = ip_addr;
-+	data.client_addr.len = strlen(ip_addr);
-+
-+	data.mnt_path.data = dirname;
-+	data.mnt_path.len = strlen(dirname);
-+
-+	data.hostname.data = hostname;
-+	data.hostname.len = strlen(hostname);
-+	data.host_addr = (struct sockaddr *)&server_addr;
-+	data.host_addrlen = sizeof(server_addr);
-+
-+#ifdef NFS_MOUNT_DEBUG
-+	printf("rsize = %d, wsize = %d, timeo = %d, retrans = %d\n",
-+	       data.rsize, data.wsize, data.timeo, data.retrans);
-+	printf("acreg (min, max) = (%d, %d), acdir (min, max) = (%d, %d)\n",
-+	       data.acregmin, data.acregmax, data.acdirmin, data.acdirmax);
-+	printf("port = %d, bg = %d, retry = %d, flags = %.8x\n",
-+	       port, bg, retry, data.flags);
-+	printf("soft = %d, intr = %d, nocto = %d, noac = %d\n",
-+	       (data.flags & NFS4_MOUNT_SOFT) != 0,
-+	       (data.flags & NFS4_MOUNT_INTR) != 0,
-+	       (data.flags & NFS4_MOUNT_NOCTO) != 0,
-+	       (data.flags & NFS4_MOUNT_NOAC) != 0);
-+	printf("proto = %s\n", (data.proto == IPPROTO_TCP) ? "tcp" : "udp");
-+#endif
-+
-+	data.version = NFS4_MOUNT_VERSION;
-+
-+	*mount_opts = (char *) &data;
-+	/* clean up */
-+	return 0;
-+
-+fail:
-+	return retval;
-+}
diff --git a/sys-apps/util-linux/files/util-linux-2.12p-swapon-check-symlinks.patch b/sys-apps/util-linux/files/util-linux-2.12p-swapon-check-symlinks.patch
deleted file mode 100644
index f421458049f1..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12p-swapon-check-symlinks.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- util-linux-2.12b/mount/swapon.c
-+++ util-linux-2.12b/mount/swapon.c
-@@ -7,2 +7,3 @@
- #include <stdlib.h>
-+#include <sys/param.h>
- #include <stdio.h>
-@@ -137,10 +138,27 @@
- static int
- is_in_proc_swaps(const char *fname) {
- 	int i;
-+	struct stat fstatbuf;
- 
- 	for (i = 0; i < numSwaps; i++)
- 		if (swapFiles[i] && !strcmp(fname, swapFiles[i]))
- 			return 1;
-+
-+	/* fallback:
-+	 * if the device in /etc/fstab is a symlink, the entry
-+	 * in /proc/swaps won't match because the kernel stores
-+	 * absolute pathnames.  Here we compare dev_t's.
-+	 */
-+	if (!lstat(fname, &fstatbuf))
-+		if (S_ISLNK(fstatbuf.st_mode)) {
-+			struct stat swapstatbuf;
-+			stat(fname, &fstatbuf);
-+			for (i = 0; i < numSwaps; i++)
-+				if (swapFiles[i] && !stat(swapFiles[i], &swapstatbuf) && \
-+				    swapstatbuf.st_rdev == fstatbuf.st_rdev)
-+					return 1;
-+		}
-+
- 	return 0;
- }
- 
diff --git a/sys-apps/util-linux/files/util-linux-2.12q-debian-10cfdisk.patch b/sys-apps/util-linux/files/util-linux-2.12q-debian-10cfdisk.patch
deleted file mode 100644
index 9092e0be9b33..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12q-debian-10cfdisk.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-## 10cfdisk.dpatch by LaMont Jones <lamont@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Buffer overruns with narrow terminal windows.
-
-@DPATCH@
-diff -urNad util-linux/fdisk/cfdisk.c /tmp/dpep.rEB26p/util-linux/fdisk/cfdisk.c
---- util-linux.orig/fdisk/cfdisk.c	2004-12-24 14:41:20.000000000 -0700
-+++ util-linux/fdisk/cfdisk.c	2004-12-24 15:00:00.503453740 -0700
-@@ -2100,7 +2100,7 @@
- 	if (to_file) {
- 	    if ((fp = fopen(fname, "w")) == NULL) {
- 		char errstr[LINE_LENGTH];
--		sprintf(errstr, _("Cannot open file '%s'"), fname);
-+		snprintf(errstr, sizeof(errstr), _("Cannot open file '%s'"), fname);
- 		print_warning(errstr);
- 		return;
- 	    }
-@@ -2184,7 +2184,7 @@
- 	if (to_file) {
- 	    if ((fp = fopen(fname, "w")) == NULL) {
- 		char errstr[LINE_LENGTH];
--		sprintf(errstr, _("Cannot open file '%s'"), fname);
-+		snprintf(errstr, sizeof(errstr), _("Cannot open file '%s'"), fname);
- 		print_warning(errstr);
- 		return;
- 	    }
-@@ -2638,9 +2638,9 @@
- 	mvaddstr(WARNING_START, 0, line);
- 
- 
--    sprintf(line, "cfdisk %s", VERSION);
-+    snprintf(line, COLS+1, "cfdisk %s", VERSION);
-     mvaddstr(HEADER_START, (COLS-strlen(line))/2, line);
--    sprintf(line, _("Disk Drive: %s"), disk_device);
-+    snprintf(line, COLS+1, _("Disk Drive: %s"), disk_device);
-     mvaddstr(HEADER_START+2, (COLS-strlen(line))/2, line);
-     {
- 	    long long bytes = actual_size*(long long) SECTOR_SIZE;
-@@ -2654,7 +2654,7 @@
- 			    bytes, megabytes/K, (10*megabytes/K)%10);
-     }
-     mvaddstr(HEADER_START+3, (COLS-strlen(line))/2, line);
--    sprintf(line, _("Heads: %d   Sectors per Track: %d   Cylinders: %lld"),
-+    snprintf(line, COLS+1, _("Heads: %d   Sectors per Track: %d   Cylinders: %lld"),
- 	    heads, sectors, cylinders);
-     mvaddstr(HEADER_START+4, (COLS-strlen(line))/2, line);
- 
diff --git a/sys-apps/util-linux/files/util-linux-2.12q-dont-umask.patch b/sys-apps/util-linux/files/util-linux-2.12q-dont-umask.patch
deleted file mode 100644
index 704c258159be..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12q-dont-umask.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Don't force umask to 022 or the -o umask option doesn't work.
-
-Patch by Daniel Drake.
-
-http://bugs.gentoo.org/93671
-
---- mount/mount.c
-+++ mount/mount.c
-@@ -1491,8 +1491,6 @@ main(int argc, char *argv[]) {
- 	if ((p = strrchr(progname, '/')) != NULL)
- 		progname = p+1;
- 
--	umask(022);
--
- 	/* People report that a mount called from init without console
- 	   writes error messages to /etc/mtab
- 	   Let us try to avoid getting fd's 0,1,2 */
diff --git a/sys-apps/util-linux/files/util-linux-2.12q-i18n-update.patch b/sys-apps/util-linux/files/util-linux-2.12q-i18n-update.patch
deleted file mode 100644
index a47810cdd2f2..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12q-i18n-update.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-DELACOUR Guillaume reports:
-i18n: Typo in french translation of mount error
-http://bugs.gentoo.org/show_bug.cgi?id=75693
---- po/fr.po
-+++ po/fr.po
-@@ -8358,3 +8358,3 @@
- msgid "%s looks like swapspace - not mounted"
--msgstr "%s ressemble à un esapce de swap - n'a pas été monté"
-+msgstr "%s ressemble à un espace de swap - n'a pas été monté"
- 
diff --git a/sys-apps/util-linux/files/util-linux-2.12q-more-fake-checks-v2.patch b/sys-apps/util-linux/files/util-linux-2.12q-more-fake-checks-v2.patch
deleted file mode 100644
index f598a8da350f..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12q-more-fake-checks-v2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-> Running `mount -fv /mnt/pnt` incorrectly updates /etc/mtab
-
-This one is bogus.
-
-Manpage:
-
-=====
--f     Causes  everything  to  be  done  except  for  the  actual  system call;
-       if it's not obvious, this ``fakes'' mounting the file system.  This option
-       is useful in conjunction with the -v flag to determine what the mount
-       command is trying to do. It can also be used to add entries for devices that
-       were mounted earlier with the -n option.
-=====
-
-Also, we need it in /etc/init.d/checkroot to regen /etc/mtab ...
-
-
-=======================================================================
-Running `mount -afvt type` incorrectly warns that 'nothing was mounted'
-
---- mount/mount.c
-+++ mount/mount.c
-#@@ -659,7 +659,7 @@
-# 	if (verbose)
-# 		print_one (&mnt);
-# 
-#-	if (!nomtab && mtab_is_writable()) {
-#+	if (!fake && !nomtab && mtab_is_writable()) {
-# 		if (flags & MS_REMOUNT)
-# 			update_mtab (mnt.mnt_dir, &mnt);
-# 		else {
-@@ -1629,7 +1629,7 @@
- 	case 0:
- 		/* mount -a */
- 		result = do_mount_all (types, options, test_opts);
--		if (result == 0 && verbose)
-+		if (result == 0 && verbose && !fake)
- 			error(_("nothing was mounted"));
- 		break;
- 
diff --git a/sys-apps/util-linux/files/util-linux-2.12q-no-m68k-fdisk.patch b/sys-apps/util-linux/files/util-linux-2.12q-no-m68k-fdisk.patch
deleted file mode 100644
index 6d3334f4d810..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12q-no-m68k-fdisk.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Disable building fdisk on m68k
-
---- fdisk/Makefile
-+++ fdisk/Makefile
-@@ -18,8 +18,10 @@
- endif
- endif
- 
-+ifneq "$(ARCH)" "m68k"
- SBIN:=$(SBIN) fdisk
- MAN8:=$(MAN8) fdisk.8
-+endif
- 
- ifneq "$(ARCH)" "sparc"
- SBIN:=$(SBIN) $(CFDISK) sfdisk
diff --git a/sys-apps/util-linux/files/util-linux-2.12q-umount-dont-write-mtab-with-remount.patch b/sys-apps/util-linux/files/util-linux-2.12q-umount-dont-write-mtab-with-remount.patch
deleted file mode 100644
index 2b8f4ad36c3f..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12q-umount-dont-write-mtab-with-remount.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Make umount respect the -n option when using -r
-
-Patch by Derick Swanepoel
-
-http://bugs.gentoo.org/98675
-
---- mount/umount.c
-+++ mount/umount.c
-@@ -349,7 +349,8 @@
- 			remnt.mnt_type = remnt.mnt_fsname = NULL;
- 			remnt.mnt_dir = xstrdup(node);
- 			remnt.mnt_opts = xstrdup("ro");
--			update_mtab(node, &remnt);
-+			if (!nomtab && mtab_is_writable())
-+				update_mtab(node, &remnt);
- 			return 0;
- 		} else if (errno != EBUSY) { 	/* hmm ... */
- 			perror("remount");
diff --git a/sys-apps/util-linux/files/util-linux-2.12q-update-mtab-when-moving.patch b/sys-apps/util-linux/files/util-linux-2.12q-update-mtab-when-moving.patch
deleted file mode 100644
index aa921f5edc2c..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12q-update-mtab-when-moving.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Running `mount --move /foo /bar` would leave the old /foo entry in /etc/mtab 
-and create a new /bar entry with wrong info.
-
-http://bugs.gentoo.org/104697
-
---- 1/mount/mount.c
-+++ 2/mount/mount.c
-@@ -665,6 +665,25 @@
- 		else {
- 			mntFILE *mfp;
- 
-+			/* when moving a mount point, we have to make sure the mtab
-+			 * gets updated properly.  We get info about the old mount
-+			 * point, copy it to the new mount point, and then delete
-+			 * the old mount point. */
-+			if (flags & MS_MOVE) {
-+				const char *olddir = mnt.mnt_fsname;
-+				struct mntentchn *oldmc = oldmc = getmntfile(olddir);
-+				if (oldmc != NULL) {
-+					mnt.mnt_fsname = xstrdup(oldmc->m.mnt_fsname);
-+					mnt.mnt_type = oldmc->m.mnt_type;
-+					mnt.mnt_opts = oldmc->m.mnt_opts;
-+					mnt.mnt_freq = oldmc->m.mnt_freq;
-+					mnt.mnt_passno = oldmc->m.mnt_passno;
-+				}
-+				update_mtab(olddir, NULL);
-+				if (oldmc != NULL)
-+					my_free(olddir);
-+			}
-+
- 			lock_mtab();
- 			mfp = my_setmntent(MOUNTED, "a+");
- 			if (mfp == NULL || mfp->mntent_fp == NULL) {
diff --git a/sys-apps/util-linux/files/util-linux-2.12q-update_mtab-fixes.patch b/sys-apps/util-linux/files/util-linux-2.12q-update_mtab-fixes.patch
deleted file mode 100644
index 7e1c9db6bf86..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12q-update_mtab-fixes.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-This fixes a few issues with update_mtab():
-- If it is a remount, and only mnt_opts needs updating, mc->m.mnt_opts is set
-  to point to instead->mnt_opts, rather than allocating a new string, which
-  would cause a double free if the caller actually freed the passed mnt_opts,
-  as we free mc->m.mnt_opts before returning to the caller.
-- Mostly the same issue as above.  If mtab does not contain the new entry, then
-  absent->m is set to point to instead, which would have cause a double free
-  if absent was inserted properly into the linked list, since we free all
-  elements of absent before returning to the caller.
-- If mtab does not contain the new entry, then only mc0->prev is updated to
-  point to absent, but not the old mc0->prev's nxt pointer.  Because we then
-  use the nxt pointers to write the new mtab, absent is not added to the new
-  mtab.
-- If mtab is empty, absent->prev should be set to mc0, and not mc0->prev, as
-  it will be NULL.
-- Memory leak if we have to abort before mc0 and co are freed.
-
-Patch by Martin Schlemmer <azarah@gentoo.org>
-
-
---- util-linux-2.12q/mount/fstab.c	2005-09-14 15:30:10.000000000 +0200
-+++ util-linux-2.12q.az/mount/fstab.c	2005-09-14 15:31:48.000000000 +0200
-@@ -604,15 +604,32 @@ update_mtab (const char *dir, struct my_
- 				free(mc);
- 			}
- 		} else {
--			/* A remount */
--			mc->m.mnt_opts = instead->mnt_opts;
-+			/* A remount. */
-+			my_free(mc->m.mnt_opts);
-+			/* Need to alloc memory, else we might
-+			 * run into issues if both we and the caller frees
-+			 * mnt_opts ... */
-+			mc->m.mnt_opts = xstrdup(instead->mnt_opts);
- 		}
- 	} else if (instead) {
- 		/* not found, add a new entry */
- 		absent = xmalloc(sizeof(*absent));
--		absent->m = *instead;
-+		/* Cannot just set absent->m to instead, as we free absent
-+		 * below, and the caller might free instead */
-+		absent->m.mnt_fsname = xstrdup(instead->mnt_fsname);
-+		absent->m.mnt_dir = xstrdup(instead->mnt_dir);
-+		absent->m.mnt_type = xstrdup(instead->mnt_type);
-+		absent->m.mnt_opts = xstrdup(instead->mnt_opts);
-+		absent->m.mnt_freq = instead->mnt_freq;
-+		absent->m.mnt_passno = instead->mnt_passno;
-+
- 		absent->nxt = mc0;
--		absent->prev = mc0->prev;
-+		if (mc0->prev != NULL) {
-+			absent->prev = mc0->prev;
-+			mc0->prev->nxt = absent;
-+		} else {
-+			absent->prev = mc0;
-+		}
- 		mc0->prev = absent;
- 		if (mc0->nxt == NULL)
- 			mc0->nxt = absent;
-@@ -624,6 +641,8 @@ update_mtab (const char *dir, struct my_
- 		int errsv = errno;
- 		error (_("cannot open %s (%s) - mtab not updated"),
- 		       MOUNTED_TEMP, strerror (errsv));
-+		/* Do not leak memory */
-+		discard_mntentchn(mc0);
- 		goto leave;
- 	}
- 
diff --git a/sys-apps/util-linux/files/util-linux-2.12q-use-update_mtab-for-fake.patch b/sys-apps/util-linux/files/util-linux-2.12q-use-update_mtab-for-fake.patch
deleted file mode 100644
index 5d0b4366da98..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12q-use-update_mtab-for-fake.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Use update_mtab() to update /etc/mtab on fake mounts (mount -f), else we get
-dup entries in /etc/mtab.
-
-Patch by Mike Frysinger <vapier@gentoo.org>
-
---- util-linux-2.12q/mount/mount.c	2005-09-14 15:37:43.000000000 +0200
-+++ util-linux-2.12q.az/mount/mount.c	2005-09-14 15:27:14.000000000 +0200
-@@ -662,7 +662,7 @@ update_mtab_entry(const char *spec, cons
- 		print_one (&mnt);
- 
- 	if (!nomtab && mtab_is_writable()) {
--		if (flags & MS_REMOUNT)
-+		if (fake || (flags & MS_REMOUNT))
- 			update_mtab (mnt.mnt_dir, &mnt);
- 		else {
- 			mntFILE *mfp;
diff --git a/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h-loop-aes.patch b/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h-loop-aes.patch
deleted file mode 100644
index 8c5bbc7aece9..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h-loop-aes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-fix building when asm/page.h is not available
-
-http://bugs.gentoo.org/168278
-
-the loop-aes patch adds this ...
-
---- mount/swapon.c
-+++ mount/swapon.c
-@@ -31,7 +31,9 @@
- #include <sys/ioctl.h>
- #include <sys/utsname.h>
- #include <sys/time.h>
-+#ifdef HAVE_asm_page_h
- #include <asm/page.h>
-+#endif
- #include "xmalloc.h"
- #include "swap_constants.h"
- #include "swapargs.h"
diff --git a/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h.patch b/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h.patch
deleted file mode 100644
index 21c04709d809..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-fix building when asm/page.h is not available
-
-http://bugs.gentoo.org/168278
-
---- disk-utils/fsck.cramfs.c
-+++ disk-utils/fsck.cramfs.c
-@@ -76,7 +76,9 @@
- 
- #define PAD_SIZE 512
- 
-+#ifdef HAVE_asm_page_h
- #include <asm/page.h>
-+#endif
- #ifdef PAGE_SIZE
- #define PAGE_CACHE_SIZE ((int) PAGE_SIZE)
- #elif defined __ia64__
diff --git a/sys-apps/util-linux/files/util-linux-2.12r-cal-dumb-terminal.patch b/sys-apps/util-linux/files/util-linux-2.12r-cal-dumb-terminal.patch
deleted file mode 100644
index 073506ec7e87..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12r-cal-dumb-terminal.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-If you try to use cal on a terminal which doesnt support highlighting,
-Senter and Sexit will be set to NULL instead of "" which will cause the
-resulting output to be off:
-
-$ env TERM=dumb cal
-   December 2005
-Su Mo Tu We Th Fr Sa
-             1  2  3
- 4  5  6  7  8  9 10
-111 13 14 15 16 17
-18 19 20 21 22 23 24
-25 26 27 28 29 30 31
-
-http://bugs.gentoo.org/112406
-
---- util-linux/misc-utils/cal.c
-+++ util-linux/misc-utils/cal.c
-@@ -89,7 +89,8 @@
- 
- static char *
- my_tgetstr(char *s, char *ss) {
--     return tigetstr(ss);
-+     char *ret = tigetstr(ss);
-+     return (ret == NULL ? "" : ret);
- }
- 
- #elif defined(HAVE_termcap)
-@@ -112,7 +113,8 @@
- 
- static char *
- my_tgetstr(char *s, char *ss) {
--     return tgetstr(s, &strbuf);
-+     char *ret = tgetstr(s, &strbuf);
-+     return (ret == NULL ? "" : ret);
- }
- 
- #endif
diff --git a/sys-apps/util-linux/files/util-linux-2.12r-cracklib-words.patch b/sys-apps/util-linux/files/util-linux-2.12r-cracklib-words.patch
deleted file mode 100644
index 30bc7e0be12a..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12r-cracklib-words.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- misc-utils/look.c
-+++ misc-utils/look.c
-@@ -137,7 +137,15 @@
- 		*++p = '\0';
- 
- 	if ((fd = open(file, O_RDONLY, 0)) < 0 || fstat(fd, &sb))
--		err("%s: %s", file, strerror(errno));
-+	{
-+		/* if opening the primary file failed, fall back to cracklib word files */
-+		file = "/usr/share/dict/cracklib-words";
-+		if ((fd = open(file, O_RDONLY, 0)) < 0 || fstat(fd, &sb)) {
-+			file = "/usr/share/dict/cracklib-small";
-+			if ((fd = open(file, O_RDONLY, 0)) < 0 || fstat(fd, &sb))
-+				err("%s: %s\n\tplease emerge sys-apps/cracklib-words or sys-apps/miscfiles", file, strerror(errno));
-+		}
-+	}
- 	front = mmap(NULL, (size_t) sb.st_size, PROT_READ,
- #ifdef MAP_FILE
- 		     MAP_FILE |
diff --git a/sys-apps/util-linux/files/util-linux-2.12r-fdisk-frame-pointers.patch b/sys-apps/util-linux/files/util-linux-2.12r-fdisk-frame-pointers.patch
deleted file mode 100644
index 1ad291665003..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12r-fdisk-frame-pointers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- fdisk/Makefile.orig	2005-10-15 14:30:56.000000000 +0000
-+++ fdisk/Makefile	2005-10-15 14:33:02.000000000 +0000
-@@ -6,6 +6,9 @@
- include ../make_include
- include ../MCONFIG
- 
-+# fdisk when built with ssp and omiting -fomit-frame-pointer causes fdisk/cfdisk/sfdisk to not see the device
-+CFLAGS += -fno-omit-frame-pointer
-+
- MAN8=
- SBIN=
- CFDISK=cfdisk
diff --git a/sys-apps/util-linux/files/util-linux-2.12r-no-_syscall.patch b/sys-apps/util-linux/files/util-linux-2.12r-no-_syscall.patch
deleted file mode 100644
index fb5ab38b62b7..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12r-no-_syscall.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-newer kernel headers stop exporting _syscall#() macro's, so let's insert
-some workarounds to handle this ...
-
-util-linux-2.13 doesnt use _syscall#() anymore
-
-http://bugs.gentoo.org/150852
-
---- lib/my-syscall.h
-+++ lib/my-syscall.h
-@@ -0,0 +1,12 @@
-+#ifndef __MY_SYSCALL_H__
-+#define __MY_SYSCALL_H__
-+
-+#ifndef _syscall5
-+# define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
-+type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \
-+{ \
-+	return (type) syscall(__NR_##name, arg1, arg2, arg3, arg4, arg5); \
-+}
-+#endif
-+
-+#endif
---- fdisk/llseek.c
-+++ fdisk/llseek.c
-@@ -10,6 +10,8 @@
- #include <errno.h>
- #include <unistd.h>
- 
-+#include "my-syscall.h"
-+
- extern long long ext2_llseek (unsigned int, long long, unsigned int);
- 
- #ifdef __linux__
---- fdisk/sfdisk.c
-+++ fdisk/sfdisk.c
-@@ -177,6 +177,7 @@
- #endif
- 
- #ifndef use_lseek
-+#include <my-syscall.h>
- static __attribute__used
- _syscall5(int,  _llseek,  unsigned int,  fd, ulong, hi, ulong, lo,
-        loff_t *, res, unsigned int, wh);
---- partx/partx.c
-+++ partx/partx.c
-@@ -339,6 +339,7 @@
- 
- #ifdef NEED__llseek
- #include <linux/unistd.h>       /* _syscall */
-+#include "../lib/my-syscall.h"
- static
- _syscall5(int,  _llseek,  uint,  fd, ulong, hi, ulong, lo,
- 	  long long *, res, uint, wh);
diff --git a/sys-apps/util-linux/files/util-linux-2.12r-umount-no-special.patch b/sys-apps/util-linux/files/util-linux-2.12r-umount-no-special.patch
deleted file mode 100644
index 2d2c1cfd5248..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12r-umount-no-special.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mount/umount.c
-+++ mount/umount.c
-@@ -31,7 +31,7 @@
- #include <arpa/inet.h>
- #endif
- 
--#if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__)
-+#if defined(MNT_FORCE)
- /* Interesting ... it seems libc knows about MNT_FORCE and presumably
-    about umount2 as well -- need not do anything */
- #else /* MNT_FORCE */
diff --git a/sys-apps/util-linux/files/util-linux-2.12r-umount-nosysfs.patch b/sys-apps/util-linux/files/util-linux-2.12r-umount-nosysfs.patch
deleted file mode 100644
index eb0d40599eff..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12r-umount-nosysfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- util-linux-2.12r/mount/umount.c.orig	2006-03-03 11:29:57.000000000 -0500
-+++ util-linux-2.12r/mount/umount.c	2006-03-03 11:30:07.000000000 -0500
-@@ -724,7 +724,7 @@
- 	if (all) {
- 		/* nodev stuff: sysfs, usbfs, oprofilefs, ... */
- 		if (types == NULL)
--			types = "noproc,nodevfs,nodevpts";
-+			types = "noproc,nodevfs,nodevpts,nosysfs";
- 		result = umount_all (types, test_opts);
- 	} else if (argc < 1) {
- 		usage (stderr, 2);