mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
busybox: update to busybox-1.21.0
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue
parent
7b5576563d
commit
4236f4f826
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Busybox version: 1.20.2
|
||||
# Tue Aug 7 00:21:10 2012
|
||||
# Busybox version: 1.21.0
|
||||
# Tue Jan 22 01:39:02 2013
|
||||
#
|
||||
CONFIG_HAVE_DOT_CONFIG=y
|
||||
|
||||
@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y
|
||||
# CONFIG_FEATURE_UTMP is not set
|
||||
# CONFIG_FEATURE_WTMP is not set
|
||||
# CONFIG_FEATURE_PIDFILE is not set
|
||||
CONFIG_PID_FILE_PATH=""
|
||||
# CONFIG_FEATURE_SUID is not set
|
||||
# CONFIG_FEATURE_SUID_CONFIG is not set
|
||||
# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
|
||||
@ -95,7 +96,8 @@ CONFIG_PREFIX="./_install-initramfs"
|
||||
CONFIG_FEATURE_SYSTEMD=y
|
||||
# CONFIG_FEATURE_RTMINMAX is not set
|
||||
CONFIG_PASSWORD_MINLEN=6
|
||||
CONFIG_MD5_SMALL=1
|
||||
CONFIG_MD5_SMALL=0
|
||||
CONFIG_SHA3_SMALL=0
|
||||
CONFIG_FEATURE_FAST_TOP=y
|
||||
# CONFIG_FEATURE_ETC_NETWORKS is not set
|
||||
# CONFIG_FEATURE_USE_TERMIOS is not set
|
||||
@ -263,6 +265,7 @@ CONFIG_RM=y
|
||||
# CONFIG_SHA1SUM is not set
|
||||
# CONFIG_SHA256SUM is not set
|
||||
# CONFIG_SHA512SUM is not set
|
||||
# CONFIG_SHA3SUM is not set
|
||||
CONFIG_SLEEP=y
|
||||
# CONFIG_FEATURE_FANCY_SLEEP is not set
|
||||
# CONFIG_FEATURE_FLOAT_SLEEP is not set
|
||||
@ -310,7 +313,7 @@ CONFIG_USLEEP=y
|
||||
# CONFIG_FEATURE_HUMAN_READABLE is not set
|
||||
|
||||
#
|
||||
# Common options for md5sum, sha1sum, sha256sum, sha512sum
|
||||
# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
|
||||
#
|
||||
CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
|
||||
|
||||
@ -371,7 +374,6 @@ CONFIG_FEATURE_VI_SETOPTS=y
|
||||
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 is not set
|
||||
# CONFIG_CMP is not set
|
||||
@ -612,9 +614,11 @@ CONFIG_FEATURE_VOLUMEID_EXT=y
|
||||
CONFIG_FEATURE_VOLUMEID_BTRFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_REISERFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_FAT=y
|
||||
CONFIG_FEATURE_VOLUMEID_EXFAT=y
|
||||
CONFIG_FEATURE_VOLUMEID_HFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_JFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_XFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_NILFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_NTFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_ISO9660=y
|
||||
CONFIG_FEATURE_VOLUMEID_UDF=y
|
||||
@ -622,6 +626,7 @@ CONFIG_FEATURE_VOLUMEID_LUKS=y
|
||||
CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
|
||||
CONFIG_FEATURE_VOLUMEID_CRAMFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_ROMFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_SYSV=y
|
||||
CONFIG_FEATURE_VOLUMEID_OCFS2=y
|
||||
CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
|
||||
@ -890,6 +895,13 @@ CONFIG_FEATURE_MIME_CHARSET=""
|
||||
# CONFIG_PSTREE is not set
|
||||
# CONFIG_PWDX is not set
|
||||
# CONFIG_SMEMCAP is not set
|
||||
# CONFIG_TOP is not set
|
||||
# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
|
||||
# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
|
||||
# CONFIG_FEATURE_TOP_SMP_CPU is not set
|
||||
# CONFIG_FEATURE_TOP_DECIMALS is not set
|
||||
# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
|
||||
# CONFIG_FEATURE_TOPMEM is not set
|
||||
# CONFIG_UPTIME is not set
|
||||
# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
|
||||
# CONFIG_FREE is not set
|
||||
@ -910,13 +922,6 @@ CONFIG_FEATURE_MIME_CHARSET=""
|
||||
# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
|
||||
# CONFIG_RENICE is not set
|
||||
# CONFIG_BB_SYSCTL is not set
|
||||
# CONFIG_TOP is not set
|
||||
# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
|
||||
# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
|
||||
# CONFIG_FEATURE_TOP_SMP_CPU is not set
|
||||
# CONFIG_FEATURE_TOP_DECIMALS is not set
|
||||
# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
|
||||
# CONFIG_FEATURE_TOPMEM is not set
|
||||
# CONFIG_FEATURE_SHOW_THREADS is not set
|
||||
# CONFIG_WATCH is not set
|
||||
|
||||
@ -1011,6 +1016,7 @@ CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
|
||||
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
|
||||
# CONFIG_LOGREAD is not set
|
||||
# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
|
||||
# CONFIG_FEATURE_KMSG_SYSLOG is not set
|
||||
# CONFIG_KLOGD is not set
|
||||
# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
|
||||
# CONFIG_LOGGER is not set
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Busybox version: 1.20.0
|
||||
# Sun Apr 22 16:23:36 2012
|
||||
# Busybox version: 1.21.0
|
||||
# Tue Jan 22 01:37:41 2013
|
||||
#
|
||||
CONFIG_HAVE_DOT_CONFIG=y
|
||||
|
||||
@ -42,6 +42,7 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
|
||||
# CONFIG_FEATURE_UTMP is not set
|
||||
# CONFIG_FEATURE_WTMP is not set
|
||||
# CONFIG_FEATURE_PIDFILE is not set
|
||||
CONFIG_PID_FILE_PATH=""
|
||||
# CONFIG_FEATURE_SUID is not set
|
||||
# CONFIG_FEATURE_SUID_CONFIG is not set
|
||||
# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
|
||||
@ -96,6 +97,7 @@ CONFIG_PREFIX="./_install-hosttools"
|
||||
# CONFIG_FEATURE_RTMINMAX is not set
|
||||
CONFIG_PASSWORD_MINLEN=6
|
||||
CONFIG_MD5_SMALL=1
|
||||
CONFIG_SHA3_SMALL=0
|
||||
CONFIG_FEATURE_FAST_TOP=y
|
||||
# CONFIG_FEATURE_ETC_NETWORKS is not set
|
||||
# CONFIG_FEATURE_USE_TERMIOS is not set
|
||||
@ -263,6 +265,7 @@ CONFIG_GZIP_FAST=0
|
||||
# CONFIG_SHA1SUM is not set
|
||||
# CONFIG_SHA256SUM is not set
|
||||
# CONFIG_SHA512SUM is not set
|
||||
# CONFIG_SHA3SUM is not set
|
||||
# CONFIG_SLEEP is not set
|
||||
# CONFIG_FEATURE_FANCY_SLEEP is not set
|
||||
# CONFIG_FEATURE_FLOAT_SLEEP is not set
|
||||
@ -355,7 +358,6 @@ CONFIG_FEATURE_VI_MAX_LEN=0
|
||||
# CONFIG_FEATURE_VI_SET is not set
|
||||
# CONFIG_FEATURE_VI_WIN_RESIZE is not set
|
||||
# CONFIG_FEATURE_VI_ASK_TERMINAL is not set
|
||||
# CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set
|
||||
# CONFIG_AWK is not set
|
||||
# CONFIG_FEATURE_AWK_LIBM is not set
|
||||
# CONFIG_CMP is not set
|
||||
@ -588,9 +590,11 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
|
||||
# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_FAT is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_EXFAT is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_HFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_JFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_XFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_NILFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_NTFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_UDF is not set
|
||||
@ -598,6 +602,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
|
||||
# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_SYSV is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
|
||||
@ -866,6 +871,13 @@ CONFIG_FEATURE_MIME_CHARSET=""
|
||||
# CONFIG_PSTREE is not set
|
||||
# CONFIG_PWDX is not set
|
||||
# CONFIG_SMEMCAP is not set
|
||||
# CONFIG_TOP is not set
|
||||
# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
|
||||
# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
|
||||
# CONFIG_FEATURE_TOP_SMP_CPU is not set
|
||||
# CONFIG_FEATURE_TOP_DECIMALS is not set
|
||||
# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
|
||||
# CONFIG_FEATURE_TOPMEM is not set
|
||||
# CONFIG_UPTIME is not set
|
||||
# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
|
||||
# CONFIG_FREE is not set
|
||||
@ -886,13 +898,6 @@ CONFIG_FEATURE_MIME_CHARSET=""
|
||||
# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
|
||||
# CONFIG_RENICE is not set
|
||||
# CONFIG_BB_SYSCTL is not set
|
||||
# CONFIG_TOP is not set
|
||||
# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
|
||||
# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
|
||||
# CONFIG_FEATURE_TOP_SMP_CPU is not set
|
||||
# CONFIG_FEATURE_TOP_DECIMALS is not set
|
||||
# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
|
||||
# CONFIG_FEATURE_TOPMEM is not set
|
||||
# CONFIG_FEATURE_SHOW_THREADS is not set
|
||||
# CONFIG_WATCH is not set
|
||||
|
||||
@ -987,6 +992,7 @@ CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
|
||||
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
|
||||
# CONFIG_LOGREAD is not set
|
||||
# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
|
||||
# CONFIG_FEATURE_KMSG_SYSLOG is not set
|
||||
# CONFIG_KLOGD is not set
|
||||
# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
|
||||
# CONFIG_LOGGER is not set
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Busybox version: 1.20.2
|
||||
# Fri Oct 12 19:25:56 2012
|
||||
# Busybox version: 1.21.0
|
||||
# Tue Jan 22 03:01:53 2013
|
||||
#
|
||||
CONFIG_HAVE_DOT_CONFIG=y
|
||||
|
||||
@ -22,7 +22,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
|
||||
# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
|
||||
CONFIG_SHOW_USAGE=y
|
||||
CONFIG_FEATURE_VERBOSE_USAGE=y
|
||||
# CONFIG_FEATURE_COMPRESS_USAGE is not set
|
||||
CONFIG_FEATURE_COMPRESS_USAGE=y
|
||||
CONFIG_FEATURE_INSTALLER=y
|
||||
CONFIG_INSTALL_NO_USR=y
|
||||
# CONFIG_LOCALE_SUPPORT is not set
|
||||
@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y
|
||||
# CONFIG_FEATURE_UTMP is not set
|
||||
# CONFIG_FEATURE_WTMP is not set
|
||||
CONFIG_FEATURE_PIDFILE=y
|
||||
CONFIG_PID_FILE_PATH="/run"
|
||||
CONFIG_FEATURE_SUID=y
|
||||
# CONFIG_FEATURE_SUID_CONFIG is not set
|
||||
# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
|
||||
@ -95,7 +96,8 @@ CONFIG_PREFIX="./_install-system"
|
||||
CONFIG_FEATURE_SYSTEMD=y
|
||||
CONFIG_FEATURE_RTMINMAX=y
|
||||
CONFIG_PASSWORD_MINLEN=6
|
||||
CONFIG_MD5_SMALL=1
|
||||
CONFIG_MD5_SMALL=0
|
||||
CONFIG_SHA3_SMALL=0
|
||||
CONFIG_FEATURE_FAST_TOP=y
|
||||
# CONFIG_FEATURE_ETC_NETWORKS is not set
|
||||
CONFIG_FEATURE_USE_TERMIOS=y
|
||||
@ -263,6 +265,7 @@ CONFIG_SEQ=y
|
||||
# CONFIG_SHA1SUM is not set
|
||||
# CONFIG_SHA256SUM is not set
|
||||
# CONFIG_SHA512SUM is not set
|
||||
# CONFIG_SHA3SUM is not set
|
||||
CONFIG_SLEEP=y
|
||||
CONFIG_FEATURE_FANCY_SLEEP=y
|
||||
CONFIG_FEATURE_FLOAT_SLEEP=y
|
||||
@ -310,7 +313,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
|
||||
CONFIG_FEATURE_HUMAN_READABLE=y
|
||||
|
||||
#
|
||||
# Common options for md5sum, sha1sum, sha256sum, sha512sum
|
||||
# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
|
||||
#
|
||||
CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
|
||||
|
||||
@ -371,7 +374,6 @@ CONFIG_FEATURE_VI_SETOPTS=y
|
||||
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 is not set
|
||||
@ -612,9 +614,11 @@ CONFIG_FEATURE_VOLUMEID_EXT=y
|
||||
CONFIG_FEATURE_VOLUMEID_BTRFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_REISERFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_FAT=y
|
||||
CONFIG_FEATURE_VOLUMEID_EXFAT=y
|
||||
CONFIG_FEATURE_VOLUMEID_HFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_JFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_XFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_NILFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_NTFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_ISO9660=y
|
||||
CONFIG_FEATURE_VOLUMEID_UDF=y
|
||||
@ -622,6 +626,7 @@ CONFIG_FEATURE_VOLUMEID_LUKS=y
|
||||
CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
|
||||
CONFIG_FEATURE_VOLUMEID_CRAMFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_ROMFS=y
|
||||
# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
|
||||
CONFIG_FEATURE_VOLUMEID_SYSV=y
|
||||
CONFIG_FEATURE_VOLUMEID_OCFS2=y
|
||||
CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
|
||||
@ -890,6 +895,13 @@ CONFIG_POWERTOP=y
|
||||
CONFIG_PSTREE=y
|
||||
CONFIG_PWDX=y
|
||||
CONFIG_SMEMCAP=y
|
||||
CONFIG_TOP=y
|
||||
CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
|
||||
CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
|
||||
CONFIG_FEATURE_TOP_SMP_CPU=y
|
||||
CONFIG_FEATURE_TOP_DECIMALS=y
|
||||
CONFIG_FEATURE_TOP_SMP_PROCESS=y
|
||||
CONFIG_FEATURE_TOPMEM=y
|
||||
CONFIG_UPTIME=y
|
||||
# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
|
||||
CONFIG_FREE=y
|
||||
@ -910,13 +922,6 @@ CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
|
||||
# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
|
||||
# CONFIG_RENICE is not set
|
||||
CONFIG_BB_SYSCTL=y
|
||||
CONFIG_TOP=y
|
||||
CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
|
||||
CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
|
||||
CONFIG_FEATURE_TOP_SMP_CPU=y
|
||||
CONFIG_FEATURE_TOP_DECIMALS=y
|
||||
CONFIG_FEATURE_TOP_SMP_PROCESS=y
|
||||
CONFIG_FEATURE_TOPMEM=y
|
||||
CONFIG_FEATURE_SHOW_THREADS=y
|
||||
# CONFIG_WATCH is not set
|
||||
|
||||
@ -1011,6 +1016,7 @@ CONFIG_FEATURE_IPC_SYSLOG=y
|
||||
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=32
|
||||
CONFIG_LOGREAD=y
|
||||
# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
|
||||
# CONFIG_FEATURE_KMSG_SYSLOG is not set
|
||||
CONFIG_KLOGD=y
|
||||
CONFIG_FEATURE_KLOGD_KLOGCTL=y
|
||||
CONFIG_LOGGER=y
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="busybox"
|
||||
PKG_VERSION="1.20.2"
|
||||
PKG_VERSION="1.21.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
diff -Naur busybox-1.20.2/util-linux/mount.c busybox-1.20.2.patch/util-linux/mount.c
|
||||
--- busybox-1.20.2/util-linux/mount.c 2012-07-02 16:08:25.000000000 +0200
|
||||
+++ busybox-1.20.2.patch/util-linux/mount.c 2012-11-14 00:04:29.305472692 +0100
|
||||
@@ -1804,7 +1804,7 @@
|
||||
int len;
|
||||
char c;
|
||||
len_and_sockaddr *lsa;
|
||||
- char *hostname, *dotted, *ip;
|
||||
+ char *hostname, *dotted, *ip, *share, *unc;
|
||||
|
||||
hostname = mp->mnt_fsname + 2;
|
||||
len = strcspn(hostname, "/\\");
|
||||
@@ -1812,6 +1812,15 @@
|
||||
goto report_error;
|
||||
c = hostname[len];
|
||||
hostname[len] = '\0';
|
||||
+
|
||||
+ share = hostname + len + 1;
|
||||
+ if (share[0] == '\0')
|
||||
+ goto report_error;
|
||||
+ // Insert "unc=\\hostname\share" option into options
|
||||
+ unc = xasprintf("unc=\\\\%s\\%s", hostname, share);
|
||||
+ parse_mount_options(unc, &filteropts);
|
||||
+ if (ENABLE_FEATURE_CLEAN_UP) free(unc);
|
||||
+
|
||||
lsa = host2sockaddr(hostname, 0);
|
||||
hostname[len] = c;
|
||||
if (!lsa)
|
||||
@ -1,25 +0,0 @@
|
||||
--- busybox-1.20.2/libbb/kernel_version.c
|
||||
+++ busybox-1.20.2-kernel_ver/libbb/kernel_version.c
|
||||
@@ -20,18 +20,15 @@
|
||||
int FAST_FUNC get_linux_version_code(void)
|
||||
{
|
||||
struct utsname name;
|
||||
- char *s;
|
||||
+ char *s, *t;
|
||||
int i, r;
|
||||
|
||||
- if (uname(&name) == -1) {
|
||||
- bb_perror_msg("can't get system information");
|
||||
- return 0;
|
||||
- }
|
||||
-
|
||||
+ uname(&name); /* never fails */
|
||||
s = name.release;
|
||||
r = 0;
|
||||
for (i = 0; i < 3; i++) {
|
||||
- r = r * 256 + atoi(strtok(s, "."));
|
||||
+ t = strtok(s, ".");
|
||||
+ r = r * 256 + (t ? atoi(t) : 0);
|
||||
s = NULL;
|
||||
}
|
||||
return r;
|
||||
@ -1,67 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,123 +0,0 @@
|
||||
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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user