[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#945066: marked as done (buster-pu: package enigmail/2:2.1.3+ds1-4~deb10u1)



Your message dated Sat, 23 Nov 2019 18:46:58 +0100
with message-id <20191123174658.GA6757@tomate.cristau.org>
and subject line Re: Bug#945066: buster-pu: package enigmail/2:2.1.3+ds1-4~deb10u1
has caused the Debian Bug report #945066,
regarding buster-pu: package enigmail/2:2.1.3+ds1-4~deb10u1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
945066: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=945066
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: pu
Tags: buster
Severity: normal
Control: affects -1 enigmail
Control: blocks 945014 with -1

thunderbird 68 is now in buster-new and in security.debian.org

sadly, the enigmail upstream versions are closely tied to the
thunderbird versions.  (enigmail 2.0.x works with TB 60, but 2.1.x works
with TB 68)  See https://bugs.debian.org/945014 for more details.

I'm proposing to upgrade the version of enigmail in buster to match the
new version of thunderbird.

You can see the proposed changes on the debian/buster git branch at
https://salsa.debian.org/debian/enigmail.git.

Because this is a major change to the version of enigmail, the
compressed debdiff is 1.4MiB, which i think is pushing it to include in
this message.

You can generate the debdiff yourself with this command:

    git clone https://salsa.debian.org/debian/enigmail.git
    cd enigmail
    git diff --src-prefix=enigmail-2.0.12+ds1-1~deb10u1/ --dst-prefix=enigmail-2.1.3+ds1-4~deb10u1/ debian/2%2.0.12+ds1-1_deb10u1..debian/2%2.1.3+ds1-4_deb10u1

and i include the diffstat here:

 .eslintrc.js                                       |   25 +-
 .gitignore                                         |   15 +-
 .gitlab-ci.yml                                     |    8 +-
 .jsbeautifyrc                                      |   41 +-
 Makefile                                           |   10 +-
 config.guess                                       | 1534 ---------
 config.sub                                         | 1788 -----------
 config/autoconf.mk.in                              |   16 +-
 configure.ac                                       |    7 +-
 debian/changelog                                   |   74 +
 debian/clean                                       |    7 +-
 debian/compat                                      |    1 -
 debian/control                                     |   21 +-
 debian/copyright                                   |   69 +-
 debian/enigmail.links                              |    1 +
 debian/gbp.conf                                    |    2 +
 .../0001-avoid-eslint-during-buildtest.patch       |    6 +-
 ...-auto-download-of-pEpEngine-Closes-891882.patch |    6 +-
 .../0003-avoid-OpenPGP.js-when-building.patch      |  511 ++-
 .../0004-copy-enums.armor-from-OpenPGP.js.patch    |   31 +-
 ... 0005-add-more-logging-to-autocrypt-test.patch} |   13 +-
 ...5-avoid-OpenPGP.js-during-key-file-import.patch |   82 -
 ...of-OpenPGP.js-for-generating-minimal-keys.patch |  178 --
 ...se-of-extra-file-descriptors-and-test-th.patch} |   34 +-
 ...do-symmetric-encryption-decryption-with-.patch} |    4 +-
 ...nstead-of-openpgp.js-for-symmetric-encryp.patch |  326 ++
 ...ndividual-tests-in-key-test-with-withTes.patch} |   15 +-
 ...0010-Avoid-errors-on-validKeyserversExist.patch |   26 +
 ...nstead-of-openpgp.js-for-symmetric-encryp.patch |  208 --
 debian/patches/0011-drop-unnecessary-tests.patch   |   37 +
 ...ldlist.py-to-unix-style-line-endings-no-f.patch |   98 +
 ...0013-use-py2to3-2.7-to-convert-to-python3.patch |  315 ++
 .../0014-fix-shebang-lines-to-use-python3.patch    |   29 +
 ...-rest-of-the-build-infrastructure-to-pyth.patch |   59 +
 .../patches/0016-always-return-a-struct_time.patch |   30 +
 ...ats-objects-as-Unicode-by-default-no-need.patch |   88 +
 .../0017-avoid-cmp-in-favor-of-__lt__.patch        |   30 +
 ...9-Avoid-weird-Preprocessor.py-misbehavior.patch |   26 +
 debian/patches/series                              |   22 +-
 debian/rules                                       |   13 +-
 debian/run-tests                                   |    9 +-
 debian/tests/control                               |   14 +-
 debian/tests/no-test.js                            |    2 +
 debian/tests/tbird-sqlite                          |   13 +-
 debian/tests/tbird-sqlite.js                       |   10 +-
 debian/tests/unit-tests                            |    5 +-
 include/postbox.h                                  |    1 +
 include/tbird.h                                    |    1 +
 ipc/modules/Makefile                               |   37 +-
 ipc/modules/enigmailprocess_common.jsm             |   48 +-
 ipc/modules/enigmailprocess_main.jsm               |   18 +-
 ipc/modules/enigmailprocess_shared.js              |    7 +-
 ipc/modules/enigmailprocess_shared_win.js          |   13 +-
 ipc/modules/enigmailprocess_unix.jsm               |  194 +-
 ipc/modules/enigmailprocess_win.jsm                |   27 +-
 ipc/modules/enigmailprocess_worker_common.js       |  186 +-
 ipc/modules/enigmailprocess_worker_unix.js         |    6 +-
 ipc/modules/enigmailprocess_worker_win.js          |   51 +-
 ipc/modules/subprocess.jsm                         |   92 +-
 ipc/tests/Makefile                                 |    2 +-
 ipc/tests/main.js                                  |   11 +-
 ipc/tests/subprocess-test.js                       |   14 +-
 lang/ar/enigmail.dtd                               |  166 +-
 lang/ar/enigmail.properties                        |  179 +-
 lang/bg/enigmail.dtd                               |  164 +-
 lang/bg/enigmail.properties                        |  179 +-
 lang/ca/enigmail.dtd                               |  166 +-
 lang/ca/enigmail.properties                        |  179 +-
 lang/cs/enigmail.dtd                               |  172 +-
 lang/cs/enigmail.properties                        |  179 +-
 lang/current-languages.txt                         |    1 +
 lang/da/enigmail.dtd                               |  155 +-
 lang/da/enigmail.properties                        |  179 +-
 lang/de/enigmail.dtd                               |  189 +-
 lang/de/enigmail.properties                        |  129 +-
 lang/el/enigmail.dtd                               |  166 +-
 lang/el/enigmail.properties                        |  179 +-
 lang/es-ES/enigmail.dtd                            |  213 +-
 lang/es-ES/enigmail.properties                     |  163 +-
 lang/fa/enigmail.dtd                               |  962 +++---
 lang/fa/enigmail.properties                        |  757 ++---
 lang/fi/enigmail.dtd                               |  178 +-
 lang/fi/enigmail.properties                        |  179 +-
 lang/fr/enigmail.dtd                               |  264 +-
 lang/fr/enigmail.properties                        |  271 +-
 lang/gd/enigmail.dtd                               |  233 +-
 lang/gd/enigmail.properties                        |  265 +-
 lang/gl/enigmail.dtd                               |  205 +-
 lang/gl/enigmail.properties                        |  179 +-
 lang/hr/enigmail.dtd                               |  222 +-
 lang/hr/enigmail.properties                        |  179 +-
 lang/hu/enigmail.dtd                               |  209 +-
 lang/hu/enigmail.properties                        |  171 +-
 lang/it/enigmail.dtd                               |  203 +-
 lang/it/enigmail.properties                        |  177 +-
 lang/ja/enigmail.dtd                               |  198 +-
 lang/ja/enigmail.properties                        |  113 +-
 lang/ko/enigmail.dtd                               |  186 +-
 lang/ko/enigmail.properties                        |  179 +-
 lang/lt/enigmail.dtd                               |  264 +-
 lang/lt/enigmail.properties                        |  289 +-
 lang/make-lang.sh                                  |  102 -
 lang/nb/enigmail.dtd                               |  214 +-
 lang/nb/enigmail.properties                        |  179 +-
 lang/nl/enigmail.dtd                               |  205 +-
 lang/nl/enigmail.properties                        |  151 +-
 lang/pl/enigmail.dtd                               |  203 +-
 lang/pl/enigmail.properties                        |  179 +-
 lang/pt-BR/enigmail.dtd                            |  206 +-
 lang/pt-BR/enigmail.properties                     |  179 +-
 lang/pt-PT/enigmail.dtd                            |  194 +-
 lang/pt-PT/enigmail.properties                     |  179 +-
 lang/ro/am-enigprefs.properties                    |    2 +
 lang/ro/enigmail.dtd                               |  780 +++++
 lang/ro/enigmail.properties                        |  857 +++++
 lang/ro/help/compose.html                          |   88 +
 lang/ro/help/editRcptRule.html                     |   83 +
 lang/ro/help/help.html                             |   35 +
 lang/ro/help/initError.html                        |   46 +
 lang/ro/help/messenger.html                        |   57 +
 lang/ro/help/rulesEditor.html                      |   63 +
 lang/ro/help/sendingPrefs.html                     |   42 +
 lang/ru/enigmail.dtd                               |  239 +-
 lang/ru/enigmail.properties                        |  179 +-
 lang/sk/enigmail.dtd                               |  170 +-
 lang/sk/enigmail.properties                        |  179 +-
 lang/sl/enigmail.dtd                               |  198 +-
 lang/sl/enigmail.properties                        |  179 +-
 lang/sq/enigmail.dtd                               |  207 +-
 lang/sq/enigmail.properties                        |  149 +-
 lang/sv/enigmail.dtd                               |  249 +-
 lang/sv/enigmail.properties                        |  211 +-
 lang/tr/enigmail.dtd                               |  166 +-
 lang/tr/enigmail.properties                        |  241 +-
 lang/vi/enigmail.dtd                               |  176 +-
 lang/vi/enigmail.properties                        |  179 +-
 lang/zh-CN/enigmail.dtd                            |  185 +-
 lang/zh-CN/enigmail.properties                     |  179 +-
 lang/zh-TW/enigmail.dtd                            |  434 ++-
 lang/zh-TW/enigmail.properties                     |  619 ++--
 package/Makefile                                   |   57 +-
 package/addrbook.jsm                               |    7 +-
 package/amPrefsService.jsm                         |    9 +-
 package/app.jsm                                    |    8 +-
 package/armor.jsm                                  |   39 +-
 package/attachment.jsm                             |   50 +-
 package/autoSetup.jsm                              |  658 ++++
 package/autocrypt.jsm                              |  923 +++---
 package/bootstrap.js                               |   88 +-
 package/card.jsm                                   |   14 +-
 package/chrome.manifest                            |    2 +-
 package/clipboard.jsm                              |    5 +-
 package/commandLine.jsm                            |   15 +-
 package/compat.jsm                                 |  216 ++
 package/configBackup.jsm                           |   17 +-
 package/configure.jsm                              |  111 +-
 package/constants.jsm                              |   32 +-
 package/core.jsm                                   |   79 +-
 package/cryptoAPI.jsm                              |   26 +
 package/cryptoAPI/Makefile                         |   33 +
 package/cryptoAPI/README.txt                       |   38 +
 package/cryptoAPI/gnupg-decryption.jsm             |  376 +++
 package/cryptoAPI/gnupg-key.jsm                    |  121 +
 package/cryptoAPI/gnupg-keylist.jsm                |  503 +++
 package/cryptoAPI/gnupg.js                         |  450 +++
 package/cryptoAPI/interface.js                     |  273 ++
 package/cryptoAPI/openpgp-js.js                    |  183 ++
 package/data.jsm                                   |    5 -
 package/decryption.jsm                             |  552 +---
 package/dialog.jsm                                 |   22 +-
 package/dns.jsm                                    |  345 +++
 package/encryption.jsm                             |   38 +-
 package/enigmailOverlays.jsm                       |  314 ++
 package/errorHandling.jsm                          |  110 +-
 package/events.jsm                                 |   10 +-
 package/execution.jsm                              |  165 +-
 package/files.jsm                                  |   23 +-
 package/filters.jsm                                |   55 +-
 package/filtersWrapper.jsm                         |   15 +-
 package/fixExchangeMsg.jsm                         |  153 +-
 package/funcs.jsm                                  |  149 +-
 package/glodaMime.jsm                              |   39 -
 package/glodaUtils.jsm                             |    8 +-
 package/gnupgUpdate.jsm                            |  122 +
 package/gpg.jsm                                    |   60 +-
 package/gpgAgent.jsm                               |   46 +-
 package/hash.jsm                                   |   20 +-
 package/httpProxy.jsm                              |   10 +-
 package/install.rdf                                |   23 +-
 package/installGnuPG.jsm                           |  219 +-
 package/installPep.jsm                             |  207 +-
 package/key.jsm                                    |  204 +-
 package/keyEditor.jsm                              |   38 +-
 package/keyObj.jsm                                 |  500 +++
 package/keyRefreshService.jsm                      |   36 +-
 package/keyRing.jsm                                | 1566 ++--------
 package/keyUsability.jsm                           |   18 +-
 package/keyserver.jsm                              | 2088 +++++++++----
 package/keyserverUris.jsm                          |   25 +-
 package/lazy.jsm                                   |    7 +-
 package/locale.jsm                                 |   36 +-
 package/localizeHtml.jsm                           |   20 +-
 package/log.jsm                                    |   25 +-
 package/manifest.json                              |   22 +
 package/mime.jsm                                   |   27 +-
 package/mimeDecrypt.jsm                            |  320 +-
 package/mimeEncrypt.jsm                            |  366 ++-
 package/mimeVerify.jsm                             |  218 +-
 package/msgCompFields.jsm                          |  178 --
 package/msgRead.jsm                                |  133 +-
 package/openpgp.jsm                                |   42 +-
 package/os.jsm                                     |    7 -
 package/overlays.jsm                               |  795 ++---
 package/pEp-nonfunc.jsm                            |  176 ++
 package/pEp.jsm                                    |   24 +-
 package/pEpAdapter.jsm                             |  398 +--
 package/pEpDecrypt.jsm                             |  167 +-
 package/pEpFilter.jsm                              |   21 +-
 package/pEpKeySync.jsm                             |   31 +-
 package/pEpListener.jsm                            |   14 +-
 package/passwords.jsm                              |   12 +-
 package/persistentCrypto.jsm                       | 1331 ++++----
 package/pgpmimeHandler.jsm                         |   60 +-
 package/prefs.jsm                                  |   43 +-
 package/prefs/defaultPrefs.js                      |   10 +-
 package/protocolHandler.jsm                        |   78 +-
 package/rng.jsm                                    |   22 +-
 package/rules.jsm                                  |   97 +-
 package/searchCallback.jsm                         |   70 +
 package/send.jsm                                   |   38 +-
 package/singletons.jsm                             |    2 +-
 package/socks5Proxy.jsm                            |   36 +-
 package/sqliteDb.jsm                               |  193 ++
 package/stdlib.jsm                                 |   80 +-
 package/streams.jsm                                |  135 +-
 package/system.jsm                                 |   26 +-
 package/tests/Makefile                             |    2 +-
 package/tests/armor-test.js                        |   20 +-
 package/tests/autoSetup-test.js                    |  674 ++++
 package/tests/autocrypt-test.js                    |   43 +-
 package/tests/core-test.js                         |   21 +-
 package/tests/decryption-test.js                   |   10 +-
 package/tests/dns-test.js                          |  189 ++
 package/tests/encryption-test.js                   |   25 +-
 package/tests/errorHandling-test.js                |    7 +-
 package/tests/execution-test.js                    |    9 +-
 package/tests/expiry-test.js                       |   27 +-
 package/tests/files-test.js                        |   21 +-
 package/tests/filters-test.js                      |   18 +-
 package/tests/funcs-test.js                        |   33 +-
 package/tests/gnupg-keylist-test.js                |   84 +
 package/tests/gpg-test.js                          |   18 +-
 package/tests/gpgAgent-test.js                     |   14 +-
 package/tests/initialize.js                        |   15 +
 package/tests/installGnuPG-test.js                 |    5 +-
 package/tests/key-test.js                          |   16 +-
 package/tests/keyEditor-test.js                    |   10 +-
 package/tests/keyObj-test.js                       |   55 +
 package/tests/keyRefreshService-test.js            |   39 +-
 package/tests/keyRing-test.js                      |  504 +--
 package/tests/keyserver-test.js                    |  849 ++---
 package/tests/keyserverUris-test.js                |   15 +-
 package/tests/log-test.js                          |   11 +-
 package/tests/mailHelper.js                        |   32 +-
 package/tests/main.js                              |   26 +-
 package/tests/mime-test.js                         |    9 +-
 package/tests/mimeDecrypt-test.js                  |   85 +-
 package/tests/openpgpjs-test.js                    |   77 +
 package/tests/os-test.js                           |   10 +-
 package/tests/pEp-test.js                          |    4 +-
 package/tests/persistentCrypto-test.js             |   96 +-
 package/tests/prefs-test.js                        |    5 +-
 package/tests/resources/attachment.txt             |    1 +
 package/tests/resources/attachment.txt.asc         |   16 +
 .../tests/resources/autocrypt-setup-message-2.eml  |  185 ++
 .../tests/resources/autocrypt-setup-message.eml    |  189 ++
 package/tests/resources/dev-strike.asc             |   54 +-
 package/tests/resources/dev-strike.sec             |  164 +-
 package/tests/resources/email-acc2-pEp-message.eml |   10 +
 .../resources/encrypted-email-with-autocrypt.eml   |  120 +
 package/tests/resources/encrypted-email.eml        |    2 +-
 .../tests/resources/encrypted-pgpmime-email.eml    |   44 +
 package/tests/resources/filterable-key.asc         |  205 --
 package/tests/resources/hkp-listing.txt            |    8 +
 package/tests/resources/keybase-download.txt       |   16 +
 package/tests/resources/keybase-search.txt         |  110 +
 package/tests/resources/multi-uid.asc              |  256 ++
 package/tests/resources/multi-uid.sec              |  377 +++
 package/tests/resources/pgpMime-msg.eml            |   52 +
 .../tests/resources/testing-domain.invalid.pub-sec |  157 +
 package/tests/resources/tiny.pl                    |    3 +
 package/tests/rules-test.js                        |   51 +-
 package/tests/streams-test.js                      |   32 +-
 package/tests/system-test.js                       |    9 +-
 package/tests/testHelper.js                        |  214 +-
 package/tests/tor-test.js                          |   25 +-
 package/tests/verify-test.js                       |   41 +
 package/tests/versioning-test.js                   |    7 +-
 package/tests/webKey-test.js                       |   38 +-
 package/time.jsm                                   |   11 +-
 package/timer.jsm                                  |   15 +-
 package/tor.jsm                                    |   26 +-
 package/trust.jsm                                  |    4 +-
 package/uris.jsm                                   |    8 +-
 package/verify.jsm                                 |   50 +-
 package/versioning.jsm                             |   12 +-
 package/webKey.jsm                                 |  204 +-
 package/windows.jsm                                |  162 +-
 package/wkdLookup.jsm                              |  388 ++-
 package/wksMimeHandler.jsm                         |   46 +-
 package/xhrUtils.jsm                               |  135 +
 static_analysis/eslint                             |    4 +-
 stdlib/LICENSE-openpgp.js.txt                      |  176 --
 stdlib/Makefile                                    |   22 +-
 stdlib/compose.jsm                                 |  136 +-
 stdlib/misc.jsm                                    |   24 +-
 stdlib/msgHdrUtils.jsm                             |   84 +-
 stdlib/qrcode.jsm                                  |  904 ++++++
 stdlib/web-streams.jsm                             | 1797 +++++++++++
 ui/content/Makefile                                |   53 +-
 ui/content/aboutEnigmail.html                      |   35 +-
 ui/content/aboutEnigmail.js                        |   33 +
 ui/content/accountManagerOverlay.js                |    8 +-
 ui/content/accountManagerOverlay.xul               |    2 +-
 ui/content/am-enigprefs.js                         |   31 +-
 ui/content/am-enigprefs.xul                        |    6 +-
 ui/content/autocryptInitiateBackup.js              |   43 +-
 ui/content/autocryptInitiateBackup.xul             |   12 +-
 ui/content/autocryptSetupPasswd.js                 |   38 +-
 ui/content/autocryptSetupPasswd.xul                |    5 +-
 ui/content/columnOverlay.js                        |   12 +-
 ui/content/columnOverlay.xul                       |    3 +-
 ui/content/commonWorkflows.js                      |   67 +
 ui/content/editSingleAccount.xul                   |    5 +-
 ui/content/enigRetrieveProgress.js                 |  303 +-
 ui/content/enigRetrieveProgress.xul                |    9 +-
 ui/content/enigmailAbCardViewOverlay.xul           |    2 +-
 ui/content/enigmailAbContactsPanel.xul             |    6 +-
 ui/content/enigmailAbOverlay.js                    |    6 +-
 ui/content/enigmailAddUidDlg.js                    |   30 +-
 ui/content/enigmailAddUidDlg.xul                   |    9 +-
 ui/content/enigmailAdvancedIdentityDlg.js          |   69 -
 ui/content/enigmailAdvancedIdentityDlg.xul         |   50 -
 ui/content/enigmailAttachmentsDialog.js            |   38 +-
 ui/content/enigmailAttachmentsDialog.xul           |   13 +-
 ui/content/enigmailCardDetails.js                  |   53 +-
 ui/content/enigmailCardDetails.xul                 |    4 +-
 ui/content/enigmailCommon.js                       |  105 +-
 ui/content/enigmailConsole.js                      |   20 +-
 ui/content/enigmailConsole.xul                     |    6 +-
 ui/content/enigmailCustToolOverlay.js              |   21 -
 ui/content/enigmailCustToolOverlay.xul             |    5 +-
 ui/content/enigmailDispPhoto.js                    |   20 +-
 ui/content/enigmailDispPhoto.xul                   |   10 +-
 ui/content/enigmailEditIdentity.js                 |  142 +-
 ui/content/enigmailEditIdentity.xul                |   22 +-
 ui/content/enigmailEditKeyExpiryDlg.js             |   42 +-
 ui/content/enigmailEditKeyExpiryDlg.xul            |   12 +-
 ui/content/enigmailEditKeyTrustDlg.js              |   32 +-
 ui/content/enigmailEditKeyTrustDlg.xul             |   17 +-
 ui/content/enigmailEncryptionDlg.js                |   21 +-
 ui/content/enigmailEncryptionDlg.xul               |   53 +-
 ui/content/enigmailFilterEditorOverlay.js          |  182 +-
 ui/content/enigmailFilterEditorOverlay.xul         |    7 +-
 ui/content/enigmailFilterListOverlay.js            |   11 +-
 ui/content/enigmailFilterListOverlay.xul           |    2 +-
 ui/content/enigmailGenCardKey.js                   |   39 +-
 ui/content/enigmailGenCardKey.xul                  |   31 +-
 ui/content/enigmailGenericDisplay.htm              |    2 +-
 ui/content/enigmailGenericDisplay.js               |    9 +-
 ui/content/enigmailGenericDisplay.xul              |    8 +-
 ui/content/enigmailHelp.js                         |   12 +-
 ui/content/enigmailHelp.xul                        |    6 +-
 ui/content/enigmailImportPhoto.js                  |   13 +-
 ui/content/enigmailImportPhoto.xul                 |   12 +-
 ui/content/enigmailKeyImportInfo.js                |   97 +-
 ui/content/enigmailKeyImportInfo.xul               |    7 +-
 ui/content/enigmailKeyManager.js                   |  445 ++-
 ui/content/enigmailKeyManager.xul                  |   28 +-
 ui/content/enigmailKeySelection.js                 |  218 +-
 ui/content/enigmailKeySelection.xul                |   53 +-
 ui/content/enigmailKeygen.js                       |  147 +-
 ui/content/enigmailKeygen.xul                      |   32 +-
 ui/content/enigmailKeyserverDlg.js                 |   78 +-
 ui/content/enigmailKeyserverDlg.xul                |   14 +-
 ui/content/enigmailManageUidDlg.js                 |   57 +-
 ui/content/enigmailManageUidDlg.xul                |    6 +-
 ui/content/enigmailMessengerOverlay.js             |  847 +++--
 ui/content/enigmailMessengerOverlay.xul            |  312 +-
 ui/content/enigmailMsgBox.js                       |   26 +-
 ui/content/enigmailMsgBox.xul                      |    5 +-
 ui/content/enigmailMsgComposeHelper.js             |   32 +-
 ui/content/enigmailMsgComposeOverlay-pbx.xul       |  301 ++
 ui/content/enigmailMsgComposeOverlay-sm.xul        |   15 +-
 ui/content/enigmailMsgComposeOverlay.js            | 1746 ++++++-----
 ui/content/enigmailMsgComposeOverlay.xul           |   54 +-
 ui/content/enigmailMsgHdrViewOverlay.js            |  757 +++--
 ui/content/enigmailMsgHdrViewOverlay.xul           |    2 +-
 ui/content/enigmailMsgPrintOverlay.js              |   26 -
 ui/content/enigmailPrefsOverlay.xul                |    2 +-
 ui/content/enigmailPrivacyOverlay.js               |   12 +-
 ui/content/enigmailPrivacyOverlay.xul              |   12 +-
 ui/content/enigmailRulesEditor.js                  |   52 +-
 ui/content/enigmailRulesEditor.xul                 |   18 +-
 ui/content/enigmailSearchKey.js                    |  869 +-----
 ui/content/enigmailSearchKey.xul                   |   20 +-
 ui/content/enigmailSelectRule.js                   |   17 +-
 ui/content/enigmailSelectRule.xul                  |   13 +-
 ui/content/enigmailSetCardPin.js                   |   39 +-
 ui/content/enigmailSetCardPin.xul                  |    7 +-
 ui/content/enigmailSetupWizard.js                  | 1528 ---------
 ui/content/enigmailSetupWizard.xul                 |  548 ----
 ui/content/enigmailSignKeyDlg.js                   |   58 +-
 ui/content/enigmailSignKeyDlg.xul                  |   48 +-
 ui/content/enigmailSingleRcptSettings.js           |   67 +-
 ui/content/enigmailSingleRcptSettings.xul          |  213 +-
 ui/content/enigmailViewFile.js                     |   44 +-
 ui/content/enigmailViewFile.xul                    |   32 +-
 ui/content/enigmailWrapSelection.js                |   23 +-
 ui/content/enigmailWrapSelection.xul               |   13 +-
 ui/content/exportSettingsWizard.js                 |   98 +-
 ui/content/exportSettingsWizard.xul                |   12 +-
 ui/content/importSettings.js                       |  237 ++
 ui/content/importSettings.xul                      |   60 +
 ui/content/keyDetailsDlg.js                        |   49 +-
 ui/content/keyDetailsDlg.xul                       |   16 +-
 ui/content/messengerOverlay-pbx.xul                |   37 +
 ui/content/pepHandshake.js                         |   30 +-
 ui/content/pepHandshake.xul                        |    4 +-
 ui/content/pepPrepHandshake.js                     |   25 +-
 ui/content/pepPrepHandshake.xul                    |    5 +-
 ui/content/pepTrustWords.js                        |   46 +-
 ui/content/pepTrustWords.xul                       |   10 +-
 ui/content/pref-enigmail.js                        |  119 +-
 ui/content/pref-enigmail.xul                       |  276 +-
 ui/content/pref-pep.js                             |   40 +-
 ui/content/pref-pep.xul                            |   79 +-
 ui/content/setupWizard2.js                         |  472 +++
 ui/content/setupWizard2.xul                        |  145 +
 ui/content/tb60FilterEditorOverlay.js              |  113 +
 ...rintOverlay.xul => tb60FilterEditorOverlay.xul} |   17 +-
 ui/content/updateGnuPG.html                        |   85 +
 ui/content/updateGnuPG.js                          |  177 ++
 ui/content/upgradeInfo.html                        |    2 +-
 ui/locale/en-US/enigmail.dtd                       |  195 +-
 ui/locale/en-US/enigmail.properties                |  129 +-
 ui/skin/Makefile                                   |   25 +-
 ui/skin/common/enigmail-common.css                 |  124 +-
 ui/skin/common/enigmail-html.css                   |   10 +
 ui/skin/images/ok-sign.svg                         |  147 +
 ui/skin/images/pEpEncryptActive.svg                |   66 +-
 ui/skin/images/pEpEncryptInactive.svg              |   62 +-
 ui/skin/postbox/mac/enigmail.css                   |   25 +
 ui/skin/postbox/win/enigmail.css                   |   26 +
 ui/skin/tb-aero/enigmail.css                       |    1 -
 ui/skin/tb-linux/enigmail.css                      |    1 -
 ui/skin/tb-mac/enigmail.css                        |    1 -
 ui/tests/Makefile                                  |    4 +-
 ui/tests/enigmailMsgComposeOverlay-test-a_e.js     |  663 ++++
 ui/tests/enigmailMsgComposeOverlay-test-enc.js     |  180 ++
 ui/tests/enigmailMsgComposeOverlay-test-f_h.js     | 1168 +++++++
 ui/tests/enigmailMsgComposeOverlay-test-i_r.js     | 1068 +++++++
 ui/tests/enigmailMsgComposeOverlay-test-s_t.js     |  885 ++++++
 ui/tests/enigmailMsgComposeOverlay-test-u_z.js     |   91 +
 ui/tests/enigmailMsgComposeOverlay-test.js         |   31 -
 ui/tests/main.js                                   |   18 +-
 ui/tests/testHelper.js                             |   13 +
 util/build.mk                                      |   49 -
 util/checkFiles.py                                 |    2 +
 util/gen-filterable-key                            |   55 -
 util/genxpi                                        |  248 +-
 util/header.py                                     |  542 ----
 util/ply/__init__.py                               |    4 -
 util/ply/lex.py                                    | 1058 -------
 util/ply/yacc.py                                   | 3276 --------------------
 util/prepPackage                                   |   25 +
 util/prepPostbox                                   |   59 +
 util/run-jsunit                                    |   11 +-
 util/test.jpg                                      |  Bin 518 -> 0 bytes
 util/typelib.py                                    |  302 --
 util/xpidl.py                                      | 1421 ---------
 util/xpidllex.py                                   |    9 -
 util/xpidlyacc.py                                  |   85 -
 util/xpt.py                                        | 1382 ---------
 util/xptgen                                        |   64 -
 485 files changed, 39321 insertions(+), 36946 deletions(-)

The diff from what's in unstable is much simpler:

diff --git enigmail-2.1.3+ds1-4/debian/changelog enigmail-2.1.3+ds1-4~deb10u1/debian/changelog
index fb04d6912..59c7c1ad4 100644
--- enigmail-2.1.3+ds1-4/debian/changelog
+++ enigmail-2.1.3+ds1-4~deb10u1/debian/changelog
@@ -1,3 +1,10 @@
+enigmail (2:2.1.3+ds1-4~deb10u1) buster; urgency=medium
+
+  * Upload to debian stable to keep it installable now that Thunderbird 68
+    is in stable (Closes: #945014)
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Tue, 19 Nov 2019 15:43:20 +0800
+
 enigmail (2:2.1.3+ds1-4) unstable; urgency=medium
 
   * convert to python3
@@ -65,6 +72,22 @@ enigmail (2:2.0.11+ds1-1) unstable; urgency=medium
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Thu, 23 May 2019 17:06:35 -0400
 
+enigmail (2:2.0.12+ds1-1~deb10u1) buster; urgency=medium
+
+  * upload upstream version to Debian stable
+   - addresses CVE-2019-12269 (Closes: #929363)
+   - uses "advanced" version of WKD
+   - switches to using keys.openpgp.org as the default keyserver
+   - avoid decrypting/verifying quoted inline-PGP
+   - un-mangling MS Exchange: ensure that message structure is
+     as expected to avoid data loss
+   - only include Subject: line in legacy-display part for
+     protected headers
+  * move Vcs-Git fields to DEP-14 branch debian/buster
+  * refresh patches
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 21 Aug 2019 12:57:35 -0400
+
 enigmail (2:2.0.10+ds1-1) unstable; urgency=medium
 
   * new upstream release
diff --git enigmail-2.1.3+ds1-4/debian/control enigmail-2.1.3+ds1-4~deb10u1/debian/control
index 3ebe3bc29..ae0a43015 100644
--- enigmail-2.1.3+ds1-4/debian/control
+++ enigmail-2.1.3+ds1-4~deb10u1/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  zip,
 Standards-Version: 4.4.1
 Homepage: https://www.enigmail.net/
-Vcs-Git: https://salsa.debian.org/debian/enigmail.git -b debian/master
+Vcs-Git: https://salsa.debian.org/debian/enigmail.git -b debian/buster
 Vcs-Browser: https://salsa.debian.org/debian/enigmail
 Rules-Requires-Root: no
 
diff --git enigmail-2.1.3+ds1-4/debian/gbp.conf enigmail-2.1.3+ds1-4~deb10u1/debian/gbp.conf
index ec1a2b13e..ad90c8b99 100644
--- enigmail-2.1.3+ds1-4/debian/gbp.conf
+++ enigmail-2.1.3+ds1-4~deb10u1/debian/gbp.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
 upstream-vcs-tag = enigmail-%(version)s
 pristine-tar = True
-debian-branch = debian/master
+debian-branch = debian/buster
 
 [import-orig]
 filter = [


Please let me know if i should upload.

       --dkg


-- System Information:
Debian Release: bullseye/sid
  APT prefers testing-debug
  APT policy: (500, 'testing-debug'), (500, 'testing'), (500, 'stable'), (500, 'oldstable'), (200, 'unstable-debug'), (200, 'unstable'), (1, 'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 5.2.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message ---
On Sat, Nov 23, 2019 at 10:53:52AM +0100, Salvatore Bonaccorso wrote:
> Hi Adam,
> 
> On Fri, Nov 22, 2019 at 04:18:31PM +0000, Adam D. Barratt wrote:
> > > At the moment,
> > > enigmail users either have to continue using a Thunderbird version with
> > > known security vulnerabilities or have to uninstall enigmail (and
> > > install the upstream version of Enigmail, which has its own drawbacks).
> > 
> > I was told on IRC that the plan was for this update to be released via the
> > security archive.
> > 
> > Daniel, could you clarify, please?
> 
> Yes, Moritz (jmm) acked the upload to happen via security.d.o so it is
> currently pending (for buster, the stretch one seem to have some
> issues to be resolved).
> 
Thanks; closing the SRM bug then.

Cheers,
Julien

--- End Message ---

Reply to: