Hello community, here is the log from the commit of package enigmail for openSUSE:Factory checked in at 2016-07-14 09:50:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/enigmail (Old) and /work/SRC/openSUSE:Factory/.enigmail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "enigmail" Changes: -------- --- /work/SRC/openSUSE:Factory/enigmail/enigmail.changes 2016-06-09 16:17:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.enigmail.new/enigmail.changes 2016-07-14 09:50:45.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 13 13:14:13 UTC 2016 - [email protected] + +- enigmail 1.9.4: + * Improved compatibility with Send Later add-on + * Various bugs fixed + +------------------------------------------------------------------- Old: ---- enigmail-1.9.3.tar.gz enigmail-1.9.3.tar.gz.asc New: ---- enigmail-1.9.4.tar.gz enigmail-1.9.4.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enigmail.spec ++++++ --- /var/tmp/diff_new_pack.irSwZk/_old 2016-07-14 09:50:46.000000000 +0200 +++ /var/tmp/diff_new_pack.irSwZk/_new 2016-07-14 09:50:46.000000000 +0200 @@ -18,7 +18,7 @@ Name: enigmail -Version: 1.9.3 +Version: 1.9.4 Release: 0 Summary: OpenPGP addon for Thunderbird and SeaMonkey License: MPL-1.1 or GPL-2.0+ @@ -44,6 +44,7 @@ %setup -q -n enigmail %build +# FIXME: you should use the %%configure macro ./configure \ CFLAGS="%{optflags}" # parallel build not supported ++++++ enigmail-1.9.3.tar.gz -> enigmail-1.9.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/Makefile new/enigmail/Makefile --- old/enigmail/Makefile 2016-06-03 16:13:30.000000000 +0200 +++ new/enigmail/Makefile 2016-07-04 17:34:04.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.3 +XPI_MODULE_VERS = 1.9.4 DEPTH = . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/configure new/enigmail/configure --- old/enigmail/configure 2016-06-03 16:13:30.000000000 +0200 +++ new/enigmail/configure 2016-07-04 17:34:04.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for enigmail 1.9.3. +# Generated by GNU Autoconf 2.69 for enigmail 1.9.4. # # Report bugs to <https://www.enigmail.net>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='enigmail' PACKAGE_TARNAME='enigmail' -PACKAGE_VERSION='1.9.3' -PACKAGE_STRING='enigmail 1.9.3' +PACKAGE_VERSION='1.9.4' +PACKAGE_STRING='enigmail 1.9.4' PACKAGE_BUGREPORT='https://www.enigmail.net' PACKAGE_URL='' @@ -1195,7 +1195,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 enigmail 1.9.3 to adapt to many kinds of systems. +\`configure' configures enigmail 1.9.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1261,7 +1261,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of enigmail 1.9.3:";; + short | recursive ) echo "Configuration of enigmail 1.9.4:";; esac cat <<\_ACEOF @@ -1343,7 +1343,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -enigmail configure 1.9.3 +enigmail configure 1.9.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by enigmail $as_me 1.9.3, which was +It was created by enigmail $as_me 1.9.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2595,7 +2595,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by enigmail $as_me 1.9.3, which was +This file was extended by enigmail $as_me 1.9.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2648,7 +2648,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -enigmail config.status 1.9.3 +enigmail config.status 1.9.4 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/enigmail/configure.ac new/enigmail/configure.ac --- old/enigmail/configure.ac 2016-06-03 16:13:30.000000000 +0200 +++ new/enigmail/configure.ac 2016-07-04 17:34:04.000000000 +0200 @@ -2,7 +2,7 @@ AC_PREREQ(2.61) min_automake_version="1.10" -AC_INIT([enigmail],[1.9.3], [https://www.enigmail.net]) +AC_INIT([enigmail],[1.9.4], [https://www.enigmail.net]) AC_PATH_PROG(PYTHON, "python2") 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-06-03 16:13:30.000000000 +0200 +++ new/enigmail/package/install.rdf 2016-07-04 17:34:04.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.3</em:version> + <em:version>1.9.4</em:version> <em:type>2</em:type> <!-- type = extension --> <em:unpack>true</em:unpack> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/keyEditor.jsm new/enigmail/package/keyEditor.jsm --- old/enigmail/package/keyEditor.jsm 2016-06-03 16:13:30.000000000 +0200 +++ new/enigmail/package/keyEditor.jsm 2016-07-04 17:34:04.000000000 +0200 @@ -421,7 +421,7 @@ deleteKey: function(parent, keyId, deleteSecretKey, callbackFunc) { EnigmailLog.DEBUG("keyManagmenent.jsm: Enigmail.addUid: keyId=" + keyId + ", deleteSecretKey=" + deleteSecretKey + "\n"); - var cmd = (deleteSecretKey ? "--delete-secret-and-public-key" : "--delete-key"); + var cmd = ["--yes", (deleteSecretKey ? "--delete-secret-and-public-key" : "--delete-key")]; return editKey(parent, false, null, keyId, cmd, { usePassphrase: true }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/pgpmimeHandler.js new/enigmail/package/pgpmimeHandler.js --- old/enigmail/package/pgpmimeHandler.js 2016-06-03 16:13:30.000000000 +0200 +++ new/enigmail/package/pgpmimeHandler.js 2016-07-04 17:34:04.000000000 +0200 @@ -29,6 +29,7 @@ var gConv; var inStream; +var gLastEncryptedUri = ""; const throwErrors = { onDataAvailable: function() { @@ -134,6 +135,10 @@ if (ct.search(/^multipart\/encrypted/i) === 0) { // PGP/MIME encrypted message + if (uri) { + let u = uri.QueryInterface(Ci.nsIURI); + gLastEncryptedUri = u.spec; + } cth = new EnigmailMimeDecrypt(); } else if (ct.search(/^multipart\/signed/i) === 0) { @@ -143,13 +148,18 @@ } else if (ct.search(/application\/(x-)?pkcs7-signature/i) > 0) { // S/MIME signed message - if (EnigmailVerify.lastMsgWindow) { + let lastUriSpec = ""; + if (uri) { + let u = uri.QueryInterface(Ci.nsIURI); + lastUriSpec = u.spec; + } + if (lastUriSpec !== gLastEncryptedUri && EnigmailVerify.lastMsgWindow) { // if message is displayed then handle like S/MIME message return this.handleSmime(uri); } else { // otherwise just make sure message body is returned - cth = EnigmailVerify.newVerifier("application/pkcs7-signature"); + cth = EnigmailVerify.newVerifier("application/(x-)?pkcs7-signature"); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailFilterEditorOverlay.js new/enigmail/ui/content/enigmailFilterEditorOverlay.js --- old/enigmail/ui/content/enigmailFilterEditorOverlay.js 2016-06-03 16:13:30.000000000 +0200 +++ new/enigmail/ui/content/enigmailFilterEditorOverlay.js 2016-07-04 17:34:04.000000000 +0200 @@ -8,11 +8,15 @@ "use strict"; -/* global gActionListOrdered: false */ +/* global gActionListOrdered: false, checkActionsReorder: true */ Components.utils.import("resource://enigmail/timer.jsm"); /*global EnigmailTimer: false */ -var enigmail_origCheckActionsReorder = function() { +// Overwrite the original checkActionsReorder function + +var enigmail_origCheckActionsReorder = checkActionsReorder; + +checkActionsReorder = function() { enigmail_origCheckActionsReorder(); EnigmailTimer.setTimeout(EnigmailFilterEditor.checkMoveAction.bind(EnigmailFilterEditor), 0); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailFilterEditorOverlay.xul new/enigmail/ui/content/enigmailFilterEditorOverlay.xul --- old/enigmail/ui/content/enigmailFilterEditorOverlay.xul 2016-06-03 16:13:30.000000000 +0200 +++ new/enigmail/ui/content/enigmailFilterEditorOverlay.xul 2016-07-04 17:34:04.000000000 +0200 @@ -18,7 +18,7 @@ <script type="application/x-javascript" src="chrome://enigmail/content/enigmailFilterEditorOverlay.js"/> <vbox insertafter="statusbar"> - <hbox id="enigmailInfobar" style="visibility: visible"> + <hbox id="enigmailInfobar" style="visibility: hidden"> <image class="enigmailWarningIcon"/> <label value="&enigmail.filterEditor.moveError.label;"/> </hbox> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailMsgComposeOverlay.js new/enigmail/ui/content/enigmailMsgComposeOverlay.js --- old/enigmail/ui/content/enigmailMsgComposeOverlay.js 2016-06-03 16:13:30.000000000 +0200 +++ new/enigmail/ui/content/enigmailMsgComposeOverlay.js 2016-07-04 17:34:04.000000000 +0200 @@ -3748,8 +3748,30 @@ } }, + /** + * Handle the 'compose-send-message' event from TB + */ sendMessageListener: function(event) { EnigmailLog.DEBUG("enigmailMsgComposeOverlay.js: Enigmail.msg.sendMessageListener\n"); + + // Do nothing if a compatible version of the "SendLater" addon is installed. + // SendLater will call handleSendMessageEvent when needed. + + try { + if (typeof(Sendlater3Composing.callEnigmail) === "function") { + return; + } + } + catch (ex) {} + + Enigmail.msg.handleSendMessageEvent(event); + }, + + /** + * Perform handling of the compose-send-message' event from TB (or SendLater) + */ + handleSendMessageEvent: function(event) { + EnigmailLog.DEBUG("enigmailMsgComposeOverlay.js: Enigmail.msg.handleSendMessageEvent\n"); let msgcomposeWindow = document.getElementById("msgcomposeWindow"); let sendMsgType = Number(msgcomposeWindow.getAttribute("msgtype")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailMsgHdrViewOverlay.js new/enigmail/ui/content/enigmailMsgHdrViewOverlay.js --- old/enigmail/ui/content/enigmailMsgHdrViewOverlay.js 2016-06-03 16:13:30.000000000 +0200 +++ new/enigmail/ui/content/enigmailMsgHdrViewOverlay.js 2016-07-04 17:34:04.000000000 +0200 @@ -764,7 +764,7 @@ msgHdrViewUnhide: function(event) { EnigmailLog.DEBUG("enigmailMsgHdrViewOverlay.js: this.msgHdrViewUnhide:\n"); - if (Enigmail.msg.securityInfo.statusFlags !== 0) { + if (Enigmail.msg.securityInfo && Enigmail.msg.securityInfo.statusFlags !== 0) { this.enigmailBox.removeAttribute("collapsed"); } }, @@ -997,14 +997,18 @@ catch (ex) { EnigmailLog.DEBUG("enigmailMsgHdrViewOverlay.js: EnigMimeHeaderSink.isCurrentMessage: could not determine URL\n"); url.value = { + host: "invalid", + path: "/message", + scheme: "enigmail", spec: "enigmail://invalid/message" }; } EnigmailLog.DEBUG("enigmailMsgHdrViewOverlay.js: EnigMimeHeaderSink.isCurrentMessage: url=" + url.value.spec + "\n"); - if (!uriSpec || uriSpec.search(/^enigmail:/) === 0 || (uriSpec.indexOf(url.value.spec) === 0 && - uriSpec.substr(url.value.spec.length).search(/([\?&].*)?$/) === 0)) { + if (!uriSpec || uriSpec.search(/^enigmail:/) === 0 || + (uri.host == url.value.host && + uri.path.substr(url.value.path.length).search(/([\?&].*)?$/) === 0)) { return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailSearchKey.js new/enigmail/ui/content/enigmailSearchKey.js --- old/enigmail/ui/content/enigmailSearchKey.js 2016-06-03 16:13:30.000000000 +0200 +++ new/enigmail/ui/content/enigmailSearchKey.js 2016-07-04 17:34:04.000000000 +0200 @@ -48,7 +48,7 @@ window.arguments[RESULT].importedKeys = 0; - var keyserver = window.arguments[INPUT].keyserver; + var keyserver = window.arguments[INPUT].keyserver.toLowerCase(); var protocol = ""; if (keyserver.search(/^[a-zA-Z0-9\-\_\.]+:\/\//) === 0) { protocol = keyserver.replace(/^([a-zA-Z0-9\-\_\.]+)(:\/\/.*)/, "$1"); @@ -77,6 +77,18 @@ port = m[3]; } + let reqType; + if (protocol === "keybase" || keyserver === "keybase.io") { + reqType = ENIG_CONN_TYPE_KEYBASE; + protocol = "keybase"; + } + else if (EnigmailPrefs.getPref("useGpgKeysTool")) { + reqType = ENIG_CONN_TYPE_GPGKEYS; + } + else { + reqType = ENIG_CONN_TYPE_HTTP; + } + gEnigRequest = { searchList: window.arguments[INPUT].searchList, keyNum: 0, @@ -84,7 +96,7 @@ port: port, protocol: protocol, keyList: [], - requestType: (EnigmailPrefs.getPref("useGpgKeysTool") ? ENIG_CONN_TYPE_GPGKEYS : ENIG_CONN_TYPE_HTTP), + requestType: reqType, gpgkeysRequest: null, progressMeter: document.getElementById("dialog.progress"), httpInProgress: false @@ -105,6 +117,7 @@ else { switch (gEnigRequest.requestType) { case ENIG_CONN_TYPE_HTTP: + case ENIG_CONN_TYPE_KEYBASE: newHttpRequest(nsIEnigmail.SEARCH_KEY, scanKeys); break; case ENIG_CONN_TYPE_GPGKEYS: @@ -236,26 +249,36 @@ window.close(); } -function statusLoadedKeybase(event) { - EnigmailLog.DEBUG("enigmailSearchKey.js: statusLoadedKeybase\n"); +function onStatusLoaded(request, connectionType) { + EnigmailLog.DEBUG("enigmailSearchKey.js: onStatusLoaded\n"); - if (this.status == 200) { + if (request.status == 200) { // de-HTMLize the result - var htmlTxt = this.responseText.replace(/<([^<>]+)>/g, ""); + var htmlTxt = request.responseText.replace(/<([^<>]+)>/g, ""); - this.requestCallbackFunc(ENIG_CONN_TYPE_HTTP, htmlTxt, ""); + request.requestCallbackFunc(connectionType, htmlTxt, ""); } - else if (this.status == 500 && this.statusText == "OK") { - this.requestCallbackFunc(ENIG_CONN_TYPE_HTTP, "no keys found", "[GNUPG:] NODATA 1\n"); + else if (request.status == 500 && request.statusText == "OK") { + request.requestCallbackFunc(ENIG_CONN_TYPE_HTTP, "no keys found", "[GNUPG:] NODATA 1\n"); } - else if (this.statusText != "OK") { - EnigmailDialog.alert(window, EnigmailLocale.getString("keyDownloadFailed", this.statusText)); + else if (request.statusText != "OK") { + EnigmailDialog.alert(window, EnigmailLocale.getString("keyDownloadFailed", request.statusText)); closeDialog(); return; } +} +function statusLoadedKeybase(event) { + EnigmailLog.DEBUG("enigmailSearchKey.js: statusLoadedKeybase\n"); + + onStatusLoaded(this, ENIG_CONN_TYPE_KEYBASE); } +function statusLoadedHttp(event) { + EnigmailLog.DEBUG("enigmailSearchKey.js: statusLoadedHttp\n"); + + onStatusLoaded(this, ENIG_CONN_TYPE_HTTP); +} function importKeys(connType, txt, errorTxt) { EnigmailLog.DEBUG("enigmailSearchKey.js: importKeys\n"); @@ -349,18 +372,17 @@ if (resp.them[hit] !== null) { var uiFlags = nsIEnigmail.UI_ALLOW_KEY_IMPORT; - var r = EnigmailKeyRing.importKey(window, uiFlags, + var r = EnigmailKeyRing.importKey(window, false, resp.them[hit].public_keys.primary.bundle, gEnigRequest.dlKeyList[gEnigRequest.keyNum - 1], errorMsgObj); - if (errorMsgObj.value) { - EnigmailDialog.alert(window, errorMsgObj.value); - } - if (r === 0) { window.arguments[RESULT].importedKeys++; } + else if (errorMsgObj.value) { + EnigmailDialog.alert(window, errorMsgObj.value); + } } } } @@ -421,6 +443,8 @@ return; } + EnigmailLog.DEBUG("enigmailSearchKey.js: newHttpRequest: requesting " + reqCommand + "\n"); + gEnigRequest.httpInProgress = true; httpReq.open("GET", reqCommand); httpReq.onerror = statusError; @@ -429,7 +453,7 @@ httpReq.onload = statusLoadedKeybase; } else { - httpReq.onload = statusLoadedKeybase; + httpReq.onload = statusLoadedHttp; } httpReq.requestCallbackFunc = requestCallbackFunc; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/locale/en-US/enigmail.properties new/enigmail/ui/locale/en-US/enigmail.properties --- old/enigmail/ui/locale/en-US/enigmail.properties 2016-06-03 16:13:30.000000000 +0200 +++ new/enigmail/ui/locale/en-US/enigmail.properties 2016-07-04 17:34:04.000000000 +0200 @@ -198,7 +198,7 @@ encryptOff=Encryption: OFF encryptOnWithReason=Encryption: ON (%S) encryptOffWithReason=Encryption: OFF (%S) -encryptOn=Encrytion: ON +encryptOn=Encryption: ON signOn=Signing: ON signOff=Signing: OFF signOnWithReason=Signing: ON (%S)
