Hello community, here is the log from the commit of package kgpg for openSUSE:Factory checked in at 2015-01-08 23:17:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-11-19 20:30:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kgpg.new/kgpg.changes 2015-01-08 23:17:32.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Dec 17 20:37:03 UTC 2014 - [email protected] + +- Update to KDE Applications 14.12.0 + * KDE Applications 14.12.0 + * See https://www.kde.org/announcements/announce-applications-14.12.0.php + +------------------------------------------------------------------- Old: ---- kgpg-4.14.3.tar.xz New: ---- kgpg-14.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kgpg.spec ++++++ --- /var/tmp/diff_new_pack.RD3sbN/_old 2015-01-08 23:17:33.000000000 +0100 +++ /var/tmp/diff_new_pack.RD3sbN/_new 2015-01-08 23:17:33.000000000 +0100 @@ -17,7 +17,7 @@ Name: kgpg -Version: 4.14.3 +Version: 14.12.0 Release: 0 Summary: Encryption Tool License: GPL-2.0+ ++++++ kgpg-4.14.3.tar.xz -> kgpg-14.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.14.3/core/KGpgSubkeyNode.cpp new/kgpg-14.12.0/core/KGpgSubkeyNode.cpp --- old/kgpg-4.14.3/core/KGpgSubkeyNode.cpp 2014-10-19 22:56:06.000000000 +0200 +++ new/kgpg-14.12.0/core/KGpgSubkeyNode.cpp 2014-12-09 21:03:22.000000000 +0100 @@ -97,3 +97,15 @@ { return m_parent->toKeyNode(); } + +void +KGpgSubkeyNode::setFingerprint(const QString &fpr) +{ + m_fingerprint = fpr; +} + +const QString & +KGpgSubkeyNode::getFingerprint() const +{ + return m_fingerprint; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.14.3/core/KGpgSubkeyNode.h new/kgpg-14.12.0/core/KGpgSubkeyNode.h --- old/kgpg-4.14.3/core/KGpgSubkeyNode.h 2014-10-19 22:56:06.000000000 +0200 +++ new/kgpg-14.12.0/core/KGpgSubkeyNode.h 2014-12-09 21:03:22.000000000 +0100 @@ -32,6 +32,7 @@ { private: KgpgCore::KgpgKeySub m_skey; + QString m_fingerprint; protected: virtual void readChildren(); @@ -50,6 +51,9 @@ virtual KGpgKeyNode *getKeyNode(void); virtual const KGpgKeyNode *getKeyNode(void) const; virtual KGpgKeyNode *getParentKeyNode() const; + + void setFingerprint(const QString &fpr); + const QString &getFingerprint() const; }; #endif /* KGPGSUBKEYNODE_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.14.3/kgpg.appdata.xml new/kgpg-14.12.0/kgpg.appdata.xml --- old/kgpg-4.14.3/kgpg.appdata.xml 2014-10-19 22:56:06.000000000 +0200 +++ new/kgpg-14.12.0/kgpg.appdata.xml 2014-12-09 21:03:22.000000000 +0100 @@ -8,10 +8,12 @@ <name xml:lang="cs">KGpg</name> <name xml:lang="da">KGpg</name> <name xml:lang="de">KGpg</name> + <name xml:lang="el">KGpg</name> <name xml:lang="en-GB">KGpg</name> <name xml:lang="es">KGpg</name> <name xml:lang="et">KGpg</name> <name xml:lang="fi">KGpg</name> + <name xml:lang="fr">KGpg</name> <name xml:lang="hu">KGpg</name> <name xml:lang="it">KGpg</name> <name xml:lang="ko">KGpg</name> @@ -29,6 +31,7 @@ <name xml:lang="sr-ijekavian">КГПГ</name> <name xml:lang="sr-ijekavianlatin">KGPG</name> <name xml:lang="sv">Kgpg</name> + <name xml:lang="tr">KGpg</name> <name xml:lang="uk">KGpg</name> <name xml:lang="x-test">xxKGpgxx</name> <name xml:lang="zh-CN">KGpg</name> @@ -38,10 +41,12 @@ <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> + <summary xml:lang="el">Εργαλείο κρυπτογράφησης</summary> <summary xml:lang="en-GB">Encryption Tool</summary> <summary xml:lang="es">Herramienta de cifrado</summary> <summary xml:lang="et">Krüptimistööriist</summary> <summary xml:lang="fi">Salaustyökalu</summary> + <summary xml:lang="fr">Outil de chiffrement</summary> <summary xml:lang="hu">Titkosító eszköz</summary> <summary xml:lang="it">Strumento di cifratura</summary> <summary xml:lang="ko">암호화 도구</summary> @@ -59,6 +64,7 @@ <summary xml:lang="sr-ijekavian">Алатка за шифровање</summary> <summary xml:lang="sr-ijekavianlatin">Alatka za šifrovanje</summary> <summary xml:lang="sv">Krypteringsverktyg</summary> + <summary xml:lang="tr">Şifreleme Aracı</summary> <summary xml:lang="uk">Програма для шифрування</summary> <summary xml:lang="x-test">xxEncryption Toolxx</summary> <summary xml:lang="zh-CN">加密工具</summary> @@ -71,6 +77,7 @@ <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="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> <p xml:lang="en-GB">KGpg is a simple interface for GnuPG, a powerful encryption utility. It can help you set up and manage your keys, import and export keys, view key signatures, trust status and expiry dates.</p> <p xml:lang="es">KGpg es una sencilla interfaz para GnuPG, una potente utilidad de cifrado. Puede ayudarle a configurar y gestionar sus claves, a importar y exportar claves, a ver firmas de claves, su nivel de confianza y sus fechas de expiración.</p> <p xml:lang="et">KGpg on võimsa krüptimistööriista GnuPG lihtne graafiline kasutajaliides. See aitab luua ja hallata võtmeid, neid importida ja eksportida, näha võtmete allkirju, usaldusväärsust ja aegumise tähtaega.</p> @@ -91,6 +98,7 @@ <p xml:lang="sr-ijekavian">КГПГ је једноставно сучеље за ГнуПГ, моћну алатку за шифровање. Може вам помоћи да постављате кључеве, управљате њима, увозите их и извозите, као и да приказујете отиске, поузданост и датуме истицања кључева.</p> <p xml:lang="sr-ijekavianlatin">KGPG je jednostavno sučelje za GnuPG, moćnu alatku za šifrovanje. Može vam pomoći da postavljate ključeve, upravljate njima, uvozite ih i izvozite, kao i da prikazujete otiske, pouzdanost i datume isticanja ključeva.</p> <p xml:lang="sv">Kgpg är ett enkelt gränssnitt för GnuPG, ett kraftfullt krypteringsverktyg. Det kan hjälpa till att ställa in och hantera nycklar, importera och exportera nycklar, samt granska nyckelsignaturer, pålitlighetsstatus och utgångsdatum.</p> + <p xml:lang="tr">KGpg, güçlü bir şifreleme aracı olan GnuPG için basit bir arayüzdür. Anahtarlarınızı ayarlamanıza ve yönetmenize, anahtarları içe ve dışa aktarmanıza, anahtar imzalarını, güven seviyelerini ve geçerlilik tarihlerini görüntülemenize yardımcı olur.</p> <p xml:lang="uk">KGpg — простий інтерфейс до GnuPG, потужного засобу шифрування. Програма допоможе вам у керуванні ключами, імпортуванні та експортуванні ключів, перегляді підписів ключів, станів довіри до ключів та даних щодо строку дії ключів.</p> <p xml:lang="x-test">xxKGpg is a simple interface for GnuPG, a powerful encryption utility. It can help you set up and manage your keys, import and export keys, view key signatures, trust status and expiry dates.xx</p> <p xml:lang="zh-CN">KGpg 是压缩工具 GnuPG 的简单界面，可以设置和管理密钥，导入导出密钥，查看密钥签名、信任状态和过期时间。</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.14.3/kgpg.cpp new/kgpg-14.12.0/kgpg.cpp --- old/kgpg-4.14.3/kgpg.cpp 2014-10-19 22:56:06.000000000 +0200 +++ new/kgpg-14.12.0/kgpg.cpp 2014-12-09 21:03:22.000000000 +0100 @@ -1,10 +1,8 @@ -/*************************************************************************** - kgpg.cpp - description - ------------------- - begin : Mon Nov 18 2002 - copyright : (C) 2002 by Jean-Baptiste Mardelle - email : [email protected] - ***************************************************************************/ +/* + * Copyright (C) 2002 Jean-Baptiste Mardelle <[email protected]> + * Copyright (C) 2007,2008,2009,2010,2011,2012,2013,2014 + * Rolf Eike Beer <[email protected]> + */ /*************************************************************************** * * @@ -69,10 +67,9 @@ if (!running) { running = true; - const QString gpgPath(KGpgSettings::gpgConfigPath()); - const QString gpgError = GPGProc::getGpgStartupError(KGpgSettings::gpgBinaryPath()); if (!gpgError.isEmpty()) { + running = false; KMessageBox::detailedError(0, i18n("GnuPG failed to start.<br />You must fix the GnuPG error first before running KGpg."), gpgError, i18n("GnuPG error")); KApplication::quit(); } @@ -85,8 +82,16 @@ connect(w, SIGNAL(updateDefault(QString)), SLOT(assistantOver(QString))); connect(w, SIGNAL(createNewKey()), s_keyManager, SLOT(slotGenerateKey())); + const QString gpgPath = KGpgSettings::gpgConfigPath(); + if (!gpgPath.isEmpty()) { - if ((KgpgInterface::getGpgBoolSetting(QLatin1String( "use-agent" ), gpgPath)) && (qgetenv("GPG_AGENT_INFO").isEmpty())) + const int gpgver = GPGProc::gpgVersion(GPGProc::gpgVersionString(KGpgSettings::gpgBinaryPath())); + + // Warn if sign of a properly running gpg-agent cannot be determined + // The environment variable has been removed in GnuPG 2.1, the agent is started internally by + // any program part of GnuPG that needs it, so simply assume everything is fine. + if ((gpgver < 0x20100) && KgpgInterface::getGpgBoolSetting(QLatin1String("use-agent"), gpgPath) && + qgetenv("GPG_AGENT_INFO").isEmpty()) KMessageBox::sorry(0, i18n("<qt>The use of <b>GnuPG Agent</b> is enabled in GnuPG's configuration file (%1).<br />" "However, the agent does not seem to be running. This could result in problems with signing/decryption.<br />" "Please disable GnuPG Agent from KGpg settings, or fix the agent.</qt>", gpgPath)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.14.3/kgpg.kcfg new/kgpg-14.12.0/kgpg.kcfg --- old/kgpg-4.14.3/kgpg.kcfg 2014-10-19 22:56:06.000000000 +0200 +++ new/kgpg-14.12.0/kgpg.kcfg 2014-12-09 21:03:22.000000000 +0100 @@ -104,7 +104,7 @@ </entry> <entry name="ShowLongKeyId" type="Bool" key="show_long_keyid"> <label>Show long key id in key manager.</label> - <default>false</default> + <default>true</default> </entry> <entry name="TrustLevel" type="Enum" key="trust filter"> <label>Show only keys with at least that trust level in key manager.</label> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.14.3/kgpginterface.cpp new/kgpg-14.12.0/kgpginterface.cpp --- old/kgpg-4.14.3/kgpginterface.cpp 2014-10-19 22:56:06.000000000 +0200 +++ new/kgpg-14.12.0/kgpginterface.cpp 2014-12-09 21:03:22.000000000 +0100 @@ -190,10 +190,13 @@ publickey->setValid(enabled); // disabled key idIndex = 0; - } else if (publickey && (lsp.at(0) == QLatin1String( "fpr" )) && (items >= 10)) { - const QString fingervalue(lsp.at(9)); + } else if (publickey && (lsp.at(0) == QLatin1String("fpr")) && (items >= 10)) { + const QString fingervalue = lsp.at(9); - publickey->setFingerprint(fingervalue); + if ((currentSNode != NULL) && (currentSNode->getType() == ITYPE_SUB)) + static_cast<KGpgSubkeyNode *>(currentSNode)->setFingerprint(fingervalue); + else + publickey->setFingerprint(fingervalue); } else if (publickey && (lsp.at(0) == QLatin1String( "sub" )) && (items >= 7)) { KgpgSubKeyType subtype; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.14.3/main.cpp new/kgpg-14.12.0/main.cpp --- old/kgpg-4.14.3/main.cpp 2014-10-19 22:56:06.000000000 +0200 +++ new/kgpg-14.12.0/main.cpp 2014-12-09 21:03:22.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.13.1"; +static const char version[] = "2.14.00"; int main(int argc, char *argv[]) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.14.3/model/kgpgitemmodel.cpp new/kgpg-14.12.0/model/kgpgitemmodel.cpp --- old/kgpg-4.14.3/model/kgpgitemmodel.cpp 2014-10-19 22:56:06.000000000 +0200 +++ new/kgpg-14.12.0/model/kgpgitemmodel.cpp 2014-12-09 21:03:22.000000000 +0100 @@ -214,6 +214,8 @@ return node->toKeyNode()->getFingerprint(); case ITYPE_SECRET: return node->toOrphanNode()->getFingerprint(); + case ITYPE_SUB: + return node->toSubkeyNode()->getFingerprint(); default: return QVariant(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.14.3/transactions/kgpgtransactionjob.cpp new/kgpg-14.12.0/transactions/kgpgtransactionjob.cpp --- old/kgpg-4.14.3/transactions/kgpgtransactionjob.cpp 2014-10-19 22:56:06.000000000 +0200 +++ new/kgpg-14.12.0/transactions/kgpgtransactionjob.cpp 2014-12-09 21:03:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009,2012 Rolf Eike Beer <[email protected]> + * Copyright (C) 2009,2010,2012,2014 Rolf Eike Beer <[email protected]> */ /*************************************************************************** @@ -20,7 +20,8 @@ KGpgTransactionJob::KGpgTransactionJob(KGpgTransaction *transaction) : KJob(transaction->parent()), m_transaction(transaction), - m_result(-1) + m_result(-1), + m_wasKilled(false) { } @@ -56,7 +57,8 @@ KGpgTransactionJob::slotTransactionDone(int result) { m_result = result; - emitResult(); + if (!m_wasKilled) + emitResult(); } void @@ -75,9 +77,9 @@ KGpgTransactionJob::doKill() { m_transaction->kill(); + m_wasKilled = true; return true; } - #include "kgpgtransactionjob.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.14.3/transactions/kgpgtransactionjob.h new/kgpg-14.12.0/transactions/kgpgtransactionjob.h --- old/kgpg-4.14.3/transactions/kgpgtransactionjob.h 2014-10-19 22:56:06.000000000 +0200 +++ new/kgpg-14.12.0/transactions/kgpgtransactionjob.h 2014-12-09 21:03:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Rolf Eike Beer <[email protected]> + * Copyright (C) 2009,2010,2012,2014 Rolf Eike Beer <[email protected]> */ /*************************************************************************** @@ -31,9 +31,6 @@ Q_DISABLE_COPY(KGpgTransactionJob) KGpgTransactionJob(); // = delete C++0x - KGpgTransaction * const m_transaction; - int m_result; - public: /** * @brief create a new KJob for this transaction @@ -70,8 +67,11 @@ void slotTransactionDone(int result); void slotStatusMessage(const QString &plain); void slotInfoProgress(qulonglong processedAmount, qulonglong totalAmount); + +private: + KGpgTransaction * const m_transaction; + int m_result; + bool m_wasKilled; }; #endif - - -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
