Merge ~racb/ubuntu/+source/dovecot:glibc-crypt-ftbfs into ubuntu/+source/dovecot:ubuntu/devel

[Robie Basak]

Test package in ppa:racb/experimental: https://launchpad.net/~racb/+archive/ubuntu/experimental/+packages

[Christian Ehrhardt  (paelzer)]

Code, CL, and build LGTM now - thanks for the debugging!

[Christian Ehrhardt  (paelzer)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 69cd5e5..0357a6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dovecot (1:2.3.2.1-1ubuntu2) cosmic; urgency=medium
+
+  * d/p/fix-glibc-crypt-ftbfs: cherry-pick from upstream to find crypt(3)
+    correctly to fix FTBFS (LP: #1793138).
+
+ -- Robie Basak <[e-mail]>  Thu, 20 Sep 2018 08:51:00 +0100
+
 dovecot (1:2.3.2.1-1ubuntu1) cosmic; urgency=medium
 
   * Merge with Debian unstable (LP: #1771524). Remaining changes:
diff --git a/debian/patches/fix-glibc-crypt-ftbfs b/debian/patches/fix-glibc-crypt-ftbfs
new file mode 100644
index 0000000..f4d06c8
--- /dev/null
+++ b/debian/patches/fix-glibc-crypt-ftbfs
@@ -0,0 +1,51 @@
+From 63a74b9e8e0604486a15a879e7f1a27257322400 Mon Sep 17 00:00:00 2001
+From: Aki Tuomi <[e-mail]>
+Date: Wed, 8 Aug 2018 12:33:20 +0300
+Subject: [PATCH] auth: mycrypt - include crypt.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes crypt usage on glibc-2.28
+
+Reported by Reuben Farrelly
+Patch provided by Thore Bödecker
+
+Bug-Ubuntu: https://launchpad.net/bugs/1793138
+Origin: upstream, https://github.com/dovecot/core/commit/63a74b9e8e0604486a15a879e7f1a27257322400
+Last-Update: 2018-09-20
+---
+ configure.ac       | 2 +-
+ src/auth/mycrypt.c | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index dd545eb..c5d8fae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -315,7 +315,7 @@ AC_CHECK_HEADERS(strings.h stdint.h unistd.h dirent.h malloc.h \
+   quota.h sys/fs/quota_common.h \
+   mntent.h sys/mnttab.h sys/event.h sys/time.h sys/mkdev.h linux/dqblk_xfs.h \
+   xfs/xqm.h execinfo.h ucontext.h malloc_np.h sys/utsname.h sys/vmount.h \
+-  sys/utsname.h glob.h linux/falloc.h ucred.h sys/ucred.h)
++  sys/utsname.h glob.h linux/falloc.h ucred.h sys/ucred.h crypt.h)
+ 
+ CC_CLANG
+ AC_CC_PIE
+diff --git a/src/auth/mycrypt.c b/src/auth/mycrypt.c
+index c49fcf8..0bd00bc 100644
+--- a/src/auth/mycrypt.c
++++ b/src/auth/mycrypt.c
+@@ -14,6 +14,9 @@
+ #  define _XPG6 /* Some Solaris versions require this, some break with this */
+ #endif
+ #include <unistd.h>
++#ifdef HAVE_CRYPT_H
++# include <crypt.h>
++#endif
+ 
+ #include "mycrypt.h"
+ 
+-- 
+2.7.4
+
diff --git a/debian/patches/series b/debian/patches/series
index e4b328a..c999538 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ mboxlocking.patch
 dovecot_name.patch
 ssl-dh-params-location.patch
 debian-changes
+fix-glibc-crypt-ftbfs