- rel 2; fix build with external printf (like on mksh)

Changed files:
    busybox-git.patch -> 1.1
    busybox.spec -> 1.194

diff --git a/busybox-git.patch b/busybox-git.patch
new file mode 100644 (file)
index 0000000..a36b0df
--- /dev/null
+++ b/busybox-git.patch
@@ -0,0 +1,112 @@
+commit efd08bfa0adab3ae299be7abdd45161a15804a3b
+Author: Denys Vlasenko <vda.linux@googlemail.com>
+Date:   Wed Oct 19 17:54:42 2011 +0200
+
+    gen_build_files: don't pass 200k+ strings as params. Closes 4321
+    
+    Also removes one grep per generated file.
+    
+    Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+
+diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh
+index e518a90..1a3d3e9 100755
+--- a/scripts/gen_build_files.sh
++++ b/scripts/gen_build_files.sh
+@@ -19,25 +19,20 @@ chk() { status "CHK" "$@"; }
+ 
+ generate()
+ {
+-      local src="$1" dst="$2" header="$3" insert="$4"
++      # NB: data to be inserted at INSERT line is coming on stdin
++      local src="$1" dst="$2" header="$3"
+       #chk "${dst}"
+-      (
++      {
+               # Need to use printf: different shells have inconsistent
+-              # rules re handling of "\n" in echo params,
+-              # and ${insert} definitely contains "\n".
+-              # Therefore, echo "${header}" would not work:
++              # rules re handling of "\n" in echo params.
+               printf "%s\n" "${header}"
+-              if grep -qs '^INSERT$' "${src}"; then
+-                      sed -n '1,/^INSERT$/p' "${src}"
+-                      printf "%s\n" "${insert}"
+-                      sed -n '/^INSERT$/,$p' "${src}"
+-              else
+-                      if [ -n "${insert}" ]; then
+-                              printf "%s\n" "ERROR: INSERT line missing in: ${src}" 1>&2
+-                      fi
+-                      cat "${src}"
+-              fi
+-      ) | sed '/^INSERT$/d' > "${dst}.tmp"
++              # print everything up to INSERT line
++              sed -n '/^INSERT$/q;1,/^INSERT$/p' "${src}"
++              # copy stdin to stdout
++              cat
++              # print everything after INSERT line
++              sed -n '/^INSERT$/{:l;n;p;bl}' "${src}"
++      } >"${dst}.tmp"
+       if ! cmp -s "${dst}" "${dst}.tmp"; then
+               gen "${dst}"
+               mv "${dst}.tmp" "${dst}"
+@@ -47,24 +42,21 @@ generate()
+ }
+ 
+ # (Re)generate include/applets.h
+-s=`sed -n 's@^//applet:@@p' "$srctree"/*/*.c "$srctree"/*/*/*.c`
+-generate \
++sed -n 's@^//applet:@@p' "$srctree"/*/*.c "$srctree"/*/*/*.c \
++| generate \
+       "$srctree/include/applets.src.h" \
+       "include/applets.h" \
+-      "/* DO NOT EDIT. This file is generated from applets.src.h */" \
+-      "${s}"
++      "/* DO NOT EDIT. This file is generated from applets.src.h */"
+ 
+ # (Re)generate include/usage.h
+ # We add line continuation backslash after each line,
+ # and insert empty line before each line which doesn't start
+ # with space or tab
+-# (note: we need to use \\\\ because of ``)
+-s=`sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\\\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\\\@p' "$srctree"/*/*.c "$srctree"/*/*/*.c`
+-generate \
++sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\@p' "$srctree"/*/*.c "$srctree"/*/*/*.c \
++| generate \
+       "$srctree/include/usage.src.h" \
+       "include/usage.h" \
+-      "/* DO NOT EDIT. This file is generated from usage.src.h */" \
+-      "${s}"
++      "/* DO NOT EDIT. This file is generated from usage.src.h */"
+ 
+ # (Re)generate */Kbuild and */Config.in
+ { cd -- "$srctree" && find . -type d; } | while read -r d; do
+@@ -75,11 +67,10 @@ generate \
+       if test -f "$src"; then
+               mkdir -p -- "$d" 2>/dev/null
+ 
+-              s=`sed -n 's@^//kbuild:@@p' "$srctree/$d"/*.c`
+-              generate \
++              sed -n 's@^//kbuild:@@p' "$srctree/$d"/*.c \
++              | generate \
+                       "${src}" "${dst}" \
+-                      "# DO NOT EDIT. This file is generated from Kbuild.src" \
+-                      "${s}"
++                      "# DO NOT EDIT. This file is generated from Kbuild.src"
+       fi
+ 
+       src="$srctree/$d/Config.src"
+@@ -87,11 +78,10 @@ generate \
+       if test -f "$src"; then
+               mkdir -p -- "$d" 2>/dev/null
+ 
+-              s=`sed -n 's@^//config:@@p' "$srctree/$d"/*.c`
+-              generate \
++              sed -n 's@^//config:@@p' "$srctree/$d"/*.c \
++              | generate \
+                       "${src}" "${dst}" \
+-                      "# DO NOT EDIT. This file is generated from Config.src" \
+-                      "${s}"
++                      "# DO NOT EDIT. This file is generated from Config.src"
+       fi
+ done
+ 

diff --git a/busybox.spec b/busybox.spec
index 7857d5f3982447f9d72ef7e58f0682487c4f578e..e7d835a0eb984c40a28b4d7f69988f85c361d886 100644 (file)
--- a/busybox.spec
+++ b/busybox.spec
@@ -38,7 +38,7 @@ Summary(pt_BR.UTF-8): BusyBox é um conjunto de utilitários UNIX em um único b
 Name:          busybox
 # stable line only
 Version:       1.19.2
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications
 Source0:       http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
@@ -54,6 +54,7 @@ Patch104:     busybox-1.19.2-inetd.patch
 Patch105:      busybox-1.19.2-syslogd.patch
 Patch106:      busybox-1.19.2-tail.patch
 Patch107:      busybox-1.19.2-tftp.patch
+Patch0:                %{name}-git.patch
 Patch1:                %{name}-logconsole.patch
 Patch2:                %{name}-printf-gettext.patch
 Patch3:                %{name}-loadfont.patch
@@ -168,6 +169,7 @@ Statycznie skonsolidowany busybox dla initrd.
 %patch105 -p1
 %patch106 -p1
 %patch107 -p1
+%patch0 -p1
 
 %patch1 -p1
 %patch2 -p1