busybox: additional 1.14.0 patches
PATCH 1/5 busybox: additional 1.14.0 patches
The original mdev patch was buggy.
Signed-off-by Peter Korsgaard <[email protected]>
--- package/busybox/busybox-1.14.0-mdev.patch | 14 +------------- package/busybox/busybox-1.14.0-sysctl.patch | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 package/busybox/busybox-1.14.0-sysctl.patch
package/busybox/busybox-1.14.0-mdev.patch +1 -13
@@ -1,5 +1,5 @@ --- busybox-1.14.0/util-linux/mdev.c Tue Apr 14 23:23:04 2009 -+++ busybox-1.14.0-mdev/util-linux/mdev.c Sat May 2 16:31:34 2009 ++++ busybox-1.14.0-mdev/util-linux/mdev.c Mon May 4 19:58:47 2009 @@ -181,7 +181,8 @@ * the rest of fields unless keep_matching == 1 */
@@ -10,15 +10,3 @@ /* 3rd field: mode - device permissions */ mode = strtoul(tokens[2], NULL, 8); -@@ -524,7 +525,10 @@ - make_device(temp, 1); - } - else if (strcmp(action, "add") == 0) { -- make_device(temp, 0); -+ /* N.B. make_device() mangles the device path, so save it */ -+ char *s = xstrdup(temp); -+ make_device(s, 0); -+ free(s); - if (ENABLE_FEATURE_MDEV_LOAD_FIRMWARE) { - if (fw) - load_firmware(fw, temp);
package/busybox/busybox-1.14.0-sysctl.patch new file +18 -0
@@ -0,0 +1,18 @@ +--- busybox-1.14.0/procps/sysctl.c Tue Apr 14 01:43:09 2009 ++++ busybox-1.14.0-sysctl/procps/sysctl.c Sun May 10 23:40:52 2009 +@@ -214,11 +214,11 @@ + // (but _whitespace_ from ends should be trimmed first (and we do it right)) + //TODO: "var==1" is mishandled (must use "=1" as a value, but uses "1") + while (config_read(parser, token, 2, 2, "# \t=", PARSE_NORMAL)) { ++ char *tp; + sysctl_dots_to_slashes(token[0]); +- /* Save ~4 bytes by using parser internals */ +- /* parser->line is big enough for sprintf */ +- sprintf(parser->line, "%s=%s", token[0], token[1]); +- sysctl_act_recursive(parser->line); ++ tp = xasprintf("%s=%s", token[0], token[1]); ++ sysctl_act_recursive(tp); ++ free(tp); + } + if (ENABLE_FEATURE_CLEAN_UP) + config_close(parser);
Signature · 1 line
1.6.2
PATCH 2/5 gamin: only enable python support if enabled
From: Sven Neumann <[email protected]>
Closes #295.
Signed-off-by Peter Korsgaard <[email protected]>
--- package/gamin/gamin.mk | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
package/gamin/gamin.mk +4 -0
@@ -12,6 +12,10 @@ GAMIN_INSTALL_TARGET = YES GAMIN_CONF_OPT = --program-prefix="" --disable-debug +ifneq ($(BR2_PACKAGE_PYTHON),y) +GAMIN_CONF_OPT += --without-python +endif + GAMIN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install GAMIN_CONF_ENV = have_abstract_sockets=no
Signature · 1 line
1.6.2
PATCH 3/5 cups: add pdftops option
The pdftops support in cups needs C++ support, whereas the rest doesn't. Add a BR2_PACKAGE_CUPS_PDFTOPS (depending on C++ support) to enable it if needed.
Signed-off-by Peter Korsgaard <[email protected]>
--- package/cups/Config.in | 13 +++++++++++++ package/cups/cups.mk | 6 ++++++ 2 files changed, 19 insertions(+), 0 deletions(-)
package/cups/Config.in +13 -0
@@ -4,3 +4,16 @@ config BR2_PACKAGE_CUPS The Common Unix Printing System http://www.cups.org + +if BR2_PACKAGE_CUPS + +config BR2_PACKAGE_CUPS_PDFTOPS + bool "pdftops support" + depends on BR2_INSTALL_LIBSTDCPP + help + Enable pdftops support + +comment "pdftops support requires a toolchain with C++ support enabled" + depends on !BR2_INSTALL_LIBSTDCPP + +endif
package/cups/cups.mk +6 -0
@@ -58,6 +58,12 @@ else CUPS_CONF_OPT += --disable-python endif +ifeq ($(BR2_PACKAGE_CUPS_PDFTOPS),y) + CUPS_CONF_OPT += --enable-pdftops +else + CUPS_CONF_OPT += --disable-pdftops +endif + $(DL_DIR)/$(CUPS_SOURCE): $(call DOWNLOAD,$(CUPS_SITE),$(CUPS_SOURCE))
Signature · 1 line
1.6.2
PATCH 4/5 cups: fix -fstack-protector configure check
The configure script failed to detect toolchains without stack protector support.
Signed-off-by Peter Korsgaard <[email protected]>
--- package/cups/cups-fix-stack-protector-check.patch | 25 +++++++++++++++++++++ package/cups/cups.mk | 3 +- 2 files changed, 27 insertions(+), 1 deletions(-) create mode 100644 package/cups/cups-fix-stack-protector-check.patch
package/cups/cups-fix-stack-protector-check.patch new file +25 -0
@@ -0,0 +1,25 @@ +[PATCH]: use AC_TRY_LINK for stack protector check + +Actually try to link an executable to test for stack protector support, +as gcc seems to accept the -fstack-protector argument even when it's +compiled with --disable-libssp (but linking fails with a error +finding -lssp_nonshared). + +Signed-off-by: Peter Korsgaard <[email protected]> +--- + config-scripts/cups-compiler.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: cups-1.3.9/config-scripts/cups-compiler.m4 +=================================================================== +--- cups-1.3.9.orig/config-scripts/cups-compiler.m4 ++++ cups-1.3.9/config-scripts/cups-compiler.m4 +@@ -109,7 +109,7 @@ if test -n "$GCC"; then + AC_MSG_CHECKING(if GCC supports -fstack-protector) + OLDCFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fstack-protector" +- AC_TRY_COMPILE(,, ++ AC_TRY_LINK(,, + OPTIM="$OPTIM -fstack-protector" + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no))
package/cups/cups.mk +2 -1
@@ -74,6 +74,7 @@ $(CUPS_DIR)/.unpacked: $(DL_DIR)/$(CUPS_SOURCE) touch $@ $(CUPS_DIR)/.configured: $(CUPS_DIR)/.unpacked + cd $(CUPS_DIR) && $(AUTOCONF) (cd $(CUPS_DIR) && \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \
@@ -109,7 +110,7 @@ $(CUPS_DIR)/.installed: $(CUPS_DIR)/.compiled $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/bin/cups-config touch $@ -cups: uclibc $(CUPS_DEPENDENCIES) $(CUPS_DIR)/.installed +cups: uclibc host-autoconf $(CUPS_DEPENDENCIES) $(CUPS_DIR)/.installed cups-source: $(DL_DIR)/$(CUPS_SOURCE)
Signature · 1 line
1.6.2
PATCH 5/5 cups: remove version number from patches
Signed-off-by Peter Korsgaard <[email protected]>
---
...-1.3.5-mantohtml.patch => cups-mantohtml.patch} | 0
...-no-tests-man.patch => cups-no-tests-man.patch} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename package/cups/{cups-1.3.5-mantohtml.patch => cups-mantohtml.patch} (100%)
rename package/cups/{cups-1.3.5-no-tests-man.patch => cups-no-tests-man.patch} (100%)package/cups/cups-mantohtml.patch renamed from package/cups/cups-1.3.5-mantohtml.patch +0 -0
package/cups/cups-no-tests-man.patch renamed from package/cups/cups-1.3.5-no-tests-man.patch +0 -0
Signature · 1 line
1.6.2