From aa30e0f0bd7e4762f243326fe96c16ed4e87f57f Mon Sep 17 00:00:00 2001 From: shannonjr Date: Thu, 4 Nov 2004 20:41:21 +0000 Subject: 1) Revised gpg_strerror_r to match comments in using strerror_r 2) Revised configure to perform header check for rfuncs.h 3) Revised files referencing getenv_r, strerror_r and ttyname_r to include if HAVE_RFUNCS_H --- security/gpgme/distinfo | 10 ++++++---- security/gpgme/patches/patch-ac | 11 ++++++++++- security/gpgme/patches/patch-ae | 16 +++++++++++++--- security/gpgme/patches/patch-af | 18 ++++++++++++++---- security/gpgme/patches/patch-ag | 14 ++++++++++++++ security/gpgme/patches/patch-ah | 24 ++++++++++++++++++++++++ 6 files changed, 81 insertions(+), 12 deletions(-) create mode 100644 security/gpgme/patches/patch-ag create mode 100644 security/gpgme/patches/patch-ah (limited to 'security') diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo index 791c10756e9..2775a66b5da 100644 --- a/security/gpgme/distinfo +++ b/security/gpgme/distinfo @@ -1,9 +1,11 @@ -$NetBSD: distinfo,v 1.12 2004/11/03 15:48:31 jmmv Exp $ +$NetBSD: distinfo,v 1.13 2004/11/04 20:41:21 shannonjr Exp $ SHA1 (gpgme-1.0.1.tar.gz) = d35fa8fc20783ea853d9e4d01fed7e1a9d3160f6 Size (gpgme-1.0.1.tar.gz) = 815046 bytes SHA1 (patch-aa) = 27f98c23d89a0a030398e1e5cfefff84b23d2658 SHA1 (patch-ab) = 5f91749ba67cf68eb21d7544a03c6047b8219891 -SHA1 (patch-ac) = 0405907ddcece65ed4016ed12208f610f4dca32f -SHA1 (patch-ae) = a18cea1e79954b860141d07e347f65538bd8d50c -SHA1 (patch-af) = 86bed86f73d3da500c4c0dc03cf47fbea28c6962 +SHA1 (patch-ac) = c702392423c1ed48cca43f8e35a2c510a8d68460 +SHA1 (patch-ae) = 88d215ad657730349ffa19462799b64238a30426 +SHA1 (patch-af) = f8d035b0e2d9a245377aec33a8576e5a432d76b7 +SHA1 (patch-ag) = b499aba9894e24470b7ebb60643a3db5d36b7fd5 +SHA1 (patch-ah) = 852e362f143c754149e0600a7b7f3a47a569f41e diff --git a/security/gpgme/patches/patch-ac b/security/gpgme/patches/patch-ac index 418df6b3c2d..5d6116fa8b6 100644 --- a/security/gpgme/patches/patch-ac +++ b/security/gpgme/patches/patch-ac @@ -1,7 +1,16 @@ -$NetBSD: patch-ac,v 1.2 2004/10/23 15:00:48 shannonjr Exp $ +$NetBSD: patch-ac,v 1.3 2004/11/04 20:41:21 shannonjr Exp $ --- configure.orig 2004-10-22 12:52:27.000000000 -0600 +++ configure +@@ -19827,7 +19827,7 @@ fi + + # Checks for header files. + +-for ac_header in sys/select.h ++for ac_header in rfuncs.h sys/select.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -21876,7 +21876,7 @@ esac fi GPGSM=$ac_cv_path_GPGSM diff --git a/security/gpgme/patches/patch-ae b/security/gpgme/patches/patch-ae index af6d53a7fd4..89157c5aef0 100644 --- a/security/gpgme/patches/patch-ae +++ b/security/gpgme/patches/patch-ae @@ -1,8 +1,18 @@ -$NetBSD: patch-ae,v 1.1 2004/10/23 15:00:48 shannonjr Exp $ +$NetBSD: patch-ae,v 1.2 2004/11/04 20:41:21 shannonjr Exp $ ---- gpgme/engine-gpgsm.c.orig 2004-04-19 08:12:02.000000000 -0600 +--- gpgme/engine-gpgsm.c.orig 2004-10-22 12:29:21.000000000 -0600 +++ gpgme/engine-gpgsm.c -@@ -448,7 +448,8 @@ gpgsm_new (void **engine, const char *lc +@@ -27,6 +27,9 @@ + #include + #include + #include ++#if HAVE_RFUNCS_H ++#include ++#endif + #include + #include /* FIXME */ + #include +@@ -452,7 +455,8 @@ gpgsm_new (void **engine, const char *lc if (isatty (1)) { diff --git a/security/gpgme/patches/patch-af b/security/gpgme/patches/patch-af index b12651e4020..d85f49299c7 100644 --- a/security/gpgme/patches/patch-af +++ b/security/gpgme/patches/patch-af @@ -1,8 +1,18 @@ -$NetBSD: patch-af,v 1.1 2004/10/23 15:00:48 shannonjr Exp $ +$NetBSD: patch-af,v 1.2 2004/11/04 20:41:21 shannonjr Exp $ ---- ./gpgme/get-env.c.orig 2003-09-13 11:45:04.000000000 -0600 -+++ ./gpgme/get-env.c -@@ -52,7 +52,26 @@ _gpgme_getenv (const char *name, char ** +--- gpgme/get-env.c.orig 2003-09-13 11:45:04.000000000 -0600 ++++ gpgme/get-env.c +@@ -21,6 +21,9 @@ + #include + #endif + #include ++#if HAVE_RFUNCS_H ++#include ++#endif + #include + #include + +@@ -52,7 +55,26 @@ _gpgme_getenv (const char *name, char ** #else diff --git a/security/gpgme/patches/patch-ag b/security/gpgme/patches/patch-ag new file mode 100644 index 00000000000..1dad237d997 --- /dev/null +++ b/security/gpgme/patches/patch-ag @@ -0,0 +1,14 @@ +$NetBSD: patch-ag,v 1.1 2004/11/04 20:41:21 shannonjr Exp $ + +--- config.h.in.orig 2004-11-04 11:57:44.000000000 -0700 ++++ config.h.in +@@ -52,6 +52,9 @@ + /* Define to 1 if you have the `putc_unlocked' function. */ + #undef HAVE_PUTC_UNLOCKED + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_RFUNCS_H ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_STDINT_H + diff --git a/security/gpgme/patches/patch-ah b/security/gpgme/patches/patch-ah new file mode 100644 index 00000000000..0d11188d86d --- /dev/null +++ b/security/gpgme/patches/patch-ah @@ -0,0 +1,24 @@ +$NetBSD: patch-ah,v 1.1 2004/11/04 20:41:21 shannonjr Exp $ + +--- gpgme/error.c.orig 2003-09-30 13:36:20.000000000 -0600 ++++ gpgme/error.c +@@ -21,6 +21,10 @@ + #include + #endif + ++#if HAVE_RFUNCS_H ++#include ++#endif ++ + #include + + /* Return a pointer to a string containing a description of the error +@@ -42,7 +46,7 @@ gpgme_strerror (gpgme_error_t err) + int + gpgme_strerror_r (gpg_error_t err, char *buf, size_t buflen) + { +- return gpg_strerror_r (err, buf, buflen); ++ return strerror_r (err, buf, buflen); + } + + -- cgit v1.2.3