diff --git a/ldns-1.7.0-multilib.patch b/ldns-1.7.0-multilib.patch index b48d805..428dc78 100644 --- a/ldns-1.7.0-multilib.patch +++ b/ldns-1.7.0-multilib.patch @@ -1,7 +1,7 @@ -diff --git a/configure b/configure +diff --git a/ldns-1.7.0/configure b/ldns-1.7.0/configure index cd087de..aeec9fb 100755 ---- a/configure -+++ b/configure +--- a/ldns-1.7.0/configure ++++ b/ldns-1.7.0/configure @@ -684,6 +684,7 @@ PYTHON_SITE_PKG PYTHON_LDFLAGS PYTHON_CPPFLAGS @@ -26,12 +26,19 @@ index cd087de..aeec9fb 100755 fi if test -z "PYTHON_LDFLAGS"; then -diff --git a/packaging/ldns-config.in b/packaging/ldns-config.in -index ffb2c57..dd9989c 100755 ---- a/packaging/ldns-config.in -+++ b/packaging/ldns-config.in -@@ -10,6 +10,22 @@ LIBS="@LIBS@ @LIBSSL_LIBS@" - LIBDIR="@libdir@" +diff --git a/ldns-1.7.0/packaging/ldns-config.in b/ldns-1.7.0/packaging/ldns-config.in +index ffb2c57..950c135 100755 +--- a/ldns-1.7.0/packaging/ldns-config.in ++++ b/ldns-1.7.0/packaging/ldns-config.in +@@ -3,13 +3,26 @@ + prefix="@prefix@" + exec_prefix="@exec_prefix@" + VERSION="@PACKAGE_VERSION@" +-CFLAGS="@CFLAGS@" + CPPFLAGS="@CPPFLAGS@ @LIBSSL_CPPFLAGS@ @PYTHON_CPPFLAGS@" +-LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ @PYTHON_LDFLAGS@" + LIBS="@LIBS@ @LIBSSL_LIBS@" +-LIBDIR="@libdir@" INCLUDEDIR="@includedir@" LIBVERSION="@VERSION_INFO@" +ARCH="`uname -m`" @@ -53,7 +60,7 @@ index ffb2c57..dd9989c 100755 for arg in $@ do -@@ -21,9 +37,13 @@ do +@@ -21,9 +34,13 @@ do then echo "${LDFLAGS} -L${LIBDIR} ${LIBS} -lldns" fi diff --git a/ldns.spec b/ldns.spec index 60fe221..9876f22 100644 --- a/ldns.spec +++ b/ldns.spec @@ -151,7 +151,7 @@ pushd %{pkgname}_python2 pushd %{pkgname} %endif # with_python -%patch1 -p1 +%patch1 -p2 -b .multilib %patch2 -p1 -b .limit %patch3 -p1 -b .realloc # To built svn snapshots @@ -234,7 +234,7 @@ make %{?_smp_mflags} doc %endif # specfic hardening options should not end up in ldns-config -sed -i "s/-Wl,-z,relro,-z,now -pie//" packaging/ldns-config +sed -i "s~$RPM_LD_FLAGS~~" packaging/ldns-config popd %if 0%{with_python3} @@ -343,6 +343,7 @@ rm -rf doc/man %changelog * Wed Feb 21 2018 Petr Menšík - 1.7.0-14 - Add only extra flags to default RPM LDFLAGS +- Fix multilib conflict of ldns-config (#1463423) * Wed Feb 21 2018 Petr Menšík - 1.7.0-13 - Support for python3 package (#1323248)