[arch-commits] Commit in skrooge/trunk (4 files)

[Jaroslav Lichtblau]

    Date: Monday, December 10, 2018 @ 18:34:26
  Author: jlichtblau
Revision: 414414

upgpkg: skrooge 2.16.2-3 - FS#60989 fix

Added:
  skrooge/trunk/sqlcipher4-compliance1.patch
  skrooge/trunk/sqlcipher4-compliance2.patch
Modified:
  skrooge/trunk/PKGBUILD
  skrooge/trunk/skrooge.changelog

------------------------------+
 PKGBUILD                     |   19 +++++++++++++++----
 skrooge.changelog            |    3 +++
 sqlcipher4-compliance1.patch |   17 +++++++++++++++++
 sqlcipher4-compliance2.patch |   14 ++++++++++++++
 4 files changed, 49 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-10 18:33:37 UTC (rev 414413)
+++ PKGBUILD	2018-12-10 18:34:26 UTC (rev 414414)
@@ -5,12 +5,12 @@
 
 pkgname=skrooge
 pkgver=2.16.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A personal finances manager for KDE"
 arch=('x86_64')
 url="https://skrooge.org/"
 license=('GPL')
-depends=('qt5-base' 'qca-qt5' 'qt5-script' 'qt5-webkit' 'libofx'
+depends=('qt5-base' 'qca' 'qt5-script' 'qt5-webkit' 'libofx'
          'grantlee' 'kross' 'knewstuff' 'krunner' 'knotifyconfig'
          'sqlcipher' 'python' 'hicolor-icon-theme')
 makedepends=('cmake' 'kdoctools' 'extra-cmake-modules' 'qt5-tools')
@@ -17,11 +17,22 @@
 options=('!emptydirs')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
+source=(https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
+        sqlcipher4-compliance1.patch sqlcipher4-compliance2.patch)
 validpgpkeys=('103DC6D087B3A4A2ED975D7EF0C8CED3382A5C4D') #Stephane MANKOWSKI (Perso) <stephane at mankowski.fr>
 sha256sums=('124e0928595be6c1ae0a879f4f1cd4631e7aced8c5273ccb92e128a4f2c2bb45'
-            'SKIP')
+            'SKIP'
+            '35e2555a404d8ee170c17664fe44864dcf47e9d70307b02af8455da09a26a61a'
+            'cc85c191033576accefe8686be22de3a6a7cb8425c987ae853f70facd4823e85')
 
+prepare() {
+  cd "${srcdir}"/$pkgname-$pkgver
+
+# https://bugs.archlinux.org/task/60989
+  patch -Np1 -i "${srcdir}"/sqlcipher4-compliance1.patch
+  patch -Np1 -i "${srcdir}"/sqlcipher4-compliance2.patch
+}
+
 build() {
   cd "${srcdir}"/$pkgname-$pkgver
 

Modified: skrooge.changelog
===================================================================
--- skrooge.changelog	2018-12-10 18:33:37 UTC (rev 414413)
+++ skrooge.changelog	2018-12-10 18:34:26 UTC (rev 414414)
@@ -1,3 +1,6 @@
+2018-12-10 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* skrooge 2.16.2-3 FS#60989 fix
+
 2018-11-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
 	* skrooge 2.16.2-1
 

Added: sqlcipher4-compliance1.patch
===================================================================
--- sqlcipher4-compliance1.patch	                        (rev 0)
+++ sqlcipher4-compliance1.patch	2018-12-10 18:34:26 UTC (rev 414414)
@@ -0,0 +1,17 @@
+diff --git a/skgbasemodeler/skgdocument.cpp b/skgbasemodeler/skgdocument.cpp
+index 7ccf5c2..5330d6c 100644
+--- a/skgbasemodeler/skgdocument.cpp
++++ b/skgbasemodeler/skgdocument.cpp
+@@ -1383,8 +1383,10 @@ SKGError SKGDocument::load(const QString& iName, const QString& iPassword, bool
+                             err = SKGError(ERR_ENCRYPTION, i18nc("Error message", "Wrong installation"));
+                         }
+ 
+-                        // Test the password
+-                        IFOKDO(err, SKGServices::executeSqliteOrder(tryOpen, QStringLiteral("SELECT count(*) FROM sqlite_master")));
++                        // Migrate to the last version of SQLCipher
++                        IFOKDO(err, SKGServices::executeSqliteOrder(tryOpen, QStringLiteral("PRAGMA cipher_migrate")));
++
++                        // Test the password                        IFOKDO(err, SKGServices::executeSqliteOrder(tryOpen, QStringLiteral("SELECT count(*) FROM sqlite_master")));
+                         IFKO(err) {
+                             SKGTRACEL(10) << "Wrong password in restore mode" << endl;
+                             err = SKGError(ERR_ENCRYPTION, i18nc("Error message", "Wrong password"));

Added: sqlcipher4-compliance2.patch
===================================================================
--- sqlcipher4-compliance2.patch	                        (rev 0)
+++ sqlcipher4-compliance2.patch	2018-12-10 18:34:26 UTC (rev 414414)
@@ -0,0 +1,14 @@
+diff --git a/skgbasemodeler/skgdocument.cpp b/skgbasemodeler/skgdocument.cpp
+index 5330d6c..88a7932 100644
+--- a/skgbasemodeler/skgdocument.cpp
++++ b/skgbasemodeler/skgdocument.cpp
+@@ -1386,7 +1386,8 @@ SKGError SKGDocument::load(const QString& iName, const QString& iPassword, bool
+                         // Migrate to the last version of SQLCipher
+                         IFOKDO(err, SKGServices::executeSqliteOrder(tryOpen, QStringLiteral("PRAGMA cipher_migrate")));
+ 
+-                        // Test the password                        IFOKDO(err, SKGServices::executeSqliteOrder(tryOpen, QStringLiteral("SELECT count(*) FROM sqlite_master")));
++                        // Test the password
++                        IFOKDO(err, SKGServices::executeSqliteOrder(tryOpen, QStringLiteral("SELECT count(*) FROM sqlite_master")));
+                         IFKO(err) {
+                             SKGTRACEL(10) << "Wrong password in restore mode" << endl;
+                             err = SKGError(ERR_ENCRYPTION, i18nc("Error message", "Wrong password"));