Hello community, here is the log from the commit of package xca for openSUSE:Factory checked in at 2020-02-04 19:56:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xca (Old) and /work/SRC/openSUSE:Factory/.xca.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xca" Tue Feb 4 19:56:44 2020 rev:3 rq:769131 version:2.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xca/xca.changes 2020-01-30 09:42:54.569538596 +0100 +++ /work/SRC/openSUSE:Factory/.xca.new.26092/xca.changes 2020-02-04 19:56:52.817445028 +0100 @@ -1,0 +2,8 @@ +Thu Jan 30 21:11:18 UTC 2020 - Martin Hauke <[email protected]> + +- Update to version 2.2.1 + * This is a patch release, fixing Issue #159: "Opening existing + database" which prevented the current version opening databases + of XCA 2.1.2 + +------------------------------------------------------------------- Old: ---- xca-2.2.0.tar.gz New: ---- xca-2.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xca.spec ++++++ --- /var/tmp/diff_new_pack.39A7X2/_old 2020-02-04 19:56:54.849446213 +0100 +++ /var/tmp/diff_new_pack.39A7X2/_new 2020-02-04 19:56:54.865446222 +0100 @@ -17,7 +17,7 @@ Name: xca -Version: 2.2.0 +Version: 2.2.1 Release: 0 Summary: An RSA key and certificate management tool License: BSD-3-Clause ++++++ xca-2.2.0.tar.gz -> xca-2.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xca-2.2.0/README.md new/xca-2.2.1/README.md --- old/xca-2.2.0/README.md 2020-01-29 21:40:04.000000000 +0100 +++ new/xca-2.2.1/README.md 2020-01-30 20:54:31.000000000 +0100 @@ -2,11 +2,8 @@ ## __Release Notes__ - * This is a minor release, addressing 21 bugs and feature requests - * Most notable improvements: - 1. Support concurrent database access - 2. Support ODBC database driver and Microsoft SQL Server - 3. Switch to MSI installer on Windows + * This is a patch release, fixing *Issue #159: "Opening existing database"* + which prevented the current version opening databases of XCA 2.1.2 * Since version 2 of XCA the database format changed to SQL Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xca-2.2.0/VERSION new/xca-2.2.1/VERSION --- old/xca-2.2.0/VERSION 2020-01-29 21:40:04.000000000 +0100 +++ new/xca-2.2.1/VERSION 2020-01-30 20:54:31.000000000 +0100 @@ -1 +1 @@ -2.2.0 +2.2.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xca-2.2.0/changelog new/xca-2.2.1/changelog --- old/xca-2.2.0/changelog 2020-01-29 21:40:04.000000000 +0100 +++ new/xca-2.2.1/changelog 2020-01-30 20:54:31.000000000 +0100 @@ -1,3 +1,7 @@ +xca 2.2.1 Thu Jan 30 2020 + + * Close #159 Opening existing database + xca 2.2.0 Wed Jan 29 2020 * Switch to MSI installer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xca-2.2.0/configure new/xca-2.2.1/configure --- old/xca-2.2.0/configure 2020-01-29 21:40:05.000000000 +0100 +++ new/xca-2.2.1/configure 2020-01-30 20:54:32.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for X Certificate and Key management 2.2.0. +# Generated by GNU Autoconf 2.69 for X Certificate and Key management 2.2.1. # # Report bugs to <[email protected]>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='X Certificate and Key management' PACKAGE_TARNAME='xca' -PACKAGE_VERSION='2.2.0' -PACKAGE_STRING='X Certificate and Key management 2.2.0' +PACKAGE_VERSION='2.2.1' +PACKAGE_STRING='X Certificate and Key management 2.2.1' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='http://xca.hohnstaedt.de' @@ -1278,7 +1278,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures X Certificate and Key management 2.2.0 to adapt to many kinds of systems. +\`configure' configures X Certificate and Key management 2.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1340,7 +1340,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of X Certificate and Key management 2.2.0:";; + short | recursive ) echo "Configuration of X Certificate and Key management 2.2.1:";; esac cat <<\_ACEOF @@ -1447,7 +1447,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -X Certificate and Key management configure 2.2.0 +X Certificate and Key management configure 2.2.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1749,7 +1749,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by X Certificate and Key management $as_me 2.2.0, which was +It was created by X Certificate and Key management $as_me 2.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4794,7 +4794,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by X Certificate and Key management $as_me 2.2.0, which was +This file was extended by X Certificate and Key management $as_me 2.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4861,7 +4861,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -X Certificate and Key management config.status 2.2.0 +X Certificate and Key management config.status 2.2.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xca-2.2.0/doc/xca.sgml new/xca-2.2.1/doc/xca.sgml --- old/xca-2.2.0/doc/xca.sgml 2020-01-29 21:40:04.000000000 +0100 +++ new/xca-2.2.1/doc/xca.sgml 2020-01-30 20:54:31.000000000 +0100 @@ -7,7 +7,7 @@ <author>(c) by Christian Hohnstädt, <tt>[email protected]</tt> -<date>January 2020 - Version 2.2.0 +<date>January 2020 - Version 2.2.1 <abstract> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xca-2.2.0/lib/settings.cpp new/xca-2.2.1/lib/settings.cpp --- old/xca-2.2.0/lib/settings.cpp 2020-01-29 21:40:04.000000000 +0100 +++ new/xca-2.2.1/lib/settings.cpp 2020-01-30 20:54:31.000000000 +0100 @@ -54,6 +54,7 @@ void settings::setAction(const QString &key, const QString &value) { + qDebug() << "Settings::setAction(" << key << ", " << value << ")"; if (key == "string_opt") ASN1_STRING_set_default_mask_asc((char*)CCHAR(value)); else if (key == "default_hash") @@ -104,7 +105,13 @@ QString settings::get(QString key) { +// const QString schema = "schema"; load_settings(); + if (key == "schema" && QSqlDatabase::database().isOpen()) { + XSqlQuery q("SELECT value FROM settings WHERE key_='schema'"); + if (q.first()) + setAction("schema", q.value(0).toString()); + } return values.contains(key) ? values[key] : QString(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xca-2.2.0/misc/binary-hashes.json new/xca-2.2.1/misc/binary-hashes.json --- old/xca-2.2.0/misc/binary-hashes.json 2020-01-29 21:40:04.000000000 +0100 +++ new/xca-2.2.1/misc/binary-hashes.json 2020-01-30 20:54:31.000000000 +0100 @@ -60,5 +60,10 @@ "xca-2.1.2.tar.gz":"fc845470a02b0b4534b46590be307f784662071fc412fdcad605c3bce901fe05", "xca-portable-2.1.2.zip":"37d2e315dc36c7060a50dd7203339dfa8c8b43cea34f340d456a900a6e5232a6", + "xca-2.2.0.dmg":"0f4539d4ce90dc7881afd58c09cc8d7480b341a66017d862ae19c1cbab21dc0a", + "xca-2.2.0.msi":"44cdd4df0369d36e0063a86a3cb5713575a41627c92cd7412b39071e3b5794de", + "xca-2.2.0.tar.gz":"b07ffbe5ca8e3fbb7c5ad2ef5a0f7c022b3c4a55f1dd41fab5b076992db07b61", + "xca-portable-2.2.0.zip":"2bd5c3cc1b428014a038df09d0f6d11399316b3d8de09fe935b317f000b257fb", + "last":"" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xca-2.2.0/misc/build-mac.sh new/xca-2.2.1/misc/build-mac.sh --- old/xca-2.2.0/misc/build-mac.sh 2020-01-29 21:40:04.000000000 +0100 +++ new/xca-2.2.1/misc/build-mac.sh 2020-01-30 20:54:31.000000000 +0100 @@ -1,57 +1,17 @@ #!/bin/sh -e -do_openssl() -{ -set -x -read openssl < "`dirname $0`/../OpenSSL.version" -test -f "$openssl".tar.gz || curl https://www.openssl.org/source/"$openssl".tar.gz > "$openssl".tar.gz -tar zxf "$openssl".tar.gz -(cd $openssl - ./Configure darwin64-x86_64-cc shared --prefix=$INSTALL_DIR $CFLAGS - #./config shared --prefix=$INSTALL_DIR - make && make install_sw -) -chmod 755 $INSTALL_DIR/lib/*.dylib -} - -do_libtool() -{( -read libtool < "`dirname $0`/../Libtool.version" -test -f "$libtool".tar.gz || curl http://ftp.gnu.org/gnu/libtool/"$libtool".tar.gz > "$libtool".tar.gz -tar zxf "$libtool".tar.gz -cd "$libtool" -#export CFLAGS="-arch i386" -./configure --prefix ${INSTALL_DIR} -make && make install -)} - XCA_DIR="`dirname $0`" XCA_DIR="`cd $XCA_DIR/.. && pwd`" -# define the installation dir and the path to the new library -# it will be installed locally in the home directory -export INSTALL_DIR="`pwd`"/install -export DYLD_LIBRARY_PATH=$INSTALL_DIR/lib -export QTDIR=/Users/chris/Qt/5.9.1/clang_64 export CFLAGS="-mmacosx-version-min=10.10" export EXTRA_VERSION="-Yosemite" -if test -f build-libs; then - do_libtool - do_openssl -fi - XCA_BUILD="xca-macbuild" -# configure XCA and build the DMG file rm -rf "$XCA_BUILD" mkdir -p "$XCA_BUILD" cd "$XCA_BUILD" -export CPPFLAGS="$CFLAGS -I${INSTALL_DIR}/include -F$QTDIR" -export CXXFLAGS="$CFLAGS -F$QTDIR" -export LDFLAGS="-L${INSTALL_DIR}/lib" - (cd $XCA_DIR && ./bootstrap) -$XCA_DIR/configure --with-openssl="$INSTALL_DIR" --with-qt=$QTDIR +$XCA_DIR/configure make -j5 cp *.dmg .. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xca-2.2.0/misc/gen-binary-hash new/xca-2.2.1/misc/gen-binary-hash --- old/xca-2.2.0/misc/gen-binary-hash 2020-01-29 21:40:04.000000000 +0100 +++ new/xca-2.2.1/misc/gen-binary-hash 2020-01-30 20:54:31.000000000 +0100 @@ -6,7 +6,7 @@ ( head -n -2 test -z "$dir" || cd $dir - sha256sum * | while read md file; do + sha256sum *xca* | while read md file; do echo ' "'$file'":"'$md'",' done cat <<-EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xca-2.2.0/widgets/MW_database.cpp new/xca-2.2.1/widgets/MW_database.cpp --- old/xca-2.2.0/widgets/MW_database.cpp 2020-01-29 21:40:04.000000000 +0100 +++ new/xca-2.2.1/widgets/MW_database.cpp 2020-01-30 20:54:31.000000000 +0100 @@ -35,6 +35,7 @@ XSqlQuery q; QSqlDatabase db = QSqlDatabase::database(); QStringList tables; + unsigned int i; if (!db.isOpen()) return QSqlError(); @@ -44,7 +45,7 @@ return db.lastError(); for (;;) { - unsigned int i = XSqlQuery::schemaVersion(); + i = XSqlQuery::schemaVersion(); if (i >= ARRAY_SIZE(schemas)) break; foreach(QString sql, schemas[i]) { @@ -56,6 +57,9 @@ } } + if (i != MAX_SCHEMAS) + Error(errorEx(tr("Failed to update the database schema to the current version"))); + TransCommit(); return QSqlError(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xca-2.2.0/widgets/MainWindow.cpp new/xca-2.2.1/widgets/MainWindow.cpp --- old/xca-2.2.0/widgets/MainWindow.cpp 2020-01-29 21:40:04.000000000 +0100 +++ new/xca-2.2.1/widgets/MainWindow.cpp 2020-01-30 20:54:31.000000000 +0100 @@ -763,7 +763,7 @@ return 1; } -void MainWindow::Error(errorEx &err) +void MainWindow::Error(const errorEx &err) { if (err.isEmpty()) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xca-2.2.0/widgets/MainWindow.h new/xca-2.2.1/widgets/MainWindow.h --- old/xca-2.2.0/widgets/MainWindow.h 2020-01-29 21:40:04.000000000 +0100 +++ new/xca-2.2.1/widgets/MainWindow.h 2020-01-30 20:54:31.000000000 +0100 @@ -119,7 +119,7 @@ { return resolver; } - static void Error(errorEx &err); + static void Error(const errorEx &err); static void dbSqlError(QSqlError err = QSqlError()); void cmd_version();
