Accepting request 970866 from mozilla:Factory

- Mozilla Thunderbird 91.8.1
  * CLIENTID extension to SMTP was not supported by smtp-js#
  * Additional SMTP errors now propagated to user
  * OpenPGP was not able to use some previously supported key types
  * OpenPGP Key Manager did not always display correct information
    after importing additional IDs
  * Duplicate new mail notifications could be displayed when
    server-side filters were in use
  * Cancelling an SMTP password entry resulted in multiple failure
    dialogs being displayed

- Mozilla Thunderbird 91.8.0
  * Google accounts using password authentication will be migrated
    to OAuth2.
  * bugfixes
    https://www.thunderbird.net/en-US/thunderbird/91.8.0/releasenotes
  MFSA 2022- (bsc#1197903)
- update create-tar.sh

- skip slow workers, this is a tough build job

OBS-URL: https://build.opensuse.org/request/show/970866
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaThunderbird?expand=0&rev=278

MozillaThunderbird.changes

@@ -1,12 +1,37 @@
+-------------------------------------------------------------------
+Sat Apr 16 11:36:34 UTC 2022 - Wolfgang Rosenauer <wr@rosenauer.org>
+
+- Mozilla Thunderbird 91.8.1
+  * CLIENTID extension to SMTP was not supported by smtp-js#
+  * Additional SMTP errors now propagated to user
+  * OpenPGP was not able to use some previously supported key types
+  * OpenPGP Key Manager did not always display correct information
+    after importing additional IDs
+  * Duplicate new mail notifications could be displayed when
+    server-side filters were in use
+  * Cancelling an SMTP password entry resulted in multiple failure
+    dialogs being displayed
+
 -------------------------------------------------------------------
 Tue Apr 12 07:30:18 UTC 2022 - Martin Liška <mliska@suse.cz>
 
 - Set memory limits for DWZ to 4x.
 
+-------------------------------------------------------------------
+Sat Apr  2 17:39:15 UTC 2022 - Wolfgang Rosenauer <wr@rosenauer.org>
+
+- Mozilla Thunderbird 91.8.0
+  * Google accounts using password authentication will be migrated
+    to OAuth2.
+  * bugfixes
+    https://www.thunderbird.net/en-US/thunderbird/91.8.0/releasenotes
+  MFSA 2022- (bsc#1197903)
+- update create-tar.sh
+
 -------------------------------------------------------------------
 Thu Mar 17 14:39:51 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
-- skip slow workers, this is a tough build job 
+- skip slow workers, this is a tough build job
 
 -------------------------------------------------------------------
 Sun Mar  6 13:02:02 UTC 2022 - Wolfgang Rosenauer <wr@rosenauer.org>

MozillaThunderbird.spec

@@ -29,8 +29,8 @@
 # major 69
 # mainver %major.99
 %define major          91
-%define mainver        %major.7.0
-%define orig_version   91.7.0
+%define mainver        %major.8.1
+%define orig_version   91.8.1
 %define orig_suffix    %{nil}
 %define update_channel release
 %define source_prefix  thunderbird-%{orig_version}

create-tar.sh

@@ -37,6 +37,7 @@ else
 fi
 
 SOURCE_TARBALL="$PRODUCT-$VERSION$VERSION_SUFFIX.source.tar.xz"
+PREV_SOURCE_TARBALL="$PRODUCT-$PREV_VERSION$PREV_VERSION_SUFFIX.source.tar.xz"
 FTP_URL="https://ftp.mozilla.org/pub/$PRODUCT/releases/$VERSION$VERSION_SUFFIX/source"
 FTP_CANDIDATES_BASE_URL="https://ftp.mozilla.org/pub/$PRODUCT/candidates"
 # Make first letter of PRODCUT upper case
@@ -145,22 +146,48 @@ function locales_get() {
   fi
 }
 
-function locales_parse() {
+function locales_parse_file() {
+  FILE="$1"
+  cat "$FILE" | python -c "import json; import sys; \
+             print('\n'.join(['{} {}'.format(key, value['revision']) \
+                for key, value in sorted(json.load(sys.stdin).items())]));"
+}
+
+function locales_parse_url() {
   URL="$1"
   curl -s "$URL" | python -c "import json; import sys; \
              print('\n'.join(['{} {}'.format(key, value['changeset']) \
                 for key, value in sorted(json.load(sys.stdin)['locales'].items())]));"
 }
 
+function extract_locales_file() {
+    # still need to extract the locale information from the archive
+    echo "extract locale changesets"
+    tar -xf $SOURCE_TARBALL $LOCALE_FILE
+}
+
 function locales_unchanged() {
   BUILD_ID="$1"
   PREV_BUILD_ID=$(get_build_number "$PREV_VERSION$PREV_VERSION_SUFFIX")
   # If no json-file for one of the versions can be found, we say "they changed"
   prev_url=$(locales_get "$PREV_VERSION$PREV_VERSION_SUFFIX" "$PREV_BUILD_ID") || return 1
-  curr_url=$(locales_get "$VERSION$VERSION_SUFFIX" "$BUILD_ID")           || return 1
+  prev_content=$(locales_parse_url "$prev_url") || exit 1
 
-  prev_content=$(locales_parse "$prev_url") || exit 1
-  curr_content=$(locales_parse "$curr_url") || exit 1
+  curr_url=$(locales_get "$VERSION$VERSION_SUFFIX" "$BUILD_ID")
+  if [ $? -ne 0 ]; then
+    # We did not find a locales file upstream on the servers
+    if [ -e $SOURCE_TARBALL ]; then
+        # We can find out what the locales are, by extracting the json-file from the tar-ball
+        # instead of getting it from the server
+        extract_locales_file || return 1
+        curr_content=$(locales_parse_file "$LOCALE_FILE") || exit 1
+      else 
+        # We can't know what the locales are in the current version
+        return 1
+      fi
+  else
+    curr_content=$(locales_parse_url "$curr_url") || exit 1
+  fi
 
   diff -y --suppress-common-lines -d <(echo "$prev_content") <(echo "$curr_content")
 }
@@ -211,9 +238,7 @@ fi
 # we might have an upstream archive already and can skip the checkout
 if [ -e $SOURCE_TARBALL ]; then
   if [ -z ${SKIP_LOCALES+x} ] && [ $LOCALES_CHANGED -ne 0 ]; then
-    # still need to extract the locale information from the archive
-    echo "extract locale changesets"
-    tar -xf $SOURCE_TARBALL $LOCALE_FILE
+    extract_locales_file
   fi
   get_source_stamp "$BUILD_ID"
 else
@@ -328,3 +353,11 @@ elif [ -f "l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz" ]; then
   echo "Moving l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz to l10n-$VERSION$VERSION_SUFFIX.tar.xz"
   mv "l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz" "l10n-$VERSION$VERSION_SUFFIX.tar.xz"
 fi
+
+if [ -e $PREV_SOURCE_TARBALL ]; then
+    echo ""
+    echo "Deleting old sources tarball $PREV_SOURCE_TARBALL"
+    $(ask_cont_abort_question "Is this ok?") || exit 0
+    rm "$PREV_SOURCE_TARBALL"
+    rm "$PREV_SOURCE_TARBALL.asc"
+fi

l10n-91.7.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a0611c73de1794a6d01da5ac5bb10084aaac7e50cbc9f068246d241defb2cefc
-size 28835196

l10n-91.8.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:485a8e58506f1fdf016dc6655b3546ab5561c1ab418b6e9df690de80f6c70b46
+size 28946816

tar_stamps

@@ -1,10 +1,10 @@
 PRODUCT="thunderbird"
 CHANNEL="esr91"
-VERSION="91.7.0"
+VERSION="91.8.1"
 VERSION_SUFFIX=""
-PREV_VERSION="91.6.2"
+PREV_VERSION="91.8.0"
 PREV_VERSION_SUFFIX=""
 #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation
 RELEASE_REPO="https://hg.mozilla.org/releases/comm-esr91"
-RELEASE_TAG="c936367e9d73e790fc2e6aa16a64ec6d55ab0379"
-RELEASE_TIMESTAMP="20220302151026"
+RELEASE_TAG="79f1a34ff6596c36fd01ceee26ae1881cebc4756"
+RELEASE_TIMESTAMP="20220413002405"

thunderbird-91.7.0.source.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:624a51870bd2e0d9b259082e836df84981f01b0b397d13d93d7f1b9ccef24e05
-size 409451024

thunderbird-91.7.0.source.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmImYLcACgkQ6+QekPbx
-L22ceA/6AziO+YWauT+3IN8baNiOclr33GEBPqpkAQIAXnYbuSqJyG1mL/Bykp5W
-A/LLiqEyDTmFk+Gf1RQtV8qdCtjnslHbGtg7H8rqPSyMdrxQNTaqI365d765mYmw
-JtP35W4quC/WAn+ky66Mr2CK+CopQ6kjhuXV5ndfV4UdF7JgNkJ9oU2OMvhtqbkK
-sWV3Vog1MvtV9gXMLjGPeG8jI9X11c5wgku/9C1apRFbUCTSLvil2XReMY0M9xzO
-KXmpXKsa3LwB36reX8pZp3bmwrZ2BCFSVM67v40rsx6yyKVx20D/TqUoJFRt0uxZ
-+g9AFe80WWHKaTQ4bYVXxlYG8My1Lh15jmViHASaNWvqh3jpX+SQd+lfPLqKpPL/
-HITDJdBrclbPBg83a5DrQtMnG9P9FHi1VIKcSDAHY0lIgtnXxQD1iHF2k30DXy1a
-YGtLbogM/OD4NSejsP6CvIt0VphmfKDMJ3ZWi7KFWooO2E7BXi+FVeqojxkbSQub
-em0Mm2CkIs2AGhkH4VLWRYBAjK78iY9+TbsLK//qwR/aGe9KbEIAHRZjwqX6vP8v
-86Hi8yJPZ4WrAIjkmtJy8kHuWi9JlAZ7q4MlPy+Efz0WZQHKuyQ2YyIOnTiAUPVM
-OPdAerRD7JUKlk8RB3PgTojkCYG6n54JsuUpqz9IXt8bUM+h8Fo=
-=FVAJ
------END PGP SIGNATURE-----

thunderbird-91.8.1.source.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82737d29b89f39620fbdfc47e84d053edad903c72057526ff2a8215fd73e283d
+size 403849008

thunderbird-91.8.1.source.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmJXFrIACgkQ6+QekPbx
+L22sow/9HIIQsTXpth0veJfkwJOIe6p1XxxHDqv4wxsB4fEIov9MA0Rpqa5FxOcD
+dMbRjANvhMYE89+wnvkMCCRDBt5wam3eMUwpP/pdEuy784WpbPiEGVM5Ltu+fZ0P
+OP6ddyPl4ixZlMP3IrL/SovJGphOyHTuG+papzef1EAmgKwniIORCJv3Z5N0uze9
+F+QrtILrKIeOBNHobxFBmsO88wap1TroJZVnA2z5ya6Z0KiigHvpN6ZVGVJGcEBa
+SoCy++KZ+1X4nXEiIAG9xVU3gY+gpwIP/M3LwB3Re+V8FCiUt7eFo13qEJzmEtJ/
+ZdRfxgzb8hTgB2UUCkyQpNRfbm3wOAeQ0CRcVsIfDcfulncVR7N3yZuFSPF1BnND
+7G558xn/l8BjKJeMg+pF62v21qetWQ8czvaGEvU66ZtGNpkoO5gm/Lx0dMVCqJu/
+bZ3O5BukMWWpea95zvVCtt1jOV7h0RCI/8q2gwRY6JWEY0Y0PJ93MpSWovZY2BOv
+2dLJwjGjOeiJ1dsaaIi52jznYyMpVInUCPMB9vjGsUdwxjZwDCn8w2ORDSWX8hJT
+XJv3X7FWPNm125NMm9aF+5rzbm4A3Kb0Q5nXETU+GLyIA6B+KVBI6jL8j1Koxji1
+314ZB9PSpDQ0D8wfKoaWkyhb1Qc73q5YDHmd4H2nGJRfx4BG9oA=
+=lGZx
+-----END PGP SIGNATURE-----