busybox: add 1.20.2 upstream fixes

From b1cec5003b73080a8aa7ea277621bf1c71c3e8d6 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 fccde4a..3a0a5e1 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 c43c8dc..15dcc1f 100644

--- a/Makefile.flags

+++ b/Makefile.flags

@@ -74,6 +74,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)

@@ -85,6 +91,7 @@ endif

 ifeq ($(CONFIG_STATIC),y)

 CFLAGS_busybox += -static

+PKG_CONFIG_FLAGS += --static

 endif

 ifeq ($(CONFIG_PIE),y)

@@ -127,7 +134,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

From 5a5dfcad6ba96d12d68bd7b39279215a8fee70d3 Mon Sep 17 00:00:00 2001

From: Tias Guns <tias@ulyssis.org>

Date: Sun, 10 Jun 2012 14:19:01 +0200

Subject: [PATCH] inetd: fix build failure in Android

Signed-off-by: Tias Guns <tias@ulyssis.org>

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

(cherry picked from commit 64f763b42a43cbf36e401690ff6767c25575e520)

---

 networking/inetd.c | 1 +

 1 file changed, 1 insertion(+)

-- 

1.7.12

From 246ea72843d5b7e9d4cd902dc5e9d71359196303 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>

(cherry picked from commit c5fe9f7b723f949457263ef8e22ab807d5b549ce)

---

 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,8 @@

 //usage:     "\n		(default: 0 - disabled)"

 #include <syslog.h>

+#include <sys/resource.h> /* setrlimit */

+#include <sys/socket.h> /* un.h may need this */

 #include <sys/un.h>

 #include "libbb.h"

diff --git a/networking/ntpd.c b/networking/ntpd.c

index 603801e..b885215 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.12