1 |
commit: 678f59a490af99a86579cc746ba77969e952c464 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Apr 8 17:05:45 2018 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 8 18:20:49 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=678f59a4 |
7 |
|
8 |
sys-apps/busybox: remove unused patches |
9 |
|
10 |
sys-apps/busybox/files/busybox-1.19.0-bb.patch | 22 -------------- |
11 |
.../busybox/files/busybox-1.25.1-setfiles.patch | 34 ---------------------- |
12 |
2 files changed, 56 deletions(-) |
13 |
|
14 |
diff --git a/sys-apps/busybox/files/busybox-1.19.0-bb.patch b/sys-apps/busybox/files/busybox-1.19.0-bb.patch |
15 |
deleted file mode 100644 |
16 |
index a66b45a5e21..00000000000 |
17 |
--- a/sys-apps/busybox/files/busybox-1.19.0-bb.patch |
18 |
+++ /dev/null |
19 |
@@ -1,22 +0,0 @@ |
20 |
---- a/shell/ash.c |
21 |
-+++ b/shell/ash.c |
22 |
-@@ -75,6 +75,8 @@ |
23 |
- //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP)) |
24 |
- //applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, sh)) |
25 |
- //applet:IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, BB_SUID_DROP, bash)) |
26 |
-+//applet:IF_ASH(APPLET_ODDNAME(bb, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) |
27 |
-+//applet:IF_ASH(APPLET_ODDNAME(bbsh, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) |
28 |
- |
29 |
- //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o |
30 |
- //kbuild:lib-$(CONFIG_ASH_RANDOM_SUPPORT) += random.o |
31 |
---- a/shell/ash.c |
32 |
-+++ b/shell/ash.c |
33 |
-@@ -7255,6 +7255,8 @@ |
34 |
- } |
35 |
- /* re-exec ourselves with the new arguments */ |
36 |
- execve(bb_busybox_exec_path, argv, envp); |
37 |
-+ execve("/bin/busybox.static", argv, envp); |
38 |
-+ execve("/bin/busybox", argv, envp); |
39 |
- /* If they called chroot or otherwise made the binary no longer |
40 |
- * executable, fall through */ |
41 |
- } |
42 |
|
43 |
diff --git a/sys-apps/busybox/files/busybox-1.25.1-setfiles.patch b/sys-apps/busybox/files/busybox-1.25.1-setfiles.patch |
44 |
deleted file mode 100644 |
45 |
index 3a5f5ed9d3a..00000000000 |
46 |
--- a/sys-apps/busybox/files/busybox-1.25.1-setfiles.patch |
47 |
+++ /dev/null |
48 |
@@ -1,34 +0,0 @@ |
49 |
-From c1704a34745f8e49373eb2cbe1c83199ab2d0091 Mon Sep 17 00:00:00 2001 |
50 |
-From: Mike Frysinger <vapier@g.o> |
51 |
-Date: Fri, 9 Dec 2016 18:14:12 -0500 |
52 |
-Subject: [PATCH] setfiles: fix build failure after common_bufsiz change |
53 |
- |
54 |
-Commit 47cfbf32fd66563f8c4e09ad6cced6abfbe2fad5 ("*: add most of the |
55 |
-required setup_common_bufsiz() calls") switched this tool over to use |
56 |
-the common_bufsiz logic but missed including the header leading to a |
57 |
-build failure when enabled: |
58 |
-selinux/setfiles.c:80:30: error: 'bb_common_bufsiz1' undeclared (first use in this function) |
59 |
- |
60 |
-URL: https://bugs.gentoo.org/600106 |
61 |
-Reported-by: Jonas Jelten <jj@××××××.net> |
62 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
63 |
-(cherry picked from commit 1cda8790803a6fb072375c8fa53273333d2d4607) |
64 |
---- |
65 |
- selinux/setfiles.c | 1 + |
66 |
- 1 file changed, 1 insertion(+) |
67 |
- |
68 |
-diff --git a/selinux/setfiles.c b/selinux/setfiles.c |
69 |
-index 51a7e63bd741..d8083d4fd580 100644 |
70 |
---- a/selinux/setfiles.c |
71 |
-+++ b/selinux/setfiles.c |
72 |
-@@ -46,6 +46,7 @@ |
73 |
- //usage: "\n if it has changed" |
74 |
- |
75 |
- #include "libbb.h" |
76 |
-+#include "common_bufsiz.h" |
77 |
- #if ENABLE_FEATURE_SETFILES_CHECK_OPTION |
78 |
- #include <sepol/sepol.h> |
79 |
- #endif |
80 |
--- |
81 |
-2.11.0.rc2 |
82 |
- |