Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (c8258482c2174af1fee710d04ecf3394e8dd0980)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (c8258482c2174af1fee710d04ecf3394e8dd0980)
  • Date: Thu, 3 Sep 2009 01:06:02 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

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

New commits:
commit c8258482c2174af1fee710d04ecf3394e8dd0980
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

gnupg 1.4.10

diff --git a/crypto/gnupg/DETAILS b/crypto/gnupg/DETAILS
index b7a7279..e8e39c6 100755
--- a/crypto/gnupg/DETAILS
+++ b/crypto/gnupg/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnupg
- VERSION=1.4.9
+ VERSION=1.4.10
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/$SPELL/$SOURCE
diff --git a/crypto/gnupg/HISTORY b/crypto/gnupg/HISTORY
index f10184f..2f56fcc 100644
--- a/crypto/gnupg/HISTORY
+++ b/crypto/gnupg/HISTORY
@@ -1,3 +1,7 @@
+2009-09-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.10
+ * PRE_BUILD, gcc43.patch: removed patch
+
2009-01-16 George Sherwood <gsherwood AT sourcemage.org>
* PRE_REMOVE: Added to remove gnugp1.info file
* REPAIR^737a6991d42adc1ffe069a0ace215440^POST_REMOVE: Added
diff --git a/crypto/gnupg/PRE_BUILD b/crypto/gnupg/PRE_BUILD
index 9bae87a..8d04715 100755
--- a/crypto/gnupg/PRE_BUILD
+++ b/crypto/gnupg/PRE_BUILD
@@ -1,7 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-sed -i "s:sparc9:sparcv9:;s:sparc8:sparcv8:" mpi/config.links &&
-
-patch $SOURCE_DIRECTORY/keyserver/gpgkeys_curl.c \
- $SPELL_DIRECTORY/gcc43.patch
+sed -i "s:sparc9:sparcv9:;s:sparc8:sparcv8:" mpi/config.links
diff --git a/crypto/gnupg/gcc43.patch b/crypto/gnupg/gcc43.patch
deleted file mode 100644
index dae4377..0000000
--- a/crypto/gnupg/gcc43.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-By: Eric Sandall
-For: Source Mage GNU/Linux
-Description: A quick fix to get gnupg-1.4.9 compiling with gcc 4.3.0 by
obfuscating
-the reference to a bit-field.
---
-diff -Naur gnupg-1.4.9.orig/keyserver/gpgkeys_curl.c
gnupg-1.4.9/keyserver/gpgkeys_curl.c
---- gnupg-1.4.9.orig/keyserver/gpgkeys_curl.c 2008-04-13 09:42:06.000000000
+0000
-+++ gnupg-1.4.9/keyserver/gpgkeys_curl.c 2008-04-13 09:42:18.000000000
+0000
-@@ -301,7 +301,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)



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (c8258482c2174af1fee710d04ecf3394e8dd0980), Ladislav Hagara, 09/03/2009

Archive powered by MHonArc 2.6.24.

Top of Page