From nobody Sun Dec 12 22:19:05 2021 X-Original-To: dev-commits-ports-main@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 7AF1A18DDC8E; Sun, 12 Dec 2021 22:19:06 +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 4JBzZL1076z4txq; Sun, 12 Dec 2021 22:19:06 +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 E82C29DD; Sun, 12 Dec 2021 22:19:05 +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 1BCMJ5Hm087182; Sun, 12 Dec 2021 22:19:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BCMJ5sO087181; Sun, 12 Dec 2021 22:19:05 GMT (envelope-from git) Date: Sun, 12 Dec 2021 22:19:05 GMT Message-Id: <202112122219.1BCMJ5sO087181@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 9a2174d4e02e - main - mail/thunderbird: use libc for res_* functions List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 9a2174d4e02e859881d336167e1509840e5f2d82 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639347546; 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=QIWwvtgKYhWfYeyzgN2x0f2W4XB5mNGgR7b1lnfT/u8=; b=hZ4cFTp5b+cPCq3iLk4a8u8YM1lFnOQkt+EPDI329Zor5ij2V5ZpkB+yheTFwR/XxyxjBX N5T73JVdTBaNpMcARhx1O+5ndcMqzrd81H35yX9/qx6iJcKhZc74fMk3P6kYHx6pSBSuq5 D5gS6vi4xaGn2L/FQqeBFxm5OToF3D6cr7mt0t5y5f0wcPS6f4frqBYWjWsFvYOThi2hde A51wEV3nC0QL1MWAI8zqd7xFER6xCWTPpoaov3YdcMSVa0Q9JDA7wjQOGu1tmVGpdNhvmj yLHhaCtOo07iubTRhqRtCi0CZLvL2JipGXfpgMFoi/HHDO4bDpcB5rKgKrpx9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639347546; a=rsa-sha256; cv=none; b=G14/6elwbOSWuLOg1RvHb1wkatpde1KUTg32o+7Y+UOD7Tle/H4Fv4LEXZ5IJPZA+u76wa I9KEOmwjRyugKgs0Qg5DBNCKOwLV00bIeTUL8pGhSTDEfxDh9Dr/Te2kDuKRQIauimN+fv r8igDiCaenboIUPMFppVFpG9q09Twd8O72dtNvIlr4iA97N35te1Rc+QgrPATY8Kk4lDgE 3Y/q6viZbFsANM5DIU2L/ybV8crbJzc76Tr6mJioRBNibOm+kBg3MGjjawSiUyD090NoQ3 mbrKTRkzPfgGRnBqQlSi2fbvyF085KX3VdC5hw+ewKHkSFwoOZvRsPn/jFzMzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a2174d4e02e859881d336167e1509840e5f2d82 commit 9a2174d4e02e859881d336167e1509840e5f2d82 Author: Christoph Moench-Tegeder AuthorDate: 2021-12-12 22:04:13 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-12-12 22:04:13 +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. --- 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 b00ed84e7cea..85594400250f 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -2,7 +2,7 @@ PORTNAME= thunderbird DISTVERSION= 91.4.0 -PORTREVISION= 2 +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 {