From e1032e3da5ce94509ebb59cab4b668864d6e5add Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Nov 15 2013 14:23:33 +0000 Subject: patch configure in cyrus-sasl-2.1.21-sizes.patch cyrus-sasl-2.1.26-relro.patch in order not to call autoreconf in spec file --- diff --git a/cyrus-sasl-2.1.21-sizes.patch b/cyrus-sasl-2.1.21-sizes.patch index 006962b..45f1800 100644 --- a/cyrus-sasl-2.1.21-sizes.patch +++ b/cyrus-sasl-2.1.21-sizes.patch @@ -14,8 +14,137 @@ conflicts between 32- and 64-bit architectures. RFEd as #2829. IPv6_CHECK_SS_FAMILY() IPv6_CHECK_SA_LEN() ---- cyrus-sasl-2.1.21/include/makemd5.c 2003-02-13 14:55:52.000000000 -0500 -+++ cyrus-sasl-2.1.21/include/makemd5.c 2006-05-16 07:45:08.000000000 -0400 +diff -up cyrus-sasl-2.1.26/configure.sizes cyrus-sasl-2.1.26/configure +--- cyrus-sasl-2.1.26/configure.sizes 2013-11-13 16:40:44.492792539 +0100 ++++ cyrus-sasl-2.1.26/configure 2013-11-13 16:40:47.489777836 +0100 +@@ -18166,6 +18166,124 @@ fi + + done + ++ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" " ++#ifdef HAVE_INTTYPES_H ++#include ++#endif ++" ++if test "x$ac_cv_type_long_long" = xyes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_LONG_LONG 1 ++_ACEOF ++ ++ ++fi ++ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" " ++#ifdef HAVE_INTTYPES_H ++#include ++#endif ++" ++if test "x$ac_cv_type_int8_t" = xyes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_INT8_T 1 ++_ACEOF ++ ++ ++fi ++ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" " ++#ifdef HAVE_INTTYPES_H ++#include ++#endif ++" ++if test "x$ac_cv_type_uint8_t" = xyes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_UINT8_T 1 ++_ACEOF ++ ++ ++fi ++ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" " ++#ifdef HAVE_INTTYPES_H ++#include ++#endif ++" ++if test "x$ac_cv_type_int16_t" = xyes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_INT16_T 1 ++_ACEOF ++ ++ ++fi ++ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" " ++#ifdef HAVE_INTTYPES_H ++#include ++#endif ++" ++if test "x$ac_cv_type_uint16_t" = xyes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_UINT16_T 1 ++_ACEOF ++ ++ ++fi ++ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" " ++#ifdef HAVE_INTTYPES_H ++#include ++#endif ++" ++if test "x$ac_cv_type_int32_t" = xyes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_INT32_T 1 ++_ACEOF ++ ++ ++fi ++ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" " ++#ifdef HAVE_INTTYPES_H ++#include ++#endif ++" ++if test "x$ac_cv_type_uint32_t" = xyes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_UINT32_T 1 ++_ACEOF ++ ++ ++fi ++ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" " ++#ifdef HAVE_INTTYPES_H ++#include ++#endif ++" ++if test "x$ac_cv_type_int64_t" = xyes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_INT64_T 1 ++_ACEOF ++ ++ ++fi ++ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" " ++#ifdef HAVE_INTTYPES_H ++#include ++#endif ++" ++if test "x$ac_cv_type_uint64_t" = xyes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_UINT64_T 1 ++_ACEOF ++ ++ ++fi ++ + + + { $as_echo "$as_me:$LINENO: checking whether you have ss_family in struct sockaddr_storage" >&5 +diff -up cyrus-sasl-2.1.26/include/makemd5.c.sizes cyrus-sasl-2.1.26/include/makemd5.c +--- cyrus-sasl-2.1.26/include/makemd5.c.sizes 2012-01-28 00:31:36.000000000 +0100 ++++ cyrus-sasl-2.1.26/include/makemd5.c 2013-11-13 16:22:24.195981512 +0100 @@ -82,12 +82,19 @@ */ diff --git a/cyrus-sasl-2.1.26-relro.patch b/cyrus-sasl-2.1.26-relro.patch index 1a260be..f8b6027 100644 --- a/cyrus-sasl-2.1.26-relro.patch +++ b/cyrus-sasl-2.1.26-relro.patch @@ -10,6 +10,18 @@ diff -up cyrus-sasl-2.1.26/lib/Makefile.am.relro cyrus-sasl-2.1.26/lib/Makefile. libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) +diff -up cyrus-sasl-2.1.26/lib/Makefile.in.relro cyrus-sasl-2.1.26/lib/Makefile.in +--- cyrus-sasl-2.1.26/lib/Makefile.in.relro 2013-11-13 16:55:09.606555125 +0100 ++++ cyrus-sasl-2.1.26/lib/Makefile.in 2013-11-13 16:56:43.331096795 +0100 +@@ -330,7 +330,7 @@ common_headers = saslint.h + 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 + lib_LTLIBRARIES = libsasl2.la + libsasl2_la_SOURCES = $(common_sources) $(common_headers) +-libsasl2_la_LDFLAGS = -version-info $(sasl_version) ++libsasl2_la_LDFLAGS = -Wl,-z,relro -version-info $(sasl_version) + libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) + libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) + @MACOSX_TRUE@framedir = /Library/Frameworks/SASL2.framework diff -up cyrus-sasl-2.1.26/plugins/Makefile.am.relro cyrus-sasl-2.1.26/plugins/Makefile.am --- cyrus-sasl-2.1.26/plugins/Makefile.am.relro 2012-10-12 16:05:48.000000000 +0200 +++ cyrus-sasl-2.1.26/plugins/Makefile.am 2013-02-11 14:18:01.749053772 +0100 @@ -22,6 +34,18 @@ diff -up cyrus-sasl-2.1.26/plugins/Makefile.am.relro cyrus-sasl-2.1.26/plugins/M COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ +diff -up cyrus-sasl-2.1.26/plugins/Makefile.in.relro cyrus-sasl-2.1.26/plugins/Makefile.in +--- cyrus-sasl-2.1.26/plugins/Makefile.in.relro 2013-11-13 16:57:08.430974081 +0100 ++++ cyrus-sasl-2.1.26/plugins/Makefile.in 2013-11-13 16:57:58.911727846 +0100 +@@ -364,7 +364,7 @@ top_srcdir = @top_srcdir@ + # CURRENT:REVISION:AGE + plugin_version = 3:0:0 + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include +-AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version) ++AM_LDFLAGS = -Wl,-z,relro -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version) + COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ + EXTRA_DIST = makeinit.sh NTMakefile + noinst_SCRIPTS = makeinit.sh diff -up cyrus-sasl-2.1.26/saslauthd/Makefile.am.relro cyrus-sasl-2.1.26/saslauthd/Makefile.am --- cyrus-sasl-2.1.26/saslauthd/Makefile.am.relro 2013-02-11 14:18:36.910900647 +0100 +++ cyrus-sasl-2.1.26/saslauthd/Makefile.am 2013-02-11 14:20:17.336463915 +0100 @@ -33,3 +57,14 @@ diff -up cyrus-sasl-2.1.26/saslauthd/Makefile.am.relro cyrus-sasl-2.1.26/saslaut testsaslauthd_SOURCES = testsaslauthd.c utils.c testsaslauthd_LDADD = @LIB_SOCKET@ +diff -up cyrus-sasl-2.1.26/saslauthd/Makefile.in.relro cyrus-sasl-2.1.26/saslauthd/Makefile.in +--- cyrus-sasl-2.1.26/saslauthd/Makefile.in.relro 2013-11-13 16:58:13.085659148 +0100 ++++ cyrus-sasl-2.1.26/saslauthd/Makefile.in 2013-11-13 16:58:49.679481841 +0100 +@@ -234,6 +234,7 @@ saslauthd_DEPENDENCIES = saslauthd-main. + saslauthd_LDADD = @SASL_KRB_LIB@ \ + @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ + @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ ++saslauthd_LDFLAGS = -pie -Wl,-z,now + + testsaslauthd_SOURCES = testsaslauthd.c utils.c + testsaslauthd_LDADD = @LIB_SOCKET@