aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorTravis Johnson2013-06-03 18:51:54 -0500
committerJack Nagel2013-06-06 15:45:42 -0500
commit3de616f673602f9998e067eb9db6034847d96e7e (patch)
tree2bfd9d180cd27c8f18e1ed17545a80e5450c3455 /Library/Formula
parent6102e21c0f9a0ddc3a01cd6009c70ef593478520 (diff)
downloadhomebrew-3de616f673602f9998e067eb9db6034847d96e7e.tar.bz2
gnupg2 2.0.20
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/gnupg2.rb27
1 files changed, 21 insertions, 6 deletions
diff --git a/Library/Formula/gnupg2.rb b/Library/Formula/gnupg2.rb
index 2eb54b9f4..f5cee5f57 100644
--- a/Library/Formula/gnupg2.rb
+++ b/Library/Formula/gnupg2.rb
@@ -2,8 +2,8 @@ require 'formula'
class Gnupg2 < Formula
homepage 'http://www.gnupg.org/'
- url 'ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.0.19.tar.bz2'
- sha1 '190c09e6688f688fb0a5cf884d01e240d957ac1f'
+ url 'ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.0.20.tar.bz2'
+ sha1 '7ddfefa37ee9da89a8aaa8f9059d251b4cd02562'
depends_on 'libgpg-error'
depends_on 'libgcrypt'
@@ -19,6 +19,8 @@ class Gnupg2 < Formula
# upstream: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;h=c3f08dc
# Adjust package name to fit our scheme of packaging both gnupg 1.x and
# 2.x, and gpg-agent separately, and adjust tests to fit this scheme
+ # Fix typo that breaks compilation:
+ # http://lists.gnupg.org/pipermail/gnupg-users/2013-May/046652.html
def patches; DATA; end
def install
@@ -58,10 +60,10 @@ index 5f2e31e..d797b68 100644
diff --git a/configure b/configure
-index 829fc79..684213e 100755
+index 616d165..ae3126e 100755
--- a/configure
+++ b/configure
-@@ -558,8 +558,8 @@ MFLAGS=
+@@ -578,8 +578,8 @@ MFLAGS=
MAKEFLAGS=
# Identity of this package.
@@ -69,8 +71,8 @@ index 829fc79..684213e 100755
-PACKAGE_TARNAME='gnupg'
+PACKAGE_NAME='gnupg2'
+PACKAGE_TARNAME='gnupg2'
- PACKAGE_VERSION='2.0.19'
- PACKAGE_STRING='gnupg 2.0.19'
+ PACKAGE_VERSION='2.0.20'
+ PACKAGE_STRING='gnupg 2.0.20'
PACKAGE_BUGREPORT='http://bugs.gnupg.org'
diff --git a/tests/openpgp/Makefile.in b/tests/openpgp/Makefile.in
@@ -91,3 +93,16 @@ index 1a617e7..1af2d4b 100644
TESTS = version.test mds.test \
decrypt.test decrypt-dsa.test \
+ diff --git a/scd/pcsc-wrapper.c b/scd/pcsc-wrapper.c
+ index 7d9415a..f3d92ff 100644
+--- a/scd/pcsc-wrapper.c
++++ b/scd/pcsc-wrapper.c
+@@ -66,7 +66,7 @@
+ static int verbose;
+
+ #if defined(__APPLE__) || defined(_WIN32) || defined(__CYGWIN__)
+-typedef unsinged int pcsc_dword_t;
++typedef unsigned int pcsc_dword_t;
+ #else
+ typedef unsigned long pcsc_dword_t;
+ #endif