patches: Drop patch similar to a change upstream

https://git.busybox.net/busybox/commit/coreutils/uname.c?id=64ed5f0d3c5eefbb208d4a334654834c78be2cbd

2 files changed, 2 insertions, 58 deletions

diff --git a/changelog b/changelog
index 6da6869..bc5e8e8 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,8 @@
 busybox (1.32.0-1) trunk
 
   * New upstream release.
-    - Drop patches that came from upstream.
+    - Drop patches that came from upstream or are similar to ones
+      applied upstream.
   * Manage all applet links with update-alternatives.
   * /etc/init.d/networking: Write directly to </var/run/net-ifaces>
     instead of </etc/network/interfaces>.  Users should now edit
diff --git a/patches/03_make-uname-info-os-configurable.patch b/patches/03_make-uname-info-os-configurable.patch
deleted file mode 100644
index 6278040..0000000
--- a/patches/03_make-uname-info-os-configurable.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Author: "P. J. McDermott" <pj@pehjota.net>
-Subject: uname: Make uname_info.os configurable.
-
-This thread reminded me to make this correction:
-  http://lists.busybox.net/pipermail/busybox/2013-September/079749.html
-
-diff -Naur src.orig/coreutils/Config.src src/coreutils/Config.src
---- src.orig/coreutils/Config.src	2013-05-11 19:30:43.000000000 -0400
-+++ src/coreutils/Config.src	2013-09-20 17:49:16.357733865 -0400
-@@ -673,6 +673,16 @@
- 	help
- 	  uname is used to print system information.
- 
-+config FEATURE_UNAME_OS
-+	string "Operating system name"
-+	default "BusyBox/Linux"
-+	depends on UNAME
-+	help
-+	  This is the operating system name as reported with the -o and -a
-+	  options.
-+
-+	  This should be changed if BusyBox isn't your main userspace.
-+
- config UNEXPAND
- 	bool "unexpand"
- 	default y
-diff -Naur src.orig/coreutils/uname.c src/coreutils/uname.c
---- src.orig/coreutils/uname.c	2013-05-11 19:30:43.000000000 -0400
-+++ src/coreutils/uname.c	2013-09-20 18:12:05.186067343 -0400
-@@ -62,7 +62,8 @@
- //usage:
- //usage:#define uname_example_usage
- //usage:       "$ uname -a\n"
--//usage:       "Linux debian 2.4.23 #2 Tue Dec 23 17:09:10 MST 2003 i686 GNU/Linux\n"
-+//usage:       "Linux debian 2.4.23 #2 Tue Dec 23 17:09:10 MST 2003 i686 "
-+//usage:       CONFIG_FEATURE_UNAME_OS "\n"
- 
- #include "libbb.h"
- /* After libbb.h, since it needs sys/types.h on some systems */
-@@ -72,7 +72,7 @@
- 	struct utsname name;
- 	char processor[sizeof(((struct utsname*)NULL)->machine)];
- 	char platform[sizeof(((struct utsname*)NULL)->machine)];
--	char os[sizeof("GNU/Linux")];
-+	char os[sizeof(CONFIG_FEATURE_UNAME_OS)];
- } uname_info_t;
- 
- static const char options[] ALIGN1 = "snrvmpioa";
-@@ -139,7 +139,7 @@
- #endif
- 	strcpy(uname_info.processor, unknown_str);
- 	strcpy(uname_info.platform, unknown_str);
--	strcpy(uname_info.os, "GNU/Linux");
-+	strcpy(uname_info.os, CONFIG_FEATURE_UNAME_OS);
- #if 0
- 	/* Fedora does something like this */
- 	strcpy(uname_info.processor, uname_info.name.machine);