- up to 1.20.2; unfortunately bunch of linking problems so rel 0.1

diff --git a/busybox-dhcp.patch b/busybox-dhcp.patch
index f708b247a068209b746f6cc269270cd37bb9e34a..e812a6443733ac049f4d6177d2fde4ceb53359cf 100644 (file)
--- a/busybox-dhcp.patch
+++ b/busybox-dhcp.patch
@@ -1,13 +1,13 @@
---- busybox-1.17.3/networking/udhcp/common.c~  2010-10-09 22:57:14.000000000 +0300
-+++ busybox-1.17.3/networking/udhcp/common.c   2010-11-08 21:36:56.660518687 +0200
+--- busybox-1.20.2/networking/udhcp/common.c~  2012-06-26 15:35:45.000000000 +0200
++++ busybox-1.20.2/networking/udhcp/common.c   2013-01-02 22:06:43.349795477 +0100
 @@ -32,8 +32,8 @@
-       { OPTION_STRING               | OPTION_REQ, 0x0c }, /* DHCP_HOST_NAME     */
+       { OPTION_STRING_HOST          | OPTION_REQ, 0x0c }, /* DHCP_HOST_NAME     */
        { OPTION_U16                              , 0x0d }, /* DHCP_BOOT_SIZE     */
-       { OPTION_STRING               | OPTION_REQ, 0x0f }, /* DHCP_DOMAIN_NAME   */
+       { OPTION_STRING_HOST          | OPTION_REQ, 0x0f }, /* DHCP_DOMAIN_NAME   */
 -      { OPTION_IP                               , 0x10 }, /* DHCP_SWAP_SERVER   */
 -      { OPTION_STRING                           , 0x11 }, /* DHCP_ROOT_PATH     */
 +      { OPTION_IP                   | OPTION_REQ, 0x10 }, /* DHCP_SWAP_SERVER   */
 +      { OPTION_STRING               | OPTION_REQ, 0x11 }, /* DHCP_ROOT_PATH     */
        { OPTION_U8                               , 0x17 }, /* DHCP_IP_TTL        */
        { OPTION_U16                              , 0x1a }, /* DHCP_MTU           */
-       { OPTION_IP                   | OPTION_REQ, 0x1c }, /* DHCP_BROADCAST     */
+ //TODO: why do we request DHCP_BROADCAST? Can't we assume that

diff --git a/busybox-git.patch b/busybox-git.patch
deleted file mode 100644 (file)
index a36b0df..0000000
--- a/busybox-git.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-commit efd08bfa0adab3ae299be7abdd45161a15804a3b
-Author: Denys Vlasenko <vda.linux@googlemail.com>
-Date:   Wed Oct 19 17:54:42 2011 +0200
-
-    gen_build_files: don't pass 200k+ strings as params. Closes 4321
-    
-    Also removes one grep per generated file.
-    
-    Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-
-diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh
-index e518a90..1a3d3e9 100755
---- a/scripts/gen_build_files.sh
-+++ b/scripts/gen_build_files.sh
-@@ -19,25 +19,20 @@ chk() { status "CHK" "$@"; }
- 
- generate()
- {
--      local src="$1" dst="$2" header="$3" insert="$4"
-+      # NB: data to be inserted at INSERT line is coming on stdin
-+      local src="$1" dst="$2" header="$3"
-       #chk "${dst}"
--      (
-+      {
-               # Need to use printf: different shells have inconsistent
--              # rules re handling of "\n" in echo params,
--              # and ${insert} definitely contains "\n".
--              # Therefore, echo "${header}" would not work:
-+              # rules re handling of "\n" in echo params.
-               printf "%s\n" "${header}"
--              if grep -qs '^INSERT$' "${src}"; then
--                      sed -n '1,/^INSERT$/p' "${src}"
--                      printf "%s\n" "${insert}"
--                      sed -n '/^INSERT$/,$p' "${src}"
--              else
--                      if [ -n "${insert}" ]; then
--                              printf "%s\n" "ERROR: INSERT line missing in: ${src}" 1>&2
--                      fi
--                      cat "${src}"
--              fi
--      ) | sed '/^INSERT$/d' > "${dst}.tmp"
-+              # print everything up to INSERT line
-+              sed -n '/^INSERT$/q;1,/^INSERT$/p' "${src}"
-+              # copy stdin to stdout
-+              cat
-+              # print everything after INSERT line
-+              sed -n '/^INSERT$/{:l;n;p;bl}' "${src}"
-+      } >"${dst}.tmp"
-       if ! cmp -s "${dst}" "${dst}.tmp"; then
-               gen "${dst}"
-               mv "${dst}.tmp" "${dst}"
-@@ -47,24 +42,21 @@ generate()
- }
- 
- # (Re)generate include/applets.h
--s=`sed -n 's@^//applet:@@p' "$srctree"/*/*.c "$srctree"/*/*/*.c`
--generate \
-+sed -n 's@^//applet:@@p' "$srctree"/*/*.c "$srctree"/*/*/*.c \
-+| generate \
-       "$srctree/include/applets.src.h" \
-       "include/applets.h" \
--      "/* DO NOT EDIT. This file is generated from applets.src.h */" \
--      "${s}"
-+      "/* DO NOT EDIT. This file is generated from applets.src.h */"
- 
- # (Re)generate include/usage.h
- # We add line continuation backslash after each line,
- # and insert empty line before each line which doesn't start
- # with space or tab
--# (note: we need to use \\\\ because of ``)
--s=`sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\\\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\\\@p' "$srctree"/*/*.c "$srctree"/*/*/*.c`
--generate \
-+sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\@p' "$srctree"/*/*.c "$srctree"/*/*/*.c \
-+| generate \
-       "$srctree/include/usage.src.h" \
-       "include/usage.h" \
--      "/* DO NOT EDIT. This file is generated from usage.src.h */" \
--      "${s}"
-+      "/* DO NOT EDIT. This file is generated from usage.src.h */"
- 
- # (Re)generate */Kbuild and */Config.in
- { cd -- "$srctree" && find . -type d; } | while read -r d; do
-@@ -75,11 +67,10 @@ generate \
-       if test -f "$src"; then
-               mkdir -p -- "$d" 2>/dev/null
- 
--              s=`sed -n 's@^//kbuild:@@p' "$srctree/$d"/*.c`
--              generate \
-+              sed -n 's@^//kbuild:@@p' "$srctree/$d"/*.c \
-+              | generate \
-                       "${src}" "${dst}" \
--                      "# DO NOT EDIT. This file is generated from Kbuild.src" \
--                      "${s}"
-+                      "# DO NOT EDIT. This file is generated from Kbuild.src"
-       fi
- 
-       src="$srctree/$d/Config.src"
-@@ -87,11 +78,10 @@ generate \
-       if test -f "$src"; then
-               mkdir -p -- "$d" 2>/dev/null
- 
--              s=`sed -n 's@^//config:@@p' "$srctree/$d"/*.c`
--              generate \
-+              sed -n 's@^//config:@@p' "$srctree/$d"/*.c \
-+              | generate \
-                       "${src}" "${dst}" \
--                      "# DO NOT EDIT. This file is generated from Config.src" \
--                      "${s}"
-+                      "# DO NOT EDIT. This file is generated from Config.src"
-       fi
- done
- 

diff --git a/busybox-initrd.config b/busybox-initrd.config
index a69f3cf06bee3cf93f16f7f04693b548fba30ff7..5c756ef36412efacf9e41a20b0930f444cc26ac5 100644 (file)
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -55,7 +55,10 @@ CONFIG_FEATURE_HAVE_RPC=y
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
 # CONFIG_LFS is not set
 CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_SYSROOT=""
 CONFIG_EXTRA_CFLAGS=""
+CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
 
 #
 # Debugging Options
@@ -90,7 +93,7 @@ CONFIG_FEATURE_SYSTEMD=y
 CONFIG_FEATURE_RTMINMAX=y
 CONFIG_FEATURE_SKIP_ROOTFS=y
 CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_MD5_SMALL=1
 # CONFIG_FEATURE_FAST_TOP is not set
 # CONFIG_FEATURE_ETC_NETWORKS is not set
 CONFIG_FEATURE_EDITING=y
@@ -473,7 +476,7 @@ CONFIG_LSMOD=y
 # Options common to multiple modutils
 #
 CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-CONFIG_FEATURE_2_4_MODULES=y
+# CONFIG_FEATURE_2_4_MODULES is not set
 CONFIG_FEATURE_2_6_MODULES=y
 CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
 CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
@@ -792,6 +795,7 @@ CONFIG_FEATURE_UDHCP_8021Q=y
 # CONFIG_TCPSVD is not set
 # CONFIG_UDPSVD is not set
 # CONFIG_TUNCTL is not set
+CONFIG_UDHCPC6=y
 
 #
 # Process Utilities
@@ -813,6 +817,7 @@ CONFIG_KILLALL5=y
 # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
 # CONFIG_RENICE is not set
 # CONFIG_IOSTAT is not set
+# CONFIG_LSOF is not set
 # CONFIG_MPSTAT is not set
 # CONFIG_PMAP is not set
 # CONFIG_POWERTOP is not set

diff --git a/busybox.config b/busybox.config
index 77333157b3007bb704eed44e54e883369efe20fb..f34307f0fd9033be44585940dd7a81d598225516 100644 (file)
--- a/busybox.config
+++ b/busybox.config
@@ -59,7 +59,10 @@ CONFIG_PLATFORM_LINUX=y
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
 CONFIG_LFS=y
 CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_SYSROOT=""
 CONFIG_EXTRA_CFLAGS=""
+CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
 
 #
 # Debugging Options
@@ -92,7 +95,7 @@ CONFIG_PREFIX="./_install"
 CONFIG_FEATURE_SYSTEMD=y
 CONFIG_FEATURE_RTMINMAX=y
 CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_MD5_SMALL=1
 CONFIG_FEATURE_FAST_TOP=y
 # CONFIG_FEATURE_ETC_NETWORKS is not set
 CONFIG_FEATURE_EDITING=y
@@ -100,6 +103,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024
 CONFIG_FEATURE_EDITING_VI=y
 CONFIG_FEATURE_EDITING_HISTORY=15
 CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
 CONFIG_FEATURE_REVERSE_SEARCH=y
 CONFIG_FEATURE_TAB_COMPLETION=y
 CONFIG_FEATURE_USERNAME_COMPLETION=y
@@ -139,6 +143,7 @@ CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y
 CONFIG_GUNZIP=y
 CONFIG_GZIP=y
 CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
+CONFIG_GZIP_FAST=0
 CONFIG_LZOP=y
 CONFIG_LZOP_COMPR_HIGH=y
 CONFIG_RPM2CPIO=y
@@ -268,6 +273,7 @@ CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
 CONFIG_TEST=y
 CONFIG_FEATURE_TEST_64=y
 CONFIG_TOUCH=y
+CONFIG_FEATURE_TOUCH_SUSV3=y
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
@@ -459,6 +465,7 @@ CONFIG_GETTY=y
 CONFIG_FEATURE_UTMP=y
 CONFIG_FEATURE_WTMP=y
 CONFIG_LOGIN=y
+CONFIG_LOGIN_SESSION_AS_CHILD=y
 # CONFIG_PAM is not set
 # CONFIG_LOGIN_SCRIPTS is not set
 CONFIG_FEATURE_NOLOGIN=y
@@ -467,6 +474,7 @@ CONFIG_PASSWD=y
 CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
 CONFIG_CRYPTPW=y
 CONFIG_CHPASSWD=y
+CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="sha512"
 CONFIG_SU=y
 CONFIG_FEATURE_SU_SYSLOG=y
 CONFIG_FEATURE_SU_CHECKS_SHELLS=y
@@ -866,6 +874,7 @@ CONFIG_ZCIP=y
 CONFIG_TCPSVD=y
 CONFIG_UDPSVD=y
 CONFIG_TUNCTL=y
+CONFIG_UDHCPC6=y
 CONFIG_FEATURE_TUNCTL_UG=y
 CONFIG_NBDCLIENT=y
 
@@ -895,6 +904,7 @@ CONFIG_FEATURE_SENDMAIL_MAILXX=y
 CONFIG_FREE=y
 CONFIG_FUSER=y
 CONFIG_IOSTAT=y
+CONFIG_LSOF=y
 CONFIG_MPSTAT=y
 CONFIG_PMAP=y
 CONFIG_POWERTOP=y

diff --git a/busybox.spec b/busybox.spec
index 19918fda34ebcf84bdf397e8d00d56a3a8404783..e7dd4f891af9db96006e7a1dd4595ec54a470822 100644 (file)
--- a/busybox.spec
+++ b/busybox.spec
@@ -37,22 +37,22 @@ Summary(pl.UTF-8):  Zestaw narzędzi uniksowych dla systemów wbudowanych
 Summary(pt_BR.UTF-8):  BusyBox é um conjunto de utilitários UNIX em um único binário
 Name:          busybox
 # stable line only
-Version:       1.19.3
-Release:       1
+Version:       1.20.2
+Release:       0.1
 License:       GPL v2
 Group:         Applications
 Source0:       http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: c3938e1ac59602387009bbf1dd1af7f6
+# Source0-md5: e025414bc6cd79579cc7a32a45d3ae1c
 Source1:       %{name}.config
 Source2:       %{name}-initrd.config
 %{?with_altconfig:Source3:     %{cfgfile}}
-Patch100:      http://busybox.net/downloads/fixes-1.19.3/busybox-1.19.3-getty.patch
-# Patch100-md5:        5ed72ca85b8fba4598d64a550210b31f
-Patch101:      http://busybox.net/downloads/fixes-1.19.3/busybox-1.19.3-modinfo.patch
-# Patch101-md5:        41636628e481f22b8774b6bee1eebfb1
-Patch102:      http://busybox.net/downloads/fixes-1.19.3/busybox-1.19.3-wget.patch
-# Patch102-md5:        cb48bffc0e1e3be527cd4ff67324a2a2
-Patch0:                %{name}-git.patch
+Patch100:      http://busybox.net/downloads/fixes-1.20.2/busybox-1.20.2-kernel_ver.patch
+# Patch100-md5:        3386a2bf992f2284b86608498f4cb822
+Patch101:      http://busybox.net/downloads/fixes-1.20.2/busybox-1.20.2-pkg-config-selinux.patch
+# Patch101-md5:        a1b6587697c70808808f3693c4610884
+Patch102:      http://busybox.net/downloads/fixes-1.20.2/busybox-1.20.2-sys-resource.patch
+# Patch102-md5:        cfb5d5d7ed1414b5749f2c2ec0bf066a
+
 Patch1:                %{name}-logconsole.patch
 Patch2:                %{name}-printf-gettext.patch
 Patch3:                %{name}-loadfont.patch
@@ -162,7 +162,7 @@ Statycznie skonsolidowany busybox dla initrd.
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
-%patch0 -p1
+
 %patch1 -p1
 %patch2 -p1
 #%patch3 -p1