From c88615fc6338c98aff6402a9d83661e3e8144bae Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Thu, 12 Dec 2019 11:19:05 +0100
Subject: [PATCH] upgrading package: dovecot 2.3.8 -> 2.3.9

---
 dovecot/dovecot.patch | 27 ++++++++++++++++++++++++---
 dovecot/dovecot.spec  | 10 ++++------
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/dovecot/dovecot.patch b/dovecot/dovecot.patch
index 03446aabb3..b32dcf698a 100644
--- a/dovecot/dovecot.patch
+++ b/dovecot/dovecot.patch
@@ -1,7 +1,7 @@
 Index: src/lib-master/test-event-stats.c
---- src/lib-master/test-event-stats.c.orig	2019-03-05 23:18:13.407870000 +0100
-+++ src/lib-master/test-event-stats.c	2019-03-05 23:19:39.803093000 +0100
-@@ -14,6 +14,7 @@
+--- src/lib-master/test-event-stats.c.orig	2019-12-04 10:31:27.000000000 +0100
++++ src/lib-master/test-event-stats.c	2019-12-12 09:27:14.864844000 +0100
+@@ -15,6 +15,7 @@
  #include <fcntl.h>
  #include <unistd.h>
  #include <signal.h>
@@ -9,3 +9,24 @@ Index: src/lib-master/test-event-stats.c
  #include <sys/socket.h>
  #include <sys/un.h>
  #include <sys/wait.h>
+Index: src/lib/net.c
+--- src/lib/net.c.orig	2019-12-04 10:31:27.000000000 +0100
++++ src/lib/net.c	2019-12-12 11:15:16.948290000 +0100
+@@ -1068,13 +1068,17 @@
+ 		int error;
+ 		enum net_hosterror_type type;
+ 	} error_map[] = {
++#ifdef EAI_ADDRFAMILY
+ 		{ EAI_ADDRFAMILY, NET_HOSTERROR_TYPE_NOT_FOUND },
++#endif
+ 		{ EAI_AGAIN, NET_HOSTERROR_TYPE_NAMESERVER },
+ 		{ EAI_BADFLAGS, NET_HOSTERROR_TYPE_INTERNAL_ERROR },
+ 		{ EAI_FAIL, NET_HOSTERROR_TYPE_NAMESERVER },
+ 		{ EAI_FAMILY, NET_HOSTERROR_TYPE_INTERNAL_ERROR },
+ 		{ EAI_MEMORY, NET_HOSTERROR_TYPE_INTERNAL_ERROR },
++#ifdef EAI_NODATA
+ 		{ EAI_NODATA, NET_HOSTERROR_TYPE_NOT_FOUND },
++#endif
+ 		{ EAI_NONAME, NET_HOSTERROR_TYPE_NOT_FOUND },
+ 		{ EAI_SERVICE, NET_HOSTERROR_TYPE_INTERNAL_ERROR },
+ 		{ EAI_SOCKTYPE, NET_HOSTERROR_TYPE_INTERNAL_ERROR },
diff --git a/dovecot/dovecot.spec b/dovecot/dovecot.spec
index bf943f1b7a..534f8c8b69 100644
--- a/dovecot/dovecot.spec
+++ b/dovecot/dovecot.spec
@@ -23,8 +23,8 @@
 
 #   package version
 %define       V_major       2.3
-%define       V_minor       8
-%define       V_pigeonhole  0.5.8
+%define       V_minor       9
+%define       V_pigeonhole  0.5.9
 
 #   package information
 Name:         dovecot
@@ -37,7 +37,7 @@ Class:        PLUS
 Group:        Mail
 License:      MIT+LGPL
 Version:      %{V_major}.%{V_minor}
-Release:      20191008
+Release:      20191212
 
 #   package options
 %option       with_fsl          yes
@@ -119,8 +119,7 @@ PreReq:       sqlite
     #   build Dovecot
     %{l_shtool} subst \
         -e 's;/usr/sbin/sendmail;%{l_prefix}/sbin/sendmail;g' \
-        src/config/all-settings.c \
-        src/lib-lda/lda-settings.c
+        src/lib-smtp/smtp-submit-settings.c
     cppflags="%{l_cppflags}"
     ldflags="%{l_ldflags} %{l_fsl_ldflags}"
     libs="%{l_fsl_libs}"
@@ -185,7 +184,6 @@ PreReq:       sqlite
 %else
         --without-pam \
 %endif
-        --without-gc \
         --without-gssapi \
         --without-lucene \
         --without-vpopmail \