CVS commit: pkgsrc/security/libgcrypt

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Fri May 11 19:20:11 UTC 2018

Modified Files:
        pkgsrc/security/libgcrypt: distinfo
Added Files:
        pkgsrc/security/libgcrypt/patches: patch-random_jitterentropy-base.c

Log Message:
libgcrypt: Fix build with Clang

Port code that disables optimization on GCC to Clang/LLVM.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/security/libgcrypt/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/libgcrypt/patches/patch-random_jitterentropy-base.c

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

Modified files:

Index: pkgsrc/security/libgcrypt/distinfo
diff -u pkgsrc/security/libgcrypt/distinfo:1.76 pkgsrc/security/libgcrypt/distinfo:1.77
--- pkgsrc/security/libgcrypt/distinfo:1.76     Thu Dec 14 08:49:54 2017
+++ pkgsrc/security/libgcrypt/distinfo  Fri May 11 19:20:11 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.76 2017/12/14 08:49:54 adam Exp $
+$NetBSD: distinfo,v 1.77 2018/05/11 19:20:11 kamil Exp $
 
 SHA1 (libgcrypt-1.8.2.tar.bz2) = ab8aae5d7a68f8e0988f90e11e7f6a4805af5c8d
 RMD160 (libgcrypt-1.8.2.tar.bz2) = e0bed861b328fe411faa74daca0db388fb5aed88
@@ -6,4 +6,5 @@ SHA512 (libgcrypt-1.8.2.tar.bz2) = 1e8c4
 Size (libgcrypt-1.8.2.tar.bz2) = 2966534 bytes
 SHA1 (patch-aa) = 60b3f4453b217ed8879a2ffd8d485c0195ffb5f8
 SHA1 (patch-cipher_rijndael-arm.S) = ef3cb7f481022440780eb48ae31cbfad0a3ec115
+SHA1 (patch-random_jitterentropy-base.c) = 5a14676aae7ad5d12f9f0bed366af5183aaf22ad
 SHA1 (patch-src_visibility.h) = 8cbbf6803ab34b4b7dda832aa8ee18247aa89518

Added files:

Index: pkgsrc/security/libgcrypt/patches/patch-random_jitterentropy-base.c
diff -u /dev/null pkgsrc/security/libgcrypt/patches/patch-random_jitterentropy-base.c:1.1
--- /dev/null   Fri May 11 19:20:12 2018
+++ pkgsrc/security/libgcrypt/patches/patch-random_jitterentropy-base.c Fri May 11 19:20:11 2018
@@ -0,0 +1,26 @@
+$NetBSD: patch-random_jitterentropy-base.c,v 1.1 2018/05/11 19:20:11 kamil Exp $
+
+Port to Clang.
+
+--- random/jitterentropy-base.c.orig   2017-11-23 18:16:58.000000000 +0000
++++ random/jitterentropy-base.c
+@@ -50,13 +50,18 @@
+  */
+ 
+ #undef _FORTIFY_SOURCE
++
++#ifdef __clang__
++#pragma clang optimize off
++#else
+ #pragma GCC optimize ("O0")
++#endif
+ 
+ #include "jitterentropy.h"
+ 
+ #ifndef CONFIG_CRYPTO_CPU_JITTERENTROPY_STAT
+  /* only check optimization in a compilation for real work */
+- #ifdef __OPTIMIZE__
++ #if defined(__OPTIMIZE__) && !defined(__clang__)
+   #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy-base.c."
+  #endif
+ #endif