diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-10 17:26:49 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-10 17:26:49 +0100 |
| commit | 6957f5c65b02bba533954eabc0b62f5de36be206 (patch) | |
| tree | 21d8ab8f61dffd9cccc82d0badb68982516a6855 /sys-apps/busybox | |
| parent | e91a1aaa5ec8fab37f0fd082ac6024d41c6651e2 (diff) | |
gentoo resync : 10.04.2018
Diffstat (limited to 'sys-apps/busybox')
| -rw-r--r-- | sys-apps/busybox/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/busybox/files/busybox-1.19.0-bb.patch | 22 | ||||
| -rw-r--r-- | sys-apps/busybox/files/busybox-1.25.1-setfiles.patch | 34 |
3 files changed, 0 insertions, 58 deletions
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index e44c0328f19f..c2ac7ab8e31b 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -1,5 +1,3 @@ -AUX busybox-1.19.0-bb.patch 908 BLAKE2B fa4db200bcfa7d4a650c98157b02ca119348d2a28503f2538246787783dc0544678f4cb9c369406958a9b0b1ecf9dc838a5e6cf3053aa782de1055df4b586ba2 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c -AUX busybox-1.25.1-setfiles.patch 1153 BLAKE2B 3f7b2bbbc97e36908ae2045bdebc17fc1ebdefa7e4c134ef35e7e1a56df143eafed69cb0eff5713a41bac88cb09652dc6e39cce96d9d990091de1636397dff52 SHA512 2b3b4aba3be49437b1875ce00887e385abae275cc269ca0e80af797a6a6acfa2f20ea4bcf195e67490d8fe691c1ca7493adbf7e097bd4f6f0e1d7e07e493dca4 AUX busybox-1.26.2-bb.patch 2416 BLAKE2B 2e227c11b0fd5558bfdb91a2d8bf3fd73e348e7efff9ecc6820e9ecd92047ffe4e94fe8f2aa864db87a3f081c2e3ff599546563fff83c78fc36a44fafc559de6 SHA512 cb767a613ede504a7b1a87da3270992ffa44d3b6f76eebefceffc8a5a49119a99333c482420efab9d1e5a92a26280376c7e9ec62fcb2193d9172f4e7bc19f50e AUX ginit.c 3097 BLAKE2B 77a9382dfa5dabc7541fab85fe211760604c757c3f2c5e49556d0ae9e82239833d21eb8954f595ebf814925d3508a5016701344985c6ef15e6f3d23ea675f646 SHA512 8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c AUX klogd.confd 218 BLAKE2B e4c814e673dc4fa555bca9cf2065659facbb4878b4a794a56c18366be3077944bf15b1dcf665d83e7ab53a279e23a0cdc1ea8dd01399bb6747247c9bb0d65da3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f 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 a66b45a5e21d..000000000000 --- 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 3a5f5ed9d3a6..000000000000 --- 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 <vapier@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 <jj@stusta.net> -Signed-off-by: Mike Frysinger <vapier@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 - |