CVS commit: pkgsrc/mail/fdm

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Fri May  4 15:33:22 UTC 2018

Modified Files:
        pkgsrc/mail/fdm: Makefile distinfo options.mk
        pkgsrc/mail/fdm/patches: patch-Makefile.am
Added Files:
        pkgsrc/mail/fdm/patches: patch-configure.ac

Log Message:
fdm: Fix the build with OpenSSL 1.1.0 and minor cosmetic changes

- Fix the build with OpenSSL 1.1.0 backporting a patch from upstream.
- Minor mostly cosmetic changes (pointed out by pkglint)
- Take MAINTAINERship

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/fdm/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/fdm/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/fdm/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/fdm/patches/patch-Makefile.am
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/fdm/patches/patch-configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/fdm/Makefile
diff -u pkgsrc/mail/fdm/Makefile:1.9 pkgsrc/mail/fdm/Makefile:1.10
--- pkgsrc/mail/fdm/Makefile:1.9        Sat Mar  5 11:28:48 2016
+++ pkgsrc/mail/fdm/Makefile    Fri May  4 15:33:22 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2016/03/05 11:28:48 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2018/05/04 15:33:22 leot Exp $
 
 DISTNAME=      fdm-1.9
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=nicm/}
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    leot%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/nicm/fdm/
 COMMENT=       Fetch or receive mail and deliver it in various ways
 LICENSE=       modified-bsd

Index: pkgsrc/mail/fdm/distinfo
diff -u pkgsrc/mail/fdm/distinfo:1.8 pkgsrc/mail/fdm/distinfo:1.9
--- pkgsrc/mail/fdm/distinfo:1.8        Fri Nov  6 20:34:00 2015
+++ pkgsrc/mail/fdm/distinfo    Fri May  4 15:33:22 2018
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2015/11/06 20:34:00 joerg Exp $
+$NetBSD: distinfo,v 1.9 2018/05/04 15:33:22 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) = 62a901e68f7c3451d73701e21d9bbfce629b5ec3
+SHA1 (patch-Makefile.am) = 864d905906a0bd78a6beb95093300fba0f52f10c
+SHA1 (patch-configure.ac) = 745810f7b1fe7cf4295cf8b68a9c4757c6ce4386
 SHA1 (patch-fdm.h) = 98d01387d0e17d782950571c1b25e8faf841649b

Index: pkgsrc/mail/fdm/options.mk
diff -u pkgsrc/mail/fdm/options.mk:1.2 pkgsrc/mail/fdm/options.mk:1.3
--- pkgsrc/mail/fdm/options.mk:1.2      Fri Sep 25 13:08:44 2015
+++ pkgsrc/mail/fdm/options.mk  Fri May  4 15:33:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2015/09/25 13:08:44 leot Exp $
+# $NetBSD: options.mk,v 1.3 2018/05/04 15:33:22 leot Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.fdm
 PKG_SUPPORTED_OPTIONS= debug pcre
@@ -17,6 +17,6 @@ CONFIGURE_ARGS+=      --enable-debug
 # PCRE support
 #
 .if !empty(PKG_OPTIONS:Mpcre)
-   MAKE_ENV+=  PCRE=1
+MAKE_ENV+=     PCRE=1
 .  include "../../devel/pcre/buildlink3.mk"
 .endif

Index: pkgsrc/mail/fdm/patches/patch-Makefile.am
diff -u pkgsrc/mail/fdm/patches/patch-Makefile.am:1.1 pkgsrc/mail/fdm/patches/patch-Makefile.am:1.2
--- pkgsrc/mail/fdm/patches/patch-Makefile.am:1.1       Fri Nov  6 20:34:00 2015
+++ pkgsrc/mail/fdm/patches/patch-Makefile.am   Fri May  4 15:33:22 2018
@@ -1,4 +1,6 @@
-$NetBSD: patch-Makefile.am,v 1.1 2015/11/06 20:34:00 joerg Exp $
+$NetBSD: patch-Makefile.am,v 1.2 2018/05/04 15:33:22 leot Exp $
+
+Fix race conditions.
 
 --- Makefile.am.orig   2015-11-06 14:11:58.000000000 +0000
 +++ Makefile.am

Added files:

Index: pkgsrc/mail/fdm/patches/patch-configure.ac
diff -u /dev/null pkgsrc/mail/fdm/patches/patch-configure.ac:1.1
--- /dev/null   Fri May  4 15:33:22 2018
+++ pkgsrc/mail/fdm/patches/patch-configure.ac  Fri May  4 15:33:22 2018
@@ -0,0 +1,26 @@
+$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