From fa52724b67b906f1c325aba99f12d3b32b718bae905873e0268183e1b19ca58d Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 7 Aug 2009 20:44:44 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/busybox?expand=0&rev=13 --- busybox-buildfix.patch | 49 +++++++++++++ busybox-static.changes | 5 ++ busybox-static.spec | 9 +-- busybox.changes | 5 ++ busybox.spec | 157 +---------------------------------------- 5 files changed, 65 insertions(+), 160 deletions(-) create mode 100644 busybox-buildfix.patch diff --git a/busybox-buildfix.patch b/busybox-buildfix.patch new file mode 100644 index 0000000..78ca251 --- /dev/null +++ b/busybox-buildfix.patch @@ -0,0 +1,49 @@ +--- networking/libiproute/iptunnel.c ++++ networking/libiproute/iptunnel.c +@@ -21,7 +21,45 @@ + #ifndef __constant_htons + #define __constant_htons htons + #endif +-#include ++/* From linux/if_tunnel.h. #including it proved troublesome ++ * (redefiniton errors due to name collisions in linux/ and net[inet]/) */ ++#define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0) ++#define SIOCADDTUNNEL (SIOCDEVPRIVATE + 1) ++#define SIOCDELTUNNEL (SIOCDEVPRIVATE + 2) ++#define SIOCCHGTUNNEL (SIOCDEVPRIVATE + 3) ++//#define SIOCGETPRL (SIOCDEVPRIVATE + 4) ++//#define SIOCADDPRL (SIOCDEVPRIVATE + 5) ++//#define SIOCDELPRL (SIOCDEVPRIVATE + 6) ++//#define SIOCCHGPRL (SIOCDEVPRIVATE + 7) ++#define GRE_CSUM __constant_htons(0x8000) ++//#define GRE_ROUTING __constant_htons(0x4000) ++#define GRE_KEY __constant_htons(0x2000) ++#define GRE_SEQ __constant_htons(0x1000) ++//#define GRE_STRICT __constant_htons(0x0800) ++//#define GRE_REC __constant_htons(0x0700) ++//#define GRE_FLAGS __constant_htons(0x00F8) ++//#define GRE_VERSION __constant_htons(0x0007) ++struct ip_tunnel_parm { ++ char name[IFNAMSIZ]; ++ int link; ++ uint16_t i_flags; ++ uint16_t o_flags; ++ uint32_t i_key; ++ uint32_t o_key; ++ struct iphdr iph; ++}; ++/* SIT-mode i_flags */ ++//#define SIT_ISATAP 0x0001 ++//struct ip_tunnel_prl { ++// uint32_t addr; ++// uint16_t flags; ++// uint16_t __reserved; ++// uint32_t datalen; ++// uint32_t __reserved2; ++// /* data follows */ ++//}; ++///* PRL flags */ ++//#define PRL_DEFAULT 0x0001 + + #include "ip_common.h" /* #include "libbb.h" is inside */ + #include "rt_names.h" diff --git a/busybox-static.changes b/busybox-static.changes index df4e3ab..b9b8887 100644 --- a/busybox-static.changes +++ b/busybox-static.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 4 18:14:50 CEST 2009 - aj@suse.de + +- Fix build with newer kernel headers (busybox-buildfix.patch) + ------------------------------------------------------------------- Thu Dec 18 11:35:49 CET 2008 - sassmann@suse.de diff --git a/busybox-static.spec b/busybox-static.spec index b2e79b7..8b7801e 100644 --- a/busybox-static.spec +++ b/busybox-static.spec @@ -21,7 +21,7 @@ Name: busybox-static Url: http://www.busybox.net/ Version: 1.12.3 -Release: 2 +Release: 3 Summary: The Swiss Army Knife of Embedded Linux License: GPL v2 or later Group: System/Base @@ -34,6 +34,7 @@ Patch1: busybox.uClibc-build-fix.patch Patch100: busybox.install.patch Patch101: busybox.libunarchive-array.patch Patch102: busybox.dmesg-size.patch +Patch103: busybox-buildfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: uClibc-devel ExcludeArch: s390 s390x ppc64 @@ -61,6 +62,7 @@ Authors: %patch100 -p1 %patch101 -p1 %patch102 -p1 +%patch103 %build cp -avL %{S:2} .config @@ -81,8 +83,3 @@ install busybox $RPM_BUILD_ROOT/usr/bin/busybox-static /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) diff --git a/busybox.changes b/busybox.changes index dc50b97..bb337a1 100644 --- a/busybox.changes +++ b/busybox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 4 18:13:36 CEST 2009 - aj@suse.de + +- Fix build with updated kernel headers (busybox-buildfix.patch) + ------------------------------------------------------------------- Thu Dec 18 11:35:49 CET 2008 - sassmann@suse.de diff --git a/busybox.spec b/busybox.spec index 6419132..fda88ef 100644 --- a/busybox.spec +++ b/busybox.spec @@ -21,7 +21,7 @@ Name: busybox Url: http://www.busybox.net/ Version: 1.12.3 -Release: 2 +Release: 3 Summary: The Swiss Army Knife of Embedded Linux License: GPL v2 or later Group: System/Base @@ -33,6 +33,7 @@ Source4: mkinitrd-boot.sh Patch100: busybox.install.patch Patch101: busybox.libunarchive-array.patch Patch102: busybox.dmesg-size.patch +Patch103: busybox-buildfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,6 +58,7 @@ Authors: %patch100 -p1 %patch101 -p1 %patch102 -p1 +%patch103 %build cp -avL %{S:2} .config @@ -103,156 +105,3 @@ exit 0 /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 -- removed patches included upstream - * busybox-1.8.2-arping.patch - * busybox-1.8.2-static - * busybox-1.8.2-vi.patch -- refreshed patches - * busybox.libunarchive-array.patch - * busybox.dmesg-size.patch -- updated config file - * removed awk math support and dc to get rid of libm -* Wed Sep 03 2008 hare@suse.de -- Call mkinitrd_setup during %%post and %%postun (bnc#413709) -* Fri Aug 22 2008 prusnak@suse.cz -- enabled SELinux support [Fate#303662] -* Wed Jul 23 2008 hare@suse.de -- Include mkinitrd scriptlets. -* Thu Jan 17 2008 sassmann@suse.de -- update to 1.8.2 - see http://www.busybox.net/ for full changelog -- added bugfixes - * busybox-1.8.2-arping.patch - * busybox-1.8.2-static - * busybox-1.8.2-vi.patch -* Fri Nov 16 2007 olh@suse.de -- update to 1.8.1 - see http://www.busybox.net/ for full changelog -* Sun Jul 15 2007 olh@suse.de -- update to 1.6.1 - see http://www.busybox.net/ for full changelog -* Fri May 11 2007 olh@suse.de -- increase ash cmdline history size - user kernel ringbuffer size for dmesg -* Mon May 07 2007 olh@suse.de -- gcc42 rejects out of bounds array access -* Sat Apr 28 2007 olh@suse.de -- update to 1.4.2 - reduces binary size after e2fsprogs removal -* Wed Dec 06 2006 trenn@suse.de -- move to 1.2.2 and enable nearly everything. - Most important (awk,less,vi and much more) - binary on i386 now has 732k -* Wed Aug 09 2006 ihno@suse.de -- update to busybox 1.2.1 final - Bugfix release. Bugs fixed: - lash: "var=value" works without export - tar: can extract git generated tarballs - adduser: /etc/group is updated - modprobe: look for modules.conf at the right place for 2.6 kernels - all setuid and getgid calls are check return values in case - somebody using per-process resource limits that prevent a user - from having too many processes -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Mon Jan 16 2006 ihno@suse.de -- Update to busybox 1.1.0 final -* Wed Jan 11 2006 ihno@suse.de -- update to busybox 1.1.0-pre1 -* Wed Nov 16 2005 dmueller@suse.de -- build against dietlibc unconditionally -* Thu May 12 2005 uli@suse.de -- use dietlibc on ARM -- uclibc config file needs to be fixed -* 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 -* Thu Aug 05 2004 nashif@suse.de -- Update to 1.00-rc2 -* Wed Jul 21 2004 nashif@suse.de -- Update to 1.00-rc1 -* Tue May 11 2004 nashif@suse.de -- Bug #39461 - Fixes netlink vulnerability -* Tue Apr 27 2004 mmj@suse.de -- Fix strict aliasing -* Mon Mar 01 2004 nashif@suse.de -- Update to 1.0 pre 8 -* Wed Feb 11 2004 ro@suse.de -- hack to build it on amd64 -* Tue Feb 10 2004 schwab@suse.de -- Fix building on ia64. -* Wed Feb 04 2004 kukuk@suse.de -- Remove wrong dietlibc requires -* Mon Feb 02 2004 hare@suse.de -- Fixed spec file to build on all archs. -* Fri Jan 30 2004 hare@suse.de -- Update to 1.00-pre5 -- Patched dietlibc support to use a menuconfig option. -* Sat Jan 10 2004 adrian@suse.de -- build as user -* Wed Dec 10 2003 uli@suse.de -- build with dietlibc where available -* Mon Jun 02 2003 nashif@suse.de -- Set Autoreqprov: on -* Thu May 29 2003 nashif@suse.de -- Updated with latest stable release incl. patches. -* Sat May 17 2003 nashif@suse.de -- Removed CVS files -* Sat Nov 02 2002 nashif@suse.de -- Update to version 0.60.5 -- Unique patch names -* Mon Jun 10 2002 nashif@suse.de -- Update to version 0.60.3 -* Mon Nov 26 2001 nashif@suse.de -- Update to version 0.60.2 -- Major Changes: - * msh was reworked - * reworked hostname - * Various bugfixes -* Fri Aug 24 2001 nashif@suse.de -- Update to version 0.60.1 -- This is a relatively minor bug fixing release which fixes bugs - in the following applets, among others: msh, sed, route, syslogd, - ifconfig, lash -- Rewrite of tftp -* Sat Aug 04 2001 nashif@suse.de -- Update to version 0.60.0 -* Thu Jul 12 2001 nashif@suse.de -- Update to version 0.52 -* Wed Apr 11 2001 nashif@suse.de -- Update to version 0.51 -* Fri Feb 09 2001 nashif@suse.de -- Fixed sync.c to compile -* Mon Feb 05 2001 nashif@suse.de -- Update to version 0.49 -* Wed Dec 20 2000 uli@suse.de -- disabled insmod for all archs except IA32, ARM and SH -* Tue Dec 19 2000 nashif@suse.de -- Update to 0.48 (Fixes many bugs) -* 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 -* Wed Sep 27 2000 nashif@suse.de -- Update to 0.47 -- Fix nfsmount.c -* Wed Aug 30 2000 nashif@suse.de -- Fix for axp -* Mon Aug 28 2000 nashif@suse.de -- Update to version 0.46 -* Thu Jul 06 2000 nashif@suse.de -- Fix install script (Bug #3195) -* Tue May 23 2000 nashif@suse.de -- Initial Release (Version 0.43)