rpm/busybox
SHA256
1
0
Fork 0
forked from pool/busybox
Code Pull Requests Activity

Accepting request 303927 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/303927
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/busybox?expand=0&rev=42
This commit is contained in:
Stephan Kulow 2015-04-27 05:46:33 +00:00 committed by Git OBS Bridge
commit ec682e1405
8 changed files with 52 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
busybox-1.18.3-libarchive.patch
View File

@ -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 Index: busybox-1.23.2/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 --- busybox-1.23.2.orig/archival/libarchive/get_header_tar.c
@@ -287,6 +287,9 @@ +++ 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; file_header->link_target = NULL;
if (!p_linkname && parse_names && tar.linkname[0]) { if (!p_linkname && parse_names && tar.linkname[0]) {

3
busybox-1.22.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b
size 2218650

3
busybox-1.23.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a
size 2252786

6
busybox-resource.patch
View File

@ -2,10 +2,10 @@
include/libbb.h | 1 + include/libbb.h | 1 +
1 file changed, 1 insertion(+) 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.23.2.orig/include/libbb.h
+++ busybox-1.22.1/include/libbb.h 2014-09-05 00:35:51.000000000 +0100 +++ busybox-1.23.2/include/libbb.h
@@ -40,6 +40,7 @@ @@ -40,6 +40,7 @@
#include <poll.h> #include <poll.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>

8
busybox-static.changes
View File

@ -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 Thu Sep 4 23:43:33 UTC 2014 - andreas.stieger@gmx.de

20
busybox-static.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package busybox-static # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,12 +17,12 @@
Name: busybox-static Name: busybox-static
Url: http://www.busybox.net/ Version: 1.23.2
Version: 1.22.1
Release: 0 Release: 0
Summary: The Swiss Army Knife of Embedded Linux Summary: The Swiss Army Knife of Embedded Linux
License: GPL-2.0+ License: GPL-2.0+
Group: System/Base Group: System/Base
Url: http://www.busybox.net/
Source: http://busybox.net/downloads/busybox-%{version}.tar.bz2 Source: http://busybox.net/downloads/busybox-%{version}.tar.bz2
Source1: BusyBox.1 Source1: BusyBox.1
Source2: busybox-static.SuSE.config Source2: busybox-static.SuSE.config
@ -30,8 +30,8 @@ Source2: busybox-static.SuSE.config
Patch100: busybox.install.patch Patch100: busybox.install.patch
Patch101: busybox-1.18.3-libarchive.patch Patch101: busybox-1.18.3-libarchive.patch
Patch103: busybox-resource.patch Patch103: busybox-resource.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: glibc-devel-static BuildRequires: glibc-devel-static
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
BusyBox combines tiny versions of many common UNIX utilities into a BusyBox combines tiny versions of many common UNIX utilities into a
@ -49,8 +49,8 @@ counterparts.
%patch100 -p1 %patch100 -p1
%patch101 -p1 %patch101 -p1
%patch103 -p1 %patch103 -p1
%{__cp} -a %{S:1} docs/ cp -a %{SOURCE1} docs/
%{__cp} -a %{S:2} .config cp -a %{SOURCE2} .config
find -name CVS | xargs rm -rf find -name CVS | xargs rm -rf
find -name .cvsignore | xargs rm -rf find -name .cvsignore | xargs rm -rf
find -name .svn | xargs rm -rf find -name .svn | xargs rm -rf
@ -60,14 +60,14 @@ find -name .gitignore | xargs rm -rf
export VERBOSE=-v export VERBOSE=-v
export BUILD_VERBOSE=2 export BUILD_VERBOSE=2
export CFLAGS="%{optflags} -fno-strict-aliasing" export CFLAGS="%{optflags} -fno-strict-aliasing"
export CC="%{__cc}" export CC="gcc"
export HOSTCC=gcc export HOSTCC=gcc
make -e oldconfig make %{?_smp_mflags} -e oldconfig
make -e %{?_smp_mflags} make -e %{?_smp_mflags}
%install %install
install -d $RPM_BUILD_ROOT/%{_bindir} install -d %{buildroot}/%{_bindir}
install busybox $RPM_BUILD_ROOT/%{_bindir}/busybox-static install busybox %{buildroot}/%{_bindir}/busybox-static
%files %files
%defattr(-,root,root) %defattr(-,root,root)

8
busybox.changes
View File

@ -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 Thu Oct 9 11:41:36 UTC 2014 - olaf@aepfle.de

30
busybox.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package busybox # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,12 +17,12 @@
Name: busybox Name: busybox
Url: http://www.busybox.net/ Version: 1.23.2
Version: 1.22.1
Release: 0 Release: 0
Summary: The Swiss Army Knife of Embedded Linux Summary: The Swiss Army Knife of Embedded Linux
License: GPL-2.0+ License: GPL-2.0+
Group: System/Base Group: System/Base
Url: http://www.busybox.net/
Source: http://busybox.net/downloads/%{name}-%{version}.tar.bz2 Source: http://busybox.net/downloads/%{name}-%{version}.tar.bz2
Source1: BusyBox.1 Source1: BusyBox.1
Source2: busybox.SuSE.config Source2: busybox.SuSE.config
@ -44,12 +44,12 @@ expected functionality and behave very much like their GNU
counterparts. counterparts.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q
%patch100 -p1 %patch100 -p1
%patch101 -p1 %patch101 -p1
%patch103 -p1 %patch103 -p1
%{__cp} -a %{S:1} docs/ cp -a %{SOURCE1} docs/
%{__cp} -a %{S:2} .config cp -a %{SOURCE2} .config
find -name CVS | xargs rm -rf find -name CVS | xargs rm -rf
find -name .cvsignore | xargs rm -rf find -name .cvsignore | xargs rm -rf
find -name .svn | xargs rm -rf find -name .svn | xargs rm -rf
@ -59,20 +59,20 @@ find -name .gitignore | xargs rm -rf
export VERBOSE=-v export VERBOSE=-v
export BUILD_VERBOSE=2 export BUILD_VERBOSE=2
export CFLAGS="%{optflags} -fno-strict-aliasing" export CFLAGS="%{optflags} -fno-strict-aliasing"
export CC="%{__cc}" export CC="gcc"
export HOSTCC=gcc export HOSTCC=gcc
make -e oldconfig make %{?_smp_mflags} -e oldconfig
make -e %{?_smp_mflags} make -e %{?_smp_mflags}
make -e doc busybox.links %{?_smp_mflags} make -e doc busybox.links %{?_smp_mflags}
%install %install
install -d $RPM_BUILD_ROOT/%{_bindir} install -d %{buildroot}/%{_bindir}
install -d $RPM_BUILD_ROOT/%{_datadir}/busybox install -d %{buildroot}/%{_datadir}/busybox
install busybox.links $RPM_BUILD_ROOT%{_datadir}/busybox install busybox.links %{buildroot}%{_datadir}/busybox
install applets/install.sh $RPM_BUILD_ROOT/usr/bin/busybox.install install applets/install.sh %{buildroot}%{_bindir}/busybox.install
install busybox $RPM_BUILD_ROOT/%{_bindir} install busybox %{buildroot}/%{_bindir}
install -d $RPM_BUILD_ROOT%_mandir/man1 install -d %{buildroot}%{_mandir}/man1
install -m 644 docs/BusyBox.1 $RPM_BUILD_ROOT%_mandir/man1 install -m 644 docs/BusyBox.1 %{buildroot}%{_mandir}/man1
%files %files
%defattr(-,root,root) %defattr(-,root,root)