Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (117d50fcb14d20ddedb8dbb66ff9db36477614c6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (117d50fcb14d20ddedb8dbb66ff9db36477614c6)
  • Date: Sun, 4 Jan 2009 13:11:40 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

crypto/qca-openssl/DETAILS | 4 ++--
crypto/qca-openssl/HISTORY | 5 +++++
crypto/qca-openssl/PRE_BUILD | 2 +-
crypto/qca-openssl/qca-ossl-openssl.patch | 29
+++++++++++++++++++++++++++++
crypto/qca-openssl/qca-ossl_fix.patch | 10 ----------
5 files changed, 37 insertions(+), 13 deletions(-)

New commits:
commit 117d50fcb14d20ddedb8dbb66ff9db36477614c6
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

qca-openssl: Updated to version 2.0.0-beta3 and updated patch to
fix compile problem. Patch from gentoo.

diff --git a/crypto/qca-openssl/DETAILS b/crypto/qca-openssl/DETAILS
index 14dc1cf..bb4fd01 100755
--- a/crypto/qca-openssl/DETAILS
+++ b/crypto/qca-openssl/DETAILS
@@ -1,9 +1,9 @@
SPELL=qca-openssl
- VERSION=2.0.0-beta1
+ VERSION=2.0.0-beta3
SOURCE=qca-ossl-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/qca-ossl-$VERSION
SOURCE_URL[0]=http://delta.affinix.com/download/qca/2.0/plugins/$SOURCE
-
SOURCE_HASH=sha512:9825358c547e53bb6b60e27e6b965777b6c68f5e8f17a2e2bb6960c647dd6c0c73572fa968c57915d6d30a7075c3dd09277880a9c1502c3b1319454301680194
+
SOURCE_HASH=sha512:17b30099c1bc8650757d71fd9e7824831b132cedc920f59832cb5a8096b90932834e05f3f77ed34e213fdadf881625710e1311ae4fcc4c0919a1684adb4525b8
LICENSE[0]=GPL
WEB_SITE=http://delta.affinix.com/qca
ENTERED=20050101
diff --git a/crypto/qca-openssl/HISTORY b/crypto/qca-openssl/HISTORY
index 7096c7e..0742369 100644
--- a/crypto/qca-openssl/HISTORY
+++ b/crypto/qca-openssl/HISTORY
@@ -1,3 +1,8 @@
+2009-01-04 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.0.0-beta3
+ * PRE_BUILD: Updated patch name
+ * qca-ossl-openssl.patch: Added gentoo patch to fix compile issue.
+
2007-11-04 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 2.0.0-beta1.
* BUILD: Added code to detect qt4.
diff --git a/crypto/qca-openssl/PRE_BUILD b/crypto/qca-openssl/PRE_BUILD
index 3ef8b6b..27a7d8e 100755
--- a/crypto/qca-openssl/PRE_BUILD
+++ b/crypto/qca-openssl/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/qca-ossl_fix.patch
+patch -p0 < $SCRIPT_DIRECTORY/qca-ossl-openssl.patch
diff --git a/crypto/qca-openssl/qca-ossl-openssl.patch
b/crypto/qca-openssl/qca-ossl-openssl.patch
new file mode 100644
index 0000000..0d171a0
--- /dev/null
+++ b/crypto/qca-openssl/qca-ossl-openssl.patch
@@ -0,0 +1,29 @@
+http://websvn.kde.org/trunk/kdesupport/qca/plugins/qca-ossl/qca-ossl.cpp?r1=848615&r2=864423&view=patch
+
+--- qca-ossl.cpp 2008/08/18 09:08:51 848615
++++ qca-ossl.cpp 2008/09/24 19:22:26 864423
+@@ -6616,9 +6616,11 @@
+ #ifdef SHA512_DIGEST_LENGTH
+ list += "sha512";
+ #endif
++/*
+ #ifdef OBJ_whirlpool
+ list += "whirlpool";
+ #endif
++*/
+ return list;
+ }
+
+@@ -6863,10 +6865,12 @@
+ else if ( type == "sha512" )
+ return new opensslHashContext( EVP_sha512(), this,
type);
+ #endif
++/*
+ #ifdef OBJ_whirlpool
+ else if ( type == "whirlpool" )
+ return new opensslHashContext( EVP_whirlpool(), this,
type);
+ #endif
++*/
+ else if ( type == "pbkdf1(sha1)" )
+ return new opensslPbkdf1Context( EVP_sha1(), this,
type );
+ else if ( type == "pbkdf1(md2)" )
diff --git a/crypto/qca-openssl/qca-ossl_fix.patch
b/crypto/qca-openssl/qca-ossl_fix.patch
deleted file mode 100644
index 3e34431..0000000
--- a/crypto/qca-openssl/qca-ossl_fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- qca-ossl.cpp.orig 2007-11-04 21:30:46.000000000 +0400
-+++ qca-ossl.cpp 2007-11-04 21:31:04.000000000 +0400
-@@ -19,6 +19,7 @@
- */
-
- #include <QtCrypto>
-+#include <qcaprovider.h>
-
- #include <QDebug>
- #include <QtCore/qplugin.h>



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (117d50fcb14d20ddedb8dbb66ff9db36477614c6), George Sherwood, 01/04/2009

Archive powered by MHonArc 2.6.24.

Top of Page