diff -up kdelibs-4.7.0/knewstuff/knewstuff2/core/security.cpp.knewstuff2_gpg2 kdelibs-4.7.0/knewstuff/knewstuff2/core/security.cpp --- kdelibs-4.7.0/knewstuff/knewstuff2/core/security.cpp.knewstuff2_gpg2 2011-05-20 15:24:54.000000000 -0500 +++ kdelibs-4.7.0/knewstuff/knewstuff2/core/security.cpp 2011-09-06 11:29:18.939251150 -0500 @@ -36,9 +36,20 @@ #include #include #include +#include using namespace KNS; +static QString gpgExecutable() +{ + QString gpgExe = KStandardDirs::findExe( "gpg" ); + if ( gpgExe.isEmpty() ) + gpgExe = KStandardDirs::findExe( "gpg2" ); + if ( gpgExe.isEmpty() ) + return QLatin1String( "gpg" ); + return gpgExe; +} + Security::Security() { m_keysRead = false; @@ -61,7 +72,7 @@ void Security::readKeys() m_runMode = List; m_keys.clear(); m_process = new KProcess(); - *m_process << "gpg" + *m_process << gpgExecutable() << "--no-secmem-warning" << "--no-tty" << "--with-colon" @@ -87,7 +98,7 @@ void Security::readSecretKeys() } m_runMode = ListSecret; m_process = new KProcess(); - *m_process << "gpg" + *m_process << gpgExecutable() << "--no-secmem-warning" << "--no-tty" << "--with-colon" @@ -260,7 +271,7 @@ void Security::slotCheckValidity() //verify the signature m_process = new KProcess(); - *m_process << "gpg" + *m_process << gpgExecutable() << "--no-secmem-warning" << "--status-fd=2" << "--command-fd=0" @@ -342,7 +353,7 @@ void Security::slotSignFile() //verify the signature m_process = new KProcess(); - *m_process << "gpg" + *m_process << gpgExecutable() << "--no-secmem-warning" << "--status-fd=2" << "--command-fd=0"