From nobody Sun Jun 16 16:37:50 2024 X-Original-To: dev-commits-ports-all@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 4W2JbM0NjWz5P5Ww; Sun, 16 Jun 2024 16:37:51 +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 4W2JbL6ytQz4S4K; Sun, 16 Jun 2024 16:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718555871; 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=newr4DKpxaOrN17qnec4PwKEKHDJHdW/UU0OpmIxiTU=; b=j4yJRLabdpreasTAcCkHj/mkVoKhWtzLLHxgOuJfl7R4L/h2XUHeRj/Iyn0+G1SMrsSwxb 20qichEa1baNi1+Wh1698s0bEjCiNU2skbIKOx+2djIElkI1jEXfbXfQkOElu6V5DGIfPU qqAcCiZ2KAxMkfzQ7KFgzdfjy8BEZQIwYeHUMonWhyLkm0ZejL1bqYWKBgbVAWFRY1ij58 5R3XIgKuwS+mxTaRR1A+GTm3DhWvbJKE4as8lA/I9JxQV7tCTKAcBe12iS1jWj4Xgu5vGR IFnGp/sOPCGMcxRnbQHKuJmQ8cr0VEQA8UyRMu3fs2dEpgZN/1ADC3FcqVrmVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718555871; a=rsa-sha256; cv=none; b=mRj4UdDQrjbFYP22LkJZeJzNhOn2rCxrj4nUUxurNK79aiQtNOuI+vWPtuHIeJGKgBo6G/ A8OhaWjYVX0uZGIht2gVA5BJMRpyfpdj7/fxfPtQum/NS64q/mx6GJ0D8wXvQzV/ahYDgL aFFkzw151mfgh01zRmy6m9I7emDuD6fKNGh/Wm0+yeX9EswsOImxWM3lcGj0lvs9yXd5NP oMN4IEv4xY3Y+PnraMBo/BYIBH1cD7mBkX/stfZE4nQQmdS3hQaMGjokdI5xKpzRzTPxuk Rux+ArRx8hoPDOJ/dsiNEY9/28kpB54D+TxA7gFNWzgnyyeqmmB0oHVSLZBaDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718555871; 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=newr4DKpxaOrN17qnec4PwKEKHDJHdW/UU0OpmIxiTU=; b=TpMGM4n6pexTpVxzjzXzlJ/Qh/ZxBthE2nMI0CUG1B0yqndjw1aoUdRamp1q7opALv93Bg 8qDzkS7SBYd/ll/vtVAIFpJD60gBbxb2LAbOz0ZqnGiE49zr+puYg8aj7PhFkUzaZSeUwR qV1+0gfaoSofq88xc0g152E59CN+vuNv6ntKye2c4VB1Bfd7a0qmBXzpJe1+UYslB/GfOJ 41Wqvuewee3GhP5S/ClHEmH59BgyWnDwiFWr7uDWgi6dDJ/NgMlixuvlvp7Hx18ZeCTYGY exyErDp34lZvyDorLThzORAeZm00nP/GavYm9Qb/tJK+Mps3i42lo4kq/HD8DA== 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 4W2JbL6KB8zw2l; Sun, 16 Jun 2024 16:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45GGboML071983; Sun, 16 Jun 2024 16:37:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GGboW7071980; Sun, 16 Jun 2024 16:37:50 GMT (envelope-from git) Date: Sun, 16 Jun 2024 16:37:50 GMT Message-Id: <202406161637.45GGboW7071980@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 31800eab6e49 - main - security/openconnect: Fix build with libxml 2.12.0 and newer List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31800eab6e497d58e4c3bc8e6f3a286412022bc2 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=31800eab6e497d58e4c3bc8e6f3a286412022bc2 commit 31800eab6e497d58e4c3bc8e6f3a286412022bc2 Author: Daniel Engberg AuthorDate: 2024-06-16 15:55:23 +0000 Commit: Daniel Engberg CommitDate: 2024-06-16 16:35:51 +0000 security/openconnect: Fix build with libxml 2.12.0 and newer Backport upstream commit 6c83dfd2e1cfb9539cd527424910298a52c6d11f Reference: https://gitlab.com/openconnect/openconnect/-/commit/6c83dfd2e1cfb9539cd527424910298a52c6d11f PR: 279761 Reviewed by: zi (maintainer) --- .../openconnect/files/patch-openconnect-internal.h | 24 ++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/security/openconnect/files/patch-openconnect-internal.h b/security/openconnect/files/patch-openconnect-internal.h index ca02258192c0..f1eb860cbf6c 100644 --- a/security/openconnect/files/patch-openconnect-internal.h +++ b/security/openconnect/files/patch-openconnect-internal.h @@ -1,14 +1,22 @@ ---- openconnect-internal.h.orig 2022-08-27 20:09:15 UTC +--- openconnect-internal.h.orig 2023-05-19 16:12:15 UTC +++ openconnect-internal.h -@@ -135,6 +135,11 @@ - #include - #endif +@@ -85,6 +85,7 @@ + #define N_(s) s + + #include ++#include + #include + #ifdef _WIN32 +@@ -133,6 +134,11 @@ extern char **environ; + extern char **environ; + #endif + #include ++#endif ++ + +#ifdef __FreeBSD__ +extern char **environ; -+#endif -+ + #endif + /* Equivalent of "/dev/null" on Windows. - * See https://stackoverflow.com/a/44163934 - */