diff options
Diffstat (limited to 'package/busybox')
| -rw-r--r-- | package/busybox/busybox-1.17.1/busybox-1.17.1-mktemp.patch | 12 | ||||
| -rw-r--r-- | package/busybox/busybox.mk | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/package/busybox/busybox-1.17.1/busybox-1.17.1-mktemp.patch b/package/busybox/busybox-1.17.1/busybox-1.17.1-mktemp.patch new file mode 100644 index 000000000..557e337b1 --- /dev/null +++ b/package/busybox/busybox-1.17.1/busybox-1.17.1-mktemp.patch @@ -0,0 +1,12 @@ +diff -urpN busybox-1.17.1/debianutils/mktemp.c busybox-1.17.1-mktemp/debianutils/mktemp.c +--- busybox-1.17.1/debianutils/mktemp.c 2010-07-25 00:12:56.000000000 +0200 ++++ busybox-1.17.1-mktemp/debianutils/mktemp.c 2010-07-27 08:21:26.000000000 +0200 +@@ -50,7 +50,7 @@ int mktemp_main(int argc UNUSED_PARAM, c + opts = getopt32(argv, "dqtp:", &path); + + chp = argv[optind] ? argv[optind] : xstrdup("tmp.XXXXXX"); +- if (chp[0] != '/' || (opts & 8)) ++ if (!strchr(chp, '/') || (opts & 8)) + chp = concat_path_file(path, chp); + + if (opts & 1) { /* -d */ diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 086b56371..b7f474091 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -29,7 +29,7 @@ endef endif # id applet breaks on >=1.13.0 with old uclibc unless the bb pwd routines are used -ifeq ($(BR2_BUSYBOX_VERSION_1_13_X)$(BR2_BUSYBOX_VERSION_1_14_X)$(BR2_UCLIBC_VERSION_0_9_28_3)$(BR2_UCLIBC_VERSION_0_9_29),yy) +ifeq ($(BR2_BUSYBOX_VERSION_1_13_X)$(BR2_BUSYBOX_VERSION_1_14_X)$(BR2_UCLIBC_VERSION_0_9_29),yy) define BUSYBOX_SET_BB_PWD if grep -q 'CONFIG_ID=y' $(BUSYBOX_BUILD_CONFIG); \ then \ |