From ecf43ae571f1aebfe1f005659e4968e573a7fb54 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 28 Dec 2018 00:40:53 +0100
Subject: [PATCH] libsasl: Update from 2.1.26 to 2.1.27

---
 packages/libsasl/auth_getpwent.c.patch | 32 +++++++++++---------------
 packages/libsasl/build.sh              | 10 ++++----
 packages/libsasl/config-ltconfig.patch | 23 ------------------
 packages/memcached/build.sh            |  1 +
 packages/mutt/build.sh                 |  1 +
 5 files changed, 21 insertions(+), 46 deletions(-)
 delete mode 100644 packages/libsasl/config-ltconfig.patch

diff --git a/packages/libsasl/auth_getpwent.c.patch b/packages/libsasl/auth_getpwent.c.patch
index 10637b0dc..2ec901963 100644
--- a/packages/libsasl/auth_getpwent.c.patch
+++ b/packages/libsasl/auth_getpwent.c.patch
@@ -1,21 +1,17 @@
-diff -u -r ../cyrus-sasl-2.1.26/saslauthd/auth_getpwent.c ./saslauthd/auth_getpwent.c
---- ../cyrus-sasl-2.1.26/saslauthd/auth_getpwent.c	2012-10-12 10:05:48.000000000 -0400
-+++ ./saslauthd/auth_getpwent.c	2015-12-13 20:55:42.978090186 -0500
-@@ -105,17 +105,21 @@
- 	}
-     }
- 
-+#ifndef __ANDROID__
-     if (strcmp(pw->pw_passwd, (const char *)crypt(password, pw->pw_passwd))) {
- 	if (flags & VERBOSE) {
- 	    syslog(LOG_DEBUG, "DEBUG: auth_getpwent: %s: invalid password", login);
- 	}
-+#endif
- 	RETURN("NO Incorrect password");
-+#ifndef __ANDROID__
-     }
- 
-     if (flags & VERBOSE) {
+diff -u -r ../cyrus-sasl-2.1.27/saslauthd/auth_getpwent.c ./saslauthd/auth_getpwent.c
+--- ../cyrus-sasl-2.1.27/saslauthd/auth_getpwent.c	2016-12-10 16:17:11.000000000 +0000
++++ ./saslauthd/auth_getpwent.c	2018-12-27 22:51:44.851604495 +0000
+@@ -72,6 +72,9 @@
+   /* END PARAMETERS */
+   )
+ {
++#ifdef __ANDROID__
++   RETURN("NO Invalid username");
++#else
+     /* VARIABLES */
+     struct passwd *pw;			/* pointer to passwd file entry */
+     char *crpt_passwd;			/* encrypted password */
+@@ -115,6 +118,7 @@
  	syslog(LOG_DEBUG, "DEBUG: auth_getpwent: OK: %s", login);
      }
      RETURN("OK");
diff --git a/packages/libsasl/build.sh b/packages/libsasl/build.sh
index 09029d942..90089f375 100644
--- a/packages/libsasl/build.sh
+++ b/packages/libsasl/build.sh
@@ -1,12 +1,12 @@
 TERMUX_PKG_HOMEPAGE=https://www.cyrusimap.org/sasl/
 TERMUX_PKG_DESCRIPTION="Cyrus SASL - authentication abstraction library"
-TERMUX_PKG_VERSION=2.1.26
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SRCURL=https://cyrusimap.org/releases/cyrus-sasl-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3
+TERMUX_PKG_VERSION=2.1.27
+TERMUX_PKG_SHA256=6eaf75ce1e73be63894fb04d1fd0bfa9f54f33e88269743dd8f2ff54e27ea043
+TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/cyrus-sasl-$TERMUX_PKG_VERSION.tar.xz
 # Seems to be race issues in build (symlink creation)::
 TERMUX_MAKE_PROCESSES=1
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+lt_cv_deplibs_check_method=pass_all
 ac_cv_func_syslog=no
 ac_cv_header_syslog_h=no
 --disable-gssapi
@@ -29,7 +29,7 @@ termux_step_post_configure () {
 termux_step_post_massage () {
 	for sub in anonymous crammd5 digestmd5 plain; do
 		local base=lib/sasl2/lib${sub}
-		if [ ! -L ${base}.so ] || [ ! -L ${base}.so.3 ] || [ ! -f ${base}.so.3.0.0 ] ; then
+		if [ ! -f ${base}.so ]; then
 			termux_error_exit "libsasl not packaged with $base"
 		fi
 	done
diff --git a/packages/libsasl/config-ltconfig.patch b/packages/libsasl/config-ltconfig.patch
deleted file mode 100644
index ccf3216f9..000000000
--- a/packages/libsasl/config-ltconfig.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./config/ltconfig	2012-10-12 14:05:48.000000000 +0000
-+++ ../ltconfig	2017-12-21 13:49:35.243749635 +0000
-@@ -1237,8 +1237,8 @@
- 
-   *)
-     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
--      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
--      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      archive_cmds='$CC $CFLAGS -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC $CFLAGS -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-     else
-       ld_shlibs=no
-     fi
-@@ -1956,7 +1956,8 @@
-   shlibpath_var=DYLD_LIBRARY_PATH
-   ;;
- 
--gnu*)
-+gnu* | linux-android*)
-+  deplibs_check_method=pass_all
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
diff --git a/packages/memcached/build.sh b/packages/memcached/build.sh
index f00ee03c1..9366c4486 100644
--- a/packages/memcached/build.sh
+++ b/packages/memcached/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://memcached.org/
 TERMUX_PKG_DESCRIPTION="Free & open source, high-performance, distributed memory object caching system"
 TERMUX_PKG_VERSION=1.5.12
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=c02f97d5685617b209fbe25f3464317b234d765b427d254c2413410a5c095b29
 TERMUX_PKG_SRCURL=https://www.memcached.org/files/memcached-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_DEPENDS="libevent, libsasl"
diff --git a/packages/mutt/build.sh b/packages/mutt/build.sh
index 9dad56955..ce234dcff 100644
--- a/packages/mutt/build.sh
+++ b/packages/mutt/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.mutt.org/
 TERMUX_PKG_DESCRIPTION="Mail client with patches from neomutt"
 TERMUX_PKG_VERSION=1.11.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=705141013662e53b78e49ed545360281f30a09ddda908f4de733277a60b1db05
 TERMUX_PKG_SRCURL=ftp://ftp.mutt.org/pub/mutt/mutt-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses, gdbm, openssl, libsasl, mime-support"