From 9656192800864395a98ccd58923512ba44e0adc044a3ad0d61b3e9601d20f75b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 4 Jan 2016 10:41:29 +0000 Subject: [PATCH] Accepting request 351758 from home:posophe:branches:Base:System update OBS-URL: https://build.opensuse.org/request/show/351758 OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=37 --- busybox-1.23.2.tar.bz2 | 3 --- busybox-1.24.1.tar.bz2 | 3 +++ busybox-static.changes | 7 +++++++ busybox-static.spec | 2 +- busybox.changes | 7 +++++++ busybox.install.patch | 13 ++++++++----- busybox.spec | 2 +- 7 files changed, 27 insertions(+), 10 deletions(-) delete mode 100644 busybox-1.23.2.tar.bz2 create mode 100644 busybox-1.24.1.tar.bz2 diff --git a/busybox-1.23.2.tar.bz2 b/busybox-1.23.2.tar.bz2 deleted file mode 100644 index f8a48ca..0000000 --- a/busybox-1.23.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a -size 2252786 diff --git a/busybox-1.24.1.tar.bz2 b/busybox-1.24.1.tar.bz2 new file mode 100644 index 0000000..d486e84 --- /dev/null +++ b/busybox-1.24.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37d03132cc078937360b392170b7a1d0e5b322eee9f57c0b82292a8b1f0afe3d +size 2068803 diff --git a/busybox-static.changes b/busybox-static.changes index 7d52ada..bdc69f2 100644 --- a/busybox-static.changes +++ b/busybox-static.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jan 3 12:01:09 UTC 2016 - p.drouand@gmail.com + +- Update to version 1.24.1 + * for a full list of changes see http://www.busybox.net/news.html +- Refresh busybox.install.patch + ------------------------------------------------------------------- Mon Apr 20 16:16:14 UTC 2015 - mpluskal@suse.com diff --git a/busybox-static.spec b/busybox-static.spec index d9277e0..13f84f0 100644 --- a/busybox-static.spec +++ b/busybox-static.spec @@ -17,7 +17,7 @@ Name: busybox-static -Version: 1.23.2 +Version: 1.24.1 Release: 0 Summary: The Swiss Army Knife of Embedded Linux License: GPL-2.0+ diff --git a/busybox.changes b/busybox.changes index bcfb5ef..006e557 100644 --- a/busybox.changes +++ b/busybox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jan 3 12:00:13 UTC 2016 - p.drouand@gmail.com + +- Update to version 1.24.1 + * for a full list of changes see http://www.busybox.net/news.html +- Refresh busybox.install.patch + ------------------------------------------------------------------- Mon Apr 20 16:16:14 UTC 2015 - mpluskal@suse.com diff --git a/busybox.install.patch b/busybox.install.patch index 3c33f30..7db4a34 100644 --- a/busybox.install.patch +++ b/busybox.install.patch @@ -2,20 +2,23 @@ Index: busybox-1.19.4/applets/install.sh =================================================================== --- busybox-1.19.4.orig/applets/install.sh +++ busybox-1.19.4/applets/install.sh -@@ -5,11 +5,11 @@ export LC_CTYPE=POSIX +@@ -5,14 +5,14 @@ prefix=$1 if [ -z "$prefix" ]; then -- echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks/--scriptwrapper]" -+ echo "usage: busybox.install DESTINATION [--symlinks/--hardlinks/--scriptwrapper]" +- echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks/--binaries/--scriptwrapper]" ++ echo "usage: busybox.install DESTINATION [--symlinks/--hardlinks/--binaries/--scriptwrapper]" exit 1 fi + # Source the configuration + . ./.config + -h=`sort busybox.links | uniq` +h=`sort /usr/share/busybox/busybox.links | uniq` - linkopts="" - scriptwrapper="n" + sharedlib_dir="0_lib" + @@ -64,7 +64,7 @@ fi rm -f "$prefix/bin/busybox" || exit 1 diff --git a/busybox.spec b/busybox.spec index f875579..1b205ea 100644 --- a/busybox.spec +++ b/busybox.spec @@ -17,7 +17,7 @@ Name: busybox -Version: 1.23.2 +Version: 1.24.1 Release: 0 Summary: The Swiss Army Knife of Embedded Linux License: GPL-2.0+