From 38ceb02a8f7f2fb0f6f7e4dd404546d08568a3fa Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 26 Jul 2010 15:31:51 +0200 Subject: update to 1.17.1 --- package/busybox/Makefile | 6 ++-- package/busybox/patches/003-defaults-no.patch | 40 +++++++++++++++--------- package/busybox/patches/patch-include_libbb_h | 23 -------------- package/busybox/patches/patch-include_platform_h | 30 ------------------ 4 files changed, 29 insertions(+), 70 deletions(-) delete mode 100644 package/busybox/patches/patch-include_libbb_h delete mode 100644 package/busybox/patches/patch-include_platform_h (limited to 'package') diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 2af65a714..62e2789ba 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox -PKG_VERSION:= 1.17.0 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 2908d1d1ca83ff12bc0b05f0d2a3335c +PKG_VERSION:= 1.17.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= c7fe7533b7fc4018b0b49a05ee0ee601 PKG_DESCR:= Core utilities for embedded systems PKG_SECTION:= base PKG_URL:= http://www.busybox.net/ diff --git a/package/busybox/patches/003-defaults-no.patch b/package/busybox/patches/003-defaults-no.patch index 7385616e1..1bc448165 100644 --- a/package/busybox/patches/003-defaults-no.patch +++ b/package/busybox/patches/003-defaults-no.patch @@ -1,15 +1,27 @@ -diff -Nur busybox-1.17.0.orig/archival/Config.src busybox-1.17.0/archival/Config.src ---- busybox-1.17.0.orig/archival/Config.src 2010-06-25 01:32:35.000000000 +0200 -+++ busybox-1.17.0/archival/Config.src 2010-07-16 02:06:58.336016174 +0200 -@@ -39,7 +39,7 @@ +diff -Nur busybox-1.17.1.orig/Config.in busybox-1.17.1/Config.in +--- busybox-1.17.1.orig/Config.in 2010-07-25 00:12:56.000000000 +0200 ++++ busybox-1.17.1/Config.in 2010-07-26 14:32:24.000000000 +0200 +@@ -15,7 +15,7 @@ - config AR - bool "ar" + config DESKTOP + bool "Enable options for full-blown desktop systems" - default y + default n help - ar is an archival utility program used to create, modify, and - extract contents from archives. An archive is a single file holding + Enable options and features which are not essential. + Select this only if you plan to use busybox on full-blown +@@ -32,7 +32,7 @@ + + config INCLUDE_SUSv2 + bool "Enable obsolete features removed before SUSv3" +- default y ++ default n + help + This option will enable backwards compatibility with SuSv2, + specifically, old-style numeric options ('command -1 ') +diff -Nur busybox-1.17.1.orig/archival/Config.src busybox-1.17.1/archival/Config.src +--- busybox-1.17.1.orig/archival/Config.src 2010-07-25 00:12:56.000000000 +0200 ++++ busybox-1.17.1/archival/Config.src 2010-07-26 14:30:27.000000000 +0200 @@ -79,7 +79,7 @@ config BUNZIP2 @@ -78,9 +90,9 @@ diff -Nur busybox-1.17.0.orig/archival/Config.src busybox-1.17.0/archival/Config help unxz is a unlzma successor. -diff -Nur busybox-1.17.0.orig/editors/Config.src busybox-1.17.0/editors/Config.src ---- busybox-1.17.0.orig/editors/Config.src 2010-06-24 04:40:43.000000000 +0200 -+++ busybox-1.17.0/editors/Config.src 2010-07-16 02:05:47.485881936 +0200 +diff -Nur busybox-1.17.1.orig/editors/Config.src busybox-1.17.1/editors/Config.src +--- busybox-1.17.1.orig/editors/Config.src 2010-07-06 04:25:53.000000000 +0200 ++++ busybox-1.17.1/editors/Config.src 2010-07-26 14:30:27.000000000 +0200 @@ -31,7 +31,7 @@ config DIFF @@ -106,9 +118,9 @@ diff -Nur busybox-1.17.0.orig/editors/Config.src busybox-1.17.0/editors/Config.s help sed is used to perform text transformations on a file or input from a pipeline. -diff -Nur busybox-1.17.0.orig/networking/Config.src busybox-1.17.0/networking/Config.src ---- busybox-1.17.0.orig/networking/Config.src 2010-06-27 04:21:56.000000000 +0200 -+++ busybox-1.17.0/networking/Config.src 2010-07-16 02:05:16.665861002 +0200 +diff -Nur busybox-1.17.1.orig/networking/Config.src busybox-1.17.1/networking/Config.src +--- busybox-1.17.1.orig/networking/Config.src 2010-07-25 00:12:43.000000000 +0200 ++++ busybox-1.17.1/networking/Config.src 2010-07-26 14:30:27.000000000 +0200 @@ -961,7 +961,7 @@ config WGET diff --git a/package/busybox/patches/patch-include_libbb_h b/package/busybox/patches/patch-include_libbb_h deleted file mode 100644 index 4f08ed4e5..000000000 --- a/package/busybox/patches/patch-include_libbb_h +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nur busybox-1.17.0.orig/include/libbb.h busybox-1.17.0/include/libbb.h ---- busybox-1.17.0.orig/include/libbb.h 2010-07-04 15:32:24.000000000 +0200 -+++ busybox-1.17.0/include/libbb.h 2010-07-08 12:27:04.531002165 +0200 -@@ -40,6 +40,9 @@ - /* Try to pull in PATH_MAX */ - #include - #include -+ -+#if !(defined __APPLE__ || defined __FreeBSD__ || defined __MirBSD__ ) -+ - #ifdef HAVE_MNTENT_H - #include - #endif -@@ -52,6 +55,9 @@ - #include - #include - #endif -+ -+#endif -+ - #if ENABLE_LOCALE_SUPPORT - # include - #else diff --git a/package/busybox/patches/patch-include_platform_h b/package/busybox/patches/patch-include_platform_h deleted file mode 100644 index 307c588ec..000000000 --- a/package/busybox/patches/patch-include_platform_h +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nur busybox-1.17.0.orig/include/platform.h busybox-1.17.0/include/platform.h ---- busybox-1.17.0.orig/include/platform.h 2010-06-24 04:40:43.000000000 +0200 -+++ busybox-1.17.0/include/platform.h 2010-07-08 12:15:16.099001527 +0200 -@@ -20,6 +20,8 @@ - #define HAVE_STRSIGNAL 1 - #define HAVE_VASPRINTF 1 - -+#include -+ - /* Convenience macros to test the version of gcc. */ - #undef __GNUC_PREREQ - #if defined __GNUC__ && defined __GNUC_MINOR__ -@@ -161,7 +163,7 @@ - # define bswap_32 __bswap32 - # define bswap_16 __bswap16 - # define __BIG_ENDIAN__ (_BYTE_ORDER == _BIG_ENDIAN) --#elif !defined __APPLE__ -+#elif !(defined __APPLE__ || defined BSD) - # include - # include - #endif -@@ -230,7 +232,7 @@ - /* ---- Compiler dependent settings ------------------------- */ - - #if (defined __digital__ && defined __unix__) \ -- || defined __APPLE__ || defined __FreeBSD__ -+ || defined __APPLE__ || defined __FreeBSD__ || defined BSD - # undef HAVE_MNTENT_H - # undef HAVE_SYS_STATFS_H - #else -- cgit v1.2.3