[pkgsrc/trunk]: pkgsrc/mail/fdm fdm: Update to 2.0

[leot <leot%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2aa47c76ba21
branches:  trunk
changeset: 391642:2aa47c76ba21
user:      leot <leot%pkgsrc.org@localhost>
date:      Wed Feb 13 11:08:02 2019 +0000

description:
fdm: Update to 2.0

pkgsrc changes:
 - Remove no longer needed patches

Changes:
2.0
---
 - Remove Courier support
 - Add `ignore-errors' flag to ignore possible delivery errors and continue to
   the next mail
 - Add a `lock-timeout' option to customize default 10 seconds timeout
 - Add support for STARTTLS on IMAP and POP3
 - Disable OpenSSL insecure stuff enabled by default and introduce a `insecure'
   flag to replace `no-tls1'
 - Add support for newer OpenSSL
 - Use SNI extension (fixes some servers when OpenSSL supports TLS 1.3)
 - Misc bug fixes and improvements

diffstat:

 mail/fdm/Makefile                   |   5 ++---
 mail/fdm/distinfo                   |  15 ++++++---------
 mail/fdm/patches/patch-Makefile.am  |  10 +++++-----
 mail/fdm/patches/patch-configure.ac |  26 --------------------------
 mail/fdm/patches/patch-connect.c    |  20 --------------------
 mail/fdm/patches/patch-fdm.h        |  18 ------------------
 6 files changed, 13 insertions(+), 81 deletions(-)

diffs (133 lines):

diff -r f23451ed928c -r 2aa47c76ba21 mail/fdm/Makefile
--- a/mail/fdm/Makefile Wed Feb 13 08:29:52 2019 +0000
+++ b/mail/fdm/Makefile Wed Feb 13 11:08:02 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2018/12/02 00:48:46 leot Exp $
+# $NetBSD: Makefile,v 1.12 2019/02/13 11:08:02 leot Exp $
 
-DISTNAME=      fdm-1.9
-PKGREVISION=   3
+DISTNAME=      fdm-2.0
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=nicm/}
 
diff -r f23451ed928c -r 2aa47c76ba21 mail/fdm/distinfo
--- a/mail/fdm/distinfo Wed Feb 13 08:29:52 2019 +0000
+++ b/mail/fdm/distinfo Wed Feb 13 11:08:02 2019 +0000
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.10 2018/12/02 00:48:46 leot Exp $
+$NetBSD: distinfo,v 1.11 2019/02/13 11:08:02 leot Exp $
 
-SHA1 (fdm-1.9.tar.gz) = 818bf39418ae4b170b4c3aa7c852015bf4802d7a
-RMD160 (fdm-1.9.tar.gz) = f44d009ac29cdf244509ce032270758be7f4be32
-SHA512 (fdm-1.9.tar.gz) = ec204e58a95b00f51912b572d25418f4c4161a53e0b8e42c7c887deac35da113182a4a477428b30a9da1ae3c509f844f3e1700b7669f856e97ec7e4c985cfbf4
-Size (fdm-1.9.tar.gz) = 175815 bytes
-SHA1 (patch-Makefile.am) = 864d905906a0bd78a6beb95093300fba0f52f10c
-SHA1 (patch-configure.ac) = 745810f7b1fe7cf4295cf8b68a9c4757c6ce4386
-SHA1 (patch-connect.c) = ee95c91b2bbf37539a3c94e006e135c5c6c49f86
-SHA1 (patch-fdm.h) = 98d01387d0e17d782950571c1b25e8faf841649b
+SHA1 (fdm-2.0.tar.gz) = 4da70cca5791457489d9e0a018706a6696609eab
+RMD160 (fdm-2.0.tar.gz) = b07dc4ee0b8de3362177d74bd935d1ae4dad961d
+SHA512 (fdm-2.0.tar.gz) = 9c321dfd200af7b7d396524a43a3ac4b569cddda0a2096122b935e9d7bdb8101f269341fae5bbd4ad8a2947312774da2d49e03eddc67c6ecbce4e1ff9488ebe2
+Size (fdm-2.0.tar.gz) = 180662 bytes
+SHA1 (patch-Makefile.am) = 2169ebc8e7c920cdf8492ee2039b410f5a6e358c
diff -r f23451ed928c -r 2aa47c76ba21 mail/fdm/patches/patch-Makefile.am
--- a/mail/fdm/patches/patch-Makefile.am        Wed Feb 13 08:29:52 2019 +0000
+++ b/mail/fdm/patches/patch-Makefile.am        Wed Feb 13 11:08:02 2019 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-Makefile.am,v 1.2 2018/05/04 15:33:22 leot Exp $
+$NetBSD: patch-Makefile.am,v 1.3 2019/02/13 11:08:02 leot Exp $
 
 Fix race conditions.
 
---- Makefile.am.orig   2015-11-06 14:11:58.000000000 +0000
+--- Makefile.am.orig   2019-02-12 22:08:26.000000000 +0000
 +++ Makefile.am
-@@ -109,6 +109,8 @@ dist_fdm_SOURCES = \
+@@ -110,6 +110,8 @@ dist_fdm_SOURCES = \
        parse.y \
        lex.c
  
 +lex.o: parse.c
 +
  nodist_fdm_SOURCES =
- if NO_STRLCAT
- nodist_fdm_SOURCES += compat/strlcat.c
+ if NO_B64_NTOP
+ nodist_fdm_SOURCES += compat/base64.c
diff -r f23451ed928c -r 2aa47c76ba21 mail/fdm/patches/patch-configure.ac
--- a/mail/fdm/patches/patch-configure.ac       Wed Feb 13 08:29:52 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2018/05/04 15:33:22 leot Exp $
-
-Also check for OPENSSL_init_ssl (fixes build with OpenSSL 1.1.0).
-
-From upstream commit 070cee8d1efba1ca260777a204fba7cdfe676ca5.
-
---- configure.ac.orig  2015-09-14 14:40:44.000000000 +0000
-+++ configure.ac
-@@ -83,11 +83,16 @@ if test "x$found_libcrypto" = xno; then
-       AC_MSG_ERROR("libcrypto not found")
- fi
- AC_SEARCH_LIBS(
--      SSL_library_init,
-+      OPENSSL_init_ssl,
-       [ssl],
-       found_libssl=yes,
-       found_libssl=no
- )
-+AC_SEARCH_LIBS(
-+      SSL_library_init,
-+      [ssl],
-+      found_libssl=yes,
-+)
- if test "x$found_libssl" = xno; then
-       AC_MSG_ERROR("libssl not found")
- fi
diff -r f23451ed928c -r 2aa47c76ba21 mail/fdm/patches/patch-connect.c
--- a/mail/fdm/patches/patch-connect.c  Wed Feb 13 08:29:52 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-connect.c,v 1.1 2018/12/02 00:48:46 leot Exp $
-
-Use SNI extension, from Tomasz Miasko in GitHub issue 50.
-
-From upstream commit dde4c369359dc12bfe93329f3df9c9dfd2e3837d.
-
---- connect.c.orig     2018-12-02 00:37:55.540662771 +0000
-+++ connect.c
-@@ -584,6 +584,11 @@ makessl(struct server *srv, int fd, int 
-               goto error;
-       }
- 
-+      if (SSL_set_tlsext_host_name(ssl, srv->host) != 1) {
-+              *cause = sslerror("SSL_set_tlsext_host_name");
-+              goto error;
-+      }
-+
-       if (SSL_set_fd(ssl, fd) != 1) {
-               *cause = sslerror("SSL_set_fd");
-               goto error;
diff -r f23451ed928c -r 2aa47c76ba21 mail/fdm/patches/patch-fdm.h
--- a/mail/fdm/patches/patch-fdm.h      Wed Feb 13 08:29:52 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-fdm.h,v 1.3 2015/09/25 13:08:44 leot Exp $
-
-MAXNAMLEN is not POSIX. For systems that does not define it use NAME_MAX
-macro instead.
-
---- fdm.h.orig 2015-09-14 14:40:44.000000000 +0000
-+++ fdm.h
-@@ -72,6 +72,10 @@
- 
- extern char   *__progname;
- 
-+#ifndef MAXNAMLEN
-+#define MAXNAMLEN NAME_MAX
-+#endif
-+
- /* Linux compatibility bullshit. */
- #ifndef UID_MAX
- #define UID_MAX UINT_MAX