From e0aa46df308c78f4dee86067059edf4d9474f1e64989d86553d9a9b52f8f00ef Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 25 Apr 2015 09:02:17 +0000 Subject: [PATCH] Accepting request 298217 from home:pluskalm:branches:Base:System - Update to 1.23.2 * for a full list of changes see http://www.busybox.net/news.html - Cleaned up spec file with spec-cleaner - Refreshed patches - Update to 1.23.2 * for a full list of changes see http://www.busybox.net/news.html - Cleaned up spec file with spec-cleaner - Refreshed patches OBS-URL: https://build.opensuse.org/request/show/298217 OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=35 --- busybox-1.18.3-libarchive.patch | 9 +++++---- busybox-1.22.1.tar.bz2 | 3 --- busybox-1.23.2.tar.bz2 | 3 +++ busybox-resource.patch | 6 +++--- busybox-static.changes | 8 ++++++++ busybox-static.spec | 20 ++++++++++---------- busybox.changes | 8 ++++++++ busybox.spec | 30 +++++++++++++++--------------- 8 files changed, 52 insertions(+), 35 deletions(-) delete mode 100644 busybox-1.22.1.tar.bz2 create mode 100644 busybox-1.23.2.tar.bz2 diff --git a/busybox-1.18.3-libarchive.patch b/busybox-1.18.3-libarchive.patch index 1a37a4f..259935e 100644 --- a/busybox-1.18.3-libarchive.patch +++ b/busybox-1.18.3-libarchive.patch @@ -1,7 +1,8 @@ -diff -ruN busybox-1.18.3-orig/archival/libarchive/get_header_tar.c busybox-1.18.3/archival/libarchive/get_header_tar.c ---- busybox-1.18.3-orig/archival/libarchive/get_header_tar.c 2011-02-08 18:24:57.000000000 +0100 -+++ busybox-1.18.3/archival/libarchive/get_header_tar.c 2011-03-12 23:28:59.000000000 +0100 -@@ -287,6 +287,9 @@ +Index: busybox-1.23.2/archival/libarchive/get_header_tar.c +=================================================================== +--- busybox-1.23.2.orig/archival/libarchive/get_header_tar.c ++++ busybox-1.23.2/archival/libarchive/get_header_tar.c +@@ -304,6 +304,9 @@ char FAST_FUNC get_header_tar(archive_ha } file_header->link_target = NULL; if (!p_linkname && parse_names && tar.linkname[0]) { diff --git a/busybox-1.22.1.tar.bz2 b/busybox-1.22.1.tar.bz2 deleted file mode 100644 index 9b596ba..0000000 --- a/busybox-1.22.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b -size 2218650 diff --git a/busybox-1.23.2.tar.bz2 b/busybox-1.23.2.tar.bz2 new file mode 100644 index 0000000..f8a48ca --- /dev/null +++ b/busybox-1.23.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a +size 2252786 diff --git a/busybox-resource.patch b/busybox-resource.patch index 77294da..2a09e9c 100644 --- a/busybox-resource.patch +++ b/busybox-resource.patch @@ -2,10 +2,10 @@ include/libbb.h | 1 + 1 file changed, 1 insertion(+) -Index: busybox-1.22.1/include/libbb.h +Index: busybox-1.23.2/include/libbb.h =================================================================== ---- busybox-1.22.1.orig/include/libbb.h 2014-01-09 18:15:44.000000000 +0000 -+++ busybox-1.22.1/include/libbb.h 2014-09-05 00:35:51.000000000 +0100 +--- busybox-1.23.2.orig/include/libbb.h ++++ busybox-1.23.2/include/libbb.h @@ -40,6 +40,7 @@ #include #include diff --git a/busybox-static.changes b/busybox-static.changes index 398c177..7d52ada 100644 --- a/busybox-static.changes +++ b/busybox-static.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 20 16:16:14 UTC 2015 - mpluskal@suse.com + +- Update to 1.23.2 + * for a full list of changes see http://www.busybox.net/news.html +- Cleaned up spec file with spec-cleaner +- Refreshed patches + ------------------------------------------------------------------- Thu Sep 4 23:43:33 UTC 2014 - andreas.stieger@gmx.de diff --git a/busybox-static.spec b/busybox-static.spec index 883b1f4..d9277e0 100644 --- a/busybox-static.spec +++ b/busybox-static.spec @@ -1,7 +1,7 @@ # # spec file for package busybox-static # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: busybox-static -Url: http://www.busybox.net/ -Version: 1.22.1 +Version: 1.23.2 Release: 0 Summary: The Swiss Army Knife of Embedded Linux License: GPL-2.0+ Group: System/Base +Url: http://www.busybox.net/ Source: http://busybox.net/downloads/busybox-%{version}.tar.bz2 Source1: BusyBox.1 Source2: busybox-static.SuSE.config @@ -30,8 +30,8 @@ Source2: busybox-static.SuSE.config Patch100: busybox.install.patch Patch101: busybox-1.18.3-libarchive.patch Patch103: busybox-resource.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: glibc-devel-static +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description BusyBox combines tiny versions of many common UNIX utilities into a @@ -49,8 +49,8 @@ counterparts. %patch100 -p1 %patch101 -p1 %patch103 -p1 -%{__cp} -a %{S:1} docs/ -%{__cp} -a %{S:2} .config +cp -a %{SOURCE1} docs/ +cp -a %{SOURCE2} .config find -name CVS | xargs rm -rf find -name .cvsignore | xargs rm -rf find -name .svn | xargs rm -rf @@ -60,14 +60,14 @@ find -name .gitignore | xargs rm -rf export VERBOSE=-v export BUILD_VERBOSE=2 export CFLAGS="%{optflags} -fno-strict-aliasing" -export CC="%{__cc}" +export CC="gcc" export HOSTCC=gcc -make -e oldconfig +make %{?_smp_mflags} -e oldconfig make -e %{?_smp_mflags} %install -install -d $RPM_BUILD_ROOT/%{_bindir} -install busybox $RPM_BUILD_ROOT/%{_bindir}/busybox-static +install -d %{buildroot}/%{_bindir} +install busybox %{buildroot}/%{_bindir}/busybox-static %files %defattr(-,root,root) diff --git a/busybox.changes b/busybox.changes index 723e50e..bcfb5ef 100644 --- a/busybox.changes +++ b/busybox.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 20 16:16:14 UTC 2015 - mpluskal@suse.com + +- Update to 1.23.2 + * for a full list of changes see http://www.busybox.net/news.html +- Cleaned up spec file with spec-cleaner +- Refreshed patches + ------------------------------------------------------------------- Thu Oct 9 11:41:36 UTC 2014 - olaf@aepfle.de diff --git a/busybox.spec b/busybox.spec index 4af998b..f875579 100644 --- a/busybox.spec +++ b/busybox.spec @@ -1,7 +1,7 @@ # # spec file for package busybox # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: busybox -Url: http://www.busybox.net/ -Version: 1.22.1 +Version: 1.23.2 Release: 0 Summary: The Swiss Army Knife of Embedded Linux License: GPL-2.0+ Group: System/Base +Url: http://www.busybox.net/ Source: http://busybox.net/downloads/%{name}-%{version}.tar.bz2 Source1: BusyBox.1 Source2: busybox.SuSE.config @@ -44,12 +44,12 @@ expected functionality and behave very much like their GNU counterparts. %prep -%setup -q -n %{name}-%{version} +%setup -q %patch100 -p1 %patch101 -p1 %patch103 -p1 -%{__cp} -a %{S:1} docs/ -%{__cp} -a %{S:2} .config +cp -a %{SOURCE1} docs/ +cp -a %{SOURCE2} .config find -name CVS | xargs rm -rf find -name .cvsignore | xargs rm -rf find -name .svn | xargs rm -rf @@ -59,20 +59,20 @@ find -name .gitignore | xargs rm -rf export VERBOSE=-v export BUILD_VERBOSE=2 export CFLAGS="%{optflags} -fno-strict-aliasing" -export CC="%{__cc}" +export CC="gcc" export HOSTCC=gcc -make -e oldconfig +make %{?_smp_mflags} -e oldconfig make -e %{?_smp_mflags} make -e doc busybox.links %{?_smp_mflags} %install -install -d $RPM_BUILD_ROOT/%{_bindir} -install -d $RPM_BUILD_ROOT/%{_datadir}/busybox -install busybox.links $RPM_BUILD_ROOT%{_datadir}/busybox -install applets/install.sh $RPM_BUILD_ROOT/usr/bin/busybox.install -install busybox $RPM_BUILD_ROOT/%{_bindir} -install -d $RPM_BUILD_ROOT%_mandir/man1 -install -m 644 docs/BusyBox.1 $RPM_BUILD_ROOT%_mandir/man1 +install -d %{buildroot}/%{_bindir} +install -d %{buildroot}/%{_datadir}/busybox +install busybox.links %{buildroot}%{_datadir}/busybox +install applets/install.sh %{buildroot}%{_bindir}/busybox.install +install busybox %{buildroot}/%{_bindir} +install -d %{buildroot}%{_mandir}/man1 +install -m 644 docs/BusyBox.1 %{buildroot}%{_mandir}/man1 %files %defattr(-,root,root)