Use just committed upstream change addressing c99 inline semantics.

4 files changed, 31 insertions, 67 deletions

diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index 20c9b820591..09fb733fc82 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2012/10/27 17:39:12 wiz Exp $
+$NetBSD: distinfo,v 1.54 2012/11/07 12:23:23 wiz Exp $
 
 SHA1 (gnupg-1.4.12.tar.bz2) = 9b78e20328d35525af7b8a9c1cf081396910e937
 RMD160 (gnupg-1.4.12.tar.bz2) = d5f4367c9a636d778b6ccb2711bfba6597c27fa0
@@ -8,6 +8,5 @@ RMD160 (idea.c.gz) = e35be5a031d10d52341ac5f029d28f811edd908d
 Size (idea.c.gz) = 5216 bytes
 SHA1 (patch-aa) = ad76abec765e95209f884da7701ea4566ddf35f3
 SHA1 (patch-ab) = 24e200a04f8f31e53e22dc80ed079570cb5de8d8
-SHA1 (patch-ac) = 70b270723be8d54eaa158ec1da896e9792ff9e54
-SHA1 (patch-ad) = 622dce042bbe6a8bd5975b86614b3b894ba8107f
 SHA1 (patch-ak) = cf3afbd3de520c7cc15f8f026e90df6ea8c56367
+SHA1 (patch-mpi_mpi-inline.h) = 36887f60ef01958c9d988e6a7dbf8af7215f224e
diff --git a/security/gnupg/patches/patch-ac b/security/gnupg/patches/patch-ac
deleted file mode 100644
index 7cbd817477a..00000000000
--- a/security/gnupg/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.20 2012/10/27 17:39:12 wiz Exp $
-
-Deal with c99 inline semantics.
-
---- mpi/mpi-inline.h.orig	2008-12-11 16:39:43.000000000 +0000
-+++ mpi/mpi-inline.h
-@@ -28,10 +28,6 @@
- #ifndef G10_MPI_INLINE_H
- #define G10_MPI_INLINE_H
- 
--#ifndef G10_MPI_INLINE_DECL
--#define G10_MPI_INLINE_DECL  extern __inline__
--#endif
--
- G10_MPI_INLINE_DECL  mpi_limb_t
- mpihelp_add_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
- 	       mpi_size_t s1_size, mpi_limb_t s2_limb)
diff --git a/security/gnupg/patches/patch-ad b/security/gnupg/patches/patch-ad
deleted file mode 100644
index 1d5409604a3..00000000000
--- a/security/gnupg/patches/patch-ad
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2012/10/27 17:39:12 wiz Exp $
-
-Deal with c99 inline semantics.
-
---- mpi/mpi-internal.h.orig	2008-12-11 16:39:43.000000000 +0000
-+++ mpi/mpi-internal.h
-@@ -29,6 +29,14 @@
- #ifndef G10_MPI_INTERNAL_H
- #define G10_MPI_INTERNAL_H
- 
-+#ifndef G10_MPI_INLINE_DECL
-+#if defined(__GNUC_STDC_INLINE__) && __GNUC_STDC_INLINE__
-+#define G10_MPI_INLINE_DECL  __inline__
-+#else
-+#define G10_MPI_INLINE_DECL  extern __inline__
-+#endif
-+#endif
-+
- #include "mpi.h"
- #include "mpi-asm-defs.h"
- 
-@@ -198,19 +206,19 @@ void mpi_lshift_limbs( MPI a, unsigned i
- 
- 
- /*-- mpihelp-add.c --*/
--mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
-+G10_MPI_INLINE_DECL mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
- 			 mpi_size_t s1_size, mpi_limb_t s2_limb );
--mpi_limb_t mpihelp_add_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-+G10_MPI_INLINE_DECL mpi_limb_t mpihelp_add_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
- 			  mpi_ptr_t s2_ptr,  mpi_size_t size);
--mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
-+G10_MPI_INLINE_DECL mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
- 		       mpi_ptr_t s2_ptr, mpi_size_t s2_size);
- 
- /*-- mpihelp-sub.c --*/
--mpi_limb_t mpihelp_sub_1( mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
-+G10_MPI_INLINE_DECL mpi_limb_t mpihelp_sub_1( mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
- 			  mpi_size_t s1_size, mpi_limb_t s2_limb );
--mpi_limb_t mpihelp_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-+G10_MPI_INLINE_DECL mpi_limb_t mpihelp_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
- 			  mpi_ptr_t s2_ptr, mpi_size_t size);
--mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
-+G10_MPI_INLINE_DECL mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
- 		       mpi_ptr_t s2_ptr, mpi_size_t s2_size);
- 
- /*-- mpihelp-cmp.c --*/
diff --git a/security/gnupg/patches/patch-mpi_mpi-inline.h b/security/gnupg/patches/patch-mpi_mpi-inline.h
new file mode 100644
index 00000000000..a656fa30924
--- /dev/null
+++ b/security/gnupg/patches/patch-mpi_mpi-inline.h
@@ -0,0 +1,29 @@
+$NetBSD: patch-mpi_mpi-inline.h,v 1.1 2012/11/07 12:23:24 wiz Exp $
+
+From 5093bed27580e608de073bcc5953bd76b6b8b2de Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Tue, 6 Nov 2012 17:14:04 +0100
+Subject: [PATCH] Fix extern inline use for gcc > 4.3 in c99 mode
+
+* mpi/mpi-inline.h [!G10_MPI_INLINE_DECL]: Take care of changed extern
+inline semantics in gcc.
+
+--- mpi/mpi-inline.h.orig	2012-01-20 10:51:16.000000000 +0000
++++ mpi/mpi-inline.h
+@@ -28,8 +28,15 @@
+ #ifndef G10_MPI_INLINE_H
+ #define G10_MPI_INLINE_H
+
++/* Starting with gcc 4.3 "extern inline" conforms in c99 mode to the
++   c99 semantics.  To keep the useful old semantics we use an
++   attribute.  */
+ #ifndef G10_MPI_INLINE_DECL
+-#define G10_MPI_INLINE_DECL  extern __inline__
++# ifdef __GNUC_STDC_INLINE__
++#  define G10_MPI_INLINE_DECL  extern inline __attribute__ ((__gnu_inline__))
++# else
++#  define G10_MPI_INLINE_DECL  extern __inline__
++# endif
+ #endif
+
+ G10_MPI_INLINE_DECL  mpi_limb_t