Botan/Botan-qt_thread_support.patch

Index: src/mutex/qt_mutex/mux_qt.cpp
===================================================================
--- src/mutex/qt_mutex/mux_qt.cpp.orig	2010-08-31 18:39:00.000000000 +0200
+++ src/mutex/qt_mutex/mux_qt.cpp	2010-09-01 18:50:46.546845986 +0200
@@ -9,7 +9,7 @@
 #include <botan/mux_qt.h>
 #include <qmutex.h>
 
-#if !defined(QT_THREAD_SUPPORT)
+#if !(defined(QT_THREAD_SUPPORT) || !defined(QT_NO_THREAD))
    #error Your version of Qt does not support threads or mutexes
 #endif
 
Index: src/mutex/qt_mutex/info.txt
===================================================================
--- src/mutex/qt_mutex/info.txt.orig	2010-08-31 18:39:00.000000000 +0200
+++ src/mutex/qt_mutex/info.txt	2010-09-01 20:07:41.039257575 +0200
@@ -14,5 +14,5 @@ mux_qt.h
 # I think we want to always use qt-mt, not qt -- not much point in supporting
 # mutexes in a single threaded application, after all.
 <libs>
-all -> qt-mt
+all -> QtCore
 </libs>
- Prefix last patch with Botan-. - Enable building of the qt_mutex module. This means that from now on libbotan requires libQtCore. - Fix test for thread/mutex support to also work for Qt4. - Update to 1.8.10: * This release changes a number of aspects of how private keys are encrypted. The default encryption algorithm has changed from 3DES to AES-256 * The default iteration count for PBES1 and PBES2 encryption schemes (which are used primarily to encrypt asymmetric keys like RSA or DSA) has increased from 2048 to 10000, which should make brute force key cracking substantially harder. * The first round of AES now uses a smaller set of lookup tables; this only reduces performance slightly but some timing and cache analysis attacks against AES are substantially harder when AES is implemented this way. * The class known as S2K was renamed PBKDF in 1.9, with a typedef for backwards compatibility. For providing an equivalent forward compatibility path, 1.8.10 includes a typedef for PBKDF and a new accessor function get_pbkdf. It also includes a new interface for deriving keys with a passphrase which takes both the passphrase and desired output length as well as the salt and iteration count; in many cases this call is actually significantly more convenient than the older API. OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=16 2010-09-02 12:07:50 +02:00			`Index: src/mutex/qt_mutex/mux_qt.cpp`
			`===================================================================`
			`--- src/mutex/qt_mutex/mux_qt.cpp.orig 2010-08-31 18:39:00.000000000 +0200`
			`+++ src/mutex/qt_mutex/mux_qt.cpp 2010-09-01 18:50:46.546845986 +0200`
			`@@ -9,7 +9,7 @@`
			`#include <botan/mux_qt.h>`
			`#include <qmutex.h>`

			`-#if !defined(QT_THREAD_SUPPORT)`
			`+#if !(defined(QT_THREAD_SUPPORT) \|\| !defined(QT_NO_THREAD))`
			`#error Your version of Qt does not support threads or mutexes`
			`#endif`

			`Index: src/mutex/qt_mutex/info.txt`
			`===================================================================`
			`--- src/mutex/qt_mutex/info.txt.orig 2010-08-31 18:39:00.000000000 +0200`
			`+++ src/mutex/qt_mutex/info.txt 2010-09-01 20:07:41.039257575 +0200`
			`@@ -14,5 +14,5 @@ mux_qt.h`
			`# I think we want to always use qt-mt, not qt -- not much point in supporting`
			`# mutexes in a single threaded application, after all.`
			`<libs>`
			`-all -> qt-mt`
			`+all -> QtCore`
			`</libs>`