sys-apps/busybox: remove uneeded patches

Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 14 insertions, 193 deletions

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index a3b867b..2210bc1 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -2,8 +2,6 @@
 Hash: SHA256
 
 AUX busybox-1.19.0-bb.patch 908 SHA256 98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c WHIRLPOOL b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8
-AUX busybox-1.20.2-glibc-sys-resource.patch 3054 SHA256 03d64c3b864fc5caa9ec56e3d2bf3bcd43801ee82e27332dbfe412138c9502d7 SHA512 c895d7ad0bf379b3ff1c4114af7f8fe0d53b1e60371ac1faaaf3434c293e125be4d79a6ee17d1aa2a923629b09416b833dd3408b9b4dabf56dd74d630c24e9ff WHIRLPOOL ff3e347035a4eb500762d59e35ff8cd2a91130de1c73b0666331f62fc19c586646fd713814e6712d53449d484fc2479ec0e5c29dfe3a19feb2163350a9171fac
-AUX busybox-1.20.2-selinux-pkg-config.patch 2009 SHA256 09d34cafa860cfabfb6911b087fa5887dd7f8b0026955654904fdb79d5281e76 SHA512 7b9b5cfc890d6c751727c6873df66ada967973786a2056a33e76663358aefe2d5828b366f6ce85b573bc01737426a1019dd2f0177caceef9dfac32904ee01d84 WHIRLPOOL fef2b477065ed309298788e35b82fd77d3297eb52eb59f065ebb9c631ec4a3f849ef99a014bdf682469ee1e8683debc312993faf1ad094e2f9afd8ce99c955aa
 AUX busybox-ntpd.confd 186 SHA256 4bff7f5c66f4eece52e4381fd2706e591f10eb50f3c3a4132344d34150dc54de SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8 WHIRLPOOL a1b228ae22c61de6ecc7fa58edcd4c3941b3762a45fcc38d05bd1c9428bc553b1a158c101d65a99ba63d4bc19b269e834b3f0eba40a5a1c81e0ae876a2ecb42c
 AUX busybox-ntpd.initd 602 SHA256 95383156f6f417719bd4d5655e9291e2e7a3e9fa815329eb60c2b911e79f859b SHA512 6aff8dc4e7740f58f1d43aafd1aca22fecb9f138ec155e4a1bae43a214007e06d92bc648bf965f08fc151b00cc97c32f24bf0691847a79e684f3972ee7356d82 WHIRLPOOL 0b09ae03d45d9af92bda0f0f716c3c112c1be353e229fbe8d84614d87b844bc130d5d5cdb819d496382d943e584cca347465cc4139a9ed2d57212de85805d0bc
 AUX busybox-sysklogd.confd 319 SHA256 41a7dcb89156a80387a56579757e3a9f0f87ae4e0e955997e31092ab015a3152 SHA512 c9ddc5bec07c76b1ac4b3ceeb9dcdbaa96ef0791bc3a699b7cf1645d2765d74f5bb105e4d7912d67d8af0bf02e8447b6771edd789a05c7e4d9afeaf3a45896d2 WHIRLPOOL 6f2b18cea47118bfae04ecf932e62464a8574db1a2f45c5d4cb6d7a2352a117865bfffff9e367b51701c15103ef5a68f4b27a83b1e179ddfecb8529f68eb4038
@@ -18,22 +16,22 @@ AUX mdev/dvbdev 356 SHA256 ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e20141
 AUX mdev/ide_links 440 SHA256 3fccc9ee437e3dcc8ac73bfe3713334a7156a112fe442e052fff4f26ff0f6a88 SHA512 0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec WHIRLPOOL ce02358a65ad2beeab12485379e322736c7b6b58ff44a20b880d9bab8806e04890a385b94228f2db685150dfe0a3c716f842ce5c1c7f579c8208ab4e9a6ae852
 AUX mdev/usbdev 1624 SHA256 113ecaa722fa1f4e1c76489e2a7b24099778615a5bccd443aa9cbab28c6d05d0 SHA512 f2d98050eeeb2fbb299298e221f47182a74ed901d2c8c848aa297ebd461c62c30d2fb968bb3eb723a6d9c268fac4a3c40a18aa59ed934043d42c38a1f6b9f5a2 WHIRLPOOL 9b773cb41827bf5777061ec7ed432315bc5bf070768a44ceec7c893af2266d8c06ea4c061711b2696a8228d72c7222fbf52d26fb92b4112158716727b3bc1e38
 AUX mdev/usbdisk_link 984 SHA256 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858 SHA512 392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 WHIRLPOOL 439e0c86e312e685bce1f7a4a67f709c4556de69b40112d97d6a376bc7da9d73e794663d06097f721173d97bf4f671ddbb4d0c4838db604e7cd13d2c531ede19
-EBUILD busybox-9999.ebuild 9415 SHA256 57b91eeb0b135ce4f2e518e1beb5fbd1939e2b9240937efef86154da5b472612 SHA512 0335dee69882fb84a779aca4f32fe3d9d2511490b7ad35e245c7d7460ad68af67b6638dddc747e46ba30b3287d346a634a46ae827459ddd3c7a2b2e41492f49e WHIRLPOOL 29116f0016ec7c2e1244d6c655337cced07fd4b909afdedd911afd73d8cb7fc92e6e4873d30a78f5080e7cf1b7409d5d2b00567bc52f017935e33c2d0dd141e2
+EBUILD busybox-9999.ebuild 9380 SHA256 5eb471a98e5a2bc00d135004f7a2f92d9f8ce45f138d2461c8a622b30b608f5a SHA512 5559b25e7353e3a9d9bf4a0fc439cdff629182f763ef24342cdb076a4c2f2013c6ea2aac17475a84bb870287ad0007475cd0a1d35b39818cdeefa4021ba556d0 WHIRLPOOL 1c46244d253d7f0f47dda8ed59b477b6e8596178d6d7ebfc2737b67260f06ded67ba520e1d7ee3ab5d42c9c9a5aa485d211b763a5a437d2fd6684023d6f61533
 MISC metadata.xml 856 SHA256 96bd35614f2246ff9fbbcc5a3e78f524160279cb92c073b7bac2d9802e42de1a SHA512 974fa556e606efc3bd65d1486eefb2eefdef001fc882ba2ab436468313d948fe3d0a2701bd302f5107401604f6cdf4bf78f66f9b8f0ddf4be81e55c3958fffc2 WHIRLPOOL 5ccbbb9c8ee41a97074155eec2f602fc126597bf2030f9ae1c5ad8289e6765586ac83e6e1b58e9e411b20debb3fda959f58da8141948d60b5438a47ff24dcc06
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQuWwaAAoJEJOE+m71LUu6RXEP/2exxbdryvRbkhdUZfm9+Ea0
-vtOeuh0e6rJxv+i1ng9hxy0s7DRVrBRMRS8Vby3pnOGOQ/Fl3jWP88U5ptT8P2lv
-azPF77DpYf83bcRh/oI5YnW50aXyMVh21ro5jAMfCoto8Cdp0WLPKW0B3r8bQNQ6
-/DCMrdmiriI614PgkflErrEC6JqehyqSP9zvH8ZagMIpp8ZWhBLCriskJMJTFK73
-wtqZRhvYiHZL2QzaIMxsJh9ZOv3yfOmK+ogFeO5ZOppNN7ITzj3/U15i68w81aND
-6ANEdJH4Opi6viC7GsFtsKPxvCYzRQbh9KGr+Blsgs2zu/b/XUHWhSlpzFCMVQm8
-caaWZq3mEdoXHA9aQXREMi5OcxF+vszcphnMnVNSUrzYjnUtOR5RZJLtGba3V5SK
-8h9IkP5ZkuTJH4zJ3tEhU8i2T+vblhpaj+9JkHcMLjF9rmM57eESSRzniMOs1mG7
-A2QfrpK+G7oKuIVp7o5/NfRH4DUHUr3HUn1G0gElZ9X4RXhcf5JHZ7whBDS3+twi
-XKnBqyXmYf6EXFUjlADD6nb3W8t12msngl0IAXC8jscfyeFgKKogqAYGsQUy3HE9
-gzOG12DgIV2u4sID4pshmYDkUUq/OQp2F5m1sM/u74H+nGxNGtYfQ5WKkO3m1s5v
-V+SSF+KJnr2Ab74xLhK4
-=iqxt
+iQIcBAEBCAAGBQJQuW4+AAoJEJOE+m71LUu69eMP/jroN2ES50KDCEFhpJY5RRkM
+ezhOEwFzDfpRDZD+LYGEwdqeH76d/It7qVArE7utj9lQROJC07eIz0Nz/ogbA1th
+Hlt1YMwiBzC/rTq2JFgpVeOTzzceFGf6xXYGiCx1kw0wRhuvsqLdTJuRL9JAf/Kr
+igR+aIjudp8MI8qqxptMxP5GoL9ADwg5gzZ6il28Xc3hMynLJHDtBzdVzrphczFq
+Icug7TpAqErLZYSLTFvcGM2Im5XN67LPb8FE0W2uoOljwBnfrjO7UZeyNtxjYXnv
+rFbE/Wk7m9auYYEH5mvjYR/7UDPFV8cIglS5pD1/vckcaPAd1nFlDFguQn1QyXnz
+YQv8J3bJ6osj4x2pSwBTnSVS6khSiAjjrVkLE4Ip8Jr3solwKpADJ9I85oMlR1XQ
+LwlZETwmaiRD11mcWGObl/m9AH64P284CYIbpifcfTsHo5VHz7YrUs/QZfKSkpjY
+dk38YpGiorg116TOGpBF4wgr6gaBJ1iEWbb/Trnnxfk+IHUqWNhW9s/H6CkXBd7r
+H3hzE8Y7GrCEoGZuYP8MOM9vIIkn91R5c1R2BapCst77uIreEyo1C/0Q0tA7P2+D
+jGHQIGbV7lhM1BzdPnqw1KZ/tJgaKLD+ORpUDiUpc318DWT0ksOsgqPByrECo8ds
+y33WNPWLWfsrz9tihKOs
+=BghK
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index d19d5cf..922d526 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -88,7 +88,6 @@ src_prepare() {
 
 	# patches go here!
 	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-	epatch "${FILESDIR}"/${P}-*.patch
 	cp "${FILESDIR}"/ginit.c init/ || die
 
 	# flag cleanup
diff --git a/sys-apps/busybox/files/busybox-1.20.2-glibc-sys-resource.patch b/sys-apps/busybox/files/busybox-1.20.2-glibc-sys-resource.patch
deleted file mode 100644
index f682d00..0000000
--- a/sys-apps/busybox/files/busybox-1.20.2-glibc-sys-resource.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-https://bugs.gentoo.org/424954
-
-From c5fe9f7b723f949457263ef8e22ab807d5b549ce Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 5 Jul 2012 23:19:09 -0400
-Subject: [PATCH] include sys/resource.h where needed
-
-We use functions from sys/resource.h in misc applets, but don't include
-the header.  This breaks building with newer glibc versions, so add the
-include where needed.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- loginutils/passwd.c      |    1 +
- miscutils/time.c         |    1 +
- networking/inetd.c       |    1 +
- networking/ntpd.c        |    1 +
- networking/ntpd_simple.c |    1 +
- runit/chpst.c            |    1 +
- shell/shell_common.c     |    1 +
- 7 files changed, 7 insertions(+)
-
-diff --git a/loginutils/passwd.c b/loginutils/passwd.c
-index b83db00..a7006f0 100644
---- a/loginutils/passwd.c
-+++ b/loginutils/passwd.c
-@@ -15,6 +15,7 @@
- 
- #include "libbb.h"
- #include <syslog.h>
-+#include <sys/resource.h> /* setrlimit */
- 
- static void nuke_str(char *str)
- {
-diff --git a/miscutils/time.c b/miscutils/time.c
-index 945f15f..ffed386 100644
---- a/miscutils/time.c
-+++ b/miscutils/time.c
-@@ -16,6 +16,7 @@
- //usage:     "\n	-v	Verbose"
- 
- #include "libbb.h"
-+#include <sys/resource.h> /* getrusage */
- 
- /* Information on the resources used by a child process.  */
- typedef struct {
-diff --git a/networking/inetd.c b/networking/inetd.c
-index 1308d74..00baf69 100644
---- a/networking/inetd.c
-+++ b/networking/inetd.c
-@@ -165,6 +165,7 @@
- //usage:     "\n		(default: 0 - disabled)"
- 
- #include <syslog.h>
-+#include <sys/resource.h> /* setrlimit */
- #include <sys/un.h>
- 
- #include "libbb.h"
-diff --git a/networking/ntpd.c b/networking/ntpd.c
-index 72e9d0b..5b92db6 100644
---- a/networking/ntpd.c
-+++ b/networking/ntpd.c
-@@ -46,6 +46,7 @@
- #include "libbb.h"
- #include <math.h>
- #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
-+#include <sys/resource.h> /* setpriority */
- #include <sys/timex.h>
- #ifndef IPTOS_LOWDELAY
- # define IPTOS_LOWDELAY 0x10
-diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c
-index 4ad44e4..1b7c66b 100644
---- a/networking/ntpd_simple.c
-+++ b/networking/ntpd_simple.c
-@@ -7,6 +7,7 @@
-  */
- #include "libbb.h"
- #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
-+#include <sys/resource.h> /* setpriority */
- #ifndef IPTOS_LOWDELAY
- # define IPTOS_LOWDELAY 0x10
- #endif
-diff --git a/runit/chpst.c b/runit/chpst.c
-index ac296ba..ed72c8b 100644
---- a/runit/chpst.c
-+++ b/runit/chpst.c
-@@ -91,6 +91,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- //usage:     "\n			a SIGXCPU after N seconds"
- 
- #include "libbb.h"
-+#include <sys/resource.h> /* getrlimit */
- 
- /*
- Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
-diff --git a/shell/shell_common.c b/shell/shell_common.c
-index 51c92d6..780e27e 100644
---- a/shell/shell_common.c
-+++ b/shell/shell_common.c
-@@ -18,6 +18,7 @@
-  */
- #include "libbb.h"
- #include "shell_common.h"
-+#include <sys/resource.h> /* getrlimit */
- 
- const char defifsvar[] ALIGN1 = "IFS= \t\n";
- 
--- 
-1.7.9.7
-
diff --git a/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch b/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch
deleted file mode 100644
index 5e9ef26..0000000
--- a/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 5694afd72a0a424fcdd2ac85838229a1a86b7e84 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 20 Oct 2012 15:01:26 -0400
-Subject: [PATCH] build system: use pkg-config to look up selinux libs
-
-Newer versions of libselinux has started linking against more libs.
-Rather than continuing hardcoding things, switch to using pkg-config
-to query for its dependencies.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile       |  1 +
- Makefile.flags | 12 +++++++++++-
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index b2e9477..8995ff5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -297,6 +297,7 @@ NM		= $(CROSS_COMPILE)nm
- STRIP		= $(CROSS_COMPILE)strip
- OBJCOPY		= $(CROSS_COMPILE)objcopy
- OBJDUMP		= $(CROSS_COMPILE)objdump
-+PKG_CONFIG	?= $(CROSS_COMPILE)pkg-config
- AWK		= awk
- GENKSYMS	= scripts/genksyms/genksyms
- DEPMOD		= /sbin/depmod
-diff --git a/Makefile.flags b/Makefile.flags
-index e77c0e5..307afa7 100644
---- a/Makefile.flags
-+++ b/Makefile.flags
-@@ -78,6 +78,12 @@ ARCH_FPIC ?= -fpic
- ARCH_FPIE ?= -fpie
- ARCH_PIE ?= -pie
- 
-+# Usage: $(eval $(call pkg_check_modules,VARIABLE-PREFIX,MODULES))
-+define pkg_check_modules
-+$(1)_CFLAGS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags $(2))
-+$(1)_LIBS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs $(2))
-+endef
-+
- ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y)
- # on i386: 14% smaller libbusybox.so
- # (code itself is 9% bigger, we save on relocs/PLT/GOT)
-@@ -89,6 +95,7 @@ endif
- 
- ifeq ($(CONFIG_STATIC),y)
- CFLAGS_busybox += -static
-+PKG_CONFIG_FLAGS += --static
- endif
- 
- ifeq ($(CONFIG_PIE),y)
-@@ -131,7 +138,10 @@ LDLIBS += pam pam_misc pthread
- endif
- 
- ifeq ($(CONFIG_SELINUX),y)
--LDLIBS += selinux sepol
-+SELINUX_PC_MODULES = libselinux libsepol
-+$(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
-+CPPFLAGS += $(SELINUX_CFLAGS)
-+LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%))
- endif
- 
- ifeq ($(CONFIG_EFENCE),y)
--- 
-1.7.12
-