From nobody Mon Aug 26 18:24:12 2024 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 4WszbJ1zcbz5TP1d; Mon, 26 Aug 2024 18:24:12 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WszbJ1J48z4B1N; Mon, 26 Aug 2024 18:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724696652; 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=47/nf5EDHssy0h15ABpto3zbPp0D4dp7Po1WIoABlYk=; b=TzP/MQj0WoCJxk8stPFqXcqyFS6zOuDotyklhG895uZkBZo6bMCXgMroD3C/lqbhTkmVQQ dg8qUXl3xa1q6xhZ1jtFYntppAhxJciSPVQUvsii6g1sKKbIR/N1wnHinixqKTk4WqiR+2 TkHxOPJ8nx7s4Xi/MUERCE3fEfOtpMBF/bFOMBAdS9gpVIWASWhroOG+mb6IQqlxxPo/Sn F9gJRvrl+u/V9MTazKyaObsbvnmnftfno8W4JCKzz2Us108LaQ4MWaJCyzndS4YAkRyitB gH7hXpWJbFFcY5HjO11QIuYbJr1jWhR+3ohLHlb4okd1Hae9aVq/rPlFo8/MpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724696652; a=rsa-sha256; cv=none; b=xWoDiD1vrZIMpJp72OztHgCWJ4c9O/1CEaGWFt5IOeVg8gBUocHq26WJQH8F+I8Xa/6aak pqHIP/KRLx3InSqKl0ZkINO5nVlSEC5xsat0FNNU2hzyKD4Z7uXMhED3r5nXLUKjvwhP1B iVsrLISSjAkgt4DvWzSPPocPeJiEqSGQyBUh2usqfX+5bj9aP4/aF1Cka1szmOtseH4eUi RYq2kZFyX4lQsBoiHPeV/ltTWyhYFGUsjQCCkGENgaEcGL1FLX0+LxSmrdYOPzn6ivRIBX r2HDjSDWYX1tko9ilo8uRagUCaJJ6kNLhHk6wUH0Qtc0+BpMawXa1Fl6sP8YCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724696652; 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=47/nf5EDHssy0h15ABpto3zbPp0D4dp7Po1WIoABlYk=; b=v5jSItenRq8Sra9wMYd9fiQTOLM2hrwUBSnlGEZ+MshA6y83O6MYi+0s+u1wvAUxIe4Qko bW4MFaMAv0qHLa26Bn4rMTEChqB72B84YC7y5bWOaG1eixFedl0NtwO6elxoDEAIoiiD+r qiy8gq70vXlXQnyC7DtjAHiayDhSKGQuHo7bRS8jBktp1WOoSz9aWYJRJlrQ1ifTEw2Iva t4u/iP4jV/x3IgVDK59sUAnKzD4KBYkMV5uyxZhWH265vHTBl2jj76B81f262x6YqVvO5O 1zTi5QP63HhjKX2xnne3o8coTlxdu+nBMTM/505Bt/oLnGpcWZ+pvNiXN85E8g== 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 4WszbJ0tfKzHbh; Mon, 26 Aug 2024 18:24:12 +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 47QIOC3p076145; Mon, 26 Aug 2024 18:24:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47QIOCsX076142; Mon, 26 Aug 2024 18:24:12 GMT (envelope-from git) Date: Mon, 26 Aug 2024 18:24:12 GMT Message-Id: <202408261824.47QIOCsX076142@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Zsolt Udvari Subject: git: c89a37da755f - main - security/kc: add YUBIKEY option 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: uzsolt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c89a37da755fc8aa59772f6be56b695999646df2 Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=c89a37da755fc8aa59772f6be56b695999646df2 commit c89a37da755fc8aa59772f6be56b695999646df2 Author: Daniel AuthorDate: 2024-08-26 18:17:23 +0000 Commit: Zsolt Udvari CommitDate: 2024-08-26 18:17:23 +0000 security/kc: add YUBIKEY option Remove pcre support. Add TEST_DEPENDS and use bash instead of sh in tests. Shorten pkg-message. Switch to DISTVERSION. Pet portlint, portfmt. PR: 277801 Approved by: submitter is maintainer --- security/kc/Makefile | 69 +++++++++++++++++++++++++++---------------------- security/kc/pkg-message | 31 ++-------------------- 2 files changed, 40 insertions(+), 60 deletions(-) diff --git a/security/kc/Makefile b/security/kc/Makefile index 0f963080cf83..a9c101e171c2 100644 --- a/security/kc/Makefile +++ b/security/kc/Makefile @@ -1,47 +1,54 @@ -PORTNAME= kc -PORTVERSION= 2.5.3 -PORTREVISION= 1 -CATEGORIES= security +PORTNAME= kc +DISTVERSION= 2.5.3 +PORTREVISION= 2 +CATEGORIES= security -MAINTAINER= leva@ecentrum.hu -COMMENT= Console based password storing application -WWW= https://github.com/levaidaniel/kc +MAINTAINER= leva@ecentrum.hu +COMMENT= Console based password storing application +WWW= https://github.com/levaidaniel/kc -LICENSE= BSD2CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libxml2.so:textproc/libxml2 +LIB_DEPENDS= libxml2.so:textproc/libxml2 +TEST_DEPENDS= bash:shells/bash -CONFLICTS= kc24 +USES= ncurses pkgconfig ssl uidfix +USE_GITHUB= yes +GH_ACCOUNT= levaidaniel -OPTIONS_DEFINE= PCRE SCRYPT -OPTIONS_DEFAULT= PCRE SCRYPT LIBEDIT -OPTIONS_RADIO= CLI -OPTIONS_RADIO_CLI= LIBEDIT READLINE +MAKE_ARGS= BINDIR="${PREFIX}/bin" \ + MANDIR="${PREFIX}/share/man/man" +MAKE_ENV= BUNDLED_BCRYPT=y +TEST_ENV= SH=${PREFIX}/bin/bash +TEST_TARGET= test -SCRYPT_DESC= Scrypt KDF support (needs libscrypt) +CONFLICTS= kc24 -PCRE_LIB_DEPENDS= libpcre.so:devel/pcre -PCRE_MAKE_ENV+= HAVE_PCRE=yes -SCRYPT_LIB_DEPENDS= libscrypt.so:security/libscrypt -SCRYPT_MAKE_ENV+= HAVE_LIBSCRYPT=1 -LIBEDIT_USES= libedit -LIBEDIT_MAKE_ENV+= EDITLINE=y -READLINE_USES= readline -READLINE_MAKE_ENV+= READLINE=y +PLIST_FILES= bin/kc share/doc/kc/Changelog.md share/man/man1/kc.1.gz -USES+= pkgconfig ncurses ssl uidfix -USE_GITHUB= yes -GH_ACCOUNT= levaidaniel +OPTIONS_DEFINE= SCRYPT YUBIKEY +OPTIONS_DEFAULT= LIBEDIT SCRYPT +OPTIONS_SINGLE= CLI +OPTIONS_SINGLE_CLI= LIBEDIT READLINE -PLIST_FILES= bin/kc share/doc/kc/Changelog.md share/man/man1/kc.1.gz +SCRYPT_DESC= Scrypt KDF support (needs libscrypt) +YUBIKEY_DESC= YubiKey support (needs libyubikey and ykpers) -MAKE_ARGS= BINDIR="${PREFIX}/bin" \ - MANDIR="${PREFIX}/share/man/man" -MAKE_ENV+= BUNDLED_BCRYPT=y +LIBEDIT_USES= libedit +LIBEDIT_MAKE_ENV= EDITLINE=y +READLINE_USES= readline +READLINE_MAKE_ENV= READLINE=y +SCRYPT_LIB_DEPENDS= libscrypt.so:security/libscrypt +SCRYPT_MAKE_ENV= HAVE_LIBSCRYPT=1 +YUBIKEY_LIB_DEPENDS= libykpers-1.so:security/ykpers \ + libyubikey.so:security/libyubikey +YUBIKEY_MAKE_ENV+= CFLAGS=-I${PREFIX}/include \ + HAVE_YUBIKEY=y post-patch: @${REINPLACE_CMD} -e 's|-lncursesw|${NCURSESLIBS}|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|^#!/bin/sh|#!${PREFIX}/bin/bash|' ${WRKSRC}/regress/run_tests.sh post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/security/kc/pkg-message b/security/kc/pkg-message index c08487d3e962..e5f800a9cb5c 100644 --- a/security/kc/pkg-message +++ b/security/kc/pkg-message @@ -1,36 +1,9 @@ [ { type: install message: < import -o -R 5000 -k passwords.kcd -Reading database... -Opening 'passwords.kcd' -Password: -Decrypting... -Checking database... -Counting keys and keychains... -Import finished. - +For YubiKey support, the user needs to have r/w access to the USB device under /dev/usb. EOM } ]