polkitagent, pkexec: Respect SUID_CFLAGS and SUID_LDFLAGS

This is a good way for distributors to use -fPIE/-pie.

https://bugs.freedesktop.org/attachment.cgi?id=57584

diff --git a/configure.ac b/configure.ac
index b1e478bccd85cac482f41d19a92d59f01164b889..a9c24c4295d4dce21429f4cd8b12ef938d5d8181 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -479,6 +479,11 @@ AC_SUBST([GETTEXT_PACKAGE])
 AM_GLIB_GNU_GETTEXT
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
 
+AC_ARG_VAR([SUID_CFLAGS],
+           [CFLAGS used for binaries which are usually with the suid bit])
+AC_ARG_VAR([SUID_LDFLAGS],
+           [LDFLAGS used for binaries which are usually with the suid bit])
+
 AC_OUTPUT([
 Makefile
 actions/Makefile

diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
index c8420fa4f91bf9e0c8a4a227d9d72d6c4c3f90b6..3bc364e5b02ad967a8b483dcd8c22e66c619b5c4 100644 (file)
--- a/src/polkitagent/Makefile.am
+++ b/src/polkitagent/Makefile.am
@@ -94,6 +94,7 @@ endif
 
 polkit_agent_helper_1_CFLAGS  =                                        \
         -D_POLKIT_COMPILATION                                                  \
+       $(SUID_CFLAGS)                                                  \
        $(GLIB_CFLAGS)                                                  \
        $(NULL)
 
@@ -103,6 +104,11 @@ polkit_agent_helper_1_LDADD =                                              \
        $(top_builddir)/src/polkit/libpolkit-gobject-1.la               \
        $(NULL)
 
+polkit_agent_helper_1_LDFLAGS =                                        \
+       $(SUID_LDFLAGS)                                                 \
+       $(AM_LDFLAGS)                                                   \
+       $(NULL)
+
 if HAVE_INTROSPECTION
 
 girdir = $(INTROSPECTION_GIRDIR)

diff --git a/src/programs/Makefile.am b/src/programs/Makefile.am
index bc1b5a88bbd4134d2260fa3117fcd30d8f49460e..4e7273d7e9c98bd1594c07aac2d178c03822d933 100644 (file)
--- a/src/programs/Makefile.am
+++ b/src/programs/Makefile.am
@@ -24,6 +24,7 @@ bin_PROGRAMS = pkexec pkcheck pkaction pkttyagent
 pkexec_SOURCES = pkexec.c
 
 pkexec_CFLAGS =                                                        \
+       $(SUID_CFLAGS)                                                  \
        $(GLIB_CFLAGS)                                                  \
        $(AUTH_LIBS)                                                    \
        $(NULL)
@@ -34,6 +35,11 @@ pkexec_LDADD =                                                       \
        $(top_builddir)/src/polkitagent/libpolkit-agent-1.la            \
        $(NULL)
 
+pkexec_LDFLAGS =                                                       \
+       $(SUID_LDFLAGS)                                                 \
+       $(AM_LDFLAGS)                                                   \
+       $(NULL)
+
 # ----------------------------------------------------------------------------------------------------
 
 pkcheck_SOURCES = pkcheck.c