2012-06-06 16:55:51 +02:00
|
|
|
Build binaries in this package as RELRO PIEs, libraries as partial RELRO,
|
|
|
|
|
and install shared libraries with the execute bit set on them. Prune out
|
|
|
|
|
the -L/usr/lib* and PIE flags where they might leak out and affect
|
|
|
|
|
apps which just want to link with the libraries. FIXME: needs to check and
|
|
|
|
|
not just assume that the compiler supports using these flags.
|
|
|
|
|
|
2016-12-05 18:34:31 +01:00
|
|
|
--- krb5-1.15.orig/src/config/shlib.conf 2016-12-01 23:31:24.000000000 +0100
|
|
|
|
|
+++ krb5-1.15/src/config/shlib.conf 2016-12-03 16:58:48.378478508 +0100
|
|
|
|
|
@@ -423,7 +423,7 @@
|
2012-06-06 16:55:51 +02:00
|
|
|
# Linux ld doesn't default to stuffing the SONAME field...
|
|
|
|
|
# Use objdump -x to examine the fields of the library
|
2016-12-05 18:34:31 +01:00
|
|
|
# UNDEF_CHECK is suppressed by --enable-asan
|
|
|
|
|
- LDCOMBINE='$(CC) -shared -fPIC -Wl,-h,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) $(UNDEF_CHECK)'
|
|
|
|
|
+ LDCOMBINE='$(CC) -shared -fPIC -Wl,-h,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) $(UNDEF_CHECK) -Wl,-z,relro'
|
|
|
|
|
UNDEF_CHECK='-Wl,--no-undefined'
|
|
|
|
|
# $(EXPORT_CHECK) runs export-check.pl when in maintainer mode.
|
|
|
|
|
LDCOMBINE_TAIL='-Wl,--version-script binutils.versions $(EXPORT_CHECK)'
|
|
|
|
|
@@ -435,7 +435,8 @@
|
2012-06-06 16:55:51 +02:00
|
|
|
SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
|
|
|
|
|
PROFFLAGS=-pg
|
|
|
|
|
PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
|
|
|
|
|
- CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
|
|
|
|
|
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) -pie -Wl,-z,relro -Wl,-z,now $(LDFLAGS)'
|
|
|
|
|
+ INSTALL_SHLIB='${INSTALL} -m755'
|
|
|
|
|
CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
|
|
|
|
|
CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
|
|
|
|
|
CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)'
|
2014-01-15 15:14:20 +01:00
|
|
|
--- krb5/src/build-tools/krb5-config.in
|
|
|
|
|
+++ krb5/src/build-tools/krb5-config.in
|
|
|
|
|
@@ -189,6 +189,13 @@ if test -n "$do_libs"; then
|
2012-06-06 16:55:51 +02:00
|
|
|
-e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
|
|
|
|
|
-e 's#\$(CFLAGS)##'`
|
|
|
|
|
|
|
|
|
|
+ if test `dirname $libdir` = /usr ; then
|
|
|
|
|
+ lib_flags=`echo $lib_flags | sed -e "s#-L$libdir##" -e "s#$RPATH_FLAG$libdir##"`
|
|
|
|
|
+ fi
|
|
|
|
|
+ lib_flags=`echo $lib_flags | sed -e "s#-fPIE##g" -e "s#-pie##g"`
|
|
|
|
|
+ lib_flags=`echo $lib_flags | sed -e "s#-Wl,-z,relro##g"`
|
|
|
|
|
+ lib_flags=`echo $lib_flags | sed -e "s#-Wl,-z,now##g"`
|
|
|
|
|
+
|
|
|
|
|
if test $library = 'kdb'; then
|
|
|
|
|
lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
|
|
|
|
|
library=krb5
|
2014-01-15 15:14:20 +01:00
|
|
|
--- krb5/src/config/pre.in
|
|
|
|
|
+++ krb5/src/config/pre.in
|
|
|
|
|
@@ -188,7 +188,7 @@
|
2012-06-06 16:55:51 +02:00
|
|
|
INSTALL_SCRIPT=@INSTALL_PROGRAM@
|
|
|
|
|
INSTALL_DATA=@INSTALL_DATA@
|
|
|
|
|
INSTALL_SHLIB=@INSTALL_SHLIB@
|
|
|
|
|
-INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root
|
|
|
|
|
+INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755
|
|
|
|
|
## This is needed because autoconf will sometimes define @exec_prefix@ to be
|
|
|
|
|
## ${prefix}.
|
|
|
|
|
prefix=@prefix@
|
