diff options
| author | joerg <joerg@pkgsrc.org> | 2011-08-02 17:11:00 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2011-08-02 17:11:00 +0000 |
| commit | bfe05c9ac28a4da4ff1d96930c6d37d0b90e0079 (patch) | |
| tree | a7cba440cc3f25fb1ced0bf84f79ebc2a1724085 /security/gnupg | |
| parent | 5834101508ecbd6be0b3847de7d1410752040a19 (diff) | |
| download | pkgsrc-bfe05c9ac28a4da4ff1d96930c6d37d0b90e0079.tar.gz | |
Deal with c99 inline semantics.
Diffstat (limited to 'security/gnupg')
| -rw-r--r-- | security/gnupg/distinfo | 4 | ||||
| -rw-r--r-- | security/gnupg/patches/patch-ac | 15 | ||||
| -rw-r--r-- | security/gnupg/patches/patch-ad | 45 |
3 files changed, 63 insertions, 1 deletions
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo index 0f61ac01e09..b2901eed91c 100644 --- a/security/gnupg/distinfo +++ b/security/gnupg/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.50 2010/10/21 21:48:12 wiz Exp $ +$NetBSD: distinfo,v 1.51 2011/08/02 17:11:00 joerg Exp $ SHA1 (gnupg-1.4.11.tar.bz2) = 78e22f5cca88514ee71034aafff539c33f3c6676 RMD160 (gnupg-1.4.11.tar.bz2) = 9daf2dedfd4c6211fc13b8cdee8f08b8f5925378 @@ -8,4 +8,6 @@ RMD160 (idea.c.gz) = e35be5a031d10d52341ac5f029d28f811edd908d Size (idea.c.gz) = 5216 bytes SHA1 (patch-aa) = ad76abec765e95209f884da7701ea4566ddf35f3 SHA1 (patch-ab) = 24e200a04f8f31e53e22dc80ed079570cb5de8d8 +SHA1 (patch-ac) = 3d53b0ed816b83156ce5f169bd571e46bde78032 +SHA1 (patch-ad) = 99f7af1fb6e6d9d2e25edbe0fb6bc027fbacddcb SHA1 (patch-ak) = 89a6a7552104f4d5b97a98889da88fca68c54f31 diff --git a/security/gnupg/patches/patch-ac b/security/gnupg/patches/patch-ac new file mode 100644 index 00000000000..0ae7f6ec6dc --- /dev/null +++ b/security/gnupg/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.19 2011/08/02 17:11:00 joerg Exp $ + +--- 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 new file mode 100644 index 00000000000..6ffdad0a668 --- /dev/null +++ b/security/gnupg/patches/patch-ad @@ -0,0 +1,45 @@ +$NetBSD: patch-ad,v 1.7 2011/08/02 17:11:00 joerg Exp $ + +--- 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 --*/ |