Add PIE and RELRO to binaries

dovecot · Jul 6, 2016 · b200bc3 · b200bc3
1 parent 14a7cd4
commit b200bc3
Show file tree

Hide file tree

Showing 29 changed files with 178 additions and 98 deletions.
diff --git 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
@@ -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
@@ -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
@@ -9,19 +9,22 @@ 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 = \
 	$(libs) \
 	$(LIBDOVECOT) \
 	$(DICT_LIBS) \
 	$(SQL_LIBS)
+
 dict_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
 
 dict_SOURCES = \

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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) \