Marcus Rueckert
c9287944c3
https://www.haproxy.com/blog/announcing-haproxy-2-2/ * [RELEASE] Released version 2.2.0 * MINOR: version: mention that it's an LTS release now * DOC: minor update to coding style file * DOC: update INSTALL with new compiler versions * CLEANUP: ssl: remove unrelevant comment in smp_fetch_ssl_x_keylog() * DOC: configuration: remove obsolete mentions of H2 being converted to HTTP/1.x * BUG/MINOR: connection: See new connection as available only on reuse always * BUG/MEDIUM: connection: Don't consider new private connections as available * BUG/MINOR: backend: Remove CO_FL_SESS_IDLE if a client remains on the last server * MINOR: mux-h1: Improve traces about the splicing - refreshed patches to apply cleanly again: haproxy-1.6.0-makefile_lib.patch haproxy-1.6.0-sec-options.patch - track series file in source rpm OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=221
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
commit 88413472b09e2ecd4ad2b4a00992184c14d5723c
|
|
Author: Kristoffer Gronlund <kgronlund@suse.com>
|
|
Date: Mon Jun 17 13:00:08 2019 +0000
|
|
|
|
SUSE: Makefile sec options
|
|
|
|
Index: haproxy-2.2/Makefile
|
|
===================================================================
|
|
--- haproxy-2.2.orig/Makefile
|
|
+++ haproxy-2.2/Makefile
|
|
@@ -741,6 +741,35 @@ ifneq ($(USE_NS),)
|
|
OPTIONS_OBJS += src/namespace.o
|
|
endif
|
|
|
|
+# PIE
|
|
+ifneq ($(USE_PIE),)
|
|
+OPTIONS_CFLAGS += -DUSE_PIE
|
|
+BUILD_OPTIONS += $(call ignore_implicit,USE_PIE)
|
|
+OPTIONS_LDFLAGS += -pie
|
|
+# still need to figure out how to express this conditional in the makefile
|
|
+# %ifarch s390 s390x %sparc
|
|
+# PIEFLAGS="-fPIE"
|
|
+# %else
|
|
+# PIEFLAGS="-fpie"
|
|
+# %endif
|
|
+# PIE_FLAGS.s390 = -fPIE
|
|
+# PIE_FLAGS.i386 = -fpie
|
|
+# SEC_FLAGS += $(PIE_FLAGS.$(ARCH))
|
|
+OPTIONS_CFLAGS += -fpie
|
|
+endif
|
|
+
|
|
+ifneq ($(USE_STACKPROTECTOR),)
|
|
+OPTIONS_CFLAGS += -DUSE_STACKPROTECTOR
|
|
+BUILD_OPTIONS += $(call ignore_implicit,USE_STACKPROTECTOR)
|
|
+OPTIONS_CFLAGS += -fstack-protector
|
|
+endif
|
|
+
|
|
+ifneq ($(USE_RELRO_NOW),)
|
|
+OPTIONS_CFLAGS += -DUSE_RELRO_NOW
|
|
+BUILD_OPTIONS += $(call ignore_implicit,USE_RELRO_NOW)
|
|
+OPTIONS_LDFLAGS += -Wl,-z,relro,-z,now
|
|
+endif
|
|
+
|
|
#### Global link options
|
|
# These options are added at the end of the "ld" command line. Use LDFLAGS to
|
|
# add options at the beginning of the "ld" command line if needed.
|