diff options
| author | jmmv <jmmv@pkgsrc.org> | 2004-11-06 17:40:15 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2004-11-06 17:40:15 +0000 |
| commit | 16239b238138dd7fee63f0c10ed790d616353f28 (patch) | |
| tree | c5715ca9a5c9d2c14130ccf3845306d27f7cb5e1 /security/gpgme/patches | |
| parent | 6078dbf40b6721a922512e570f60a956eb7af2e1 (diff) | |
| download | pkgsrc-16239b238138dd7fee63f0c10ed790d616353f28.tar.gz | |
Let this build if gnupg 1.2.x is not installed (i.e., gnupg-devel exists).
A test program was trying to run 'gpg', bypassing the binary name given
through the --with-gpg flag to configure.
XXX This still has a chance to break. If gnupg-devel is built w/o the
gpgsm option and gpgme is being built w/ it, no gpg binary will be found.
This is one of the those damages produced by build options...
Diffstat (limited to 'security/gpgme/patches')
| -rw-r--r-- | security/gpgme/patches/patch-ab | 17 | ||||
| -rw-r--r-- | security/gpgme/patches/patch-ai | 13 |
2 files changed, 26 insertions, 4 deletions
diff --git a/security/gpgme/patches/patch-ab b/security/gpgme/patches/patch-ab index 01b596f87f8..ae08b83e284 100644 --- a/security/gpgme/patches/patch-ab +++ b/security/gpgme/patches/patch-ab @@ -1,8 +1,17 @@ -$NetBSD: patch-ab,v 1.2 2004/11/03 15:48:31 jmmv Exp $ +$NetBSD: patch-ab,v 1.3 2004/11/06 17:40:15 jmmv Exp $ ---- tests/gpg/mkdemodirs.orig Wed Oct 17 06:08:55 2001 -+++ tests/gpg/mkdemodirs Wed Jan 30 14:17:56 2002 -@@ -25,7 +25,9 @@ +--- tests/gpg/mkdemodirs.orig 2001-11-22 04:01:26.000000000 +0100 ++++ tests/gpg/mkdemodirs +@@ -2,7 +2,7 @@ + + set -e + +-GPG="gpg --batch --quiet --no-secmem-warning" ++GPG="${GPG:-gpg} --batch --quiet --no-secmem-warning" + NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India + Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo + Sierra Tango Uniform Victor Whisky XRay Yankee Zulu' +@@ -25,7 +25,9 @@ GPGDEMO="$GPG --homedir . --trustdb-name echo -n "Creating:" for name in $NAMES; do echo -n " $name" diff --git a/security/gpgme/patches/patch-ai b/security/gpgme/patches/patch-ai new file mode 100644 index 00000000000..39a17c2cbc8 --- /dev/null +++ b/security/gpgme/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2004/11/06 17:40:15 jmmv Exp $ + +--- tests/gpg/Makefile.in.orig 2004-10-22 20:52:26.000000000 +0200 ++++ tests/gpg/Makefile.in +@@ -732,7 +732,7 @@ all-local: ./pubring.gpg + $(GPG) --homedir . --allow-secret-key-import --import Alpha/Secret.gpg Zulu/Secret.gpg + + ./Alpha/Secret.gpg: secdemo.asc +- srcdir=$(srcdir) $(srcdir)/mkdemodirs ++ srcdir=$(srcdir) GPG=$(GPG) $(srcdir)/mkdemodirs + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: |