diff options
| -rw-r--r-- | kde/build/kde-runtime | 2 | ||||
| -rw-r--r-- | kde/build/kwallet | 2 | ||||
| -rw-r--r-- | kde/patch/kde-runtime.patch | 2 | ||||
| -rw-r--r-- | kde/patch/kde-runtime/kde-runtime_kwallet_cbcfix.diff.gz | bin | 0 -> 5331 bytes | |||
| -rw-r--r-- | kde/patch/kdelibs.patch | 4 | ||||
| -rw-r--r-- | kde/patch/kdelibs/fixbic-4.14.6.patch | 47 | ||||
| -rw-r--r-- | kde/patch/kwallet.patch | 5 | ||||
| -rw-r--r-- | kde/patch/kwallet/kwallet_cbcfix.diff.gz | bin | 0 -> 1940 bytes | |||
| -rw-r--r-- | kde/patch/kwallet/kwallet_convert_ecb2cbc.diff.gz | bin | 0 -> 2872 bytes |
9 files changed, 62 insertions, 0 deletions
diff --git a/kde/build/kde-runtime b/kde/build/kde-runtime new file mode 100644 index 0000000..9a7456b --- /dev/null +++ b/kde/build/kde-runtime @@ -0,0 +1,2 @@ +2 + diff --git a/kde/build/kwallet b/kde/build/kwallet new file mode 100644 index 0000000..9a7456b --- /dev/null +++ b/kde/build/kwallet @@ -0,0 +1,2 @@ +2 + diff --git a/kde/patch/kde-runtime.patch b/kde/patch/kde-runtime.patch index b0efb11..b30561e 100644 --- a/kde/patch/kde-runtime.patch +++ b/kde/patch/kde-runtime.patch @@ -2,3 +2,5 @@ # - Minimize/maximize by clicking taskbar entries requires double click. #zcat $CWD/patch/kde-runtime/kde-runtime.kdebug324470.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +# Fix for kwallet -which was encrypting to ECB instead of CBC: +zcat $CWD/patch/kde-runtime/kde-runtime_kwallet_cbcfix.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kde-runtime/kde-runtime_kwallet_cbcfix.diff.gz b/kde/patch/kde-runtime/kde-runtime_kwallet_cbcfix.diff.gz Binary files differnew file mode 100644 index 0000000..4783fbe --- /dev/null +++ b/kde/patch/kde-runtime/kde-runtime_kwallet_cbcfix.diff.gz diff --git a/kde/patch/kdelibs.patch b/kde/patch/kdelibs.patch index 4822201..fa3bd01 100644 --- a/kde/patch/kdelibs.patch +++ b/kde/patch/kdelibs.patch @@ -15,3 +15,7 @@ zcat $CWD/patch/kdelibs/return-application-icons-properly.patch.gz | patch -R -p # Patch for CVE-2014-3494 (KMail/KIO POP3 SSL MITM Flaw) - fixed in 4.13.3: #zcat $CWD/patch/kdelibs/kdelibs.CVE-2014-3494.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +# Patch a BIC (binary incompatibility) introduced by mistake in 4.14.6. +# Will be fixed in 4.14.7: +cat $CWD/patch/kdelibs/fixbic-4.14.6.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/kdelibs/fixbic-4.14.6.patch b/kde/patch/kdelibs/fixbic-4.14.6.patch new file mode 100644 index 0000000..585ce51 --- /dev/null +++ b/kde/patch/kdelibs/fixbic-4.14.6.patch @@ -0,0 +1,47 @@ +diff --git a/khtml/dom/dom_string.h b/khtml/dom/dom_string.h +index 087f697..b269213 100644 +--- a/khtml/dom/dom_string.h ++++ b/khtml/dom/dom_string.h +@@ -124,10 +124,23 @@ public: + bool endsWith(const DOMString& str) const; + bool startsWith(const DOMString& str) const; + +- // http://www.w3.org/TR/html/infrastructure.html#urls ++ /** ++ * Return a parsed url. ++ * Used to parse SRC url attribute, ++ * see http://www.w3.org/TR/html/infrastructure.html#urls ++ * ++ * @since 4.14.6 ++ */ + DOMString parsedUrl() const; + + /** ++ * @deprecated, use parsedUrl() ++ */ ++#ifndef KDE_NO_DEPRECATED ++ KDE_DEPRECATED DOMString trimSpaces() const; ++#endif ++ ++ /** + * @internal get a handle to the imlementation of the DOMString + * Use at own risk!!! + */ +diff --git a/khtml/dom/dom_string.cpp b/khtml/dom/dom_string.cpp +index a3c4abd..4da676b 100644 +--- a/khtml/dom/dom_string.cpp ++++ b/khtml/dom/dom_string.cpp +@@ -336,6 +336,13 @@ DOMString DOMString::parsedUrl() const + return out; + } + ++#ifndef KDE_NO_DEPRECATED ++DOMString DOMString::trimSpaces() const ++{ ++ return parsedUrl(); ++} ++#endif ++ + // ------------------------------------------------------------------------ + + bool DOM::strcasecmp( const DOMString &as, const DOMString &bs ) diff --git a/kde/patch/kwallet.patch b/kde/patch/kwallet.patch new file mode 100644 index 0000000..3145d3c --- /dev/null +++ b/kde/patch/kwallet.patch @@ -0,0 +1,5 @@ +# Fix for kwallet -which was encrypting to ECB instead of CBC: +zcat $CWD/patch/kde-runtime/kwallet_cbcfix.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +# Automatically convert old wallets from ECB to CBC: +zcat $CWD/patch/kde-runtime/kwallet_convert_ecb2cbc.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/kwallet/kwallet_cbcfix.diff.gz b/kde/patch/kwallet/kwallet_cbcfix.diff.gz Binary files differnew file mode 100644 index 0000000..25d9106 --- /dev/null +++ b/kde/patch/kwallet/kwallet_cbcfix.diff.gz diff --git a/kde/patch/kwallet/kwallet_convert_ecb2cbc.diff.gz b/kde/patch/kwallet/kwallet_convert_ecb2cbc.diff.gz Binary files differnew file mode 100644 index 0000000..e26f8ab --- /dev/null +++ b/kde/patch/kwallet/kwallet_convert_ecb2cbc.diff.gz |