Hello community, here is the log from the commit of package enigmail for openSUSE:Factory checked in at 2017-05-17 10:54:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/enigmail (Old) and /work/SRC/openSUSE:Factory/.enigmail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "enigmail" Wed May 17 10:54:34 2017 rev:14 rq:495328 version:1.9.7 Changes: -------- --- /work/SRC/openSUSE:Factory/enigmail/enigmail.changes 2016-11-22 18:58:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.enigmail.new/enigmail.changes 2017-05-17 10:54:36.212722493 +0200 @@ -1,0 +2,7 @@ +Mon May 15 16:47:41 UTC 2017 - [email protected] + +- enigmail 1.9.7: + * This version fixes a compatibility bug on Thunderbird 52 that + makes keyserver up/downloads unusable + +------------------------------------------------------------------- Old: ---- enigmail-1.9.6.1.tar.gz enigmail-1.9.6.1.tar.gz.asc New: ---- enigmail-1.9.7.tar.gz enigmail-1.9.7.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enigmail.spec ++++++ --- /var/tmp/diff_new_pack.YkF1sH/_old 2017-05-17 10:54:37.020608841 +0200 +++ /var/tmp/diff_new_pack.YkF1sH/_new 2017-05-17 10:54:37.028607715 +0200 @@ -1,7 +1,7 @@ # # spec file for package enigmail # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2014 Wolfgang Rosenauer <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: enigmail -Version: 1.9.6.1 +Version: 1.9.7 Release: 0 Summary: OpenPGP addon for Thunderbird and SeaMonkey License: MPL-2.0 ++++++ enigmail-1.9.6.1.tar.gz -> enigmail-1.9.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/Makefile new/enigmail/Makefile --- old/enigmail/Makefile 2016-11-16 13:04:27.000000000 +0100 +++ new/enigmail/Makefile 2017-05-13 18:09:37.000000000 +0200 @@ -3,7 +3,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. XPI_MODULE = enigmail -XPI_MODULE_VERS = 1.9.6.1 +XPI_MODULE_VERS = 1.9.7 DEPTH = . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/gpgAgent.jsm new/enigmail/package/gpgAgent.jsm --- old/enigmail/package/gpgAgent.jsm 2016-11-16 13:04:27.000000000 +0100 +++ new/enigmail/package/gpgAgent.jsm 2017-05-13 18:09:37.000000000 +0200 @@ -584,7 +584,12 @@ let filePath = cloneOrNull(EnigmailGpgAgent.agentPath); - if (filePath) filePath = filePath.parent; + if (filePath) { + // try to get the install directory of gpg/gpg2 executable + filePath.normalize(); + filePath = filePath.parent; + } + if (filePath) { filePath.append(fileName); if (filePath.exists()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/install.rdf new/enigmail/package/install.rdf --- old/enigmail/package/install.rdf 2016-11-16 13:04:27.000000000 +0100 +++ new/enigmail/package/install.rdf 2017-05-13 18:09:37.000000000 +0200 @@ -5,7 +5,7 @@ <Description about="urn:mozilla:install-manifest"> <em:id>{847b3a00-7ab1-11d4-8f02-006008948af5}</em:id> - <em:version>1.9.6.1</em:version> + <em:version>1.9.7</em:version> <em:type>2</em:type> <!-- type = extension --> <em:unpack>true</em:unpack> @@ -16,7 +16,7 @@ <Description> <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> <em:minVersion>38.0</em:minVersion> - <em:maxVersion>51.0</em:maxVersion> + <em:maxVersion>56.0</em:maxVersion> </Description> </em:targetApplication> <em:targetApplication> @@ -24,7 +24,7 @@ <Description> <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id> <em:minVersion>2.35</em:minVersion> - <em:maxVersion>2.48</em:maxVersion> + <em:maxVersion>2.53</em:maxVersion> </Description> </em:targetApplication> <!-- em:targetApplication> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigRetrieveProgress.js new/enigmail/ui/content/enigRetrieveProgress.js --- old/enigmail/ui/content/enigRetrieveProgress.js 2016-11-16 13:04:27.000000000 +0100 +++ new/enigmail/ui/content/enigRetrieveProgress.js 2017-05-13 18:09:37.000000000 +0200 @@ -9,7 +9,7 @@ // Uses: chrome://enigmail/content/enigmailCommon.js -/* global EnigmailLog: false, doSetOKCancel: false, EnigmailLocale: false, EnigmailKeyServer: false */ +/* global EnigmailLog: false, EnigmailLocale: false, EnigmailKeyServer: false */ /* global EnigmailErrorHandling: false */ // from enigmailCommon.js: @@ -96,13 +96,6 @@ if (!enigmailSvc) return; - // Set up dialog button callbacks. - var object = this; - doSetOKCancel("", function() { - return object.onCancel(); - }); - - var statTxt = document.getElementById("dialog.status2"); if (inArg.accessType == nsIEnigmail.UPLOAD_KEY) { statTxt.value = EnigmailLocale.getString("keyserverProgress.uploading"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailSetupWizard.js new/enigmail/ui/content/enigmailSetupWizard.js --- old/enigmail/ui/content/enigmailSetupWizard.js 2016-11-16 13:04:27.000000000 +0100 +++ new/enigmail/ui/content/enigmailSetupWizard.js 2017-05-13 18:09:37.000000000 +0200 @@ -1260,10 +1260,16 @@ function doImportSettings() { EnigmailLog.DEBUG("enigmailSetupWizard.js: importSettings\n"); let importFile = gImportSettingsFile.value; - if (!importFile.exists()) return false; + if (!importFile.exists()) { + EnigmailLog.DEBUG("enigmailSetupWizard.js: importSettings: Importfile doesn't exist!\n"); + return false; + } importFile.normalize(); - if (!importFile.isFile()) return false; + if (!importFile.isFile()) { + EnigmailLog.DEBUG("enigmailSetupWizard.js: importSettings: Importfile is not a normal file!\n"); + return false; + } document.getElementById("errorMessage").setAttribute("hidden", "true"); document.getElementById("importInProgress").removeAttribute("hidden"); @@ -1273,6 +1279,7 @@ zipR = EnigmailFiles.openZipFile(importFile); } catch (ex) { + EnigmailLog.DEBUG("enigmailSetupWizard.js: importSettings - openZipFile() failed with " + ex.toString() + "\n" + ex.stack + "\n"); EnigAlert(EnigGetString("setupWizard.invalidSettingsFile")); return false; } @@ -1282,6 +1289,7 @@ cfg = ensureGpgHomeDir(); } catch (ex) { + EnigmailLog.DEBUG("enigmailSetupWizard.js: importSettings - ensureGpgHomeDir() failed with " + ex.toString() + "\n" + ex.stack + "\n"); return false; } @@ -1291,14 +1299,21 @@ let files = ["keyring.asc", "ownertrust.txt", "prefs.json"]; + let filesAreMissing = false; + // check if mandatory files are included for (let i in files) { if (!zipR.hasEntry(files[i])) { - EnigAlert(EnigGetString("setupWizard.invalidSettingsFile")); - return false; + filesAreMissing = true; + EnigmailLog.DEBUG("enigmailSetupWizard.js: importSettings: InvalidSettingsFile, missing: " + files[i] + "\n"); } } + if (filesAreMissing) { + EnigAlert(EnigGetString("setupWizard.invalidSettingsFile")); + return false; + } + // append optional files files.push("gpg.conf"); @@ -1331,6 +1346,7 @@ cfgFile.append("gpg.conf"); if (cfgFile.exists()) { if (!EnigConfirm(EnigGetString("setupWizard.gpgConfExists"), EnigGetString("dlg.button.overwrite"), EnigGetString("dlg.button.skip"))) { + EnigmailLog.DEBUG("enigmailSetupWizard.js: importSettings: User has chosen to keep the already existing local gpg.conf.\n"); doCfgFile = false; } } @@ -1340,11 +1356,11 @@ if (doCfgFile) tmpFile.moveTo(cfg.homeDir, "gpg.conf"); } catch (ex) { - EnigmailLog.DEBUG("error with gpg.conf " + ex.toString() + "\n"); + EnigmailLog.DEBUG("enigmailSetupWizard.js: importSettings: Error with gpg.conf " + ex.toString() + "\n"); } } else { - EnigmailLog.DEBUG("no gpg.conf file\n"); + EnigmailLog.DEBUG("enigmailSetupWizard.js: importSettings: Remark: no gpg.conf file in archive.\n"); } tmpFile = tmpDir.clone();
