[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (7d65a59368f8c5ac3b37b437e7506c4dbc08c685)

Ladislav Hagara scm at sourcemage.org
Mon Jan 12 05:52:35 EST 2009


GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara at unob.cz>:

 crypto/gnupg-exp/DETAILS     |    2 +-
 crypto/gnupg-exp/HISTORY     |    4 ++++
 crypto/gnupg-exp/PRE_BUILD   |    5 +----
 crypto/gnupg-exp/gcc43.patch |   24 ------------------------
 4 files changed, 6 insertions(+), 29 deletions(-)

New commits:
commit 7d65a59368f8c5ac3b37b437e7506c4dbc08c685
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    gnupg-exp 2.0.10

diff --git a/crypto/gnupg-exp/DETAILS b/crypto/gnupg-exp/DETAILS
index 1457c20..269806a 100755
--- a/crypto/gnupg-exp/DETAILS
+++ b/crypto/gnupg-exp/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnupg-exp
-         VERSION=2.0.9
+         VERSION=2.0.10
   SECURITY_PATCH=5
       PATCHLEVEL=0
 
diff --git a/crypto/gnupg-exp/HISTORY b/crypto/gnupg-exp/HISTORY
index 9e1f3cf..07f5caf 100644
--- a/crypto/gnupg-exp/HISTORY
+++ b/crypto/gnupg-exp/HISTORY
@@ -1,3 +1,7 @@
+2009-01-12 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.0.10
+	* PRE_BUILD, gcc43.patch: removed patch
+
 2008-08-20 Ladislav Hagara <hgr at vabo.cz>
 	* PRE_BUILD: added sedit #14415
 
diff --git a/crypto/gnupg-exp/PRE_BUILD b/crypto/gnupg-exp/PRE_BUILD
index f8cb619..7b3c09c 100755
--- a/crypto/gnupg-exp/PRE_BUILD
+++ b/crypto/gnupg-exp/PRE_BUILD
@@ -1,7 +1,4 @@
 default_pre_build                                 &&
 
 #14415
-sedit 's:FAQ faq.html::' $SOURCE_DIRECTORY/doc/Makefile.in  &&
-
-patch $SOURCE_DIRECTORY/keyserver/gpgkeys_curl.c  \
-      $SCRIPT_DIRECTORY/gcc43.patch
+sedit 's:FAQ faq.html::' $SOURCE_DIRECTORY/doc/Makefile.in
diff --git a/crypto/gnupg-exp/gcc43.patch b/crypto/gnupg-exp/gcc43.patch
deleted file mode 100644
index dd494ce..0000000
--- a/crypto/gnupg-exp/gcc43.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-By: Eric Sandall
-For: Source Mage GNU/Linux
-Description: A quick fix to get gnupg-2.0.9 compiling with gcc 4.3.0 by obfuscating
-the reference to a bit-field.
---
-diff -Naur gnupg-2.0.9.orig/keyserver/gpgkeys_curl.c gnupg-2.0.9/keyserver/gpgkeys_curl.c
---- gnupg-2.0.9.orig/keyserver/gpgkeys_curl.c	2008-04-13 09:52:35.000000000 +0000
-+++ gnupg-2.0.9/keyserver/gpgkeys_curl.c	2008-04-13 09:52:43.000000000 +0000
-@@ -300,7 +300,14 @@
-       curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
-     }
- 
--  curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,opt->flags.check_cert);
-+  /*
-+   * GCC 4.3.0 fix for bit-fields
-+   */
-+  unsigned int check_cert = 0;
-+  check_cert = opt->flags.check_cert;
-+  curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,check_cert);
-+  /* End GCC 4.3.0 fix */
-+
-   curl_easy_setopt(curl,CURLOPT_CAINFO,opt->ca_cert_file);
- 
-   if(proxy)



More information about the SM-Commit mailing list