Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (0f6ed6d64fbc09fb8e04a01924ae16b2972f9aa2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (0f6ed6d64fbc09fb8e04a01924ae16b2972f9aa2)
  • Date: Sun, 13 Apr 2008 05:00:13 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

crypto/gnupg-exp/HISTORY | 4 ++++
crypto/gnupg-exp/PRE_BUILD | 3 +++
crypto/gnupg-exp/gcc43.patch | 24 ++++++++++++++++++++++++
crypto/gnupg/HISTORY | 4 ++++
crypto/gnupg/PRE_BUILD | 5 ++++-
crypto/gnupg/gcc43.patch | 24 ++++++++++++++++++++++++
6 files changed, 63 insertions(+), 1 deletion(-)

New commits:
commit 0f6ed6d64fbc09fb8e04a01924ae16b2972f9aa2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnupg-exp: Fixes Bug #14446 (compilation with gcc 4.3.0)

commit 21a3904f5a1ef108052ae4b6075324efd36574ac
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnupg: Fixes Bug #14446 (compilation with gcc 4.3.0)

diff --git a/crypto/gnupg-exp/HISTORY b/crypto/gnupg-exp/HISTORY
index 56ccbed..f49936d 100644
--- a/crypto/gnupg-exp/HISTORY
+++ b/crypto/gnupg-exp/HISTORY
@@ -1,3 +1,7 @@
+2008-04-13 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Quick fix for Bug #14446
+
2008-03-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.9

diff --git a/crypto/gnupg-exp/PRE_BUILD b/crypto/gnupg-exp/PRE_BUILD
new file mode 100755
index 0000000..427b680
--- /dev/null
+++ b/crypto/gnupg-exp/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+patch $SOURCE_DIRECTORY/keyserver/gpgkeys_curl.c \
+ $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/crypto/gnupg-exp/gcc43.patch b/crypto/gnupg-exp/gcc43.patch
new file mode 100644
index 0000000..dd494ce
--- /dev/null
+++ b/crypto/gnupg-exp/gcc43.patch
@@ -0,0 +1,24 @@
+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)
diff --git a/crypto/gnupg/HISTORY b/crypto/gnupg/HISTORY
index 9df5cd9..d3671eb 100644
--- a/crypto/gnupg/HISTORY
+++ b/crypto/gnupg/HISTORY
@@ -1,3 +1,7 @@
+2008-04-13 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Quick fix for Bug #14446
+
2008-03-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.9

diff --git a/crypto/gnupg/PRE_BUILD b/crypto/gnupg/PRE_BUILD
index 4cca1a8..95231f4 100755
--- a/crypto/gnupg/PRE_BUILD
+++ b/crypto/gnupg/PRE_BUILD
@@ -3,4 +3,7 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&

sedit 's/sparc9/sparcv9/' mpi/config.links &&
-sedit 's/sparc8/sparcv8/' mpi/config.links
\ No newline at end of file
+sedit 's/sparc8/sparcv8/' mpi/config.links &&
+
+patch $SOURCE_DIRECTORY/keyserver/gpgkeys_curl.c \
+ $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/crypto/gnupg/gcc43.patch b/crypto/gnupg/gcc43.patch
new file mode 100644
index 0000000..dae4377
--- /dev/null
+++ b/crypto/gnupg/gcc43.patch
@@ -0,0 +1,24 @@
+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 Eric Sandall (0f6ed6d64fbc09fb8e04a01924ae16b2972f9aa2), Eric Sandall, 04/13/2008

Archive powered by MHonArc 2.6.24.

Top of Page