diff options
| author | joerg <joerg@pkgsrc.org> | 2018-01-07 21:01:09 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2018-01-07 21:01:09 +0000 |
| commit | cf52f7c07f2630eecc0f11dc262d0a4c3db04aeb (patch) | |
| tree | c8b0b21d21317688aa1fee83311199c4b5d4612f /net/ocamlnet | |
| parent | 72096d0337608c656fc21bbcb0c0b4f1d8f4442f (diff) | |
| download | pkgsrc-cf52f7c07f2630eecc0f11dc262d0a4c3db04aeb.tar.gz | |
Fix build against newer nettle.
Diffstat (limited to 'net/ocamlnet')
| -rw-r--r-- | net/ocamlnet/distinfo | 3 | ||||
| -rw-r--r-- | net/ocamlnet/patches/patch-src_nettls-nettle.c | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/net/ocamlnet/distinfo b/net/ocamlnet/distinfo index df68313b53c..adaa6b14ffe 100644 --- a/net/ocamlnet/distinfo +++ b/net/ocamlnet/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2017/09/04 18:17:47 jaapb Exp $ +$NetBSD: distinfo,v 1.25 2018/01/07 21:01:09 joerg Exp $ SHA1 (ocamlnet-4.1.4.tar.gz) = f7bb6e98f2c35850fb8dce428c061ce316d55ce2 RMD160 (ocamlnet-4.1.4.tar.gz) = a71a5c894db5c540e5b47df750ea4a1468ea7bf8 @@ -7,3 +7,4 @@ Size (ocamlnet-4.1.4.tar.gz) = 4552969 bytes SHA1 (patch-Makefile.rules) = 124b787309e39334036681035e0687120da672c8 SHA1 (patch-src_netsys_Makefile) = 9edbac14c5f5840933f3e93b27bb95750e946089 SHA1 (patch-src_netsys_netsys__c.c) = d83d7746267523456696057bdd2ade74a9313f01 +SHA1 (patch-src_nettls-nettle.c) = 75748ff2fd30ff6f54f15b9646a22b420d108f28 diff --git a/net/ocamlnet/patches/patch-src_nettls-nettle.c b/net/ocamlnet/patches/patch-src_nettls-nettle.c new file mode 100644 index 00000000000..15c9ac742dd --- /dev/null +++ b/net/ocamlnet/patches/patch-src_nettls-nettle.c @@ -0,0 +1,24 @@ +$NetBSD: patch-src_nettls-nettle.c,v 1.1 2018/01/07 21:01:09 joerg Exp $ + +Newer nettle versions provide macros for this purpose. + +--- src/nettls-gnutls/nettle.c.orig 2017-08-14 13:16:50.-06639040 +0000 ++++ src/nettls-gnutls/nettle.c +@@ -98,7 +98,7 @@ static const char *net_nettle_cipher_nam + return cipher->name; + } + +-#ifndef HAVE_FUN_nettle_ciphers ++#if !defined(HAVE_FUN_nettle_ciphers) && !defined(nettle_ciphers) + const struct nettle_cipher * const nettle_ciphers[] = { + &nettle_aes128, + &nettle_aes192, +@@ -337,7 +337,7 @@ static void net_nettle_hash_digest(net_n + hash->digest(ctx, length, dst); + } + +-#ifndef HAVE_FUN_nettle_hashes ++#if defined(HAVE_FUN_nettle_hashes) && !defined(nettle_hashes) + const struct nettle_hash * const nettle_hashes[] = { + &nettle_md2, + &nettle_md4, |