From owner-dev-commits-ports-main@freebsd.org Mon May 17 14:01:45 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 90D46648ECA; Mon, 17 May 2021 14:01:45 +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 4FkLQx3mP2z3FPF; Mon, 17 May 2021 14:01:45 +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 69EAA5378; Mon, 17 May 2021 14:01:45 +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 14HE1j8O076274; Mon, 17 May 2021 14:01:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14HE1jYu076273; Mon, 17 May 2021 14:01:45 GMT (envelope-from git) Date: Mon, 17 May 2021 14:01:45 GMT Message-Id: <202105171401.14HE1jYu076273@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 0e94a54ee194 - main - devel/libsoup: Massage features and options MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e94a54ee19481e569344e95d5d28732ce3a86ef Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2021 14:01:45 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e94a54ee19481e569344e95d5d28732ce3a86ef commit 0e94a54ee19481e569344e95d5d28732ce3a86ef Author: Adriaan de Groot AuthorDate: 2021-05-17 13:25:45 +0000 Commit: Adriaan de Groot CommitDate: 2021-05-17 14:01:43 +0000 devel/libsoup: Massage features and options - From PR 235207 comes a patch from mi@ to use NTLM if it's there. Unfortunately, the switch to Meson has made this run-time-option a build-time-check, so the original patch isn't directly useful. Make samba a build-time dep, so that the code is enabled; there is a run-time check if the NTLM executable is available. - From PR 231160 comes a patch to configure different kinds of GSSAPI. That too doesn't apply with the current Meson build, but the general idea does. Build-tested in 8 configurations (but libsoup is nice that everything is #ifdeffed internally, so there's no plist or other visible changes) While here, add WWW line. PR: 235207 231160 Reported by: mi Reported by: Sergey Akhmatov --- devel/libsoup/Makefile | 20 ++++++++++++++++++-- devel/libsoup/pkg-descr | 2 ++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index c2d9b74bb2b3..b5b7e4092bd6 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -2,6 +2,7 @@ PORTNAME= libsoup PORTVERSION= 2.72.0 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -19,8 +20,23 @@ RUN_DEPENDS= glib-networking>=2.29.18:net/glib-networking PORTSCOUT= limitw:1,even +OPTIONS_SINGLE= GSSAPI +OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE +OPTIONS_DEFAULT= GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} + +GSSAPI_BASE_USES= gssapi +GSSAPI_MIT_MESON_ON= -Dgssapi=enabled -Dkrb5_config=${KRB5CONFIG} + +GSSAPI_MIT_USES= gssapi:heimdal +GSSAPI_MIT_MESON_ON= -Dgssapi=enabled -Dkrb5_config=${KRB5CONFIG} + +GSSAPI_MIT_USES= gssapi:mit +GSSAPI_MIT_MESON_ON= -Dgssapi=enabled -Dkrb5_config=${KRB5CONFIG} + +GSSAPI_NONE_MESON_DISABLED= gssapi + USES= gettext gnome localbase meson \ - pkgconfig python:3.6+,build sqlite ssl tar:xz + pkgconfig python:3.6+,build samba:build sqlite ssl tar:xz USE_GNOME= glib20 intlhack introspection:build \ libxml2 USE_LDCONFIG= yes @@ -29,7 +45,7 @@ MESON_ARGS= -Dvapi=disabled \ -Dtests=false \ -Dgnome=true \ -Dbrotli=disabled \ - -Dntlm=disabled + -Dntlm=enabled LIBVERSION= 1.11.0 PLIST_SUB= VERSION="2.4" LIBVERSION=${LIBVERSION} diff --git a/devel/libsoup/pkg-descr b/devel/libsoup/pkg-descr index c758849f920e..23d583fb4f75 100644 --- a/devel/libsoup/pkg-descr +++ b/devel/libsoup/pkg-descr @@ -14,3 +14,5 @@ Features: * SSL Support using OpenSSL * Apache module server support * Client digest authentication + +WWW: https://libsoup.org/