Accepting request 878586 from home:mgerstner:branches:network

- pass PIE compiler and linker flags via environment variables to make /usr/bin/delv in bind-tools also position independent (bsc#1183453). - drop pie_compile.diff: no longer needed, this patch is difficult to maintain, the environment variable approach is less error prone. OBS-URL: https://build.opensuse.org/request/show/878586 OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=311
2021-03-23 11:05:30 +00:00 · 2021-03-23 11:05:30 +00:00 · de638e5cf5
commit de638e5cf5
parent fc3480a7ee
3 changed files with 10 additions and 180 deletions
--- a/bind.changes
+++ b/bind.changes
@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Mar 12 15:03:21 UTC 2021 - Matthias Gerstner <matthias.gerstner@suse.com>
+
+- pass PIE compiler and linker flags via environment variables to make
+  /usr/bin/delv in bind-tools also position independent (bsc#1183453).
+- drop pie_compile.diff: no longer needed, this patch is difficult to
+  maintain, the environment variable approach is less error prone.
+
 -------------------------------------------------------------------
 Thu Feb 18 08:44:47 UTC 2021 - Josef Möllers <josef.moellers@suse.com>

--- a/bind.spec
+++ b/bind.spec
@ -61,7 +61,6 @@ Source60:       dlz-schema.txt
 # configuation files for systemd-tmpfiles
 Source70:       bind.conf
 Source72:       named.conf
-Patch51:        pie_compile.diff
 Patch52:        named-bootconf.diff
 Patch56:        bind-ldapdump-use-valid-host.patch
 BuildRequires:  libcap-devel
@ -147,7 +146,6 @@ This package provides a module which allows commands to be sent to rndc directly

 %prep
 %setup -q -a1
-%patch51 -p1
 %patch52 -p1
 %patch56 -p1

@ -173,7 +171,8 @@ popd

 %build
 autoreconf -fvi
-export CFLAGS="%{optflags} -DNO_VERSION_DATE"
+export CFLAGS="%{optflags} -fPIE -DNO_VERSION_DATE"
+export LDFLAGS="-pie"
 %configure \
 	--with-python=%{_bindir}/python3 \
 	--includedir=%{_includedir}/bind \
--- a/pie_compile.diff
+++ b/pie_compile.diff
@ -1,177 +0,0 @@
-Index: bind-9.16.4/bin/Makefile.in
-===================================================================
--- bind-9.16.4.orig/bin/Makefile.in
-+++ bind-9.16.4/bin/Makefile.in
-@@ -15,4 +15,8 @@ SUBDIRS =	named rndc dig delv dnssec too
- 		@NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests
- TARGETS =
- 
-+EXT_CFLAGS = -fPIE -static
-+
- @BIND9_MAKE_RULES@
-+
-+LDFLAGS   += -pie
-Index: bind-9.16.4/bin/check/Makefile.in
-===================================================================
--- bind-9.16.4.orig/bin/check/Makefile.in
-+++ bind-9.16.4/bin/check/Makefile.in
-@@ -46,8 +46,12 @@ TARGETS =	named-checkconf@EXEEXT@ named-
- # Alphabetically
- SRCS =		named-checkconf.c named-checkzone.c check-tool.c
- 
-+EXT_CFLAGS = -fPIE -static
-+
- @BIND9_MAKE_RULES@
- 
-+LDFLAGS   += -pie
-+
- named-checkconf.@O@: named-checkconf.c
- 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
- 		-DVERSION=\"${VERSION}\" \
-Index: bind-9.16.4/bin/confgen/Makefile.in
-===================================================================
--- bind-9.16.4.orig/bin/confgen/Makefile.in
-+++ bind-9.16.4/bin/confgen/Makefile.in
-@@ -55,8 +55,12 @@ TARGETS =	rndc-confgen@EXEEXT@ ddns-conf
- 
- UOBJS =		unix/os.@O@
- 
-+EXT_CFLAGS = -fPIE -static
-+
- @BIND9_MAKE_RULES@
- 
-+LDFLAGS   += -pie
-+
- rndc-confgen.@O@: rndc-confgen.c
- 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
- 		-DRNDC_KEYFILE=\"${sysconfdir}/rndc.key\" \
-Index: bind-9.16.4/bin/confgen/unix/Makefile.in
-===================================================================
--- bind-9.16.4.orig/bin/confgen/unix/Makefile.in
-+++ bind-9.16.4/bin/confgen/unix/Makefile.in
-@@ -25,4 +25,8 @@ SRCS =		os.c
- 
- TARGETS =	${OBJS}
- 
-+EXT_CFLAGS = -fPIE -static
-+
- @BIND9_MAKE_RULES@
-+
-+LDFLAGS   += -pie
-Index: bind-9.16.4/bin/dig/Makefile.in
-===================================================================
--- bind-9.16.4.orig/bin/dig/Makefile.in
-+++ bind-9.16.4/bin/dig/Makefile.in
-@@ -57,10 +57,14 @@ UOBJS =
- 
- SRCS =		dig.c dighost.c host.c nslookup.c
- 
-+EXT_CFLAGS = -fPIE -static
-+
- @BIND9_MAKE_RULES@
- 
- LDFLAGS =	@LDFLAGS@ @LIBIDN2_LDFLAGS@
- 
-+LDFLAGS   += -pie
-+
- dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
- 	export BASEOBJS="dig.@O@ dighost.@O@ ${UOBJS}"; \
- 	export LIBS0="${DNSLIBS} ${IRSLIBS}"; \
-Index: bind-9.16.4/bin/dnssec/Makefile.in
-===================================================================
--- bind-9.16.4.orig/bin/dnssec/Makefile.in
-+++ bind-9.16.4/bin/dnssec/Makefile.in
-@@ -50,8 +50,12 @@ SRCS =		dnssec-cds.c dnssec-dsfromkey.c
- 		dnssec-settime.c dnssec-signzone.c dnssec-verify.c \
- 		dnssectool.c
- 
-+EXT_CFLAGS = -fPIE -static
-+
- @BIND9_MAKE_RULES@
- 
-+LDFLAGS   += -pie
-+
- dnssec-cds@EXEEXT@: dnssec-cds.@O@ ${OBJS} ${DEPLIBS}
- 	export BASEOBJS="dnssec-cds.@O@ ${OBJS}"; \
- 	${FINALBUILDCMD}
-Index: bind-9.16.4/bin/named/Makefile.in
-===================================================================
--- bind-9.16.4.orig/bin/named/Makefile.in
-+++ bind-9.16.4/bin/named/Makefile.in
-@@ -117,8 +117,12 @@ SRCS =		builtin.c config.c control.c \
- 		tkeyconf.c tsigconf.c zoneconf.c \
- 		${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
- 
-+EXT_CFLAGS = -fPIE -static
-+
- @BIND9_MAKE_RULES@
- 
-+LDFLAGS   += -pie
-+
- main.@O@: main.c
- 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
- 		-DVERSION=\"${VERSION}\" \
-Index: bind-9.16.4/bin/named/unix/Makefile.in
-===================================================================
--- bind-9.16.4.orig/bin/named/unix/Makefile.in
-+++ bind-9.16.4/bin/named/unix/Makefile.in
-@@ -27,4 +27,8 @@ SRCS =		os.c dlz_dlopen_driver.c
- 
- TARGETS =	${OBJS}
- 
-+EXT_CFLAGS = -fPIE -static
-+
- @BIND9_MAKE_RULES@
-+
-+LDFLAGS   += -pie
-Index: bind-9.16.4/bin/nsupdate/Makefile.in
-===================================================================
--- bind-9.16.4.orig/bin/nsupdate/Makefile.in
-+++ bind-9.16.4/bin/nsupdate/Makefile.in
-@@ -59,8 +59,12 @@ UOBJS =
- 
- SRCS =		nsupdate.c
- 
-+EXT_CFLAGS = -fPIE -static
-+
- @BIND9_MAKE_RULES@
- 
-+LDFLAGS   += -pie
-+
- nsupdate.@O@: nsupdate.c
- 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
- 		-DSESSION_KEYFILE=\"${localstatedir}/run/named/session.key\" \
-Index: bind-9.16.4/bin/rndc/Makefile.in
-===================================================================
--- bind-9.16.4.orig/bin/rndc/Makefile.in
-+++ bind-9.16.4/bin/rndc/Makefile.in
-@@ -45,8 +45,12 @@ SRCS=		rndc.c
- 
- TARGETS =	rndc@EXEEXT@
- 
-+EXT_CFLAGS = -fPIE -static
-+
- @BIND9_MAKE_RULES@
- 
-+LDFLAGS   += -pie
-+
- rndc.@O@: rndc.c
- 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
- 		-DVERSION=\"${VERSION}\" \
-Index: bind-9.16.4/bin/tools/Makefile.in
-===================================================================
--- bind-9.16.4.orig/bin/tools/Makefile.in
-+++ bind-9.16.4/bin/tools/Makefile.in
-@@ -54,8 +54,12 @@ SRCS =		arpaname.c named-journalprint.c
- 		nsec3hash.c mdig.c \
- 		@DNSTAPSRCS@ @NZDSRCS@
- 
-+EXT_CFLAGS = -fPIE -static
-+
- @BIND9_MAKE_RULES@
- 
-+LDFLAGS   += -pie
-+
- arpaname@EXEEXT@: arpaname.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
- 		-o $@ arpaname.@O@ ${ISCLIBS} ${LIBS}