From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Tue, 19 Apr 2016 13:02:38 +0000 (+0300)
Subject: Add PIE and RELRO to binaries
X-Git-Tag: 2.3.0.rc1~3321
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b200bc3875fa06d42c8619865cc306c3297fcacc;p=thirdparty%2Fdovecot%2Fcore.git

Add PIE and RELRO to binaries
---

diff --git a/src/anvil/Makefile.am b/src/anvil/Makefile.am
index d85db54f58..01b58ffe74 100644
--- a/src/anvil/Makefile.am
+++ b/src/anvil/Makefile.am
@@ -6,11 +6,14 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
 	-I$(top_srcdir)/src/lib-test \
 	-I$(top_srcdir)/src/lib-settings \
-	-I$(top_srcdir)/src/lib-master
+	-I$(top_srcdir)/src/lib-master \
+	$(BINARY_CFLAGS)
 
 anvil_LDADD = \
 	$(LIBDOVECOT) \
-	$(RAND_LIBS)
+	$(RAND_LIBS) \
+	$(BINARY_LDFLAGS)
+
 anvil_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 anvil_SOURCES = \
diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 5c1987d6a3..836f9007fe 100644
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LIBRARIES = libpassword.a
+noinst_LTLIBRARIES = libpassword.la
 auth_moduledir = $(moduledir)/auth
 
 # automake seems to force making this unconditional..
@@ -41,7 +41,7 @@ AM_CPPFLAGS = \
 
 auth_LDFLAGS = -export-dynamic
 
-libpassword_a_SOURCES = \
+libpassword_la_SOURCES = \
 	mycrypt.c \
 	password-scheme.c \
 	password-scheme-crypt.c \
@@ -53,12 +53,13 @@ libpassword_a_SOURCES = \
 
 auth_libs = \
 	libstats_auth.la \
-	libpassword.a \
-	../lib-ntlm/libntlm.a \
-	../lib-otp/libotp.a \
+	libpassword.la \
+	../lib-ntlm/libntlm.la \
+	../lib-otp/libotp.la \
 	$(LIBDOVECOT_SQL)
 
-auth_LDADD = $(auth_libs) $(LIBDOVECOT) $(AUTH_LIBS)
+auth_CPPFLAGS = $(AM_CPPFLAGS) $(BINARY_CFLAGS)
+auth_LDADD = $(auth_libs) $(LIBDOVECOT) $(AUTH_LIBS) $(BINARY_LDFLAGS)
 auth_DEPENDENCIES = $(auth_libs) $(LIBDOVECOT_DEPS)
 
 ldap_sources = db-ldap.c passdb-ldap.c userdb-ldap.c
@@ -198,7 +199,8 @@ libauthdb_imap_la_SOURCES = passdb-imap.c
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)
 
-checkpassword_reply_LDADD = $(LIBDOVECOT)
+checkpassword_reply_CPPFLAGS = $(AM_CPPFLAGS) $(BINARY_CFLAGS)
+checkpassword_reply_LDADD = $(LIBDOVECOT) $(BINARY_LDFLAGS)
 checkpassword_reply_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 checkpassword_reply_sources = \
@@ -223,16 +225,16 @@ test_libs = \
 	../lib-test/libtest.la \
 	../lib/liblib.la
 
-test_auth_cache_SOURCES = test-auth-cache.c
-test_auth_cache_LDADD = auth-cache.o $(test_libs)
+test_auth_cache_SOURCES = auth-cache.c test-auth-cache.c
+test_auth_cache_LDADD = $(test_libs)
 test_auth_cache_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs)
 
-test_auth_request_var_expand_SOURCES = test-auth-request-var-expand.c
-test_auth_request_var_expand_LDADD = auth-request-var-expand.o auth-fields.o $(test_libs)
+test_auth_request_var_expand_SOURCES = auth-request-var-expand.c auth-fields.c test-auth-request-var-expand.c
+test_auth_request_var_expand_LDADD = $(test_libs)
 test_auth_request_var_expand_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs)
 
-test_db_dict_SOURCES = test-db-dict.c
-test_db_dict_LDADD = db-dict-cache-key.o $(test_libs)
+test_db_dict_SOURCES = db-dict-cache-key.c test-db-dict.c
+test_db_dict_LDADD = $(test_libs)
 test_db_dict_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs)
 
 check: check-am check-test
diff --git a/src/config/Makefile.am b/src/config/Makefile.am
index 5b2166e78b..9fc2eb4f00 100644
--- a/src/config/Makefile.am
+++ b/src/config/Makefile.am
@@ -13,16 +13,21 @@ AM_CPPFLAGS = \
 	-DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \
 	-DEXAMPLE_CONFIG_DIR=\""$(exampledir)"\" \
 	-DMODULEDIR=\""$(moduledir)"\" \
-	-DSSLDIR=\""$(ssldir)\""
+	-DSSLDIR=\""$(ssldir)\"" \
+	$(BINARY_CFLAGS)
 
 config_LDADD = \
 	$(LIBDOVECOT) \
-	$(RAND_LIBS)
+	$(RAND_LIBS) \
+	$(BINARY_LDFLAGS)
+
 config_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 doveconf_LDADD = \
 	$(LIBDOVECOT) \
-	$(RAND_LIBS)
+	$(RAND_LIBS) \
+	$(BINARY_LDFLAGS)
+
 doveconf_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 common = \
diff --git a/src/dict/Makefile.am b/src/dict/Makefile.am
index 4606de8902..b959cb878c 100644
--- a/src/dict/Makefile.am
+++ b/src/dict/Makefile.am
@@ -9,12 +9,14 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-dict \
 	-I$(top_srcdir)/src/lib-sql \
 	-DDICT_MODULE_DIR=\""$(moduledir)/dict"\" \
-	-DPKG_RUNDIR=\""$(rundir)"\"
+	-DPKG_RUNDIR=\""$(rundir)"\" \
+	$(BINARY_CFLAGS)
 
-dict_LDFLAGS = -export-dynamic
+dict_LDFLAGS = -export-dynamic \
+	$(BINARY_LDFLAGS)
 
 libs = \
-	../lib-dict/libdict_backend.a \
+	../lib-dict/libdict_backend.la \
 	$(LIBDOVECOT_SQL)
 
 dict_LDADD = \
@@ -22,6 +24,7 @@ dict_LDADD = \
 	$(LIBDOVECOT) \
 	$(DICT_LIBS) \
 	$(SQL_LIBS)
+
 dict_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
 
 dict_SOURCES = \
diff --git a/src/director/Makefile.am b/src/director/Makefile.am
index e1d969407c..d29e38d490 100644
--- a/src/director/Makefile.am
+++ b/src/director/Makefile.am
@@ -9,9 +9,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-imap \
 	-I$(top_srcdir)/src/lib-settings \
 	-I$(top_srcdir)/src/lib-master \
-	-I$(top_srcdir)/src/lib-mail
+	-I$(top_srcdir)/src/lib-mail \
+	$(BINARY_CFLAGS)
+
+director_LDADD = $(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
 
-director_LDADD = $(LIBDOVECOT)
 director_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 director_SOURCES = \
diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index 573b4dda7e..87f4b6cdf1 100644
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -5,9 +5,12 @@ pkglibexec_PROGRAMS = dns-client
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
 	-I$(top_srcdir)/src/lib-master \
-	-I$(top_srcdir)/src/lib-settings
+	-I$(top_srcdir)/src/lib-settings \
+	$(BINARY_CFLAGS)
+
+dns_client_LDADD = $(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
 
-dns_client_LDADD = $(LIBDOVECOT)
 dns_client_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 dns_client_SOURCES = \
 	dns-client.c \
diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am
index a60100a233..e11256d179 100644
--- a/src/doveadm/Makefile.am
+++ b/src/doveadm/Makefile.am
@@ -30,12 +30,13 @@ AM_CPPFLAGS = \
 	-DPKG_STATEDIR=\""$(statedir)"\" \
 	-DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \
 	-DBINDIR=\""$(bindir)"\" \
-	-DMANDIR=\""$(mandir)"\"
+	-DMANDIR=\""$(mandir)"\" \
+	$(BINARY_CFLAGS)
 
 cmd_pw_libs = \
-	../auth/libpassword.a \
-	../lib-ntlm/libntlm.a \
-	../lib-otp/libotp.a
+	../auth/libpassword.la \
+	../lib-ntlm/libntlm.la \
+	../lib-otp/libotp.la
 
 libs = \
 	dsync/libdsync.la \
@@ -46,7 +47,9 @@ doveadm_LDADD = \
 	$(cmd_pw_libs) \
 	$(CRYPT_LIBS) \
 	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT)
+	$(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
+
 doveadm_DEPENDENCIES = \
 	$(libs) \
 	$(cmd_pw_libs) \
@@ -56,7 +59,9 @@ doveadm_DEPENDENCIES = \
 doveadm_server_LDADD = \
 	$(libs) \
 	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT)
+	$(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
+
 doveadm_server_DEPENDENCIES = \
 	$(libs) \
 	$(LIBDOVECOT_STORAGE_DEPS) \
@@ -177,8 +182,8 @@ test_libs = \
 	../lib/liblib.la
 test_deps = $(noinst_LTLIBRARIES) $(test_libs)
 
-test_doveadm_util_SOURCES = test-doveadm-util.c
-test_doveadm_util_LDADD = doveadm-util.o $(test_libs) $(MODULE_LIBS)
+test_doveadm_util_SOURCES = doveadm-util.c test-doveadm-util.c
+test_doveadm_util_LDADD = $(test_libs) $(MODULE_LIBS)
 test_doveadm_util_DEPENDENCIES = $(test_deps)
 
 check: check-am check-test
diff --git a/src/imap-hibernate/Makefile.am b/src/imap-hibernate/Makefile.am
index 59714b177a..3641c90e13 100644
--- a/src/imap-hibernate/Makefile.am
+++ b/src/imap-hibernate/Makefile.am
@@ -6,9 +6,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
 	-I$(top_srcdir)/src/lib-settings \
 	-I$(top_srcdir)/src/lib-master \
-	-I$(top_srcdir)/src/lib-imap
+	-I$(top_srcdir)/src/lib-imap \
+	$(BINARY_CFLAGS)
+
+imap_hibernate_LDADD = $(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
 
-imap_hibernate_LDADD = $(LIBDOVECOT)
 imap_hibernate_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 imap_hibernate_SOURCES = \
diff --git a/src/imap-login/Makefile.am b/src/imap-login/Makefile.am
index 1138471e22..9a6afb817a 100644
--- a/src/imap-login/Makefile.am
+++ b/src/imap-login/Makefile.am
@@ -9,12 +9,15 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-sasl \
 	-I$(top_srcdir)/src/lib-imap \
 	-I$(top_srcdir)/src/lib-master \
-	-I$(top_srcdir)/src/login-common
+	-I$(top_srcdir)/src/login-common \
+	$(BINARY_CFLAGS)
 
 imap_login_LDADD = \
 	$(LIBDOVECOT_LOGIN) \
 	$(LIBDOVECOT) \
-	$(SSL_LIBS)
+	$(SSL_LIBS) \
+	$(BINARY_LDFLAGS)
+
 imap_login_DEPENDENCIES = \
 	$(LIBDOVECOT_LOGIN) \
 	$(LIBDOVECOT_DEPS)
diff --git a/src/imap-urlauth/Makefile.am b/src/imap-urlauth/Makefile.am
index d484039267..2eaea752dc 100644
--- a/src/imap-urlauth/Makefile.am
+++ b/src/imap-urlauth/Makefile.am
@@ -3,19 +3,25 @@ pkglibexecdir = $(libexecdir)/dovecot
 # Refer to comment in imap-urlauth.c for info on what these binaries are for.
 pkglibexec_PROGRAMS = imap-urlauth-login imap-urlauth imap-urlauth-worker
 
-# imap-urlauth-login
-
-imap_urlauth_login_CPPFLAGS = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
 	-I$(top_srcdir)/src/lib-settings \
 	-I$(top_srcdir)/src/lib-auth \
 	-I$(top_srcdir)/src/lib-master \
+	$(BINARY_CFLAGS)
+
+# imap-urlauth-login
+
+imap_urlauth_login_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
 	-I$(top_srcdir)/src/login-common
 
 imap_urlauth_login_LDADD = \
 	$(LIBDOVECOT_LOGIN) \
 	$(LIBDOVECOT) \
-	$(SSL_LIBS)
+	$(SSL_LIBS) \
+	$(BINARY_LDFLAGS)
+
 imap_urlauth_login_DEPENDENCIES = \
 	$(LIBDOVECOT_LOGIN_DEPS) \
 	$(LIBDOVECOT_DEPS)
@@ -27,16 +33,15 @@ imap_urlauth_login_SOURCES = \
 # imap-urlauth
 
 imap_urlauth_CPPFLAGS = \
-	-I$(top_srcdir)/src/lib \
-	-I$(top_srcdir)/src/lib-settings \
-	-I$(top_srcdir)/src/lib-auth \
-	-I$(top_srcdir)/src/lib-master \
+	$(AM_CPPFLAGS) \
 	-I$(top_srcdir)/src/lib-dict \
 	-DPKG_RUNDIR=\""$(rundir)"\"
 
 imap_urlauth_LDFLAGS = -export-dynamic
 
-imap_urlauth_LDADD = $(LIBDOVECOT)
+imap_urlauth_LDADD = $(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
+
 imap_urlauth_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 imap_urlauth_SOURCES = \
@@ -47,10 +52,7 @@ imap_urlauth_SOURCES = \
 # imap-urlauth-worker
 
 imap_urlauth_worker_CPPFLAGS = \
-	-I$(top_srcdir)/src/lib \
-	-I$(top_srcdir)/src/lib-auth \
-	-I$(top_srcdir)/src/lib-settings \
-	-I$(top_srcdir)/src/lib-master \
+	$(AM_CPPFLAGS) \
 	-I$(top_srcdir)/src/lib-dict \
 	-I$(top_srcdir)/src/imap \
 	-I$(top_srcdir)/src/lib-imap \
@@ -60,7 +62,8 @@ imap_urlauth_worker_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-storage \
 	-I$(top_srcdir)/src/login-common
 
-imap_urlauth_worker_LDFLAGS = -export-dynamic
+imap_urlauth_worker_LDFLAGS = -export-dynamic \
+	$(BINARY_LDFLAGS)
 
 urlauth_libs = \
 	$(top_builddir)/src/lib-imap-urlauth/libimap-urlauth.la
diff --git a/src/imap/Makefile.am b/src/imap/Makefile.am
index 2ffb6061a2..608c2cdd45 100644
--- a/src/imap/Makefile.am
+++ b/src/imap/Makefile.am
@@ -13,9 +13,11 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-imap-urlauth \
 	-I$(top_srcdir)/src/lib-imap-storage \
 	-I$(top_srcdir)/src/lib-index \
-	-I$(top_srcdir)/src/lib-storage
+	-I$(top_srcdir)/src/lib-storage \
+	$(BINARY_CFLAGS)
 
-imap_LDFLAGS = -export-dynamic
+imap_LDFLAGS = -export-dynamic \
+	$(BINARY_LDFLAGS)
 
 imap_LDADD = \
 	../lib-imap-urlauth/libimap-urlauth.la \
diff --git a/src/indexer/Makefile.am b/src/indexer/Makefile.am
index 1a29550bd1..8bfc891fa7 100644
--- a/src/indexer/Makefile.am
+++ b/src/indexer/Makefile.am
@@ -9,9 +9,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-mail \
 	-I$(top_srcdir)/src/lib-index \
 	-I$(top_srcdir)/src/lib-storage \
-	-DPKG_RUNDIR=\""$(rundir)"\"
+	-DPKG_RUNDIR=\""$(rundir)"\" \
+	$(BINARY_CFLAGS)
+
+indexer_LDADD = $(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
 
-indexer_LDADD = $(LIBDOVECOT)
 indexer_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 indexer_SOURCES = \
 	indexer.c \
@@ -23,7 +26,9 @@ indexer_SOURCES = \
 
 indexer_worker_LDADD = \
 	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT)
+	$(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
+
 indexer_worker_DEPENDENCIES = \
 	$(LIBDOVECOT_STORAGE_DEPS) \
 	$(LIBDOVECOT_DEPS)
diff --git a/src/ipc/Makefile.am b/src/ipc/Makefile.am
index f915200269..a12609e468 100644
--- a/src/ipc/Makefile.am
+++ b/src/ipc/Makefile.am
@@ -5,9 +5,11 @@ pkglibexec_PROGRAMS = ipc
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
 	-I$(top_srcdir)/src/lib-settings \
-	-I$(top_srcdir)/src/lib-master
+	-I$(top_srcdir)/src/lib-master \
+	$(BINARY_CFLAGS)
 
-ipc_LDADD = $(LIBDOVECOT) 
+ipc_LDADD = $(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
 ipc_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 ipc_SOURCES = \
diff --git a/src/lda/Makefile.am b/src/lda/Makefile.am
index 844ea98c29..f474cb7b91 100644
--- a/src/lda/Makefile.am
+++ b/src/lda/Makefile.am
@@ -12,14 +12,17 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-lda \
 	-I$(top_srcdir)/src/lib-storage \
 	-I$(top_srcdir)/src/lib-storage/index \
-	-I$(top_srcdir)/src/lib-storage/index/raw
+	-I$(top_srcdir)/src/lib-storage/index/raw \
+	$(BINARY_CFLAGS)
 
 dovecot_lda_LDFLAGS = -export-dynamic
 
 dovecot_lda_LDADD = \
 	$(LIBDOVECOT_LDA) \
 	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT)
+	$(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
+
 dovecot_lda_DEPENDENCIES = \
 	$(LIBDOVECOT_LDA) \
 	$(LIBDOVECOT_STORAGE_DEPS) \
diff --git a/src/lib-dict/Makefile.am b/src/lib-dict/Makefile.am
index f21176e36b..027f321578 100644
--- a/src/lib-dict/Makefile.am
+++ b/src/lib-dict/Makefile.am
@@ -1,5 +1,4 @@
-noinst_LTLIBRARIES = libdict.la
-noinst_LIBRARIES = libdict_backend.a
+noinst_LTLIBRARIES = libdict.la libdict_backend.la
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
@@ -20,13 +19,13 @@ base_sources = \
 libdict_la_SOURCES = \
 	$(base_sources)
 
-libdict_backend_a_SOURCES = \
+libdict_backend_la_SOURCES = \
 	dict-db.c \
 	dict-cdb.c \
 	dict-sql.c \
 	dict-sql-settings.c
 
-nodist_libdict_backend_a_SOURCES = \
+nodist_libdict_backend_la_SOURCES = \
 	dict-drivers-register.c
 
 headers = \
diff --git a/src/lib-ntlm/Makefile.am b/src/lib-ntlm/Makefile.am
index ac5df54f4b..94cf777440 100644
--- a/src/lib-ntlm/Makefile.am
+++ b/src/lib-ntlm/Makefile.am
@@ -1,9 +1,9 @@
-noinst_LIBRARIES = libntlm.a
+noinst_LTLIBRARIES = libntlm.la
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib
 
-libntlm_a_SOURCES = \
+libntlm_la_SOURCES = \
 	ntlm-des.c \
 	ntlm-encrypt.c \
 	ntlm-message.c
diff --git a/src/lib-otp/Makefile.am b/src/lib-otp/Makefile.am
index afc3737cd5..5b34fba7cb 100644
--- a/src/lib-otp/Makefile.am
+++ b/src/lib-otp/Makefile.am
@@ -1,9 +1,9 @@
-noinst_LIBRARIES = libotp.a
+noinst_LTLIBRARIES = libotp.la
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib
 
-libotp_a_SOURCES = \
+libotp_la_SOURCES = \
 	otp-dictionary.c \
 	otp-hash.c \
 	otp-parity.c \
diff --git a/src/lmtp/Makefile.am b/src/lmtp/Makefile.am
index 9991aa0bbc..73d5a23525 100644
--- a/src/lmtp/Makefile.am
+++ b/src/lmtp/Makefile.am
@@ -14,9 +14,11 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-ssl-iostream \
 	-I$(top_srcdir)/src/lib-storage \
 	-I$(top_srcdir)/src/lib-storage/index \
-	-I$(top_srcdir)/src/lib-storage/index/raw
+	-I$(top_srcdir)/src/lib-storage/index/raw \
+	$(BINARY_CFLAGS)
 
-lmtp_LDFLAGS = -export-dynamic
+lmtp_LDFLAGS = -export-dynamic \
+	$(BINARY_LDFLAGS)
 
 lmtp_LDADD = \
 	$(LIBDOVECOT_LDA) \
diff --git a/src/log/Makefile.am b/src/log/Makefile.am
index d9443a17a2..9888fcdbab 100644
--- a/src/log/Makefile.am
+++ b/src/log/Makefile.am
@@ -5,9 +5,12 @@ pkglibexec_PROGRAMS = log
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
 	-I$(top_srcdir)/src/lib-settings \
-	-I$(top_srcdir)/src/lib-master
+	-I$(top_srcdir)/src/lib-master \
+	$(BINARY_CFLAGS)
+
+log_LDADD = $(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
 
-log_LDADD = $(LIBDOVECOT)
 log_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 log_SOURCES = \
diff --git a/src/master/Makefile.am b/src/master/Makefile.am
index ef7955ff31..3296860c79 100644
--- a/src/master/Makefile.am
+++ b/src/master/Makefile.am
@@ -14,11 +14,14 @@ AM_CPPFLAGS = \
 	-DPKG_RUNDIR=\""$(rundir)"\" \
 	-DPKG_STATEDIR=\""$(statedir)"\" \
 	-DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \
-	-DBINDIR=\""$(bindir)"\"
+	-DBINDIR=\""$(bindir)"\" \
+	$(BINARY_CFLAGS)
 
 dovecot_LDADD = \
 	$(LIBCAP) \
-	$(LIBDOVECOT)
+	$(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
+
 dovecot_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 dovecot_SOURCES = \
diff --git a/src/plugins/fts/Makefile.am b/src/plugins/fts/Makefile.am
index 115d0e80e2..ebf41d1e2f 100644
--- a/src/plugins/fts/Makefile.am
+++ b/src/plugins/fts/Makefile.am
@@ -57,9 +57,9 @@ noinst_HEADERS = \
 
 pkglibexec_PROGRAMS = xml2text
 
-xml2text_SOURCES = xml2text.c
-
-xml2text_LDADD = fts-parser-html.lo $(LIBDOVECOT)
+xml2text_SOURCES = xml2text.c fts-parser-html.c
+xml2text_CPPFLAGS = $(AM_CPPFLAGS) $(BINARY_CFLAGS)
+xml2text_LDADD = $(LIBDOVECOT) $(BINARY_LDFLAGS)
 xml2text_DEPENDENCIES = $(module_LTLIBRARIES) $(LIBDOVECOT_DEPS)
 
 pkglibexec_SCRIPTS = decode2text.sh
diff --git a/src/plugins/quota/Makefile.am b/src/plugins/quota/Makefile.am
index 076e2da615..3c5e962735 100644
--- a/src/plugins/quota/Makefile.am
+++ b/src/plugins/quota/Makefile.am
@@ -57,12 +57,13 @@ lib10_doveadm_quota_plugin_la_SOURCES = \
 
 quota_status_SOURCES = \
 	quota-status.c
-
+quota_status_CPPFLAGS = $(AM_CPPFLAGS) $(BINARY_CFLAGS)
 quota_status_LDADD = \
 	$(quota_common_objects) \
 	$(LIBDOVECOT_STORAGE) \
 	$(LIBDOVECOT) \
-	$(QUOTA_LIBS)
+	$(QUOTA_LIBS) \
+	$(BINARY_LDFLAGS)
 quota_status_DEPENDENCIES = \
 	$(quota_common_objects) \
 	$(LIBDOVECOT_STORAGE_DEPS) \
diff --git a/src/pop3-login/Makefile.am b/src/pop3-login/Makefile.am
index a3f831c7d8..0cba57c0d7 100644
--- a/src/pop3-login/Makefile.am
+++ b/src/pop3-login/Makefile.am
@@ -8,12 +8,15 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-auth \
 	-I$(top_srcdir)/src/lib-sasl \
 	-I$(top_srcdir)/src/lib-master \
-	-I$(top_srcdir)/src/login-common
+	-I$(top_srcdir)/src/login-common \
+	$(BINARY_CFLAGS)
 
 pop3_login_LDADD = \
 	$(LIBDOVECOT_LOGIN) \
 	$(LIBDOVECOT) \
-	$(SSL_LIBS)
+	$(SSL_LIBS) \
+	$(BINARY_LDFLAGS)
+
 pop3_login_DEPENDENCIES = \
 	$(LIBDOVECOT_LOGIN) \
 	$(LIBDOVECOT_DEPS)
diff --git a/src/pop3/Makefile.am b/src/pop3/Makefile.am
index 0c1fc1f4bb..44ae4b7afa 100644
--- a/src/pop3/Makefile.am
+++ b/src/pop3/Makefile.am
@@ -8,9 +8,11 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-master \
 	-I$(top_srcdir)/src/lib-dict \
 	-I$(top_srcdir)/src/lib-mail \
-	-I$(top_srcdir)/src/lib-storage
+	-I$(top_srcdir)/src/lib-storage \
+	$(BINARY_CFLAGS)
 
-pop3_LDFLAGS = -export-dynamic
+pop3_LDFLAGS = -export-dynamic \
+	$(BINARY_LDFLAGS)
 
 pop3_LDADD = \
 	$(LIBDOVECOT_STORAGE) \
diff --git a/src/replication/aggregator/Makefile.am b/src/replication/aggregator/Makefile.am
index f2b42a7aab..a0b350131b 100644
--- a/src/replication/aggregator/Makefile.am
+++ b/src/replication/aggregator/Makefile.am
@@ -8,9 +8,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-auth \
 	-I$(top_srcdir)/src/lib-master \
 	-I$(top_srcdir)/src/replication \
-	-DPKG_STATEDIR=\""$(statedir)"\"
+	-DPKG_STATEDIR=\""$(statedir)"\" \
+	$(BINARY_CFLAGS)
+
+aggregator_LDFLAGS = -export-dynamic \
+	$(BINARY_LDFLAGS)
 
-aggregator_LDFLAGS = -export-dynamic
 aggregator_LDADD = $(LIBDOVECOT)
 aggregator_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
diff --git a/src/replication/replicator/Makefile.am b/src/replication/replicator/Makefile.am
index 0271400bb5..a0ac563f9c 100644
--- a/src/replication/replicator/Makefile.am
+++ b/src/replication/replicator/Makefile.am
@@ -8,9 +8,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-auth \
 	-I$(top_srcdir)/src/lib-master \
 	-I$(top_srcdir)/src/replication \
-	-DPKG_STATEDIR=\""$(statedir)"\"
+	-DPKG_STATEDIR=\""$(statedir)"\" \
+	$(BINARY_CFLAGS)
+
+replicator_LDFLAGS = -export-dynamic \
+	$(BINARY_LDFLAGS)
 
-replicator_LDFLAGS = -export-dynamic
 replicator_LDADD = $(LIBDOVECOT)
 replicator_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
diff --git a/src/ssl-params/Makefile.am b/src/ssl-params/Makefile.am
index e2442d552e..861dc00fc9 100644
--- a/src/ssl-params/Makefile.am
+++ b/src/ssl-params/Makefile.am
@@ -7,9 +7,10 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-master \
 	-I$(top_srcdir)/src/lib-settings \
 	-I$(top_srcdir)/src/lib-ssl-iostream \
-	-DPKG_STATEDIR=\""$(statedir)"\"
+	-DPKG_STATEDIR=\""$(statedir)"\" \
+	$(BINARY_CFLAGS)
 
-ssl_params_LDADD = $(LIBDOVECOT)
+ssl_params_LDADD = $(LIBDOVECOT) $(BINARY_LDFLAGS)
 ssl_params_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 ssl_params_SOURCES = \
 	main.c \
diff --git a/src/stats/Makefile.am b/src/stats/Makefile.am
index ec5ae7482d..6df1489294 100644
--- a/src/stats/Makefile.am
+++ b/src/stats/Makefile.am
@@ -8,9 +8,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
 	-I$(top_srcdir)/src/lib-settings \
 	-I$(top_srcdir)/src/lib-master \
-	-I$(top_srcdir)/src/lib-stats
+	-I$(top_srcdir)/src/lib-stats \
+	$(BINARY_CFLAGS)
+
+stats_LDADD = $(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
 
-stats_LDADD = $(LIBDOVECOT) 
 stats_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 stats_SOURCES = \
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index a6b8b4ddb6..e1b522a1ec 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -20,42 +20,54 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-storage \
 	-I$(top_srcdir)/src/auth \
 	-DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \
-	-DPKG_RUNDIR=\""$(rundir)"\"
+	-DPKG_RUNDIR=\""$(rundir)"\" \
+	$(BINARY_CFLAGS)
+
+rawlog_LDADD = $(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
 
-rawlog_LDADD = $(LIBDOVECOT)
 rawlog_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 rawlog_SOURCES = \
 	rawlog.c
 
 script_login_LDADD = \
 	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT) 
+	$(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
+
 script_login_DEPENDENCIES = \
 	$(LIBDOVECOT_STORAGE_DEPS) \
 	$(LIBDOVECOT_DEPS)
 script_login_SOURCES = \
 	script-login.c
 
-script_LDADD = $(LIBDOVECOT)
+script_LDADD = $(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
 script_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 script_SOURCES = \
 	script.c
 
 if TCPWRAPPERS
 TCPWRAP_BIN = tcpwrap
-tcpwrap_LDADD = $(LIBDOVECOT) $(LIBWRAP_LIBS)
+tcpwrap_LDADD = $(LIBDOVECOT) $(LIBWRAP_LIBS) \
+	$(BINARY_LDFLAGS)
+
 tcpwrap_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 tcpwrap_SOURCES = \
 	tcpwrap.c \
 	tcpwrap-settings.c
 endif
 
-gdbhelper_LDADD = $(LIBDOVECOT)
+gdbhelper_LDADD = $(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
+
 gdbhelper_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 gdbhelper_SOURCES = \
 	gdbhelper.c
 
-maildirlock_LDADD = $(LIBDOVECOT)
+maildirlock_LDADD = $(LIBDOVECOT) \
+	$(BINARY_LDFLAGS)
+
 maildirlock_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 maildirlock_SOURCES = \
 	maildirlock.c