diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/busybox/Makefile | 15 | ||||
| -rw-r--r-- | sysutils/busybox/distinfo | 14 | ||||
| -rw-r--r-- | sysutils/busybox/files/data-.config | 93 | ||||
| -rw-r--r-- | sysutils/busybox/files/patch-002 | 290 | ||||
| -rw-r--r-- | sysutils/busybox/files/patch-include__libbb.h | 22 | ||||
| -rw-r--r-- | sysutils/busybox/files/patch-include__platform.h | 11 | ||||
| -rw-r--r-- | sysutils/busybox/files/patch-libbb__match_fstype.c | 17 | ||||
| -rw-r--r-- | sysutils/busybox/files/patch-scripts__kconfig__mconf.c | 10 | ||||
| -rw-r--r-- | sysutils/busybox/files/patch-sysklogd__logread.c (renamed from sysutils/busybox/files/patch-strnlen) | 8 |
9 files changed, 148 insertions, 332 deletions
diff --git a/sysutils/busybox/Makefile b/sysutils/busybox/Makefile index ba4fbdee0452..60a9bdc666d7 100644 --- a/sysutils/busybox/Makefile +++ b/sysutils/busybox/Makefile @@ -6,11 +6,18 @@ # PORTNAME= busybox -PORTVERSION= 1.18.5 -PORTREVISION= 1 +PORTVERSION= 1.19.0 CATEGORIES= sysutils misc shells MASTER_SITES= http://www.busybox.net/downloads/ +PATCH_SITES= http://www.busybox.net/downloads/fixes-${PORTVERSION}/ +PATCHFILES= busybox-1.19.0-cttyhack.patch \ + busybox-1.19.0-less.patch \ + busybox-1.19.0-sed.patch \ + busybox-1.19.0-swap.patch \ + busybox-1.19.0-uncompress.patch +PATCH_DIST_STRIP= -p1 + MAINTAINER= mandree@FreeBSD.org COMMENT= Busybox for FreeBSD @@ -34,8 +41,8 @@ PORTDOCS= * .endif post-patch: - @${REINPLACE_CMD} -e 's/sed/gsed/' ${WRKSRC}/scripts/gen_build_files.sh - @${REINPLACE_CMD} -e 's/<malloc.h>/<stdlib.h>/' \ + ${REINPLACE_CMD} -e 's/sed/gsed/' ${WRKSRC}/scripts/gen_build_files.sh + ${REINPLACE_CMD} -e 's/<malloc.h>/<stdlib.h>/' \ ${WRKSRC}/libbb/appletlib.c \ ${WRKSRC}/shell/hush.c diff --git a/sysutils/busybox/distinfo b/sysutils/busybox/distinfo index 3835c7eba3ae..4602491af676 100644 --- a/sysutils/busybox/distinfo +++ b/sysutils/busybox/distinfo @@ -1,2 +1,12 @@ -SHA256 (busybox-1.18.5.tar.bz2) = 10954fcd5c48d8a262a3497b16227bf983a05658bf2bf661af2fdeca773f2fc0 -SIZE (busybox-1.18.5.tar.bz2) = 2130681 +SHA256 (busybox-1.19.0.tar.bz2) = 19cf44a096d7796800780d6344c4cc5054dac9f50d1c9b7a5c506c4777f7620c +SIZE (busybox-1.19.0.tar.bz2) = 2168657 +SHA256 (busybox-1.19.0-cttyhack.patch) = f315e48a9c586fb5e77921eda59c773ba8afbb1e4ac9fd422c66b5c482dca6d2 +SIZE (busybox-1.19.0-cttyhack.patch) = 592 +SHA256 (busybox-1.19.0-less.patch) = e0d1a306bf3be7802ef19c0033b278ae2ecf8fd4f271bad7d93209c9c6a0f019 +SIZE (busybox-1.19.0-less.patch) = 278 +SHA256 (busybox-1.19.0-sed.patch) = b21ac5eb86519fbcbe0a74fc531cb707a878e988b6fdb298be6083760e04fb89 +SIZE (busybox-1.19.0-sed.patch) = 8081 +SHA256 (busybox-1.19.0-swap.patch) = d9d70a607d877646b4e2087ddf4c3ad14d5bcb2b5973b33fed30ee8e6d69b40d +SIZE (busybox-1.19.0-swap.patch) = 402 +SHA256 (busybox-1.19.0-uncompress.patch) = 442b259d55771663bd4bd21167b297e81a8bd6dc73eac4604fc4a02d0d720a6a +SIZE (busybox-1.19.0-uncompress.patch) = 1513 diff --git a/sysutils/busybox/files/data-.config b/sysutils/busybox/files/data-.config index 5f2985be19f6..c66e0477d968 100644 --- a/sysutils/busybox/files/data-.config +++ b/sysutils/busybox/files/data-.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.18.1 -# Tue Dec 21 19:47:40 2010 +# Busybox version: 1.19.0 +# Fri Aug 26 00:56:12 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -39,8 +39,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=767 CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set CONFIG_FEATURE_PIDFILE=y CONFIG_FEATURE_SUID=y CONFIG_FEATURE_SUID_CONFIG=y @@ -89,6 +89,8 @@ CONFIG_PREFIX="./_install" # # Busybox Library Tuning # +# CONFIG_FEATURE_SYSTEMD is not set +CONFIG_FEATURE_RTMINMAX=y CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SIZE_VS_SPEED=2 CONFIG_FEATURE_FAST_TOP=y @@ -99,6 +101,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set CONFIG_FEATURE_EDITING_HISTORY=30 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_REVERSE_SEARCH is not set CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set @@ -106,6 +109,7 @@ CONFIG_FEATURE_TAB_COMPLETION=y CONFIG_FEATURE_NON_POSIX_CP=y # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set CONFIG_FEATURE_COPYBUF_KB=4 +# CONFIG_FEATURE_SKIP_ROOTFS is not set # CONFIG_MONOTONIC_SYSCALL is not set CONFIG_IOCTL_HEX2STR_ERROR=y CONFIG_FEATURE_HWIB=y @@ -169,12 +173,17 @@ CONFIG_CAT=y # CONFIG_FEATURE_DATE_ISOFMT is not set # CONFIG_FEATURE_DATE_NANO is not set # CONFIG_FEATURE_DATE_COMPAT is not set +CONFIG_ID=y +CONFIG_GROUPS=y CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y # CONFIG_BASE64 is not set +# CONFIG_WHO is not set +# CONFIG_USERS is not set CONFIG_CAL=y CONFIG_CATV=y CONFIG_CHGRP=y @@ -212,10 +221,8 @@ CONFIG_FSYNC=y CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y CONFIG_HOSTID=y -CONFIG_ID=y CONFIG_INSTALL=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LENGTH=y CONFIG_LN=y CONFIG_LOGNAME=y CONFIG_LS=y @@ -267,7 +274,6 @@ CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TOUCH=y CONFIG_TRUE=y CONFIG_TTY=y CONFIG_UNAME=y @@ -279,7 +285,6 @@ CONFIG_UUDECODE=y CONFIG_UUENCODE=y CONFIG_WC=y CONFIG_FEATURE_WC_LARGE=y -# CONFIG_WHO is not set CONFIG_WHOAMI=y CONFIG_YES=y @@ -346,20 +351,13 @@ CONFIG_WHICH=y # Editors # CONFIG_PATCH=y -CONFIG_AWK=y -CONFIG_FEATURE_AWK_LIBM=y -CONFIG_CMP=y -CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_LONG_OPTIONS=y -CONFIG_FEATURE_DIFF_DIR=y -CONFIG_ED=y -CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=1024 CONFIG_FEATURE_VI_8BIT=y CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set CONFIG_FEATURE_VI_USE_SIGNALS=y CONFIG_FEATURE_VI_DOT_CMD=y CONFIG_FEATURE_VI_READONLY=y @@ -368,6 +366,14 @@ CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_CMP=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_LONG_OPTIONS=y +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y +CONFIG_SED=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -426,6 +432,7 @@ CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_INITRD is not set CONFIG_INIT_TERMINAL_TYPE="" # CONFIG_MESG is not set +# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set # # Login/Password Management Utilities @@ -471,6 +478,10 @@ CONFIG_CHATTR=y # CONFIG_FSCK is not set # CONFIG_LSATTR is not set # CONFIG_TUNE2FS is not set + +# +# Linux Module Utilities +# # CONFIG_MODINFO is not set # CONFIG_MODPROBE_SMALL is not set # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set @@ -482,6 +493,10 @@ CONFIG_CHATTR=y # CONFIG_MODPROBE is not set # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set # CONFIG_DEPMOD is not set + +# +# Options common to multiple modutils +# # CONFIG_FEATURE_2_4_MODULES is not set # CONFIG_FEATURE_INSMOD_TRY_MMAP is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set @@ -503,6 +518,7 @@ CONFIG_REV=y # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set # CONFIG_BLKID is not set +# CONFIG_FEATURE_BLKID_TYPE is not set # CONFIG_DMESG is not set # CONFIG_FEATURE_DMESG_PRETTY is not set # CONFIG_FBSET is not set @@ -598,10 +614,25 @@ CONFIG_SCRIPTREPLAY=y # Miscellaneous Utilities # # CONFIG_CONSPY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y +# CONFIG_FEATURE_LESS_WINCH is not set +# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set +# CONFIG_FEATURE_LESS_DASHCMD is not set +# CONFIG_FEATURE_LESS_LINENUMS is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set +# CONFIG_SETSERIAL is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set # CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set @@ -642,15 +673,6 @@ CONFIG_FEATURE_DC_LIBM=y # CONFIG_LAST is not set # CONFIG_FEATURE_LAST_SMALL is not set # CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -CONFIG_FEATURE_LESS_MARKS=y -CONFIG_FEATURE_LESS_REGEXP=y -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set # CONFIG_HDPARM is not set # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -684,11 +706,17 @@ CONFIG_VOLNAME=y # # Networking Utilities # +# CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set # CONFIG_NBDCLIENT is not set CONFIG_NC=y # CONFIG_NC_SERVER is not set # CONFIG_NC_EXTRA is not set # CONFIG_NC_110_COMPAT is not set +# CONFIG_PING is not set +# CONFIG_PING6 is not set +# CONFIG_FEATURE_FANCY_PING is not set +# CONFIG_WHOIS is not set # CONFIG_FEATURE_IPV6 is not set # CONFIG_FEATURE_UNIX_LOCAL is not set # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set @@ -761,17 +789,12 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" CONFIG_IPCALC=y CONFIG_FEATURE_IPCALC_FANCY=y CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set # CONFIG_NETSTAT is not set # CONFIG_FEATURE_NETSTAT_WIDE is not set # CONFIG_FEATURE_NETSTAT_PRG is not set # CONFIG_NSLOOKUP is not set # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set -# CONFIG_PING is not set -# CONFIG_PING6 is not set -# CONFIG_FEATURE_FANCY_PING is not set CONFIG_PSCAN=y # CONFIG_ROUTE is not set # CONFIG_SLATTACH is not set @@ -804,12 +827,14 @@ CONFIG_FEATURE_TFTP_PROGRESS_BAR=y # CONFIG_DHCPRELAY is not set # CONFIG_DUMPLEASES is not set # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set CONFIG_DHCPD_LEASES_FILE="" # CONFIG_UDHCPC is not set # CONFIG_FEATURE_UDHCPC_ARPING is not set # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_RFC3397 is not set +# CONFIG_FEATURE_UDHCP_8021Q is not set CONFIG_UDHCPC_DEFAULT_SCRIPT="" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" @@ -845,15 +870,19 @@ CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_IOSTAT=y CONFIG_MPSTAT=y +# CONFIG_NMETER is not set CONFIG_PMAP=y CONFIG_POWERTOP=y +CONFIG_PSTREE=y +CONFIG_PWDX=y CONFIG_SMEMCAP=y +# CONFIG_UPTIME is not set +# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set # CONFIG_FREE is not set # CONFIG_FUSER is not set CONFIG_KILL=y CONFIG_KILLALL=y CONFIG_KILLALL5=y -# CONFIG_NMETER is not set CONFIG_PGREP=y # CONFIG_PIDOF is not set # CONFIG_FEATURE_PIDOF_SINGLE is not set @@ -874,7 +903,6 @@ CONFIG_BB_SYSCTL=y # CONFIG_FEATURE_TOP_SMP_PROCESS is not set # CONFIG_FEATURE_TOPMEM is not set CONFIG_FEATURE_SHOW_THREADS=y -# CONFIG_UPTIME is not set CONFIG_WATCH=y # @@ -912,6 +940,7 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # CONFIG_ASH=y # CONFIG_ASH_BASH_COMPAT is not set +# CONFIG_ASH_IDLE_TIMEOUT is not set # CONFIG_ASH_JOB_CONTROL is not set # CONFIG_ASH_ALIAS is not set # CONFIG_ASH_GETOPTS is not set @@ -952,6 +981,7 @@ CONFIG_SH_MATH_SUPPORT_64=y # CONFIG_FEATURE_SH_EXTRA_QUIET is not set # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set +CONFIG_FEATURE_SH_HISTFILESIZE=y # # System Logging Utilities @@ -960,6 +990,7 @@ CONFIG_SYSLOGD=y CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y # CONFIG_FEATURE_SYSLOGD_DUP is not set +CONFIG_FEATURE_SYSLOGD_CFG=y CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 diff --git a/sysutils/busybox/files/patch-002 b/sysutils/busybox/files/patch-002 deleted file mode 100644 index d7c859a9cfa1..000000000000 --- a/sysutils/busybox/files/patch-002 +++ /dev/null @@ -1,290 +0,0 @@ -diff --git a/include/libbb.h b/include/libbb.h -index 5551031..28896ae 100644 ---- include/libbb.h -+++ include/libbb.h -@@ -38,6 +38,12 @@ - #include <time.h> - #include <unistd.h> - #include <sys/param.h> -+#ifndef HAVE_CLEARENV -+# define clearenv() environ[0] == NULL -+#endif -+#ifndef HAVE_FDATASYNC -+# define fdatasync fsync -+#endif - #ifdef HAVE_MNTENT_H - # include <mntent.h> - #endif -diff --git a/include/platform.h b/include/platform.h -index bbbc0a9..2bc88c3 100644 ---- include/platform.h -+++ include/platform.h -@@ -10,9 +10,12 @@ - /* Assume all these functions exist by default. Platforms where it is not - * true will #undef them below. - */ -+#define HAVE_CLEARENV 1 -+#define HAVE_FDATASYNC 1 - #define HAVE_FDPRINTF 1 - #define HAVE_MEMRCHR 1 - #define HAVE_MKDTEMP 1 -+#define HAVE_PTSNAME_R 1 - #define HAVE_SETBIT 1 - #define HAVE_SIGHANDLER_T 1 - #define HAVE_STRCASESTR 1 -@@ -253,7 +256,10 @@ typedef uint32_t bb__aliased_uint32_t FIX_ALIASING; - #if (defined __digital__ && defined __unix__) \ - || defined __APPLE__ \ - || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ -+# undef HAVE_CLEARENV -+# undef HAVE_FDATASYNC - # undef HAVE_MNTENT_H -+# undef HAVE_PTSNAME_R - # undef HAVE_SYS_STATFS_H - # undef HAVE_SIGHANDLER_T - #else -diff --git a/libbb/getpty.c b/libbb/getpty.c -index ea653b0..6a15cff 100644 ---- libbb/getpty.c -+++ libbb/getpty.c -@@ -19,7 +19,7 @@ int FAST_FUNC xgetpty(char *line) - if (p > 0) { - grantpt(p); /* chmod+chown corresponding slave pty */ - unlockpt(p); /* (what does this do?) */ --#if 0 /* if ptsname_r is not available... */ -+#ifndef HAVE_PTSNAME_R - const char *name; - name = ptsname(p); /* find out the name of slave pty */ - if (!name) { -diff --git a/include/platform.h b/include/platform.h -index 2666eeb..6328ff6 100644 ---- include/platform.h -+++ include/platform.h -@@ -14,6 +14,7 @@ - #define HAVE_MEMRCHR 1 - #define HAVE_MKDTEMP 1 - #define HAVE_SETBIT 1 -+#define HAVE_SIGHANDLER_T 1 - #define HAVE_STRCASESTR 1 - #define HAVE_STRCHRNUL 1 - #define HAVE_STRSEP 1 -@@ -253,6 +254,7 @@ typedef uint32_t bb__aliased_uint32_t FIX_ALIASING; - || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ - # undef HAVE_MNTENT_H - # undef HAVE_SYS_STATFS_H -+# undef HAVE_SIGHANDLER_T - #else - # define HAVE_MNTENT_H 1 - # define HAVE_SYS_STATFS_H 1 -@@ -396,6 +398,10 @@ extern char *mkdtemp(char *template) FAST_FUNC; - # define clrbit(a, b) ((a)[(b) >> 3] &= ~(1 << ((b) & 7))) - #endif - -+#ifndef HAVE_SIGHANDLER_T -+typedef void (*sighandler_t)(int); -+#endif -+ - #ifndef HAVE_STRCASESTR - extern char *strcasestr(const char *s, const char *pattern) FAST_FUNC; - #endif -diff --git a/include/libbb.h b/include/libbb.h -index 5551031..31d9b74 100644 ---- include/libbb.h -+++ include/libbb.h -@@ -58,6 +58,9 @@ - #ifdef DMALLOC - # include <dmalloc.h> - #endif -+#ifndef HAVE_XTABS -+# define XTABS OXTABS -+#endif - #include <pwd.h> - #include <grp.h> - #if ENABLE_FEATURE_SHADOWPASSWDS -diff --git a/include/platform.h b/include/platform.h -index bbbc0a9..73bd59a 100644 ---- include/platform.h -+++ include/platform.h -@@ -256,9 +256,12 @@ typedef uint32_t bb__aliased_uint32_t FIX_ALIASING; - # undef HAVE_MNTENT_H - # undef HAVE_SYS_STATFS_H - # undef HAVE_SIGHANDLER_T -+# undef HAVE_XTABS -+# undef HAVE_FDPRINTF - #else - # define HAVE_MNTENT_H 1 - # define HAVE_SYS_STATFS_H 1 -+# define HAVE_XTABS 1 - #endif - - /*----- Kernel versioning ------------------------------------*/ -diff --git a/libbb/makedev.c b/libbb/makedev.c -index cf59e61..1809fda 100644 ---- libbb/makedev.c -+++ libbb/makedev.c -@@ -8,8 +8,14 @@ - - /* We do not include libbb.h - #define makedev() is there! */ - #include "platform.h" --#include <features.h> --#include <sys/sysmacros.h> -+#if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ -+ || defined(__APPLE__) \ -+ ) -+# include <features.h> -+# include <sys/sysmacros.h> -+#else -+# include <sys/types.h> -+#endif - - #ifdef __GLIBC__ - /* At least glibc has horrendously large inline for this, so wrap it */ -diff --git a/libbb/match_fstype.c b/libbb/match_fstype.c -index 83d6e67..655329b 100644 ---- libbb/match_fstype.c -+++ libbb/match_fstype.c -@@ -10,6 +10,8 @@ - * Licensed under GPLv2 or later, see file LICENSE in this source tree. - */ - -+#ifdef CONFIG_PLATFORM_LINUX -+ - #include "libbb.h" - - int FAST_FUNC match_fstype(const struct mntent *mt, const char *t_fstype) -@@ -40,3 +42,5 @@ int FAST_FUNC match_fstype(const struct mntent *mt, const char *t_fstype) - - return !match; - } -+ -+#endif /* CONFIG_PLATFORM_LINUX */ -diff --git a/coreutils/who.c b/coreutils/who.c -index 8384d95..4c2606d 100644 ---- coreutils/who.c -+++ coreutils/who.c -@@ -19,7 +19,9 @@ - /* BB_AUDIT SUSv3 _NOT_ compliant -- missing options -b, -d, -l, -m, -p, -q, -r, -s, -t, -T, -u; Missing argument 'file'. */ - - #include "libbb.h" --#include <utmp.h> -+#if ENABLE_FEATURE_UTMP -+# include <utmp.h> -+#endif - - static void idle_string(char *str6, time_t t) - { -diff --git a/libbb/messages.c b/libbb/messages.c -index 66e466f..90dd955 100644 ---- libbb/messages.c -+++ libbb/messages.c -@@ -48,15 +48,17 @@ const int const_int_1 = 1; - * and it will end up in bss */ - const int const_int_0 = 0; - --#include <utmp.h> -+#if ENABLE_FEATURE_UTMP -+# include <utmp.h> - /* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */ - const char bb_path_wtmp_file[] ALIGN1 = --#if defined _PATH_WTMP -+# if defined _PATH_WTMP - _PATH_WTMP; --#elif defined WTMP_FILE -+# elif defined WTMP_FILE - WTMP_FILE; --#else --#error unknown path to wtmp file -+# else -+# error unknown path to wtmp file -+# endif - #endif - - /* We use it for "global" data via *(struct global*)&bb_common_bufsiz1. -diff --git a/libbb/utmp.c b/libbb/utmp.c -index 2bf9c11..a055de7 100644 ---- libbb/utmp.c -+++ libbb/utmp.c -@@ -6,8 +6,9 @@ - * - * Licensed under GPLv2, see file LICENSE in this source tree. - */ --#include "libbb.h" --#include <utmp.h> -+#if ENABLE_FEATURE_UTMP -+# include "libbb.h" -+# include <utmp.h> - - static void touch(const char *filename) - { -@@ -53,11 +54,11 @@ void FAST_FUNC write_new_utmp(pid_t pid, int new_type, const char *tty_name, con - pututline(&utent); - endutent(); - --#if ENABLE_FEATURE_WTMP -+# if ENABLE_FEATURE_WTMP - /* "man utmp" says wtmp file should *not* be created automagically */ - /*touch(bb_path_wtmp_file);*/ - updwtmp(bb_path_wtmp_file, &utent); --#endif -+# endif - } - - /* -@@ -125,9 +126,10 @@ void FAST_FUNC update_utmp(pid_t pid, int new_type, const char *tty_name, const - pututline(&utent); - endutent(); - --#if ENABLE_FEATURE_WTMP -+# if ENABLE_FEATURE_WTMP - /* "man utmp" says wtmp file should *not* be created automagically */ - /*touch(bb_path_wtmp_file);*/ - updwtmp(bb_path_wtmp_file, &utent); --#endif -+# endif - } -+#endif /* ENABLE_FEATURE_UTMP */ -diff --git a/miscutils/last.c b/miscutils/last.c -index fec5b70..354af42 100644 ---- miscutils/last.c -+++ miscutils/last.c -@@ -8,7 +8,9 @@ - */ - - #include "libbb.h" --#include <utmp.h> -+#if ENABLE_FEATURE_UTMP -+# include <utmp.h> -+#endif - - /* NB: ut_name and ut_user are the same field, use only one name (ut_user) - * to reduce confusion */ -diff --git a/miscutils/runlevel.c b/miscutils/runlevel.c -index 363e450..b31736a 100644 ---- miscutils/runlevel.c -+++ miscutils/runlevel.c -@@ -12,7 +12,9 @@ - * initially busyboxified by Bernhard Reutner-Fischer - */ - #include "libbb.h" --#include <utmp.h> -+#if ENABLE_FEATURE_UTMP -+# include <utmp.h> -+#endif - - int runlevel_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; - int runlevel_main(int argc UNUSED_PARAM, char **argv) -diff --git a/miscutils/wall.c b/miscutils/wall.c -index eecfc16..738726e 100644 ---- miscutils/wall.c -+++ miscutils/wall.c -@@ -7,7 +7,9 @@ - */ - - #include "libbb.h" --#include <utmp.h> -+#if ENABLE_FEATURE_UTMP -+# include <utmp.h> -+#endif - - int wall_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; - int wall_main(int argc UNUSED_PARAM, char **argv) diff --git a/sysutils/busybox/files/patch-include__libbb.h b/sysutils/busybox/files/patch-include__libbb.h new file mode 100644 index 000000000000..ca322a9ebbdc --- /dev/null +++ b/sysutils/busybox/files/patch-include__libbb.h @@ -0,0 +1,22 @@ +--- ./include/libbb.h.orig 2011-08-11 02:23:58.000000000 +0200 ++++ ./include/libbb.h 2011-08-26 02:10:16.000000000 +0200 +@@ -75,6 +75,9 @@ + #ifdef DMALLOC + # include <dmalloc.h> + #endif ++#ifndef HAVE_XTABS ++# define XTABS OXTABS ++#endif + #include <pwd.h> + #include <grp.h> + #if ENABLE_FEATURE_SHADOWPASSWDS +@@ -120,9 +123,6 @@ + #ifndef HAVE_FDATASYNC + # define fdatasync fsync + #endif +-#ifndef HAVE_XTABS +-# define XTABS TAB3 +-#endif + + + /* Some libc's forget to declare these, do it ourself */ diff --git a/sysutils/busybox/files/patch-include__platform.h b/sysutils/busybox/files/patch-include__platform.h new file mode 100644 index 000000000000..2547cf5db188 --- /dev/null +++ b/sysutils/busybox/files/patch-include__platform.h @@ -0,0 +1,11 @@ +--- ./include/platform.h.orig 2011-08-11 02:23:58.000000000 +0200 ++++ ./include/platform.h 2011-08-26 02:10:16.000000000 +0200 +@@ -417,6 +417,8 @@ + # undef HAVE_STRVERSCMP + # undef HAVE_XTABS + # undef HAVE_DPRINTF ++# undef HAVE_UNLOCKED_STDIO ++# undef HAVE_UNLOCKED_LINE_OPS + #endif + + #if defined(__FreeBSD__) diff --git a/sysutils/busybox/files/patch-libbb__match_fstype.c b/sysutils/busybox/files/patch-libbb__match_fstype.c new file mode 100644 index 000000000000..62a4c006a81e --- /dev/null +++ b/sysutils/busybox/files/patch-libbb__match_fstype.c @@ -0,0 +1,17 @@ +--- ./libbb/match_fstype.c.orig 2011-08-11 02:23:58.000000000 +0200 ++++ ./libbb/match_fstype.c 2011-08-26 02:10:16.000000000 +0200 +@@ -10,6 +10,8 @@ + * Licensed under GPLv2 or later, see file LICENSE in this source tree. + */ + ++#ifdef HAVE_MNTENT_H ++ + #include "libbb.h" + + int FAST_FUNC match_fstype(const struct mntent *mt, const char *t_fstype) +@@ -40,3 +42,5 @@ + + return !match; + } ++ ++#endif /* HAVE_MNTENT_H */ diff --git a/sysutils/busybox/files/patch-scripts__kconfig__mconf.c b/sysutils/busybox/files/patch-scripts__kconfig__mconf.c new file mode 100644 index 000000000000..db0c1955cc69 --- /dev/null +++ b/sysutils/busybox/files/patch-scripts__kconfig__mconf.c @@ -0,0 +1,10 @@ +--- ./scripts/kconfig/mconf.c.orig 2011-08-11 02:23:58.000000000 +0200 ++++ ./scripts/kconfig/mconf.c 2011-08-26 02:10:16.000000000 +0200 +@@ -8,7 +8,6 @@ + * i18n, 2005, Arnaldo Carvalho de Melo <acme@conectiva.com.br> + */ + +-#define _XOPEN_SOURCE 700 + + #include <sys/ioctl.h> + #include <sys/wait.h> diff --git a/sysutils/busybox/files/patch-strnlen b/sysutils/busybox/files/patch-sysklogd__logread.c index 5d639049a653..e81587e5ac6e 100644 --- a/sysutils/busybox/files/patch-strnlen +++ b/sysutils/busybox/files/patch-sysklogd__logread.c @@ -1,8 +1,6 @@ -diff --git a/sysklogd/logread.c b/sysklogd/logread.c -index 52c97aa..93b886f 100644 ---- sysklogd/logread.c -+++ sysklogd/logread.c -@@ -14,6 +14,20 @@ +--- ./sysklogd/logread.c.orig 2011-08-11 02:23:58.000000000 +0200 ++++ ./sysklogd/logread.c 2011-08-26 02:10:16.000000000 +0200 +@@ -20,6 +20,20 @@ #include <sys/sem.h> #include <sys/shm.h> |