tags 701381 + pending thanks Dear maintainer,
I've prepared an NMU for busybox (versioned as 1:1.20.0-8.1) and uploaded it to DELAYED/3. Please feel free to tell me if I should delay it longer. Regards, Aron
diff -Nru busybox-1.20.0/debian/changelog busybox-1.20.0/debian/changelog --- busybox-1.20.0/debian/changelog 2013-03-02 20:42:49.000000000 +0800 +++ busybox-1.20.0/debian/changelog 2013-06-02 18:04:24.000000000 +0800 @@ -1,3 +1,10 @@ +busybox (1:1.20.0-8.1) unstable; urgency=low + + * Non-maintainer upload. + * eglibc-2.17.patch - backport upstream patch (Closes: #701381) + + -- Aron Xu <a...@debian.org> Sun, 02 Jun 2013 17:59:36 +0800 + busybox (1:1.20.0-8) unstable; urgency=low * grep-fix-grep--Fw-not-respecting-the--w-option.patch - implement diff -Nru busybox-1.20.0/debian/patches/eglibc-2.17.patch busybox-1.20.0/debian/patches/eglibc-2.17.patch --- busybox-1.20.0/debian/patches/eglibc-2.17.patch 1970-01-01 08:00:00.000000000 +0800 +++ busybox-1.20.0/debian/patches/eglibc-2.17.patch 2013-06-02 17:56:16.000000000 +0800 @@ -0,0 +1,81 @@ +From c5fe9f7b723f949457263ef8e22ab807d5b549ce Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vap...@gentoo.org> +Date: Fri, 06 Jul 2012 03:19:09 +0000 +Subject: 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 <vap...@gentoo.org> +--- +--- 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) + { +--- 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 { +--- 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" +--- 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 +--- 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 +--- a/runit/chpst.c ++++ b/runit/chpst.c +@@ -91,6 +91,7 @@ + //usage: "\n a SIGXCPU after N seconds" + + #include "libbb.h" ++#include <sys/resource.h> /* getrlimit */ + + /* + Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit. +--- 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"; + diff -Nru busybox-1.20.0/debian/patches/series busybox-1.20.0/debian/patches/series --- busybox-1.20.0/debian/patches/series 2013-03-01 16:54:07.000000000 +0800 +++ busybox-1.20.0/debian/patches/series 2013-06-02 17:51:44.000000000 +0800 @@ -33,3 +33,5 @@ dont-force-no-alignment-for-s390.patch stop-checking-ancient-kernel-version.patch + +eglibc-2.17.patch
signature.asc
Description: Digital signature