Hello community, here is the log from the commit of package busybox for openSUSE:Factory checked in at 2012-08-27 15:52:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/busybox (Old) and /work/SRC/openSUSE:Factory/.busybox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "busybox", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/busybox/busybox-static.changes 2012-06-06 18:02:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.busybox.new/busybox-static.changes 2012-08-27 15:52:56.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 18 07:44:02 UTC 2012 - [email protected] + +- Add missing sys/resource include (glibc 2.16) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/busybox/busybox.changes 2012-06-06 18:02:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.busybox.new/busybox.changes 2012-08-27 15:52:56.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Aug 1 14:15:40 UTC 2012 - [email protected] + +- fix path in busybox.install (bnc#680153) + +------------------------------------------------------------------- +Wed Jul 18 07:43:58 UTC 2012 - [email protected] + +- Add missing sys/resource include (glibc 2.16) + +------------------------------------------------------------------- New: ---- busybox-resource.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ busybox-static.spec ++++++ --- /var/tmp/diff_new_pack.57lmS2/_old 2012-08-27 15:53:08.000000000 +0200 +++ /var/tmp/diff_new_pack.57lmS2/_new 2012-08-27 15:53:08.000000000 +0200 @@ -33,6 +33,7 @@ Patch100: busybox.install.patch Patch101: busybox-1.18.3-libarchive.patch Patch102: busybox-1.19.4-ext2fs_h.diff +Patch103: busybox-resource.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: uClibc-devel @@ -53,6 +54,7 @@ %patch100 -p1 %patch101 -p1 %patch102 -p1 +%patch103 -p1 %{__cp} -a %{S:1} docs/ %{__cp} -a %{S:2} .config find -name CVS | xargs rm -rf ++++++ busybox.spec ++++++ --- /var/tmp/diff_new_pack.57lmS2/_old 2012-08-27 15:53:08.000000000 +0200 +++ /var/tmp/diff_new_pack.57lmS2/_new 2012-08-27 15:53:08.000000000 +0200 @@ -32,6 +32,7 @@ Patch100: busybox.install.patch Patch101: %{name}-1.18.3-libarchive.patch Patch102: busybox-1.19.4-ext2fs_h.diff +Patch103: busybox-resource.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,6 +51,7 @@ %patch100 -p1 %patch101 -p1 %patch102 -p1 +%patch103 -p1 %{__cp} -a %{S:1} docs/ %{__cp} -a %{S:2} .config find -name CVS | xargs rm -rf ++++++ busybox-resource.patch ++++++ Index: busybox-1.19.4/include/libbb.h =================================================================== --- busybox-1.19.4.orig/include/libbb.h +++ busybox-1.19.4/include/libbb.h @@ -35,6 +35,7 @@ #include <sys/poll.h> #include <sys/ioctl.h> #include <sys/mman.h> +#include <sys/resource.h> #include <sys/socket.h> #include <sys/stat.h> #include <sys/time.h> ++++++ busybox.install.patch ++++++ --- /var/tmp/diff_new_pack.57lmS2/_old 2012-08-27 15:53:08.000000000 +0200 +++ /var/tmp/diff_new_pack.57lmS2/_new 2012-08-27 15:53:08.000000000 +0200 @@ -1,6 +1,13 @@ ---- busybox-1.19.4/applets/install.sh +Index: busybox-1.19.4/applets/install.sh +=================================================================== +--- busybox-1.19.4.orig/applets/install.sh +++ busybox-1.19.4/applets/install.sh -@@ -9,7 +9,7 @@ +@@ -5,11 +5,11 @@ export LC_CTYPE=POSIX + + prefix=$1 + if [ -z "$prefix" ]; then +- echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks/--scriptwrapper]" ++ echo "usage: busybox.install DESTINATION [--symlinks/--hardlinks/--scriptwrapper]" exit 1 fi @@ -9,3 +16,12 @@ linkopts="" scriptwrapper="n" +@@ -64,7 +64,7 @@ fi + + rm -f "$prefix/bin/busybox" || exit 1 + mkdir -p "$prefix/bin" || exit 1 +-install -m 755 busybox "$prefix/bin/busybox" || exit 1 ++install -m 755 /usr/bin/busybox "$prefix/bin/busybox" || exit 1 + + for i in $h; do + appdir=`dirname "$i"` -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
