Tue Jan 7 13:35:13 2020 UTC ()
opendkim: Fix build

Actually fix == bashism as referred to in patch's comment


(sborrill)
diff -r1.19 -r1.20 pkgsrc/mail/opendkim/distinfo
diff -r1.1 -r1.2 pkgsrc/mail/opendkim/patches/patch-configure.ac
cvs diff -r1.19 -r1.20 pkgsrc/mail/opendkim/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/opendkim/distinfo 2019/11/24 23:20:40 1.19
+++ pkgsrc/mail/opendkim/distinfo 2020/01/07 13:35:13 1.20
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.19 2019/11/24 23:20:40 christos Exp $ 1$NetBSD: distinfo,v 1.20 2020/01/07 13:35:13 sborrill Exp $
2 2
3SHA1 (opendkim-2.10.3.tar.gz) = 4e9b966860bcfbca6441ed84a95bbe762fff69f4 3SHA1 (opendkim-2.10.3.tar.gz) = 4e9b966860bcfbca6441ed84a95bbe762fff69f4
4RMD160 (opendkim-2.10.3.tar.gz) = c6553757ae9675434e647f3cc1e6357bc60c7d2a 4RMD160 (opendkim-2.10.3.tar.gz) = c6553757ae9675434e647f3cc1e6357bc60c7d2a
5SHA512 (opendkim-2.10.3.tar.gz) = 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8 5SHA512 (opendkim-2.10.3.tar.gz) = 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
6Size (opendkim-2.10.3.tar.gz) = 1210224 bytes 6Size (opendkim-2.10.3.tar.gz) = 1210224 bytes
7SHA1 (patch-configure.ac) = 17eeb1927fb19ba7f48f9dfd8a9c2f6c44d823ca 7SHA1 (patch-configure.ac) = c9ae182ed2c5c2ec3018fe4c6066ed7fa0d3686f
8SHA1 (patch-opendkim_opendkim-crypto.c) = d7d08fda3dba5bf9cb834123218b1e89b78878e5 8SHA1 (patch-opendkim_opendkim-crypto.c) = d7d08fda3dba5bf9cb834123218b1e89b78878e5
cvs diff -r1.1 -r1.2 pkgsrc/mail/opendkim/patches/patch-configure.ac (expand / switch to unified diff)

--- pkgsrc/mail/opendkim/patches/patch-configure.ac 2019/11/24 23:20:40 1.1
+++ pkgsrc/mail/opendkim/patches/patch-configure.ac 2020/01/07 13:35:13 1.2
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-configure.ac,v 1.1 2019/11/24 23:20:40 christos Exp $ 1$NetBSD: patch-configure.ac,v 1.2 2020/01/07 13:35:13 sborrill Exp $
2 2
3- compat for OpenSSL 1.1 https://sourceforge.net/p/opendkim/patches/37/ 3- compat for OpenSSL 1.1 https://sourceforge.net/p/opendkim/patches/37/
4- fix == bashism 4- fix == bashism
5 5
6--- configure.ac.orig 2015-05-12 14:43:09.000000000 -0400 6--- configure.ac.orig 2015-05-12 19:43:09.000000000 +0100
7+++ configure.ac 2019-11-24 18:03:48.650839906 -0500 7+++ configure.ac 2020-01-07 13:30:01.000000000 +0000
8@@ -860,26 +860,28 @@ 8@@ -860,26 +860,28 @@
9 AC_SEARCH_LIBS([ERR_peek_error], [crypto], , 9 AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
10 AC_MSG_ERROR([libcrypto not found])) 10 AC_MSG_ERROR([libcrypto not found]))
11  11
12- AC_SEARCH_LIBS([SSL_library_init], [ssl], , 12- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
13- [ 13- [
14- if test x"$enable_shared" = x"yes" 14- if test x"$enable_shared" = x"yes"
15- then 15- then
16- AC_MSG_ERROR([Cannot build shared opendkim 16- AC_MSG_ERROR([Cannot build shared opendkim
17- against static openssl libraries. 17- against static openssl libraries.
18- Configure with --disable-shared 18- Configure with --disable-shared
19- to get this working or obtain a 19- to get this working or obtain a
20- shared libssl library for 20- shared libssl library for
@@ -43,13 +43,22 @@ $NetBSD: patch-configure.ac,v 1.1 2019/1 @@ -43,13 +43,22 @@ $NetBSD: patch-configure.ac,v 1.1 2019/1
43+ Configure with --disable-shared 43+ Configure with --disable-shared
44+ to get this working or obtain a 44+ to get this working or obtain a
45+ shared libssl library for 45+ shared libssl library for
46+ opendkim to use.]) 46+ opendkim to use.])
47+ fi 47+ fi
48+ 48+
49+ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl" 49+ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
50+ AC_SEARCH_LIBS([SSL_library_init], [ssl], , 50+ AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
51+ AC_MSG_ERROR([libssl not found]), [-ldl]) 51+ AC_MSG_ERROR([libssl not found]), [-ldl])
52+ fi 52+ fi
53  53
54 AC_CHECK_DECL([SHA256_DIGEST_LENGTH], 54 AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
55 AC_DEFINE([HAVE_SHA256], 1, 55 AC_DEFINE([HAVE_SHA256], 1,
 56@@ -2184,7 +2186,7 @@
 57 AC_MSG_ERROR([reputation requires libjansson])
 58 fi
 59
 60-if test x"$jansson_found" == x"yes"
 61+if test x"$jansson_found" = x"yes"
 62 then
 63 AC_DEFINE(USE_JANSSON, 1, [use libjansson to parse REPUTE replies])
 64 fi