From 6966aa0d50fb96dbcdf8d574b2a91dd9f09742a4 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 11 Nov 2014 09:49:20 +0000 Subject: lldpd: allow discovery protocols to be disabled from menuconfig Signed-off-by: Michel Stam [jow: fixed condition for CONFIG_LLDPD_WITH_JSON] Signed-off-by: Jo-Philipp Wich SVN-Revision: 43233 --- package/network/services/lldpd/patches/002-no-stack-protector.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'package/network/services/lldpd/patches') diff --git a/package/network/services/lldpd/patches/002-no-stack-protector.patch b/package/network/services/lldpd/patches/002-no-stack-protector.patch index dc861bac64..8a49d2d134 100644 --- a/package/network/services/lldpd/patches/002-no-stack-protector.patch +++ b/package/network/services/lldpd/patches/002-no-stack-protector.patch @@ -1,10 +1,11 @@ --- a/configure.ac +++ b/configure.ac -@@ -62,7 +62,6 @@ AX_CFLAGS_GCC_OPTION([-Wformat]) +@@ -62,7 +62,5 @@ AX_CFLAGS_GCC_OPTION([-Wformat]) AX_CFLAGS_GCC_OPTION([-Wformat-security]) AX_CFLAGS_GCC_OPTION([-Wcast-align]) AX_CFLAGS_GCC_OPTION([-Winline]) -AX_CFLAGS_GCC_OPTION([-fstack-protector]) +-AX_CFLAGS_GCC_OPTION([-fstack-protector-strong]) + AX_CFLAGS_GCC_OPTION([-fno-omit-frame-pointer]) AX_CFLAGS_GCC_OPTION([-D_FORTIFY_SOURCE=2]) - AX_CFLAGS_GCC_OPTION([-Wdeclaration-after-statement]) AX_CFLAGS_GCC_OPTION([-Wno-unused-parameter]) -- cgit v1.2.3