| + | + | + | + | + + + + |
|---|---|---|---|---|
| RNP (OpenPGP) | ++ | ++ | ++ | ++ | +
![[sigpic]](${url}pass.png)
`;
+
+ let wasAllowed = element => {
+ return !element.matches(":-moz-broken") && element.naturalWidth > 0;
+ };
+
+ be_in_folder(folder);
+ select_click_row(gMsgNo);
+
+ let nwc = open_compose_new_mail();
+ Assert.ok(
+ wasAllowed(
+ nwc.window.document
+ .getElementById("messageEditor")
+ .contentDocument.getElementById("testelement")
+ ),
+ "Should allow remote sig in new mail"
+ );
+ close_compose_window(nwc);
+
+ let rwc = open_compose_with_reply();
+ Assert.ok(
+ wasAllowed(
+ rwc.window.document
+ .getElementById("messageEditor")
+ .contentDocument.getElementById("testelement")
+ ),
+ "Should allow remote sig in reply"
+ );
+ close_compose_window(rwc);
+
+ identity.htmlSigFormat = false;
+ identity.htmlSigText = "";
+});
+
// Copied from test-blocked-content.js.
function putHTMLOnClipboard(html) {
let trans = Cc["@mozilla.org/widget/transferable;1"].createInstance(
Binary files /srv/release.debian.org/tmp/sTDTfdb_JL/thunderbird-102.6.0/comm/mail/test/browser/openpgp/data/keys/key-binary.gpg and /srv/release.debian.org/tmp/eOKhAj6MBO/thunderbird-102.8.0/comm/mail/test/browser/openpgp/data/keys/key-binary.gpg differ
diff -Nru thunderbird-102.6.0/comm/mail/test/browser/openpgp/data/keys/key-with-utf8-comment.asc thunderbird-102.8.0/comm/mail/test/browser/openpgp/data/keys/key-with-utf8-comment.asc
--- thunderbird-102.6.0/comm/mail/test/browser/openpgp/data/keys/key-with-utf8-comment.asc 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-102.8.0/comm/mail/test/browser/openpgp/data/keys/key-with-utf8-comment.asc 2023-02-14 22:00:33.000000000 +0000
@@ -0,0 +1,15 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: 💌 (unicode symbol: love letter)
+Comment: 😀 (unicode symbol: smiley)
+
+mDMEY4d9vRYJKwYBBAHaRw8BAQdAhoLFPAnuWEK0GKQqJfZLeIMJ8mzzo0Bxm47G
+04P6qHC0H3Rlc3QgPHRlc3QtdW5pY29kZUBleGFtcGxlLmNvbT6IkwQTFggAOxYh
+BHJRT0PQBg/FiOgCOIUsVebSr9fvBQJjh329AhsDBQsJCAcCAiICBhUKCQgLAgQW
+AgMBAh4HAheAAAoJEIUsVebSr9fvSqIA/1I5cpEa2UdGGKVXndz3HFoUq5TrRVZd
+1el8bq177HbaAQDkJlNvBxwcjW3yDVo4+nxoqm8nK1b8yPwQet2NXobcArg4BGOH
+fb0SCisGAQQBl1UBBQEBB0CqqMW7jKUygeB9+DmqMWBoWPZXiSLe4imAGj3t+h/c
+JgMBCAeIeAQYFggAIBYhBHJRT0PQBg/FiOgCOIUsVebSr9fvBQJjh329AhsMAAoJ
+EIUsVebSr9fvRbwA/ApVf9/S9YjFEcR74W/R5G+PVaL15ERHfiR0f7AYqDgiAPsG
+N+POP/0TWKb+uT/jz2QYhjxbdQsELGvWQePLhOb0Aw==
+=pPjp
+-----END PGP PUBLIC KEY BLOCK-----
diff -Nru thunderbird-102.6.0/comm/mail/themes/shared/mail/aboutAddressBook.css thunderbird-102.8.0/comm/mail/themes/shared/mail/aboutAddressBook.css
--- thunderbird-102.6.0/comm/mail/themes/shared/mail/aboutAddressBook.css 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mail/themes/shared/mail/aboutAddressBook.css 2023-02-14 22:00:33.000000000 +0000
@@ -111,7 +111,7 @@
}
.toolbarbutton-1:focus-visible {
- outline: var(--in-content-focus-outline);
+ outline: var(--focus-outline);
}
#toolbarCreateBook {
diff -Nru thunderbird-102.6.0/comm/mail/themes/shared/mail/chat.css thunderbird-102.8.0/comm/mail/themes/shared/mail/chat.css
--- thunderbird-102.6.0/comm/mail/themes/shared/mail/chat.css 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mail/themes/shared/mail/chat.css 2023-02-14 22:00:33.000000000 +0000
@@ -782,8 +782,13 @@
border-bottom-color: var(--sidebar-border-color, rgba(249,249,250,.2));
}
+.conv-header-label {
+ overflow: hidden;
+}
+
#participantCount {
background: transparent;
+ width: 0;
}
:root[lwt-tree] #participantCount {
diff -Nru thunderbird-102.6.0/comm/mail/themes/shared/mail/messageIcons.css thunderbird-102.8.0/comm/mail/themes/shared/mail/messageIcons.css
--- thunderbird-102.6.0/comm/mail/themes/shared/mail/messageIcons.css 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mail/themes/shared/mail/messageIcons.css 2023-02-14 22:00:33.000000000 +0000
@@ -255,7 +255,7 @@
treechildren::-moz-tree-image(subjectCol, new) {
list-style-image: var(--icon-notify);
fill: var(--color-yellow-50) !important; /* override the selected, focus rule */
- stroke: var(--color-orange-40) !important; /* override the selected, focus rule */
+ stroke: var(--color-orange-50) !important; /* override the selected, focus rule */
}
treechildren::-moz-tree-image(subjectCol, selected, focus) {
@@ -279,6 +279,46 @@
stroke: var(--color-red-50) !important; /* override the selected, focus rule */
}
+ /* ..... subject column, dark color scheme ..... */
+
+ treechildren::-moz-tree-image(subjectCol, replied) {
+ fill: var(--color-purple-40);
+ stroke: var(--color-purple-40);
+ }
+
+ treechildren::-moz-tree-image(subjectCol, forwarded) {
+ fill: var(--color-blue-40);
+ }
+
+ treechildren::-moz-tree-image(subjectCol, redirected) {
+ fill: var(--color-orange-40);
+ }
+
+ treechildren::-moz-tree-image(subjectCol, replied, forwarded) {
+ fill: var(--color-blue-40);
+ stroke: var(--color-purple-40);
+ }
+
+ treechildren::-moz-tree-image(subjectCol, replied, redirected) {
+ fill: var(--color-orange-40);
+ stroke: var(--color-purple-40);
+ }
+
+ treechildren::-moz-tree-image(subjectCol, forwarded, redirected) {
+ fill: var(--color-blue-40);
+ stroke: var(--color-orange-40);
+ }
+
+ treechildren::-moz-tree-image(subjectCol, replied, forwarded, redirected) {
+ fill: var(--color-blue-40);
+ stroke: var(--color-purple-40);
+ }
+
+ treechildren::-moz-tree-image(subjectCol, selected, focus) {
+ fill: var(--select-focus-text-color);
+ stroke: var(--select-focus-text-color);
+ }
+
treechildren::-moz-tree-image(subjectCol, new) {
fill: var(--color-yellow-40) !important; /* override the selected, focus rule */
stroke: var(--color-orange-30) !important; /* override the selected, focus rule */
diff -Nru thunderbird-102.6.0/comm/mail/themes/windows/mail/mailWindow1.css thunderbird-102.8.0/comm/mail/themes/windows/mail/mailWindow1.css
--- thunderbird-102.6.0/comm/mail/themes/windows/mail/mailWindow1.css 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mail/themes/windows/mail/mailWindow1.css 2023-02-14 22:00:33.000000000 +0000
@@ -186,25 +186,13 @@
:root[sizemode=normal][tabsintitlebar] {
border-top: 1px solid -moz-accent-color;
}
- :root[tabsintitlebar]:not(:-moz-window-inactive,:-moz-lwtheme),
- :root[tabsintitlebar]:not(:-moz-window-inactive)[lwt-default-theme-in-dark-mode] {
+ :root[tabsintitlebar]:not(:-moz-window-inactive,:-moz-lwtheme) {
background-color: -moz-accent-color;
}
- :root[tabsintitlebar] #navigation-toolbox:not(:-moz-window-inactive,:-moz-lwtheme),
- :root[tabsintitlebar] #navigation-toolbox:not(:-moz-window-inactive)[lwt-default-theme-in-dark-mode] {
+ :root[tabsintitlebar] #navigation-toolbox:not(:-moz-window-inactive,:-moz-lwtheme) {
color: -moz-accent-color-foreground;
}
-
- :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
- .titlebar-button {
- stroke: -moz-accent-color-foreground;
- }
-
- :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #tabs-toolbar {
- --toolbarbutton-icon-fill: -moz-accent-color-foreground;
- --toolbarbutton-icon-fill-opacity: .7;
- }
}
:root[sizemode=normal][tabsintitlebar]:-moz-window-inactive {
diff -Nru thunderbird-102.6.0/comm/mailnews/addrbook/content/abDragDrop.js thunderbird-102.8.0/comm/mailnews/addrbook/content/abDragDrop.js
--- thunderbird-102.6.0/comm/mailnews/addrbook/content/abDragDrop.js 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/addrbook/content/abDragDrop.js 2023-02-14 22:00:33.000000000 +0000
@@ -69,7 +69,7 @@
event.dataTransfer.setData("text/vcard", decodeURIComponent(vCard));
event.dataTransfer.setData(
"application/x-moz-file-promise-dest-filename",
- card.displayName + ".vcf"
+ `${card.displayName}.vcf`.replace(/(.{74}).*(.{10})$/u, "$1...$2")
);
event.dataTransfer.setData(
"application/x-moz-file-promise-url",
diff -Nru thunderbird-102.6.0/comm/mailnews/addrbook/modules/CardDAVUtils.jsm thunderbird-102.8.0/comm/mailnews/addrbook/modules/CardDAVUtils.jsm
--- thunderbird-102.6.0/comm/mailnews/addrbook/modules/CardDAVUtils.jsm 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/addrbook/modules/CardDAVUtils.jsm 2023-02-14 22:00:33.000000000 +0000
@@ -331,20 +331,9 @@
let details = OAuth2Providers.getHostnameDetails(url.host);
if (details) {
let [issuer, scope] = details;
- let [
- clientId,
- clientSecret,
- authorizationEndpoint,
- tokenEndpoint,
- ] = OAuth2Providers.getIssuerDetails(issuer);
+ let issuerDetails = OAuth2Providers.getIssuerDetails(issuer);
- oAuth = new OAuth2(
- authorizationEndpoint,
- tokenEndpoint,
- scope,
- clientId,
- clientSecret
- );
+ oAuth = new OAuth2(scope, issuerDetails);
oAuth._isNew = true;
oAuth._loginOrigin = `oauth://${issuer}`;
oAuth._scope = scope;
diff -Nru thunderbird-102.6.0/comm/mailnews/addrbook/modules/LDAPClient.jsm thunderbird-102.8.0/comm/mailnews/addrbook/modules/LDAPClient.jsm
--- thunderbird-102.6.0/comm/mailnews/addrbook/modules/LDAPClient.jsm 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/addrbook/modules/LDAPClient.jsm 2023-02-14 22:00:33.000000000 +0000
@@ -41,12 +41,13 @@
}
connect() {
+ let hostname = this._host.toLowerCase();
this._logger.debug(
- `Connecting to ${this._useSecureTransport ? "ldaps" : "ldap"}://${
- this._host
- }:${this._port}`
+ `Connecting to ${
+ this._useSecureTransport ? "ldaps" : "ldap"
+ }://${hostname}:${this._port}`
);
- this._socket = new TCPSocket(this._host, this._port, {
+ this._socket = new TCPSocket(hostname, this._port, {
binaryType: "arraybuffer",
useSecureTransport: this._useSecureTransport,
});
diff -Nru thunderbird-102.6.0/comm/mailnews/base/src/MsgDBCacheManager.jsm thunderbird-102.8.0/comm/mailnews/base/src/MsgDBCacheManager.jsm
--- thunderbird-102.6.0/comm/mailnews/base/src/MsgDBCacheManager.jsm 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/base/src/MsgDBCacheManager.jsm 2023-02-14 22:00:33.000000000 +0000
@@ -130,9 +130,9 @@
let numOpenInWindow = 0;
let dbs = [];
for (let db of cachedDBs) {
- if (!db.folder.databaseOpen) {
+ if (!db.folder?.databaseOpen) {
// The DB isn't really open anymore.
- log.debug("Skipping, DB not open for folder: " + db.folder.name);
+ log.debug("Skipping, DB not open for folder: " + db.folder?.name);
numClosing++;
continue;
}
diff -Nru thunderbird-102.6.0/comm/mailnews/base/src/OAuth2.jsm thunderbird-102.8.0/comm/mailnews/base/src/OAuth2.jsm
--- thunderbird-102.6.0/comm/mailnews/base/src/OAuth2.jsm 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/base/src/OAuth2.jsm 2023-02-14 22:00:33.000000000 +0000
@@ -19,29 +19,28 @@
* Constructor for the OAuth2 object.
*
* @constructor
- * @param {string} authorizationEndpoint - The authorization endpoint as
- * defined by RFC 6749 Section 3.1.
- * @param {string} tokenEndpoint - The token endpoint as defined by
- * RFC 6749 Section 3.2.
* @param {?string} scope - The scope as specified by RFC 6749 Section 3.3.
* Will not be included in the requests if falsy.
- * @param {string} clientId - The client_id as specified by RFC 6749 Section
- * 2.3.1.
- * @param {string} [clientSecret=null] - The client_secret as specified in
- * RFC 6749 section 2.3.1. Will not be included in the requests if null.
+ * @param {string} issuerDetails.authorizationEndpoint - The authorization
+ * endpoint as defined by RFC 6749 Section 3.1.
+ * @param {string} issuerDetails.clientId - The client_id as specified by RFC
+ * 6749 Section 2.3.1.
+ * @param {string} issuerDetails.clientSecret - The client_secret as specified
+ * in RFC 6749 section 2.3.1. Will not be included in the requests if null.
+ * @param {string} issuerDetails.redirectionEndpoint - The redirect_uri as
+ * specified by RFC 6749 section 3.1.2.
+ * @param {string} issuerDetails.tokenEndpoint - The token endpoint as defined
+ * by RFC 6749 Section 3.2.
*/
-function OAuth2(
- authorizationEndpoint,
- tokenEndpoint,
- scope,
- clientId,
- clientSecret = null
-) {
- this.authorizationEndpoint = authorizationEndpoint;
- this.tokenEndpoint = tokenEndpoint;
+function OAuth2(scope, issuerDetails) {
this.scope = scope;
- this.clientId = clientId;
- this.consumerSecret = clientSecret;
+ this.authorizationEndpoint = issuerDetails.authorizationEndpoint;
+ this.clientId = issuerDetails.clientId;
+ this.consumerSecret = issuerDetails.clientSecret || null;
+ this.redirectionEndpoint =
+ issuerDetails.redirectionEndpoint || "http://localhost";
+ this.tokenEndpoint = issuerDetails.tokenEndpoint;
+ this.useHttpChannel = issuerDetails.useHttpChannel || false;
this.extraAuthParams = [];
@@ -55,11 +54,11 @@
OAuth2.prototype = {
clientId: null,
consumerSecret: null,
- redirectionEndpoint: "http://localhost",
requestWindowURI: "chrome://messenger/content/browserRequest.xhtml",
requestWindowFeatures: "chrome,private,centerscreen,width=980,height=750",
requestWindowTitle: "",
scope: null,
+ useHttpChannel: false,
accessToken: null,
refreshToken: null,
@@ -212,9 +211,9 @@
// @see RFC 6749 section 4.1.2: Authorization Response
onAuthorizationReceived(aURL) {
this.log.info("OAuth2 authorization received: url=" + aURL);
- let params = new URLSearchParams(aURL.split("?", 2)[1]);
- if (params.has("code")) {
- this.requestAccessToken(params.get("code"), false);
+ const url = new URL(aURL);
+ if (url.searchParams.has("code")) {
+ this.requestAccessToken(url.searchParams.get("code"), false);
} else {
this.onAuthorizationFailed(null, aURL);
}
@@ -257,47 +256,147 @@
data.append("redirect_uri", this.redirectionEndpoint);
}
- fetch(this.tokenEndpoint, {
- method: "POST",
- cache: "no-cache",
- body: data,
- })
- .then(response => response.json())
- .then(result => {
- let resultStr = JSON.stringify(result, null, 2);
- if ("error" in result) {
- // RFC 6749 section 5.2. Error Response
+ // Microsoft's OAuth explicitly breaks on receiving an Origin header, and
+ // we don't have control over whether fetch() sends Origin. Later versions
+ // of Gecko don't send it in this instance, but we have to work around it in
+ // this one.
+ if (this.useHttpChannel) {
+ // Get the request body as a string-based stream
+ let stream = Cc["@mozilla.org/io/string-input-stream;1"].createInstance(
+ Ci.nsIStringInputStream
+ );
+
+ let body = data.toString();
+ stream.setUTF8Data(body, body.length);
+
+ // Set up an HTTP channel in order to make our request
+ let channel = Services.io.newChannelFromURI(
+ Services.io.newURI(this.tokenEndpoint),
+ null,
+ Services.scriptSecurityManager.getSystemPrincipal(),
+ null,
+ Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL,
+ Ci.nsIContentPolicy.TYPE_OTHER
+ );
+
+ channel.QueryInterface(Ci.nsIHttpChannel);
+ channel.setRequestHeader(
+ "Content-Type",
+ "application/x-www-form-urlencoded",
+ false
+ );
+
+ channel.QueryInterface(Ci.nsIUploadChannel);
+ channel.setUploadStream(stream, "application/x-www-form-urlencoded", -1);
+ channel.requestMethod = "POST";
+
+ // Set up a response handler for our request
+ let listener = Cc["@mozilla.org/network/stream-loader;1"].createInstance(
+ Ci.nsIStreamLoader
+ );
+
+ const oauth = this;
+
+ listener.init({
+ onStreamComplete(loader, context, status, resultLength, resultBytes) {
+ try {
+ let resultStr = new TextDecoder().decode(
+ Uint8Array.from(resultBytes)
+ );
+ let result = JSON.parse(resultStr);
+
+ if ("error" in result) {
+ // RFC 6749 section 5.2. Error Response
+ oauth.log.info(
+ `The authorization server returned an error response: ${resultStr}`
+ );
+ // Typically in production this would be {"error": "invalid_grant"}.
+ // That is, the token expired or was revoked (user changed password?).
+ // Reset the tokens we have and call success so that the auth flow
+ // will be re-triggered.
+ oauth.accessToken = null;
+ oauth.refreshToken = null;
+ oauth.connectSuccessCallback();
+ return;
+ }
+
+ // RFC 6749 section 5.1. Successful Response
+ oauth.log.info(
+ `Successful response from the authorization server: ${resultStr}`
+ );
+ oauth.accessToken = result.access_token;
+ if ("refresh_token" in result) {
+ oauth.refreshToken = result.refresh_token;
+ }
+ if ("expires_in" in result) {
+ oauth.tokenExpires =
+ new Date().getTime() + result.expires_in * 1000;
+ } else {
+ oauth.tokenExpires = Number.MAX_VALUE;
+ }
+
+ oauth.connectSuccessCallback();
+ } catch (err) {
+ oauth.log.info(`Connection to authorization server failed: ${err}`);
+ oauth.connectFailureCallback(err);
+ }
+ },
+ });
+
+ // Make the request
+ channel.asyncOpen(listener, channel);
+ } else {
+ fetch(this.tokenEndpoint, {
+ method: "POST",
+ cache: "no-cache",
+ body: data,
+ })
+ .then(response => response.json())
+ .then(result => {
+ let resultStr = JSON.stringify(result, null, 2);
+ if ("error" in result) {
+ // RFC 6749 section 5.2. Error Response
+ let err = result.error;
+ if ("error_description" in result) {
+ err += "; " + result.error_description;
+ }
+ if ("error_uri" in result) {
+ err += "; " + result.error_uri;
+ }
+ this.log.warn(
+ `Error response from the authorization server: ${err}`
+ );
+ this.log.info(`Error response details: ${resultStr}`);
+
+ // Typically in production this would be {"error": "invalid_grant"}.
+ // That is, the token expired or was revoked (user changed password?).
+ // Reset the tokens we have and call success so that the auth flow
+ // will be re-triggered.
+ this.accessToken = null;
+ this.refreshToken = null;
+ this.connectSuccessCallback();
+ return;
+ }
+
+ // RFC 6749 section 5.1. Successful Response
this.log.info(
- `The authorization server returned an error response: ${resultStr}`
+ `Successful response from the authorization server: ${resultStr}`
);
- // Typically in production this would be {"error": "invalid_grant"}.
- // That is, the token expired or was revoked (user changed password?).
- // Reset the tokens we have and call success so that the auth flow
- // will be re-triggered.
- this.accessToken = null;
- this.refreshToken = null;
+ this.accessToken = result.access_token;
+ if ("refresh_token" in result) {
+ this.refreshToken = result.refresh_token;
+ }
+ if ("expires_in" in result) {
+ this.tokenExpires = new Date().getTime() + result.expires_in * 1000;
+ } else {
+ this.tokenExpires = Number.MAX_VALUE;
+ }
this.connectSuccessCallback();
- return;
- }
-
- // RFC 6749 section 5.1. Successful Response
- this.log.info(
- `Successful response from the authorization server: ${resultStr}`
- );
- this.accessToken = result.access_token;
- if ("refresh_token" in result) {
- this.refreshToken = result.refresh_token;
- }
- if ("expires_in" in result) {
- this.tokenExpires = new Date().getTime() + result.expires_in * 1000;
- } else {
- this.tokenExpires = Number.MAX_VALUE;
- }
- this.connectSuccessCallback();
- })
- .catch(err => {
- this.log.info(`Connection to authorization server failed: ${err}`);
- this.connectFailureCallback(err);
- });
+ })
+ .catch(err => {
+ this.log.info(`Connection to authorization server failed: ${err}`);
+ this.connectFailureCallback(err);
+ });
+ }
},
};
diff -Nru thunderbird-102.6.0/comm/mailnews/base/src/OAuth2Module.jsm thunderbird-102.8.0/comm/mailnews/base/src/OAuth2Module.jsm
--- thunderbird-102.6.0/comm/mailnews/base/src/OAuth2Module.jsm 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/base/src/OAuth2Module.jsm 2023-02-14 22:00:33.000000000 +0000
@@ -44,12 +44,6 @@
aDirectory.getStringValue("carddav.username", "") || aDirectory.UID,
aHostname
);
- if (aHostname == "mochi.test") {
- // I don't know why, but tests refuse to work with a plain HTTP endpoint
- // (the request is redirected to HTTPS, which we're not listening to).
- // Just use an HTTPS endpoint.
- this._oauth.redirectionEndpoint = "https://localhost";
- }
},
_initPrefs(root, aUsername, aHostname) {
// Load all of the parameters from preferences.
@@ -73,13 +67,8 @@
// Find the app key we need for the OAuth2 string. Eventually, this should
// be using dynamic client registration, but there are no current
// implementations that we can test this with.
- let [
- clientId,
- clientSecret,
- authorizationEndpoint,
- tokenEndpoint,
- ] = OAuth2Providers.getIssuerDetails(issuer);
- if (!clientId) {
+ const issuerDetails = OAuth2Providers.getIssuerDetails(issuer);
+ if (!issuerDetails.clientId) {
return false;
}
@@ -91,13 +80,7 @@
this._scope = scope;
// Define the OAuth property and store it.
- this._oauth = new OAuth2(
- authorizationEndpoint,
- tokenEndpoint,
- scope,
- clientId,
- clientSecret
- );
+ this._oauth = new OAuth2(scope, issuerDetails);
// Try hinting the username...
this._oauth.extraAuthParams = [["login_hint", aUsername]];
diff -Nru thunderbird-102.6.0/comm/mailnews/base/src/OAuth2Providers.jsm thunderbird-102.8.0/comm/mailnews/base/src/OAuth2Providers.jsm
--- thunderbird-102.6.0/comm/mailnews/base/src/OAuth2Providers.jsm 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/base/src/OAuth2Providers.jsm 2023-02-14 22:00:33.000000000 +0000
@@ -50,14 +50,14 @@
"outlook.office365.com",
[
"login.microsoftonline.com",
- "https://outlook.office365.com/IMAP.AccessAsUser.All https://outlook.office365.com/POP.AccessAsUser.All https://outlook.office365.com/SMTP.Send offline_access",
+ "https://outlook.office.com/IMAP.AccessAsUser.All https://outlook.office.com/POP.AccessAsUser.All https://outlook.office.com/SMTP.Send offline_access",
],
],
[
"smtp.office365.com",
[
"login.microsoftonline.com",
- "https://outlook.office365.com/IMAP.AccessAsUser.All https://outlook.office365.com/POP.AccessAsUser.All https://outlook.office365.com/SMTP.Send offline_access",
+ "https://outlook.office.com/IMAP.AccessAsUser.All https://outlook.office.com/POP.AccessAsUser.All https://outlook.office.com/SMTP.Send offline_access",
],
],
@@ -79,70 +79,82 @@
var kIssuers = new Map([
[
"accounts.google.com",
- [
- "406964657835-aq8lmia8j95dhl1a2bvharmfk3t1hgqj.apps.googleusercontent.com",
- "kSmqreRr0qwBWJgbf5Y-PjSU",
- "https://accounts.google.com/o/oauth2/auth",
- "https://www.googleapis.com/oauth2/v3/token",
- ],
+ {
+ clientId:
+ "406964657835-aq8lmia8j95dhl1a2bvharmfk3t1hgqj.apps.googleusercontent.com",
+ clientSecret: "kSmqreRr0qwBWJgbf5Y-PjSU",
+ authorizationEndpoint: "https://accounts.google.com/o/oauth2/auth",
+ tokenEndpoint: "https://www.googleapis.com/oauth2/v3/token",
+ },
],
[
"o2.mail.ru",
- [
- "thunderbird",
- "I0dCAXrcaNFujaaY",
- "https://o2.mail.ru/login",
- "https://o2.mail.ru/token",
- ],
+ {
+ clientId: "thunderbird",
+ clientSecret: "I0dCAXrcaNFujaaY",
+ authorizationEndpoint: "https://o2.mail.ru/login",
+ tokenEndpoint: "https://o2.mail.ru/token",
+ },
],
[
"oauth.yandex.com",
- [
- "2a00bba7374047a6ab79666485ffce31",
- "3ded85b4ec574c2187a55dc49d361280",
- "https://oauth.yandex.com/authorize",
- "https://oauth.yandex.com/token",
- ],
+ {
+ clientId: "2a00bba7374047a6ab79666485ffce31",
+ clientSecret: "3ded85b4ec574c2187a55dc49d361280",
+ authorizationEndpoint: "https://oauth.yandex.com/authorize",
+ tokenEndpoint: "https://oauth.yandex.com/token",
+ },
],
[
"login.yahoo.com",
- [
- "dj0yJmk9NUtCTWFMNVpTaVJmJmQ9WVdrOVJ6UjVTa2xJTXpRbWNHbzlNQS0tJnM9Y29uc3VtZXJzZWNyZXQmeD0yYw--",
- "f2de6a30ae123cdbc258c15e0812799010d589cc",
- "https://api.login.yahoo.com/oauth2/request_auth",
- "https://api.login.yahoo.com/oauth2/get_token",
- ],
+ {
+ clientId:
+ "dj0yJmk9NUtCTWFMNVpTaVJmJmQ9WVdrOVJ6UjVTa2xJTXpRbWNHbzlNQS0tJnM9Y29uc3VtZXJzZWNyZXQmeD0yYw--",
+ clientSecret: "f2de6a30ae123cdbc258c15e0812799010d589cc",
+ authorizationEndpoint: "https://api.login.yahoo.com/oauth2/request_auth",
+ tokenEndpoint: "https://api.login.yahoo.com/oauth2/get_token",
+ },
],
[
"login.aol.com",
- [
- "dj0yJmk9OXRHc1FqZHRQYzVvJmQ9WVdrOU1UQnJOR0pvTjJrbWNHbzlNQS0tJnM9Y29uc3VtZXJzZWNyZXQmeD02NQ--",
- "79c1c11991d148ddd02a919000d69879942fc278",
- "https://api.login.aol.com/oauth2/request_auth",
- "https://api.login.aol.com/oauth2/get_token",
- ],
+ {
+ clientId:
+ "dj0yJmk9OXRHc1FqZHRQYzVvJmQ9WVdrOU1UQnJOR0pvTjJrbWNHbzlNQS0tJnM9Y29uc3VtZXJzZWNyZXQmeD02NQ--",
+ clientSecret: "79c1c11991d148ddd02a919000d69879942fc278",
+ authorizationEndpoint: "https://api.login.aol.com/oauth2/request_auth",
+ tokenEndpoint: "https://api.login.aol.com/oauth2/get_token",
+ },
],
[
"login.microsoftonline.com",
- [
- "08162f7c-0fd2-4200-a84a-f25a4db0b584", // Application (client) ID
- "TxRBilcHdC6WGBee]fs?QR:SJ8nI[g82", // @see App registrations | Certificates & secrets
+ {
+ clientId: "9e5f94bc-e8a4-4e73-b8be-63364c29d753", // Application (client) ID
// https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-v2-protocols#endpoints
- "https://login.microsoftonline.com/common/oauth2/v2.0/authorize",
- "https://login.microsoftonline.com/common/oauth2/v2.0/token",
- ],
+ authorizationEndpoint:
+ "https://login.microsoftonline.com/common/oauth2/v2.0/authorize",
+ tokenEndpoint:
+ "https://login.microsoftonline.com/common/oauth2/v2.0/token",
+ redirectionEndpoint: "https://localhost",
+ useHttpChannel: true,
+ },
],
// For testing purposes.
[
"mochi.test",
- [
- "test_client_id",
- "test_secret",
- "http://mochi.test:8888/browser/comm/mail/components/addrbook/test/browser/data/redirect_auto.sjs",
- "http://mochi.test:8888/browser/comm/mail/components/addrbook/test/browser/data/token.sjs",
- ],
+ {
+ clientId: "test_client_id",
+ clientSecret: "test_secret",
+ authorizationEndpoint:
+ "http://mochi.test:8888/browser/comm/mail/components/addrbook/test/browser/data/redirect_auto.sjs",
+ tokenEndpoint:
+ "http://mochi.test:8888/browser/comm/mail/components/addrbook/test/browser/data/token.sjs",
+ // I don't know why, but tests refuse to work with a plain HTTP endpoint
+ // (the request is redirected to HTTPS, which we're not listening to).
+ // Just use an HTTPS endpoint.
+ redirectionEndpoint: "https://localhost",
+ },
],
]);
diff -Nru thunderbird-102.6.0/comm/mailnews/base/src/nsMsgDBFolder.cpp thunderbird-102.8.0/comm/mailnews/base/src/nsMsgDBFolder.cpp
--- thunderbird-102.6.0/comm/mailnews/base/src/nsMsgDBFolder.cpp 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/base/src/nsMsgDBFolder.cpp 2023-02-14 22:00:33.000000000 +0000
@@ -645,6 +645,7 @@
if (force || !mInitializedFromCache) {
nsCOMPtr we've just created.
MoveToEndOfDocument();
}
+
+ bool oldAllow;
+ GetAllowRemoteContent(&oldAllow);
+ SetAllowRemoteContent(true);
htmlEditor->InsertHTML(aSignature);
+ SetAllowRemoteContent(oldAllow);
+
if (isForwarded && sigOnTop) htmlEditor->EndOfDocument();
} else
htmlEditor->EndOfDocument();
@@ -5003,7 +5013,11 @@
if (NS_SUCCEEDED(rv)) {
if (m_composeHTML) {
+ bool oldAllow;
+ GetAllowRemoteContent(&oldAllow);
+ SetAllowRemoteContent(true);
rv = MOZ_KnownLive(editor->AsHTMLEditor())->InsertHTML(aSignature);
+ SetAllowRemoteContent(oldAllow);
} else {
rv = editor->InsertLineBreak();
InsertDivWrappedTextAtSelection(aSignature, u"moz-signature"_ns);
diff -Nru thunderbird-102.6.0/comm/mailnews/db/msgdb/src/nsDBFolderInfo.cpp thunderbird-102.8.0/comm/mailnews/db/msgdb/src/nsDBFolderInfo.cpp
--- thunderbird-102.6.0/comm/mailnews/db/msgdb/src/nsDBFolderInfo.cpp 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/db/msgdb/src/nsDBFolderInfo.cpp 2023-02-14 22:00:33.000000000 +0000
@@ -698,9 +698,9 @@
/* void GetTransferInfo (out nsIDBFolderInfo transferInfo); */
NS_IMETHODIMP nsDBFolderInfo::GetTransferInfo(nsIDBFolderInfo** transferInfo) {
NS_ENSURE_ARG_POINTER(transferInfo);
+ NS_ENSURE_STATE(m_mdbRow);
- nsTransferDBFolderInfo* newInfo = new nsTransferDBFolderInfo;
- NS_ADDREF(*transferInfo = newInfo);
+ RefPtr newInfo = new nsTransferDBFolderInfo;
mdb_count numCells;
mdbYarn cellYarn;
@@ -708,7 +708,6 @@
char columnName[100];
mdbYarn cellName = {columnName, 0, sizeof(columnName), 0, 0, nullptr};
- NS_ASSERTION(m_mdbRow, "null row in getTransferInfo");
m_mdbRow->GetCount(m_mdb->GetEnv(), &numCells);
// iterate over the cells in the dbfolderinfo remembering attribute names and
// values.
@@ -730,6 +729,7 @@
}
}
+ newInfo.forget(transferInfo);
return NS_OK;
}
diff -Nru thunderbird-102.6.0/comm/mailnews/extensions/smime/nsCMS.cpp thunderbird-102.8.0/comm/mailnews/extensions/smime/nsCMS.cpp
--- thunderbird-102.6.0/comm/mailnews/extensions/smime/nsCMS.cpp 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/extensions/smime/nsCMS.cpp 2023-02-14 22:00:33.000000000 +0000
@@ -242,11 +242,14 @@
nsTArray certBytes(cert->derCert.data, cert->derCert.len);
nsTArray> builtChain;
+ // This code is used when verifying incoming certificates, including
+ // a signature certificate. Performing OCSP is necessary.
+ // Allowing OCSP in blocking mode should be fine, because all our
+ // callers run this code on a separate thread, using
+ // SMimeVerificationTask/CryptoTask.
mozilla::pkix::Result result = certVerifier->VerifyCert(
certBytes, usageForPkix, Now(), nullptr /*XXX pinarg*/,
- nullptr /*hostname*/, builtChain,
- // Only local checks can run on the main thread.
- CertVerifier::FLAG_LOCAL_ONLY);
+ nullptr /*hostname*/, builtChain);
if (result != mozilla::pkix::Success) {
return SECFailure;
}
diff -Nru thunderbird-102.6.0/comm/mailnews/extensions/smime/nsISMimeJSHelper.idl thunderbird-102.8.0/comm/mailnews/extensions/smime/nsISMimeJSHelper.idl
--- thunderbird-102.6.0/comm/mailnews/extensions/smime/nsISMimeJSHelper.idl 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/extensions/smime/nsISMimeJSHelper.idl 2023-02-14 22:00:33.000000000 +0000
@@ -19,6 +19,7 @@
/**
* Obtains detailed information about the certificate availability
* status of email recipients.
+ * The returned certificates have NOT been checked for validity yet
*
* @param compFields - Attributes of the composed message.
* @param emailAddresses - The list of all recipient email addresses
@@ -34,6 +35,17 @@
out Array certs,
out boolean canEncrypt);
+ void getRecipients(in nsIMsgCompFields compFields,
+ out Array emailAddresses);
+
+ /**
+ * Only a VALID certificate will be returned.
+ */
+ void getValidCertInfo(in AString email,
+ out AString certIssuedInfo,
+ out AString certExpiresInfo,
+ out nsIX509Cert cert);
+
/**
* Obtains a list of email addresses where valid email recipient certificates
* are not yet available.
diff -Nru thunderbird-102.6.0/comm/mailnews/extensions/smime/nsMsgComposeSecure.cpp thunderbird-102.8.0/comm/mailnews/extensions/smime/nsMsgComposeSecure.cpp
--- thunderbird-102.6.0/comm/mailnews/extensions/smime/nsMsgComposeSecure.cpp 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/extensions/smime/nsMsgComposeSecure.cpp 2023-02-14 22:00:33.000000000 +0000
@@ -612,6 +612,7 @@
/* Compute the hash...
*/
+ NS_ENSURE_STATE(mDataHash);
nsAutoCString hashString;
rv = mDataHash->Finish(false, hashString);
mDataHash = nullptr;
diff -Nru thunderbird-102.6.0/comm/mailnews/extensions/smime/nsSMimeJSHelper.cpp thunderbird-102.8.0/comm/mailnews/extensions/smime/nsSMimeJSHelper.cpp
--- thunderbird-102.6.0/comm/mailnews/extensions/smime/nsSMimeJSHelper.cpp 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/extensions/smime/nsSMimeJSHelper.cpp 2023-02-14 22:00:33.000000000 +0000
@@ -40,6 +40,70 @@
style, &explodedTime, result);
}
+NS_IMETHODIMP nsSMimeJSHelper::GetRecipients(
+ nsIMsgCompFields* compFields, nsTArray& emailAddresses) {
+ nsTArray mailboxes;
+ nsresult rv = getMailboxList(compFields, mailboxes);
+ NS_ENSURE_SUCCESS(rv, rv);
+
+ uint32_t mailbox_count = mailboxes.Length();
+
+ emailAddresses.ClearAndRetainStorage();
+ emailAddresses.SetCapacity(mailbox_count);
+
+ rv = NS_OK;
+
+ for (uint32_t i = 0; i < mailbox_count; ++i) {
+ const nsCString& email = mailboxes[i];
+
+ nsCString email_lowercase;
+ ToLowerCase(email, email_lowercase);
+
+ emailAddresses.AppendElement(NS_ConvertUTF8toUTF16(email));
+ }
+ return NS_OK;
+}
+
+NS_IMETHODIMP nsSMimeJSHelper::GetValidCertInfo(const nsAString& email,
+ nsAString& certIssuedInfo,
+ nsAString& certExpiresInfo,
+ nsIX509Cert** cert) {
+ nsCOMPtr certdb = do_GetService(NS_X509CERTDB_CONTRACTID);
+
+ *cert = nullptr;
+ nsresult rv = NS_OK;
+
+ nsCOMPtr composeSecure =
+ do_CreateInstance("@mozilla.org/messengercompose/composesecure;1", &rv);
+ NS_ENSURE_SUCCESS(rv, rv);
+
+ NS_ConvertUTF16toUTF8 emailC(email);
+
+ nsCString email_lowercase;
+ ToLowerCase(emailC, email_lowercase);
+
+ // Find only valid certificate.
+ if (NS_SUCCEEDED(
+ composeSecure->FindCertByEmailAddress(email_lowercase, true, cert))) {
+ nsCOMPtr validity;
+ rv = (*cert)->GetValidity(getter_AddRefs(validity));
+ if (NS_SUCCEEDED(rv)) {
+ PRTime notBefore;
+ rv = validity->GetNotBefore(¬Before);
+ if (NS_SUCCEEDED(rv)) {
+ PRTimeToLocalDateString(notBefore, certIssuedInfo);
+ }
+ PRTime notAfter;
+ rv = validity->GetNotAfter(¬After);
+ if (NS_SUCCEEDED(rv)) {
+ PRTimeToLocalDateString(notAfter, certExpiresInfo);
+ }
+ }
+ }
+
+ return NS_OK;
+}
+
NS_IMETHODIMP nsSMimeJSHelper::GetRecipientCertsInfo(
nsIMsgCompFields* compFields, nsTArray& emailAddresses,
nsTArray& certIssuedInfos, nsTArray& certExpiresInfos,
@@ -79,6 +143,7 @@
nsCString email_lowercase;
ToLowerCase(email, email_lowercase);
+ // Find certificate regardless of validity.
if (NS_SUCCEEDED(composeSecure->FindCertByEmailAddress(
email_lowercase, false, getter_AddRefs(cert)))) {
nsCOMPtr validity;
diff -Nru thunderbird-102.6.0/comm/mailnews/imap/src/ImapClient.jsm thunderbird-102.8.0/comm/mailnews/imap/src/ImapClient.jsm
--- thunderbird-102.6.0/comm/mailnews/imap/src/ImapClient.jsm 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/imap/src/ImapClient.jsm 2023-02-14 22:00:33.000000000 +0000
@@ -53,12 +53,11 @@
// Reuse the connection.
this.onReady();
} else {
- this._logger.debug(
- `Connecting to ${this._server.hostName}:${this._server.port}`
- );
+ let hostname = this._server.hostName.toLowerCase();
+ this._logger.debug(`Connecting to ${hostname}:${this._server.port}`);
this._capabilities = null;
this._secureTransport = this._server.socketType == Ci.nsMsgSocketType.SSL;
- this._socket = new TCPSocket(this._server.hostName, this._server.port, {
+ this._socket = new TCPSocket(hostname, this._server.port, {
binaryType: "arraybuffer",
useSecureTransport: this._secureTransport,
});
diff -Nru thunderbird-102.6.0/comm/mailnews/imap/src/nsImapMailFolder.cpp thunderbird-102.8.0/comm/mailnews/imap/src/nsImapMailFolder.cpp
--- thunderbird-102.6.0/comm/mailnews/imap/src/nsImapMailFolder.cpp 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/imap/src/nsImapMailFolder.cpp 2023-02-14 22:00:33.000000000 +0000
@@ -1458,7 +1458,7 @@
// This is a little kludgy.
rv = trashFolder->DeleteStorage();
NS_ENSURE_SUCCESS(rv, rv);
- trashFolder->SetDBTransferInfo(transferInfo);
+ if (transferInfo) trashFolder->SetDBTransferInfo(transferInfo);
trashFolder->SetSizeOnDisk(0);
// The trash folder has effectively been deleted.
diff -Nru thunderbird-102.6.0/comm/mailnews/import/modules/AddrBookFileImporter.jsm thunderbird-102.8.0/comm/mailnews/import/modules/AddrBookFileImporter.jsm
--- thunderbird-102.6.0/comm/mailnews/import/modules/AddrBookFileImporter.jsm 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/import/modules/AddrBookFileImporter.jsm 2023-02-14 22:00:33.000000000 +0000
@@ -227,10 +227,9 @@
].getService(Ci.nsIMsgVCardService);
let content = await IOUtils.readUTF8(this._sourceFile.path);
- let lines = content
- .trim()
- .replaceAll("\r\n", "\n")
- .split("\n");
+ // According to rfc6350, \r\n should be used as line break.
+ let sep = content.includes("\r\n") ? "\r\n" : "\n";
+ let lines = content.trim().split(sep);
let totalLines = lines.length;
let currentLine = 0;
@@ -242,7 +241,7 @@
continue;
}
- if (line.toLowerCase() == "begin:vcard") {
+ if (line.toLowerCase().trimEnd() == "begin:vcard") {
if (record.length) {
throw Components.Exception(
"Expecting END:VCARD but got BEGIN:VCARD",
@@ -260,7 +259,7 @@
record.push(line);
- if (line.toLowerCase() == "end:vcard") {
+ if (line.toLowerCase().trimEnd() == "end:vcard") {
this._targetDirectory.addCard(
vcardService.vCardToAbCard(record.join("\n") + "\n")
);
diff -Nru thunderbird-102.6.0/comm/mailnews/import/src/nsBeckyFilters.cpp thunderbird-102.8.0/comm/mailnews/import/src/nsBeckyFilters.cpp
--- thunderbird-102.6.0/comm/mailnews/import/src/nsBeckyFilters.cpp 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/import/src/nsBeckyFilters.cpp 2023-02-14 22:00:33.000000000 +0000
@@ -436,11 +436,11 @@
NS_ENSURE_STATE(mServer);
nsCOMPtr filterList;
- nsresult rv = mServer->GetFilterList(nullptr, getter_AddRefs(filterList));
- NS_ENSURE_SUCCESS(rv, rv);
+ mServer->GetFilterList(nullptr, getter_AddRefs(filterList));
+ NS_ENSURE_STATE(filterList);
nsCOMPtr filter;
- rv = filterList->CreateFilter(EmptyString(), getter_AddRefs(filter));
+ nsresult rv = filterList->CreateFilter(EmptyString(), getter_AddRefs(filter));
NS_ENSURE_SUCCESS(rv, rv);
if (aIncoming)
@@ -459,11 +459,11 @@
NS_ENSURE_STATE(mServer);
nsCOMPtr filterList;
- nsresult rv = mServer->GetFilterList(nullptr, getter_AddRefs(filterList));
- NS_ENSURE_SUCCESS(rv, rv);
+ mServer->GetFilterList(nullptr, getter_AddRefs(filterList));
+ NS_ENSURE_STATE(filterList);
uint32_t count;
- rv = filterList->GetFilterCount(&count);
+ nsresult rv = filterList->GetFilterCount(&count);
NS_ENSURE_SUCCESS(rv, rv);
return filterList->InsertFilterAt(count, aFilter);
diff -Nru thunderbird-102.6.0/comm/mailnews/import/test/unit/resources/addressbook.json thunderbird-102.8.0/comm/mailnews/import/test/unit/resources/addressbook.json
--- thunderbird-102.6.0/comm/mailnews/import/test/unit/resources/addressbook.json 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/import/test/unit/resources/addressbook.json 2023-02-14 22:00:33.000000000 +0000
@@ -92,6 +92,14 @@
"PrimaryEmail": "jane.doe@genericemail.invalid"
}
],
+ "dos_vcard_import": [
+ {
+ "DisplayName": "Name Surname",
+ "FirstName": "Name",
+ "LastName": "Surname",
+ "PrimaryEmail": "example@gmail.com"
+ }
+ ],
"csv_import": [
{
"DisplayName": "John Doe",
diff -Nru thunderbird-102.6.0/comm/mailnews/import/test/unit/resources/dos_vcard_addressbook.vcf thunderbird-102.8.0/comm/mailnews/import/test/unit/resources/dos_vcard_addressbook.vcf
--- thunderbird-102.6.0/comm/mailnews/import/test/unit/resources/dos_vcard_addressbook.vcf 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/import/test/unit/resources/dos_vcard_addressbook.vcf 2023-02-14 22:00:33.000000000 +0000
@@ -0,0 +1,6 @@
+BEGIN:VCARD
+VERSION:3.0
+N:Surname;Name;;;
+FN:Name Surname
+EMAIL;type=INTERNET;type=HOME:example@gmail.com
+END:VCARD
diff -Nru thunderbird-102.6.0/comm/mailnews/import/test/unit/test_AddrBookFileImporter.js thunderbird-102.8.0/comm/mailnews/import/test/unit/test_AddrBookFileImporter.js
--- thunderbird-102.6.0/comm/mailnews/import/test/unit/test_AddrBookFileImporter.js 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/import/test/unit/test_AddrBookFileImporter.js 2023-02-14 22:00:33.000000000 +0000
@@ -110,6 +110,15 @@
);
});
+/** Test importing .vcf file with \r\r\n as line breaks works. */
+add_task(async function test_importDosVCardFile() {
+ return test_importAbFile(
+ "vcard",
+ "resources/dos_vcard_addressbook.vcf",
+ "dos_vcard_import"
+ );
+});
+
/** Test importing .ldif file works. */
add_task(async function test_importLdifFile() {
return test_importAbFile(
diff -Nru thunderbird-102.6.0/comm/mailnews/local/src/Pop3Client.jsm thunderbird-102.8.0/comm/mailnews/local/src/Pop3Client.jsm
--- thunderbird-102.6.0/comm/mailnews/local/src/Pop3Client.jsm 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/local/src/Pop3Client.jsm 2023-02-14 22:00:33.000000000 +0000
@@ -131,15 +131,14 @@
* Initiate a connection to the server
*/
connect() {
- this._logger.debug(
- `Connecting to pop://${this._server.hostName}:${this._server.port}`
- );
+ let hostname = this._server.hostName.toLowerCase();
+ this._logger.debug(`Connecting to pop://${hostname}:${this._server.port}`);
this.runningUri
.QueryInterface(Ci.nsIMsgMailNewsUrl)
.SetUrlState(true, Cr.NS_OK);
this._server.serverBusy = true;
this._secureTransport = this._server.socketType == Ci.nsMsgSocketType.SSL;
- this._socket = new TCPSocket(this._server.hostName, this._server.port, {
+ this._socket = new TCPSocket(hostname, this._server.port, {
binaryType: "arraybuffer",
useSecureTransport: this._secureTransport,
});
diff -Nru thunderbird-102.6.0/comm/mailnews/local/src/Pop3IncomingServer.jsm thunderbird-102.8.0/comm/mailnews/local/src/Pop3IncomingServer.jsm
--- thunderbird-102.6.0/comm/mailnews/local/src/Pop3IncomingServer.jsm 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/local/src/Pop3IncomingServer.jsm 2023-02-14 22:00:33.000000000 +0000
@@ -131,7 +131,9 @@
/** @see nsILocalMailIncomingServer */
createDefaultMailboxes() {
for (let name of ["Inbox", "Trash"]) {
- if (!this.rootFolder.containsChildNamed(name)) {
+ let folderUri = this.rootFolder.URI + "/" + name;
+ // Check by URI instead of by name, because folder name can be localized.
+ if (!this.rootFolder.getChildWithURI(folderUri, false, false)) {
this.msgStore.createFolder(this.rootFolder, name);
}
}
@@ -208,7 +210,14 @@
// Check if we are deferred to the local folders, and create INBOX if needed.
let server = MailServices.accounts.getAccount(accountKey).incomingServer;
if (server instanceof Ci.nsILocalMailIncomingServer) {
- if (!server.rootFolder.containsChildNamed("Inbox")) {
+ // Check by URI instead of by name, because folder name can be localized.
+ if (
+ !this.rootFolder.getChildWithURI(
+ `${this.rootFolder.URI}/Inbox`,
+ false,
+ false
+ )
+ ) {
server.rootFolder.createSubfolder("Inbox", null);
}
}
diff -Nru thunderbird-102.6.0/comm/mailnews/local/src/nsLocalMailFolder.cpp thunderbird-102.8.0/comm/mailnews/local/src/nsLocalMailFolder.cpp
--- thunderbird-102.6.0/comm/mailnews/local/src/nsLocalMailFolder.cpp 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/local/src/nsLocalMailFolder.cpp 2023-02-14 22:00:33.000000000 +0000
@@ -578,7 +578,7 @@
if (NS_SUCCEEDED(rv) && newTrashFolder) {
nsCOMPtr localTrash =
do_QueryInterface(newTrashFolder);
- newTrashFolder->SetDBTransferInfo(transferInfo);
+ if (transferInfo) newTrashFolder->SetDBTransferInfo(transferInfo);
if (localTrash) localTrash->RefreshSizeOnDisk();
// update the summary totals so the front end will
// show the right thing for the new trash folder
diff -Nru thunderbird-102.6.0/comm/mailnews/news/src/NntpClient.jsm thunderbird-102.8.0/comm/mailnews/news/src/NntpClient.jsm
--- thunderbird-102.6.0/comm/mailnews/news/src/NntpClient.jsm 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/news/src/NntpClient.jsm 2023-02-14 22:00:33.000000000 +0000
@@ -94,14 +94,15 @@
this.onOpen();
} else {
// Start a new connection.
+ let hostname = this._server.hostName.toLowerCase();
this._authenticated = false;
let useSecureTransport = this._server.isSecure;
this._logger.debug(
- `Connecting to ${useSecureTransport ? "snews" : "news"}://${
- this._server.hostName
- }:${this._server.port}`
+ `Connecting to ${useSecureTransport ? "snews" : "news"}://${hostname}:${
+ this._server.port
+ }`
);
- this._socket = new TCPSocket(this._server.hostName, this._server.port, {
+ this._socket = new TCPSocket(hostname, this._server.port, {
binaryType: "arraybuffer",
useSecureTransport,
});
diff -Nru thunderbird-102.6.0/comm/mailnews/search/src/nsMsgFilterService.cpp thunderbird-102.8.0/comm/mailnews/search/src/nsMsgFilterService.cpp
--- thunderbird-102.6.0/comm/mailnews/search/src/nsMsgFilterService.cpp 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/mailnews/search/src/nsMsgFilterService.cpp 2023-02-14 22:00:33.000000000 +0000
@@ -1270,8 +1270,8 @@
NS_ENSURE_ARG_POINTER(aFolder);
nsCOMPtr filterList;
- nsresult rv = aFolder->GetFilterList(aMsgWindow, getter_AddRefs(filterList));
- NS_ENSURE_SUCCESS(rv, rv);
+ aFolder->GetFilterList(aMsgWindow, getter_AddRefs(filterList));
+ NS_ENSURE_STATE(filterList);
uint32_t filterCount;
filterList->GetFilterCount(&filterCount);
diff -Nru thunderbird-102.6.0/comm/python/l10n/l10n_clone/l10n_clone.py thunderbird-102.8.0/comm/python/l10n/l10n_clone/l10n_clone.py
--- thunderbird-102.6.0/comm/python/l10n/l10n_clone/l10n_clone.py 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-102.8.0/comm/python/l10n/l10n_clone/l10n_clone.py 2023-02-14 22:00:33.000000000 +0000
@@ -0,0 +1,81 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this,
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+"""
+Download and combine translations from l10n-central and comm-l10n for
+use by mach build installers-$AB_CD and mach build langpack-$AB_CD.
+"""
+
+import argparse
+import os
+import sys
+import tempfile
+from pathlib import Path
+
+from mozpack.copier import FileCopier
+from mozpack.files import FileFinder
+from mozversioncontrol.repoupdate import update_mercurial_repo
+
+COMM_PATH = (Path(__file__).parent / "../../..").resolve()
+COMM_PYTHON_L10N = os.path.join(COMM_PATH, "python/l10n")
+sys.path.insert(1, COMM_PYTHON_L10N)
+
+from tbxchannel.l10n_merge import (
+ COMM_L10N,
+ L10N_CENTRAL,
+ COMM_STRINGS_PATTERNS,
+ GECKO_STRINGS_PATTERNS,
+)
+
+ALL_LOCALES = [
+ l.rstrip() for l in (COMM_PATH / "mail/locales/all-locales").open().readlines()
+]
+
+
+def tb_locale(locale):
+ if locale in ALL_LOCALES:
+ return locale
+ raise argparse.ArgumentTypeError("Locale {} invalid.".format(locale))
+
+
+def get_strings_repos(locale, destination):
+ with tempfile.TemporaryDirectory() as tmproot:
+ central_url = "{}/{}".format(L10N_CENTRAL, locale)
+ l10n_central = Path(tmproot) / "l10n-central"
+ l10n_central.mkdir()
+ central_path = l10n_central / locale
+ update_mercurial_repo("hg", central_url, central_path)
+
+ comm_l10n = Path(tmproot) / "comm-l10n"
+ update_mercurial_repo("hg", COMM_L10N, comm_l10n)
+
+ file_copier = FileCopier()
+
+ def add_to_registry(base_path, patterns):
+ finder = FileFinder(base_path)
+ for pattern in patterns:
+ for _filepath, _fileobj in finder.find(pattern.format(lang=locale)):
+ # _filepath = os.path.join("l10n-central", _filepath)
+ file_copier.add(_filepath, _fileobj)
+
+ add_to_registry(l10n_central, GECKO_STRINGS_PATTERNS)
+ add_to_registry(comm_l10n, COMM_STRINGS_PATTERNS)
+
+ file_copier.copy(str(destination))
+
+
+def main():
+ parser = argparse.ArgumentParser(
+ description="Download translated strings from comm-l10n"
+ )
+ parser.add_argument("locale", help="The locale to download", type=tb_locale)
+ parser.add_argument(
+ "dest_path", help="Path where locale will be downloaded to.", type=Path
+ )
+
+ args = parser.parse_args()
+ get_strings_repos(args.locale, args.dest_path)
+
+
+if __name__ == "__main__":
+ main()
diff -Nru thunderbird-102.6.0/comm/python/l10n/tbxchannel/__init__.py thunderbird-102.8.0/comm/python/l10n/tbxchannel/__init__.py
--- thunderbird-102.6.0/comm/python/l10n/tbxchannel/__init__.py 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/python/l10n/tbxchannel/__init__.py 2023-02-14 22:00:33.000000000 +0000
@@ -4,6 +4,8 @@
from pathlib import Path
+from .l10n_merge import COMM_STRINGS_QUARANTINE, COMM_STRINGS_QUARANTINE_PUSH
+
def get_thunderbird_xc_config(topsrcdir, strings_path):
assert isinstance(topsrcdir, Path)
@@ -11,10 +13,10 @@
return {
"strings": {
"path": strings_path,
- "url": "https://hg.mozilla.org/users/thunderbird_calypsoblue.org/comm-strings-quarantine/",
+ "url": COMM_STRINGS_QUARANTINE,
"heads": {"default": "default"},
"update_on_pull": True,
- "push_url": "ssh://hg.mozilla.org/users/thunderbird_calypsoblue.org/comm-strings-quarantine/",
+ "push_url": COMM_STRINGS_QUARANTINE_PUSH,
},
"source": {
"comm-central": {
diff -Nru thunderbird-102.6.0/comm/python/l10n/tbxchannel/l10n_merge.py thunderbird-102.8.0/comm/python/l10n/tbxchannel/l10n_merge.py
--- thunderbird-102.6.0/comm/python/l10n/tbxchannel/l10n_merge.py 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-102.8.0/comm/python/l10n/tbxchannel/l10n_merge.py 2023-02-14 22:00:33.000000000 +0000
@@ -0,0 +1,25 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+L10N_CENTRAL = "https://hg.mozilla.org/l10n-central"
+COMM_L10N = "https://hg.mozilla.org/projects/comm-l10n"
+COMM_STRINGS_QUARANTINE = "https://hg.mozilla.org/projects/comm-strings-quarantine"
+COMM_STRINGS_QUARANTINE_PUSH = f"ssh{COMM_STRINGS_QUARANTINE[5:]}"
+
+
+GECKO_STRINGS_PATTERNS = (
+ "{lang}/browser/pdfviewer/**",
+ "{lang}/devtools/**",
+ "{lang}/dom/**",
+ "{lang}/netwerk/**",
+ "{lang}/security/**",
+ "{lang}/services/**",
+ "{lang}/toolkit/**",
+)
+
+COMM_STRINGS_PATTERNS = (
+ "{lang}/calendar/**",
+ "{lang}/chat/**",
+ "{lang}/mail/**",
+)
diff -Nru thunderbird-102.6.0/comm/python/rocbuild/process_cmake_define_files.py thunderbird-102.8.0/comm/python/rocbuild/process_cmake_define_files.py
--- thunderbird-102.6.0/comm/python/rocbuild/process_cmake_define_files.py 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-102.8.0/comm/python/rocbuild/process_cmake_define_files.py 2023-02-14 22:00:33.000000000 +0000
@@ -0,0 +1,103 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import argparse
+import os
+import re
+import sys
+from buildconfig import topsrcdir, topobjdir
+from mozbuild.backend.configenvironment import PartialConfigEnvironment
+
+
+def define_type(string):
+ vals = string.split("=", 1)
+ if len(vals) == 1:
+ vals.append(1)
+ elif vals[1].isdecimal():
+ vals[1] = int(vals[1])
+ return tuple(vals)
+
+
+def process_cmake_define_file(output, input_file, extra_defines):
+ """Creates the given config header. A config header is generated by
+ taking the corresponding source file and replacing some #define/#undef
+ occurences:
+ "#undef NAME" is turned into "#define NAME VALUE"
+ "#cmakedefine NAME" is turned into "#define NAME VALUE"
+ "#define NAME" is unchanged
+ "#define NAME ORIGINAL_VALUE" is turned into "#define NAME VALUE"
+ "#undef UNKNOWN_NAME" is turned into "/* #undef UNKNOWN_NAME */"
+ "#cmakedefine UNKNOWN_NAME" is turned into "/* #undef UNKNOWN_NAME */"
+ Whitespaces are preserved.
+ """
+
+ path = os.path.abspath(input_file)
+
+ config = PartialConfigEnvironment(topobjdir)
+
+ defines = dict(config.defines.iteritems())
+ defines.update(extra_defines)
+
+ with open(path, "r") as input_file:
+ r = re.compile(
+ r'^\s*#\s*(?P[a-z]+)(?:\s+(?P\S+)(?:\s+(?P("[^"]+"|\S+)))?)?',
+ re.U,
+ )
+ for line in input_file:
+ m = r.match(line)
+ if m:
+ cmd = m.group("cmd")
+ name = m.group("name")
+ value = m.group("value")
+ if name:
+ if cmd == "define":
+ if value and name in defines:
+ line = (
+ line[: m.start("value")]
+ + str(defines[name])
+ + line[m.end("value") :]
+ )
+ elif cmd in ("undef", "cmakedefine"):
+ if name in defines:
+ line = (
+ line[: m.start("cmd")]
+ + "define"
+ + line[m.end("cmd") : m.end("name")]
+ + " "
+ + str(defines[name])
+ + line[m.end("name") :]
+ )
+ else:
+ line = (
+ "/* #undef "
+ + line[m.start("name") : m.end("name")]
+ + " */"
+ + line[m.end("name") :]
+ )
+
+ output.write(line)
+
+
+def main(output, *argv):
+ parser = argparse.ArgumentParser(description="Process define files.")
+
+ parser.add_argument("input", help="Input define file.")
+ parser.add_argument(
+ "-D",
+ type=define_type,
+ action="append",
+ dest="extra_defines",
+ default=[],
+ help="Additional defines not set at configure time.",
+ )
+
+ args = parser.parse_args(argv)
+
+ return process_cmake_define_file(output, args.input, args.extra_defines)
+
+
+if __name__ == "__main__":
+ sys.exit(main(*sys.argv))
diff -Nru thunderbird-102.6.0/comm/python/thirdroc/thirdroc/__init__.py thunderbird-102.8.0/comm/python/thirdroc/thirdroc/__init__.py
--- thunderbird-102.6.0/comm/python/thirdroc/thirdroc/__init__.py 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/python/thirdroc/thirdroc/__init__.py 2023-02-14 22:00:33.000000000 +0000
@@ -5,7 +5,7 @@
from __future__ import print_function, absolute_import
import re
-from distutils.version import StrictVersion
+from packaging.version import parse
VTAG_RE = re.compile(r"^v\d+\.\d+\.\d+$")
@@ -24,12 +24,12 @@
def get_latest_version(*versions):
"""
- Given a list of versions (that must parse with distutils.version.StrictVersion,
+ Given a list of versions (that must parse with packaging.version.parse),
return the latest/newest version.
:param list versions:
- :return StrictVersion:
+ :return Version:
"""
- version_list = [StrictVersion(tag2version(v)) for v in versions]
+ version_list = [parse(tag2version(v)) for v in versions]
version_list.sort()
return version_list[-1]
diff -Nru thunderbird-102.6.0/comm/python/thirdroc/thirdroc/rnp.py thunderbird-102.8.0/comm/python/thirdroc/thirdroc/rnp.py
--- thunderbird-102.6.0/comm/python/thirdroc/thirdroc/rnp.py 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/python/thirdroc/thirdroc/rnp.py 2023-02-14 22:00:33.000000000 +0000
@@ -8,12 +8,12 @@
from io import StringIO
from datetime import date
import re
-from distutils.version import StrictVersion
+from packaging.version import parse
from mozbuild.preprocessor import Preprocessor
-def rnp_source_update(rnp_root, version_str, revision, timestamp, bug_report):
+def rnp_source_update(rnp_root, version_str, revision, timestamp):
"""
Update RNP source files: generate version.h and mangle config.h.in
:param rnp_root:
@@ -21,12 +21,11 @@
:param string version_str: latest version
:param string revision: revision hash (short form)
:param float timestamp: UNIX timestamp from revision
- :param string bug_report: where to report bugs for this RNP build
"""
- version = StrictVersion(version_str)
- version_major = version.version[0]
- version_minor = version.version[1]
- version_patch = version.version[2]
+ version = parse(version_str)
+ version_major = version.major
+ version_minor = version.minor
+ version_patch = version.micro
date_str = date.fromtimestamp(float(timestamp)).strftime("%Y%m%d")
revision_short = revision[:8]
version_full = "{}+git{}.{}.MZLA".format(version_str, date_str, revision_short)
@@ -38,16 +37,13 @@
RNP_VERSION=version_str,
RNP_VERSION_FULL=version_full,
RNP_VERSION_COMMIT_TIMESTAMP=str(timestamp),
- BUGREPORT_EMAIL=bug_report,
)
src_lib = os.path.join(rnp_root, "src", "lib")
version_h_in = os.path.join(src_lib, "version.h.in")
version_h = os.path.join(src_lib, "version.h")
- config_h_in = os.path.join(src_lib, "config.h.in")
readme_rnp = os.path.join(rnp_root, "..", "README.rnp")
generate_version_h(version_h_in, version_h, defines)
- mangle_config_h_in(config_h_in, defines)
update_readme(readme_rnp, revision)
@@ -81,26 +77,6 @@
rnp_preprocess(tmpl, dest, defines)
-def mangle_config_h_in(template, defines):
- """
- Mangle RNP's config.h.in so that it will work with CONFIGURE_DEFINE_FILES
- :param string template: path to config.h.in
- :param dict defines: result of get_defines()
- """
- with open(template) as tmpl:
- tmp_string = StringIO()
- rnp_preprocess(tmpl, tmp_string, defines)
-
- tmp_string.seek(0)
-
- with open(template, "w") as dest:
- for line in tmp_string:
- if line.startswith("#cmakedefine"):
- line = line.replace("#cmakedefine", "#undef")
- dest.write(line)
- dest.write("\n")
-
-
def update_readme(path, revision):
"""
Updates the commit hash in README.rnp
diff -Nru thunderbird-102.6.0/comm/python/thirdroc/thirdroc/rnp_symbols.py thunderbird-102.8.0/comm/python/thirdroc/thirdroc/rnp_symbols.py
--- thunderbird-102.6.0/comm/python/thirdroc/thirdroc/rnp_symbols.py 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/python/thirdroc/thirdroc/rnp_symbols.py 2023-02-14 22:00:33.000000000 +0000
@@ -16,26 +16,71 @@
Dependencies: Only Python 3
Running:
- python3 rnp_symbols.py
+ python3 rnp_symbols.py [-h] [rnp.h path] [rnp.symbols path]
-Output will be on stdout, this is to give the developer the opportunity to compare the old and
-new versions and check for accuracy.
-"""
+Both file path arguments are optional. By default, the header file will be
+read from "comm/third_party/rnp/include/rnp/rnp.h" and the symbols file will
+be written to "comm/third_party/rnp/rnp.symbols".
+
+Path arguments are relative to the current working directory, the defaults
+will be determined based on the location of this script.
-from __future__ import absolute_import, print_function
+Either path argument can be '-' to use stdin or stdout respectively.
+"""
+import argparse
import sys
import os
import re
HERE = os.path.dirname(__file__)
TOPSRCDIR = os.path.abspath(os.path.join(HERE, "../../../../"))
-RNPSRCDIR = os.path.join(TOPSRCDIR, "comm/third_party/rnp")
+THIRD_SRCDIR = os.path.join(TOPSRCDIR, "comm/third_party")
+HEADER_FILE_REL = "rnp/include/rnp/rnp.h"
+HEADER_FILE = os.path.join(THIRD_SRCDIR, HEADER_FILE_REL)
+SYMBOLS_FILE_REL = "rnp/rnp.symbols"
+SYMBOLS_FILE = os.path.join(THIRD_SRCDIR, SYMBOLS_FILE_REL)
FUNC_DECL_RE = re.compile(r"^RNP_API\s+.*?([a-zA-Z0-9_]+)\(.*$")
+class FileArg:
+ """Based on argparse.FileType from the Python standard library.
+ Modified to not open the filehandles until the open() method is
+ called.
+ """
+
+ def __init__(self, mode="r"):
+ self._mode = mode
+ self._fp = None
+ self._file = None
+
+ def __call__(self, string):
+ # the special argument "-" means sys.std{in,out}
+ if string == "-":
+ if "r" in self._mode:
+ self._fp = sys.stdin.buffer if "b" in self._mode else sys.stdin
+ elif "w" in self._mode:
+ self._fp = sys.stdout.buffer if "b" in self._mode else sys.stdout
+ else:
+ raise ValueError(f"Invalid mode {self._mode} for stdin/stdout")
+ else:
+ if "r" in self._mode:
+ if not os.path.isfile(string):
+ raise ValueError(f"Cannot read file {string}, does not exist.")
+ elif "w" in self._mode:
+ if not os.access(string, os.W_OK):
+ raise ValueError(f"Cannot write file {string}, permission denied.")
+ self._file = string
+ return self
+
+ def open(self):
+ if self._fp:
+ return self._fp
+ return open(self._file, self._mode)
+
+
def get_func_name(line):
"""
Extract the function name from a RNP_API function declaration.
@@ -48,22 +93,39 @@
return m.group(1)
-def extract_func_defs(filename):
+def extract_func_defs(filearg):
"""
Look for RNP_API in the header file to find the names of the symbols that should be exported
"""
- with open(filename) as fp:
+ with filearg.open() as fp:
for line in fp:
- if line.startswith("RNP_API"):
+ if line.startswith("RNP_API") and "RNP_DEPRECATED" not in line:
func_name = get_func_name(line)
yield func_name
if __name__ == "__main__":
- if len(sys.argv) > 1:
- FILENAME = sys.argv[1]
- else:
- FILENAME = os.path.join(RNPSRCDIR, "include/rnp/rnp.h")
-
- for f in sorted(list(extract_func_defs(FILENAME))):
- print(f)
+ parser = argparse.ArgumentParser(
+ description="Update rnp.symbols file from rnp.h",
+ epilog="To use stdin or stdout pass '-' for the argument.",
+ )
+ parser.add_argument(
+ "header_file",
+ default=HEADER_FILE,
+ type=FileArg("r"),
+ nargs="?",
+ help=f"input path to rnp.h header file (default: {HEADER_FILE_REL})",
+ )
+ parser.add_argument(
+ "symbols_file",
+ default=SYMBOLS_FILE,
+ type=FileArg("w"),
+ nargs="?",
+ help=f"output path to symbols file (default: {SYMBOLS_FILE_REL})",
+ )
+
+ args = parser.parse_args()
+
+ with args.symbols_file.open() as out_fp:
+ for symbol in sorted(list(extract_func_defs(args.header_file))):
+ out_fp.write(f"{symbol}\n")
diff -Nru thunderbird-102.6.0/comm/taskcluster/ci/beetmover-strings-source/kind.yml thunderbird-102.8.0/comm/taskcluster/ci/beetmover-strings-source/kind.yml
--- thunderbird-102.6.0/comm/taskcluster/ci/beetmover-strings-source/kind.yml 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-102.8.0/comm/taskcluster/ci/beetmover-strings-source/kind.yml 2023-02-14 22:00:33.000000000 +0000
@@ -0,0 +1,19 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+---
+loader: gecko_taskgraph.loader.single_dep:loader
+
+transforms:
+ - gecko_taskgraph.transforms.name_sanity:transforms
+ - gecko_taskgraph.transforms.beetmover:transforms
+ - gecko_taskgraph.transforms.beetmover_source:transforms
+ - gecko_taskgraph.transforms.task:transforms
+
+kind-dependencies:
+ - shippable-l10n-pre-signing
+
+job-template:
+ shipping-phase: promote
+ attributes:
+ artifact_map: comm/taskcluster/comm_taskgraph/manifests/strings_source.yml
diff -Nru thunderbird-102.6.0/comm/taskcluster/ci/config.yml thunderbird-102.8.0/comm/taskcluster/ci/config.yml
--- thunderbird-102.6.0/comm/taskcluster/ci/config.yml 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/taskcluster/ci/config.yml 2023-02-14 22:00:33.000000000 +0000
@@ -155,17 +155,17 @@
provisioner: 'comm-{level}'
implementation: docker-worker
os: linux
- worker-type: '{alias}'
+ worker-type: '{alias}-gcp'
b-win2012:
provisioner: 'comm-{level}'
implementation: generic-worker
os: windows
- worker-type: '{alias}'
+ worker-type: '{alias}-azure'
images:
provisioner: 'comm-{level}'
implementation: docker-worker
os: linux
- worker-type: '{alias}'
+ worker-type: '{alias}-gcp'
balrog:
provisioner: scriptworker-k8s
implementation: balrog
@@ -235,7 +235,7 @@
provisioner: comm-t
implementation: docker-worker
os: linux
- worker-type: '{alias}'
+ worker-type: '{alias}-gcp'
t-osx-1015-r8:
provisioner: releng-hardware
implementation: generic-worker
@@ -260,7 +260,7 @@
provisioner: comm-t
implementation: docker-worker
os: linux
- worker-type: misc
+ worker-type: misc-gcp
mac-notarization:
mac-behavior:
diff -Nru thunderbird-102.6.0/comm/taskcluster/ci/l10n-bump/kind.yml thunderbird-102.8.0/comm/taskcluster/ci/l10n-bump/kind.yml
--- thunderbird-102.6.0/comm/taskcluster/ci/l10n-bump/kind.yml 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/taskcluster/ci/l10n-bump/kind.yml 2023-02-14 22:00:33.000000000 +0000
@@ -23,7 +23,7 @@
default: false
source-repo:
by-release-type:
- release: https://hg.mozilla.org/releases/comm-esr91
+ release: https://hg.mozilla.org/releases/comm-esr102
beta: https://hg.mozilla.org/releases/comm-beta
default: https://hg.mozilla.org/comm-central
l10n-bump-info:
@@ -32,7 +32,7 @@
name: Thunderbird l10n changesets
path: mail/locales/l10n-changesets.json
version-path: mail/config/version.txt
- l10n-repo-url: "https://hg.mozilla.org/l10n-central/%(locale)s/json-pushes?version=2&tipsonly=1"
+ l10n-repo-url: "https://hg.mozilla.org/projects/comm-l10n/json-pushes?version=2&tipsonly=1"
ignore-config:
ja:
- macosx64
diff -Nru thunderbird-102.6.0/comm/taskcluster/ci/merge-automation/kind.yml thunderbird-102.8.0/comm/taskcluster/ci/merge-automation/kind.yml
--- thunderbird-102.6.0/comm/taskcluster/ci/merge-automation/kind.yml 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/taskcluster/ci/merge-automation/kind.yml 2023-02-14 22:00:33.000000000 +0000
@@ -34,7 +34,7 @@
name: Thunderbird l10n changesets
path: mail/locales/l10n-changesets.json
version-path: mail/config/version.txt
- l10n-repo-url: "https://hg.mozilla.org/l10n-central/%(locale)s/json-pushes?version=2&tipsonly=1"
+ l10n-repo-url: "https://hg.mozilla.org/projects/comm-l10n/json-pushes?version=2&tipsonly=1"
ignore-config:
ja:
- macosx64
diff -Nru thunderbird-102.6.0/comm/taskcluster/ci/shippable-l10n/kind.yml thunderbird-102.8.0/comm/taskcluster/ci/shippable-l10n/kind.yml
--- thunderbird-102.6.0/comm/taskcluster/ci/shippable-l10n/kind.yml 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/taskcluster/ci/shippable-l10n/kind.yml 2023-02-14 22:00:33.000000000 +0000
@@ -7,7 +7,7 @@
group-by: platform
transforms:
- - gecko_taskgraph.transforms.l10n:transforms
+ - comm_taskgraph.transforms.l10n:transforms
- gecko_taskgraph.transforms.job:transforms
- gecko_taskgraph.transforms.task:transforms
@@ -15,6 +15,7 @@
- build
- build-signing
- fetch
+ - shippable-l10n-pre
- repackage
- toolchain
@@ -29,7 +30,10 @@
job-template:
description: Localization
- locales-file: comm/mail/locales/l10n-changesets.json
+ locales-file:
+ by-release-type:
+ beta|release: comm/mail/locales/shipped-locales
+ default: comm/mail/locales/all-locales
locales-per-chunk: 5
run-on-projects: ['release']
attributes:
@@ -37,13 +41,15 @@
ignore-locales:
by-build-platform:
# OSX has a special locale for japanese
- macosx64.*: [ja]
- default: [ja-JP-mac]
+ macosx64.*: [ja, en-US]
+ default: [ja-JP-mac, en-US]
run-time:
by-build-platform:
default: 900
win.*: 1800
secrets: false
+ dependencies:
+ shippable-l10n-pre: shippable-l10n-pre-shippable-l10n-pre/opt
fetches:
toolchain:
by-build-platform:
@@ -60,6 +66,8 @@
default: []
win.*:
- upx-3.95-win
+ shippable-l10n-pre:
+ - strings_all.tar.zst
tooltool:
by-build-platform:
default: internal
@@ -75,7 +83,6 @@
win32-shippable: win32-opt
win64-shippable: win64-opt
worker-type: b-linux
- docker-image: {in-tree: debian11-amd64-build}
treeherder:
symbol: L10n(B)
tier: 1
@@ -137,6 +144,6 @@
- single_locale/tc_win64.py
- single_locale/thunderbird.py
- taskcluster_nightly.py
- actions: ['clone-locales', 'list-locales', 'setup', 'repack',
+ actions: ['list-locales', 'setup', 'repack',
'summary']
script: mozharness/scripts/desktop_l10n.py
diff -Nru thunderbird-102.6.0/comm/taskcluster/ci/shippable-l10n-pre/kind.yml thunderbird-102.8.0/comm/taskcluster/ci/shippable-l10n-pre/kind.yml
--- thunderbird-102.6.0/comm/taskcluster/ci/shippable-l10n-pre/kind.yml 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-102.8.0/comm/taskcluster/ci/shippable-l10n-pre/kind.yml 2023-02-14 22:00:33.000000000 +0000
@@ -0,0 +1,60 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+---
+loader: gecko_taskgraph.loader.transform:loader
+
+kind-dependencies:
+ - toolchain
+
+transforms:
+ - comm_taskgraph.transforms.l10n_pre:transforms
+ - gecko_taskgraph.transforms.build:transforms
+ - gecko_taskgraph.transforms.build_attrs:transforms
+ - gecko_taskgraph.transforms.job:transforms
+ - gecko_taskgraph.transforms.task:transforms
+
+job-defaults:
+ shipping-phase: promote
+ treeherder:
+ symbol: L10n-pre-S
+ worker-type: b-linux
+ worker:
+ max-run-time: 900
+ env:
+ MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE: system
+ attributes:
+ shippable: true
+ locale-list:
+ by-release-type:
+ beta|release: comm/mail/locales/shipped-locales
+ default: comm/mail/locales/all-locales
+ comm-locales-file: comm/mail/locales/l10n-changesets.json
+ browser-locales-file: browser/locales/l10n-changesets.json
+ run:
+ using: mozharness
+ comm-checkout: true
+ actions:
+ - clone-gecko-locales
+ - clone-monorepo
+ - merge-repos
+ - pack-merged
+ - gen-changesets
+ script: comm/taskcluster/scripts/desktop_comm_l10n.py
+ config-paths:
+ - comm/testing/mozharness/configs
+ config:
+ - single_locale/linux64.py
+ - single_locale/tc_common.py
+ - single_locale/thunderbird_split_l10n.py
+ - taskcluster_nightly.py
+ options: []
+ run-on-projects: []
+ optimization: null
+
+
+jobs:
+ shippable-l10n-pre/opt:
+ description: Pre-Localization artifact build
+ treeherder:
+ platform: thunderbird-release/opt
diff -Nru thunderbird-102.6.0/comm/taskcluster/ci/shippable-l10n-pre-signing/kind.yml thunderbird-102.8.0/comm/taskcluster/ci/shippable-l10n-pre-signing/kind.yml
--- thunderbird-102.6.0/comm/taskcluster/ci/shippable-l10n-pre-signing/kind.yml 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-102.8.0/comm/taskcluster/ci/shippable-l10n-pre-signing/kind.yml 2023-02-14 22:00:33.000000000 +0000
@@ -0,0 +1,17 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+---
+loader: gecko_taskgraph.loader.single_dep:loader
+
+transforms:
+ - gecko_taskgraph.transforms.name_sanity:transforms
+ - comm_taskgraph.transforms.l10n_source_signing:transforms
+ - gecko_taskgraph.transforms.signing:transforms
+ - gecko_taskgraph.transforms.task:transforms
+
+kind-dependencies:
+ - shippable-l10n-pre
+
+job-template:
+ shipping-phase: promote
diff -Nru thunderbird-102.6.0/comm/taskcluster/comm_taskgraph/manifests/strings_source.yml thunderbird-102.8.0/comm/taskcluster/comm_taskgraph/manifests/strings_source.yml
--- thunderbird-102.6.0/comm/taskcluster/comm_taskgraph/manifests/strings_source.yml 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-102.8.0/comm/taskcluster/comm_taskgraph/manifests/strings_source.yml 2023-02-14 22:00:33.000000000 +0000
@@ -0,0 +1,64 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+---
+s3_bucket_paths:
+ by-platform:
+ shippable-l10n-pre:
+ - pub/thunderbird/candidates
+default_locales: # if given an empty locale, use these locales
+ - en-US
+tasktype_map: # Map task reference to task type.
+ shippable-l10n-pre-signing: signing
+
+# A default entry, which the mappings below extend and override.
+# Final 'destinations' will be the product of:
+# s3_bucket_paths + destinations + locale_prefix + pretty_name
+default: &default
+ from:
+ - shippable-l10n-pre-signing
+ all_locales: false
+ description: "TO_BE_OVERRIDDEN"
+ locale_prefix: ''
+ source_path_modifier: ''
+ destinations: # locale_prefix is appended
+ - ${version}-candidates/build${build_number}/source
+
+# Configuration for individual files. Extends 'default', above.
+mapping:
+ strings_all.tar.zst:
+ <<: *default
+ description: "Strings sources for localuized builds and langpacks"
+ pretty_name:
+ by-platform:
+ shippable-l10n-pre: thunderbird-${version}.strings_all.tar.zst
+ checksums_path:
+ by-platform:
+ shippable-l10n-pre: source/thunderbird-${version}.strings_all.tar.zst
+ strings_all.tar.zst.asc:
+ <<: *default
+ description: "Detached signature for the strings source file"
+ pretty_name:
+ by-platform:
+ shippable-l10n-pre: thunderbird-${version}.strings_all.tar.zst.asc
+ checksums_path:
+ by-platform:
+ shippable-l10n-pre: source/thunderbird-${version}.strings_all.tar.zst.asc
+ l10n-changesets.json:
+ <<: *default
+ description: "Source info used to build strings_all.tar.zst"
+ pretty_name:
+ by-platform:
+ shippable-l10n-pre: thunderbird-${version}.l10n-changesets.json
+ checksums_path:
+ by-platform:
+ shippable-l10n-pre: source/thunderbird-${version}.l10n-changesets.json
+ l10n-changesets.json.asc:
+ <<: *default
+ description: "Detached signature for changesets file"
+ pretty_name:
+ by-platform:
+ shippable-l10n-pre: thunderbird-${version}.l10n-changesets.json.asc
+ checksums_path:
+ by-platform:
+ shippable-l10n-pre: source/thunderbird-${version}.l10n-changesets.json.asc
diff -Nru thunderbird-102.6.0/comm/taskcluster/comm_taskgraph/transforms/l10n.py thunderbird-102.8.0/comm/taskcluster/comm_taskgraph/transforms/l10n.py
--- thunderbird-102.6.0/comm/taskcluster/comm_taskgraph/transforms/l10n.py 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-102.8.0/comm/taskcluster/comm_taskgraph/transforms/l10n.py 2023-02-14 22:00:33.000000000 +0000
@@ -0,0 +1,83 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+"""
+Do transforms specific to l10n kind
+"""
+
+from taskgraph.transforms.base import TransformSequence, ValidateSchema
+from taskgraph.util.schema import resolve_keyed_by
+
+from gecko_taskgraph.transforms.l10n import (
+ all_locales_attribute,
+ chunk_locales,
+ copy_in_useful_magic,
+ handle_artifact_prefix,
+ handle_keyed_by,
+ l10n_description_schema,
+ make_job_description,
+ set_extra_config,
+ setup_name,
+)
+
+
+def setup_signing_dependency(config, jobs):
+ """Sets up a task dependency to the signing job this relates to"""
+ for job in jobs:
+ job["dependencies"].update(
+ {
+ "build": job["dependent-tasks"]["build"].label,
+ }
+ )
+
+ if job["attributes"]["build_platform"].startswith("win"):
+ job["dependencies"].update(
+ {
+ "build-signing": job["dependent-tasks"]["build-signing"].label,
+ }
+ )
+
+ if "shippable" in job["attributes"]["build_platform"]:
+ if job["attributes"]["build_platform"].startswith("macosx"):
+ job["dependencies"].update(
+ {"repackage": job["dependent-tasks"]["repackage"].label}
+ )
+ if job["attributes"]["build_platform"].startswith("linux"):
+ job["dependencies"].update(
+ {
+ "build-signing": job["dependent-tasks"]["build-signing"].label,
+ }
+ )
+ yield job
+
+
+def handle_keyed_by_local(config, jobs):
+ """Resolve fields that can be keyed by platform, etc."""
+ for job in jobs:
+ resolve_keyed_by(
+ job,
+ "locales-file",
+ item_name=job["name"],
+ **{"release-type": config.params["release_type"]},
+ )
+ yield job
+
+
+transforms = TransformSequence()
+
+
+for transform_func in (
+ setup_name,
+ copy_in_useful_magic,
+ handle_keyed_by_local,
+ ValidateSchema(l10n_description_schema),
+ setup_signing_dependency,
+ handle_keyed_by,
+ handle_artifact_prefix,
+ all_locales_attribute,
+ chunk_locales,
+ ValidateSchema(l10n_description_schema),
+ set_extra_config,
+ make_job_description,
+):
+ transforms.add(transform_func)
diff -Nru thunderbird-102.6.0/comm/taskcluster/comm_taskgraph/transforms/l10n_pre.py thunderbird-102.8.0/comm/taskcluster/comm_taskgraph/transforms/l10n_pre.py
--- thunderbird-102.6.0/comm/taskcluster/comm_taskgraph/transforms/l10n_pre.py 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-102.8.0/comm/taskcluster/comm_taskgraph/transforms/l10n_pre.py 2023-02-14 22:00:33.000000000 +0000
@@ -0,0 +1,45 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+"""
+Create a strings build artifact to be consumed by shippable-l10n.
+"""
+
+
+from taskgraph.transforms.base import TransformSequence
+from taskgraph.util.schema import resolve_keyed_by
+
+transforms = TransformSequence()
+
+
+@transforms.add
+def handle_keyed_by(config, jobs):
+ """Resolve fields that can be keyed by platform, etc."""
+ for job in jobs:
+ resolve_keyed_by(
+ job,
+ "locale-list",
+ item_name=job["name"],
+ **{"release-type": config.params["release_type"]},
+ )
+ yield job
+
+
+@transforms.add
+def make_job_description(config, jobs):
+ for job in jobs:
+ locale_list = job.pop("locale-list")
+ comm_locales_file = job.pop("comm-locales-file")
+ browser_locales_file = job.pop("browser-locales-file")
+ job["run"].update(
+ {
+ "job-script": "comm/taskcluster/scripts/build-l10n-pre.sh",
+ "options": [
+ f"locale-list={locale_list}",
+ f"comm-locales-file={comm_locales_file}",
+ f"browser-locales-file={browser_locales_file}",
+ ],
+ }
+ )
+
+ yield job
diff -Nru thunderbird-102.6.0/comm/taskcluster/comm_taskgraph/transforms/l10n_source_signing.py thunderbird-102.8.0/comm/taskcluster/comm_taskgraph/transforms/l10n_source_signing.py
--- thunderbird-102.6.0/comm/taskcluster/comm_taskgraph/transforms/l10n_source_signing.py 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-102.8.0/comm/taskcluster/comm_taskgraph/transforms/l10n_source_signing.py 2023-02-14 22:00:33.000000000 +0000
@@ -0,0 +1,53 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+"""
+Transform the signing task into an actual task description.
+"""
+
+from taskgraph.transforms.base import TransformSequence
+from taskgraph.util.taskcluster import get_artifact_path
+
+
+from gecko_taskgraph.transforms.build_signing import add_signed_routes
+from gecko_taskgraph.util.attributes import copy_attributes_from_dependent_job
+
+transforms = TransformSequence()
+
+transforms.add(add_signed_routes)
+
+
+@transforms.add
+def define_upstream_artifacts(config, jobs):
+ for job in jobs:
+ dep_job = job["primary-dependency"]
+ upstream_artifact_task = job.pop("upstream-artifact-task", dep_job)
+
+ job["attributes"] = copy_attributes_from_dependent_job(dep_job)
+
+ artifacts_specifications = [
+ {
+ "artifacts": [
+ get_artifact_path(job, "strings_all.tar.zst"),
+ get_artifact_path(job, "l10n-changesets.json"),
+ ],
+ "formats": ["autograph_gpg"],
+ }
+ ]
+
+ task_ref = f"<{upstream_artifact_task.kind}>"
+ task_type = "build"
+ if "notarization" in upstream_artifact_task.kind:
+ task_type = "scriptworker"
+
+ job["upstream-artifacts"] = [
+ {
+ "taskId": {"task-reference": task_ref},
+ "taskType": task_type,
+ "paths": spec["artifacts"],
+ "formats": spec["formats"],
+ }
+ for spec in artifacts_specifications
+ ]
+
+ yield job
diff -Nru thunderbird-102.6.0/comm/taskcluster/docs/kinds.rst thunderbird-102.8.0/comm/taskcluster/docs/kinds.rst
--- thunderbird-102.6.0/comm/taskcluster/docs/kinds.rst 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/taskcluster/docs/kinds.rst 2023-02-14 22:00:33.000000000 +0000
@@ -4,3 +4,62 @@
This section lists and documents the additional task kinds that are specific
to Thunderbird and are implemented in it's source tree.
+shippable-l10n-pre
+------------------
+Prepares a build artifact containing the translated strings from all locales.
+The artifact is consumed by `shippable-l10n` to produce the localized
+Thunderbird builds.
+
+Using
+.....
+
+- kind-dependencies:
+ Must include `build`
+- transforms:
+ Must include `comm_taskgraph.transforms.l10n_pre:transforms`
+- only-for-attributes:
+ Must include `shippable`
+- only-for-build-platforms:
+ This is set to `linux64-shippable/opt` so that it only runs for that
+ platform. All platforms will consume the build artifact from
+ `linux64-shippable/opt`. (It's just string data; nothing platform-specific
+ in there.)
+
+Parameters
+..........
+
+There are some task parameters specific to this job kind.
+
+- locale-list:
+ Points to either `shipped-locales` or `all-locales`. This file is used to
+ select the locales that are included in the build artifact.
+- comm-locales-file:
+ This file contains the revision of the `comm-l10n` monorepo to checkout.
+- browser-locales-file:
+ This file contains the revisions of the `l10n-central` repositories to checkout.
+ This is for toolkit and other strings used from mozilla-central.
+
+Other notes
+...........
+
+The mozharness script reads its configuration from `thunderbird_split_l10n.py`.
+In that file, `hg_l10n_base` refers to the `l10n-central` repository root.
+This is used with `browser-locales-file` to get the strings from toolkit and
+devtools that are needed.
+
+Also in the mozharness config file is `hg_comm_l10n_repo`, set to the URL of
+the `comm-l10n` monorepo.
+
+The mozharness script will clone the necessary repositories from `l10n-central`,
+and `comm-l10n`, merge them, and create a tar file.
+
+
+shippable-l10n-pre-signing
+--------------------------
+
+Signing job for shippable-l10n-pre artifacts
+
+beetmover-strings-source
+------------------------
+
+Upload strings source files to FTP.
diff -Nru thunderbird-102.6.0/comm/taskcluster/scripts/build-l10n-pre.sh thunderbird-102.8.0/comm/taskcluster/scripts/build-l10n-pre.sh
--- thunderbird-102.6.0/comm/taskcluster/scripts/build-l10n-pre.sh 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-102.8.0/comm/taskcluster/scripts/build-l10n-pre.sh 2023-02-14 22:00:33.000000000 +0000
@@ -0,0 +1,90 @@
+#! /bin/bash -vex
+
+set -x -e
+
+echo "running as" $(id)
+
+####
+# Taskcluster friendly wrapper for performing fx desktop l10n repacks via mozharness.
+# Based on ./build-l10n.sh
+####
+
+# Inputs, with defaults
+
+: MOZHARNESS_SCRIPT ${MOZHARNESS_SCRIPT}
+: MOZHARNESS_CONFIG ${MOZHARNESS_CONFIG}
+: MOZHARNESS_CONFIG_PATHS ${MOZHARNESS_CONFIG_PATHS}
+: MOZHARNESS_ACTIONS ${MOZHARNESS_ACTIONS}
+: MOZHARNESS_OPTIONS ${MOZHARNESS_OPTIONS}
+
+: TOOLTOOL_CACHE ${TOOLTOOL_CACHE:=/builds/worker/tooltool-cache}
+
+: MOZ_SCM_LEVEL ${MOZ_SCM_LEVEL:=1}
+
+: MOZ_SCM_LEVEL ${MOZ_SCM_LEVEL:=1}
+
+: WORKSPACE ${WORKSPACE:=/builds/worker/workspace}
+: MOZ_OBJDIR ${MOZ_OBJDIR:=$WORKSPACE/obj-build}
+
+set -v
+
+fail() {
+ echo # make sure error message is on a new line
+ echo "[build-l10n-pre.sh:error]" "${@}"
+ exit 1
+}
+
+export MOZ_CRASHREPORTER_NO_REPORT=1
+export TINDERBOX_OUTPUT=1
+
+# test required parameters are supplied
+if [[ -z ${MOZHARNESS_SCRIPT} ]]; then fail "MOZHARNESS_SCRIPT is not set"; fi
+if [[ -z "${MOZHARNESS_CONFIG}" && -z "${EXTRA_MOZHARNESS_CONFIG}" ]]; then fail "MOZHARNESS_CONFIG or EXTRA_MOZHARNESS_CONFIG is not set"; fi
+
+# set up mozharness configuration, via command line, env, etc.
+
+# $TOOLTOOL_CACHE bypasses mozharness completely and is read by tooltool_wrapper.sh to set the
+# cache. However, only some mozharness scripts use tooltool_wrapper.sh, so this may not be
+# entirely effective.
+export TOOLTOOL_CACHE
+
+export MOZ_OBJDIR
+
+config_path_cmds=""
+for path in ${MOZHARNESS_CONFIG_PATHS}; do
+ config_path_cmds="${config_path_cmds} --extra-config-path ${GECKO_PATH}/${path}"
+done
+
+# support multiple, space delimited, config files
+config_cmds=""
+for cfg in $MOZHARNESS_CONFIG; do
+ config_cmds="${config_cmds} --config ${cfg}"
+done
+
+# if MOZHARNESS_ACTIONS is given, only run those actions (completely overriding default_actions
+# in the mozharness configuration)
+if [ -n "$MOZHARNESS_ACTIONS" ]; then
+ actions=""
+ for action in $MOZHARNESS_ACTIONS; do
+ actions="$actions --$action"
+ done
+fi
+
+# if MOZHARNESS_OPTIONS is given, append them to mozharness command line run
+if [ -n "$MOZHARNESS_OPTIONS" ]; then
+ options=""
+ for option in $MOZHARNESS_OPTIONS; do
+ options="$options --$option"
+ done
+fi
+
+cd /builds/worker
+
+$GECKO_PATH/mach python -- \
+ $GECKO_PATH/${MOZHARNESS_SCRIPT} \
+ ${config_path_cmds} \
+ ${config_cmds} \
+ $actions \
+ $options \
+ --log-level=debug \
+ --work-dir=$WORKSPACE \
diff -Nru thunderbird-102.6.0/comm/taskcluster/scripts/desktop_comm_l10n.py thunderbird-102.8.0/comm/taskcluster/scripts/desktop_comm_l10n.py
--- thunderbird-102.6.0/comm/taskcluster/scripts/desktop_comm_l10n.py 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-102.8.0/comm/taskcluster/scripts/desktop_comm_l10n.py 2023-02-14 22:00:33.000000000 +0000
@@ -0,0 +1,232 @@
+#!/usr/bin/env python
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import json
+import os
+import sys
+
+GECKO_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../.."))
+MOZHARNESS = os.path.join(GECKO_PATH, "testing/mozharness")
+COMM_PYTHON_L10N = os.path.join(GECKO_PATH, "comm/python/l10n")
+sys.path.insert(1, MOZHARNESS)
+sys.path.insert(1, COMM_PYTHON_L10N)
+
+from mozharness.base.script import BaseScript
+from mozharness.base.vcs.vcsbase import VCSMixin
+from mozharness.mozilla.automation import AutomationMixin
+from mozharness.mozilla.l10n.locales import LocalesMixin
+from mozpack.archive import create_tar_from_files
+from mozpack.copier import FileRegistry
+from mozpack.files import FileFinder
+from tbxchannel.l10n_merge import COMM_STRINGS_PATTERNS, GECKO_STRINGS_PATTERNS
+from zstandard import ZstdCompressor
+
+
+class CommMultiLocale(LocalesMixin, AutomationMixin, VCSMixin, BaseScript):
+ config_options = [
+ [
+ [
+ "--locale-list",
+ ],
+ {
+ "action": "store",
+ "dest": "locale_list",
+ "type": "string",
+ "help": "File with locales to include. Either all-locales or shipped-locales",
+ },
+ ],
+ [
+ [
+ "--comm-locales-file",
+ ],
+ {
+ "action": "store",
+ "dest": "hg_comm_locales_file",
+ "type": "string",
+ "help": "File with HG revision of comm-l10n monorepo to use",
+ },
+ ],
+ [
+ [
+ "--browser-locales-file",
+ ],
+ {
+ "action": "store",
+ "dest": "locales_file",
+ "type": "string",
+ "help": "File with HG revisions of l10n-central repositories",
+ },
+ ],
+ ]
+
+ def __init__(self, require_config_file=False):
+ buildscript_kwargs = {
+ "all_actions": [
+ "clone-gecko-locales",
+ "clone-monorepo",
+ "merge-repos",
+ "pack-merged",
+ "gen-changesets",
+ ],
+ "config": {
+ "ignore_locales": ["en-US"],
+ "log_name": "multi_locale",
+ "hg_merged_dir": "l10n_merged",
+ "objdir": "obj-build",
+ "upload_file": "strings_all.tar.zst",
+ "changesets_file": "l10n-changesets.json",
+ },
+ }
+
+ LocalesMixin.__init__(self)
+ BaseScript.__init__(
+ self,
+ config_options=self.config_options,
+ require_config_file=require_config_file,
+ **buildscript_kwargs,
+ )
+ self.upload_env = None
+ self.file_registry = None
+ self.comm_l10n_revision = None
+
+ def query_abs_dirs(self):
+ if self.abs_dirs:
+ return self.abs_dirs
+ abs_dirs = super(CommMultiLocale, self).query_abs_dirs()
+ c = self.config
+ dirs = {}
+ dirs["abs_checkout_dir"] = os.path.abspath(
+ os.path.join(abs_dirs["abs_src_dir"], "..")
+ )
+ dirs["abs_work_dir"] = os.path.join(c["base_work_dir"], c["work_dir"])
+ # Needs to match abs_dirs["abs_l10n_dir"] set in mozharness.mozilla.l10n.locales
+ dirs["abs_l10n_central_dir"] = os.path.abspath(
+ os.path.join(dirs["abs_checkout_dir"], "l10n-central")
+ )
+ dirs["abs_comm_l10n_dir"] = os.path.abspath(
+ os.path.join(dirs["abs_checkout_dir"], "comm-l10n")
+ )
+ dirs["abs_merged_dir"] = os.path.abspath(
+ os.path.join(dirs["abs_work_dir"], "l10n-central")
+ )
+ for key in dirs.keys():
+ if key not in abs_dirs:
+ abs_dirs[key] = dirs[key]
+ self.abs_dirs = abs_dirs
+ return self.abs_dirs
+
+ def _query_upload_env(self):
+ """returns the environment used for the upload step"""
+ if self.upload_env:
+ return self.upload_env
+ config = self.config
+
+ upload_env = self.query_env(partial_env=config.get("upload_env"))
+
+ self.upload_env = upload_env
+ return self.upload_env
+
+ def _ensure_upload_path(self):
+ env = self._query_upload_env()
+ if "UPLOAD_PATH" in env and not os.path.exists(env["UPLOAD_PATH"]):
+ self.mkdir_p(env["UPLOAD_PATH"])
+
+ def get_gecko_l10n_revisions(self):
+ # Populate self.locales with Thunderbird's locales, and revisions
+ # from browser/locales/l10n-changesets.json
+ c = self.config
+ ignore_locales = c.get("ignore_locales", [])
+
+ dirs = self.query_abs_dirs()
+ locale_list = os.path.join(dirs["abs_src_dir"], c["locale_list"])
+ locales = self.parse_locales_file(locale_list)
+ locale_changesets_file = os.path.join(dirs["abs_src_dir"], c["locales_file"])
+ # parse_locales_file fills in self.l10n_revisions with changesets
+ self.parse_locales_file(locale_changesets_file)
+
+ for locale in ignore_locales:
+ if locale in locales:
+ self.debug("Ignoring locale %s." % locale)
+ locales.remove(locale)
+
+ self.locales = locales
+
+ # Actions {{{2
+ def clone_gecko_locales(self):
+ self.get_gecko_l10n_revisions()
+ self.pull_locale_source()
+
+ def clone_monorepo(self):
+ c = self.config
+ dirs = self.query_abs_dirs()
+
+ locales_file = os.path.join(dirs["abs_src_dir"], c["hg_comm_locales_file"])
+ locales_data = {}
+ if locales_file.endswith(".json"):
+ with open(locales_file) as fh:
+ locales_data = json.load(fh)
+ # would use en-US, but it's not in this file!
+ self.comm_l10n_revision = locales_data.get("en-GB", {}).get("revision")
+
+ if self.comm_l10n_revision:
+ self.mkdir_p(dirs["abs_checkout_dir"])
+ self.vcs_checkout(
+ dest=dirs["abs_comm_l10n_dir"],
+ repo=c["hg_comm_l10n_repo"],
+ branch=self.comm_l10n_revision,
+ vcs="hg",
+ )
+ else:
+ raise Exception(
+ f"Unable to find revision from comm-l10n repo using "
+ f"{c['hg_comm_locales_file']}."
+ )
+
+ def merge_repos(self):
+ dirs = self.query_abs_dirs()
+ if os.path.exists(dirs["abs_merged_dir"]):
+ self.rmtree(dirs["abs_merged_dir"])
+
+ file_registry = FileRegistry()
+
+ def add_to_registry(base_path, patterns):
+ finder = FileFinder(base_path)
+ for pattern in patterns:
+ for _lang in self.locales:
+ for _filepath, _fileobj in finder.find(pattern.format(lang=_lang)):
+ _filepath = os.path.join("l10n-central", _filepath)
+ file_registry.add(_filepath, _fileobj)
+
+ add_to_registry(dirs["abs_l10n_central_dir"], GECKO_STRINGS_PATTERNS)
+ add_to_registry(dirs["abs_comm_l10n_dir"], COMM_STRINGS_PATTERNS)
+
+ self.file_registry = file_registry
+
+ def pack_merged(self):
+ self._ensure_upload_path()
+ upload_path = self.config["upload_env"]["UPLOAD_PATH"]
+ archive_path = os.path.join(upload_path, self.config["upload_file"])
+
+ with open(archive_path, "wb") as f:
+ with ZstdCompressor().stream_writer(f) as z:
+ create_tar_from_files(z, dict(self.file_registry))
+
+ def gen_changesets(self):
+ changeset_data = {
+ "gecko_strings": self.gecko_locale_revisions,
+ "comm_strings": {
+ "repo": self.config["hg_comm_l10n_repo"],
+ "revision": self.comm_l10n_revision,
+ },
+ }
+ upload_path = self.config["upload_env"]["UPLOAD_PATH"]
+ changesets_file = os.path.join(upload_path, self.config["changesets_file"])
+ with open(changesets_file, "w") as f:
+ json.dump(changeset_data, f, sort_keys=True, indent=2)
+
+
+if __name__ == "__main__":
+ single_locale = CommMultiLocale()
+ single_locale.run_and_exit()
diff -Nru thunderbird-102.6.0/comm/testing/mozharness/configs/single_locale/thunderbird_split_l10n.py thunderbird-102.8.0/comm/testing/mozharness/configs/single_locale/thunderbird_split_l10n.py
--- thunderbird-102.6.0/comm/testing/mozharness/configs/single_locale/thunderbird_split_l10n.py 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-102.8.0/comm/testing/mozharness/configs/single_locale/thunderbird_split_l10n.py 2023-02-14 22:00:33.000000000 +0000
@@ -0,0 +1,21 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+config = {
+ # Source path
+ "app_name": "comm/mail",
+ "mozconfig_variant": "l10n-mozconfig",
+ # Used to get toolkit & devtools strings
+ "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
+ # URL of comm-l10n monorepo
+ "hg_comm_l10n_repo": "https://hg.mozilla.org/projects/comm-l10n",
+ "locales_dir": "comm/mail/locales",
+ "ignore_locales": ["en-US"],
+ "bootstrap_env": {
+ "NO_MERCURIAL_SETUP_CHECK": "1",
+ "MOZ_OBJDIR": "%(abs_obj_dir)s",
+ "DIST": "%(abs_obj_dir)s",
+ "L10NBASEDIR": "../../l10n",
+ },
+}
diff -Nru thunderbird-102.6.0/comm/third_party/README.json-c thunderbird-102.8.0/comm/third_party/README.json-c
--- thunderbird-102.6.0/comm/third_party/README.json-c 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/README.json-c 2023-02-14 22:00:33.000000000 +0000
@@ -1,17 +1,18 @@
-Directory ./json-c contains a copy of version 0.15 of the json-c library,
-which has been obtained from https://s3.amazonaws.com/json-c_releases/releases/json-c-0.15-nodoc.tar.gz .
+Directory ./json-c contains a copy of version 0.16 of the json-c library,
+which has been obtained from https://s3.amazonaws.com/json-c_releases/releases/json-c-0.16-nodoc.tar.gz .
(Link at https://github.com/json-c/json-c/wiki).
For licensing information, please refer to the included documentation.
The SHA256SUM of the imported file is:
-99bca4f944b8ced8ae0bbc6310d6a3528ca715e69541793a1ef51f8c5b4b0878 json-c-0.15-nodoc.tar.gz
+ac8a3dd6820daaca579b23fbc74664310fbc3d67f52f6707cda67d21dde5570f json-c-0.16-nodoc.tar.gz
The following files and directories were removed from the source distribution's root:
.github/
apps/
bench/
cmake/
+doc/
fuzz/
tests/
.clang-format
@@ -23,6 +24,8 @@
README
appveyor.yml
cmake-configure
+issues_closed_for_0.{13,14,15,16}.md
+json_config.h.win32
json-c.pc.in
json-c.sym
diff -Nru thunderbird-102.6.0/comm/third_party/README.rnp thunderbird-102.8.0/comm/third_party/README.rnp
--- thunderbird-102.6.0/comm/third_party/README.rnp 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/README.rnp 2023-02-14 22:00:33.000000000 +0000
@@ -1,7 +1,7 @@
Directory ./rnp contains a copy of rnp which has been obtained from:
https://github.com/rnpgp/rnp
-[commit f06439f77e50974e427023f77a459843e46ac682]
+[commit 298ad98b9ba2fb58e6eadec3c226f8184b41ab98]
For licensing information, please refer to the included documentation.
@@ -17,14 +17,15 @@
without parameters updates to the latest master.
The following files and directories are removed by update_rnp.sh:
-ci
-cmake
-git-hooks
-.github
.cirrus.yml
.clang-format
+.codespellrc
+.github
.gitignore
_config.yml
+ci
+cmake
+git-hooks
docker.sh
travis.sh
vcpkg.txt
@@ -38,11 +39,61 @@
moz.build
module.ver
rnp.symbols
-src/lib/config.h.in
src/lib/rnp/rnp_export.h
src/version.h
-The following patches were applied:
-Bug 1641720 - patches/rnp/disable_obsolete_ciphers.patch
-Bug 1763641 - patches/rnp/bug_1763641.patch
-Bug 1768424 - patches/rnp/bug_1768424.patch
+
+Build notes:
+
+There are several configure options that can be added to mozconfig to control
+how librnp is built.
+
+--with-system-librnp
+ Use system RNP (librnp) for OpenPGP support.
+ This option will not build librnp at all. In order to provide OpenPGP support,
+ librnp must be installed as a system package (RPM, DEB) and located where the
+ dynamic loader will find it or copied separately into Thunderbird's application
+ directory.
+
+--with-system-jsonc
+ Use system JSON-C for librnp (located with pkgconfig)
+ Build librnp from the in-tree sources, but link with a system-installed
+ libjson-c. Build flags are determined with Pkg-config/pkgconf.
+
+--with-system-bz2[=prefix]
+ Use system Bzip2 for librnp (pkgconfig/given prefix)
+ Build librnp from in-tree sources, link with a system libbz2.
+ This option does accept a prefix path (such as --with-system-bz2=/usr/local).
+ (Bzip2 itself does not provide a pkgconfig file. Some Linux distributions
+ include their own so the build system will look for one.)
+
+--with-system-zlib
+ Link librnp to a system zlib. Pkgconfig only.
+
+--with-librnp-backend=(botan|openssl) **
+ ** "openssl" is only supported when targeting Linux.
+
+ This option allows building librnp with the OpenSSL backend. When not provided,
+ it defaults to "botan".
+ When set to "openssl", OpenSSL will be located via Pkgconfig.
+
+--with-system-botan
+ Link librnp to a system libbotan. Pkgconfig only. Note that it is not necessary
+ to also set "--with-librnp-backend=botan".
+
+--with-openssl=prefix (Linux only)
+ Used with "--with-librnp-backend=openssl" to use OpenSSL installed at "prefix"
+ instead of one provided by Pkgconfig. Ex: --with-openssl=/usr/openssl-3
+
+
+OpenSSL notes:
+
+Only Linux targets are supported.
+
+OpenSSL 1.1.1 and OpenSSL 3.0.x are supported. The version is checked during
+configure as RNP has slightly different code paths for 3.x.
+
+The OpenSSL backend has some limitations compared to Botan. The following
+features are disabled:
+TWOFISH, BRAINPOOL
+
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/AUTHORS thunderbird-102.8.0/comm/third_party/json-c/AUTHORS
--- thunderbird-102.6.0/comm/third_party/json-c/AUTHORS 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/AUTHORS 2023-02-14 22:00:33.000000000 +0000
@@ -1,30 +1,61 @@
+Alan Coopersmith
Alexander Dahl
+Alexandru Ardelean
andy5995
+Aram Poghosyan
Björn Esser
+BonsaY
changyong guo
chenguoping
+Chris Lamb
Christopher Head
Chris Wolfe
C. Watford (christopher.watford@gmail.com)
Darjan Krijan
+David McCann
+DeX77
+dota17
+Eric Haszlakiewicz
Eric Hawicz
+Even Rouault
+Gianluigi Tiesi
grdowns
+Hex052
+hofnarr
+ihsinme <61293369+ihsinme@users.noreply.github.com>
Ivan Romanov
Jaap Keuter
+Jakov Smolic
janczer
Jehan
Jehiah Czebotar
Jonathan Wiens
Jose Bollo
+José Bollo
+Juuso Alasuutari
Keith Holman
+Kizuna-Meraki
+Leon Gross
Liang, Gao
+Marc <34656315+MarcT512@users.noreply.github.com>
max
+Micah Snyder
Michael Clark
myd7349
+Pascal Cuoq
+Pawday
+Philosoph228
Pierce Lopez
Po-Chuan Hsieh
Ramiro Polla
Rikard Falkeborn
+Robert Bielik
Robert
+Rosen Penev
Rubasri Kalidas
+Simon McVittie
+ssrlive <30760636+ssrlive@users.noreply.github.com>
+Tobias Nießen
+Tobias Stoeckmann
+Tudor Brindus
Unmanned Player <36690541+unmanned-player@users.noreply.github.com>
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/ChangeLog thunderbird-102.8.0/comm/third_party/json-c/ChangeLog
--- thunderbird-102.6.0/comm/third_party/json-c/ChangeLog 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/ChangeLog 2023-02-14 22:00:33.000000000 +0000
@@ -1,6 +1,60 @@
-Next Release 0.15
-=====================
+0.16 (up to commit 66dcdf5, 2022-04-13)
+========================================
+
+Deprecated and removed features:
+--------------------------------
+* JSON_C_OBJECT_KEY_IS_CONSTANT is deprecated in favor of
+ JSON_C_OBJECT_ADD_CONSTANT_KEY
+* Direct access to lh_table and lh_entry structure members is deprecated.
+ Use access functions instead, lh_table_head(), lh_entry_next(), etc...
+* Drop REFCOUNT_DEBUG code.
+
+New features
+------------
+* The 0.16 release introduces no new features
+
+Build changes
+-------------
+* Add a DISABLE_EXTRA_LIBS option to skip using libbsd
+* Add a DISABLE_JSON_POINTER option to skip compiling in json_pointer support.
+
+Significant changes and bug fixes
+---------------------------------
+* Cap string length at INT_MAX to avoid various issues with very long strings.
+* json_object_deep_copy: fix deep copy of strings containing '\0'
+* Fix read past end of buffer in the "json_parse" command
+* Avoid out of memory accesses in the locally provided vasprintf() function
+ (for those platforms that use it)
+* Handle allocation failure in json_tokener_new_ex
+* Fix use-after-free in json_tokener_new_ex() in the event of printbuf_new() returning NULL
+* printbuf_memset(): set gaps to zero - areas within the print buffer which
+ have not been initialized by using printbuf_memset
+* printbuf: return -1 on invalid arguments (len < 0 or total buffer > INT_MAX)
+* sprintbuf(): propagate printbuf_memappend errors back to the caller
+
+Optimizations
+--------------
+* Speed up parsing by replacing ctype functions with simplified, faster
+ non-locale-sensitive ones in json_tokener and json_object_to_json_string.
+* Neither vertical tab nor formfeed are considered whitespace per the JSON spec
+* json_object: speed up creation of objects, calloc() -> malloc() + set fields
+* Avoid needless extra strlen() call in json_c_shallow_copy_default() and
+ json_object_equal() when the object is known to be a json_type_string.
+
+Other changes
+-------------
+* Validate size arguments in arraylist functions.
+* Use getrandom() if available; with GRND_NONBLOCK to allow use of json-c
+ very early during boot, such as part of cryptsetup.
+* Use arc4random() if it's available.
+* random_seed: on error, continue to next method instead of exiting the process
+* Close file when unable to read from /dev/urandom in get_dev_random_seed()
+
+***
+
+0.15 (up to commit 870965e, 2020/07/26)
+========================================
Deprecated and removed features:
--------------------------------
@@ -59,7 +113,7 @@
* #589 - Detect broken RDRAND during initialization; also, fix segfault
in the CPUID check.
* #592 - Fix integer overflows to prevert out of bounds write on large input.
-* Protect against division by zero in linkhash, when creaed with zero size.
+* Protect against division by zero in linkhash, when created with zero size.
* #602 - Fix json_parse_uint64() internal error checking, leaving the retval
untouched in more failure cases.
* #614 - Prevent truncation when custom double formatters insert extra \0's
@@ -185,7 +239,7 @@
* Use size_t for array length and size. Platforms where sizeof(size_t) != sizeof(int) may not be backwards compatible
See commits 45c56b, 92e9a5 and others.
-* Check for failue when allocating memory, returning NULL and errno=ENOMEM.
+* Check for failure when allocating memory, returning NULL and errno=ENOMEM.
See commit 2149a04.
* Change json_object_object_add() return type from void to int, and will return -1 on failures, instead of exiting. (Note: this is not an ABI change)
@@ -376,7 +430,7 @@
* Add an alternative iterator implementation, see json_object_iterator.h
* Make json_object_iter public to enable external use of the
json_object_object_foreachC macro.
- * Add a printbuf_memset() function to provide an effecient way to set and
+ * Add a printbuf_memset() function to provide an efficient way to set and
append things like whitespace indentation.
* Adjust json_object_is_type and json_object_get_type so they return
json_type_null for NULL objects and handle NULL passed to
@@ -462,7 +516,7 @@
0.7
===
* Add escaping of backslash to json output
- * Add escaping of foward slash on tokenizing and output
+ * Add escaping of forward slash on tokenizing and output
* Changes to internal tokenizer from using recursion to
using a depth state structure to allow incremental parsing
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/README.html thunderbird-102.8.0/comm/third_party/json-c/README.html
--- thunderbird-102.6.0/comm/third_party/json-c/README.html 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/README.html 2023-02-14 22:00:33.000000000 +0000
@@ -26,12 +26,12 @@
Send email to
+#CFLAGS += -I$(JSON_C_DIR)/include
LDFLAGS+= -L$(JSON_C_DIR)/lib -ljson-c
```
+If your project uses cmake:
+
+* Add to your CMakeLists.txt file:
+
+```cmake
+find_package(json-c CONFIG)
+target_link_libraries(${PROJECT_NAME} PRIVATE json-c::json-c)
+```
+
+* Then you might run in your project:
+
+```sh
+cd build
+cmake -DCMAKE_PREFIX_PATH=/path/to/json_c/install/lib64/cmake ..
+```
Using json-c
------------
-To use json-c you can either include json.h, or preferrably, one of the
+To use json-c you can either include json.h, or preferably, one of the
following more specific header files:
* json_object.h - Core types and methods.
@@ -241,9 +265,9 @@
objects from a json-c object tree.
* json_object_iterator.h - Methods for iterating over single json_object instances. (See also `json_object_object_foreach()` in json_object.h)
* json_visit.h - Methods for walking a tree of json-c objects.
-* json_util.h - Miscelleanous utility functions.
+* json_util.h - Miscellaneous utility functions.
-For a full list of headers see [files.html](http://json-c.github.io/json-c/json-c-current-release/doc/html/files.html)
+For a full list of headers see [files.html](https://json-c.github.io/json-c/json-c-current-release/doc/html/files.html)
The primary type in json-c is json_object. It describes a reference counted
tree of json objects which are created by either parsing text with a
@@ -251,7 +275,7 @@
(with `json_object_new_object()`, `json_object_new_int()`, etc...) and adding
(with `json_object_object_add()`, `json_object_array_add()`, etc...) them
individually.
-Typically, every object in the tree will have one reference, from it's parent.
+Typically, every object in the tree will have one reference, from its parent.
When you are done with the tree of objects, you call json_object_put() on just
the root object to free it, which recurses down through any child objects
calling json_object_put() on each one of those in turn.
@@ -266,7 +290,7 @@
When parsing text, the json_tokener object is independent from the json_object
that it returns. It can be allocated (`json_tokener_new()`)
-used ones or multiple times (`json_tokener_parse_ex()`, and
+used one or multiple times (`json_tokener_parse_ex()`, and
freed (`json_tokener_free()`) while the json_object objects live on.
A json_object tree can be serialized back into a string with
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/RELEASE_CHECKLIST.txt thunderbird-102.8.0/comm/third_party/json-c/RELEASE_CHECKLIST.txt
--- thunderbird-102.6.0/comm/third_party/json-c/RELEASE_CHECKLIST.txt 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/RELEASE_CHECKLIST.txt 2023-02-14 22:00:33.000000000 +0000
@@ -20,7 +20,14 @@
* Mention removed features in ChangeLog
* Consider re-adding backwards compatible support, through symbol
aliases and appropriate entries in json-c.sym
+ * Be sure any new symbols are listed in json-c.sym as part of
+ the _new_ release version.
* Update the AUTHORS file
+
+ PREV=$(git tag | tail -1)
+ ( git log -r ${PREV}..HEAD | grep Author: | sed -e's/Author: //' ; cat AUTHORS ) | sort -u > A1
+ mv A1 AUTHORS
+
* Exclude mentioning changes that have already been included in a point
release of the previous release branch.
@@ -33,14 +40,14 @@
## Release creation
Start creating the new release:
- release=0.15
+ release=0.16
git clone https://github.com/json-c/json-c json-c-${release}
mkdir distcheck
cd distcheck
# Note, the build directory *must* be entirely separate from
# the source tree for distcheck to work properly.
- cmake ../json-c-${release}
+ cmake -DCMAKE_BUILD_TYPE=Release ../json-c-${release}
make distcheck
cd ..
@@ -55,7 +62,6 @@
Using ${release}:
Update the version in json_c_version.h
Update the version in CMakeLists.txt (VERSION in the project(...) line)
- Update the version in config.h.win32 (several places)
Update the set_target_properties() line in CmakeLists.txt to set the shared
library version. Generally, unless we're doing a major release, change:
@@ -74,9 +80,11 @@
Generate the doxygen documentation:
- doxygen
+ (cd ../distcheck && make doc)
+ cp -r -p ../distcheck/doc/{html,Doxyfile} doc/.
+ rm doc/Doxyfile # Remove generated file w/ hardcoded paths
git add -f doc
- git commit doc
+ git commit doc -m "Generate docs for the ${release} release"
------------
@@ -86,7 +94,7 @@
echo .git > excludes
tar -czf json-c-${release}.tar.gz -X excludes json-c-${release}
- echo doc >> excludes
+ echo 'doc/*' >> excludes
tar -czf json-c-${release}-nodoc.tar.gz -X excludes json-c-${release}
------------
@@ -104,7 +112,7 @@
Go to Amazon S3 service at:
https://console.aws.amazon.com/s3/
-Upload the two tarballs in the json-c_releases folder.
+Upload the two tarballs in the json-c_releases/releases folder.
When uploading, use "Standard" storage class, and make the uploaded files publicly accessible.
Logout of Amazon S3, and verify that the files are visible.
@@ -121,13 +129,14 @@
Use ${release}.99 to indicate a version "newer" than anything on the branch:
Update the version in json_c_version.h
Update the version in CMakeLists.txt
- Update the version in config.h.win32
Update RELEASE_CHECKLIST.txt, set release=${release}+1
+Add a new empty section to the json-c.sym file, for ${release}+1
+
Update the set_target_properties() line in CmakeLists.txt to match the release branch.
- git commit -a -m "Update the master branch to version 0.${release}.99"
+ git commit -a -m "Update the master branch to version ${release}.99"
git push
------------
@@ -143,6 +152,8 @@
mkdir json-c-${release}
cp -R ../json-c-${release}/doc json-c-${release}/.
git add json-c-${release}
+ rm json-c-current-release
+ ln -s json-c-${release} json-c-current-release
git commit -a -m "Add the ${release} docs."
vi index.html
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/arraylist.c thunderbird-102.8.0/comm/third_party/json-c/arraylist.c
--- thunderbird-102.6.0/comm/third_party/json-c/arraylist.c 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/arraylist.c 2023-02-14 22:00:33.000000000 +0000
@@ -45,6 +45,8 @@
{
struct array_list *arr;
+ if (initial_size < 0 || (size_t)initial_size >= SIZE_T_MAX / sizeof(void *))
+ return NULL;
arr = (struct array_list *)malloc(sizeof(struct array_list));
if (!arr)
return NULL;
@@ -106,6 +108,8 @@
void *t;
size_t new_size;
+ if (empty_slots >= SIZE_T_MAX / sizeof(void *) - arr->length)
+ return -1;
new_size = arr->length + empty_slots;
if (new_size == arr->size)
return 0;
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/arraylist.h thunderbird-102.8.0/comm/third_party/json-c/arraylist.h
--- thunderbird-102.6.0/comm/third_party/json-c/arraylist.h 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/arraylist.h 2023-02-14 22:00:33.000000000 +0000
@@ -15,8 +15,8 @@
* Although this is exposed by the json_object_get_array() method,
* it is not recommended for direct use.
*/
-#ifndef _arraylist_h_
-#define _arraylist_h_
+#ifndef _json_c_arraylist_h_
+#define _json_c_arraylist_h_
#ifdef __cplusplus
extern "C" {
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/config.h.in thunderbird-102.8.0/comm/third_party/json-c/config.h.in
--- thunderbird-102.6.0/comm/third_party/json-c/config.h.in 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/config.h.in 2023-02-14 22:00:33.000000000 +0000
@@ -57,6 +57,9 @@
/* Define to 1 if you have the header file. */
#undef HAVE_SYS_PARAM_H
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_RANDOM_H
+
/* Define to 1 if you have the header file. */
#undef HAVE_SYS_RESOURCE_H
@@ -72,6 +75,12 @@
/* Define to 1 if you have the header file. */
#undef HAVE_XLOCALE_H
+/* Define to 1 if you have the header file. */
+#undef HAVE_BSD_STDLIB_H
+
+/* Define to 1 if you have `arc4random' */
+#undef HAVE_ARC4RANDOM
+
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT
@@ -141,6 +150,9 @@
/* Define to 1 if you have the `vsyslog' function. */
#undef HAVE_VSYSLOG
+/* Define if you have the `getrandom' function. */
+#undef HAVE_GETRANDOM
+
/* Define if you have the `getrusage' function. */
#undef HAVE_GETRUSAGE
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/debug.h thunderbird-102.8.0/comm/third_party/json-c/debug.h
--- thunderbird-102.6.0/comm/third_party/json-c/debug.h 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/debug.h 2023-02-14 22:00:33.000000000 +0000
@@ -14,8 +14,8 @@
* @file
* @brief Do not use, json-c internal, may be changed or removed at any time.
*/
-#ifndef _DEBUG_H_
-#define _DEBUG_H_
+#ifndef _JSON_C_DEBUG_H_
+#define _JSON_C_DEBUG_H_
#include
@@ -24,7 +24,7 @@
#endif
#ifndef JSON_EXPORT
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && defined(JSON_C_DLL)
#define JSON_EXPORT __declspec(dllexport)
#else
#define JSON_EXPORT extern
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/issues_closed_for_0.13.md thunderbird-102.8.0/comm/third_party/json-c/issues_closed_for_0.13.md
--- thunderbird-102.6.0/comm/third_party/json-c/issues_closed_for_0.13.md 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/issues_closed_for_0.13.md 1970-01-01 00:00:00.000000000 +0000
@@ -1,270 +0,0 @@
-
-This list was created with:
-
-```
-curl https://api.github.com/search/issues?q="repo%3Ajson-c%2Fjson-c+closed%3A>2014-04-10+created%3A<2017-12-01&sort=created&order=asc&per_page=400&page=1" > issues1.out
-curl https://api.github.com/search/issues?q="repo%3Ajson-c%2Fjson-c+closed%3A>2014-04-10+created%3A<2017-12-01&sort=created&order=asc&per_page=400&page=2" > issues2.out
-curl https://api.github.com/search/issues?q="repo%3Ajson-c%2Fjson-c+closed%3A>2014-04-10+created%3A<2017-12-01&sort=created&order=asc&per_page=400&page=3" > issues3.out
-jq -r '.items[] | "[" + .title + "](" + .url + ")" | tostring' issues?.out > issues.md
-sed -e's,^\[ *\(.*\)\](https://api.github.com/.*/\([0-9].*\)),[Issue #\2](https://github.com/json-c/json-c/issues/\2) - \1,' -i issues.md
-#... manual editing ...
-```
-
-----
-
-Issues and Pull Requests closed for the 0.13 release
-(since commit f84d9c, the 0.12 branch point, 2014-04-10)
-
-
-* [Issue #61](https://github.com/json-c/json-c/issues/61) - Make json_object_object_add() indicate success or failure, test fix \
-* [Issue #113](https://github.com/json-c/json-c/issues/113) - Build fixes (make dist and make distcheck) \
-* [Issue #124](https://github.com/json-c/json-c/issues/124) - Fixing build \
-* [Issue #125](https://github.com/json-c/json-c/issues/125) - Fix compile error(variable size set but not used) on g++4.6 \
-* [Issue #126](https://github.com/json-c/json-c/issues/126) - Removed unused size variable. \
-* [Issue #127](https://github.com/json-c/json-c/issues/127) - remove unused `size` variable \
-* [Issue #128](https://github.com/json-c/json-c/issues/128) - Remove unused variable from json_tokenizer.c \
-* [Issue #130](https://github.com/json-c/json-c/issues/130) - Failed to compile under Ubuntu 13.10 32bit \
-* [Issue #131](https://github.com/json-c/json-c/issues/131) - undefined symbol: __sync_val_compare_and_swap_4 \
-* [Issue #132](https://github.com/json-c/json-c/issues/132) - Remove unused variable 'size' \
-* [Issue #133](https://github.com/json-c/json-c/issues/133) - Update and rename README to README.md \
-* [Issue #134](https://github.com/json-c/json-c/issues/134) - Must remove variable size... \
-* [Issue #135](https://github.com/json-c/json-c/issues/135) - bits.h uses removed json_tokener_errors\[error\] \
-* [Issue #136](https://github.com/json-c/json-c/issues/136) - Error when running make check \
-* [Issue #137](https://github.com/json-c/json-c/issues/137) - config.h.in should not be in git \
-* [Issue #138](https://github.com/json-c/json-c/issues/138) - Can't build on RHEL 6.5 due to dependency on automake-1.14 \
-* [Issue #140](https://github.com/json-c/json-c/issues/140) - Code bug in random_test.c evaluating same expression twice \
-* [Issue #141](https://github.com/json-c/json-c/issues/141) - Removed duplicate check in random_seed test - bug #140 \
-* [Issue #142](https://github.com/json-c/json-c/issues/142) - Please undeprecate json_object_object_get \
-* [Issue #144](https://github.com/json-c/json-c/issues/144) - Introduce json_object_from_fd \
-* [Issue #145](https://github.com/json-c/json-c/issues/145) - Handle % character properly \
-* [Issue #146](https://github.com/json-c/json-c/issues/146) - TAGS rename \
-* [Issue #148](https://github.com/json-c/json-c/issues/148) - Bump the soname \
-* [Issue #149](https://github.com/json-c/json-c/issues/149) - SONAME bump \
-* [Issue #150](https://github.com/json-c/json-c/issues/150) - Fix build using MinGW. \
-* [Issue #151](https://github.com/json-c/json-c/issues/151) - Remove json_type enum trailing comma \
-* [Issue #152](https://github.com/json-c/json-c/issues/152) - error while compiling json-c library version 0.11 \
-* [Issue #153](https://github.com/json-c/json-c/issues/153) - improve doc for json_object_to_json_string() \
-* [Issue #154](https://github.com/json-c/json-c/issues/154) - double precision \
-* [Issue #155](https://github.com/json-c/json-c/issues/155) - add bsearch for arrays \
-* [Issue #156](https://github.com/json-c/json-c/issues/156) - Remove trailing whitespaces \
-* [Issue #157](https://github.com/json-c/json-c/issues/157) - JSON-C shall not exit on calloc fail. \
-* [Issue #158](https://github.com/json-c/json-c/issues/158) - while using json-c 0.11, I am facing strange crash issue in json_object_put. \
-* [Issue #159](https://github.com/json-c/json-c/issues/159) - json_tokener.c compile error \
-* [Issue #160](https://github.com/json-c/json-c/issues/160) - missing header file on windows?? \
-* [Issue #161](https://github.com/json-c/json-c/issues/161) - Is there a way to append to file? \
-* [Issue #162](https://github.com/json-c/json-c/issues/162) - json_util: add directory check for POSIX distros \
-* [Issue #163](https://github.com/json-c/json-c/issues/163) - Fix Win32 build problems \
-* [Issue #164](https://github.com/json-c/json-c/issues/164) - made it compile and link on Widnows (as static library) \
-* [Issue #165](https://github.com/json-c/json-c/issues/165) - json_object_to_json_string_ext length \
-* [Issue #167](https://github.com/json-c/json-c/issues/167) - Can't build on Windows with Visual Studio 2010 \
-* [Issue #168](https://github.com/json-c/json-c/issues/168) - Tightening the number parsing algorithm \
-* [Issue #169](https://github.com/json-c/json-c/issues/169) - Doesn't compile on ubuntu 14.04, 64bit \
-* [Issue #170](https://github.com/json-c/json-c/issues/170) - Generated files in repository \
-* [Issue #171](https://github.com/json-c/json-c/issues/171) - Update configuration for VS2010 and win64 \
-* [Issue #172](https://github.com/json-c/json-c/issues/172) - Adding support for parsing octal numbers \
-* [Issue #173](https://github.com/json-c/json-c/issues/173) - json_parse_int64 doesn't work correctly at illumos \
-* [Issue #174](https://github.com/json-c/json-c/issues/174) - Adding JSON_C_TO_STRING_PRETTY_TAB flag \
-* [Issue #175](https://github.com/json-c/json-c/issues/175) - make check fails 4 tests with overflows when built with ASAN \
-* [Issue #176](https://github.com/json-c/json-c/issues/176) - Possible to delete an array element at a given idx ? \
-* [Issue #177](https://github.com/json-c/json-c/issues/177) - Fix compiler warnings \
-* [Issue #178](https://github.com/json-c/json-c/issues/178) - Unable to compile on CentOS5 \
-* [Issue #179](https://github.com/json-c/json-c/issues/179) - Added array_list_del_idx and json_object_array_del_idx \
-* [Issue #180](https://github.com/json-c/json-c/issues/180) - Enable silent build by default \
-* [Issue #181](https://github.com/json-c/json-c/issues/181) - json_tokener_parse_ex accepts invalid JSON \
-* [Issue #182](https://github.com/json-c/json-c/issues/182) - Link against libm when needed \
-* [Issue #183](https://github.com/json-c/json-c/issues/183) - Apply compile warning fix to master branch \
-* [Issue #184](https://github.com/json-c/json-c/issues/184) - Use only GCC-specific flags when compiling with GCC \
-* [Issue #185](https://github.com/json-c/json-c/issues/185) - compile error \
-* [Issue #186](https://github.com/json-c/json-c/issues/186) - Syntax error \
-* [Issue #187](https://github.com/json-c/json-c/issues/187) - array_list_get_idx and negative indexes. \
-* [Issue #188](https://github.com/json-c/json-c/issues/188) - json_object_object_foreach warnings \
-* [Issue #189](https://github.com/json-c/json-c/issues/189) - noisy json_object_from_file: error opening file \
-* [Issue #190](https://github.com/json-c/json-c/issues/190) - warning: initialization discards const qualifier from pointer target type \[enabled by default\] \
-* [Issue #192](https://github.com/json-c/json-c/issues/192) - json_tokener_parse accepts invalid JSON {"key": "value" , } \
-* [Issue #193](https://github.com/json-c/json-c/issues/193) - Make serialization format of doubles configurable \
-* [Issue #194](https://github.com/json-c/json-c/issues/194) - Add utility function for comparing json_objects \
-* [Issue #195](https://github.com/json-c/json-c/issues/195) - Call uselocale instead of setlocale \
-* [Issue #196](https://github.com/json-c/json-c/issues/196) - Performance improvements \
-* [Issue #197](https://github.com/json-c/json-c/issues/197) - Time for a new release? \
-* [Issue #198](https://github.com/json-c/json-c/issues/198) - Fix possible memory leak and remove superfluous NULL checks before free() \
-* [Issue #199](https://github.com/json-c/json-c/issues/199) - Fix build in Visual Studio \
-* [Issue #200](https://github.com/json-c/json-c/issues/200) - Add build scripts for CI platforms \
-* [Issue #201](https://github.com/json-c/json-c/issues/201) - disable forward-slash escaping? \
-* [Issue #202](https://github.com/json-c/json-c/issues/202) - Array with objects support \
-* [Issue #203](https://github.com/json-c/json-c/issues/203) - Add source position/coordinates to API \
-* [Issue #204](https://github.com/json-c/json-c/issues/204) - json-c/json.h not found \
-* [Issue #205](https://github.com/json-c/json-c/issues/205) - json-c Compiled with Visual Studios \
-* [Issue #206](https://github.com/json-c/json-c/issues/206) - what do i use in place of json_object_object_get? \
-* [Issue #207](https://github.com/json-c/json-c/issues/207) - Add support for property pairs directly added to arrays \
-* [Issue #208](https://github.com/json-c/json-c/issues/208) - Performance enhancements (mainly) to json_object_to_json_string() \
-* [Issue #209](https://github.com/json-c/json-c/issues/209) - fix regression from 2d549662be832da838aa063da2efa78ee3b99668 \
-* [Issue #210](https://github.com/json-c/json-c/issues/210) - Use size_t for arrays \
-* [Issue #211](https://github.com/json-c/json-c/issues/211) - Atomic updates for the refcount \
-* [Issue #212](https://github.com/json-c/json-c/issues/212) - Refcount doesn't work between threads \
-* [Issue #213](https://github.com/json-c/json-c/issues/213) - fix to compile with microsoft visual c++ 2010 \
-* [Issue #214](https://github.com/json-c/json-c/issues/214) - Some non-GNU systems support __sync_val_compare_and_swap \
-* [Issue #215](https://github.com/json-c/json-c/issues/215) - Build json-c for window 64 bit. \
-* [Issue #216](https://github.com/json-c/json-c/issues/216) - configure: check realloc with AC_CHECK_FUNCS() to fix cross-compilation. \
-* [Issue #217](https://github.com/json-c/json-c/issues/217) - Checking for functions in float.h \
-* [Issue #218](https://github.com/json-c/json-c/issues/218) - Use a macro to indicate C99 to the compiler \
-* [Issue #219](https://github.com/json-c/json-c/issues/219) - Fix various potential null ptr deref and int32 overflows \
-* [Issue #220](https://github.com/json-c/json-c/issues/220) - Add utility function for comparing json_objects \
-* [Issue #221](https://github.com/json-c/json-c/issues/221) - JSON_C_TO_STRING_NOSLASHESCAPE works incorrectly \
-* [Issue #222](https://github.com/json-c/json-c/issues/222) - Fix issue #221: JSON_C_TO_STRING_NOSLASHESCAPE works incorrectly \
-* [Issue #223](https://github.com/json-c/json-c/issues/223) - Clarify json_object_get_string documentation of NULL handling & return \
-* [Issue #224](https://github.com/json-c/json-c/issues/224) - json_tokener.c - all warnings being treated as errors \
-* [Issue #225](https://github.com/json-c/json-c/issues/225) - Hi, will you support clib as a "registry"? \
-* [Issue #227](https://github.com/json-c/json-c/issues/227) - Bump SOVERSION to 3 \
-* [Issue #228](https://github.com/json-c/json-c/issues/228) - avoid double slashes from json \
-* [Issue #229](https://github.com/json-c/json-c/issues/229) - configure fails: checking size of size_t... configure: error: cannot determine a size for size_t \
-* [Issue #230](https://github.com/json-c/json-c/issues/230) - Use stdint.h to check for size_t size \
-* [Issue #231](https://github.com/json-c/json-c/issues/231) - Fix size_t size check for first-time builds \
-* [Issue #232](https://github.com/json-c/json-c/issues/232) - tests/tests1: fix printf format for size_t arguments \
-* [Issue #233](https://github.com/json-c/json-c/issues/233) - Include stddef.h in json_object.h \
-* [Issue #234](https://github.com/json-c/json-c/issues/234) - Add public API to use userdata independently of custom serializer \
-* [Issue #235](https://github.com/json-c/json-c/issues/235) - Undefined symbols Error for architecture x86_64 on Mac \
-* [Issue #236](https://github.com/json-c/json-c/issues/236) - Building a project which uses json-c with flag -Wcast-qual causes compilation errors \
-* [Issue #237](https://github.com/json-c/json-c/issues/237) - handle escaped utf-8 \
-* [Issue #238](https://github.com/json-c/json-c/issues/238) - linkhash.c: optimised the table_free path \
-* [Issue #239](https://github.com/json-c/json-c/issues/239) - initialize null terminator of new printbuf \
-* [Issue #240](https://github.com/json-c/json-c/issues/240) - Compile error: Variable set but not used \
-* [Issue #241](https://github.com/json-c/json-c/issues/241) - getting error in date string 19\/07\/2016, fixed for error 19/07/2016 \
-* [Issue #242](https://github.com/json-c/json-c/issues/242) - json_tokener_parse error \
-* [Issue #243](https://github.com/json-c/json-c/issues/243) - Fix #165 \
-* [Issue #244](https://github.com/json-c/json-c/issues/244) - Error while compiling source from RHEL5, could you please help me to fix this \
-* [Issue #245](https://github.com/json-c/json-c/issues/245) - json-c compile in window xp \
-* [Issue #246](https://github.com/json-c/json-c/issues/246) - Mac: uselocale failed to build \
-* [Issue #247](https://github.com/json-c/json-c/issues/247) - json_object_array_del_idx function has segment fault error? \
-* [Issue #248](https://github.com/json-c/json-c/issues/248) - Minor changes in C source code \
-* [Issue #249](https://github.com/json-c/json-c/issues/249) - Improving README \
-* [Issue #250](https://github.com/json-c/json-c/issues/250) - Improving .gitignore \
-* [Issue #251](https://github.com/json-c/json-c/issues/251) - Adding a file for EditorConfig \
-* [Issue #252](https://github.com/json-c/json-c/issues/252) - Very minor changes not related to C source code \
-* [Issue #253](https://github.com/json-c/json-c/issues/253) - Adding a test with cppcheck for Travis CI \
-* [Issue #254](https://github.com/json-c/json-c/issues/254) - Very minor changes to some tests \
-* [Issue #255](https://github.com/json-c/json-c/issues/255) - Minor changes in C source code \
-* [Issue #256](https://github.com/json-c/json-c/issues/256) - Mailing list dead? \
-* [Issue #257](https://github.com/json-c/json-c/issues/257) - Defining a coding style \
-* [Issue #258](https://github.com/json-c/json-c/issues/258) - Enable CI services \
-* [Issue #259](https://github.com/json-c/json-c/issues/259) - Fails to parse valid json \
-* [Issue #260](https://github.com/json-c/json-c/issues/260) - Adding an object to itself \
-* [Issue #261](https://github.com/json-c/json-c/issues/261) - Lack of proper documentation \
-* [Issue #262](https://github.com/json-c/json-c/issues/262) - Add Cmakefile and fix compiler warning. \
-* [Issue #263](https://github.com/json-c/json-c/issues/263) - Compiler Warnings with VS2015 \
-* [Issue #264](https://github.com/json-c/json-c/issues/264) - successed in simple test while failed in my project \
-* [Issue #265](https://github.com/json-c/json-c/issues/265) - Conformance report for reference \
-* [Issue #266](https://github.com/json-c/json-c/issues/266) - crash perhaps related to reference counting \
-* [Issue #267](https://github.com/json-c/json-c/issues/267) - Removes me as Win32 maintainer, because I'm not. \
-* [Issue #268](https://github.com/json-c/json-c/issues/268) - Documentation of json_object_to_json_string gives no information about memory management \
-* [Issue #269](https://github.com/json-c/json-c/issues/269) - json_object__set(json_object *o, value) API for value setting in json object private structure \
-* [Issue #270](https://github.com/json-c/json-c/issues/270) - new API json_object_new_double_f(doubel d,const char * fmt); \
-* [Issue #271](https://github.com/json-c/json-c/issues/271) - Cannot compile using CMake on macOS \
-* [Issue #273](https://github.com/json-c/json-c/issues/273) - fixed wrong object name in json_object_all_values_equal \
-* [Issue #274](https://github.com/json-c/json-c/issues/274) - Support for 64 bit pointers on Windows \
-* [Issue #275](https://github.com/json-c/json-c/issues/275) - Out-of-bounds read in json_tokener_parse_ex \
-* [Issue #276](https://github.com/json-c/json-c/issues/276) - ./configure for centos release 6.7(final) failure \
-* [Issue #277](https://github.com/json-c/json-c/issues/277) - Json object set xxx \
-* [Issue #278](https://github.com/json-c/json-c/issues/278) - Serialization of double with no fractional component drops trailing zero \
-* [Issue #279](https://github.com/json-c/json-c/issues/279) - Segmentation fault in array_list_length() \
-* [Issue #280](https://github.com/json-c/json-c/issues/280) - Should json_object_array_get_idx check whether input obj is array? \
-* [Issue #281](https://github.com/json-c/json-c/issues/281) - how to pretty print json-c? \
-* [Issue #282](https://github.com/json-c/json-c/issues/282) - ignore temporary files \
-* [Issue #283](https://github.com/json-c/json-c/issues/283) - json_pointer: add first revision based on RFC 6901 \
-* [Issue #284](https://github.com/json-c/json-c/issues/284) - Resusing json_tokener object \
-* [Issue #285](https://github.com/json-c/json-c/issues/285) - Revert "compat/strdup.h: move common compat check for strdup() to own \
-* [Issue #286](https://github.com/json-c/json-c/issues/286) - json_tokener_parse_ex() returns json_tokener_continue on zero-length string \
-* [Issue #287](https://github.com/json-c/json-c/issues/287) - json_pointer: extend setter & getter with printf() style arguments \
-* [Issue #288](https://github.com/json-c/json-c/issues/288) - Fix _GNU_SOURCE define for vasprintf \
-* [Issue #289](https://github.com/json-c/json-c/issues/289) - bugfix: floating point representaion without fractional part \
-* [Issue #290](https://github.com/json-c/json-c/issues/290) - duplicate an json_object \
-* [Issue #291](https://github.com/json-c/json-c/issues/291) - isspace assert error \
-* [Issue #292](https://github.com/json-c/json-c/issues/292) - configure error "./configure: line 13121: syntax error near unexpected token `-Wall'" \
-* [Issue #293](https://github.com/json-c/json-c/issues/293) - how to make with bitcode for ios \
-* [Issue #294](https://github.com/json-c/json-c/issues/294) - Adding UTF-8 validation. Fixes #122 \
-* [Issue #295](https://github.com/json-c/json-c/issues/295) - cross compile w/ mingw \
-* [Issue #296](https://github.com/json-c/json-c/issues/296) - Missing functions header in json_object.h \
-* [Issue #297](https://github.com/json-c/json-c/issues/297) - could not parse string to Json object? Like string str=\"helloworld;E\\test\\log\\;end\" \
-* [Issue #298](https://github.com/json-c/json-c/issues/298) - Building using CMake doesn't work \
-* [Issue #299](https://github.com/json-c/json-c/issues/299) - Improve json_object -> string performance \
-* [Issue #300](https://github.com/json-c/json-c/issues/300) - Running tests with MinGW build \
-* [Issue #301](https://github.com/json-c/json-c/issues/301) - How to deep copy json_object in C++ ? \
-* [Issue #302](https://github.com/json-c/json-c/issues/302) - json_tokener_parse_ex doesn't parse JSON values \
-* [Issue #303](https://github.com/json-c/json-c/issues/303) - fix doc in tokener header file \
-* [Issue #304](https://github.com/json-c/json-c/issues/304) - (.text+0x72846): undefined reference to `is_error' \
-* [Issue #305](https://github.com/json-c/json-c/issues/305) - Fix compilation without C-99 option \
-* [Issue #306](https://github.com/json-c/json-c/issues/306) - ./configure: line 12748 -error=deprecated-declarations \
-* [Issue #307](https://github.com/json-c/json-c/issues/307) - Memory leak in json_tokener_parse \
-* [Issue #308](https://github.com/json-c/json-c/issues/308) - AM_PROG_LIBTOOL not found on Linux \
-* [Issue #309](https://github.com/json-c/json-c/issues/309) - GCC 7 reports various -Wimplicit-fallthrough= errors \
-* [Issue #310](https://github.com/json-c/json-c/issues/310) - Add FALLTHRU comment to handle GCC7 warnings. \
-* [Issue #311](https://github.com/json-c/json-c/issues/311) - Fix error C3688 when compiling on Visual Studio 2015 \
-* [Issue #312](https://github.com/json-c/json-c/issues/312) - Fix CMake Build process improved for MinGW and MSYS2 \
-* [Issue #313](https://github.com/json-c/json-c/issues/313) - VERBOSE=1 make check; tests/test_util_file.test.c and tests/test_util_file.expected out of sync \
-* [Issue #315](https://github.com/json-c/json-c/issues/315) - Passing -1 to json_tokener_parse_ex is possibly unsafe \
-* [Issue #316](https://github.com/json-c/json-c/issues/316) - Memory Returned by json_object_to_json_string not freed \
-* [Issue #317](https://github.com/json-c/json-c/issues/317) - json_object_get_string gives segmentation error \
-* [Issue #318](https://github.com/json-c/json-c/issues/318) - PVS-Studio static analyzer analyze results \
-* [Issue #319](https://github.com/json-c/json-c/issues/319) - Windows: Fix dynamic library build with Visual Studio \
-* [Issue #320](https://github.com/json-c/json-c/issues/320) - Can't compile in Mac OS X El Capitan \
-* [Issue #321](https://github.com/json-c/json-c/issues/321) - build,cmake: fix vasprintf implicit definition and generate both static & shared libs \
-* [Issue #322](https://github.com/json-c/json-c/issues/322) - can not link with libjson-c.a \
-* [Issue #323](https://github.com/json-c/json-c/issues/323) - implicit fallthrough detected by gcc 7.1 \
-* [Issue #324](https://github.com/json-c/json-c/issues/324) - JsonPath like function? \
-* [Issue #325](https://github.com/json-c/json-c/issues/325) - Fix stack buffer overflow in json_object_double_to_json_string_format() \
-* [Issue #327](https://github.com/json-c/json-c/issues/327) - why json-c so hard to compile \
-* [Issue #328](https://github.com/json-c/json-c/issues/328) - json_object: implement json_object_deep_copy() function \
-* [Issue #329](https://github.com/json-c/json-c/issues/329) - build,cmake: build,cmake: rename libjson-c-static.a to libjson-c.a \
-* [Issue #330](https://github.com/json-c/json-c/issues/330) - tests: symlink basic tests to a single file that has the common code \
-* [Issue #331](https://github.com/json-c/json-c/issues/331) - Safe use of snprintf() / vsnprintf() for Visual studio, and thread-safety fix \
-* [Issue #332](https://github.com/json-c/json-c/issues/332) - Valgrind: invalid read after json_object_array_del_idx. \
-* [Issue #333](https://github.com/json-c/json-c/issues/333) - Replace obsolete AM_PROG_LIBTOOL \
-* [Issue #335](https://github.com/json-c/json-c/issues/335) - README.md: show build status tag from travis-ci.org \
-* [Issue #336](https://github.com/json-c/json-c/issues/336) - tests: fix tests in travis-ci.org \
-* [Issue #337](https://github.com/json-c/json-c/issues/337) - Synchronize "potentially racy" random seed in lh_char_hash() \
-* [Issue #338](https://github.com/json-c/json-c/issues/338) - implement json_object_int_inc(json_object *, int64_t) \
-* [Issue #339](https://github.com/json-c/json-c/issues/339) - Json schema validation \
-* [Issue #340](https://github.com/json-c/json-c/issues/340) - strerror_override: add extern "C" and JSON_EXPORT specifiers for Visual C++ compilers \
-* [Issue #341](https://github.com/json-c/json-c/issues/341) - character "/" parse as "\/" \
-* [Issue #342](https://github.com/json-c/json-c/issues/342) - No such file or directory "/usr/include/json.h" \
-* [Issue #343](https://github.com/json-c/json-c/issues/343) - Can't parse json \
-* [Issue #344](https://github.com/json-c/json-c/issues/344) - Fix Mingw build \
-* [Issue #345](https://github.com/json-c/json-c/issues/345) - Fix make dist and make distcheck \
-* [Issue #346](https://github.com/json-c/json-c/issues/346) - Clamp double to int32 when narrowing in json_object_get_int. \
-* [Issue #347](https://github.com/json-c/json-c/issues/347) - MSVC linker error json_c_strerror \
-* [Issue #348](https://github.com/json-c/json-c/issues/348) - why \
-* [Issue #349](https://github.com/json-c/json-c/issues/349) - `missing` is missing? \
-* [Issue #350](https://github.com/json-c/json-c/issues/350) - stderror-override and disable-shared \
-* [Issue #351](https://github.com/json-c/json-c/issues/351) - SIZE_T_MAX redefined from limits.h \
-* [Issue #352](https://github.com/json-c/json-c/issues/352) - `INSTALL` overrides an automake script. \
-* [Issue #353](https://github.com/json-c/json-c/issues/353) - Documentation issues \
-* [Issue #354](https://github.com/json-c/json-c/issues/354) - Fixes #351 #352 #353 \
-* [Issue #355](https://github.com/json-c/json-c/issues/355) - 1.make it can been compiled with Visual Studio 2010 by modify the CMakeList.txt and others \
-* [Issue #356](https://github.com/json-c/json-c/issues/356) - VS2008 test test_util_file.cpp err! \
-* [Issue #357](https://github.com/json-c/json-c/issues/357) - __json_c_strerror incompatibility with link-time optimization \
-* [Issue #358](https://github.com/json-c/json-c/issues/358) - make issue \
-* [Issue #359](https://github.com/json-c/json-c/issues/359) - update CMakeLists.txt for compile with visual studio at least 2010 \
-* [Issue #360](https://github.com/json-c/json-c/issues/360) - Use strtoll() to parse ints \
-* [Issue #361](https://github.com/json-c/json-c/issues/361) - Fix double to int cast overflow in json_object_get_int64. \
-* [Issue #362](https://github.com/json-c/json-c/issues/362) - CMake Package Config \
-* [Issue #363](https://github.com/json-c/json-c/issues/363) - Issue #338, add json_object_add_int functions \
-* [Issue #364](https://github.com/json-c/json-c/issues/364) - Cmake is Errir \
-* [Issue #365](https://github.com/json-c/json-c/issues/365) - added fallthrough for gcc7 \
-* [Issue #366](https://github.com/json-c/json-c/issues/366) - how to check the json string,crash! \
-* [Issue #367](https://github.com/json-c/json-c/issues/367) - Is json-c support "redirect" semantic? \
-* [Issue #368](https://github.com/json-c/json-c/issues/368) - Add examples \
-* [Issue #369](https://github.com/json-c/json-c/issues/369) - How to build json-c library for android? \
-* [Issue #370](https://github.com/json-c/json-c/issues/370) - Compiling using clang-cl \
-* [Issue #371](https://github.com/json-c/json-c/issues/371) - Invalid parsing for Infinity with json-c 0.12 \
-* [Issue #372](https://github.com/json-c/json-c/issues/372) - Json-c 0.12: Fixed Infinity bug \
-* [Issue #373](https://github.com/json-c/json-c/issues/373) - build: fix build on appveyor CI \
-* [Issue #374](https://github.com/json-c/json-c/issues/374) - Undefined symbols for architecture x86_64: \
-* [Issue #375](https://github.com/json-c/json-c/issues/375) - what would happened when json_object_object_add add the same key \
-* [Issue #376](https://github.com/json-c/json-c/issues/376) - Eclipse error \
-* [Issue #377](https://github.com/json-c/json-c/issues/377) - on gcc 7.2.0 on my linux distribution with json-c 2013-04-02 source \
-* [Issue #378](https://github.com/json-c/json-c/issues/378) - Eclipse: library (libjson-c) not found, but configured \
-* [Issue #379](https://github.com/json-c/json-c/issues/379) - error: this statement may fall through \[-Werror=implicit-fallthrough=\] \
-* [Issue #380](https://github.com/json-c/json-c/issues/380) - Build on Windows \
-* [Issue #381](https://github.com/json-c/json-c/issues/381) - Fix makedist \
-* [Issue #382](https://github.com/json-c/json-c/issues/382) - Memory leak for json_tokener_parse_ex for version 0.12.1 \
-* [Issue #383](https://github.com/json-c/json-c/issues/383) - Fix a compiler warning. \
-* [Issue #384](https://github.com/json-c/json-c/issues/384) - Fix a VS 2015 compiler warnings. \
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/issues_closed_for_0.14.md thunderbird-102.8.0/comm/third_party/json-c/issues_closed_for_0.14.md
--- thunderbird-102.6.0/comm/third_party/json-c/issues_closed_for_0.14.md 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/issues_closed_for_0.14.md 1970-01-01 00:00:00.000000000 +0000
@@ -1,202 +0,0 @@
-This list was created with:
-
-```
-curl https://api.github.com/search/issues?q="repo%3Ajson-c%2Fjson-c+closed%3A>2017-12-07+created%3A<2020-04-17&sort=created&order=asc&per_page=400&page=1" > issues1.out
-curl https://api.github.com/search/issues?q="repo%3Ajson-c%2Fjson-c+closed%3A>2017-12-07+created%3A<2020-04-17&sort=created&order=asc&per_page=400&page=2" > issues2.out
-curl https://api.github.com/search/issues?q="repo%3Ajson-c%2Fjson-c+closed%3A>2017-12-07+created%3A<2020-04-17&sort=created&order=asc&per_page=400&page=3" > issues3.out
-jq -r '.items[] | "[" + .title + "](" + .url + ")" | tostring' issues?.out > issues.md
-sed -e's,^\[ *\(.*\)\](https://api.github.com/.*/\([0-9].*\)),[Issue #\2](https://github.com/json-c/json-c/issues/\2) - \1,' -i issues.md
-#... manual editing ...
-```
-
-----
-
-Issues and Pull Requests closed for the 0.14 release (since commit d582d3a(2017-12-07) to a911439(2020-04-17))
-
-
-* [Issue #122](https://github.com/json-c/json-c/issues/122) - Add utf-8 validation when parsing strings. \
-* [Issue #139](https://github.com/json-c/json-c/issues/139) - json_object_from_file cannot accept max_depth \
-* [Issue #143](https://github.com/json-c/json-c/issues/143) - RFE / enhancement for full 64-bit signed/unsigned support \
-* [Issue #147](https://github.com/json-c/json-c/issues/147) - Please introduce soname bump if API changed \
-* [Issue #166](https://github.com/json-c/json-c/issues/166) - Need a way to specify nesting depth when opening JSON file \
-* [Issue #226](https://github.com/json-c/json-c/issues/226) - There is no json_object_new_null() \
-* [Issue #314](https://github.com/json-c/json-c/issues/314) - new release ? \
-* [Issue #326](https://github.com/json-c/json-c/issues/326) - Please extend api json_object_get_uint64 \
-* [Issue #334](https://github.com/json-c/json-c/issues/334) - Switch json-c builds to use CMake \
-* [Issue #386](https://github.com/json-c/json-c/issues/386) - Makefile: Add ACLOCAL_AMFLAGS \
-* [Issue #387](https://github.com/json-c/json-c/issues/387) - doc: Use other doxygen feature to specify mainpage \
-* [Issue #388](https://github.com/json-c/json-c/issues/388) - json_object: Add size_t json_object_sizeof() \
-* [Issue #389](https://github.com/json-c/json-c/issues/389) - json_object: Avoid double free (and thus a segfault) when ref_count gets < 0 \
-* [Issue #390](https://github.com/json-c/json-c/issues/390) - json_object: Add const size_t json_c_object_sizeof() \
-* [Issue #391](https://github.com/json-c/json-c/issues/391) - Fix non-GNUC define for JSON_C_CONST_FUNCTION \
-* [Issue #392](https://github.com/json-c/json-c/issues/392) - json_object: Avoid invalid free (and thus a segfault) when ref_count gets < 0 \
-* [Issue #393](https://github.com/json-c/json-c/issues/393) - json_object_private: Use unsigned 32-bit integer type for refcount \
-* [Issue #394](https://github.com/json-c/json-c/issues/394) - Problem serializing double \
-* [Issue #395](https://github.com/json-c/json-c/issues/395) - Key gets modified if it contains "\" \
-* [Issue #396](https://github.com/json-c/json-c/issues/396) - Build failure with no threads uClibc toolchain \
-* [Issue #397](https://github.com/json-c/json-c/issues/397) - update json object with key. \
-* [Issue #398](https://github.com/json-c/json-c/issues/398) - Build failed. \
-* [Issue #399](https://github.com/json-c/json-c/issues/399) - Avoid uninitialized variable warnings \
-* [Issue #400](https://github.com/json-c/json-c/issues/400) - How to generate static lib (.a) \
-* [Issue #401](https://github.com/json-c/json-c/issues/401) - Warnings with Valgrind \
-* [Issue #402](https://github.com/json-c/json-c/issues/402) - Add fuzzers from OSS-Fuzz \
-* [Issue #403](https://github.com/json-c/json-c/issues/403) - Segmentation fault when double quotes is used \
-* [Issue #404](https://github.com/json-c/json-c/issues/404) - valgrind: memory leak \
-* [Issue #405](https://github.com/json-c/json-c/issues/405) - Missing API to determine an object is empty \
-* [Issue #406](https://github.com/json-c/json-c/issues/406) - Undefine NDEBUG for tests \
-* [Issue #407](https://github.com/json-c/json-c/issues/407) - json_tokener_parse is crash \
-* [Issue #408](https://github.com/json-c/json-c/issues/408) - bug in array_list_del_idx when array_list_length()==1 \
-* [Issue #410](https://github.com/json-c/json-c/issues/410) - Fixed typos \
-* [Issue #411](https://github.com/json-c/json-c/issues/411) - Crash- signal SIGSEGV, Segmentation fault. ../sysdeps/x86_64/strlen.S: No such file or directory. \
-* [Issue #412](https://github.com/json-c/json-c/issues/412) - json_type changes during inter process communication. \
-* [Issue #413](https://github.com/json-c/json-c/issues/413) - how to read object of type `json_object *` in c++ \
-* [Issue #414](https://github.com/json-c/json-c/issues/414) - [Question] How JSON-c stores the serialized data in memory? \
-* [Issue #415](https://github.com/json-c/json-c/issues/415) - Resolve windows name conflict \
-* [Issue #416](https://github.com/json-c/json-c/issues/416) - segmentation fault in json_tokener_parse \
-* [Issue #417](https://github.com/json-c/json-c/issues/417) - json_tokener_parse json_object_object_get_ex with string value which is json string \
-* [Issue #418](https://github.com/json-c/json-c/issues/418) - json_object_from_* return value documented incorrectly \
-* [Issue #419](https://github.com/json-c/json-c/issues/419) - Suggestion: document (and define) that json_object_put() accepts NULL pointer to object \
-* [Issue #420](https://github.com/json-c/json-c/issues/420) - arraylist: Fixed names of parameters for callback function \
-* [Issue #421](https://github.com/json-c/json-c/issues/421) - install json_object_iterator.h header file \
-* [Issue #422](https://github.com/json-c/json-c/issues/422) - json_object_get_double() does not set errno when there is no valid conversion \
-* [Issue #423](https://github.com/json-c/json-c/issues/423) - memory leak \
-* [Issue #424](https://github.com/json-c/json-c/issues/424) - Parse string contains "\" or "/" errors \
-* [Issue #425](https://github.com/json-c/json-c/issues/425) - what this is? \
-* [Issue #426](https://github.com/json-c/json-c/issues/426) - __deprecated not supported on clang. \
-* [Issue #427](https://github.com/json-c/json-c/issues/427) - CMake: builds involving this target will not be correct \
-* [Issue #430](https://github.com/json-c/json-c/issues/430) - json_object_object_del() and Segmentation fault \
-* [Issue #431](https://github.com/json-c/json-c/issues/431) - cmake: Bump required version \
-* [Issue #432](https://github.com/json-c/json-c/issues/432) - The real CMake support. \
-* [Issue #433](https://github.com/json-c/json-c/issues/433) - The real CMake support. \
-* [Issue #434](https://github.com/json-c/json-c/issues/434) - The real CMake support \
-* [Issue #435](https://github.com/json-c/json-c/issues/435) - json_object_object_del() segmentation fault \
-* [Issue #436](https://github.com/json-c/json-c/issues/436) - Improve pkgconfig setting \
-* [Issue #437](https://github.com/json-c/json-c/issues/437) - Bad link in README.md \
-* [Issue #438](https://github.com/json-c/json-c/issues/438) - Bad link in README.html \
-* [Issue #439](https://github.com/json-c/json-c/issues/439) - reserved identifier violation \
-* [Issue #440](https://github.com/json-c/json-c/issues/440) - Use of angle brackets around file names for include statements \
-* [Issue #441](https://github.com/json-c/json-c/issues/441) - fix c flag loss during cmake building \
-* [Issue #442](https://github.com/json-c/json-c/issues/442) - error in configure file \
-* [Issue #443](https://github.com/json-c/json-c/issues/443) - remove pretty spaces when using pretty tabs \
-* [Issue #444](https://github.com/json-c/json-c/issues/444) - Document refcount of json_tokener_parse_ex return \
-* [Issue #445](https://github.com/json-c/json-c/issues/445) - Add missing "make check" target to cmake config \
-* [Issue #446](https://github.com/json-c/json-c/issues/446) - Forward slashes get escaped \
-* [Issue #448](https://github.com/json-c/json-c/issues/448) - Buffer overflow in json-c \
-* [Issue #449](https://github.com/json-c/json-c/issues/449) - Need of json_type_int64 returned by json_object_get_type() \
-* [Issue #450](https://github.com/json-c/json-c/issues/450) - Allow use json-c cmake as subproject \
-* [Issue #452](https://github.com/json-c/json-c/issues/452) - Update README.md \
-* [Issue #453](https://github.com/json-c/json-c/issues/453) - Fixed misalignment in JSON string due to space after \n being printed... \
-* [Issue #454](https://github.com/json-c/json-c/issues/454) - json_object_private: save 8 bytes in struct json_object in 64-bit arc… \
-* [Issue #455](https://github.com/json-c/json-c/issues/455) - index.html:fix dead link \
-* [Issue #456](https://github.com/json-c/json-c/issues/456) - STYLE.txt:remove executable permissions \
-* [Issue #457](https://github.com/json-c/json-c/issues/457) - .gitignore:add build directory \
-* [Issue #458](https://github.com/json-c/json-c/issues/458) - README.md:fix dead "file.html" link \
-* [Issue #459](https://github.com/json-c/json-c/issues/459) - README.html:fix link to Doxygen docs, remove WIN32 link \
-* [Issue #460](https://github.com/json-c/json-c/issues/460) - No docs for json_object_new_string_len() \
-* [Issue #461](https://github.com/json-c/json-c/issues/461) - json_object.c:set errno in json_object_get_double() \
-* [Issue #462](https://github.com/json-c/json-c/issues/462) - json_object.h:document json_object_new_string_len() \
-* [Issue #463](https://github.com/json-c/json-c/issues/463) - please check newlocale api first argument valuse. \
-* [Issue #465](https://github.com/json-c/json-c/issues/465) - CMakeLists.txt doesn't contain json_object_iterator.h which json.h includes \
-* [Issue #466](https://github.com/json-c/json-c/issues/466) - configure:3610: error: C compiler cannot create executables \
-* [Issue #467](https://github.com/json-c/json-c/issues/467) - Fix compiler warnings \
-* [Issue #468](https://github.com/json-c/json-c/issues/468) - Fix compiler warnings \
-* [Issue #469](https://github.com/json-c/json-c/issues/469) - Build under alpine with pecl install & docker-php-ext-enable? \
-* [Issue #470](https://github.com/json-c/json-c/issues/470) - cfuhash_foreach_remove doesn't upate cfuhash_num_entries \
-* [Issue #472](https://github.com/json-c/json-c/issues/472) - Segmentation fault in json_object_iter_begin \
-* [Issue #473](https://github.com/json-c/json-c/issues/473) - Convert ChangeLog to valid UTF-8 encoding. \
-* [Issue #474](https://github.com/json-c/json-c/issues/474) - Installation directories empty with CMake in pkg-config. \
-* [Issue #475](https://github.com/json-c/json-c/issues/475) - improvement proposal for json_object_object_foreach \
-* [Issue #477](https://github.com/json-c/json-c/issues/477) - Hang/Crash with large strings \
-* [Issue #478](https://github.com/json-c/json-c/issues/478) - json_object_get_string_len returns 0 when value is number \
-* [Issue #479](https://github.com/json-c/json-c/issues/479) - I want to use it in iOS or Android but I can't compile \
-* [Issue #480](https://github.com/json-c/json-c/issues/480) - json-c-0.12.1 failed making from source code \
-* [Issue #481](https://github.com/json-c/json-c/issues/481) - error while loading shared libraries: libjson-c.so.4 \
-* [Issue #482](https://github.com/json-c/json-c/issues/482) - Error "double free or corruption" after free() \
-* [Issue #483](https://github.com/json-c/json-c/issues/483) - compatible with rarely-used Chinese characters in GBK charset \
-* [Issue #485](https://github.com/json-c/json-c/issues/485) - Install CMake module files \
-* [Issue #486](https://github.com/json-c/json-c/issues/486) - In the case of negative double value, it is formatted without including ".0" \
-* [Issue #488](https://github.com/json-c/json-c/issues/488) - Some APIs are not exported when built as shared lib on Win32 \
-* [Issue #489](https://github.com/json-c/json-c/issues/489) - Don't use -Werror by default \
-* [Issue #490](https://github.com/json-c/json-c/issues/490) - do not compile with -Werror by default \
-* [Issue #491](https://github.com/json-c/json-c/issues/491) - build: add option --disable-werror to configure \
-* [Issue #492](https://github.com/json-c/json-c/issues/492) - lack some quick usage in readme \
-* [Issue #494](https://github.com/json-c/json-c/issues/494) - Code generator? \
-* [Issue #495](https://github.com/json-c/json-c/issues/495) - README.md:fix 2 typos \
-* [Issue #496](https://github.com/json-c/json-c/issues/496) - json_pointer.h:suggest minor grammar improvement for pointer doc \
-* [Issue #497](https://github.com/json-c/json-c/issues/497) - add common header for all tests \
-* [Issue #498](https://github.com/json-c/json-c/issues/498) - double_serializer_test fails (with valgrind) \
-* [Issue #499](https://github.com/json-c/json-c/issues/499) - .travis.yml:test on more recent clang and gcc versions \
-* [Issue #500](https://github.com/json-c/json-c/issues/500) - test/Makefile.am:add missing deps for test1 and test2 \
-* [Issue #501](https://github.com/json-c/json-c/issues/501) - undefine NDEBUG for tests \
-* [Issue #502](https://github.com/json-c/json-c/issues/502) - configure error \
-* [Issue #503](https://github.com/json-c/json-c/issues/503) - json-c retuns OK when Invalid json string is passed \
-* [Issue #504](https://github.com/json-c/json-c/issues/504) - json_object_put coredump \
-* [Issue #505](https://github.com/json-c/json-c/issues/505) - Add vcpkg installation instructions \
-* [Issue #506](https://github.com/json-c/json-c/issues/506) - Cannot parse more than one object \
-* [Issue #509](https://github.com/json-c/json-c/issues/509) - Sometimes a double value is not serialized \
-* [Issue #510](https://github.com/json-c/json-c/issues/510) - Bump so-name and improve CMake \
-* [Issue #511](https://github.com/json-c/json-c/issues/511) - Reduce lines for better optimization \
-* [Issue #512](https://github.com/json-c/json-c/issues/512) - Properly append to CMAKE_C_FLAGS string \
-* [Issue #513](https://github.com/json-c/json-c/issues/513) - What does `userdata` means?And what is the case we can use it? \
-* [Issue #514](https://github.com/json-c/json-c/issues/514) - Json c 0.13 \
-* [Issue #515](https://github.com/json-c/json-c/issues/515) - Mies suomesta fixes segfaults and logic errors \
-* [Issue #516](https://github.com/json-c/json-c/issues/516) - Lja slight mods \
-* [Issue #518](https://github.com/json-c/json-c/issues/518) - Escape character "\\003\", get unexpected value \
-* [Issue #519](https://github.com/json-c/json-c/issues/519) - Add test case obj token \
-* [Issue #520](https://github.com/json-c/json-c/issues/520) - Adding type uint64 \
-* [Issue #521](https://github.com/json-c/json-c/issues/521) - build cmake windows 10 \
-* [Issue #522](https://github.com/json-c/json-c/issues/522) - update json_visit testcase \
-* [Issue #523](https://github.com/json-c/json-c/issues/523) - update tsetcase for tokener_c \
-* [Issue #524](https://github.com/json-c/json-c/issues/524) - Increase coverage \
-* [Issue #525](https://github.com/json-c/json-c/issues/525) - update pointer test case \
-* [Issue #526](https://github.com/json-c/json-c/issues/526) - Increased the test coverage of printbuf.c 82% to 92%. \
-* [Issue #527](https://github.com/json-c/json-c/issues/527) - Arraylist testcase \
-* [Issue #528](https://github.com/json-c/json-c/issues/528) - Solve issue #108. Skip \u0000 while parsing. \
-* [Issue #529](https://github.com/json-c/json-c/issues/529) - Increased the test coverage of json_c_version.c 0% to 100%. \
-* [Issue #530](https://github.com/json-c/json-c/issues/530) - validate utf-8 string before parse \
-* [Issue #531](https://github.com/json-c/json-c/issues/531) - validate utf-8 string \
-* [Issue #532](https://github.com/json-c/json-c/issues/532) - json_object_object_get_ex returning the original object \
-* [Issue #533](https://github.com/json-c/json-c/issues/533) - Fix "make check" \
-* [Issue #535](https://github.com/json-c/json-c/issues/535) - short string optimization: excessive array length \
-* [Issue #536](https://github.com/json-c/json-c/issues/536) - add json_object_new_null() \
-* [Issue #538](https://github.com/json-c/json-c/issues/538) - update shortstring and arraylist parameters \
-* [Issue #539](https://github.com/json-c/json-c/issues/539) - double serializes to the old value after set_double \
-* [Issue #541](https://github.com/json-c/json-c/issues/541) - add coveralls auto tool to json-c \
-* [Issue #542](https://github.com/json-c/json-c/issues/542) - add uint64 data to json-c \
-* [Issue #543](https://github.com/json-c/json-c/issues/543) - Readme \
-* [Issue #544](https://github.com/json-c/json-c/issues/544) - Increase distcheck target in cmake \
-* [Issue #545](https://github.com/json-c/json-c/issues/545) - add doc target in cmake \
-* [Issue #546](https://github.com/json-c/json-c/issues/546) - Add uninstall target in cmake \
-* [Issue #547](https://github.com/json-c/json-c/issues/547) - modify json-c default build type, and fix up the assert() errors in t… \
-* [Issue #548](https://github.com/json-c/json-c/issues/548) - Solve some problems about cmake build type (debug/release) \
-* [Issue #549](https://github.com/json-c/json-c/issues/549) - lib installation issues \
-* [Issue #550](https://github.com/json-c/json-c/issues/550) - Format codes with clang-format tool? \
-* [Issue #551](https://github.com/json-c/json-c/issues/551) - Allow hexadecimal number format convention parsing \
-* [Issue #553](https://github.com/json-c/json-c/issues/553) - Fix/clang ubsan \
-* [Issue #554](https://github.com/json-c/json-c/issues/554) - RFC 8259 compatibility mode \
-* [Issue #555](https://github.com/json-c/json-c/issues/555) - Format json-c with clang-format tool \
-* [Issue #556](https://github.com/json-c/json-c/issues/556) - Fixes various Wreturn-type and Wimplicit-fallthrough errors on Mingw-w64 \
-* [Issue #557](https://github.com/json-c/json-c/issues/557) - Add option in CMAKE to not build documentation \
-* [Issue #558](https://github.com/json-c/json-c/issues/558) - modify the doc target message \
-* [Issue #559](https://github.com/json-c/json-c/issues/559) - json_c_visit() not exported on Windows \
-* [Issue #560](https://github.com/json-c/json-c/issues/560) - error: implicit declaration of function '_strtoi64' \
-* [Issue #561](https://github.com/json-c/json-c/issues/561) - add the badge in README.md and test the coveralls \
-* [Issue #562](https://github.com/json-c/json-c/issues/562) - Bugfix and testcases supplements \
-* [Issue #563](https://github.com/json-c/json-c/issues/563) - Changed order of calloc args to match stdlib \
-* [Issue #564](https://github.com/json-c/json-c/issues/564) - Remove autogenerated files \
-* [Issue #565](https://github.com/json-c/json-c/issues/565) - test the CI and ignore this PR \
-* [Issue #566](https://github.com/json-c/json-c/issues/566) - add the json_types.h to Makefile.am \
-* [Issue #567](https://github.com/json-c/json-c/issues/567) - Install json_types.h with autotools build as well. \
-* [Issue #568](https://github.com/json-c/json-c/issues/568) - Adding better support to MinGW \
-* [Issue #569](https://github.com/json-c/json-c/issues/569) - Handling of -Bsymbolic-function in CMakeLists.txt is deficient \
-* [Issue #571](https://github.com/json-c/json-c/issues/571) - CMake: Bump SONAME to 5. \
-* [Issue #572](https://github.com/json-c/json-c/issues/572) - Small fixes to CMakeLists \
-* [Issue #573](https://github.com/json-c/json-c/issues/573) - Fix coveralls submission. \
-* [Issue #574](https://github.com/json-c/json-c/issues/574) - autogen.sh missing from repository \
-* [Issue #575](https://github.com/json-c/json-c/issues/575) - Small cosmetics. \
-* [Issue #576](https://github.com/json-c/json-c/issues/576) - Test coverage for json_c_version. \
-* [Issue #577](https://github.com/json-c/json-c/issues/577) - Be verbose on failing json_c_version test. \
-* [Issue #578](https://github.com/json-c/json-c/issues/578) - CMake: Install pkgconfig file in proper location by default \
-* [Issue #579](https://github.com/json-c/json-c/issues/579) - Enforce strict prototypes. \
-* [Issue #580](https://github.com/json-c/json-c/issues/580) - Fix CMake tests for enforced strict prototypes. \
-* [Issue #581](https://github.com/json-c/json-c/issues/581) - CMakeLists: do not enforce strict prototypes on Windows. \
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/json.h thunderbird-102.8.0/comm/third_party/json-c/json.h
--- thunderbird-102.6.0/comm/third_party/json-c/json.h 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/json.h 1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-/*
- * $Id: json.h,v 1.6 2006/01/26 02:16:28 mclark Exp $
- *
- * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd.
- * Michael Clark
- * Copyright (c) 2009 Hewlett-Packard Development Company, L.P.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See COPYING for details.
- *
- */
-
-/**
- * @file
- * @brief A convenience header that may be included instead of other individual ones.
- */
-#ifndef _json_h_
-#define _json_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "arraylist.h"
-#include "debug.h"
-#include "json_c_version.h"
-#include "json_object.h"
-#include "json_object_iterator.h"
-#include "json_pointer.h"
-#include "json_tokener.h"
-#include "json_util.h"
-#include "linkhash.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/json.h.cmakein thunderbird-102.8.0/comm/third_party/json-c/json.h.cmakein
--- thunderbird-102.6.0/comm/third_party/json-c/json.h.cmakein 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/json.h.cmakein 2023-02-14 22:00:33.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+ * $Id: json.h,v 1.6 2006/01/26 02:16:28 mclark Exp $
+ *
+ * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd.
+ * Michael Clark
+ * Copyright (c) 2009 Hewlett-Packard Development Company, L.P.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See COPYING for details.
+ *
+ */
+
+/**
+ * @file
+ * @brief A convenience header that may be included instead of other individual ones.
+ */
+#ifndef _json_h_
+#define _json_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "arraylist.h"
+#include "debug.h"
+#include "json_c_version.h"
+#include "json_object.h"
+#include "json_object_iterator.h"
+@JSON_H_JSON_POINTER@
+#include "json_tokener.h"
+#include "json_util.h"
+#include "linkhash.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/json_c_version.h thunderbird-102.8.0/comm/third_party/json-c/json_c_version.h
--- thunderbird-102.6.0/comm/third_party/json-c/json_c_version.h 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/json_c_version.h 2023-02-14 22:00:33.000000000 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012,2017,2019,2020 Eric Hawicz
+ * Copyright (c) 2012,2017-2022 Eric Haszlakiewicz
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See COPYING for details.
@@ -17,14 +17,14 @@
#endif
#define JSON_C_MAJOR_VERSION 0
-#define JSON_C_MINOR_VERSION 15
+#define JSON_C_MINOR_VERSION 16
#define JSON_C_MICRO_VERSION 0
#define JSON_C_VERSION_NUM \
((JSON_C_MAJOR_VERSION << 16) | (JSON_C_MINOR_VERSION << 8) | JSON_C_MICRO_VERSION)
-#define JSON_C_VERSION "0.15"
+#define JSON_C_VERSION "0.16"
#ifndef JSON_EXPORT
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && defined(JSON_C_DLL)
#define JSON_EXPORT __declspec(dllexport)
#else
#define JSON_EXPORT extern
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/json_config.h.win32 thunderbird-102.8.0/comm/third_party/json-c/json_config.h.win32
--- thunderbird-102.6.0/comm/third_party/json-c/json_config.h.win32 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/json_config.h.win32 1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-
-/* Define to 1 if you have the header file. */
-#if defined(_MSC_VER) && _MSC_VER >= 1800
-#define JSON_C_HAVE_INTTYPES_H 1
-#endif
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/json_object.c thunderbird-102.8.0/comm/third_party/json-c/json_object.c
--- thunderbird-102.6.0/comm/third_party/json-c/json_object.c 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/json_object.c 2023-02-14 22:00:33.000000000 +0000
@@ -13,7 +13,6 @@
#include "strerror_override.h"
#include
-#include
#ifdef HAVE_LIMITS_H
#include
#endif
@@ -35,8 +34,11 @@
#include "snprintf_compat.h"
#include "strdup_compat.h"
+/* Avoid ctype.h and locale overhead */
+#define is_plain_digit(c) ((c) >= '0' && (c) <= '9')
+
#if SIZEOF_LONG_LONG != SIZEOF_INT64_T
-#error "The long long type isn't 64-bits"
+#error The long long type is not 64-bits
#endif
#ifndef SSIZE_T_MAX
@@ -51,9 +53,6 @@
#endif
#endif
-// Don't define this. It's not thread-safe.
-/* #define REFCOUNT_DEBUG 1 */
-
const char *json_hex_chars = "0123456789abcdefABCDEF";
static void json_object_generic_delete(struct json_object *jso);
@@ -159,41 +158,6 @@
* */
JSON_NORETURN static void json_abort(const char *message);
-/* ref count debugging */
-
-#ifdef REFCOUNT_DEBUG
-
-static struct lh_table *json_object_table;
-
-static void json_object_init(void) __attribute__((constructor));
-static void json_object_init(void)
-{
- MC_DEBUG("json_object_init: creating object table\n");
- json_object_table = lh_kptr_table_new(128, NULL);
-}
-
-static void json_object_fini(void) __attribute__((destructor));
-static void json_object_fini(void)
-{
- struct lh_entry *ent;
- if (MC_GET_DEBUG())
- {
- if (json_object_table->count)
- {
- MC_DEBUG("json_object_fini: %d referenced objects at exit\n",
- json_object_table->count);
- lh_foreach(json_object_table, ent)
- {
- struct json_object *obj = (struct json_object *)lh_entry_v(ent);
- MC_DEBUG("\t%s:%p\n", json_type_to_name(obj->o_type), obj);
- }
- }
- }
- MC_DEBUG("json_object_fini: freeing object table\n");
- lh_table_free(json_object_table);
-}
-#endif /* REFCOUNT_DEBUG */
-
/* helper for accessing the optimized string data component in json_object
*/
static inline char *get_string_component_mutable(struct json_object *jso)
@@ -214,10 +178,11 @@
static int json_escape_str(struct printbuf *pb, const char *str, size_t len, int flags)
{
- int pos = 0, start_offset = 0;
+ size_t pos = 0, start_offset = 0;
unsigned char c;
- while (len--)
+ while (len)
{
+ --len;
c = str[pos];
switch (c)
{
@@ -235,7 +200,7 @@
break;
}
- if (pos - start_offset > 0)
+ if (pos > start_offset)
printbuf_memappend(pb, str + start_offset, pos - start_offset);
if (c == '\b')
@@ -261,7 +226,7 @@
if (c < ' ')
{
char sbuf[7];
- if (pos - start_offset > 0)
+ if (pos > start_offset)
printbuf_memappend(pb, str + start_offset,
pos - start_offset);
snprintf(sbuf, sizeof(sbuf), "\\u00%c%c", json_hex_chars[c >> 4],
@@ -273,7 +238,7 @@
pos++;
}
}
- if (pos - start_offset > 0)
+ if (pos > start_offset)
printbuf_memappend(pb, str + start_offset, pos - start_offset);
return 0;
}
@@ -337,10 +302,6 @@
static void json_object_generic_delete(struct json_object *jso)
{
-#ifdef REFCOUNT_DEBUG
- MC_DEBUG("json_object_delete_%s: %p\n", json_type_to_name(jso->o_type), jso);
- lh_table_delete(json_object_table, jso);
-#endif /* REFCOUNT_DEBUG */
printbuf_free(jso->_pb);
free(jso);
}
@@ -362,10 +323,6 @@
jso->_userdata = NULL;
//jso->... // Type-specific fields must be set by caller
-#ifdef REFCOUNT_DEBUG
- lh_table_insert(json_object_table, jso, jso);
- MC_DEBUG("json_object_new_%s: %p\n", json_type_to_name(jso->o_type), jso);
-#endif /* REFCOUNT_DEBUG */
return jso;
}
@@ -542,7 +499,7 @@
static void json_object_lh_entry_free(struct lh_entry *ent)
{
- if (!ent->k_is_constant)
+ if (!lh_entry_k_is_constant(ent))
free(lh_entry_k(ent));
json_object_put((struct json_object *)lh_entry_v(ent));
}
@@ -605,7 +562,7 @@
if (!existing_entry)
{
const void *const k =
- (opts & JSON_C_OBJECT_KEY_IS_CONSTANT) ? (const void *)key : strdup(key);
+ (opts & JSON_C_OBJECT_ADD_CONSTANT_KEY) ? (const void *)key : strdup(key);
if (k == NULL)
return -1;
return lh_table_insert_w_hash(JC_OBJECT(jso)->c_object, k, val, hash, opts);
@@ -613,7 +570,7 @@
existing_value = (json_object *)lh_entry_v(existing_entry);
if (existing_value)
json_object_put(existing_value);
- existing_entry->v = val;
+ lh_entry_set_val(existing_entry, val);
return 0;
}
@@ -735,7 +692,7 @@
int32_t json_object_get_int(const struct json_object *jso)
{
- int64_t cint64=0;
+ int64_t cint64 = 0;
double cdouble;
enum json_type o_type;
@@ -976,7 +933,21 @@
#endif
if (global_serialization_float_format)
free(global_serialization_float_format);
- global_serialization_float_format = double_format ? strdup(double_format) : NULL;
+ if (double_format)
+ {
+ char *p = strdup(double_format);
+ if (p == NULL)
+ {
+ _json_c_set_last_err("json_c_set_serialization_double_format: "
+ "out of memory\n");
+ return -1;
+ }
+ global_serialization_float_format = p;
+ }
+ else
+ {
+ global_serialization_float_format = NULL;
+ }
}
else if (global_or_thread == JSON_C_OPTION_THREAD)
{
@@ -986,16 +957,31 @@
free(tls_serialization_float_format);
tls_serialization_float_format = NULL;
}
- tls_serialization_float_format = double_format ? strdup(double_format) : NULL;
+ if (double_format)
+ {
+ char *p = strdup(double_format);
+ if (p == NULL)
+ {
+ _json_c_set_last_err("json_c_set_serialization_double_format: "
+ "out of memory\n");
+ return -1;
+ }
+ tls_serialization_float_format = p;
+ }
+ else
+ {
+ tls_serialization_float_format = NULL;
+ }
#else
- _json_c_set_last_err("json_c_set_option: not compiled with __thread support\n");
+ _json_c_set_last_err("json_c_set_serialization_double_format: not compiled "
+ "with __thread support\n");
return -1;
#endif
}
else
{
- _json_c_set_last_err("json_c_set_option: invalid global_or_thread value: %d\n",
- global_or_thread);
+ _json_c_set_last_err("json_c_set_serialization_double_format: invalid "
+ "global_or_thread value: %d\n", global_or_thread);
return -1;
}
return 0;
@@ -1056,8 +1042,7 @@
format_drops_decimals = 1;
looks_numeric = /* Looks like *some* kind of number */
- isdigit((unsigned char)buf[0]) ||
- (size > 1 && buf[0] == '-' && isdigit((unsigned char)buf[1]));
+ is_plain_digit(buf[0]) || (size > 1 && buf[0] == '-' && is_plain_digit(buf[1]));
if (size < (int)sizeof(buf) - 2 && looks_numeric && !p && /* Has no decimal point */
strchr(buf, 'e') == NULL && /* Not scientific notation */
@@ -1254,17 +1239,17 @@
struct json_object_string *jso;
/*
- * Structures Actual memory layout
- * ------------------- --------------------
+ * Structures Actual memory layout
+ * ------------------- --------------------
* [json_object_string [json_object_string
* [json_object] [json_object]
- * ...other fields... ...other fields...
+ * ...other fields... ...other fields...
* c_string] len
- * bytes
+ * bytes
* of
* string
* data
- * \0]
+ * \0]
*/
if (len > (SSIZE_T_MAX - (sizeof(*jso) - sizeof(jso->c_string)) - 1))
return NULL;
@@ -1281,7 +1266,8 @@
return NULL;
jso->len = len;
memcpy(jso->c_string.idata, s, len);
- jso->c_string.idata[len] = '\0';
+ // Cast below needed for Clang UB sanitizer
+ ((char *)jso->c_string.idata)[len] = '\0';
return &jso->base;
}
@@ -1305,18 +1291,20 @@
default: return json_object_to_json_string(jso);
}
}
-int json_object_get_string_len(const struct json_object *jso)
+
+static inline ssize_t _json_object_get_string_len(const struct json_object_string *jso)
{
ssize_t len;
+ len = jso->len;
+ return (len < 0) ? -(ssize_t)len : len;
+}
+int json_object_get_string_len(const struct json_object *jso)
+{
if (!jso)
return 0;
switch (jso->o_type)
{
- case json_type_string:
- {
- len = JC_STRING_C(jso)->len;
- return (len < 0) ? -(ssize_t)len : len;
- }
+ case json_type_string: return _json_object_get_string_len(JC_STRING_C(jso));
default: return 0;
}
}
@@ -1329,9 +1317,10 @@
if (jso == NULL || jso->o_type != json_type_string)
return 0;
- if (len >= SSIZE_T_MAX - 1)
+ if (len >= INT_MAX - 1)
// jso->len is a signed ssize_t, so it can't hold the
- // full size_t range.
+ // full size_t range. json_object_get_string_len returns
+ // length as int, cap length at INT_MAX.
return 0;
dstbuf = get_string_component_mutable(jso);
@@ -1605,9 +1594,10 @@
case json_type_string:
{
- return (json_object_get_string_len(jso1) == json_object_get_string_len(jso2) &&
+ return (_json_object_get_string_len(JC_STRING(jso1)) ==
+ _json_object_get_string_len(JC_STRING(jso2)) &&
memcmp(get_string_component(jso1), get_string_component(jso2),
- json_object_get_string_len(jso1)) == 0);
+ _json_object_get_string_len(JC_STRING(jso1))) == 0);
}
case json_type_object: return json_object_all_values_equal(jso1, jso2);
@@ -1628,14 +1618,22 @@
if (dst->_to_json_string == json_object_userdata_to_json_string ||
dst->_to_json_string == _json_object_userdata_to_json_string)
{
- dst->_userdata = strdup(src->_userdata);
+ char *p;
+ assert(src->_userdata);
+ p = strdup(src->_userdata);
+ if (p == NULL)
+ {
+ _json_c_set_last_err("json_object_copy_serializer_data: out of memory\n");
+ return -1;
+ }
+ dst->_userdata = p;
}
// else if ... other supported serializers ...
else
{
_json_c_set_last_err(
- "json_object_deep_copy: unable to copy unknown serializer data: %p\n",
- (void *)dst->_to_json_string);
+ "json_object_copy_serializer_data: unable to copy unknown serializer data: "
+ "%p\n", (void *)dst->_to_json_string);
return -1;
}
dst->_user_delete = src->_user_delete;
@@ -1672,7 +1670,10 @@
}
break;
- case json_type_string: *dst = json_object_new_string(get_string_component(src)); break;
+ case json_type_string:
+ *dst = json_object_new_string_len(get_string_component(src),
+ _json_object_get_string_len(JC_STRING(src)));
+ break;
case json_type_object: *dst = json_object_new_object(); break;
@@ -1724,8 +1725,8 @@
/* This handles the `json_type_null` case */
if (!iter.val)
jso = NULL;
- else if (json_object_deep_copy_recursive(iter.val, src, iter.key, -1, &jso,
- shallow_copy) < 0)
+ else if (json_object_deep_copy_recursive(iter.val, src, iter.key, UINT_MAX,
+ &jso, shallow_copy) < 0)
{
json_object_put(jso);
return -1;
@@ -1789,7 +1790,7 @@
if (shallow_copy == NULL)
shallow_copy = json_c_shallow_copy_default;
- rc = json_object_deep_copy_recursive(src, NULL, NULL, -1, dst, shallow_copy);
+ rc = json_object_deep_copy_recursive(src, NULL, NULL, UINT_MAX, dst, shallow_copy);
if (rc < 0)
{
json_object_put(*dst);
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/json_object.h thunderbird-102.8.0/comm/third_party/json-c/json_object.h
--- thunderbird-102.6.0/comm/third_party/json-c/json_object.h 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/json_object.h 2023-02-14 22:00:33.000000000 +0000
@@ -52,7 +52,7 @@
* json_object_to_file_ext() functions which causes
* the output to be formatted.
*
- * See the "Two Space Tab" option at http://jsonformatter.curiousconcept.com/
+ * See the "Two Space Tab" option at https://jsonformatter.curiousconcept.com/
* for an example of the format.
*/
#define JSON_C_TO_STRING_PRETTY (1 << 1)
@@ -100,9 +100,17 @@
* key is given as a real constant value in the function
* call, e.g. as in
* json_object_object_add_ex(obj, "ip", json,
- * JSON_C_OBJECT_KEY_IS_CONSTANT);
+ * JSON_C_OBJECT_ADD_CONSTANT_KEY);
*/
-#define JSON_C_OBJECT_KEY_IS_CONSTANT (1 << 2)
+#define JSON_C_OBJECT_ADD_CONSTANT_KEY (1 << 2)
+/**
+ * This flag is an alias to JSON_C_OBJECT_ADD_CONSTANT_KEY.
+ * Historically, this flag was used first and the new name
+ * JSON_C_OBJECT_ADD_CONSTANT_KEY was introduced for version
+ * 0.16.00 in order to have regular naming.
+ * Use of this flag is now legacy.
+ */
+#define JSON_C_OBJECT_KEY_IS_CONSTANT JSON_C_OBJECT_ADD_CONSTANT_KEY
/**
* Set the global value of an option, which will apply to all
@@ -131,7 +139,7 @@
* beyond the lifetime of the parent object.
* - Detaching an object field or array index from its parent object
* (using `json_object_object_del()` or `json_object_array_del_idx()`)
- * - Sharing a json_object with multiple (not necesarily parallel) threads
+ * - Sharing a json_object with multiple (not necessarily parallel) threads
* of execution that all expect to free it (with `json_object_put()`) when
* they're done.
*
@@ -470,19 +478,19 @@
* @param val the local name for the json_object* object variable defined in
* the body
*/
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && __STDC_VERSION__ >= 199901L
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
#define json_object_object_foreach(obj, key, val) \
char *key = NULL; \
struct json_object *val __attribute__((__unused__)) = NULL; \
- for (struct lh_entry *entry##key = json_object_get_object(obj)->head, \
+ for (struct lh_entry *entry##key = lh_table_head(json_object_get_object(obj)), \
*entry_next##key = NULL; \
({ \
if (entry##key) \
{ \
key = (char *)lh_entry_k(entry##key); \
val = (struct json_object *)lh_entry_v(entry##key); \
- entry_next##key = entry##key->next; \
+ entry_next##key = lh_entry_next(entry##key); \
}; \
entry##key; \
}); \
@@ -495,25 +503,25 @@
struct json_object *val = NULL; \
struct lh_entry *entry##key; \
struct lh_entry *entry_next##key = NULL; \
- for (entry##key = json_object_get_object(obj)->head; \
+ for (entry##key = lh_table_head(json_object_get_object(obj)); \
(entry##key ? (key = (char *)lh_entry_k(entry##key), \
val = (struct json_object *)lh_entry_v(entry##key), \
- entry_next##key = entry##key->next, entry##key) \
+ entry_next##key = lh_entry_next(entry##key), entry##key) \
: 0); \
entry##key = entry_next##key)
-#endif /* defined(__GNUC__) && !defined(__STRICT_ANSI__) && __STDC_VERSION__ >= 199901L */
+#endif /* defined(__GNUC__) && !defined(__STRICT_ANSI__) && (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) */
/** Iterate through all keys and values of an object (ANSI C Safe)
* @param obj the json_object instance
* @param iter the object iterator, use type json_object_iter
*/
#define json_object_object_foreachC(obj, iter) \
- for (iter.entry = json_object_get_object(obj)->head; \
+ for (iter.entry = lh_table_head(json_object_get_object(obj)); \
(iter.entry ? (iter.key = (char *)lh_entry_k(iter.entry), \
iter.val = (struct json_object *)lh_entry_v(iter.entry), iter.entry) \
: 0); \
- iter.entry = iter.entry->next)
+ iter.entry = lh_entry_next(iter.entry))
/* Array type methods */
@@ -656,8 +664,9 @@
* The type is coerced to a json_bool if the passed object is not a json_bool.
* integer and double objects will return 0 if there value is zero
* or 1 otherwise. If the passed object is a string it will return
- * 1 if it has a non zero length. If any other object type is passed
- * 1 will be returned if the object is not NULL.
+ * 1 if it has a non zero length.
+ * If any other object type is passed 0 will be returned, even non-empty
+ * json_type_array and json_type_object objects.
*
* @param obj the json_object instance
* @returns a json_bool
@@ -738,7 +747,7 @@
*
* @param obj the json_object instance
* @param val the value to add
- * @returns 1 if the increment succeded, 0 otherwise
+ * @returns 1 if the increment succeeded, 0 otherwise
*/
JSON_EXPORT int json_object_int_inc(struct json_object *obj, int64_t val);
@@ -1055,7 +1064,7 @@
* when custom serializers are in use. See also
* json_object set_serializer.
*
- * @returns 0 if the copy went well, -1 if an error occured during copy
+ * @returns 0 if the copy went well, -1 if an error occurred during copy
* or if the destination pointer is non-NULL
*/
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/json_object_iterator.c thunderbird-102.8.0/comm/third_party/json-c/json_object_iterator.c
--- thunderbird-102.6.0/comm/third_party/json-c/json_object_iterator.c 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/json_object_iterator.c 2023-02-14 22:00:33.000000000 +0000
@@ -71,7 +71,7 @@
/// @note For a pair-less Object, head is NULL, which matches our
/// definition of the "end" iterator
- iter.opaque_ = pTable->head;
+ iter.opaque_ = lh_table_head(pTable);
return iter;
}
@@ -98,7 +98,7 @@
JASSERT(NULL != iter);
JASSERT(kObjectEndIterValue != iter->opaque_);
- iter->opaque_ = ((const struct lh_entry *)iter->opaque_)->next;
+ iter->opaque_ = lh_entry_next(((const struct lh_entry *)iter->opaque_));
}
/**
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/json_pointer.c thunderbird-102.8.0/comm/third_party/json-c/json_pointer.c
--- thunderbird-102.6.0/comm/third_party/json-c/json_pointer.c 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/json_pointer.c 2023-02-14 22:00:33.000000000 +0000
@@ -10,7 +10,6 @@
#include "strerror_override.h"
-#include
#include
#include
#include
@@ -20,6 +19,9 @@
#include "strdup_compat.h"
#include "vasprintf_compat.h"
+/* Avoid ctype.h and locale overhead */
+#define is_plain_digit(c) ((c) >= '0' && (c) <= '9')
+
/**
* JavaScript Object Notation (JSON) Pointer
* RFC 6901 - https://tools.ietf.org/html/rfc6901
@@ -47,7 +49,7 @@
*/
if (len == 1)
{
- if (isdigit((unsigned char)path[0]))
+ if (is_plain_digit(path[0]))
{
*idx = (path[0] - '0');
goto check_oob;
@@ -64,7 +66,7 @@
/* RFC states base-10 decimals */
for (i = 0; i < len; i++)
{
- if (!isdigit((unsigned char)path[i]))
+ if (!is_plain_digit(path[i]))
{
errno = EINVAL;
return 0;
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/json_tokener.c thunderbird-102.8.0/comm/third_party/json-c/json_tokener.c
--- thunderbird-102.6.0/comm/third_party/json-c/json_tokener.c 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/json_tokener.c 2023-02-14 22:00:33.000000000 +0000
@@ -10,14 +10,13 @@
*
* Copyright (c) 2008-2009 Yahoo! Inc. All rights reserved.
* The copyrights to the contents of this file are licensed under the MIT License
- * (http://www.opensource.org/licenses/mit-license.php)
+ * (https://www.opensource.org/licenses/mit-license.php)
*/
#include "config.h"
#include "math_compat.h"
#include
-#include
#include
#include
#include
@@ -53,6 +52,34 @@
#error You do not have strncasecmp on your system.
#endif /* HAVE_STRNCASECMP */
+#if defined(_MSC_VER) && (_MSC_VER <= 1800)
+/* VS2013 doesn't know about "inline" */
+#define inline __inline
+#elif defined(AIX_CC)
+#define inline
+#endif
+
+/* The following helper functions are used to speed up parsing. They
+ * are faster than their ctype counterparts because they assume that
+ * the input is in ASCII and that the locale is set to "C". The
+ * compiler will also inline these functions, providing an additional
+ * speedup by saving on function calls.
+ */
+static inline int is_ws_char(char c)
+{
+ return c == ' '
+ || c == '\t'
+ || c == '\n'
+ || c == '\r';
+}
+
+static inline int is_hex_char(char c)
+{
+ return (c >= '0' && c <= '9')
+ || (c >= 'A' && c <= 'F')
+ || (c >= 'a' && c <= 'f');
+}
+
/* Use C99 NAN by default; if not available, nan("") should work too. */
#ifndef NAN
#define NAN nan("")
@@ -61,7 +88,8 @@
static const char json_null_str[] = "null";
static const int json_null_str_len = sizeof(json_null_str) - 1;
static const char json_inf_str[] = "Infinity";
-static const char json_inf_str_lower[] = "infinity";
+/* Swapped case "Infinity" to avoid need to call tolower() on input chars: */
+static const char json_inf_str_invert[] = "iNFINITY";
static const unsigned int json_inf_str_len = sizeof(json_inf_str) - 1;
static const char json_nan_str[] = "NaN";
static const int json_nan_str_len = sizeof(json_nan_str) - 1;
@@ -134,6 +162,12 @@
return NULL;
}
tok->pb = printbuf_new();
+ if (!tok->pb)
+ {
+ free(tok->stack);
+ free(tok);
+ return NULL;
+ }
tok->max_depth = depth;
json_tokener_reset(tok);
return tok;
@@ -316,7 +350,7 @@
case json_tokener_state_eatws:
/* Advance until we change state */
- while (isspace((unsigned char)c))
+ while (is_ws_char(c))
{
if ((!ADVANCE_CHAR(str, tok)) || (!PEEK_CHAR(c, tok)))
goto out;
@@ -421,17 +455,15 @@
* complicated with likely little performance benefit.
*/
int is_negative = 0;
- const char *_json_inf_str = json_inf_str;
- if (!(tok->flags & JSON_TOKENER_STRICT))
- _json_inf_str = json_inf_str_lower;
/* Note: tok->st_pos must be 0 when state is set to json_tokener_state_inf */
while (tok->st_pos < (int)json_inf_str_len)
{
char inf_char = *str;
- if (!(tok->flags & JSON_TOKENER_STRICT))
- inf_char = tolower((unsigned char)*str);
- if (inf_char != _json_inf_str[tok->st_pos])
+ if (inf_char != json_inf_str[tok->st_pos] &&
+ ((tok->flags & JSON_TOKENER_STRICT) ||
+ inf_char != json_inf_str_invert[tok->st_pos])
+ )
{
tok->err = json_tokener_error_parse_unexpected;
goto out;
@@ -647,7 +679,7 @@
/* Handle a 4-byte \uNNNN sequence, or two sequences if a surrogate pair */
while (1)
{
- if (!c || !strchr(json_hex_chars, c))
+ if (!c || !is_hex_char(c))
{
tok->err = json_tokener_error_parse_string;
goto out;
@@ -714,7 +746,7 @@
* we can't simply peek ahead here, because the
* characters we need might not be passed to us
* until a subsequent call to json_tokener_parse.
- * Instead, transition throug a couple of states.
+ * Instead, transition through a couple of states.
* (now):
* _escape_unicode => _unicode_need_escape
* (see a '\\' char):
@@ -920,7 +952,7 @@
next call to json_tokener_parse().
*/
if (tok->depth > 0 && c != ',' && c != ']' && c != '}' && c != '/' &&
- c != 'I' && c != 'i' && !isspace((unsigned char)c))
+ c != 'I' && c != 'i' && !is_ws_char(c))
{
tok->err = json_tokener_error_parse_number;
goto out;
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/json_types.h thunderbird-102.8.0/comm/third_party/json-c/json_types.h
--- thunderbird-102.6.0/comm/third_party/json-c/json_types.h 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/json_types.h 2023-02-14 22:00:33.000000000 +0000
@@ -18,7 +18,7 @@
#endif
#ifndef JSON_EXPORT
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && defined(JSON_C_DLL)
#define JSON_EXPORT __declspec(dllexport)
#else
#define JSON_EXPORT extern
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/json_util.c thunderbird-102.8.0/comm/third_party/json-c/json_util.c
--- thunderbird-102.6.0/comm/third_party/json-c/json_util.c 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/json_util.c 2023-02-14 22:00:33.000000000 +0000
@@ -14,7 +14,6 @@
#include "strerror_override.h"
-#include
#include
#include
#include
@@ -92,7 +91,7 @@
if (!(pb = printbuf_new()))
{
- _json_c_set_last_err("json_object_from_file: printbuf_new failed\n");
+ _json_c_set_last_err("json_object_from_fd_ex: printbuf_new failed\n");
return NULL;
}
@@ -102,7 +101,7 @@
if (!tok)
{
_json_c_set_last_err(
- "json_object_from_fd: unable to allocate json_tokener(depth=%d): %s\n", depth,
+ "json_object_from_fd_ex: unable to allocate json_tokener(depth=%d): %s\n", depth,
strerror(errno));
printbuf_free(pb);
return NULL;
@@ -114,7 +113,7 @@
}
if (ret < 0)
{
- _json_c_set_last_err("json_object_from_fd: error reading fd %d: %s\n", fd,
+ _json_c_set_last_err("json_object_from_fd_ex: error reading fd %d: %s\n", fd,
strerror(errno));
json_tokener_free(tok);
printbuf_free(pb);
@@ -138,8 +137,8 @@
if ((fd = open(filename, O_RDONLY)) < 0)
{
- _json_c_set_last_err("json_object_from_file: error opening file %s: %s\n", filename,
- strerror(errno));
+ _json_c_set_last_err("json_object_from_file: error opening file %s: %s\n",
+ filename, strerror(errno));
return NULL;
}
obj = json_object_from_fd(fd);
@@ -156,14 +155,14 @@
if (!obj)
{
- _json_c_set_last_err("json_object_to_file: object is null\n");
+ _json_c_set_last_err("json_object_to_file_ext: object is null\n");
return -1;
}
if ((fd = open(filename, O_WRONLY | O_TRUNC | O_CREAT, 0644)) < 0)
{
- _json_c_set_last_err("json_object_to_file: error opening file %s: %s\n", filename,
- strerror(errno));
+ _json_c_set_last_err("json_object_to_file_ext: error opening file %s: %s\n",
+ filename, strerror(errno));
return -1;
}
ret = _json_object_to_fd(fd, obj, flags, filename);
@@ -203,7 +202,7 @@
{
if ((ret = write(fd, json_str + wpos, wsize - wpos)) < 0)
{
- _json_c_set_last_err("json_object_to_file: error writing file %s: %s\n",
+ _json_c_set_last_err("json_object_to_fd: error writing file %s: %s\n",
filename, strerror(errno));
return -1;
}
@@ -289,8 +288,8 @@
int o_type_int = (int)o_type;
if (o_type_int < 0 || o_type_int >= (int)NELEM(json_type_name))
{
- _json_c_set_last_err("json_type_to_name: type %d is out of range [0,%d]\n", o_type,
- NELEM(json_type_name));
+ _json_c_set_last_err("json_type_to_name: type %d is out of range [0,%u]\n", o_type,
+ (unsigned)NELEM(json_type_name));
return NULL;
}
return json_type_name[o_type];
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/linkhash.c thunderbird-102.8.0/comm/third_party/json-c/linkhash.c
--- thunderbird-102.6.0/comm/third_party/json-c/linkhash.c 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/linkhash.c 2023-02-14 22:00:33.000000000 +0000
@@ -65,9 +65,9 @@
/*
* hashlittle from lookup3.c, by Bob Jenkins, May 2006, Public Domain.
- * http://burtleburtle.net/bob/c/lookup3.c
+ * https://burtleburtle.net/bob/c/lookup3.c
* minor modifications to make functions static so no symbols are exported
- * minor mofifications to compile with -Werror
+ * minor modifications to compile with -Werror
*/
/*
@@ -81,7 +81,7 @@
the public domain. It has no warranty.
You probably want to use hashlittle(). hashlittle() and hashbig()
-hash byte arrays. hashlittle() is is faster than hashbig() on
+hash byte arrays. hashlittle() is faster than hashbig() on
little-endian machines. Intel and AMD are little-endian machines.
On second thought, you probably want hashlittle2(), which is identical to
hashlittle() except it returns two 32-bit hashes for the price of one.
@@ -156,7 +156,7 @@
14 9 3 7 17 3
Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
for "differ" defined as + with a one-bit base and a two-bit delta. I
-used http://burtleburtle.net/bob/hash/avalanche.html to choose
+used https://burtleburtle.net/bob/hash/avalanche.html to choose
the operations, constants, and arrangements of the variables.
This does not achieve avalanche. There are input bits of (a,b,c)
@@ -285,9 +285,9 @@
* rest of the string. Every machine with memory protection I've seen
* does it on word boundaries, so is OK with this. But VALGRIND will
* still catch it and complain. The masking trick does make the hash
- * noticably faster for short strings (like English words).
+ * noticeably faster for short strings (like English words).
* AddressSanitizer is similarly picky about overrunning
- * the buffer. (http://clang.llvm.org/docs/AddressSanitizer.html
+ * the buffer. (https://clang.llvm.org/docs/AddressSanitizer.html)
*/
#ifdef VALGRIND
#define PRECISE_MEMORY_ACCESS 1
@@ -439,8 +439,8 @@
}
/* clang-format on */
-/* a simple hash function similiar to what perl does for strings.
- * for good results, the string should not be excessivly large.
+/* a simple hash function similar to what perl does for strings.
+ * for good results, the string should not be excessively large.
*/
static unsigned long lh_perllike_str_hash(const void *k)
{
@@ -465,7 +465,7 @@
if (random_seed == -1)
{
RANDOM_SEED_TYPE seed;
- /* we can't use -1 as it is the unitialized sentinel */
+ /* we can't use -1 as it is the uninitialized sentinel */
while ((seed = json_c_get_random_seed()) == -1) {}
#if SIZEOF_INT == 8 && defined __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8
#define USE_SYNC_COMPARE_AND_SWAP 1
@@ -481,12 +481,12 @@
#elif defined _MSC_VER || defined __MINGW32__
InterlockedCompareExchange(&random_seed, seed, -1);
#else
- //#warning "racy random seed initializtion if used by multiple threads"
+ //#warning "racy random seed initialization if used by multiple threads"
random_seed = seed; /* potentially racy */
#endif
}
- return hashlittle((const char *)k, strlen((const char *)k), random_seed);
+ return hashlittle((const char *)k, strlen((const char *)k), (uint32_t)random_seed);
}
int lh_char_equal(const void *k1, const void *k2)
@@ -546,7 +546,7 @@
unsigned long h = lh_get_hash(new_t, ent->k);
unsigned int opts = 0;
if (ent->k_is_constant)
- opts = JSON_C_OBJECT_KEY_IS_CONSTANT;
+ opts = JSON_C_OBJECT_ADD_CONSTANT_KEY;
if (lh_table_insert_w_hash(new_t, ent->k, ent->v, h, opts) != 0)
{
lh_table_free(new_t);
@@ -599,7 +599,7 @@
}
t->table[n].k = k;
- t->table[n].k_is_constant = (opts & JSON_C_OBJECT_KEY_IS_CONSTANT);
+ t->table[n].k_is_constant = (opts & JSON_C_OBJECT_ADD_CONSTANT_KEY);
t->table[n].v = v;
t->count++;
diff -Nru thunderbird-102.6.0/comm/third_party/json-c/linkhash.h thunderbird-102.8.0/comm/third_party/json-c/linkhash.h
--- thunderbird-102.6.0/comm/third_party/json-c/linkhash.h 2022-12-12 21:37:51.000000000 +0000
+++ thunderbird-102.8.0/comm/third_party/json-c/linkhash.h 2023-02-14 22:00:33.000000000 +0000
@@ -16,8 +16,8 @@
* this is exposed by the json_object_get_object() function and within the
* json_object_iter type, it is not recommended for direct use.
*/
-#ifndef _linkhash_h_
-#define _linkhash_h_
+#ifndef _json_c_linkhash_h_
+#define _json_c_linkhash_h_
#include "json_object.h"
@@ -80,64 +80,84 @@
typedef int(lh_equal_fn)(const void *k1, const void *k2);
/**
- * An entry in the hash table
+ * An entry in the hash table. Outside of linkhash.c, treat this as opaque.
*/
struct lh_entry
{
/**
- * The key. Use lh_entry_k() instead of accessing this directly.
+ * The key.
+ * @deprecated Use lh_entry_k() instead of accessing this directly.
*/
const void *k;
/**
* A flag for users of linkhash to know whether or not they
* need to free k.
+ * @deprecated use lh_entry_k_is_constant() instead.
*/
int k_
Documentation
-Doxygen generated documentation exists here.
+Doxygen generated documentation exists here.
GIT Reposository
git clone https://github.com/json-c/json-c.git
Mailing List
+Mailing List
json-c <at> googlegroups <dot> com