From nobody Wed Aug 14 12:24:39 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 4WkSB00G1tz5TH9Z; Wed, 14 Aug 2024 12:24:40 +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 4WkS9z6lg9z4bDS; Wed, 14 Aug 2024 12:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723638279; 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=Z8rUpUSWdS7mWDSaznRvE4IaydjlNv6nhZIvRd/UtP4=; b=pqnYDoi+Lpj9eUQEckvBHEGTrNTECqJyOMRUJQToYkn4gEJwUzphI4oMWkDPoK+emTifYZ XMV/YGHCyd4exraM6P3Rus97mABIu25seDq2otLPywLyIOGCLVTn3s1B+hM5Le7EBx7q2Q yN4TIsP7y5/1sjB4DSSfNsFxyKoRnsNfSg/RyPRJ2LpVDcPmRE+znnv3gxQqptvyMEovRt uHsySjZAIH+AcaL/ryNcbuqX6NhOgrgtY7CTvQwmUe+MEwTMgN7SdxcIu/2/uIybZj6zeV 9M9hUdMFMmn4TZrvk8bRd6631u9NzDyMpXW0Bh4Sbn1JxGixm+KCH5phqu1Nvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723638279; a=rsa-sha256; cv=none; b=XmlcfTTDTTMYvAxdofWT9AyQynB4uP5yx4gtOn+EKaVUlw0jl97f9vt4pGRt8ewpsqTr2Z wYU/s+DovL7pecVaidhzVDR1rLsaDmb0hI/LBGYmRhM2jKj+Ampkq/hOZrQp6GruYuQdbh XRjxhfleRbURzvAA57jtnEKrk3W/sis2+hMX8SwJLnzL2tcaQP9vkXBCilwnw43n+0Az1k xcdJT5DubOlgL61BX346ZyABo/Ehkbi1NNkdTUIe0ISl8aLj99P+3MdJwMjTSOD7tGUEb2 4nVDKa+Cdzy1DqeqFwPdV7wfSIFQR0YPqan/r2MGPhrsUZ7OCEyYFffZ+KU1Kg== 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=1723638279; 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=Z8rUpUSWdS7mWDSaznRvE4IaydjlNv6nhZIvRd/UtP4=; b=PoPItlMbcEgN70y5oB1O83EX59JuZU1fFljznaxOBzYMuu821YaenQQBR5UZwUvAx5//ue wnoVg1hWWTdt9ROK6NsKjE1IALS3DaZDLAydVjYzWamOCnuKiGYWjyy1Ved5Zvd26XQf8k w+bt6/DCC+JRFiNzPnYultOCjb2JC20rBubO5ZoNC5/F4Iu/XKdjjoF/TIYS4U4X+ZESw7 1/EnHqlnUs20q3j2MMCa0dvgs9xfB7pOM3ARN8RnHhujnvZoq/QVKgx+Zd4jssX4ADtwK+ nW9AFBzUrHNDhhAvR0wBM1ik92xGdIQiKreQPDe6RcCyKTqvjmXPsqO/RPDlCw== 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 4WkS9z6Lv2zty1; Wed, 14 Aug 2024 12:24:39 +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 47ECOdtT066695; Wed, 14 Aug 2024 12:24:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47ECOdHq066692; Wed, 14 Aug 2024 12:24:39 GMT (envelope-from git) Date: Wed, 14 Aug 2024 12:24:39 GMT Message-Id: <202408141224.47ECOdHq066692@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: fc94b4e3dde6 - main - devel/libccid: Update to 1.6.1 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc94b4e3dde63313c7f915630c496fe3d50e19a0 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=fc94b4e3dde63313c7f915630c496fe3d50e19a0 commit fc94b4e3dde63313c7f915630c496fe3d50e19a0 Author: Marcin Cieślak AuthorDate: 2024-08-14 12:00:31 +0000 Commit: Gleb Popov CommitDate: 2024-08-14 12:24:30 +0000 devel/libccid: Update to 1.6.1 Extract the common variable between this port and pcsc-lite into a separate include. Sponsored by: Serenity Cybersecurity, LLC Co-authored-by: Gleb Popov Differential Revision: https://reviews.freebsd.org/D45456 --- devel/libccid/Makefile | 29 ++++++++++++++++------------- devel/libccid/distinfo | 6 +++--- devel/pcsc-lite/Makefile | 4 +++- devel/pcsc-lite/Makefile.common | 1 + 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/devel/libccid/Makefile b/devel/libccid/Makefile index 27164338b665..e41d92ba117e 100644 --- a/devel/libccid/Makefile +++ b/devel/libccid/Makefile @@ -1,6 +1,5 @@ PORTNAME= ccid -PORTVERSION= 1.5.5 -PORTREVISION= 1 +PORTVERSION= 1.6.1 CATEGORIES= devel MASTER_SITES= https://ccid.apdu.fr/files/ @@ -13,27 +12,31 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite -USES= perl5 pkgconfig tar:bzip2 +USES= perl5 pkgconfig tar:xz meson USE_LDCONFIG= yes USE_PERL5= build -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-usbdropdir=${PREFIX}/lib/pcsc/drivers \ - --enable-ccidtwindir=${PREFIX}/lib/pcsc/drivers/serial +MESON_ARGS= -Dpcsclite=true -LDFLAGS= -pthread -INSTALL_TARGET= install-strip +.include "../../devel/pcsc-lite/Makefile.common" +BUNDLE_DIR= ${USBDROPDIR}/ifd-ccid.bundle +PLIST_DIRS= ${USBDROPDIR} PLIST_FILES= bin/RSA_SecurID_getpasswd \ - lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so \ - lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist \ - share/man/man1/RSA_SecurID_getpasswd.1.gz + bin/Kobil_mIDentity_switch \ + ${BUNDLE_DIR}/Contents/FreeBSD/libccid.so \ + ${BUNDLE_DIR}/Contents/Info.plist \ + share/man/man1/RSA_SecurID_getpasswd.1.gz \ + share/man/man8/Kobil_mIDentity_switch.8.gz post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/contrib/RSA_SecurID/RSA_SecurID_getpasswd \ + ${INSTALL_PROGRAM} ${WRKSRC}/${MESON_BUILD_DIR}/Kobil_mIDentity_switch \ + ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8 \ + ${STAGEDIR}${PREFIX}/share/man/man8 + ${INSTALL_PROGRAM} ${WRKSRC}/${MESON_BUILD_DIR}/RSA_SecurID_getpasswd \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/contrib/RSA_SecurID/RSA_SecurID_getpasswd.1 \ ${STAGEDIR}${PREFIX}/share/man/man1 - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so .include diff --git a/devel/libccid/distinfo b/devel/libccid/distinfo index 745e909808c5..b4ccba61017f 100644 --- a/devel/libccid/distinfo +++ b/devel/libccid/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1709534464 -SHA256 (ccid-1.5.5.tar.bz2) = 194708f75fe369d45dd7c15e8b3e8a7db8b49cfc5557574ca2a2e76ef12ca0ca -SIZE (ccid-1.5.5.tar.bz2) = 708374 +TIMESTAMP = 1723636201 +SHA256 (ccid-1.6.1.tar.xz) = 2eca8fb07e8fe7c0d39daeaca7b97cd73c40ed9b72738a24ad3dcbdfc918e1ea +SIZE (ccid-1.6.1.tar.xz) = 195844 diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile index 601309f9e0b9..18ec90600abd 100644 --- a/devel/pcsc-lite/Makefile +++ b/devel/pcsc-lite/Makefile @@ -19,11 +19,13 @@ USE_RC_SUBR= pcscd SHEBANG_FILES= src/spy/pcsc-spy +.include "Makefile.common" + MESON_ARGS= -Dlibsystemd=false \ -Dlibudev=false \ -Dlibusb=true \ -Dusb=true \ - -Dusbdropdir=${PREFIX}/lib/pcsc/drivers/ \ + -Dusbdropdir=${USBDROPDIR}/ \ -Dipcdir=/var/run SUB_FILES= pkg-message diff --git a/devel/pcsc-lite/Makefile.common b/devel/pcsc-lite/Makefile.common new file mode 100644 index 000000000000..d7c9761863f6 --- /dev/null +++ b/devel/pcsc-lite/Makefile.common @@ -0,0 +1 @@ +USBDROPDIR= ${PREFIX}/lib/pcsc/drivers