Page MenuHomeFreeBSD
Files F109132444

D27934.id81614.diff
No OneTemporary
Actions

D27934.id81614.diff
View Options

Index: sysutils/busybox/Makefile
===================================================================
--- sysutils/busybox/Makefile
+++ sysutils/busybox/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= busybox
-PORTVERSION= 1.31.1
+PORTVERSION= 1.32.1
CATEGORIES= sysutils misc shells
MASTER_SITES= https://busybox.net/downloads/
Index: sysutils/busybox/distinfo
===================================================================
--- sysutils/busybox/distinfo
+++ sysutils/busybox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588539347
-SHA256 (busybox-1.31.1.tar.bz2) = d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998
-SIZE (busybox-1.31.1.tar.bz2) = 2430221
+TIMESTAMP = 1609623487
+SHA256 (busybox-1.32.1.tar.bz2) = 9d57c4bd33974140fd4111260468af22856f12f5b5ef7c70c8d9b75c712a0dee
+SIZE (busybox-1.32.1.tar.bz2) = 2444679
Index: sysutils/busybox/files/data-.config
===================================================================
--- sysutils/busybox/files/data-.config
+++ sysutils/busybox/files/data-.config
@@ -19,7 +19,7 @@
CONFIG_LFS=y
# CONFIG_PAM is not set
CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_UTMP is not set
+CONFIG_FEATURE_UTMP=y
# CONFIG_FEATURE_WTMP is not set
CONFIG_FEATURE_PIDFILE=y
CONFIG_PID_FILE_PATH="/var/run"
@@ -71,7 +71,7 @@
#
# Debugging Options
#
-# CONFIG_DEBUG is not set
+CONFIG_DEBUG=y
# CONFIG_DEBUG_PESSIMIZE is not set
# CONFIG_DEBUG_SANITIZE is not set
# CONFIG_UNIT_TEST is not set
@@ -188,9 +188,9 @@
# CONFIG_FEATURE_TAR_SELINUX is not set
CONFIG_UNZIP=y
CONFIG_FEATURE_UNZIP_CDF=y
-# CONFIG_FEATURE_UNZIP_BZIP2 is not set
-# CONFIG_FEATURE_UNZIP_LZMA is not set
-# CONFIG_FEATURE_UNZIP_XZ is not set
+CONFIG_FEATURE_UNZIP_BZIP2=y
+CONFIG_FEATURE_UNZIP_LZMA=y
+CONFIG_FEATURE_UNZIP_XZ=y
CONFIG_FEATURE_LZMA_FAST=y
#
@@ -211,10 +211,10 @@
CONFIG_FEATURE_CP_LONG_OPTIONS=y
CONFIG_FEATURE_CP_REFLINK=y
CONFIG_CUT=y
-# CONFIG_DATE is not set
-# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
# CONFIG_FEATURE_DATE_NANO is not set
-# CONFIG_FEATURE_DATE_COMPAT is not set
+CONFIG_FEATURE_DATE_COMPAT=y
CONFIG_DD=y
CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
@@ -297,21 +297,21 @@
CONFIG_SPLIT=y
CONFIG_FEATURE_SPLIT_FANCY=y
CONFIG_STAT=y
-# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_FEATURE_STAT_FORMAT=y
# CONFIG_FEATURE_STAT_FILESYSTEM is not set
CONFIG_STTY=y
CONFIG_SUM=y
CONFIG_SYNC=y
# CONFIG_FEATURE_SYNC_FANCY is not set
CONFIG_FSYNC=y
-# CONFIG_TAC is not set
+CONFIG_TAC=y
CONFIG_TAIL=y
CONFIG_FEATURE_FANCY_TAIL=y
CONFIG_TEE=y
CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
CONFIG_TEST=y
-# CONFIG_TEST1 is not set
-# CONFIG_TEST2 is not set
+CONFIG_TEST1=y
+CONFIG_TEST2=y
CONFIG_FEATURE_TEST_64=y
CONFIG_TIMEOUT=y
CONFIG_TOUCH=y
@@ -334,9 +334,9 @@
CONFIG_UUENCODE=y
CONFIG_WC=y
CONFIG_FEATURE_WC_LARGE=y
-# CONFIG_WHO is not set
-# CONFIG_W is not set
-# CONFIG_USERS is not set
+CONFIG_WHO=y
+CONFIG_W=y
+CONFIG_USERS=y
CONFIG_WHOAMI=y
CONFIG_YES=y
@@ -463,8 +463,8 @@
# CONFIG_FEATURE_FIND_CONTEXT is not set
CONFIG_FEATURE_FIND_LINKS=y
CONFIG_GREP=y
-# CONFIG_EGREP is not set
-# CONFIG_FGREP is not set
+CONFIG_EGREP=y
+CONFIG_FGREP=y
CONFIG_FEATURE_GREP_CONTEXT=y
CONFIG_XARGS=y
CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
@@ -481,7 +481,7 @@
# CONFIG_BOOTCHARTD is not set
# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
-# CONFIG_HALT is not set
+CONFIG_HALT=y
CONFIG_POWEROFF=y
CONFIG_REBOOT=y
# CONFIG_FEATURE_WAIT_FOR_INIT is not set
@@ -670,7 +670,7 @@
CONFIG_RENICE=y
CONFIG_REV=y
# CONFIG_RTCWAKE is not set
-# CONFIG_SCRIPT is not set
+CONFIG_SCRIPT=y
CONFIG_SCRIPTREPLAY=y
# CONFIG_SETARCH is not set
# CONFIG_LINUX32 is not set
@@ -692,7 +692,7 @@
# CONFIG_UMOUNT is not set
# CONFIG_FEATURE_UMOUNT_ALL is not set
# CONFIG_UNSHARE is not set
-# CONFIG_WALL is not set
+CONFIG_WALL=y
# CONFIG_FEATURE_MOUNT_LOOP is not set
# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set
# CONFIG_FEATURE_MTAB_SUPPORT is not set
@@ -738,14 +738,14 @@
# CONFIG_BEEP is not set
CONFIG_FEATURE_BEEP_FREQ=0
CONFIG_FEATURE_BEEP_LENGTH_MS=0
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
-# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
-# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
-# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
-# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+CONFIG_CHAT=y
+CONFIG_FEATURE_CHAT_NOFAIL=y
+CONFIG_FEATURE_CHAT_TTY_HIFI=y
+CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
+CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y
+CONFIG_FEATURE_CHAT_SEND_ESCAPES=y
+CONFIG_FEATURE_CHAT_VAR_ABORT_LEN=y
+CONFIG_FEATURE_CHAT_CLR_ABORT=y
# CONFIG_CONSPY is not set
CONFIG_CROND=y
CONFIG_FEATURE_CROND_D=y
@@ -838,17 +838,17 @@
CONFIG_DNSD=y
# CONFIG_ETHER_WAKE is not set
CONFIG_FTPD=y
-# CONFIG_FEATURE_FTPD_WRITE is not set
+CONFIG_FEATURE_FTPD_WRITE=y
CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
-# CONFIG_FEATURE_FTPD_AUTHENTICATION is not set
+CONFIG_FEATURE_FTPD_AUTHENTICATION=y
CONFIG_FTPGET=y
CONFIG_FTPPUT=y
CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
CONFIG_HOSTNAME=y
-# CONFIG_DNSDOMAINNAME is not set
+CONFIG_DNSDOMAINNAME=y
CONFIG_HTTPD=y
CONFIG_FEATURE_HTTPD_RANGES=y
-# CONFIG_FEATURE_HTTPD_SETUID is not set
+CONFIG_FEATURE_HTTPD_SETUID=y
CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
CONFIG_FEATURE_HTTPD_AUTH_MD5=y
CONFIG_FEATURE_HTTPD_CGI=y
@@ -927,7 +927,8 @@
CONFIG_SSL_CLIENT=y
# CONFIG_TC is not set
# CONFIG_FEATURE_TC_INGRESS is not set
-# CONFIG_TCPSVD is not set
+CONFIG_TCPSVD=y
+# DOes not work on FreeBSD
# CONFIG_UDPSVD is not set
CONFIG_TELNET=y
CONFIG_FEATURE_TELNET_TTYPE=y
@@ -1167,9 +1168,15 @@
CONFIG_SYSLOGD=y
CONFIG_FEATURE_ROTATE_LOGFILE=y
CONFIG_FEATURE_REMOTE_LOG=y
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
+CONFIG_FEATURE_SYSLOGD_DUP=y
CONFIG_FEATURE_SYSLOGD_CFG=y
CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
CONFIG_FEATURE_IPC_SYSLOG=y
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
CONFIG_FEATURE_KMSG_SYSLOG=y
+
+CONFIG_WARN_SIMPLE_MSG=n
+CONFIG_FEATURE_FIND_EMPTY=y
+CONFIG_MIM=y
+CONFIG_SHELL_HUSH=n
+CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS=n
Index: sysutils/busybox/files/patch-Makefile.flags
===================================================================
--- sysutils/busybox/files/patch-Makefile.flags
+++ sysutils/busybox/files/patch-Makefile.flags
@@ -1,30 +1,12 @@
---- Makefile.flags.orig 2018-12-05 14:44:34 UTC
+--- Makefile.flags.orig 2021-01-03 14:40:37 UTC
+++ Makefile.flags
-@@ -47,12 +47,11 @@ endif
- # gcc 3.x emits bogus "old style proto" warning on find.c:alloc_action()
- CFLAGS += $(call cc-ifversion, -ge, 0400, -Wold-style-definition)
+@@ -180,7 +180,9 @@ LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$
+ endif
--CFLAGS += $(call cc-option,-fno-builtin-strlen -finline-limit=0 -fomit-frame-pointer -ffunction-sections -fdata-sections,)
-+CFLAGS += $(call cc-option,-fno-builtin-strlen -fomit-frame-pointer -ffunction-sections -fdata-sections,)
- # -fno-guess-branch-probability: prohibit pseudo-random guessing
- # of branch probabilities (hopefully makes bloatcheck more stable):
- CFLAGS += $(call cc-option,-fno-guess-branch-probability,)
--CFLAGS += $(call cc-option,-funsigned-char -static-libgcc,)
--CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,)
-+CFLAGS += $(call cc-option,-funsigned-char,)
- # Defeat .eh_frame bloat (gcc 4.6.3 x86-32 defconfig: 20% smaller busybox binary):
- CFLAGS += $(call cc-option,-fno-unwind-tables,)
- CFLAGS += $(call cc-option,-fno-asynchronous-unwind-tables,)
-@@ -156,9 +155,9 @@ CPPFLAGS += $(SELINUX_CFLAGS)
- LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%))
+ ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y)
++ifeq ($(CONFIG_UNAME_OSNAME),Linux)
+ LDLIBS += resolv
++endif
endif
--ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y)
--LDLIBS += resolv
--endif
-+# ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y)
-+# LDLIBS += resolv
-+# endif
-
ifeq ($(CONFIG_EFENCE),y)
- LDLIBS += efence
Index: sysutils/busybox/files/patch-coreutils_mknod.c
===================================================================
--- sysutils/busybox/files/patch-coreutils_mknod.c
+++ sysutils/busybox/files/patch-coreutils_mknod.c
@@ -1,12 +1,12 @@
---- coreutils/mknod.c.orig 2018-12-30 15:14:20 UTC
+--- coreutils/mknod.c.orig 2021-01-01 10:52:27 UTC
+++ coreutils/mknod.c
-@@ -36,7 +36,8 @@
+@@ -36,7 +36,9 @@
//usage: "$ mknod /dev/fd0 b 2 0\n"
//usage: "$ mknod -m 644 /tmp/pipe p\n"
--#include <sys/sysmacros.h> // For makedev
-+// #include <sys/sysmacros.h> // For makedev
-+#include <sys/types.h>
++#ifdef __linux__
+ #include <sys/sysmacros.h> // For makedev
++#endif
#include "libbb.h"
#include "libcoreutils/coreutils.h"
Index: sysutils/busybox/files/patch-include_libbb.h
===================================================================
--- sysutils/busybox/files/patch-include_libbb.h
+++ sysutils/busybox/files/patch-include_libbb.h
@@ -1,22 +1,14 @@
---- include/libbb.h.orig 2019-02-14 13:31:15 UTC
+--- include/libbb.h.orig 2021-01-04 13:16:47 UTC
+++ include/libbb.h
-@@ -53,6 +53,9 @@
- #include <termios.h>
- #include <time.h>
- #include <sys/param.h>
-+#ifndef HAVE_XTABS
-+# define XTABS TAB3
+@@ -106,7 +106,11 @@
+ # define updwtmpx updwtmp
+ # define _PATH_UTMPX _PATH_UTMP
+ # else
++#ifndef __FreeBSD__
+ # include <utmp.h>
++#else
++#define _PATH_UTMPX "/var/run/utx.active"
+#endif
- #include <pwd.h>
- #include <grp.h>
- #if ENABLE_FEATURE_SHADOWPASSWDS
-@@ -160,9 +163,6 @@
- #ifndef HAVE_FDATASYNC
- # define fdatasync fsync
- #endif
--#ifndef HAVE_XTABS
--# define XTABS TAB3
--#endif
- /*
- * Use '%m' to append error string on platforms that support it,
- * '%s' and strerror() on those that don't.
+ # include <utmpx.h>
+ # if defined _PATH_UTMP && !defined _PATH_UTMPX
+ # define _PATH_UTMPX _PATH_UTMP
Index: sysutils/busybox/files/patch-include_platform.h
===================================================================
--- sysutils/busybox/files/patch-include_platform.h
+++ sysutils/busybox/files/patch-include_platform.h
@@ -1,6 +1,6 @@
---- include/platform.h.orig 2018-12-05 14:44:34 UTC
+--- include/platform.h.orig 2021-01-01 13:30:02 UTC
+++ include/platform.h
-@@ -315,7 +315,7 @@ typedef unsigned smalluint;
+@@ -319,7 +319,7 @@ typedef unsigned smalluint;
#endif
/* Define bb_setpgrp */
Index: sysutils/busybox/files/patch-libbb_pw__encrypt.c
===================================================================
--- sysutils/busybox/files/patch-libbb_pw__encrypt.c
+++ sysutils/busybox/files/patch-libbb_pw__encrypt.c
@@ -1,11 +1,12 @@
---- libbb/pw_encrypt.c.orig 2018-12-05 14:44:34 UTC
+--- libbb/pw_encrypt.c.orig 2021-01-01 13:30:02 UTC
+++ libbb/pw_encrypt.c
-@@ -6,7 +6,7 @@
- *
+@@ -7,7 +7,9 @@
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
--#include <crypt.h>
-+#include <unistd.h>
+ #if !ENABLE_USE_BB_CRYPT
++#ifndef __FreeBSD__
+ #include <crypt.h>
++#endif
+ #endif
#include "libbb.h"
- /* static const uint8_t ascii64[] ALIGN1 =
Index: sysutils/busybox/files/patch-networking_httpd.c
===================================================================
--- sysutils/busybox/files/patch-networking_httpd.c
+++ sysutils/busybox/files/patch-networking_httpd.c
@@ -1,17 +1,14 @@
---- networking/httpd.c.orig 2019-06-10 09:09:31 UTC
+--- networking/httpd.c.orig 2021-01-01 13:30:02 UTC
+++ networking/httpd.c
-@@ -2135,10 +2135,10 @@ static void handle_incoming_and_exit(con
- }
- #if ENABLE_FEATURE_IPV6
- if (fromAddr->u.sa.sa_family == AF_INET6
-- && fromAddr->u.sin6.sin6_addr.s6_addr32[0] == 0
-- && fromAddr->u.sin6.sin6_addr.s6_addr32[1] == 0
-- && ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[2]) == 0xffff)
-- remote_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[3]);
-+ && fromAddr->u.sin6.sin6_addr.s6_addr[0] == 0
-+ && fromAddr->u.sin6.sin6_addr.s6_addr[1] == 0
-+ && ntohl(fromAddr->u.sin6.sin6_addr.s6_addr[2]) == 0xffff)
-+ remote_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr[3]);
- #endif
- if (ENABLE_FEATURE_HTTPD_CGI || DEBUG || verbose) {
- /* NB: can be NULL (user runs httpd -i by hand?) */
+@@ -267,6 +267,11 @@
+
+ #define HEADER_READ_TIMEOUT 60
+
++/* see sys/netinet6/in6.h */
++#ifdef __FreeBSD__
++#define s6_addr32 __u6_addr.__u6_addr32
++#endif
++
+ static const char DEFAULT_PATH_HTTPD_CONF[] ALIGN1 = "/etc";
+ static const char HTTPD_CONF[] ALIGN1 = "httpd.conf";
+ static const char HTTP_200[] ALIGN1 = "HTTP/1.0 200 OK\r\n";
Index: sysutils/busybox/files/patch-networking_nslookup.c
===================================================================
--- sysutils/busybox/files/patch-networking_nslookup.c
+++ sysutils/busybox/files/patch-networking_nslookup.c
@@ -1,10 +1,12 @@
---- networking/nslookup.c.orig 2019-02-14 13:31:15 UTC
+--- networking/nslookup.c.orig 2021-01-01 13:30:02 UTC
+++ networking/nslookup.c
-@@ -34,6 +34,7 @@
+@@ -34,6 +34,9 @@
//usage: "Name: debian\n"
//usage: "Address: 127.0.0.1\n"
-+#include <netinet/in.h>
++#ifdef __FreeBSD__
++#include <netinet/in.h> /* for struct in_addr */
++#endif
#include <resolv.h>
#include <net/if.h> /* for IFNAMSIZ */
//#include <arpa/inet.h>
Index: sysutils/busybox/files/patch-networking_ping.c
===================================================================
--- sysutils/busybox/files/patch-networking_ping.c
+++ sysutils/busybox/files/patch-networking_ping.c
@@ -1,22 +1,22 @@
---- networking/ping.c.orig 2018-12-30 15:14:20 UTC
+--- networking/ping.c.orig 2021-01-01 13:30:02 UTC
+++ networking/ping.c
-@@ -119,7 +119,12 @@
+@@ -119,6 +119,10 @@
//usage: "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
#include <net/if.h>
-+
-+#include <netinet/in.h>
-+#include <netinet/in_systm.h>
++#ifdef __FreeBSD__
++#include <netinet/in.h> /* struct ip and friends */
+#include <netinet/ip.h>
++#endif
#include <netinet/ip_icmp.h>
-+
#include "libbb.h"
#include "common_bufsiz.h"
-
-@@ -147,6 +152,42 @@
- # define SOL_RAW IPPROTO_RAW
- #endif
-
+@@ -155,6 +159,41 @@
+ # undef IPV6_HOPLIMIT
+ # define IPV6_HOPLIMIT IPV6_2292HOPLIMIT
+ # endif
++#endif
++
+#if defined(__FreeBSD__) || defined(__APPLE__)
+/**
+ * On BSD the IPv4 struct is called struct ip and instead of iXX
@@ -50,9 +50,6 @@
+ u_int32_t daddr;
+ /*The options start here. */
+ };
-+#endif
-+
-+
- #if ENABLE_PING6
- # include <netinet/icmp6.h>
- /* I see RENUMBERED constants in bits/in.h - !!?
+ #endif
+
+ enum {
Index: sysutils/busybox/files/patch-networking_traceroute.c
===================================================================
--- sysutils/busybox/files/patch-networking_traceroute.c
+++ sysutils/busybox/files/patch-networking_traceroute.c
@@ -1,20 +1,28 @@
---- networking/traceroute.c.orig 2018-12-30 15:14:20 UTC
+--- networking/traceroute.c.orig 2021-01-01 13:30:02 UTC
+++ networking/traceroute.c
-@@ -635,7 +635,7 @@ packet4_ok(int read_len, const struct so
+@@ -634,8 +634,8 @@ packet4_ok(int read_len, const struct sockaddr_in *fro
+ // Off: since we do not form the entire IP packet,
// but defer it to kernel, we can't set source port,
// and thus can't check it here in the reply
- /* && up->source == htons(ident) */
+- /* && up->source == htons(ident) */
- && up->dest == htons(port + seq)
++ /* && up->uh_sport == htons(ident) */
+ && up->uh_dport == htons(port + seq)
) {
return (type == ICMP_TIMXCEED ? -1 : code + 1);
}
-@@ -933,7 +933,7 @@ common_traceroute_main(int op, char **ar
+@@ -932,8 +932,13 @@ common_traceroute_main(int op, char **argv)
+ setsockopt_SOL_SOCKET_1(rcvsock, SO_DONTROUTE);
#if ENABLE_TRACEROUTE6
++#ifdef __FreeBSD__
++#define SOL_V6_OPTION SOL_IPV6
++#else
++#define SOL_V6_OPTION SOL_RAW
++#endif
if (af == AF_INET6) {
- if (setsockopt_int(rcvsock, SOL_RAW, IPV6_CHECKSUM, 2) != 0)
-+ if (setsockopt_int(rcvsock, SOL_IPV6, IPV6_CHECKSUM, 2) != 0)
++ if (setsockopt_int(rcvsock, SOL_V6_OPTION, IPV6_CHECKSUM, 2) != 0)
bb_perror_msg_and_die("setsockopt(%s)", "IPV6_CHECKSUM");
xmove_fd(xsocket(af, SOCK_DGRAM, 0), sndsock);
} else
Index: sysutils/busybox/files/patch-shell_shell__common.c
===================================================================
--- sysutils/busybox/files/patch-shell_shell__common.c
+++ sysutils/busybox/files/patch-shell_shell__common.c
@@ -1,12 +1,12 @@
---- shell/shell_common.c.orig 2019-06-10 09:09:31 UTC
+--- shell/shell_common.c.orig 2021-01-01 13:30:58 UTC
+++ shell/shell_common.c
-@@ -328,7 +328,9 @@ struct limits {
+@@ -327,7 +327,9 @@ struct limits {
static const struct limits limits_tbl[] = {
- { RLIMIT_CORE, 9, "core file size (blocks)" }, // -c
- { RLIMIT_DATA, 10, "data seg size (kb)" }, // -d
+ { RLIMIT_CORE, 9, }, // -c
+ { RLIMIT_DATA, 10, }, // -d
+#ifdef RLIMIT_NICE
- { RLIMIT_NICE, 0, "scheduling priority" }, // -e
+ { RLIMIT_NICE, 0, }, // -e
+#endif
- { RLIMIT_FSIZE, 9, "file size (blocks)" }, // -f
+ { RLIMIT_FSIZE, 9, }, // -f
#define LIMIT_F_IDX 3
#ifdef RLIMIT_SIGPENDING

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 2, 5:41 AM (20 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16396413
Default Alt Text
D27934.id81614.diff (16 KB)

Event Timeline