1 files changed, 62 insertions, 19 deletions
diff --git a/config.mk.in b/config.mk.in
index 6ee541507..f3c1f658c 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -22,35 +22,56 @@ docdir=@docdir@
 mandir=@mandir@
 sysconfdir=@sysconfdir@
-HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
+# Misc flags
 BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@
-HAVE_SUID=@HAVE_SUID@
+HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
+HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
+HAVE_GCOV=@HAVE_GCOV@
 HAVE_MAN=@HAVE_MAN@
+# MANFLAGS
+HAVE_APPARMOR=@HAVE_APPARMOR@
 HAVE_CHROOT=@HAVE_CHROOT@
-HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
+HAVE_DBUSPROXY=@HAVE_DBUSPROXY@
-HAVE_NETWORK=@HAVE_NETWORK@
-HAVE_USERNS=@HAVE_USERNS@
-HAVE_X11=@HAVE_X11@
 HAVE_FILE_TRANSFER=@HAVE_FILE_TRANSFER@
+HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@
+HAVE_FORCE_NONEWPRIVS=@HAVE_FORCE_NONEWPRIVS@
 HAVE_GLOBALCFG=@HAVE_GLOBALCFG@
-HAVE_APPARMOR=@HAVE_APPARMOR@
+HAVE_IDS=@HAVE_IDS@
+HAVE_LTS=@HAVE_LTS@
+HAVE_NETWORK=@HAVE_NETWORK@
+HAVE_ONLY_SYSCFG_PROFILES=@HAVE_ONLY_SYSCFG_PROFILES@
+HAVE_OUTPUT=@HAVE_OUTPUT@
 HAVE_OVERLAYFS=@HAVE_OVERLAYFS@
-HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@
 HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@
 HAVE_PRIVATE_LIB=@HAVE_PRIVATE_LIB@
-HAVE_IDS=@HAVE_IDS@
-HAVE_GCOV=@HAVE_GCOV@
 HAVE_SELINUX=@HAVE_SELINUX@
 HAVE_SUID=@HAVE_SUID@
-HAVE_DBUSPROXY=@HAVE_DBUSPROXY@
+HAVE_USERNS=@HAVE_USERNS@
 HAVE_USERTMPFS=@HAVE_USERTMPFS@
-HAVE_OUTPUT=@HAVE_OUTPUT@
+HAVE_X11=@HAVE_X11@
-HAVE_LTS=@HAVE_LTS@
-HAVE_FORCE_NONEWPRIVS=@HAVE_FORCE_NONEWPRIVS@
-HAVE_ONLY_SYSCFG_PROFILES=@HAVE_ONLY_SYSCFG_PROFILES@
-MANFLAGS = $(HAVE_LTS) $(HAVE_OUTPUT) $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_PRIVATE_LIB) $(HAVE_APPARMOR) $(HAVE_IDS) $(HAVE_OVERLAYFS) $(HAVE_USERTMPFS) $(HAVE_DBUSPROXY) $(HAVE_FIRETUNNEL) $(HAVE_GLOBALCFG) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_FILE_TRANSFER) $(HAVE_SELINUX) $(HAVE_SUID) $(HAVE_FORCE_NONEWPRIVS) $(HAVE_ONLY_SYSCFG_PROFILES)
+MANFLAGS = \
+        $(HAVE_APPARMOR) \
+        $(HAVE_CHROOT) \
+        $(HAVE_DBUSPROXY) \
+        $(HAVE_FILE_TRANSFER) \
+        $(HAVE_FIRETUNNEL) \
+        $(HAVE_FORCE_NONEWPRIVS) \
+        $(HAVE_GLOBALCFG) \
+        $(HAVE_IDS) \
+        $(HAVE_LTS) \
+        $(HAVE_NETWORK) \
+        $(HAVE_ONLY_SYSCFG_PROFILES) \
+        $(HAVE_OUTPUT) \
+        $(HAVE_OVERLAYFS) \
+        $(HAVE_PRIVATE_HOME) \
+        $(HAVE_PRIVATE_LIB) \
+        $(HAVE_SELINUX) \
+        $(HAVE_SUID) \
+        $(HAVE_USERNS) \
+        $(HAVE_USERTMPFS) \
+        $(HAVE_X11)
 # User variables - should not be modified in the code (as they are reserved for
 # the user building the package); see the following for details:
@@ -60,7 +81,29 @@ CFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@
 # Project variables
-LIBS=@LIBS@
+EXTRA_CFLAGS  =@EXTRA_CFLAGS@
+COMMON_CFLAGS = \
+        -ggdb -O2 -DVERSION='"$(VERSION)"' \
+        -Wall -Wextra $(HAVE_FATAL_WARNINGS) \
+        -Wformat -Wformat-security \
+        -fstack-protector-all -D_FORTIFY_SOURCE=2 \
+        -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' \
+        -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' \
+        -DVARDIR='"/var/lib/firejail"' \
+PROG_CFLAGS = \
+        $(COMMON_CFLAGS) \
+        $(HAVE_GCOV) $(MANFLAGS) \
+        $(EXTRA_CFLAGS) \
+        -fPIE
+SO_CFLAGS = \
+        $(COMMON_CFLAGS) \
+        -fPIC
+EXTRA_LDFLAGS =@EXTRA_LDFLAGS@
+PROG_LDFLAGS  = -Wl,-z,relro -Wl,-z,now -fPIE -pie $(EXTRA_LDFLAGS)
+SO_LDFLAGS    = -Wl,-z,relro -Wl,-z,now -fPIC
+LIBS =@LIBS@
-EXTRA_CFLAGS +=@EXTRA_CFLAGS@
+CLEANFILES = *.o *.gcov *.gcda *.gcno *.plist
-EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@

diff --git a/config.mk.in b/config.mk.in index 6ee541507..f3c1f658c 100644 --- a/config.mk.in +++ b/config.mk.in
@@ -22,35 +22,56 @@ docdir=@docdir@
22	mandir=@mandir@	22	mandir=@mandir@
23	sysconfdir=@sysconfdir@	23	sysconfdir=@sysconfdir@
24		24
25	HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@	25	# Misc flags
26	BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@	26	BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@
27	HAVE_SUID=@HAVE_SUID@	27	HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
		28	HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
		29	HAVE_GCOV=@HAVE_GCOV@
28	HAVE_MAN=@HAVE_MAN@	30	HAVE_MAN=@HAVE_MAN@
29		31
		32	# MANFLAGS
		33	HAVE_APPARMOR=@HAVE_APPARMOR@
30	HAVE_CHROOT=@HAVE_CHROOT@	34	HAVE_CHROOT=@HAVE_CHROOT@
31	HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@	35	HAVE_DBUSPROXY=@HAVE_DBUSPROXY@
32	HAVE_NETWORK=@HAVE_NETWORK@
33	HAVE_USERNS=@HAVE_USERNS@
34	HAVE_X11=@HAVE_X11@
35	HAVE_FILE_TRANSFER=@HAVE_FILE_TRANSFER@	36	HAVE_FILE_TRANSFER=@HAVE_FILE_TRANSFER@
		37	HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@
		38	HAVE_FORCE_NONEWPRIVS=@HAVE_FORCE_NONEWPRIVS@
36	HAVE_GLOBALCFG=@HAVE_GLOBALCFG@	39	HAVE_GLOBALCFG=@HAVE_GLOBALCFG@
37	HAVE_APPARMOR=@HAVE_APPARMOR@	40	HAVE_IDS=@HAVE_IDS@
		41	HAVE_LTS=@HAVE_LTS@
		42	HAVE_NETWORK=@HAVE_NETWORK@
		43	HAVE_ONLY_SYSCFG_PROFILES=@HAVE_ONLY_SYSCFG_PROFILES@
		44	HAVE_OUTPUT=@HAVE_OUTPUT@
38	HAVE_OVERLAYFS=@HAVE_OVERLAYFS@	45	HAVE_OVERLAYFS=@HAVE_OVERLAYFS@
39	HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@
40	HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@	46	HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@
41	HAVE_PRIVATE_LIB=@HAVE_PRIVATE_LIB@	47	HAVE_PRIVATE_LIB=@HAVE_PRIVATE_LIB@
42	HAVE_IDS=@HAVE_IDS@
43	HAVE_GCOV=@HAVE_GCOV@
44	HAVE_SELINUX=@HAVE_SELINUX@	48	HAVE_SELINUX=@HAVE_SELINUX@
45	HAVE_SUID=@HAVE_SUID@	49	HAVE_SUID=@HAVE_SUID@
46	HAVE_DBUSPROXY=@HAVE_DBUSPROXY@	50	HAVE_USERNS=@HAVE_USERNS@
47	HAVE_USERTMPFS=@HAVE_USERTMPFS@	51	HAVE_USERTMPFS=@HAVE_USERTMPFS@
48	HAVE_OUTPUT=@HAVE_OUTPUT@	52	HAVE_X11=@HAVE_X11@
49	HAVE_LTS=@HAVE_LTS@
50	HAVE_FORCE_NONEWPRIVS=@HAVE_FORCE_NONEWPRIVS@
51	HAVE_ONLY_SYSCFG_PROFILES=@HAVE_ONLY_SYSCFG_PROFILES@
52		53
53	MANFLAGS = $(HAVE_LTS) $(HAVE_OUTPUT) $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_PRIVATE_LIB) $(HAVE_APPARMOR) $(HAVE_IDS) $(HAVE_OVERLAYFS) $(HAVE_USERTMPFS) $(HAVE_DBUSPROXY) $(HAVE_FIRETUNNEL) $(HAVE_GLOBALCFG) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_FILE_TRANSFER) $(HAVE_SELINUX) $(HAVE_SUID) $(HAVE_FORCE_NONEWPRIVS) $(HAVE_ONLY_SYSCFG_PROFILES)	54	MANFLAGS = \
		55	$(HAVE_APPARMOR) \
		56	$(HAVE_CHROOT) \
		57	$(HAVE_DBUSPROXY) \
		58	$(HAVE_FILE_TRANSFER) \
		59	$(HAVE_FIRETUNNEL) \
		60	$(HAVE_FORCE_NONEWPRIVS) \
		61	$(HAVE_GLOBALCFG) \
		62	$(HAVE_IDS) \
		63	$(HAVE_LTS) \
		64	$(HAVE_NETWORK) \
		65	$(HAVE_ONLY_SYSCFG_PROFILES) \
		66	$(HAVE_OUTPUT) \
		67	$(HAVE_OVERLAYFS) \
		68	$(HAVE_PRIVATE_HOME) \
		69	$(HAVE_PRIVATE_LIB) \
		70	$(HAVE_SELINUX) \
		71	$(HAVE_SUID) \
		72	$(HAVE_USERNS) \
		73	$(HAVE_USERTMPFS) \
		74	$(HAVE_X11)
54		75
55	# User variables - should not be modified in the code (as they are reserved for	76	# User variables - should not be modified in the code (as they are reserved for
56	# the user building the package); see the following for details:	77	# the user building the package); see the following for details:
@@ -60,7 +81,29 @@ CFLAGS=@CFLAGS@
60	LDFLAGS=@LDFLAGS@	81	LDFLAGS=@LDFLAGS@
61		82
62	# Project variables	83	# Project variables
63	LIBS=@LIBS@	84	EXTRA_CFLAGS =@EXTRA_CFLAGS@
		85	COMMON_CFLAGS = \
		86	-ggdb -O2 -DVERSION='"$(VERSION)"' \
		87	-Wall -Wextra $(HAVE_FATAL_WARNINGS) \
		88	-Wformat -Wformat-security \
		89	-fstack-protector-all -D_FORTIFY_SOURCE=2 \
		90	-DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' \
		91	-DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' \
		92	-DVARDIR='"/var/lib/firejail"' \
		93
		94	PROG_CFLAGS = \
		95	$(COMMON_CFLAGS) \
		96	$(HAVE_GCOV) $(MANFLAGS) \
		97	$(EXTRA_CFLAGS) \
		98	-fPIE
		99
		100	SO_CFLAGS = \
		101	$(COMMON_CFLAGS) \
		102	-fPIC
		103
		104	EXTRA_LDFLAGS =@EXTRA_LDFLAGS@
		105	PROG_LDFLAGS = -Wl,-z,relro -Wl,-z,now -fPIE -pie $(EXTRA_LDFLAGS)
		106	SO_LDFLAGS = -Wl,-z,relro -Wl,-z,now -fPIC
		107	LIBS =@LIBS@
64		108
65	EXTRA_CFLAGS +=@EXTRA_CFLAGS@	109	CLEANFILES = .o .gcov .gcda .gcno *.plist
66	EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@