diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-17 21:55:49 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-17 21:55:49 +0100 |
| commit | 15c84adca94bfe4a89ece5c04f06a884cf508ebb (patch) | |
| tree | 727d3fd768a1abe75521190b90833b3a68cce4c6 /package/scanlogd | |
| parent | 0de5d9ecedff55481b3c1eb9c3841de17716a485 (diff) | |
fix packages to be compile with stack protector
- libtool do not pass -fstack-protector while linking,
but this is required to successfully link libraries or
executables with SSP
- pass LDFLAGS for non-libtool packages
Diffstat (limited to 'package/scanlogd')
| -rw-r--r-- | package/scanlogd/Makefile | 5 | ||||
| -rw-r--r-- | package/scanlogd/patches/patch-Makefile | 14 | ||||
| -rw-r--r-- | package/scanlogd/patches/patch-params_h | 20 |
3 files changed, 35 insertions, 4 deletions
diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile index bc2d80e68..ef939a1f1 100644 --- a/package/scanlogd/Makefile +++ b/package/scanlogd/Makefile @@ -21,10 +21,7 @@ $(eval $(call PKG_template,SCANLOGD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ CONFIG_STYLE:= manual INSTALL_STYLE:= manual -MAKE_FLAGS+= CC="${TARGET_CC}" LD="${TARGET_CC}" \ - CFLAGS="-c ${TARGET_CFLAGS}" \ - LDFLAGS= \ - PCAP_H="-I${STAGING_TARGET_DIR}/usr/include" \ +MAKE_FLAGS+= PCAP_H="-I${STAGING_TARGET_DIR}/usr/include" \ NIDS_H="-I${STAGING_TARGET_DIR}/usr/include" \ NIDS_L="-L${STAGING_TARGET_DIR}/usr/lib -lnids -lnet -lpcap" ALL_TARGET:= libnids diff --git a/package/scanlogd/patches/patch-Makefile b/package/scanlogd/patches/patch-Makefile new file mode 100644 index 000000000..a2a239302 --- /dev/null +++ b/package/scanlogd/patches/patch-Makefile @@ -0,0 +1,14 @@ +--- scanlogd-2.2.6.orig/Makefile 2006-03-05 11:03:15.000000000 +0100 ++++ scanlogd-2.2.6/Makefile 2011-01-17 12:03:48.000000000 +0100 +@@ -1,8 +1,8 @@ +-CC = gcc ++CC ?= gcc + LD = $(CC) + RM = rm -f +-CFLAGS = -Wall -O2 -fomit-frame-pointer +-LDFLAGS = -s ++CFLAGS ?= -Wall -O2 -fomit-frame-pointer ++LDFLAGS ?= -s + + PCAP_H = -I/usr/include/pcap + PCAP_L = -lpcap diff --git a/package/scanlogd/patches/patch-params_h b/package/scanlogd/patches/patch-params_h new file mode 100644 index 000000000..b649c8f8d --- /dev/null +++ b/package/scanlogd/patches/patch-params_h @@ -0,0 +1,20 @@ +--- scanlogd-2.2.6.orig/params.h 2006-03-05 11:13:56.000000000 +0100 ++++ scanlogd-2.2.6/params.h 2011-01-17 11:35:06.000000000 +0100 +@@ -19,7 +19,7 @@ + * An empty directory to chroot to. The directory and its parent directories + * must not be writable by anyone but root. + */ +-#define SCANLOGD_CHROOT "/var/empty" ++#define SCANLOGD_CHROOT "/tmp/.scanlogd" + + /* + * Device to monitor, if you're using libnids or libpcap directly. #undef +@@ -29,7 +29,7 @@ + * Recent versions of libpcap support magic device name "any" and recent + * libnids supports magic device name "all". + */ +-#undef SCANLOGD_DEVICE ++#define SCANLOGD_DEVICE "all" + + /* + * Whether we want scanlogd to set the device into promiscuous mode, for |