From 4fd616f94098124b290832f39e7df82d2a59b752 Mon Sep 17 00:00:00 2001
From: Bram Matthys <syzop@vulnscan.org>
Date: Fri, 18 Nov 2016 11:13:50 +0100
Subject: [PATCH] Fix build problem on CentOS and others. Only build main
 binary with -fPIE, not the modules. It's called Position Independent
 EXECUTABLE after all. And apparently not all compilers or linkers ignore the
 option if building shared objects (mine did..).

---
 configure                     |  15 +++--
 configure.ac                  |  11 ++--
 src/{Makefile => Makefile.in} | 119 ++++++++++++++++++----------------
 3 files changed, 81 insertions(+), 64 deletions(-)
 rename src/{Makefile => Makefile.in} (65%)

diff --git a/configure b/configure
index 85a45aff41..fb7d9fe583 100755
--- a/configure
+++ b/configure
@@ -666,6 +666,8 @@ STRTOUL
 EGREP
 GREP
 CPP
+HARDEN_BINLDFLAGS
+HARDEN_BINCFLAGS
 HARDEN_LDFLAGS
 HARDEN_CFLAGS
 MKPASSWDLIBS
@@ -4613,8 +4615,8 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags__Werror___fPIE__pie" >&5
 $as_echo "$ax_cv_check_ldflags__Werror___fPIE__pie" >&6; }
 if test x"$ax_cv_check_ldflags__Werror___fPIE__pie" = xyes; then :
-  HARDEN_CFLAGS="$HARDEN_CFLAGS -fPIE"
-      HARDEN_LDFLAGS="$HARDEN_LDFLAGS -pie"
+  HARDEN_BINCFLAGS="-fPIE"
+      HARDEN_BINLDFLAGS="-pie"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -fPIE -Wl,-pie" >&5
 $as_echo_n "checking whether the linker accepts -fPIE -Wl,-pie... " >&6; }
@@ -4647,8 +4649,8 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags__Werror___fPIE__Wl__pie" >&5
 $as_echo "$ax_cv_check_ldflags__Werror___fPIE__Wl__pie" >&6; }
 if test x"$ax_cv_check_ldflags__Werror___fPIE__Wl__pie" = xyes; then :
-  HARDEN_CFLAGS="$HARDEN_CFLAGS -fPIE"
-        HARDEN_LDFLAGS="$HARDEN_LDFLAGS -Wl,-pie"
+  HARDEN_BINCFLAGS="-fPIE"
+        HARDEN_BINLDFLAGS="-Wl,-pie"
 else
   :
 fi
@@ -4752,6 +4754,8 @@ fi
 
 
 
+
+
 # End of flag tests.
 CC="$saved_CC"
 CXX="$saved_CXX"
@@ -8569,7 +8573,7 @@ UNRLINCDIR="`pwd`/include"
 BUILDDIR="`pwd`"
 
 
-ac_config_files="$ac_config_files Makefile src/modules/Makefile src/modules/chanmodes/Makefile src/modules/usermodes/Makefile src/modules/snomasks/Makefile src/modules/extbans/Makefile src/modules/third/Makefile unrealircd"
+ac_config_files="$ac_config_files Makefile src/Makefile src/modules/Makefile src/modules/chanmodes/Makefile src/modules/usermodes/Makefile src/modules/snomasks/Makefile src/modules/extbans/Makefile src/modules/third/Makefile unrealircd"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -9263,6 +9267,7 @@ do
   case $ac_config_target in
     "include/setup.h") CONFIG_HEADERS="$CONFIG_HEADERS include/setup.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/modules/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/Makefile" ;;
     "src/modules/chanmodes/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/chanmodes/Makefile" ;;
     "src/modules/usermodes/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/usermodes/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index cee4dfc48e..1007541c7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,17 +155,19 @@ AS_IF([test x"$hardening" != x"no"], [
   # The linker checks also compile code, so we need to include -fPIE as well.
   check_cc_cxx_flag([-fPIE],
    [check_link_flag([-fPIE -pie],
-     [HARDEN_CFLAGS="$HARDEN_CFLAGS -fPIE"
-      HARDEN_LDFLAGS="$HARDEN_LDFLAGS -pie"],
+     [HARDEN_BINCFLAGS="-fPIE"
+      HARDEN_BINLDFLAGS="-pie"],
      [check_link_flag([-fPIE -Wl,-pie],
-       [HARDEN_CFLAGS="$HARDEN_CFLAGS -fPIE"
-        HARDEN_LDFLAGS="$HARDEN_LDFLAGS -Wl,-pie"])])])
+       [HARDEN_BINCFLAGS="-fPIE"
+        HARDEN_BINLDFLAGS="-Wl,-pie"])])])
 
   check_link_flag([-Wl,-z,relro],
    [HARDEN_LDFLAGS="$HARDEN_LDFLAGS -Wl,-z,relro"
     check_link_flag([-Wl,-z,now], [HARDEN_LDFLAGS="$HARDEN_LDFLAGS -Wl,-z,now"])])])
 AC_SUBST([HARDEN_CFLAGS])
 AC_SUBST([HARDEN_LDFLAGS])
+AC_SUBST([HARDEN_BINCFLAGS])
+AC_SUBST([HARDEN_BINLDFLAGS])
 
 # End of flag tests.
 CC="$saved_CC"
@@ -859,6 +861,7 @@ BUILDDIR="`pwd`"
 AC_SUBST(BUILDDIR)
 
 AC_CONFIG_FILES([Makefile
+	src/Makefile
 	src/modules/Makefile
 	src/modules/chanmodes/Makefile
 	src/modules/usermodes/Makefile
diff --git a/src/Makefile b/src/Makefile.in
similarity index 65%
rename from src/Makefile
rename to src/Makefile.in
index a0fd33c859..4de18e1684 100644
--- a/src/Makefile
+++ b/src/Makefile.in
@@ -44,6 +44,11 @@ MAKEARGS =	'CFLAGS=${CFLAGS}' 'CC=${CC}' 'IRCDLIBS=${IRCDLIBS}' \
 
 MY_MAKE = $(MAKE) $(MAKEARGS)
 
+# Flags specific for the ircd binary (and it's object files)...
+# .. but NOT for modules.
+BINCFLAGS=@HARDEN_BINCFLAGS@
+BINLDFLAGS=@HARDEN_BINLDFLAGS@
+
 INCLUDES = ../include/auth.h ../include/channel.h \
 	../include/class.h ../include/common.h ../include/config.h ../include/dbuf.h \
 	../include/dynconf.h ../include/events.h ../include/fdlist.h ../include/h.h \
@@ -64,7 +69,7 @@ custommodule:
 	+cd modules/third; $(MY_MAKE) MODULEFILE=$(MODULEFILE) 'EXLIBS=$(EXLIBS)' custommodule
 
 ircd: $(OBJS)
-	$(CC) $(CFLAGS) $(CRYPTOLIB) -o ircd $(OBJS) $(LDFLAGS) $(IRCDLIBS) $(CRYPTOLIB)
+	$(CC) $(CFLAGS) $(BINCFLAGS) $(CRYPTOLIB) -o ircd $(OBJS) $(LDFLAGS) $(BINLDFLAGS) $(IRCDLIBS) $(CRYPTOLIB)
 
 mods:
 	@if [ ! -r include ] ; then \
@@ -79,56 +84,60 @@ version.c: version.c.SH
 	$(SHELL) version.c.SH
 
 version.o: version.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c version.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c version.c
 
 parse.o: parse.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c parse.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c parse.c
 
 socket.o: socket.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c socket.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c socket.c
 
 s_dispatch.o: s_dispatch.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c s_dispatch.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c s_dispatch.c
 
 dbuf.o: dbuf.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c dbuf.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c dbuf.c
 
 packet.o: packet.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c packet.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c packet.c
 
 aln.o: aln.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c aln.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c aln.c
 
 auth.o: auth.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c auth.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c auth.c
 
 send.o: send.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c send.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c send.c
 
 ssl.o: ssl.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c ssl.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c ssl.c
 
 match.o: match.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c match.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c match.c
 
 modules.o: modules.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c modules.c
+
+mempool.o: mempool.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c mempool.c
 
 support.o: support.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c support.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c support.c
 
 umodes.o: umodes.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c umodes.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c umodes.c
 
 userload.o: userload.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c userload.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c userload.c
 
 uid.o: uid.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c uid.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c uid.c
 
 s_svs.o: s_svs.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c s_svs.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c s_svs.c
 events.o: events.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c events.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c events.c
 
 clean:
 	$(RM) -f *.o *.so *~ core ircd version.c; \
@@ -140,115 +149,115 @@ depend:
 	makedepend -I${INCLUDEDIR} ${SRC}
 
 channel.o: channel.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c channel.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c channel.c
 
 ircd.o: ircd.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c ircd.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c ircd.c
 
 list.o: list.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c list.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c list.c
 
 res.o: res.c $(INCLUDES) ../include/res.h
-	$(CC) $(CFLAGS) -c res.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c res.c
 
 timesynch.o: timesynch.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c timesynch.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c timesynch.c
 
 cloak.o: cloak.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c cloak.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c cloak.c
 
 fdlist.o: fdlist.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c fdlist.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c fdlist.c
 
 s_bsd.o: s_bsd.c $(INCLUDES) ../include/res.h
-	$(CC) $(CFLAGS) -c s_bsd.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c s_bsd.c
 
 s_auth.o: s_auth.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c s_auth.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c s_auth.c
 
 s_conf.o: s_conf.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c s_conf.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c s_conf.c
 
 s_debug.o: s_debug.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c s_debug.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c s_debug.c
 
 s_err.o: s_err.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c s_err.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c s_err.c
 
 s_misc.o: s_misc.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c s_misc.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c s_misc.c
 
 scache.o: scache.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c scache.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c scache.c
 
 ircsprintf.o: ircsprintf.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c ircsprintf.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c ircsprintf.c
 
 s_user.o: s_user.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c s_user.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c s_user.c
 
 charsys.o: charsys.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c charsys.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c charsys.c
 
 s_extra.o: s_extra.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c s_extra.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c s_extra.c
 
 s_kline.o: s_kline.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c s_kline.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c s_kline.c
 
 s_serv.o: s_serv.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c s_serv.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c s_serv.c
 
 s_numeric.o: s_numeric.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c s_numeric.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c s_numeric.c
 
 whowas.o: whowas.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c whowas.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c whowas.c
 
 hash.o: hash.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c hash.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c hash.c
 
 crule.o: crule.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c crule.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c crule.c
 
 random.o: random.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c random.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c random.c
 
 extcmodes.o: extcmodes.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c extcmodes.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c extcmodes.c
 
 operclass.o: operclass.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c operclass.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c operclass.c
 
 moddata.o: moddata.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c moddata.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c moddata.c
 
 extbans.o: extbans.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c extbans.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c extbans.c
 
 md5.o: md5.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c md5.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c md5.c
 
 api-command.o: api-command.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c api-command.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c api-command.c
 
 api-isupport.o: api-isupport.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c api-isupport.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c api-isupport.c
 
 api-clicap.o: api-clicap.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c api-clicap.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c api-clicap.c
 
 crypt_blowfish.o: crypt_blowfish.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c crypt_blowfish.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c crypt_blowfish.c
 
 updconf.o: updconf.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c updconf.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c updconf.c
 
 crashreport.o: crashreport.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c crashreport.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c crashreport.c
 
 url.o: url.c $(INCLUDES)
-	$(CC) $(CFLAGS) -c url.c
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c url.c
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.