Browse Source

Added a patch for Cyrus SASL to fix the regression on iOS. See https://bugzilla.cyrusimap.org/show_bug.cgi?id=3796

dvh-chacham15-master
Hoa V. DINH 9 years ago
parent
commit
6f5b57bc46
2 changed files with 14 additions and 0 deletions
  1. +12
    -0
      build-mac/dependencies/cyrus-2.1.25-libetpan.patch
  2. +2
    -0
      build-mac/dependencies/prepare-cyrus-sasl.sh

+ 12
- 0
build-mac/dependencies/cyrus-2.1.25-libetpan.patch View File

@ -0,0 +1,12 @@
diff -ur cyrus-sasl-2.1.25/lib/client.c cyrus-sasl-2.1.25.new/lib/client.c
--- cyrus-sasl-2.1.25/lib/client.c 2011-09-02 05:58:01.000000000 -0700
+++ cyrus-sasl-2.1.25.new/lib/client.c 2013-06-01 23:23:00.000000000 -0700
@@ -504,7 +504,7 @@
/* get the clientFQDN (serverFQDN was set in _sasl_conn_init) */
memset(name, 0, sizeof(name));
if (get_fqhostname (name, MAXHOSTNAMELEN, 0) != 0) {
- return (SASL_FAIL);
+ gethostname(name, MAXHOSTNAMELEN);
}
result = _sasl_strdup(name, &conn->clientFQDN, NULL);

+ 2
- 0
build-mac/dependencies/prepare-cyrus-sasl.sh View File

@ -5,6 +5,7 @@ ARCHIVE=cyrus-sasl-$version
ARCHIVE_NAME=$ARCHIVE.tar.gz
ARCHIVE_PATCH=$ARCHIVE.patch
url=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$ARCHIVE_NAME
patchfile=cyrus-2.1.25-libetpan.patch
scriptdir="`pwd`"
@ -65,6 +66,7 @@ logfile="$srcdir/$ARCHIVE/build.log"
echo "*** patching sources ***" > "$logfile" 2>&1
cd "$srcdir/$ARCHIVE"
patch -p1 < $current_dir/$patchfile
# patch source files
cd "$srcdir/$ARCHIVE/include"
sed -E 's/\.\/makemd5 /.\/makemd5i386 /' < Makefile.am > Makefile.am.new


Loading…
Cancel
Save