Hello community,
here is the log from the commit of package busybox for openSUSE:Factory
checked in at Fri Jan 9 02:22:58 CET 2009.
--------
--- busybox/busybox.changes 2008-10-15 14:46:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/busybox/busybox.changes 2008-12-18 11:39:45.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Dec 18 11:35:49 CET 2008 - sassmann@suse.de
+
+- update to 1.12.3 bugfix release
+ * has fixes for option parsing and line editing
+
+-------------------------------------------------------------------
+Tue Nov 4 14:01:23 CET 2008 - sassmann@suse.de
+
+- updated config file to use a single config for
+ both busybox and busybox-static
+
+-------------------------------------------------------------------
New Changes file:
--- /dev/null 2008-04-22 03:09:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/busybox/busybox-static.changes 2008-12-18 11:39:45.000000000 +0100
@@ -0,0 +1,11 @@
+-------------------------------------------------------------------
+Thu Dec 18 11:35:49 CET 2008 - sassmann@suse.de
+
+- update to 1.12.3 bugfix release
+ * has fixes for option parsing and line editing
+
+-------------------------------------------------------------------
+Tue Nov 4 14:00:43 CET 2008 - sassmann@suse.de
+
+- initial release of busybox-static (version 1.12.1)
+
calling whatdependson for head-i586
Old:
----
busybox-1.12.1.tar.bz2
New:
----
busybox-1.12.3.tar.bz2
busybox-static.changes
busybox-static.spec
busybox.uClibc-build-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ busybox.spec ++++++
--- /var/tmp/diff_new_pack.P20500/_old 2009-01-09 02:21:22.000000000 +0100
+++ /var/tmp/diff_new_pack.P20500/_new 2009-01-09 02:21:22.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package busybox (Version 1.12.1)
+# spec file for package busybox (Version 1.12.3)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,10 +19,9 @@
Name: busybox
-BuildRequires: libselinux-devel
Url: http://www.busybox.net/
-Version: 1.12.1
-Release: 1
+Version: 1.12.3
+Release: 2
Summary: The Swiss Army Knife of Embedded Linux
License: GPL v2 or later
Group: System/Base
@@ -104,6 +103,12 @@
/lib/mkinitrd/scripts/boot-busybox.sh
%changelog
+* Thu Dec 18 2008 sassmann@suse.de
+- update to 1.12.3 bugfix release
+ * has fixes for option parsing and line editing
+* Tue Nov 04 2008 sassmann@suse.de
+- updated config file to use a single config for
+ both busybox and busybox-static
* Wed Oct 15 2008 sassmann@suse.de
- update to 1.12.1
see http://www.busybox.net/ for full changelog
@@ -168,13 +173,13 @@
* Thu May 12 2005 uli@suse.de
- use dietlibc on ARM
- uclibc config file needs to be fixed
-* Sat Apr 02 2005 mmj@suse.de
+* Fri Apr 01 2005 mmj@suse.de
- Correct function declaration
* Mon Jan 24 2005 nashif@suse.de
- Update to 1.00 final
* Tue Aug 17 2004 nashif@suse.de
- Update to 1.00-rc3
-* Fri Aug 06 2004 nashif@suse.de
+* Thu Aug 05 2004 nashif@suse.de
- Update to 1.00-rc2
* Wed Jul 21 2004 nashif@suse.de
- Update to 1.00-rc1
@@ -186,7 +191,7 @@
- Update to 1.0 pre 8
* Wed Feb 11 2004 ro@suse.de
- hack to build it on amd64
-* Wed Feb 11 2004 schwab@suse.de
+* Tue Feb 10 2004 schwab@suse.de
- Fix building on ia64.
* Wed Feb 04 2004 kukuk@suse.de
- Remove wrong dietlibc requires
@@ -224,7 +229,7 @@
- Rewrite of tftp
* Sat Aug 04 2001 nashif@suse.de
- Update to version 0.60.0
-* Fri Jul 13 2001 nashif@suse.de
+* Thu Jul 12 2001 nashif@suse.de
- Update to version 0.52
* Wed Apr 11 2001 nashif@suse.de
- Update to version 0.51
@@ -236,7 +241,7 @@
- disabled insmod for all archs except IA32, ARM and SH
* Tue Dec 19 2000 nashif@suse.de
- Update to 0.48 (Fixes many bugs)
-* Tue Nov 28 2000 nashif@suse.de
+* Mon Nov 27 2000 nashif@suse.de
- Fixed pathes in install script
* Tue Nov 07 2000 nashif@suse.de
- Added EM_486 and OPEN_MAX fixes
++++++ busybox-static.spec ++++++
#
# spec file for package busybox-static (Version 1.12.3)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: busybox-static
Url: http://www.busybox.net/
Version: 1.12.3
Release: 2
Summary: The Swiss Army Knife of Embedded Linux
License: GPL v2 or later
Group: System/Base
AutoReqProv: on
Source: http://busybox.net/downloads/busybox-%{version}.tar.bz2
Source2: busybox.SuSE.config
Source3: mkinitrd-setup.sh
Source4: mkinitrd-boot.sh
Patch1: busybox.uClibc-build-fix.patch
Patch100: busybox.install.patch
Patch101: busybox.libunarchive-array.patch
Patch102: busybox.dmesg-size.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: uClibc-devel
ExcludeArch: s390 s390x ppc64
%description
BusyBox combines tiny versions of many common UNIX utilities into a
small single executable. It provides minimalist replacements for most
of the utilities usually found in fileutils, shellutils, findutils,
textutils, grep, gzip, tar, and more. BusyBox provides a fairly
complete POSIX environment for any small or embedded system. The
utilities in BusyBox generally have fewer options than their
full-featured GNU cousins. The options that are included provide the
expected functionality and behave very much like their GNU
counterparts.
Authors:
--------
Erik B. Andersen
%prep
%setup -q -n busybox-%{version}
%patch1 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p1
%build
cp -avL %{S:2} .config
find -name CVS | xargs rm -rf
find -name .svn | xargs rm -rf
export VERBOSE=-v
export BUILD_VERBOSE=2
make -e oldconfig
make -e CC=gcc-uClibc %{?jobs:-j%jobs}
%install
find -name ".cvsignore" -exec rm {} \;
install -d $RPM_BUILD_ROOT/usr/bin
install busybox $RPM_BUILD_ROOT/usr/bin/busybox-static
%files
%defattr(-,root,root)
/usr/bin/busybox-static
%changelog
* Thu Dec 18 2008 sassmann@suse.de
- update to 1.12.3 bugfix release
* has fixes for option parsing and line editing
* Tue Nov 04 2008 sassmann@suse.de
- initial release of busybox-static (version 1.12.1)
++++++ busybox-1.12.1.tar.bz2 -> busybox-1.12.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/busybox-1.12.1/coreutils/basename.c new/busybox-1.12.3/coreutils/basename.c
--- old/busybox-1.12.1/coreutils/basename.c 2008-09-28 20:04:18.000000000 +0200
+++ new/busybox-1.12.3/coreutils/basename.c 2008-11-09 18:20:03.000000000 +0100
@@ -48,5 +48,5 @@
/* puts(s) will do, but we can do without stdio this way: */
s[m++] = '\n';
- return full_write(STDOUT_FILENO, s, m) == (ssize_t)m;
+ return full_write(STDOUT_FILENO, s, m) != (ssize_t)m;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/busybox-1.12.1/coreutils/env.c new/busybox-1.12.3/coreutils/env.c
--- old/busybox-1.12.1/coreutils/env.c 2008-09-28 20:04:18.000000000 +0200
+++ new/busybox-1.12.3/coreutils/env.c 2008-11-09 18:20:37.000000000 +0100
@@ -29,6 +29,8 @@
* - use xfunc_error_retval
*/
+/* This is a NOEXEC applet. Be very careful! */
+
#include "libbb.h"
#if ENABLE_FEATURE_ENV_LONG_OPTIONS
@@ -119,5 +121,3 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/busybox-1.12.1/editors/vi.c new/busybox-1.12.3/editors/vi.c
--- old/busybox-1.12.1/editors/vi.c 2008-09-28 20:04:29.000000000 +0200
+++ new/busybox-1.12.3/editors/vi.c 2008-11-09 18:20:49.000000000 +0100
@@ -291,6 +291,8 @@
#define INIT_G() do { \
SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
last_file_modified = -1; \
+ /* "" but has space for 2 chars */ \
+ USE_FEATURE_VI_SEARCH(last_search_pattern = xzalloc(2);) \
} while (0)
@@ -2974,7 +2976,7 @@
const char *msg = msg; // for compiler
char c1, *p, *q, *save_dot;
char buf[12];
- int dir = dir; // for compiler
+ int dir;
int cnt, i, j;
// c1 = c; // quiet the compiler
@@ -3316,7 +3318,7 @@
q = get_input_line(buf); // get input line- use "status line"
if (q[0] && !q[1]) {
if (last_search_pattern[0])
- last_search_pattern[0] = c;
+ last_search_pattern[0] = c;
goto dc3; // if no pat re-use old pat
}
if (q[0]) { // strlen(q) > 1: new pat- save it and find
@@ -3346,14 +3348,8 @@
do_cmd(c);
} // repeat cnt
dc3:
- if (last_search_pattern == 0) {
- msg = "No previous regular expression";
- goto dc2;
- }
- if (last_search_pattern[0] == '/') {
- dir = FORWARD; // assume FORWARD search
- p = dot + 1;
- }
+ dir = FORWARD; // assume FORWARD search
+ p = dot + 1;
if (last_search_pattern[0] == '?') {
dir = BACK;
p = dot - 1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/busybox-1.12.1/findutils/grep.c new/busybox-1.12.3/findutils/grep.c
--- old/busybox-1.12.1/findutils/grep.c 2008-09-28 20:04:28.000000000 +0200
+++ new/busybox-1.12.3/findutils/grep.c 2008-11-09 18:20:08.000000000 +0100
@@ -363,12 +363,22 @@
* (unless -v: -Fov doesnt print anything at all) */
if (found)
print_line(gl->pattern, strlen(gl->pattern), linenum, ':');
- } else {
+ } else while (1) {
+ char old = line[gl->matched_range.rm_eo];
line[gl->matched_range.rm_eo] = '\0';
print_line(line + gl->matched_range.rm_so,
gl->matched_range.rm_eo - gl->matched_range.rm_so,
linenum, ':');
- }
+ line[gl->matched_range.rm_eo] = old;
+#if !ENABLE_EXTRA_COMPAT
+ break;
+#else
+ if (re_search(&gl->compiled_regex, line, line_len,
+ gl->matched_range.rm_eo, line_len - gl->matched_range.rm_eo,
+ &gl->matched_range) < 0)
+ break;
+#endif
+ }
} else {
print_line(line, line_len, linenum, ':');
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/busybox-1.12.1/include/applets.h new/busybox-1.12.3/include/applets.h
--- old/busybox-1.12.1/include/applets.h 2008-09-28 20:04:26.000000000 +0200
+++ new/busybox-1.12.3/include/applets.h 2008-11-09 18:20:37.000000000 +0100
@@ -136,7 +136,7 @@
USE_ED(APPLET(ed, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_FEATURE_GREP_EGREP_ALIAS(APPLET_ODDNAME(egrep, grep, _BB_DIR_BIN, _BB_SUID_NEVER, egrep))
USE_EJECT(APPLET(eject, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
-USE_ENV(APPLET(env, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+USE_ENV(APPLET_NOEXEC(env, env, _BB_DIR_USR_BIN, _BB_SUID_NEVER, env))
USE_ENVDIR(APPLET_ODDNAME(envdir, chpst, _BB_DIR_USR_BIN, _BB_SUID_NEVER, envdir))
USE_ENVUIDGID(APPLET_ODDNAME(envuidgid, chpst, _BB_DIR_USR_BIN, _BB_SUID_NEVER, envuidgid))
USE_ETHER_WAKE(APPLET_ODDNAME(ether-wake, ether_wake, _BB_DIR_USR_BIN, _BB_SUID_NEVER, ether_wake))
@@ -171,7 +171,7 @@
USE_GUNZIP(APPLET(gunzip, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_GZIP(APPLET(gzip, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_HALT(APPLET(halt, _BB_DIR_SBIN, _BB_SUID_NEVER))
-USE_HD(APPLET_ODDNAME(hd, hexdump, _BB_DIR_USR_BIN, _BB_SUID_NEVER, hd))
+USE_HD(APPLET_NOEXEC(hd, hexdump, _BB_DIR_USR_BIN, _BB_SUID_NEVER, hd))
USE_HDPARM(APPLET(hdparm, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_HEAD(APPLET(head, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_HEXDUMP(APPLET_NOEXEC(hexdump, hexdump, _BB_DIR_USR_BIN, _BB_SUID_NEVER, hexdump))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/busybox-1.12.1/libbb/getopt32.c new/busybox-1.12.3/libbb/getopt32.c
--- old/busybox-1.12.1/libbb/getopt32.c 2008-09-28 20:04:20.000000000 +0200
+++ new/busybox-1.12.3/libbb/getopt32.c 2008-11-29 07:42:19.000000000 +0100
@@ -517,18 +517,8 @@
/* In case getopt32 was already called:
* reset the libc getopt() function, which keeps internal state.
- *
- * BSD-derived getopt() functions require that optind be set to 1 in
- * order to reset getopt() state. This used to be generally accepted
- * way of resetting getopt(). However, glibc's getopt()
- * has additional getopt() state beyond optind, and requires that
- * optind be set to zero to reset its state. So the unfortunate state of
- * affairs is that BSD-derived versions of getopt() misbehave if
- * optind is set to 0 in order to reset getopt(), and glibc's getopt()
- * will core dump if optind is set 1 in order to reset getopt().
- *
- * More modern versions of BSD require that optreset be set to 1 in
- * order to reset getopt(). Sigh. Standards, anyone?
+ * run_nofork_applet_prime() does this, but we might end up here
+ * also via gunzip_main() -> gzip_main(). Play safe.
*/
#ifdef __GLIBC__
optind = 0;
@@ -537,6 +527,7 @@
/* optreset = 1; */
#endif
/* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
+
pargv = NULL;
/* Note: just "getopt() <= 0" will not work well for
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/busybox-1.12.1/libbb/lineedit.c new/busybox-1.12.3/libbb/lineedit.c
--- old/busybox-1.12.1/libbb/lineedit.c 2008-09-28 20:04:20.000000000 +0200
+++ new/busybox-1.12.3/libbb/lineedit.c 2008-11-29 07:42:23.000000000 +0100
@@ -1415,7 +1415,10 @@
if ((state->flags & SAVE_HISTORY) && state->hist_file)
load_history(state->hist_file);
#endif
- state->cur_history = state->cnt_history;
+#if MAX_HISTORY > 0
+ if (state->flags & DO_HISTORY)
+ state->cur_history = state->cnt_history;
+#endif
/* prepare before init handlers */
cmdedit_y = 0; /* quasireal y, not true if line > xt*yt */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/busybox-1.12.1/libbb/setup_environment.c new/busybox-1.12.3/libbb/setup_environment.c
--- old/busybox-1.12.1/libbb/setup_environment.c 2008-09-28 20:04:20.000000000 +0200
+++ new/busybox-1.12.3/libbb/setup_environment.c 2008-11-09 18:20:21.000000000 +0100
@@ -32,16 +32,16 @@
void FAST_FUNC setup_environment(const char *shell, int clear_env, int change_env, const struct passwd *pw)
{
+ /* Change the current working directory to be the home directory
+ * of the user */
+ if (chdir(pw->pw_dir)) {
+ xchdir("/");
+ bb_error_msg("can't chdir to home directory '%s'", pw->pw_dir);
+ }
+
if (clear_env) {
const char *term;
- /* Change the current working directory to be the home directory
- * of the user */
- if (chdir(pw->pw_dir)) {
- xchdir("/");
- bb_error_msg("can't chdir to home directory '%s'", pw->pw_dir);
- }
-
/* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH.
Unset all other environment variables. */
term = getenv("TERM");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/busybox-1.12.1/libbb/vfork_daemon_rexec.c new/busybox-1.12.3/libbb/vfork_daemon_rexec.c
--- old/busybox-1.12.1/libbb/vfork_daemon_rexec.c 2008-09-28 20:04:20.000000000 +0200
+++ new/busybox-1.12.3/libbb/vfork_daemon_rexec.c 2008-11-09 18:20:37.000000000 +0100
@@ -125,6 +125,7 @@
int rc, argc;
applet_name = APPLET_NAME(applet_no);
+
xfunc_error_retval = EXIT_FAILURE;
/* Special flag for xfunc_die(). If xfunc will "die"
@@ -132,7 +133,30 @@
* die_sleep and longjmp here instead. */
die_sleep = -1;
- /* option_mask32 = 0; - not needed */
+ /* In case getopt() or getopt32() was already called:
+ * reset the libc getopt() function, which keeps internal state.
+ *
+ * BSD-derived getopt() functions require that optind be set to 1 in
+ * order to reset getopt() state. This used to be generally accepted
+ * way of resetting getopt(). However, glibc's getopt()
+ * has additional getopt() state beyond optind, and requires that
+ * optind be set to zero to reset its state. So the unfortunate state of
+ * affairs is that BSD-derived versions of getopt() misbehave if
+ * optind is set to 0 in order to reset getopt(), and glibc's getopt()
+ * will core dump if optind is set 1 in order to reset getopt().
+ *
+ * More modern versions of BSD require that optreset be set to 1 in
+ * order to reset getopt(). Sigh. Standards, anyone?
+ */
+#ifdef __GLIBC__
+ optind = 0;
+#else /* BSD style */
+ optind = 1;
+ /* optreset = 1; */
+#endif
+ /* optarg = NULL; opterr = 1; optopt = 63; - do we need this too? */
+ /* (values above are what they initialized to in glibc and uclibc) */
+ /* option_mask32 = 0; - not needed, no applet depends on it being 0 */
argc = 1;
while (argv[argc])
@@ -161,8 +185,16 @@
rc = 0;
}
- /* Restoring globals */
+ /* Restoring some globals */
restore_nofork_data(old);
+
+ /* Other globals can be simply reset to defaults */
+#ifdef __GLIBC__
+ optind = 0;
+#else /* BSD style */
+ optind = 1;
+#endif
+
return rc & 0xff; /* don't confuse people with "exitcodes" >255 */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/busybox-1.12.1/Makefile new/busybox-1.12.3/Makefile
--- old/busybox-1.12.1/Makefile 2008-09-28 20:04:30.000000000 +0200
+++ new/busybox-1.12.3/Makefile 2008-11-29 07:42:31.000000000 +0100
@@ -1,6 +1,6 @@
VERSION = 1
PATCHLEVEL = 12
-SUBLEVEL = 1
+SUBLEVEL = 3
EXTRAVERSION =
NAME = Unnamed
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/busybox-1.12.1/modutils/modprobe.c new/busybox-1.12.3/modutils/modprobe.c
--- old/busybox-1.12.1/modutils/modprobe.c 2008-09-28 20:04:15.000000000 +0200
+++ new/busybox-1.12.3/modutils/modprobe.c 2008-11-09 18:20:27.000000000 +0100
@@ -263,9 +263,9 @@
return TRUE;
}
-static int include_conf_recursive(struct include_conf_t *conf, const char *filename)
+static int include_conf_recursive(struct include_conf_t *conf, const char *filename, int flags)
{
- return recursive_action(filename, ACTION_RECURSE,
+ return recursive_action(filename, ACTION_RECURSE | flags,
include_conf_file_act,
include_conf_dir_act,
conf, 1);
@@ -362,7 +362,7 @@
char *includefile;
includefile = skip_whitespace(line_buffer + 8);
- include_conf_recursive(conf, includefile);
+ include_conf_recursive(conf, includefile, 0);
} else if (ENABLE_FEATURE_MODPROBE_BLACKLIST &&
(is_conf_command(line_buffer, "blacklist"))) {
char *mod;
@@ -559,7 +559,7 @@
if (ENABLE_FEATURE_2_6_MODULES) {
if (include_conf_file(&conf, "/etc/modprobe.conf"))
r = TRUE;
- if (include_conf_recursive(&conf, "/etc/modprobe.d"))
+ if (include_conf_recursive(&conf, "/etc/modprobe.d", ACTION_QUIET))
r = TRUE;
}
if (ENABLE_FEATURE_2_4_MODULES && !r)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/busybox-1.12.1/shell/ash.c new/busybox-1.12.3/shell/ash.c
--- old/busybox-1.12.1/shell/ash.c 2008-09-28 20:04:18.000000000 +0200
+++ new/busybox-1.12.3/shell/ash.c 2008-11-09 18:20:37.000000000 +0100
@@ -6964,8 +6964,11 @@
#if ENABLE_FEATURE_SH_STANDALONE
if (applet_no >= 0) {
- if (APPLET_IS_NOEXEC(applet_no))
+ if (APPLET_IS_NOEXEC(applet_no)) {
+ while (*envp)
+ putenv(*envp++);
run_applet_no_and_exit(applet_no, argv);
+ }
/* re-exec ourselves with the new arguments */
execve(bb_busybox_exec_path, argv, envp);
/* If they called chroot or otherwise made the binary no longer
@@ -12014,7 +12017,7 @@
char *name;
const char *p;
char **aptr;
- int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT;
+ int flag = argv[0][0] == 'r' ? VREADONLY : VEXPORT;
if (nextopt("p") != 'p') {
aptr = argptr;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/busybox-1.12.1/util-linux/getopt.c new/busybox-1.12.3/util-linux/getopt.c
--- old/busybox-1.12.1/util-linux/getopt.c 2008-09-28 20:04:30.000000000 +0200
+++ new/busybox-1.12.3/util-linux/getopt.c 2008-11-09 18:20:37.000000000 +0100
@@ -142,7 +142,8 @@
* Other settings are found in global variables.
*/
#if !ENABLE_GETOPT_LONG
-#define generate_output(argv,argc,optstr,longopts) generate_output(argv,argc,optstr)
+#define generate_output(argv,argc,optstr,longopts) \
+ generate_output(argv,argc,optstr)
#endif
static int generate_output(char **argv, int argc, const char *optstr, const struct option *longopts)
{
@@ -156,14 +157,6 @@
if (quiet_errors) /* No error reporting from getopt(3) */
opterr = 0;
- /* Reset getopt(3) (see libbb/getopt32.c for long rant) */
-#ifdef __GLIBC__
- optind = 0;
-#else /* BSD style */
- optind = 1;
- /* optreset = 1; */
-#endif
-
while (1) {
opt =
#if ENABLE_GETOPT_LONG
++++++ busybox.SuSE.config ++++++
--- /var/tmp/diff_new_pack.P20500/_old 2009-01-09 02:21:24.000000000 +0100
+++ /var/tmp/diff_new_pack.P20500/_new 2009-01-09 02:21:24.000000000 +0100
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.12.1
-# Wed Oct 15 12:33:48 2008
+# Tue Nov 4 12:57:27 2008
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -30,7 +30,7 @@
CONFIG_FEATURE_SUID=y
# CONFIG_FEATURE_SUID_CONFIG is not set
# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-CONFIG_SELINUX=y
+# CONFIG_SELINUX is not set
# CONFIG_FEATURE_PREFER_APPLETS is not set
CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
CONFIG_FEATURE_SYSLOG=y
@@ -282,10 +282,10 @@
CONFIG_FEATURE_RESIZE_PRINT=y
CONFIG_SETCONSOLE=y
# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
-# CONFIG_SETFONT is not set
+CONFIG_SETFONT=y
CONFIG_SETKEYCODES=y
CONFIG_SETLOGCONS=y
-# CONFIG_SHOWKEY is not set
+CONFIG_SHOWKEY=y
#
# Debian Utilities
@@ -462,9 +462,9 @@
# CONFIG_FEATURE_FBSET_READMODE is not set
# CONFIG_FDFLUSH is not set
# CONFIG_FDFORMAT is not set
-# CONFIG_FDISK is not set
+CONFIG_FDISK=y
CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
-# CONFIG_FEATURE_FDISK_WRITABLE is not set
+CONFIG_FEATURE_FDISK_WRITABLE=y
# CONFIG_FEATURE_AIX_LABEL is not set
# CONFIG_FEATURE_SGI_LABEL is not set
# CONFIG_FEATURE_SUN_LABEL is not set
@@ -698,7 +698,7 @@
CONFIG_TELNETD=y
CONFIG_FEATURE_TELNETD_STANDALONE=y
CONFIG_TFTP=y
-# CONFIG_TFTPD is not set
+CONFIG_TFTPD=y
CONFIG_FEATURE_TFTP_GET=y
CONFIG_FEATURE_TFTP_PUT=y
CONFIG_FEATURE_TFTP_BLOCKSIZE=y
++++++ busybox.uClibc-build-fix.patch ++++++
---
scripts/trylink | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -81,7 +81,9 @@ CFLAGS="$3"
LDFLAGS="$4"
O_FILES="$5"
A_FILES="$6"
-LDLIBS="$7"
+# no extra libraries for uClibc linking
+#LDLIBS="$7"
+LDLIBS=
# The --sort-section option is not supported by older versions of ld
SORT_SECTION=`check_cc "-Wl,--sort-section,alignment" ""`
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org