Source Mage code commit list

[George Sherwood <scm AT sourcemage.org>]

GIT changes to stable-0.46 grimoire by George Sherwood 
<gsherwood AT sourcemage.org>:

 crypto/gnupg-exp/DETAILS              |    4 ++--
 crypto/gnupg-exp/HISTORY              |   11 +++++++++++
 crypto/gnupg-exp/PRE_BUILD            |    5 ++++-
 crypto/gnupg-exp/security-alert.patch |   10 ++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

New commits:
commit 63260cbe5b0adf3222d9c1ee7649bd64481b288c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    gnupg-exp: PRE_BUILD: added missing && #15778
    (cherry picked from commit cf21d7009510a7ca9dd2c66ef81fe5f0686f900e)

commit cd96a844a66047d2554a7ef6cf3b2d7ef54c62b7
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    gnupg-exp SECURITY_PATCH=6
    http://lists.gnupg.org/pipermail/gnupg-announce/2010q3/000302.html
    (cherry picked from commit 4c5c558ed8cd2100a1f3d7a8cfe4485b286efa9d)

commit 11baabe2a909bfa9eea0df30c375591f026713aa
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    gnupg-exp 2.0.16
    (cherry picked from commit b11b6fab11bf022f4a5ec685f138e7e7986f5fa4)

diff --git a/crypto/gnupg-exp/DETAILS b/crypto/gnupg-exp/DETAILS
index d07f141..48b333e 100755
--- a/crypto/gnupg-exp/DETAILS
+++ b/crypto/gnupg-exp/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gnupg-exp
-         VERSION=2.0.15
-  SECURITY_PATCH=5
+         VERSION=2.0.16
+  SECURITY_PATCH=6
       PATCHLEVEL=0
 
           SOURCE=gnupg-$VERSION.tar.bz2
diff --git a/crypto/gnupg-exp/HISTORY b/crypto/gnupg-exp/HISTORY
index e23a66d..f1a2761 100644
--- a/crypto/gnupg-exp/HISTORY
+++ b/crypto/gnupg-exp/HISTORY
@@ -1,3 +1,14 @@
+2010-07-27 Ladislav Hagara <hgr AT vabo.cz>
+       * PRE_BUILD: added missing && #15778
+
+2010-07-26 Ladislav Hagara <hgr AT 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 AT vabo.cz>
+       * DETAILS: 2.0.16
+
 2010-03-09 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.0.15
 
diff --git a/crypto/gnupg-exp/PRE_BUILD b/crypto/gnupg-exp/PRE_BUILD
index 7b3c09c..f07e24e 100755
--- a/crypto/gnupg-exp/PRE_BUILD
+++ b/crypto/gnupg-exp/PRE_BUILD
@@ -1,4 +1,7 @@
 default_pre_build                                 &&
 
 #14415
-sedit 's:FAQ faq.html::' $SOURCE_DIRECTORY/doc/Makefile.in
+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 0000000..e8a95cc
--- /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)))