commit:     678f59a490af99a86579cc746ba77969e952c464
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Apr  8 17:05:45 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 18:20:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=678f59a4

sys-apps/busybox: remove unused patches

 sys-apps/busybox/files/busybox-1.19.0-bb.patch     | 22 --------------
 .../busybox/files/busybox-1.25.1-setfiles.patch    | 34 ----------------------
 2 files changed, 56 deletions(-)

diff --git a/sys-apps/busybox/files/busybox-1.19.0-bb.patch 
b/sys-apps/busybox/files/busybox-1.19.0-bb.patch
deleted file mode 100644
index a66b45a5e21..00000000000
--- a/sys-apps/busybox/files/busybox-1.19.0-bb.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -75,6 +75,8 @@
- //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP))
- //applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, 
BB_SUID_DROP, sh))
- //applet:IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, 
BB_SUID_DROP, bash))
-+//applet:IF_ASH(APPLET_ODDNAME(bb, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
-+//applet:IF_ASH(APPLET_ODDNAME(bbsh, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
- 
- //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o
- //kbuild:lib-$(CONFIG_ASH_RANDOM_SUPPORT) += random.o
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -7255,6 +7255,8 @@
-               }
-               /* re-exec ourselves with the new arguments */
-               execve(bb_busybox_exec_path, argv, envp);
-+              execve("/bin/busybox.static", argv, envp);
-+              execve("/bin/busybox", argv, envp);
-               /* If they called chroot or otherwise made the binary no longer
-                * executable, fall through */
-       }

diff --git a/sys-apps/busybox/files/busybox-1.25.1-setfiles.patch 
b/sys-apps/busybox/files/busybox-1.25.1-setfiles.patch
deleted file mode 100644
index 3a5f5ed9d3a..00000000000
--- a/sys-apps/busybox/files/busybox-1.25.1-setfiles.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c1704a34745f8e49373eb2cbe1c83199ab2d0091 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vap...@gentoo.org>
-Date: Fri, 9 Dec 2016 18:14:12 -0500
-Subject: [PATCH] setfiles: fix build failure after common_bufsiz change
-
-Commit 47cfbf32fd66563f8c4e09ad6cced6abfbe2fad5 ("*: add most of the
-required setup_common_bufsiz() calls") switched this tool over to use
-the common_bufsiz logic but missed including the header leading to a
-build failure when enabled:
-selinux/setfiles.c:80:30: error: 'bb_common_bufsiz1' undeclared (first use in 
this function)
-
-URL: https://bugs.gentoo.org/600106
-Reported-by: Jonas Jelten <j...@stusta.net>
-Signed-off-by: Mike Frysinger <vap...@gentoo.org>
-(cherry picked from commit 1cda8790803a6fb072375c8fa53273333d2d4607)
----
- selinux/setfiles.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/selinux/setfiles.c b/selinux/setfiles.c
-index 51a7e63bd741..d8083d4fd580 100644
---- a/selinux/setfiles.c
-+++ b/selinux/setfiles.c
-@@ -46,6 +46,7 @@
- //usage:     "\n              if it has changed"
- 
- #include "libbb.h"
-+#include "common_bufsiz.h"
- #if ENABLE_FEATURE_SETFILES_CHECK_OPTION
- #include <sepol/sepol.h>
- #endif
--- 
-2.11.0.rc2
-

Reply via email to