From nobody Sun Dec 22 14:50:17 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 4YGPG14ZpPz5YqB7; Sun, 22 Dec 2024 14:50:17 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YGPG1420Gz4VJL; Sun, 22 Dec 2024 14:50:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734879017; 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=lSE8X8gb4WmFxL27IWxiKhdccdPnZDQoVCjwnFlOFA4=; b=FwxVwiANIDUqj9JuGJIS6zGf+ISnD6o4w46KU3D6xg6AuDzV+GUXn4sCwGSfGMgK8Fid+u ALc5hTlxn0aS9h14OFdQtWnAyk1/ZRx6SoGFimHAWo9/iwEnl1uaO8WP0sR8m5ILdcGY1M 8cz2tkmhB4EG0Gt6VnN6mNe+hZ+bPDwOt8YNjg3XBcZezyv0baBjkoaPc5X4+NvCfOJhAp CEtwvYu5Gz+I5jNEq53v3eAglQ9ESX8fp3idFBMATYnAJhe65j8qaUA1xiotCV65NCKyP5 qEi9ls4xU2g6UBdbbO7CJ0JHOOYY7Twz7oJi6YjG6qCLlf6sV6hKcZJeePXVdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734879017; 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=lSE8X8gb4WmFxL27IWxiKhdccdPnZDQoVCjwnFlOFA4=; b=oYd7FHXiqZkTQj9NL9IM0Gyvgj5l14OL3nFNXJQYUcUSt9dHitUA6/xJmrAZ6mfB6v6mzH xs/b+d8rE/1USLZ/JyiBqz+ZRqKnehcG8HU48PVATcWUjDVqHp8K/abr09cU9nvdyiQ1EN dCJqFcvnAEy+5mNjfCGE6aSeH/jbsabXv3AvsDp4/mD1CDiUQLE+jLZPOWEe0vBDtHju8J zPSUZWcK2gbZxrsYcTGKPry7pvCkb2E5a5J+S9NcnTqTaV6ENIDUS3QN9PUbZMn+dBzvHb f0NJk4JAfPRO14Nql0848v6/EtX/FazzsExC89bHFICqSCiVu+n/SzC1LkYrLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734879017; a=rsa-sha256; cv=none; b=T0z5i+Lb4N4wzDoC9xnlbJtl+as75737TYp9coy5Z7lhaNpg1EHD0YsNYItVeO/XCYWnz/ 2fG3i/QiHVmGSphwGvjyEfkexeXUqWNfrija3pjr/EcjlkaJ9T1Cxb4fxWEvEH1j3udM/K 7PFyG96fAv0fGKBjDd2RM2McDoR+SfK2/jJLb9x2Kq4TeZD3cTE3ofyEF30MkWkKy/QvCz 0jAASpvrL7dAWWAwAjQd2OFkYJ5k0LAvty7+CNRyyoTaMQxpvWtfowvZ4ZYI3zkCwLx4bJ fP+ApDR52ogIPs/QCRsjqWPbwTjXFPkdSt3O8P6tPkVmdI9RA4scEk5cJLpfIg== 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 4YGPG13Yg7z1BLX; Sun, 22 Dec 2024 14:50:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BMEoHLJ018673; Sun, 22 Dec 2024 14:50:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BMEoHvC018665; Sun, 22 Dec 2024 14:50:17 GMT (envelope-from git) Date: Sun, 22 Dec 2024 14:50:17 GMT Message-Id: <202412221450.4BMEoHvC018665@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: b0c90d091353 - main - ftp/curl: Re-apply modified 2a3bac310439f8de03b945ae6b596ddf6384d411 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0c90d09135397928451238b95bb532060ff5d9c Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=b0c90d09135397928451238b95bb532060ff5d9c commit b0c90d09135397928451238b95bb532060ff5d9c Author: Po-Chuan Hsieh AuthorDate: 2024-12-22 14:49:32 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-12-22 14:49:39 +0000 ftp/curl: Re-apply modified 2a3bac310439f8de03b945ae6b596ddf6384d411 - Fix libcurl.pc with GSSAPI_BASE enabled - Bump PORTREVISION for package change Do not add heimdal-gssapi to libcurl.pc because we do no provide .pc file base GSSAPI library. --- ftp/curl/Makefile | 2 ++ ftp/curl/files/extra-patch-gssapi | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index f42934c00a88..a50a8fc289ad 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -1,5 +1,6 @@ PORTNAME= curl PORTVERSION= 8.11.1 +PORTREVISION= 1 CATEGORIES= ftp net www MASTER_SITES= https://curl.se/download/ \ https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/ @@ -100,6 +101,7 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \ GOPHER_CONFIGURE_ENABLE=gopher GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_BASE_CPPFLAGS= ${GSSAPICPPFLAGS} +GSSAPI_BASE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gssapi GSSAPI_BASE_LDFLAGS= ${GSSAPILDFLAGS} GSSAPI_BASE_LIBS= ${GSSAPILIBS} GSSAPI_BASE_USES= gssapi diff --git a/ftp/curl/files/extra-patch-gssapi b/ftp/curl/files/extra-patch-gssapi new file mode 100644 index 000000000000..d2b90d46c80f --- /dev/null +++ b/ftp/curl/files/extra-patch-gssapi @@ -0,0 +1,11 @@ +--- configure.orig 2024-12-11 07:08:12 UTC ++++ configure +@@ -26210,7 +26210,7 @@ printf "%s\n" "found" >&6; } + if test -n "$gnu_gss"; then + LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE gss" + elif test "x$not_mit" = "x1"; then +- LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE heimdal-gssapi" ++ LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE" + else + LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE mit-krb5-gssapi" + fi