From nobody Tue Jun 20 13:37:16 2023 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 4Qlnk520Zmz4gDPP; Tue, 20 Jun 2023 13:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qlnk46r78z3Q8S; Tue, 20 Jun 2023 13:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687268237; 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=z3TdOZSi26aO470v0MyhEhrYEyhnE26jLVtQVoWAdmE=; b=HpzTGBJ7EB3mEDM1Gtgrg/QdMXdnaBBTl1k91XF6K5sJIyWSuppsfUkU9J5OHrLKGzRJiz w0xYn0tH9JD/KTkoQ4CLAVzAqfZb7naXQtdA7qASRTDGrOEqpE/OWyST5dd1FfZcX0krbm DqOUJdoywLpmIImREspl7n+F9IgmFcvqN44x7ceXyasq+GoYw5ymQnSoqxCBGcW82nk5MU el5hIkUhjAbG+hC6lvH4rghYxcQWF/LmXrXQcFyKHLaTiCO1WbCKK0DiSYTYxY7HFoNJWp AvZePG+s3ajD3+y20nDPMnuCb0LlSzZzvAKTEFgDYG9nnK2fSBdXrk4PtDrgrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687268237; 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=z3TdOZSi26aO470v0MyhEhrYEyhnE26jLVtQVoWAdmE=; b=e0LxOqLzxUcPqstBpWuFOd1InL+pSFmlIeb+33oxfrm4X4VEjZjlHF/HC0rSPKzVOJ06J5 tXhwIZ5scyXZyyRyewO98xR5E33fUgugnzQDoRRxWZjDmBiByN18HKLNwaYpu6knjy6Gpf Oi2FMXw9P6r6SS5jtkz8zxerVdr4J4Fp0HlfIWSco8cchw56Yp6q0ZqTSzxW2HzyVftbgh IrfP5Dp55nm1AIwjr9hlst1uNhgzwaXrFSqJdx6PJoerw+e1G8AAUda/VBnPoYJbnZEsQT 0OaX53eVQwpsZxzn8PbCD8BT/3QUt2XfrUkisBMauUIPQET9ja5hXWb1ee5OkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687268237; a=rsa-sha256; cv=none; b=TLacq5WSc5bT6b+i5kn0l7VeQWEc+YO6O18BWvvjEA96M27IMfuJMxwbtM32RiLPpx3hk9 f+Yc3UHvSvQZIZE5RaUzGxh0sP/qtX5+I0LfulzV71ps/3zWEDDirOGCsYfVpBlTojioTt wF7khTxfb6sZ0UzLxPiFn2KRIKbRutINjGksUEeroruhBIgtB2GMk/HwXffNGsR3B1zftk N0q5NzoEZrMOa/dQf6FERQxi/4lgE40kVkHNlpw+iIUgzcvR67O0tQo49UFav4EvzXWqb2 nybT14j9AjmJMFm6hoEnAJKdhXi3hl8RDSzbTayz9jW6cNufc6yfVZo3L6kopA== 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 4Qlnk45dCpz10nG; Tue, 20 Jun 2023 13:37:16 +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 35KDbGQs063903; Tue, 20 Jun 2023 13:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KDbGKO063901; Tue, 20 Jun 2023 13:37:16 GMT (envelope-from git) Date: Tue, 20 Jun 2023 13:37:16 GMT Message-Id: <202306201337.35KDbGKO063901@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: cb186b7240bf - main - net/glib-networking: make GnuTLS and libproxy support optional 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb186b7240bf1781ee7fb72052c8fc5c95d85a99 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=cb186b7240bf1781ee7fb72052c8fc5c95d85a99 commit cb186b7240bf1781ee7fb72052c8fc5c95d85a99 Author: Alexey Dokuchaev AuthorDate: 2023-06-20 13:35:24 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-06-20 13:35:24 +0000 net/glib-networking: make GnuTLS and libproxy support optional - The OpenSSL backend is provided for systems where licensing considerations prohibit use of certain GnuTLS' dependencies - The environment variable proxy backend is intended for use when building without libproxy support - Drop long unused dependency on `security/p11-kit' which was there for `gnutls-pkcs11' backend added in version 2.31.2, disabled (deprecated) in version 2.57.2, and finally removed in 2.59.1 (November 11, 2018) due to lack of any feedback whatsoever regarding its disablement --- net/glib-networking/Makefile | 17 ++++++++++++++--- net/glib-networking/pkg-plist | 10 ++++++---- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile index 4ca1e5e629b0..6134796e7c2d 100644 --- a/net/glib-networking/Makefile +++ b/net/glib-networking/Makefile @@ -11,9 +11,6 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas -LIB_DEPENDS= libgnutls.so:security/gnutls \ - libp11-kit.so:security/p11-kit \ - libproxy.so:net/libproxy RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas PORTSCOUT= limitw:1,even @@ -24,8 +21,22 @@ USE_GNOME= glib20 BINARY_ALIAS= python3=${PYTHON_VERSION} +OPTIONS_DEFINE= GNUTLS PROXY +PROXY_DESC= Proxy configuration support via libproxy +OPTIONS_SUB= yes +OPTIONS_DEFAULT= GNUTLS PROXY + +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +GNUTLS_USES_OFF= ssl +GNUTLS_CONFIGURE_OFF= -Dgnutls=disabled -Dopenssl=enabled + +PROXY_LIB_DEPENDS= libproxy.so:net/libproxy +PROXY_CONFIGURE_OFF= -Dlibproxy=disabled -Denvironment_proxy=enabled + post-install: ${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd ${RM} -r ${STAGEDIR}${PREFIX}/share/installed-tests .include + +GNUTLS_DESC+= (OpenSSL if off) diff --git a/net/glib-networking/pkg-plist b/net/glib-networking/pkg-plist index e723505062a2..59b62cb43cd5 100644 --- a/net/glib-networking/pkg-plist +++ b/net/glib-networking/pkg-plist @@ -1,8 +1,10 @@ +%%NO_PROXY%%lib/gio/modules/libgioenvironmentproxy.so lib/gio/modules/libgiognomeproxy.so -lib/gio/modules/libgiognutls.so -lib/gio/modules/libgiolibproxy.so -libexec/glib-pacrunner -share/dbus-1/services/org.gtk.GLib.PACRunner.service +%%GNUTLS%%lib/gio/modules/libgiognutls.so +%%PROXY%%lib/gio/modules/libgiolibproxy.so +%%NO_GNUTLS%%lib/gio/modules/libgioopenssl.so +%%PROXY%%libexec/glib-pacrunner +%%PROXY%%share/dbus-1/services/org.gtk.GLib.PACRunner.service share/locale/ab/LC_MESSAGES/glib-networking.mo share/locale/an/LC_MESSAGES/glib-networking.mo share/locale/ar/LC_MESSAGES/glib-networking.mo