diff options
| author |   Daniel Black <dragonheart@gentoo.org> | 2009-03-07 23:50:42 +0000 |
|---|---|---|
| committer | Daniel Black <dragonheart@gentoo.org> | 2009-03-07 23:50:42 +0000 |
| commit | 2991776401f9f7ed9b1740c8158fcb0e908fcf4b (patch) | |
| tree | d66580ea3e39adfd60d38e541c31ba98206a8b62 /app-crypt/gpgme/files | |
| parent | Migrate to EAPI 2, keyword ~amd64 (diff) | |
| download | gentoo-2-2991776401f9f7ed9b1740c8158fcb0e908fcf4b.tar.gz gentoo-2-2991776401f9f7ed9b1740c8158fcb0e908fcf4b.tar.bz2 gentoo-2-2991776401f9f7ed9b1740c8158fcb0e908fcf4b.zip | |
fix for bug #242332 gpgme-config script fails with et_EE locale. thanks step for the report and Harald van Dijk for isolating the problem. Cleanout old stuff too
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt/gpgme/files')
| -rw-r--r-- | app-crypt/gpgme/files/gpgme-1.1.7-_gpgme_cancel_with_err.patch | 22 | ||||
| -rw-r--r-- | app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch | 11 |
2 files changed, 11 insertions, 22 deletions
diff --git a/app-crypt/gpgme/files/gpgme-1.1.7-_gpgme_cancel_with_err.patch b/app-crypt/gpgme/files/gpgme-1.1.7-_gpgme_cancel_with_err.patch deleted file mode 100644 index 26f48b9e884f..000000000000 --- a/app-crypt/gpgme/files/gpgme-1.1.7-_gpgme_cancel_with_err.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gpgme-1.1.7/gpgme/gpgme.h -+++ gpgme-1.1.7-fixed/gpgme/gpgme.h -@@ -1117,6 +1117,8 @@ - - /* Crypto Operations. */ - -+gpgme_error_t _gpgme_cancel_with_err (gpgme_ctx_t ctx, gpg_error_t ctx_err); -+ - /* Cancel a pending asynchronous operation. */ - gpgme_error_t gpgme_cancel (gpgme_ctx_t ctx); - ---- gpgme-1.1.7/gpgme/wait-global.c -+++ gpgme-1.1.7-fixed/gpgme/wait-global.c -@@ -202,7 +202,7 @@ - if (err) - /* An error occured. Close all fds in this context, and - send the error in a done event. */ -- _gpgme_cancel_with_err (ctx, &err); -+ _gpgme_cancel_with_err (ctx, err); - } - break; - diff --git a/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch b/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch new file mode 100644 index 000000000000..dc921eec4056 --- /dev/null +++ b/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch @@ -0,0 +1,11 @@ +--- ./gpgme-1.1.8/src/gpgme-config.in.orig 2009-03-08 10:25:48.000000000 +1100 ++++ ./gpgme-1.1.8/src/gpgme-config.in 2009-03-08 10:35:53.000000000 +1100 +@@ -64,7 +64,7 @@ + while test $# -gt 0; do + case "$1" in + -*=*) +- optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ++ optarg=`echo "$1" | sed 's/[-_[:alnum:]]*=//'` + ;; + *) + optarg= |