cyrus-sasl-2.1.26-relro.patch 3.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960
  1. diff -up cyrus-sasl-2.1.26/lib/Makefile.am.relro cyrus-sasl-2.1.26/lib/Makefile.am
  2. --- cyrus-sasl-2.1.26/lib/Makefile.am.relro 2012-10-12 16:05:48.000000000 +0200
  3. +++ cyrus-sasl-2.1.26/lib/Makefile.am 2013-02-11 14:18:01.749053772 +0100
  4. @@ -64,7 +64,7 @@ LIB_DOOR= @LIB_DOOR@
  5. lib_LTLIBRARIES = libsasl2.la
  6. libsasl2_la_SOURCES = $(common_sources) $(common_headers)
  7. -libsasl2_la_LDFLAGS = -version-info $(sasl_version)
  8. +libsasl2_la_LDFLAGS = -Wl,-z,relro -version-info $(sasl_version)
  9. libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
  10. libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
  11. diff -up cyrus-sasl-2.1.26/lib/Makefile.in.relro cyrus-sasl-2.1.26/lib/Makefile.in
  12. --- cyrus-sasl-2.1.26/lib/Makefile.in.relro 2013-11-13 16:55:09.606555125 +0100
  13. +++ cyrus-sasl-2.1.26/lib/Makefile.in 2013-11-13 16:56:43.331096795 +0100
  14. @@ -330,7 +330,7 @@ common_headers = saslint.h
  15. common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c saslutil.c server.c seterror.c dlopen.c ../plugins/plugin_common.c
  16. lib_LTLIBRARIES = libsasl2.la
  17. libsasl2_la_SOURCES = $(common_sources) $(common_headers)
  18. -libsasl2_la_LDFLAGS = -version-info $(sasl_version)
  19. +libsasl2_la_LDFLAGS = -Wl,-z,relro -version-info $(sasl_version)
  20. libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
  21. libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
  22. @MACOSX_TRUE@framedir = /Library/Frameworks/SASL2.framework
  23. diff -up cyrus-sasl-2.1.26/plugins/Makefile.am.relro cyrus-sasl-2.1.26/plugins/Makefile.am
  24. --- cyrus-sasl-2.1.26/plugins/Makefile.am.relro 2012-10-12 16:05:48.000000000 +0200
  25. +++ cyrus-sasl-2.1.26/plugins/Makefile.am 2013-02-11 14:18:01.749053772 +0100
  26. @@ -50,7 +50,7 @@
  27. plugin_version = 3:0:0
  28. INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
  29. -AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
  30. +AM_LDFLAGS = -Wl,-z,relro -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
  31. COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
  32. diff -up cyrus-sasl-2.1.26/plugins/Makefile.in.relro cyrus-sasl-2.1.26/plugins/Makefile.in
  33. --- cyrus-sasl-2.1.26/plugins/Makefile.in.relro 2013-11-13 16:57:08.430974081 +0100
  34. +++ cyrus-sasl-2.1.26/plugins/Makefile.in 2013-11-13 16:57:58.911727846 +0100
  35. @@ -364,7 +364,7 @@ top_srcdir = @top_srcdir@
  36. # CURRENT:REVISION:AGE
  37. plugin_version = 3:0:0
  38. INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
  39. -AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
  40. +AM_LDFLAGS = -Wl,-z,relro -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
  41. COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
  42. EXTRA_DIST = makeinit.sh NTMakefile
  43. noinst_SCRIPTS = makeinit.sh
  44. diff -up cyrus-sasl-2.1.26/saslauthd/Makefile.am.relro cyrus-sasl-2.1.26/saslauthd/Makefile.am
  45. --- cyrus-sasl-2.1.26/saslauthd/Makefile.am.relro 2013-02-11 14:18:36.910900647 +0100
  46. +++ cyrus-sasl-2.1.26/saslauthd/Makefile.am 2013-02-11 14:20:17.336463915 +0100
  47. @@ -17,6 +17,7 @@ saslauthd_DEPENDENCIES = saslauthd-main.
  48. saslauthd_LDADD = @SASL_KRB_LIB@ \
  49. @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
  50. @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
  51. +saslauthd_LDFLAGS = -pie -Wl,-z,now
  52. testsaslauthd_SOURCES = testsaslauthd.c utils.c
  53. testsaslauthd_LDADD = @LIB_SOCKET@