From nobody Thu May 09 11:45:46 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 4VZqvt6kWmz5JTs9; Thu, 09 May 2024 11:45:46 +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 4VZqvt27cRz4wc3; Thu, 9 May 2024 11:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715255146; 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=ianaTOWusi0B4SvDsG6ADcguu92AbcSS15juvt6QMQc=; b=pRwE1nsloRE1g3Rzlavi4XxEzO92EwJ9nGPcBSqG4OHQEDi8xsnyVf35jdgXQpYC4fIvp1 tDjo5NfJcTTjK/8X4aGkcgRImLOu5oNHiPndiqRJXbh1jKe1dRhyxjn+fjoGL+JNETFwwX uBk8eev5NCIuskjjfKjQYzEHuwBcAZUAUfjX0OmvTidP/enZEWELGmz9NxxBU54z4ozS/t LRJyQfQfaF3V4sS3jlaHaQHydEsxLsGsDr9DWfsVfMCuetZ8IawqmplrjC+/CakPFSmAXN /hj/tKAFsdomD1chMN5elVPfMRuROHqC6WGwGkXi9p0UtpCGHJ3M+QmBOjZ+cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715255146; a=rsa-sha256; cv=none; b=T0HvLW35Im/nwcf7WLAOCbe6K9ZSQNaNF8yI/GK/BTD5C6LwnKOQ/aAA+DBhVtXJh5FX/N 4FectPb0PNdkJjGI18z/rkyI/EgDc4S/SYCCnHX2i2GpUS2L5yB53MfnLSuVxI2tiafOqU mLZ1bQcNwTdTqKtzk6BnEobNLQNkDUv6Nh6xifSmRy/yPWwEScdhdbDXIbDE9Xlde/Wk2M JGSYN5F/p/1JCv3+l7H0vghMRE+HFEbauvRJiqSPcfBeFq3OGylUyhrA03brJFsqcDN8eX RtLAIXHfRl9+AvwSIS/4Y30Cd6y9acTQnL23W5QEytNG22QccmElxOogVoQmzQ== 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=1715255146; 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=ianaTOWusi0B4SvDsG6ADcguu92AbcSS15juvt6QMQc=; b=WoA5fMWQsfGt37y35GUGo/0DFZquHCJFHlDk/Zd38w0T+6QarKdyGMG6zHkW7ec20uz7Ii 1eb0kXIla5S9SczCHHFfB9f3xZYklyAUrL/uzWbFTlRX1oGW9ecChJ9h3SuLMrPOTZ/Iqf mElT+DL0Ibc4C+fiCqfngyQBPXFPfelTC0bf0hmDyrUWHPjvXLCFPj2PA3DlvC8SF/WxsN roXVZG/jl+m5SSp9gwC1MO7V0tkCwSJ/M6aj2GL9OzU84cE/X9qiYHxL77A0mGk7+ruPLJ xTzA6EP8JdRMKFCLX28ESfYd5tikvchGgqWCDRVT/bW1yb1RaxN4ft5r9NCFXA== 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 4VZqvt1hYKz16jx; Thu, 9 May 2024 11:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 449Bjk8c079768; Thu, 9 May 2024 11:45:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 449Bjkj2079765; Thu, 9 May 2024 11:45:46 GMT (envelope-from git) Date: Thu, 9 May 2024 11:45:46 GMT Message-Id: <202405091145.449Bjkj2079765@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: 0a1b69a66843 - main - devel/pcsc-lite: Update to 2.2.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: 0a1b69a66843b4566f3cf1c70937d6650f59c722 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a1b69a66843b4566f3cf1c70937d6650f59c722 commit 0a1b69a66843b4566f3cf1c70937d6650f59c722 Author: Gleb Popov AuthorDate: 2024-05-09 08:14:05 +0000 Commit: Gleb Popov CommitDate: 2024-05-09 11:45:42 +0000 devel/pcsc-lite: Update to 2.2.1 Sponsored by: Serenity Cybersecurity, LLC Reported by: portscout! --- devel/pcsc-lite/Makefile | 23 +++++++++++----------- devel/pcsc-lite/distinfo | 6 +++--- .../pcsc-lite/files/patch-src_spy_install__spy.sh | 20 ------------------- ...install__spy.sh => patch-src_spy_setup__spy.sh} | 8 ++++---- devel/pcsc-lite/pkg-plist | 10 +++------- 5 files changed, 21 insertions(+), 46 deletions(-) diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile index aaf005eeb887..9f60d7f9e630 100644 --- a/devel/pcsc-lite/Makefile +++ b/devel/pcsc-lite/Makefile @@ -1,5 +1,5 @@ PORTNAME= pcsc-lite -PORTVERSION= 2.0.3 +PORTVERSION= 2.2.1 PORTEPOCH= 2 CATEGORIES= devel security MASTER_SITES= https://pcsclite.apdu.fr/files/ @@ -12,18 +12,18 @@ LICENSE= BSD3CLAUSE GPLv3+ LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING -USES= libtool pathfix perl5 pkgconfig python:env shebangfix tar:bzip2 +USES= libtool meson pathfix perl5 pkgconfig python:env shebangfix tar:xz USE_LDCONFIG= yes USE_PERL5= build USE_RC_SUBR= pcscd -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -CONFIGURE_ARGS= --disable-libsystemd \ - --enable-usbdropdir=${PREFIX}/lib/pcsc/drivers/ \ - --enable-ipcdir=/var/run +MESON_ARGS= -Dlibsystemd=false \ + -Dlibudev=false \ + -Dlibusb=true \ + -Dusb=true \ + -Dusbdropdir=${PREFIX}/lib/pcsc/drivers/ \ + -Dipcdir=/var/run -INSTALL_TARGET= install-strip SHEBANG_FILES= src/spy/pcsc-spy SUB_FILES= pkg-message @@ -37,10 +37,10 @@ FEATURES_DESC= Default features knobs FILTER_DESC= Control (Ignore or Extend) reported reader names POLKIT_DESC= Polkit authorization support -FILTER_CONFIGURE_ENABLE= filter +FILTER_MESON_TRUE= filter_names -POLKIT_LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit -POLKIT_CONFIGURE_ENABLE= polkit +POLKIT_LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit +POLKIT_MESON_TRUE= polkit post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/pcsc/drivers @@ -49,7 +49,6 @@ post-install: post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/example/Makefile.am ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/example/Makefile.in ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/example/pcsc_demo.c ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/devel/pcsc-lite/distinfo b/devel/pcsc-lite/distinfo index c5bf997c8ee2..5047860b99bd 100644 --- a/devel/pcsc-lite/distinfo +++ b/devel/pcsc-lite/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1709531598 -SHA256 (pcsc-lite-2.0.3.tar.bz2) = f42ee9efa489e9ff5d328baefa26f9c515be65021856e78d99ad1f0ead9ec85d -SIZE (pcsc-lite-2.0.3.tar.bz2) = 818562 +TIMESTAMP = 1715200330 +SHA256 (pcsc-lite-2.2.1.tar.xz) = 625edcd6cf4b45af015eb5b6b75ea47f8914e892774c67e1079c9553c8665a57 +SIZE (pcsc-lite-2.2.1.tar.xz) = 207664 diff --git a/devel/pcsc-lite/files/patch-src_spy_install__spy.sh b/devel/pcsc-lite/files/patch-src_spy_install__spy.sh deleted file mode 100644 index acfc10ad71a0..000000000000 --- a/devel/pcsc-lite/files/patch-src_spy_install__spy.sh +++ /dev/null @@ -1,20 +0,0 @@ ---- src/spy/install_spy.sh.orig 2020-08-05 11:01:32 UTC -+++ src/spy/install_spy.sh -@@ -5,7 +5,7 @@ set -e - - # ldconfig --print-cache will return something like - # libpcsclite.so.1 (libc6,x86-64) => /usr/lib/x86_64-linux-gnu/libpcsclite.so.1 --DIR=$(ldconfig --print-cache | grep libpcsclite.so.1) -+DIR=$(ldconfig -r | grep libpcsclite.so.1) - - # get the right part only: /usr/lib/x86_64-linux-gnu/libpcsclite.so.1 - DIR=$(echo $DIR | cut -d'=' -f2 | cut -d' ' -f2) -@@ -14,7 +14,7 @@ DIR=$(dirname $DIR) - DIR=$(dirname $DIR) - - # find the spying library --SPY=$(ldconfig --print-cache | grep libpcscspy.so) -+SPY=$(ldconfig -r | grep libpcscspy.so) - SPY=$(echo $SPY | cut -d'=' -f2 | cut -d' ' -f2) - - echo "Using directory:" $DIR diff --git a/devel/pcsc-lite/files/patch-src_spy_uninstall__spy.sh b/devel/pcsc-lite/files/patch-src_spy_setup__spy.sh similarity index 64% rename from devel/pcsc-lite/files/patch-src_spy_uninstall__spy.sh rename to devel/pcsc-lite/files/patch-src_spy_setup__spy.sh index bfdb94466e46..e28bfae05f30 100644 --- a/devel/pcsc-lite/files/patch-src_spy_uninstall__spy.sh +++ b/devel/pcsc-lite/files/patch-src_spy_setup__spy.sh @@ -1,6 +1,6 @@ ---- src/spy/uninstall_spy.sh.orig 2020-08-05 11:01:32 UTC -+++ src/spy/uninstall_spy.sh -@@ -5,7 +5,7 @@ set -e +--- src/spy/setup_spy.sh.orig 2024-05-08 09:57:49 UTC ++++ src/spy/setup_spy.sh +@@ -5,7 +5,7 @@ PATH="$PATH:/usr/sbin" # ldconfig --print-cache will return something like # libpcsclite.so.1 (libc6,x86-64) => /usr/lib/x86_64-linux-gnu/libpcsclite.so.1 @@ -8,4 +8,4 @@ +DIR=$(ldconfig -r | grep libpcsclite.so.1) # get the right part only: /usr/lib/x86_64-linux-gnu/libpcsclite.so.1 - DIR=$(echo $DIR | cut -d'=' -f2 | cut -d' ' -f2) + DIR=$(echo "$DIR" | cut -d'=' -f2 | cut -d' ' -f2) diff --git a/devel/pcsc-lite/pkg-plist b/devel/pcsc-lite/pkg-plist index 2fb3b5e51c24..9f1ed8666eb4 100644 --- a/devel/pcsc-lite/pkg-plist +++ b/devel/pcsc-lite/pkg-plist @@ -7,20 +7,16 @@ include/PCSC/winscard.h include/PCSC/wintypes.h lib/libpcsclite.so lib/libpcsclite.so.1 -lib/libpcsclite.so.1.0.0 +lib/libpcsclite_real.so +lib/libpcsclite_real.so.1 lib/libpcscspy.so lib/libpcscspy.so.0 -lib/libpcscspy.so.0.0.0 libdata/pkgconfig/libpcsclite.pc sbin/pcscd -%%PORTDOCS%%%%DOCSDIR%%/README.polkit -%%PORTDOCS%%%%DOCSDIR%%/install_spy.sh -%%PORTDOCS%%%%DOCSDIR%%/uninstall_spy.sh +%%PORTDOCS%%%%DOCSDIR%%/setup_spy.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.am -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.in %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcsc_demo.c share/man/man1/pcsc-spy.1.gz -share/man/man5/reader.conf.5.gz share/man/man8/pcscd.8.gz %%POLKIT%%share/polkit-1/actions/org.debian.pcsc-lite.policy @dir lib/pcsc/services