diff options
| author | tron <tron> | 2011-08-25 20:17:25 +0000 |
|---|---|---|
| committer | tron <tron> | 2011-08-25 20:17:25 +0000 |
| commit | 4264c9aae667bd0985de3602612ca1eb977f853d (patch) | |
| tree | a08019f0d1f7fa9d93260e7de8c4827e5ab545fa /security | |
| parent | a2cfed47f7fd70f441b48f598b57320113cb1f61 (diff) | |
| download | pkgsrc-4264c9aae667bd0985de3602612ca1eb977f853d.tar.gz | |
Fix linking error under Mac OS X caused by duplicate definition of
a bunch of global variables.
Diffstat (limited to 'security')
| -rw-r--r-- | security/nettle/distinfo | 3 | ||||
| -rw-r--r-- | security/nettle/patches/patch-nettle-internal.h | 39 |
2 files changed, 41 insertions, 1 deletions
diff --git a/security/nettle/distinfo b/security/nettle/distinfo index d344b7087a1..6d5cd3ae051 100644 --- a/security/nettle/distinfo +++ b/security/nettle/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.4 2011/08/22 15:09:21 wiz Exp $ +$NetBSD: distinfo,v 1.5 2011/08/25 20:17:25 tron Exp $ SHA1 (nettle-2.2.tar.gz) = 5e2a914a8104308bd7a63338a8a732b4d3ef0ae4 RMD160 (nettle-2.2.tar.gz) = fd9616054759ac229c23ad6c64745d66c5ea8d1a Size (nettle-2.2.tar.gz) = 1060360 bytes SHA1 (patch-Makefile.in) = cf1f0fb4e23657f493f381c80b31e7c6294b67e7 SHA1 (patch-config.make.in) = 0bf3d2729b97883b41374a1ea3d5286fd2554e98 +SHA1 (patch-nettle-internal.h) = 519c7e305619db924e3cf0ae54bbd083bc8859f6 SHA1 (patch-testsuite_Makefile.in) = f73c6af3fc2ae63174406df4ff89892f7b5634d7 SHA1 (patch-tools_Makefile.in) = 5eca9e6d806cea894493122f7e1c79d6a26f2c88 SHA1 (patch-x86_camellia-crypt-internal.asm) = 0dd04f76ccca63f0c3e7260269fa8f74d01ddda3 diff --git a/security/nettle/patches/patch-nettle-internal.h b/security/nettle/patches/patch-nettle-internal.h new file mode 100644 index 00000000000..8e2dfc13401 --- /dev/null +++ b/security/nettle/patches/patch-nettle-internal.h @@ -0,0 +1,39 @@ +$NetBSD: patch-nettle-internal.h,v 1.1 2011/08/25 20:17:26 tron Exp $ + +Fix linking problem under Mac OS X. + +--- nettle-internal.h.orig 2011-07-11 14:59:25.000000000 +0100 ++++ nettle-internal.h 2011-08-25 21:14:05.000000000 +0100 +@@ -108,20 +108,20 @@ + (nettle_hash_digest_func *) type##_##name##_digest, \ + } + +-const struct nettle_aead nettle_gcm_aes128; +-const struct nettle_aead nettle_gcm_aes192; +-const struct nettle_aead nettle_gcm_aes256; ++extern const struct nettle_aead nettle_gcm_aes128; ++extern const struct nettle_aead nettle_gcm_aes192; ++extern const struct nettle_aead nettle_gcm_aes256; + +-const struct nettle_aead nettle_gcm_camellia128; +-const struct nettle_aead nettle_gcm_camellia192; +-const struct nettle_aead nettle_gcm_camellia256; ++extern const struct nettle_aead nettle_gcm_camellia128; ++extern const struct nettle_aead nettle_gcm_camellia192; ++extern const struct nettle_aead nettle_gcm_camellia256; + +-const struct nettle_aead nettle_gcm_serpent128; +-const struct nettle_aead nettle_gcm_serpent192; +-const struct nettle_aead nettle_gcm_serpent256; ++extern const struct nettle_aead nettle_gcm_serpent128; ++extern const struct nettle_aead nettle_gcm_serpent192; ++extern const struct nettle_aead nettle_gcm_serpent256; + +-const struct nettle_aead nettle_gcm_twofish128; +-const struct nettle_aead nettle_gcm_twofish192; +-const struct nettle_aead nettle_gcm_twofish256; ++extern const struct nettle_aead nettle_gcm_twofish128; ++extern const struct nettle_aead nettle_gcm_twofish192; ++extern const struct nettle_aead nettle_gcm_twofish256; + + #endif /* NETTLE_INTERNAL_H_INCLUDED */ |