Hello community, here is the log from the commit of package kgpg for openSUSE:Factory checked in at 2015-11-15 12:35:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kgpg (Old) and /work/SRC/openSUSE:Factory/.kgpg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kgpg" Changes: -------- --- /work/SRC/openSUSE:Factory/kgpg/kgpg.changes 2015-10-19 22:41:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kgpg.new/kgpg.changes 2015-11-15 12:35:16.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Nov 10 20:08:22 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.08.3 + * KDE Applications 15.08.3 + * https://www.kde.org/announcements/announce-applications-15.08.3.php + * boo#954531 + + +------------------------------------------------------------------- Old: ---- kgpg-15.08.2.tar.xz New: ---- kgpg-15.08.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kgpg.spec ++++++ --- /var/tmp/diff_new_pack.MKsLdO/_old 2015-11-15 12:35:17.000000000 +0100 +++ /var/tmp/diff_new_pack.MKsLdO/_new 2015-11-15 12:35:17.000000000 +0100 @@ -17,7 +17,7 @@ Name: kgpg -Version: 15.08.2 +Version: 15.08.3 Release: 0 Summary: Encryption Tool License: GPL-2.0+ ++++++ kgpg-15.08.2.tar.xz -> kgpg-15.08.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.08.2/caff.cpp new/kgpg-15.08.3/caff.cpp --- old/kgpg-15.08.2/caff.cpp 2015-09-22 09:15:10.000000000 +0200 +++ new/kgpg-15.08.3/caff.cpp 2015-11-05 17:13:45.000000000 +0100 @@ -23,6 +23,7 @@ #include "transactions/kgpgexport.h" #include "transactions/kgpgimport.h" #include "transactions/kgpgsignuid.h" +#include "gpgproc.h" #include <KDebug> #include <KLocale> @@ -41,18 +42,22 @@ m_signers(signers), m_flags(flags), m_checklevel(checklevel), + m_gpgVersion(GPGProc::gpgVersion(GPGProc::gpgVersionString(QString()))), m_allids(ids) { const QString gpgCfg = KGpgSettings::gpgConfigPath(); const QString secring = KgpgInterface::getGpgSetting(QLatin1String( "secret-keyring" ), gpgCfg); + QFileInfo fn(gpgCfg); if (!secring.isEmpty()) { m_secringfile = secring; } else { - QFileInfo fn(gpgCfg); fn.setFile(fn.dir(), QLatin1String("secring.gpg")); m_secringfile = QDir::toNativeSeparators(fn.absoluteFilePath()); } + + fn.setFile(fn.dir(), QLatin1String("private-keys-v1.d")); + m_secringdir = QDir::toNativeSeparators(fn.absoluteFilePath()); } KGpgCaffPrivate::~KGpgCaffPrivate() @@ -81,6 +86,13 @@ m_tempdir.reset(new KTempDir()); + if (m_gpgVersion >= 0x20100) { + /* see http://lists.gnupg.org/pipermail/gnupg-devel/2014-December/029296.html */ + QFile seclink(m_secringdir); + + seclink.link(m_tempdir->name() + QLatin1String("private-keys-v1.d")); + } + // export all keys necessary for signing QStringList exportkeys(m_signers); exportkeys << key->getKeyNode()->getId(); @@ -111,7 +123,8 @@ } else { KGpgSignUid *signuid = new KGpgSignUid(this, m_signers.first(), m_allids.first(), false, m_checklevel); signuid->setGnuPGHome(m_tempdir->name()); - signuid->setSecringFile(m_secringfile); + if (m_gpgVersion < 0x20100) + signuid->setSecringFile(m_secringfile); connect(signuid, SIGNAL(done(int)), SLOT(slotSigningFinished(int))); signuid->start(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.08.2/caff_p.h new/kgpg-15.08.3/caff_p.h --- old/kgpg-15.08.2/caff_p.h 2015-09-22 09:15:10.000000000 +0200 +++ new/kgpg-15.08.3/caff_p.h 2015-11-05 17:13:45.000000000 +0100 @@ -36,8 +36,10 @@ QScopedPointer<KTempDir> m_tempdir; QStringList m_signers; QString m_secringfile; + QString m_secringdir; ///< where GnuPG >=2.1 store their secret keyring information const KGpgCaff::OperationFlags m_flags; const KGpgSignTransactionHelper::carefulCheck m_checklevel; + const int m_gpgVersion; void reexportKey(const KGpgSignableNode *node); void abortOperation(int result); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.08.2/kgpg.appdata.xml new/kgpg-15.08.3/kgpg.appdata.xml --- old/kgpg-15.08.2/kgpg.appdata.xml 2015-09-22 09:15:10.000000000 +0200 +++ new/kgpg-15.08.3/kgpg.appdata.xml 2015-11-05 17:13:45.000000000 +0100 @@ -7,6 +7,7 @@ <name xml:lang="ast">KGpg</name> <name xml:lang="bs">KGpg</name> <name xml:lang="ca">KGpg</name> + <name xml:lang="ca-valencia">KGpg</name> <name xml:lang="cs">KGpg</name> <name xml:lang="da">KGpg</name> <name xml:lang="de">KGpg</name> @@ -42,6 +43,7 @@ <summary>Encryption Tool</summary> <summary xml:lang="bs">Kriptografski alat</summary> <summary xml:lang="ca">Eina d'encriptatge</summary> + <summary xml:lang="ca-valencia">Eina d'encriptatge</summary> <summary xml:lang="cs">Nástroj pro šifrování</summary> <summary xml:lang="da">Krypteringsværktøj</summary> <summary xml:lang="de">Verschlüsselungsprogramm</summary> @@ -81,6 +83,7 @@ </p> <p xml:lang="bs">KGpg je jednostavan interfejs za GnuPG, moćnog alata za šifrovanje. On vam može pomoći za postavljanje i upravljanje vašim ključevima, uvoz i izvoz ključeva, da vidite ključne potpise, status poverenja i rok trajanja.</p> <p xml:lang="ca">El KGpg és una interfície senzilla pel GnuPG, una utilitat potent d'encriptatge. Pot ajudar a configurar i gestionar les vostres claus, importar i exportar claus, veure les signatures de les claus, l'estat de confiança i les dates de venciment.</p> + <p xml:lang="ca-valencia">El KGpg és una interfície senzilla pel GnuPG, una utilitat potent d'encriptatge. Pot ajudar a configurar i gestionar les vostres claus, importar i exportar claus, veure les signatures de les claus, l'estat de confiança i les dates de venciment.</p> <p xml:lang="da">KGpg er en nem brugerflade til GnuPG, et kraftfuldt krypteringsværktøj. Det kan hjælpe dig med at opsætte og håndtere dine nøgler, importere og eksportere nøgler, vise nøglesignaturer, betroelsesstatus og udløbsdatoer.</p> <p xml:lang="de">KGpg ist eine einfache Bedienungsoberfläche für GnuPG, ein leistungsfähiges Dienstprogramm zur Verschlüsselung. KGpg kann Ihnen bei der Einrichtung und Verwaltung Ihrer Schlüssel und beim Import und Export von Schlüsseln helfen, kann Schlüsselsignaturen, Vertrauensstatus und Ablaufdaten anzeigen.</p> <p xml:lang="el">Το KGpg είναι μια απλή διεπαφή για το GnuPG, ένα πανίσχυρο εργαλείο κρυπτογράφησης. Σας βοηθάει να ορίσετε και να διαχειριστείτε τα κλειδιά σας, να κάνετε εισαγωγή και εξαγωγή κλειδιών, να δείτε τις ψηφιακές υπογραφές, την κατάσταση εμπιστοσύνης και τις ημερομηνίες λήξης.</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.08.2/main.cpp new/kgpg-15.08.3/main.cpp --- old/kgpg-15.08.2/main.cpp 2015-09-22 09:15:10.000000000 +0200 +++ new/kgpg-15.08.3/main.cpp 2015-11-05 17:13:45.000000000 +0100 @@ -23,7 +23,7 @@ static const char description[] = I18N_NOOP("KGpg - simple gui for gpg\n\nKGpg was designed to make gpg very easy to use.\nI tried to make it as secure as possible.\nHope you enjoy it."); -static const char version[] = "2.16.0"; +static const char version[] = "2.16.1"; int main(int argc, char *argv[]) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.08.2/transactions/kgpgsignuid.cpp new/kgpg-15.08.3/transactions/kgpgsignuid.cpp --- old/kgpg-15.08.2/transactions/kgpgsignuid.cpp 2015-09-22 09:15:10.000000000 +0200 +++ new/kgpg-15.08.3/transactions/kgpgsignuid.cpp 2015-11-05 17:13:45.000000000 +0100 @@ -13,6 +13,7 @@ #include "kgpgsignuid.h" +#include "gpgproc.h" #include "model/kgpgitemnode.h" KGpgSignUid::KGpgSignUid(QObject *parent, const QString &signer, const KGpgSignableNode *uid, const bool local, const carefulCheck checking) @@ -60,6 +61,20 @@ } bool +KGpgSignUid::preStart() +{ + if (!KGpgUidTransaction::preStart()) + return false; + + /* GnuPG >= 2.1 do not send a GOOD_PASSPHRASE anymore which could be used as a trigger that + * everything worked fine, so just assume everything is OK until an ERROR is received. */ + if (GPGProc::gpgVersion(GPGProc::gpgVersionString(QString())) > 0x20100) + setSuccess(TS_OK); + + return true; +} + +bool KGpgSignUid::nextLine(const QString &line) { switch (KGpgSignTransactionHelper::nextLine(line)) { @@ -70,7 +85,15 @@ default: Q_ASSERT(0); case KGpgSignTransactionHelper::notHandled: - return standardCommands(line); + if (line.contains(QLatin1String(" ERROR keysig "))) { + setSuccess(TS_BAD_PASSPHRASE); + return true; + } else if (line.contains(QLatin1String(" ERROR "))) { + setSuccess(TS_MSG_SEQUENCE); + return true; + } else { + return standardCommands(line); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.08.2/transactions/kgpgsignuid.h new/kgpg-15.08.3/transactions/kgpgsignuid.h --- old/kgpg-15.08.2/transactions/kgpgsignuid.h 2015-09-22 09:15:10.000000000 +0200 +++ new/kgpg-15.08.3/transactions/kgpgsignuid.h 2015-11-05 17:13:45.000000000 +0100 @@ -60,6 +60,7 @@ void setUid(const KGpgSignableNode *uid); protected: + virtual bool preStart() Q_DECL_OVERRIDE; virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE; virtual ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE; virtual bool passphraseReceived() Q_DECL_OVERRIDE;
