Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (46c54bcacbfcb2611102f3a5dbf1ccc74e20df27)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (46c54bcacbfcb2611102f3a5dbf1ccc74e20df27)
  • Date: Fri, 17 Feb 2017 13:06:34 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kernels/ndiswrapper/DETAILS | 4 +-
kernels/ndiswrapper/HISTORY | 3 +
qt5-cmake/qca-qt5/DETAILS | 4 +-
qt5-cmake/qca-qt5/HISTORY | 4 ++
qt5-cmake/qca-qt5/PRE_BUILD | 4 --
qt5-cmake/qca-qt5/ssl.diff | 88
--------------------------------------------
6 files changed, 11 insertions(+), 96 deletions(-)

New commits:
commit 46c54bcacbfcb2611102f3a5dbf1ccc74e20df27
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qca-qt5: => 2.1.3

commit 76fa5c0009c122c9c675e99149345bdd40422d9a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ndiswrapper: => 1.61

diff --git a/kernels/ndiswrapper/DETAILS b/kernels/ndiswrapper/DETAILS
index 326b446..7c1fd36 100755
--- a/kernels/ndiswrapper/DETAILS
+++ b/kernels/ndiswrapper/DETAILS
@@ -11,8 +11,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn/$SPELL

SOURCE_URL[0]=svn://ndiswrapper.svn.sourceforge.net/svnroot/ndiswrapper/trunk:ndiswrapper
SOURCE_IGNORE=volatile
else
- VERSION=1.59
-
SOURCE_HASH=sha512:dd1d486b6178185e813217e4fff38f6ea6b21f8a3544c5cc25be9edbca60f34b21656e5d46b9d02cb1e43c8cc82856283aaa428964b8f85cb07146a41e40e44d
+ VERSION=1.61
+
SOURCE_HASH=sha512:67a50071a2e04113b91259e0d5236b4bf02b46a0d60ecae779c34e047f678c70b18e3191bad1435525c8499e554bd26794a03a79a71e1e603987432f4c590b43
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
diff --git a/kernels/ndiswrapper/HISTORY b/kernels/ndiswrapper/HISTORY
index 8c328ed..10fa436 100644
--- a/kernels/ndiswrapper/HISTORY
+++ b/kernels/ndiswrapper/HISTORY
@@ -1,3 +1,6 @@
+2017-02-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.61
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/qt5-cmake/qca-qt5/DETAILS b/qt5-cmake/qca-qt5/DETAILS
index a76edc5..01a51e8 100755
--- a/qt5-cmake/qca-qt5/DETAILS
+++ b/qt5-cmake/qca-qt5/DETAILS
@@ -1,7 +1,7 @@
SPELL=qca-qt5
SPELLX=qca
- VERSION=2.1.1
-
SOURCE_HASH=sha512:f077b5a4cc6539e0880f4d0a615bebcf851f634e99c6c355522598204f625e5195e0cbc8a1976593669018e57eff95796c8fef69b1301b42cb18736bc8aa1abf
+ VERSION=2.1.3
+
SOURCE_HASH=sha512:0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=http://download.kde.org/stable/$SPELLX/$VERSION/src/$SOURCE
diff --git a/qt5-cmake/qca-qt5/HISTORY b/qt5-cmake/qca-qt5/HISTORY
index 1fa7978..9b52a8a 100644
--- a/qt5-cmake/qca-qt5/HISTORY
+++ b/qt5-cmake/qca-qt5/HISTORY
@@ -1,3 +1,7 @@
+2017-02-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.1.3
+ * PRE_BUILD ssl.diff: deleted
+
2016-07-08 Treeve Jelbert <treeve AT sourcemage.org>
* ssl.diff. PRE_BUILD: added
fix build qith openssl-2.4.x
diff --git a/qt5-cmake/qca-qt5/PRE_BUILD b/qt5-cmake/qca-qt5/PRE_BUILD
deleted file mode 100755
index 7f458f7..0000000
--- a/qt5-cmake/qca-qt5/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY/plugins/qca-ossl &&
-patch -p0 < $SPELL_DIRECTORY/ssl.diff &&
-cd $SOURCE_DIRECTORY
diff --git a/qt5-cmake/qca-qt5/ssl.diff b/qt5-cmake/qca-qt5/ssl.diff
deleted file mode 100644
index 615af0b..0000000
--- a/qt5-cmake/qca-qt5/ssl.diff
+++ /dev/null
@@ -1,88 +0,0 @@
---- qca-ossl.cpp.orig 2016-07-08 18:02:53.000000000 +0200
-+++ qca-ossl.cpp 2016-07-08 20:19:02.000000000 +0200
-@@ -37,6 +37,7 @@
- #include <openssl/x509v3.h>
- #include <openssl/pkcs12.h>
- #include <openssl/ssl.h>
-+#include <openssl/sha.h>
-
- #ifndef OSSL_097
- // comment this out if you'd rather use openssl 0.9.6
-@@ -1930,9 +1931,13 @@
- virtual void startSign(SignatureAlgorithm alg, SignatureFormat)
- {
- const EVP_MD *md = 0;
-+#ifndef OPENSSL_NO_SHA1
- if(alg == EMSA3_SHA1)
- md = EVP_sha1();
- else if(alg == EMSA3_MD5)
-+#else
-+ if(alg == EMSA3_MD5)
-+#endif
- md = EVP_md5();
- #ifdef HAVE_OPENSSL_MD2
- else if(alg == EMSA3_MD2)
-@@ -1958,9 +1963,13 @@
- virtual void startVerify(SignatureAlgorithm alg, SignatureFormat)
- {
- const EVP_MD *md = 0;
-+#ifndef OPENSSL_NO_SHA1
- if(alg == EMSA3_SHA1)
- md = EVP_sha1();
- else if(alg == EMSA3_MD5)
-+#else
-+ if(alg == EMSA3_MD5)
-+#endif
- md = EVP_md5();
- #ifdef HAVE_OPENSSL_MD2
- else if(alg == EMSA3_MD2)
-@@ -5403,9 +5412,11 @@
- ctx = SSL_CTX_new(SSLv2_client_method());
- break;
- #endif
-+#ifndef OPENSSL_NO_SSL2
- case TLS::SSL_v3:
- ctx = SSL_CTX_new(SSLv3_client_method());
- break;
-+#endif
- case TLS::TLS_v1:
- ctx = SSL_CTX_new(TLSv1_client_method());
- break;
-@@ -7131,10 +7142,15 @@
- return new opensslRandomContext(this);
- else if ( type == "info" )
- return new opensslInfoContext(this);
-+#ifndef OPENSSL_NO_SHA1
- else if ( type == "sha1" )
- return new opensslHashContext( EVP_sha1(), this,
type);
-+#else
-+/*
- else if ( type == "sha0" )
- return new opensslHashContext( EVP_sha(), this, type);
-+*/
-+#endif
- else if ( type == "ripemd160" )
- return new opensslHashContext( EVP_ripemd160(), this,
type);
- #ifdef HAVE_OPENSSL_MD2
-@@ -7167,8 +7183,10 @@
- return new opensslHashContext( EVP_whirlpool(), this,
type);
- #endif
- */
-+#ifndef OPENSSL_NO_SHA1
- else if ( type == "pbkdf1(sha1)" )
- return new opensslPbkdf1Context( EVP_sha1(), this,
type );
-+#endif
- #ifdef HAVE_OPENSSL_MD2
- else if ( type == "pbkdf1(md2)" )
- return new opensslPbkdf1Context( EVP_md2(), this,
type );
-@@ -7177,8 +7195,10 @@
- return new opensslPbkdf2Context( this, type );
- else if ( type == "hmac(md5)" )
- return new opensslHMACContext( EVP_md5(), this, type
);
-+#ifndef OPENSSL_NO_SHA1
- else if ( type == "hmac(sha1)" )
- return new opensslHMACContext( EVP_sha1(),this, type
);
-+#endif
- #ifdef SHA224_DIGEST_LENGTH
- else if ( type == "hmac(sha224)" )
- return new opensslHMACContext( EVP_sha224(), this,
type);



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (46c54bcacbfcb2611102f3a5dbf1ccc74e20df27), Treeve Jelbert, 02/17/2017

Archive powered by MHonArc 2.6.24.

Top of Page