From 1fe49c53b0601b449fede2b2c268b16cf8b09343 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Tue, 16 May 2006 15:54:46 +0000 Subject: [PATCH] - add conditionalized build dependency on openldap-devel (#191855) - patch md5global.h to be the same on all architectures --- cyrus-sasl-2.1.21-sizes.patch | 120 ++++++++++++++++++++++++++++++++++ cyrus-sasl.spec | 12 +++- 2 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 cyrus-sasl-2.1.21-sizes.patch diff --git a/cyrus-sasl-2.1.21-sizes.patch b/cyrus-sasl-2.1.21-sizes.patch new file mode 100644 index 0000000..006962b --- /dev/null +++ b/cyrus-sasl-2.1.21-sizes.patch @@ -0,0 +1,120 @@ +Prefer types in to our own, because it removes file content +conflicts between 32- and 64-bit architectures. RFEd as #2829. + +--- cyrus-sasl-2.1.21/configure.in 2006-05-16 07:37:52.000000000 -0400 ++++ cyrus-sasl-2.1.21/configure.in 2006-05-16 07:37:52.000000000 -0400 +@@ -1083,6 +1083,10 @@ + AC_HEADER_DIRENT + AC_HEADER_SYS_WAIT + AC_CHECK_HEADERS(des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h) ++AC_CHECK_TYPES([long long, int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t],,,[ ++#ifdef HAVE_INTTYPES_H ++#include ++#endif]) + + 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 +@@ -82,12 +82,19 @@ + */ + + ++#ifdef HAVE_CONFIG_H ++#include "../config.h" ++#endif + + #include + #include + #include + #include + ++#ifdef HAVE_INTTYPES_H ++#include ++#endif ++ + + static void + my_strupr(char *s) +@@ -122,6 +129,18 @@ + static void + try_signed(FILE *f, int len) + { ++#ifdef HAVE_INT8_T ++ BITSIZE(int8_t); ++#endif ++#ifdef HAVE_INT16_T ++ BITSIZE(int16_t); ++#endif ++#ifdef HAVE_INT32_T ++ BITSIZE(int32_t); ++#endif ++#ifdef HAVE_INT64_T ++ BITSIZE(int64_t); ++#endif + BITSIZE(signed char); + BITSIZE(short); + BITSIZE(int); +@@ -135,6 +154,18 @@ + static void + try_unsigned(FILE *f, int len) + { ++#ifdef HAVE_UINT8_T ++ BITSIZE(uint8_t); ++#endif ++#ifdef HAVE_UINT16_T ++ BITSIZE(uint16_t); ++#endif ++#ifdef HAVE_UINT32_T ++ BITSIZE(uint32_t); ++#endif ++#ifdef HAVE_UINT64_T ++ BITSIZE(uint64_t); ++#endif + BITSIZE(unsigned char); + BITSIZE(unsigned short); + BITSIZE(unsigned int); +@@ -165,6 +196,11 @@ + "/* POINTER defines a generic pointer type */\n" + "typedef unsigned char *POINTER;\n" + "\n" ++#ifdef HAVE_INTTYPES_H ++ "/* We try to define integer types for our use */\n" ++ "#include \n" ++ "\n" ++#endif + ); + return 1; + } +@@ -212,31 +248,15 @@ + + print_pre(f); + +-#ifndef HAVE_INT8_T + try_signed (f, 8); +-#endif /* HAVE_INT8_T */ +-#ifndef HAVE_INT16_T + try_signed (f, 16); +-#endif /* HAVE_INT16_T */ +-#ifndef HAVE_INT32_T + try_signed (f, 32); +-#endif /* HAVE_INT32_T */ +-#ifndef HAVE_INT64_T + try_signed (f, 64); +-#endif /* HAVE_INT64_T */ + +-#ifndef HAVE_U_INT8_T + try_unsigned (f, 8); +-#endif /* HAVE_INT8_T */ +-#ifndef HAVE_U_INT16_T + try_unsigned (f, 16); +-#endif /* HAVE_U_INT16_T */ +-#ifndef HAVE_U_INT32_T + try_unsigned (f, 32); +-#endif /* HAVE_U_INT32_T */ +-#ifndef HAVE_U_INT64_T + try_unsigned (f, 64); +-#endif /* HAVE_U_INT64_T */ + + print_post(f); + diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 6d8d06e..ebf55d1 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -1,11 +1,12 @@ %define _plugindir %{_libdir}/sasl %define _plugindir2 %{_libdir}/sasl2 %define db_version 4.3.27 +%define bootstrap_cyrus_sasl 0 Summary: The Cyrus SASL library. Name: cyrus-sasl Version: 2.1.21 -Release: 11 +Release: 12 License: Freely Distributable Group: System Environment/Libraries Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz @@ -33,11 +34,15 @@ Patch20: cyrus-sasl-2.1.21-openldap-2.3.patch Patch21: cyrus-sasl-2.1.21-no-static-deps.patch Patch22: cyrus-sasl-2.1.21-gssapi-generic.patch Patch23: cyrus-sasl-2.1.19-omit_realm.patch +Patch24: cyrus-sasl-2.1.21-sizes.patch Patch50: db-4.3.27-initmem.patch Buildroot: %{_tmppath}/%{name}-root BuildPrereq: autoconf, automake, libtool, gdbm-devel, groff BuildPrereq: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig BuildPrereq: mysql-devel, postgresql-devel, zlib-devel +%if ! %{bootstrap_cyrus_sasl} +BuildPrereq: openldap-devel +%endif Prereq: /sbin/ldconfig, chkconfig, /sbin/service %description @@ -142,6 +147,7 @@ popd %patch21 -p1 -b .no-static-deps %patch22 -p1 -b .gssapi-generic #%patch23 -p1 -b .omit_realm +%patch24 -p1 -b .sizes # FIXME - this is just weird rm config/ltconfig config/libtool.m4 rm -fr autom4te.cache @@ -411,6 +417,10 @@ fi %{_sbindir}/sasl2-shared-mechlist %changelog +* Tue May 16 2006 Nalin Dahyabhai 2.1.21-12 +- add conditionalized build dependency on openldap-devel (#191855) +- patch md5global.h to be the same on all architectures + * Thu Apr 27 2006 Nalin Dahyabhai 2.1.21-11 - add unapplied patch which makes the DIGEST-MD5 plugin omit the realm argument when the environment has $CYRUS_SASL_DIGEST_MD5_OMIT_REALM set to a