summaryrefslogtreecommitdiffstats
path: root/package/busybox/busybox-1.18.0
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2010-12-03 16:51:49 -0300
committerPeter Korsgaard <jacmet@sunsite.dk>2010-12-11 02:18:42 +0100
commit51f3f96498c9cda3386a4bcbaf8e1e4cd107035f (patch)
treee0ec39356b448796a7c6a15301d128ff23c9dfda /package/busybox/busybox-1.18.0
parent176afdb3a180e0833d8b0a5085a2745e2b3e2d27 (diff)
downloadbuildroot-novena-51f3f96498c9cda3386a4bcbaf8e1e4cd107035f.tar.gz
buildroot-novena-51f3f96498c9cda3386a4bcbaf8e1e4cd107035f.zip
busybox: add 1.18.0, remove 1.13.x and 1.14.x, mark 1.15.x as deprecated
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/busybox/busybox-1.18.0')
-rw-r--r--package/busybox/busybox-1.18.0/busybox-1.18.0-buildsys.patch21
-rw-r--r--package/busybox/busybox-1.18.0/busybox-1.18.0-sha.patch118
2 files changed, 139 insertions, 0 deletions
diff --git a/package/busybox/busybox-1.18.0/busybox-1.18.0-buildsys.patch b/package/busybox/busybox-1.18.0/busybox-1.18.0-buildsys.patch
new file mode 100644
index 000000000..c72e4d3b5
--- /dev/null
+++ b/package/busybox/busybox-1.18.0/busybox-1.18.0-buildsys.patch
@@ -0,0 +1,21 @@
+diff -urpN busybox-1.18.0/scripts/gen_build_files.sh busybox-1.18.0-buildsys/scripts/gen_build_files.sh
+--- busybox-1.18.0/scripts/gen_build_files.sh 2010-11-22 21:43:22.000000000 +0100
++++ busybox-1.18.0-buildsys/scripts/gen_build_files.sh 2010-11-24 14:59:47.732712663 +0100
+@@ -18,14 +18,14 @@ generate()
+ local src="$1" dst="$2" header="$3" insert="$4"
+ #chk "${dst}"
+ (
+- echo "${header}"
++ printf "%s\n" "${header}"
+ if grep -qs '^INSERT$' "${src}"; then
+ sed -n '1,/^INSERT$/p' "${src}"
+- echo "${insert}"
++ printf "%s\n" "${insert}"
+ sed -n '/^INSERT$/,$p' "${src}"
+ else
+ if [ -n "${insert}" ]; then
+- echo "ERROR: INSERT line missing in: ${src}" 1>&2
++ printf "%s\n" "ERROR: INSERT line missing in: ${src}" 1>&2
+ fi
+ cat "${src}"
+ fi
diff --git a/package/busybox/busybox-1.18.0/busybox-1.18.0-sha.patch b/package/busybox/busybox-1.18.0/busybox-1.18.0-sha.patch
new file mode 100644
index 000000000..3ad66fd71
--- /dev/null
+++ b/package/busybox/busybox-1.18.0/busybox-1.18.0-sha.patch
@@ -0,0 +1,118 @@
+diff -urpN busybox-1.18.0/libbb/pw_encrypt_sha.c busybox-1.18.0-sha/libbb/pw_encrypt_sha.c
+--- busybox-1.18.0/libbb/pw_encrypt_sha.c 2010-11-22 21:43:22.000000000 +0100
++++ busybox-1.18.0-sha/libbb/pw_encrypt_sha.c 2010-12-01 13:56:24.372704380 +0100
+@@ -3,7 +3,7 @@
+ */
+
+ /* Prefix for optional rounds specification. */
+-static const char str_rounds[] = "rounds=%u$";
++static const char str_rounds[] ALIGN1 = "rounds=%u$";
+
+ /* Maximum salt string length. */
+ #define SALT_LEN_MAX 16
+@@ -19,8 +19,8 @@ NOINLINE
+ sha_crypt(/*const*/ char *key_data, /*const*/ char *salt_data)
+ {
+ void (*sha_begin)(void *ctx) FAST_FUNC;
+- void (*sha_hash)(const void *buffer, size_t len, void *ctx) FAST_FUNC;
+- void (*sha_end)(void *resbuf, void *ctx) FAST_FUNC;
++ void (*sha_hash)(void *ctx, const void *buffer, size_t len) FAST_FUNC;
++ void (*sha_end)(void *ctx, void *resbuf) FAST_FUNC;
+ int _32or64;
+
+ char *result, *resptr;
+@@ -103,40 +103,40 @@ sha_crypt(/*const*/ char *key_data, /*co
+
+ /* Add KEY, SALT. */
+ sha_begin(&ctx);
+- sha_hash(key_data, key_len, &ctx);
+- sha_hash(salt_data, salt_len, &ctx);
++ sha_hash(&ctx, key_data, key_len);
++ sha_hash(&ctx, salt_data, salt_len);
+
+ /* Compute alternate SHA sum with input KEY, SALT, and KEY.
+ The final result will be added to the first context. */
+ sha_begin(&alt_ctx);
+- sha_hash(key_data, key_len, &alt_ctx);
+- sha_hash(salt_data, salt_len, &alt_ctx);
+- sha_hash(key_data, key_len, &alt_ctx);
+- sha_end(alt_result, &alt_ctx);
++ sha_hash(&alt_ctx, key_data, key_len);
++ sha_hash(&alt_ctx, salt_data, salt_len);
++ sha_hash(&alt_ctx, key_data, key_len);
++ sha_end(&alt_ctx, alt_result);
+
+ /* Add result of this to the other context. */
+ /* Add for any character in the key one byte of the alternate sum. */
+ for (cnt = key_len; cnt > _32or64; cnt -= _32or64)
+- sha_hash(alt_result, _32or64, &ctx);
+- sha_hash(alt_result, cnt, &ctx);
++ sha_hash(&ctx, alt_result, _32or64);
++ sha_hash(&ctx, alt_result, cnt);
+
+ /* Take the binary representation of the length of the key and for every
+ 1 add the alternate sum, for every 0 the key. */
+ for (cnt = key_len; cnt != 0; cnt >>= 1)
+ if ((cnt & 1) != 0)
+- sha_hash(alt_result, _32or64, &ctx);
++ sha_hash(&ctx, alt_result, _32or64);
+ else
+- sha_hash(key_data, key_len, &ctx);
++ sha_hash(&ctx, key_data, key_len);
+
+ /* Create intermediate result. */
+- sha_end(alt_result, &ctx);
++ sha_end(&ctx, alt_result);
+
+ /* Start computation of P byte sequence. */
+ /* For every character in the password add the entire password. */
+ sha_begin(&alt_ctx);
+ for (cnt = 0; cnt < key_len; ++cnt)
+- sha_hash(key_data, key_len, &alt_ctx);
+- sha_end(temp_result, &alt_ctx);
++ sha_hash(&alt_ctx, key_data, key_len);
++ sha_end(&alt_ctx, temp_result);
+
+ /* NB: past this point, raw key_data is not used anymore */
+
+@@ -153,8 +153,8 @@ sha_crypt(/*const*/ char *key_data, /*co
+ /* For every character in the password add the entire password. */
+ sha_begin(&alt_ctx);
+ for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt)
+- sha_hash(salt_data, salt_len, &alt_ctx);
+- sha_end(temp_result, &alt_ctx);
++ sha_hash(&alt_ctx, salt_data, salt_len);
++ sha_end(&alt_ctx, temp_result);
+
+ /* NB: past this point, raw salt_data is not used anymore */
+
+@@ -174,22 +174,22 @@ sha_crypt(/*const*/ char *key_data, /*co
+
+ /* Add key or last result. */
+ if ((cnt & 1) != 0)
+- sha_hash(p_bytes, key_len, &ctx);
++ sha_hash(&ctx, p_bytes, key_len);
+ else
+- sha_hash(alt_result, _32or64, &ctx);
++ sha_hash(&ctx, alt_result, _32or64);
+ /* Add salt for numbers not divisible by 3. */
+ if (cnt % 3 != 0)
+- sha_hash(s_bytes, salt_len, &ctx);
++ sha_hash(&ctx, s_bytes, salt_len);
+ /* Add key for numbers not divisible by 7. */
+ if (cnt % 7 != 0)
+- sha_hash(p_bytes, key_len, &ctx);
++ sha_hash(&ctx, p_bytes, key_len);
+ /* Add key or last result. */
+ if ((cnt & 1) != 0)
+- sha_hash(alt_result, _32or64, &ctx);
++ sha_hash(&ctx, alt_result, _32or64);
+ else
+- sha_hash(p_bytes, key_len, &ctx);
++ sha_hash(&ctx, p_bytes, key_len);
+
+- sha_end(alt_result, &ctx);
++ sha_end(&ctx, alt_result);
+ }
+
+ /* Append encrypted password to result buffer */