From nobody Sun Dec 12 22:21:00 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2E0DE18DE1F7; Sun, 12 Dec 2021 22:21:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JBzcX6ltqz4vHv; Sun, 12 Dec 2021 22:21:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BE741DF8; Sun, 12 Dec 2021 22:21:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BCML0R1098042; Sun, 12 Dec 2021 22:21:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BCML0NN098041; Sun, 12 Dec 2021 22:21:00 GMT (envelope-from git) Date: Sun, 12 Dec 2021 22:21:00 GMT Message-Id: <202112122221.1BCML0NN098041@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 96f4c70e705d - 2021Q4 - mail/thunderbird: use libc for res_* functions List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 96f4c70e705daa1fcb81b1dfc7bff9e70cd19088 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639347661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/MYfP8tVwTwjGa7C3aoLPspNuXoHpe1NrsQu5GMMF/0=; b=lVveqRW2fhT2m3mQOdbQhmrYP2Akq20N0mBzRrM7T+z+i1+8CRxMh3EQvNYcrmQZzv4lOf 0ptTLCpdi1JXcbN/yXjdJNclcxgQTz1cNN2l0BWnrRxY6164uA/lWlVxjRM9V9dX/IVBWr RE51tA+wDcrn/XRQXtR+FB9XWgWHXXXd57Jh4/bngi5bzh2qDrgsfv3GGoVvLLnQzinsTF rbMlI71wtgxbmIgX84rp+QsVcI3Ddb2UQ4wE4EolSaFgUHr5GyiK6vIJ4DoG0d8Y/EBoG1 OHe9U9gFVnbqQ+mM529bvtb3MmubUurxrrcPdyR3wr18ZIEpgyNLyKJDTD25FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639347661; a=rsa-sha256; cv=none; b=NtpjWVWHE7jtgsjlkBNRC7z0KuEyyc3dBrreoRAzdKuH94546vWdHPDXelTM8J82StiazN Af+Z+UyACjF9BlnjkopczR8Bs3l6vreliDoynqBc1gKyYOBsCJugQu9nvsXj21arnPZuaJ oO2KFut/fTTzIqZx+w4JYJCxPNpbg8ifbMWH8Kw5G3Q05yZsY6KqxWeQiU9U4REBqjiX57 I/oWurcbo+vJZciUKw8Nz+93EgLOjQFLOvJgWMz4rBi9kTq0tEPqMqYHFOP8nMEttNy6jt +EMx29Lro9b2Tcsms31m2249uSyjnXyd7F9e5VjqcYq7BuSmvkpnhkcxbOJeCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=96f4c70e705daa1fcb81b1dfc7bff9e70cd19088 commit 96f4c70e705daa1fcb81b1dfc7bff9e70cd19088 Author: Christoph Moench-Tegeder AuthorDate: 2021-12-12 22:04:13 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-12-12 22:20:46 +0000 mail/thunderbird: use libc for res_* functions thunderbird's javascript code needs more than basic DNS resolution (e.g. SRV, TXT, MX lookups) - more than javascript natively has (welcome to the web) and builds it's own bindings for libc to use the resolver(3) interface. Unlike linux, where the resolver routines live in libresolv, FreeBSD has these routines in libc. I'm referencing libc.so.7 directly, as this is enough to make this code work on 13/amd64 (others should work too) - the official way of using libc.so would be much more work (and reimplementing parts of the dynamic linker in javascript takes the cake, or something). This is enough to make adding and using new CalDAV calendars possible; other problems might linger and possibly require a better solution. (cherry picked from commit 9a2174d4e02e859881d336167e1509840e5f2d82) --- mail/thunderbird/Makefile | 2 +- .../files/patch-comm_mail_modules_DNS.jsm | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index bf13dec6b0b0..85594400250f 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -2,7 +2,7 @@ PORTNAME= thunderbird DISTVERSION= 91.4.0 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source diff --git a/mail/thunderbird/files/patch-comm_mail_modules_DNS.jsm b/mail/thunderbird/files/patch-comm_mail_modules_DNS.jsm new file mode 100644 index 000000000000..e54a883a82f9 --- /dev/null +++ b/mail/thunderbird/files/patch-comm_mail_modules_DNS.jsm @@ -0,0 +1,25 @@ +--- comm/mail/modules/DNS.jsm.orig 2021-12-12 21:21:31.875731000 +0100 ++++ comm/mail/modules/DNS.jsm 2021-12-12 22:31:04.895700000 +0100 +@@ -38,11 +38,17 @@ + _open() { + function findLibrary() { + let lastException = null; +- let candidates = [ +- { name: "resolv.9", suffix: "" }, +- { name: "resolv", suffix: ".2" }, +- { name: "resolv", suffix: "" }, +- ]; ++ if(Services.appinfo.OS.toLowerCase() == "freebsd") { ++ let candidates = [ ++ { name: "c", suffix: ".7" }, ++ ] ++ } else { ++ let candidates = [ ++ { name: "resolv.9", suffix: "" }, ++ { name: "resolv", suffix: ".2" }, ++ { name: "resolv", suffix: "" }, ++ ]; ++ } + let tried = []; + for (let candidate of candidates) { + try {