Drop unused patches too.

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

8 files changed, 8 insertions, 223 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 72f24a73a1ee..9ad05c752b94 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.350 2013/09/11 14:00:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.351 2013/09/12 04:03:42 vapier Exp $
+
+  12 Sep 2013; Mike Frysinger <vapier@gentoo.org>
+  -files/busybox-1.19.3-getty.patch, -files/busybox-1.19.3-kernel-nfs.patch,
+  -files/busybox-1.19.3-modinfo.patch, -files/busybox-1.20.0-buildsys.patch,
+  -files/busybox-1.20.0-getty.patch, -files/busybox-1.20.0-lineedit.patch,
+  -files/busybox-1.20.0-sed.patch:
+  Drop unused patches too.
 
   11 Sep 2013; Agostino Sarubbo <ago@gentoo.org> busybox-1.21.0.ebuild:
   Stable for amd64, wrt bug #461372
diff --git a/sys-apps/busybox/files/busybox-1.19.3-getty.patch b/sys-apps/busybox/files/busybox-1.19.3-getty.patch
deleted file mode 100644
index 84dad6f1bc51..000000000000
--- a/sys-apps/busybox/files/busybox-1.19.3-getty.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- busybox-1.19.3/loginutils/getty.c
-+++ busybox-1.19.3-getty/loginutils/getty.c
-@@ -271,7 +271,9 @@ static void termios_init(int speed)
- #ifdef CMSPAR
- 		| CMSPAR  /* mark or space parity */
- #endif
-+#ifdef CBAUD
- 		| CBAUD   /* (output) baud rate */
-+#endif
- #ifdef CBAUDEX
- 		| CBAUDEX /* (output) baud rate */
- #endif
diff --git a/sys-apps/busybox/files/busybox-1.19.3-kernel-nfs.patch b/sys-apps/busybox/files/busybox-1.19.3-kernel-nfs.patch
deleted file mode 100644
index 708940086833..000000000000
--- a/sys-apps/busybox/files/busybox-1.19.3-kernel-nfs.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From a86e02492d7700ce8cb4108f53646dfb025c2dff Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <vda.linux@googlemail.com>
-Date: Thu, 10 Nov 2011 16:53:35 +0100
-Subject: [PATCH] mount: make FEATURE_MOUNT_NFS not needed for Linux 2.6.23+
-
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- util-linux/Config.src |   11 ++++++++---
- util-linux/mount.c    |   47 +++++++++++++++++++++++++++++++++++++++++------
- 2 files changed, 49 insertions(+), 9 deletions(-)
-
-diff --git a/util-linux/Config.src b/util-linux/Config.src
-index 888bc8f..57a52ce 100644
---- a/util-linux/Config.src
-+++ b/util-linux/Config.src
-@@ -485,13 +485,18 @@ config FEATURE_MOUNT_LABEL
- 	  This also enables label or uuid support for swapon.
- 
- config FEATURE_MOUNT_NFS
--	bool "Support mounting NFS file systems"
--	default y
-+	bool "Support mounting NFS file systems on Linux < 2.6.23"
-+	default n
- 	depends on MOUNT
- 	select FEATURE_HAVE_RPC
- 	select FEATURE_SYSLOG
- 	help
--	  Enable mounting of NFS file systems.
-+	  Enable mounting of NFS file systems on Linux kernels prior
-+	  to version 2.6.23. Note that in this case mounting of NFS
-+	  over IPv6 will not be possible.
-+
-+	  Note that this option links in RPC support from libc,
-+	  which is rather large (~10 kbytes on uclibc).
- 
- config FEATURE_MOUNT_CIFS
- 	bool "Support mounting CIFS/SMB file systems"
-diff --git a/util-linux/mount.c b/util-linux/mount.c
-index 1dd4c0c..7ae1981 100644
---- a/util-linux/mount.c
-+++ b/util-linux/mount.c
-@@ -1144,7 +1144,7 @@ static NOINLINE int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
- 	pathname = s + 1;
- 	*s = '\0';
- 	/* Ignore all but first hostname in replicated mounts
--	   until they can be fully supported. (mack@sgi.com) */
-+	 * until they can be fully supported. (mack@sgi.com) */
- 	s = strchr(hostname, ',');
- 	if (s) {
- 		*s = '\0';
-@@ -1683,7 +1683,6 @@ static NOINLINE int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
- 
- 	/* Perform actual mount */
-  do_mount:
--	mp->mnt_type = (char*)"nfs";
- 	retval = mount_it_now(mp, vfsflags, (char*)&data);
- 	goto ret;
- 
-@@ -1708,8 +1707,43 @@ static NOINLINE int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
- 
- #else // !ENABLE_FEATURE_MOUNT_NFS
- 
--// Never called. Call should be optimized out.
--int nfsmount(struct mntent *mp, long vfsflags, char *filteropts);
-+/* Linux 2.6.23+ supports nfs mounts with options passed as a string.
-+ * For older kernels, you must build busybox with ENABLE_FEATURE_MOUNT_NFS.
-+ * (However, note that then you lose any chances that NFS over IPv6 would work).
-+ */
-+static int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
-+{
-+	len_and_sockaddr *lsa;
-+	char *opts;
-+	char *end;
-+	char *dotted;
-+	int ret;
-+
-+# if ENABLE_FEATURE_IPV6
-+	end = strchr(mp->mnt_fsname, ']');
-+	if (end && end[1] == ':')
-+		end++;
-+	else
-+# endif
-+		/* mount_main() guarantees that ':' is there */
-+		end = strchr(mp->mnt_fsname, ':');
-+
-+	*end = '\0';
-+	lsa = xdotted2sockaddr(mp->mnt_fsname, /*port:*/ 0);
-+	*end = ':';
-+	dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
-+	if (ENABLE_FEATURE_CLEAN_UP) free(lsa);
-+	opts = xasprintf("%s%saddr=%s",
-+		filteropts ? filteropts : "",
-+		filteropts ? "," : "",
-+		dotted
-+	);
-+	if (ENABLE_FEATURE_CLEAN_UP) free(dotted);
-+	ret = mount_it_now(mp, vfsflags, opts);
-+	if (ENABLE_FEATURE_CLEAN_UP) free(opts);
-+
-+	return ret;
-+}
- 
- #endif // !ENABLE_FEATURE_MOUNT_NFS
- 
-@@ -1800,10 +1834,11 @@ static int singlemount(struct mntent *mp, int ignore_busy)
- 	}
- 
- 	// Might this be an NFS filesystem?
--	if (ENABLE_FEATURE_MOUNT_NFS
--	 && (!mp->mnt_type || strcmp(mp->mnt_type, "nfs") == 0)
-+	if ((!mp->mnt_type || strncmp(mp->mnt_type, "nfs", 3) == 0)
- 	 && strchr(mp->mnt_fsname, ':') != NULL
- 	) {
-+		if (!mp->mnt_type)
-+			mp->mnt_type = (char*)"nfs";
- 		rc = nfsmount(mp, vfsflags, filteropts);
- 		goto report_error;
- 	}
--- 
-1.7.6.1
-
diff --git a/sys-apps/busybox/files/busybox-1.19.3-modinfo.patch b/sys-apps/busybox/files/busybox-1.19.3-modinfo.patch
deleted file mode 100644
index 9dd5c103a591..000000000000
--- a/sys-apps/busybox/files/busybox-1.19.3-modinfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- busybox-1.19.3/modutils/modinfo.c
-+++ busybox-1.19.3-modinfo/modutils/modinfo.c
-@@ -13,6 +13,7 @@
- //config:config MODINFO
- //config:	bool "modinfo"
- //config:	default y
-+//config:	select PLATFORM_LINUX
- //config:	help
- //config:	  Show information about a Linux Kernel module
- 
diff --git a/sys-apps/busybox/files/busybox-1.20.0-buildsys.patch b/sys-apps/busybox/files/busybox-1.20.0-buildsys.patch
deleted file mode 100644
index b9d2a5e83539..000000000000
--- a/sys-apps/busybox/files/busybox-1.20.0-buildsys.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- busybox-1.20.0/archival/libarchive/Kbuild.src
-+++ busybox-1.20.0-buildsys/archival/libarchive/Kbuild.src
-@@ -60,7 +60,7 @@ lib-$(CONFIG_FEATURE_SEAMLESS_GZ)
- lib-$(CONFIG_FEATURE_SEAMLESS_BZ2)      += open_transformer.o decompress_bunzip2.o
- lib-$(CONFIG_FEATURE_SEAMLESS_LZMA)     += open_transformer.o decompress_unlzma.o
- lib-$(CONFIG_FEATURE_SEAMLESS_XZ)       += open_transformer.o decompress_unxz.o
--lib-$(CONFIG_FEATURE_COMPRESS_USAGE)    += decompress_bunzip2.o
-+lib-$(CONFIG_FEATURE_COMPRESS_USAGE)    += open_transformer.o decompress_bunzip2.o
- lib-$(CONFIG_FEATURE_COMPRESS_BBCONFIG) += decompress_bunzip2.o
- lib-$(CONFIG_FEATURE_TAR_TO_COMMAND)    += data_extract_to_command.o
- 
diff --git a/sys-apps/busybox/files/busybox-1.20.0-getty.patch b/sys-apps/busybox/files/busybox-1.20.0-getty.patch
deleted file mode 100644
index ed52159ffe23..000000000000
--- a/sys-apps/busybox/files/busybox-1.20.0-getty.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- busybox-1.20.0/loginutils/getty.c
-+++ busybox-1.20.0-getty/loginutils/getty.c
-@@ -561,8 +561,14 @@ int getty_main(int argc UNUSED_PARAM, ch
- 		 */
- 		fd = open("/dev/tty", O_RDWR | O_NONBLOCK);
- 		if (fd >= 0) {
-+			/* TIOCNOTTY sends SIGHUP to the foreground
-+			 * process group - which may include us!
-+			 * Make sure to not die on it:
-+			 */
-+			sighandler_t old = signal(SIGHUP, SIG_IGN);
- 			ioctl(fd, TIOCNOTTY);
- 			close(fd);
-+			signal(SIGHUP, old);
- 		}
- 	}
- 
diff --git a/sys-apps/busybox/files/busybox-1.20.0-lineedit.patch b/sys-apps/busybox/files/busybox-1.20.0-lineedit.patch
deleted file mode 100644
index ee236ffc8904..000000000000
--- a/sys-apps/busybox/files/busybox-1.20.0-lineedit.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- busybox-1.20.0/libbb/lineedit.c
-+++ busybox-1.20.0-lineedit/libbb/lineedit.c
-@@ -1352,8 +1352,7 @@ static void load_history(line_input_t *s
- 		/* fill temp_h[], retaining only last MAX_HISTORY lines */
- 		memset(temp_h, 0, sizeof(temp_h));
- 		idx = 0;
--		if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT)
--			st_parm->cnt_history_in_file = 0;
-+		st_parm->cnt_history_in_file = 0;
- 		while ((line = xmalloc_fgetline(fp)) != NULL) {
- 			if (line[0] == '\0') {
- 				free(line);
-@@ -1361,8 +1360,7 @@ static void load_history(line_input_t *s
- 			}
- 			free(temp_h[idx]);
- 			temp_h[idx] = line;
--			if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT)
--				st_parm->cnt_history_in_file++;
-+			st_parm->cnt_history_in_file++;
- 			idx++;
- 			if (idx == st_parm->max_history)
- 				idx = 0;
diff --git a/sys-apps/busybox/files/busybox-1.20.0-sed.patch b/sys-apps/busybox/files/busybox-1.20.0-sed.patch
deleted file mode 100644
index 70dc63f46754..000000000000
--- a/sys-apps/busybox/files/busybox-1.20.0-sed.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- busybox-1.20.0/editors/sed.c
-+++ busybox-1.20.0-sed/editors/sed.c
-@@ -743,7 +743,7 @@ static int do_subst_command(sed_cmd_t *s
- 		 */
- 		if (!G.regmatch[0].rm_so && !G.regmatch[0].rm_eo && match_count) {
- 			pipe_putc(*line++);
--			continue;
-+			goto next;
- 		}
- 
- 		match_count++;
-@@ -755,7 +755,7 @@ static int do_subst_command(sed_cmd_t *s
- 		) {
- 			for (i = 0; i < G.regmatch[0].rm_eo; i++)
- 				pipe_putc(*line++);
--			continue;
-+			goto next;
- 		}
- 
- 		/* print everything before the match */
-@@ -773,7 +773,7 @@ static int do_subst_command(sed_cmd_t *s
- 		/* if we're not doing this globally, get out now */
- 		if (sed_cmd->which_match != 0)
- 			break;
--
-+ next:
- 		if (*line == '\0')
- 			break;
-