Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/busybox/patches/busybox-1.20.2-sys-resource.patch

    Contents of /trunk/busybox/patches/busybox-1.20.2-sys-resource.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1942 - (show annotations) (download)
    Tue Nov 6 12:50:29 2012 UTC (11 years, 5 months ago) by niro
    File size: 3561 byte(s) 
    -more upstream patches
    1 From 5a5dfcad6ba96d12d68bd7b39279215a8fee70d3 Mon Sep 17 00:00:00 2001
    2 From: Tias Guns <tias@ulyssis.org>
    3 Date: Sun, 10 Jun 2012 14:19:01 +0200
    4 Subject: [PATCH] inetd: fix build failure in Android
    5
    6 Signed-off-by: Tias Guns <tias@ulyssis.org>
    7 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
    8 (cherry picked from commit 64f763b42a43cbf36e401690ff6767c25575e520)
    9 ---
    10 networking/inetd.c | 1 +
    11 1 file changed, 1 insertion(+)
    12 --
    13 1.7.12
    14
    15 From 246ea72843d5b7e9d4cd902dc5e9d71359196303 Mon Sep 17 00:00:00 2001
    16 From: Mike Frysinger <vapier@gentoo.org>
    17 Date: Thu, 5 Jul 2012 23:19:09 -0400
    18 Subject: [PATCH] include sys/resource.h where needed
    19
    20 We use functions from sys/resource.h in misc applets, but don't include
    21 the header. This breaks building with newer glibc versions, so add the
    22 include where needed.
    23
    24 Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    25 (cherry picked from commit c5fe9f7b723f949457263ef8e22ab807d5b549ce)
    26 ---
    27 loginutils/passwd.c | 1 +
    28 miscutils/time.c | 1 +
    29 networking/inetd.c | 1 +
    30 networking/ntpd.c | 1 +
    31 networking/ntpd_simple.c | 1 +
    32 runit/chpst.c | 1 +
    33 shell/shell_common.c | 1 +
    34 7 files changed, 7 insertions(+)
    35
    36 diff --git a/loginutils/passwd.c b/loginutils/passwd.c
    37 index b83db00..a7006f0 100644
    38 --- a/loginutils/passwd.c
    39 +++ b/loginutils/passwd.c
    40 @@ -15,6 +15,7 @@
    41
    42 #include "libbb.h"
    43 #include <syslog.h>
    44 +#include <sys/resource.h> /* setrlimit */
    45
    46 static void nuke_str(char *str)
    47 {
    48 diff --git a/miscutils/time.c b/miscutils/time.c
    49 index 945f15f..ffed386 100644
    50 --- a/miscutils/time.c
    51 +++ b/miscutils/time.c
    52 @@ -16,6 +16,7 @@
    53 //usage: "\n -v Verbose"
    54
    55 #include "libbb.h"
    56 +#include <sys/resource.h> /* getrusage */
    57
    58 /* Information on the resources used by a child process. */
    59 typedef struct {
    60 diff --git a/networking/inetd.c b/networking/inetd.c
    61 index 1308d74..00baf69 100644
    62 --- a/networking/inetd.c
    63 +++ b/networking/inetd.c
    64 @@ -165,6 +165,8 @@
    65 //usage: "\n (default: 0 - disabled)"
    66
    67 #include <syslog.h>
    68 +#include <sys/resource.h> /* setrlimit */
    69 +#include <sys/socket.h> /* un.h may need this */
    70 #include <sys/un.h>
    71
    72 #include "libbb.h"
    73 diff --git a/networking/ntpd.c b/networking/ntpd.c
    74 index 603801e..b885215 100644
    75 --- a/networking/ntpd.c
    76 +++ b/networking/ntpd.c
    77 @@ -46,6 +46,7 @@
    78 #include "libbb.h"
    79 #include <math.h>
    80 #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
    81 +#include <sys/resource.h> /* setpriority */
    82 #include <sys/timex.h>
    83 #ifndef IPTOS_LOWDELAY
    84 # define IPTOS_LOWDELAY 0x10
    85 diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c
    86 index 4ad44e4..1b7c66b 100644
    87 --- a/networking/ntpd_simple.c
    88 +++ b/networking/ntpd_simple.c
    89 @@ -7,6 +7,7 @@
    90 */
    91 #include "libbb.h"
    92 #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
    93 +#include <sys/resource.h> /* setpriority */
    94 #ifndef IPTOS_LOWDELAY
    95 # define IPTOS_LOWDELAY 0x10
    96 #endif
    97 diff --git a/runit/chpst.c b/runit/chpst.c
    98 index ac296ba..ed72c8b 100644
    99 --- a/runit/chpst.c
    100 +++ b/runit/chpst.c
    101 @@ -91,6 +91,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    102 //usage: "\n a SIGXCPU after N seconds"
    103
    104 #include "libbb.h"
    105 +#include <sys/resource.h> /* getrlimit */
    106
    107 /*
    108 Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
    109 diff --git a/shell/shell_common.c b/shell/shell_common.c
    110 index 51c92d6..780e27e 100644
    111 --- a/shell/shell_common.c
    112 +++ b/shell/shell_common.c
    113 @@ -18,6 +18,7 @@
    114 */
    115 #include "libbb.h"
    116 #include "shell_common.h"
    117 +#include <sys/resource.h> /* getrlimit */
    118
    119 const char defifsvar[] ALIGN1 = "IFS= \t\n";
    120
    121 --
    122 1.7.12
    123