diff options
| author | Ladislav Hagara | 2010-07-26 14:12:58 +0200 |
|---|---|---|
| committer | George Sherwood | 2010-07-31 09:32:35 -0500 |
| commit | cd96a844a66047d2554a7ef6cf3b2d7ef54c62b7 (patch) | |
| tree | 25548d1e8a2f85d55b768a7a27bd3ca4f2b99d21 | |
| parent | 11baabe2a909bfa9eea0df30c375591f026713aa (diff) | |
gnupg-exp SECURITY_PATCH=6
http://lists.gnupg.org/pipermail/gnupg-announce/2010q3/000302.html
(cherry picked from commit 4c5c558ed8cd2100a1f3d7a8cfe4485b286efa9d)
| -rwxr-xr-x | crypto/gnupg-exp/DETAILS | 2 | ||||
| -rw-r--r-- | crypto/gnupg-exp/HISTORY | 5 | ||||
| -rwxr-xr-x | crypto/gnupg-exp/PRE_BUILD | 3 | ||||
| -rw-r--r-- | crypto/gnupg-exp/security-alert.patch | 10 |
4 files changed, 19 insertions, 1 deletions
diff --git a/crypto/gnupg-exp/DETAILS b/crypto/gnupg-exp/DETAILS index 2c22dba0de..48b333ee4e 100755 --- a/crypto/gnupg-exp/DETAILS +++ b/crypto/gnupg-exp/DETAILS @@ -1,6 +1,6 @@ SPELL=gnupg-exp VERSION=2.0.16 - SECURITY_PATCH=5 + SECURITY_PATCH=6 PATCHLEVEL=0 SOURCE=gnupg-$VERSION.tar.bz2 diff --git a/crypto/gnupg-exp/HISTORY b/crypto/gnupg-exp/HISTORY index 84cda8f0df..eed6291373 100644 --- a/crypto/gnupg-exp/HISTORY +++ b/crypto/gnupg-exp/HISTORY @@ -1,3 +1,8 @@ +2010-07-26 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: SECURITY_PATCH=6 + * PRE_BUILD, security-alert.patch: added security patch + http://lists.gnupg.org/pipermail/gnupg-announce/2010q3/000302.html + 2010-07-19 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.0.16 diff --git a/crypto/gnupg-exp/PRE_BUILD b/crypto/gnupg-exp/PRE_BUILD index 7b3c09ca75..b12cbd8d41 100755 --- a/crypto/gnupg-exp/PRE_BUILD +++ b/crypto/gnupg-exp/PRE_BUILD @@ -2,3 +2,6 @@ default_pre_build && #14415 sedit 's:FAQ faq.html::' $SOURCE_DIRECTORY/doc/Makefile.in + +cd $SOURCE_DIRECTORY && +patch -p0 < $SPELL_DIRECTORY/security-alert.patch diff --git a/crypto/gnupg-exp/security-alert.patch b/crypto/gnupg-exp/security-alert.patch new file mode 100644 index 0000000000..e8a95cc3bb --- /dev/null +++ b/crypto/gnupg-exp/security-alert.patch @@ -0,0 +1,10 @@ +--- kbx/keybox-blob.c (revision 5367) ++++ kbx/keybox-blob.c (working copy) +@@ -898,6 +898,7 @@ + rc = gpg_error_from_syserror (); + goto leave; + } ++ names = tmp; + } + names[blob->nuids++] = p; + if (!i && (p=x509_email_kludge (p))) |