From nobody Mon Dec 5 20:09:13 2022 X-Original-To: dev-commits-ports-branches@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 4NQvlG0qKWz4jNr9; Mon, 5 Dec 2022 20:09:14 +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 4NQvlF6ljnz3jjg; Mon, 5 Dec 2022 20:09:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670270954; 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=98CwC10hlk45iFrVVk9f9MfDlY07kdSOrU0Aj76VXYw=; b=jIdZrHn2a9ER6HzGdMa2x2f6cKujYzc4aXHTCt95O93A3uwvXhbGAO9A9y1AOE5BIddkjS YSziocEGyJJmnm4QMRWfZ64k4vSL0XX41tUi3kJ0SQ7+SguGNazH0or3jWex34xvVGzYWn eCyfOd7lL1kN5d7170dl8uXW52pZHrQAk/PkKAs8MsOS/a7VVFjx9oUm48m+QOlNwBDXU1 1mWcXpTDKkJs/0CX47HKpMqxDgaLxIyWj9L3Gc9ApWCthCnopeMtuF2l2AfWiTOMj1pbq+ YxQ7mDr3D/XchVpju258lErSG+OfptbhUvLqrs6OUOPNh3TKzdGZgmEYC/n0rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670270954; 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=98CwC10hlk45iFrVVk9f9MfDlY07kdSOrU0Aj76VXYw=; b=Yki3cuVxHhQMCIw/GD66p6WtAhUWDQdpG6BXUGyM9z9KozkTHFclhIjXbD+4RecTAZ+nE5 HRvJqnympEgaogi/Du9eO/MJyrgv+3+pvjNbMWcyAl6z7HYG5nQO8Fntq6N4as//akJXdf kcB7qxtNNTi5ZQaIiqav9KFf5rLWd8wkIuc3o1Yu0Xpmw0KPIgsQQFUfLdmlYZD6qU1mYH 2gB6Ok17uc5xcqcAtsbG5E01S1nJ+xhjGyntcO8WYOdk49SyHU2g4zuEE8fS0a6yYkIRjE 1/F+iySuvVnQKYS2hH00QZrKetmrJNTm12GOYxdKwp9xSRuG8Haac3ehbrj28g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670270954; a=rsa-sha256; cv=none; b=TyND/i/8WHXErBCi/Vk88ePxA75lJtXHS2vD4V6aPput6cLATFUJX+92DNFE3jqK4ntp3d FDbXNgmOXYfrAg3P5/nHgSqaFnfgFIC348BoP26J6MrbH/ZRDjiSzw8MutCbp6L1RB1hJf tkwwRKHAgxhnKTQrWAmad8UvYduWhvzqFjtz9n/QMcsTpdtIbvu3jim2nR46iNJMzZ8Pe7 6QghCnCJjEqLhemKNVy5Y37gPuW0PMvatOhqdf/XTMTbBRS6OWSMrAZmrX9S4eTNPRa53T k8+AgdeOJRgk+lIehfcLTdOo3glFfQxMVdoTUI7BaGGEGVsX9n8a05/xqHvn3w== 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 4NQvlF5bLxz18xg; Mon, 5 Dec 2022 20:09:13 +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 2B5K9D4t042376; Mon, 5 Dec 2022 20:09:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B5K9Dse042375; Mon, 5 Dec 2022 20:09:13 GMT (envelope-from git) Date: Mon, 5 Dec 2022 20:09:13 GMT Message-Id: <202212052009.2B5K9Dse042375@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: f52859499433 - 2022Q4 - security/heimdal-devel: Fix configure and package List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: f52859499433e6feacbbad680f94f920d2391e2d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f52859499433e6feacbbad680f94f920d2391e2d commit f52859499433e6feacbbad680f94f920d2391e2d Author: Cy Schubert AuthorDate: 2022-11-18 14:59:27 +0000 Commit: Cy Schubert CommitDate: 2022-12-05 20:06:13 +0000 security/heimdal-devel: Fix configure and package Remove libmicrohttpd support. If installed it will automatically detect and build the necessary binaries to support a microhttpd KDC server. It is felt that a KDC with httpd support is another vector of concern. Fixes: 4e44a84dcc9a (cherry picked from commit e87043c6c23184ab537a67e013a6a1f6d4501c3e) --- security/heimdal-devel/Makefile | 10 ++++++---- security/heimdal-devel/pkg-plist | 20 +++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/security/heimdal-devel/Makefile b/security/heimdal-devel/Makefile index 36d52e8abc0d..6c48b9e9ed7a 100644 --- a/security/heimdal-devel/Makefile +++ b/security/heimdal-devel/Makefile @@ -18,14 +18,15 @@ GH_TAGNAME= ${HASH} CONFLICTS= krb5 krb5-* -USES= cpe gettext-runtime gssapi:bootstrap,heimdal libtool pathfix \ - pkgconfig python:build readline makeinfo ssl +USES= autoreconf:build cpe gettext-runtime gssapi:bootstrap,heimdal \ + libtool pathfix pkgconfig python:build readline makeinfo ssl CPE_VENDOR= ${PORTNAME}_project USE_LDCONFIG= ${GSSAPILIBDIR} # Needs clang-format which is only provided by the port. # Else asm1_fails resulting in a command not found error. -BUILD_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} +BUILD_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \ + p5-JSON>0:converters/p5-JSON LIB_DEPENDS= liblockfile.so:devel/liblockfile @@ -53,7 +54,8 @@ CONFIGURE_ARGS= --with-berkeley-db \ --with-hdbdir="/var/${PORTNAME}" \ --sysconfdir="${PREFIX}/etc" \ CLANG_FORMAT="${LOCALBASE}/bin/clang-format${LLVM_DEFAULT}" \ - --enable-kx509 + --enable-kx509 \ + --without-microhttpd # XXX --with-readline picks up libreadline even if found in /usr/lib. MAKE_ENV= INSTALL_CATPAGES=no INSTALL_TARGET= install-strip diff --git a/security/heimdal-devel/pkg-plist b/security/heimdal-devel/pkg-plist index 5bc09ca6142a..82b50d26f038 100644 --- a/security/heimdal-devel/pkg-plist +++ b/security/heimdal-devel/pkg-plist @@ -253,15 +253,6 @@ lib/heimdal/negotiate_token_validator.a lib/heimdal/negotiate_token_validator.so lib/heimdal/negotiate_token_validator.so.0 lib/heimdal/negotiate_token_validator.so.0.0.0 -lib/heimdal/pkgconfig/heimdal-gssapi.pc -lib/heimdal/pkgconfig/heimdal-kadm-client.pc -lib/heimdal/pkgconfig/heimdal-kadm-server.pc -lib/heimdal/pkgconfig/heimdal-krb5.pc -lib/heimdal/pkgconfig/kadm-client.pc -lib/heimdal/pkgconfig/kadm-server.pc -lib/heimdal/pkgconfig/kafs.pc -lib/heimdal/pkgconfig/krb5-gssapi.pc -lib/heimdal/pkgconfig/krb5.pc lib/heimdal/simple_csr_authorizer.a lib/heimdal/simple_csr_authorizer.so lib/heimdal/simple_csr_authorizer.so.0 @@ -270,12 +261,19 @@ lib/heimdal/test_negoex_mech.a lib/heimdal/test_negoex_mech.so lib/heimdal/test_negoex_mech.so.0 lib/heimdal/test_negoex_mech.so.0.0.0 -libexec/bx509d +libdata/pkgconfig/heimdal-gssapi.pc +libdata/pkgconfig/heimdal-kadm-client.pc +libdata/pkgconfig/heimdal-kadm-server.pc +libdata/pkgconfig/heimdal-krb5.pc +libdata/pkgconfig/kadm-client.pc +libdata/pkgconfig/kadm-server.pc +libdata/pkgconfig/kafs.pc +libdata/pkgconfig/krb5-gssapi.pc +libdata/pkgconfig/krb5.pc libexec/digest-service libexec/heimdal/slc libexec/hprop libexec/hpropd -libexec/httpkadmind libexec/ipropd-master libexec/ipropd-slave libexec/kadmind