[SCM] kwallet packaging branch, master, updated. debian/5.22.0-1-5-g188ca12
Maximiliano Curia
maxy at moszumanska.debian.org
Sun Jun 26 19:08:53 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwallet.git;a=commitdiff;h=188ca12
The following commit has been merged in the master branch:
commit 188ca124c69902e4fba01d2af6b419e1aac71177
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Jun 21 22:40:10 2016 +0200
Add new patch: blowfish_endianess.diff
---
debian/patches/blowfish_endianess.diff | 50 ++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 51 insertions(+)
diff --git a/debian/patches/blowfish_endianess.diff b/debian/patches/blowfish_endianess.diff
new file mode 100644
index 0000000..168c096
--- /dev/null
+++ b/debian/patches/blowfish_endianess.diff
@@ -0,0 +1,50 @@
+--- a/src/runtime/kwalletd/backend/blowfish.cc
++++ b/src/runtime/kwalletd/backend/blowfish.cc
+@@ -33,7 +33,7 @@
+
+ // DO NOT INCLUDE THIS. IT BREAKS KWALLET.
+ // We need to live with -Wundef until someone really figures out the problem.
+-//#include <QtCore/qglobal.h> // for Q_BYTE_ORDER and friends
++#include <QtCore/qglobal.h> // for Q_BYTE_ORDER and friends
+
+ BlowFish::BlowFish()
+ {
+@@ -135,7 +135,7 @@
+ return init();
+ }
+
+-#if Q_BYTE_ORDER == Q_BIG_ENDIAN
++#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+ #define shuffle(x) do { \
+ uint32_t r = x; \
+ x = (r & 0xff000000) >> 24; \
+@@ -154,12 +154,12 @@
+ }
+
+ for (int i = 0; i < len / _blksz; i++) {
+-#if Q_BYTE_ORDER == Q_BIG_ENDIAN
++#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+ shuffle(*d);
+ shuffle(*(d + 1));
+ #endif
+ encipher(d, d + 1);
+-#if Q_BYTE_ORDER == Q_BIG_ENDIAN
++#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+ shuffle(*d);
+ shuffle(*(d + 1));
+ #endif
+@@ -178,12 +178,12 @@
+ }
+
+ for (int i = 0; i < len / _blksz; i++) {
+-#if Q_BYTE_ORDER == Q_BIG_ENDIAN
++#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+ shuffle(*d);
+ shuffle(*(d + 1));
+ #endif
+ decipher(d, d + 1);
+-#if Q_BYTE_ORDER == Q_BIG_ENDIAN
++#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+ shuffle(*d);
+ shuffle(*(d + 1));
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b46ff50
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+blowfish_endianess.diff
--
kwallet packaging
More information about the pkg-kde-commits
mailing list