diff --git a/debian/patches/include-ldflags-otpd.diff b/debian/patches/include-ldflags-otpd.diff new file mode 100644 index 000000000..c9215775a --- /dev/null +++ b/debian/patches/include-ldflags-otpd.diff @@ -0,0 +1,21 @@ +commit 75dadc1d8ffc3ac84c4b1988c266ef60de1a6cfe +Author: Jan Cholasta +Date: Wed Dec 4 18:39:44 2013 +0100 + + Include LDFLAGS provided by rpmbuild in global LDFLAGS in the spec file. + + Remove explicitly specified hardening flags from LDFLAGS in ipa-otpd. + + https://fedorahosted.org/freeipa/ticket/3896 + +diff --git a/daemons/ipa-otpd/Makefile.am b/daemons/ipa-otpd/Makefile.am +index f0b7528..ed99c3e 100644 +--- a/daemons/ipa-otpd/Makefile.am ++++ b/daemons/ipa-otpd/Makefile.am +@@ -1,5 +1,5 @@ + AM_CFLAGS := $(CFLAGS) @LDAP_CFLAGS@ @LIBVERTO_CFLAGS@ +-AM_LDFLAGS := $(LDFLAGS) @LDAP_LIBS@ @LIBVERTO_LIBS@ @KRAD_LIBS@ -pie -Wl,-z,relro -Wl,-z,now ++AM_LDFLAGS := $(LDFLAGS) @LDAP_LIBS@ @LIBVERTO_LIBS@ @KRAD_LIBS@ + + noinst_HEADERS = internal.h + libexec_PROGRAMS = ipa-otpd diff --git a/debian/patches/series b/debian/patches/series index a33caeb4a..6ffe1b680 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -16,3 +16,5 @@ fix-symlink-exclusion.diff check-dbus-before-starting.diff add-debian-platform.diff use-new-nssdb.diff + +include-ldflags-otpd.diff