Thu Aug 21 19:55:26 2014 UTC ()
Add comments and upstream bug report URLs to patches.


(wiz)
diff -r1.50 -r1.51 pkgsrc/security/libgcrypt/distinfo
diff -r1.4 -r1.5 pkgsrc/security/libgcrypt/patches/patch-ab
diff -r1.2 -r1.3 pkgsrc/security/libgcrypt/patches/patch-ad
diff -r1.1 -r1.2 pkgsrc/security/libgcrypt/patches/patch-src_visibility.h

cvs diff -r1.50 -r1.51 pkgsrc/security/libgcrypt/distinfo (expand / switch to unified diff)

--- pkgsrc/security/libgcrypt/distinfo 2014/08/21 19:41:38 1.50
+++ pkgsrc/security/libgcrypt/distinfo 2014/08/21 19:55:26 1.51
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.50 2014/08/21 19:41:38 wiz Exp $ 1$NetBSD: distinfo,v 1.51 2014/08/21 19:55:26 wiz Exp $
2 2
3SHA1 (libgcrypt-1.6.2.tar.bz2) = cc31aca87e4a3769cb86884a3f5982b2cc8eb7ec 3SHA1 (libgcrypt-1.6.2.tar.bz2) = cc31aca87e4a3769cb86884a3f5982b2cc8eb7ec
4RMD160 (libgcrypt-1.6.2.tar.bz2) = 807df33a98468015293846fd589a213dad38be19 4RMD160 (libgcrypt-1.6.2.tar.bz2) = 807df33a98468015293846fd589a213dad38be19
5Size (libgcrypt-1.6.2.tar.bz2) = 2476101 bytes 5Size (libgcrypt-1.6.2.tar.bz2) = 2476101 bytes
6SHA1 (patch-aa) = 3dd44b8745128a6788d24f9eb00002624a5fc52b 6SHA1 (patch-aa) = 3dd44b8745128a6788d24f9eb00002624a5fc52b
7SHA1 (patch-ab) = 6fac21daa26b7de3b13839d076f78a74400efce7 7SHA1 (patch-ab) = 1a72ac897fbccbd58f0108b36a9ab2a6ee579b59
8SHA1 (patch-ad) = 19345b7d164521d526a44eb3f1a465ff09d8266c 8SHA1 (patch-ad) = e74c9471e26029aeafca23d385ee0162ffc1864b
9SHA1 (patch-configure) = c4e10bdb7e00a44d507f5b964f3e71a63828cd0a 9SHA1 (patch-configure) = c4e10bdb7e00a44d507f5b964f3e71a63828cd0a
10SHA1 (patch-src_visibility.h) = 9b97ee91e8ea4e806ff8da3154a5982c6147d93a 10SHA1 (patch-src_visibility.h) = 8cbbf6803ab34b4b7dda832aa8ee18247aa89518

cvs diff -r1.4 -r1.5 pkgsrc/security/libgcrypt/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/security/libgcrypt/patches/Attic/patch-ab 2011/11/29 01:33:37 1.4
+++ pkgsrc/security/libgcrypt/patches/Attic/patch-ab 2014/08/21 19:55:26 1.5
@@ -1,14 +1,23 @@ @@ -1,14 +1,23 @@
1$NetBSD: patch-ab,v 1.4 2011/11/29 01:33:37 cheusov Exp $ 1$NetBSD: patch-ab,v 1.5 2014/08/21 19:55:26 wiz Exp $
 2
 3When exec'ing child processes (netstat and vmstat), make sure the standard
 4file descriptors (0, 1, 2) are open. This avoids multiple warnings issued
 5under NetBSD about running set[ug]id programs with those descriptors closed.
 6
 7Fixes PR pkg/26079; although it talks about gaim, the problem is here, in
 8libgcrypt.
 9
 10https://bugs.g10code.com/gnupg/issue1702
2 11
3--- random/rndunix.c.orig 2011-02-04 19:16:03.000000000 +0000 12--- random/rndunix.c.orig 2011-02-04 19:16:03.000000000 +0000
4+++ random/rndunix.c 13+++ random/rndunix.c
5@@ -87,6 +87,7 @@ 14@@ -87,6 +87,7 @@
6 #include <stdlib.h> 15 #include <stdlib.h>
7 #include <stdio.h> 16 #include <stdio.h>
8 #include <string.h> 17 #include <string.h>
9+#include <assert.h> 18+#include <assert.h>
10  19
11 /* OS-specific includes */ 20 /* OS-specific includes */
12  21
13@@ -737,6 +738,15 @@ start_gatherer( int pipefd ) 22@@ -737,6 +738,15 @@ start_gatherer( int pipefd )
14 if( i != n1 && i != n2 && i != pipefd ) 23 if( i != n1 && i != n2 && i != pipefd )

cvs diff -r1.2 -r1.3 pkgsrc/security/libgcrypt/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/security/libgcrypt/patches/Attic/patch-ad 2011/07/13 21:21:52 1.2
+++ pkgsrc/security/libgcrypt/patches/Attic/patch-ad 2014/08/21 19:55:26 1.3
@@ -1,13 +1,26 @@ @@ -1,13 +1,26 @@
1$NetBSD: patch-ad,v 1.2 2011/07/13 21:21:52 adam Exp $ 1$NetBSD: patch-ad,v 1.3 2014/08/21 19:55:26 wiz Exp $
 2
 3Fix for compiling on Solaris SPARC with gcc.
 4
 5If __sparcv8 is defined, use the SPARC v8 version of udiv_qrnnd. Without
 6this change, udiv_qrnnd will not be defined using the SPARC v8 udiv
 7instruction, and the default SPARC v7 case of defining it to be the native
 8__gmpn_udiv_qrnnd will be used, but this does not exist on SPARC v8, so
 9at link time, the user will get an error about _gmpn_udiv_qrnnd being
 10undefined. gcc defines __sparcv8.
 11
 12From PR pkg/26815.
 13
 14https://bugs.g10code.com/gnupg/issue1703
2 15
3--- mpi/longlong.h.orig 2004-03-03 08:21:49.000000000 +0000 16--- mpi/longlong.h.orig 2004-03-03 08:21:49.000000000 +0000
4+++ mpi/longlong.h 17+++ mpi/longlong.h
5@@ -1150,7 +1150,7 @@ extern USItype __udiv_qrnnd (); 18@@ -1150,7 +1150,7 @@ extern USItype __udiv_qrnnd ();
6 "rJ" ((USItype)(al)), \ 19 "rJ" ((USItype)(al)), \
7 "rI" ((USItype)(bl)) \ 20 "rI" ((USItype)(bl)) \
8 __CLOBBER_CC) 21 __CLOBBER_CC)
9-#if defined (__sparc_v8__) 22-#if defined (__sparc_v8__)
10+#if defined (__sparc_v8__) || defined(__sparcv8) 23+#if defined (__sparc_v8__) || defined(__sparcv8)
11 /* Don't match immediate range because, 1) it is not often useful, 24 /* Don't match immediate range because, 1) it is not often useful,
12 2) the 'I' flag thinks of the range as a 13 bit signed interval, 25 2) the 'I' flag thinks of the range as a 13 bit signed interval,
13 while we want to match a 13 bit interval, sign extended to 32 bits, 26 while we want to match a 13 bit interval, sign extended to 32 bits,

cvs diff -r1.1 -r1.2 pkgsrc/security/libgcrypt/patches/patch-src_visibility.h (expand / switch to unified diff)

--- pkgsrc/security/libgcrypt/patches/patch-src_visibility.h 2014/07/18 10:36:28 1.1
+++ pkgsrc/security/libgcrypt/patches/patch-src_visibility.h 2014/08/21 19:55:26 1.2
@@ -1,14 +1,18 @@ @@ -1,14 +1,18 @@
1$NetBSD: patch-src_visibility.h,v 1.1 2014/07/18 10:36:28 ryoon Exp $ 1$NetBSD: patch-src_visibility.h,v 1.2 2014/08/21 19:55:26 wiz Exp $
 2
 3GCC on SCO OpenServer 5.0.7/3.2 does not support visibility.
 4
 5https://bugs.g10code.com/gnupg/issue1704
2 6
3--- src/visibility.h.orig 2014-01-29 09:48:38.000000000 +0000 7--- src/visibility.h.orig 2014-01-29 09:48:38.000000000 +0000
4+++ src/visibility.h 8+++ src/visibility.h
5@@ -26,7 +26,9 @@ 9@@ -26,7 +26,9 @@
6  10
7 /* Include the main header here so that public symbols are mapped to 11 /* Include the main header here so that public symbols are mapped to
8 the internal underscored ones. */ 12 the internal underscored ones. */
9-#ifdef _GCRY_INCLUDED_BY_VISIBILITY_C 13-#ifdef _GCRY_INCLUDED_BY_VISIBILITY_C
10+/* All available GCC for SCO OpenServer 5.0.7/3.2 does not support 14+/* All available GCC for SCO OpenServer 5.0.7/3.2 does not support
11+ visibility. */ 15+ visibility. */
12+#if defined(_GCRY_INCLUDED_BY_VISIBILITY_C) || defined(_SCO_DS) 16+#if defined(_GCRY_INCLUDED_BY_VISIBILITY_C) || defined(_SCO_DS)
13 /* We need to redeclare the deprecated functions without the 17 /* We need to redeclare the deprecated functions without the
14 deprecated attribute. */ 18 deprecated attribute. */