From nobody Fri Nov 18 18:27:46 2022 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 4NDQJ34Pk9z4d8RR; Fri, 18 Nov 2022 18:27:47 +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 4NDQJ32KmHz4KPr; Fri, 18 Nov 2022 18:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668796067; 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=N1Pw0s2u30IattOTi/iZp7bZ7+sTIZhTrXrSzLu9xp8=; b=J2ITo4OUDXD7uOP7oIRu1rJ6kzh/cRozelJrtinJxn3dYyZeL/melcVj96i5+6puBr6g0q AEkVuRlNo8yfNY4OJoJJidDnGmDt5HNdPiW6tjDqCK9wepw4OAOx7qKdHliQhe9Xt0giGX jcXkIFJFMYF7GPYzKWMDmMh/Txo+8lD1b9P0h7BMcarexnNDR8HMNPZjW7r06IEbluT/T+ NvpIEFTDyTacR2Jc5uUKiLZ41VzkorBfmdc2Dl0RT3xrdtzTDYSUjymYDGEi7+jYIAqFi8 zF2GUBmvSpaEAYZMA8swPT0WdtnbBAyXrAoHpGWRFuTQ24IiGSQ+OzotTVlfGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668796067; 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=N1Pw0s2u30IattOTi/iZp7bZ7+sTIZhTrXrSzLu9xp8=; b=F/jL77FJpBnhd25oXLkTMC/A74N8GXvJo0PNo+wQZTA7G2uGHXKBK4vluMx34bG/FZQHdT oR6oPjg6Rqfu8AeLLGDcAeBlSP1cRbb1OrFOeLE9vtZ2Gp03aRK4U8iQJl7K+6yk+W+Sm6 MY8KCr9aIXnxf/C8W5Ut0TxudHJPysE/qbUmOuHaQPJsGVhkWVLc4hZ73KXdmKBtXihzdU 8rhwcwzfUjxsMnCiWPXA3MwTB41SfjPcRQHejAQIHJPunVJhaRrKF96LewEhq5BJMQHiSj QPcr5clevRi4Us1VwqLEHH/YjyFabMvO3IJ2TieEHKPKPIvrS/dcfHf1kWsclA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668796067; a=rsa-sha256; cv=none; b=EJ/uxU9kXAPSJ6C0rSgGI0Jn0WmB9CJ3EgdAbwo27qAfYDWNAHrMOU1UGYUS/Jd4mBA170 U9HzayMQAif1l0JAuTUJ4ILsD9fhZIvAB0DGosqekvJA9EzJYJJk54xYV0FS+tmVpRptbP W90DBK96YZnzWO0UEBgIK+TyS4wyxWvPQjtlwuvX9+Y8QotfNH85rueVmic/PsYlJ754dO bXz/ykvrKdR3MOTlKeF4iREVnAzNb2Yt3PRhCrBkLHD32xOz1Gts3MJKzKeNy/Z6flVlox MiJvJnkNRCllZBZU+R9G7Gy/rXqq54rZTBC0q0lb65FEe4OQWaaLduKE3ZiofQ== 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 4NDQJ255m4zGbQ; Fri, 18 Nov 2022 18:27:46 +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 2AIIRkrU031254; Fri, 18 Nov 2022 18:27:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AIIRkSf031253; Fri, 18 Nov 2022 18:27:46 GMT (envelope-from git) Date: Fri, 18 Nov 2022 18:27:46 GMT Message-Id: <202211181827.2AIIRkSf031253@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: e87043c6c231 - main - security/heimdal-devel: Fix configure and package 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e87043c6c23184ab537a67e013a6a1f6d4501c3e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=e87043c6c23184ab537a67e013a6a1f6d4501c3e commit e87043c6c23184ab537a67e013a6a1f6d4501c3e Author: Cy Schubert AuthorDate: 2022-11-18 14:59:27 +0000 Commit: Cy Schubert CommitDate: 2022-11-18 18:27:30 +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 --- 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