From nobody Sun Oct 06 16:16:52 2024 X-Original-To: dev-commits-ports-all@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 4XM6qS4CgCz5YG4l; Sun, 06 Oct 2024 16:16:52 +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 4XM6qS2q3Jz4GyC; Sun, 6 Oct 2024 16:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728231412; 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=CyZsreYKkS7WPtNGFRxZv52eJGChMS5zKVNPcuFfG70=; b=Cr5UbRXBcsW++WqreVeNcNBwB+01b2hfYK1aPuHLXL7pQLzsW0ZExZgOwVkDH/5aIuhBbi bZAY6/rkUPn7M0X4FgkwXtu5j51oxgqIdm2rGoG5hayyWrLZuyjCFgaNJZ0c/wZJuOHCAn csXpGWF5TREeXljQ0eplUMvXpeZZ+NuSZI5cEmMTT+fSqIu5L+gXEDSBngCzwZRxDRfvAf lrc/DG5P7qvmTnDgA7w6SlIkLCOjpStPQ00Kd6G7sJvqyO0uQ6tuu2qqqPLqTwCnZ2Djf+ XBpbT58VtrDOpItMmbqAc1GauvakO7bVrPd0wBRWPCiBs+FCuS9DpSb0ta0k1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728231412; 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=CyZsreYKkS7WPtNGFRxZv52eJGChMS5zKVNPcuFfG70=; b=sqRtU5WmQY8cLrhXS63Nif+p7IQh9vMZ502JTTULP6CsE4TRKU32Z+SEK6i+7AM15sBVce GPKnk8oAX/mQJ1koLyQxIYKxPIkTAEN0zZeMb1jat7S77hDiQ5otgJiED6SjTKrooj4bdp aCZAsOcdU09fOXv86r/hAaDMhHJKNZPE+vL4aOQDISie6QYvF76Ig+77yxni83ih/5x0z5 oGLKaIx+M/M/l7SyRyphym61obig2EpqBRd5ZZCTGLj0Z9T6pxCKOSMIodrxnJxPPrn2/E derMO2dQVMeVciBHZJrzqkEle8qDpRFNw54KqxLOvGgyTB/pvNFWYwH18XYX1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728231412; a=rsa-sha256; cv=none; b=l//uPOwhFjxBdccyNpVHEjJL2Np0H8LUM9Yq2MahAr1m8RwFVmpxmFEU4RCjipbguAMCpH cJcz3m0XIoA7PQYFvkEKfekc6mHVSQnApiu1l/vgwAZIaOpfhGPLB6ALtVLjBzR5qZVxiG 7ka9dA7xvl0aihDY8BJFhgSzUVQCCCeGY7jiefLLwNeTp9xIwUDUK9vtjyqSCMqK+FTx4S IlNMUqo8jek+HhP/MR1P1Seu3oKHJ3H7v3aikYovMGYPzKeCWVEno5CfllXfHflbBRaBH5 bJ4lqcIZHNdl+ZM1+Bp7EkeC/nK3vaB4SOXyCSOn6wyL0jvhtt0Oaf5Tn/adYA== 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 4XM6qS2Nyqz18Nm; Sun, 6 Oct 2024 16:16:52 +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 496GGqWR067344; Sun, 6 Oct 2024 16:16:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496GGq5x067341; Sun, 6 Oct 2024 16:16:52 GMT (envelope-from git) Date: Sun, 6 Oct 2024 16:16:52 GMT Message-Id: <202410061616.496GGq5x067341@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 0d17e7fbddbc - main - devel/pcsc-cyberjack: update to 3.99.5final.SP16 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d17e7fbddbcc0503e28ec4029c4c4e78eefddd4 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d17e7fbddbcc0503e28ec4029c4c4e78eefddd4 commit 0d17e7fbddbcc0503e28ec4029c4c4e78eefddd4 Author: Robert Clausecker AuthorDate: 2024-10-06 15:15:01 +0000 Commit: Robert Clausecker CommitDate: 2024-10-06 16:16:18 +0000 devel/pcsc-cyberjack: update to 3.99.5final.SP16 - update adds support for the REINER SCT cyberJack RFID standard EN - grab maintainership; tm@ no longer runs any FreeBSD gear and can thus no longer take care of the port (cf PR 273675) --- devel/pcsc-cyberjack/Makefile | 12 ++--- devel/pcsc-cyberjack/distinfo | 6 +-- devel/pcsc-cyberjack/files/patch-cjeca32_Debug.cpp | 10 ++-- .../files/patch-cjeca32_RSCTCriticalSection.h | 53 ++++++++++++++++++++++ devel/pcsc-cyberjack/files/patch-cjeca32_stdafx.h | 11 +++++ 5 files changed, 78 insertions(+), 14 deletions(-) diff --git a/devel/pcsc-cyberjack/Makefile b/devel/pcsc-cyberjack/Makefile index 54fd78927ec6..d6e574a664bf 100644 --- a/devel/pcsc-cyberjack/Makefile +++ b/devel/pcsc-cyberjack/Makefile @@ -1,11 +1,9 @@ PORTNAME= pcsc-cyberjack -DISTVERSION= 3.99.5final.SP15 -PORTREVISION= 3 +DISTVERSION= 3.99.5final.SP16 CATEGORIES= devel security -MASTER_SITES= https://downloads.reiner-sct.de/LINUX/V3.99.5_SP15/ -DISTNAME= ${PORTNAME}_${DISTVERSION} +MASTER_SITES= https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP16/ -MAINTAINER= tm@NetBSD.org +MAINTAINER= fuz@FreeBSD.org COMMENT= Reiner SCT cyberJack card reader PCSC driver WWW= https://www.reiner-sct.com/ @@ -21,7 +19,9 @@ USES= autoreconf dos2unix libtool localbase pkgconfig tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-release --with-usbdropdir=${PREFIX}/lib/pcsc/drivers -DOS2UNIX_FILES= cjeca32/Debug.cpp cjeca32/RSCTCriticalSection.cpp +DOS2UNIX_FILES= cjeca32/Debug.cpp \ + cjeca32/RSCTCriticalSection.cpp \ + cjeca32/RSCTCriticalSection.h INSTALL_TARGET= install-strip WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} diff --git a/devel/pcsc-cyberjack/distinfo b/devel/pcsc-cyberjack/distinfo index 8f6e4218e79b..959fc07d49fe 100644 --- a/devel/pcsc-cyberjack/distinfo +++ b/devel/pcsc-cyberjack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667424080 -SHA256 (pcsc-cyberjack_3.99.5final.SP15.tar.bz2) = acb7c2832450718756713767c4b3ef500832d652ed51b35110b910b11ebd467a -SIZE (pcsc-cyberjack_3.99.5final.SP15.tar.bz2) = 1681827 +TIMESTAMP = 1728227015 +SHA256 (pcsc-cyberjack-3.99.5final.SP16.tar.bz2) = 141489261c0d436be4b92f78faf240c32694426685413d9d50e3585feba5eb79 +SIZE (pcsc-cyberjack-3.99.5final.SP16.tar.bz2) = 1787299 diff --git a/devel/pcsc-cyberjack/files/patch-cjeca32_Debug.cpp b/devel/pcsc-cyberjack/files/patch-cjeca32_Debug.cpp index c5b6b960ed66..05e4113b67fb 100644 --- a/devel/pcsc-cyberjack/files/patch-cjeca32_Debug.cpp +++ b/devel/pcsc-cyberjack/files/patch-cjeca32_Debug.cpp @@ -1,11 +1,11 @@ ---- cjeca32/Debug.cpp.orig 2021-11-03 13:00:16 UTC +--- cjeca32/Debug.cpp.orig 2024-10-06 15:03:41 UTC +++ cjeca32/Debug.cpp @@ -141,7 +141,7 @@ CDebug Debug(0xffffffff); - - - + + + -#elif defined(OS_LINUX) || defined(OS_DARWIN) +#elif defined(OS_LINUX) || defined(OS_DARWIN) || defined(OS_FREEBSD) - + #if defined(OS_DARWIN) # define DEBUG_DEFAULT_LOGFILE "/Library/Logs/cj.log" diff --git a/devel/pcsc-cyberjack/files/patch-cjeca32_RSCTCriticalSection.h b/devel/pcsc-cyberjack/files/patch-cjeca32_RSCTCriticalSection.h new file mode 100644 index 000000000000..81b1df4c2d41 --- /dev/null +++ b/devel/pcsc-cyberjack/files/patch-cjeca32_RSCTCriticalSection.h @@ -0,0 +1,53 @@ +--- cjeca32/RSCTCriticalSection.h.orig 2024-10-06 15:04:53 UTC ++++ cjeca32/RSCTCriticalSection.h +@@ -1,27 +1,27 @@ + #ifndef ECA_RSCTCRITICAL_H + #define ECA_RSCTCRITICAL_H +- +-#ifdef _WINDOWS +-#include +-#endif +- +-class CJECA32_PRIVATE_CLASS CRSCTCriticalSection +-{ +-public: +- CRSCTCriticalSection(void); +-public: +- virtual ~CRSCTCriticalSection(void); +-protected: +-#ifdef _WINDOWS +- CRITICAL_SECTION m_hCritSec; +-#elif defined(OS_LINUX) +-#elif defined(OS_DARWIN) +-// MPCriticalRegionID m_CriticalRegionID; +-#endif +-public: +- void Enter(void); +-public: +- void Leave(void); +-}; ++ ++#ifdef _WINDOWS ++#include ++#endif ++ ++class CJECA32_PRIVATE_CLASS CRSCTCriticalSection ++{ ++public: ++ CRSCTCriticalSection(void); ++public: ++ virtual ~CRSCTCriticalSection(void); ++protected: ++#ifdef _WINDOWS ++ CRITICAL_SECTION m_hCritSec; ++#elif defined(OS_LINUX) || defined(OS_FREEBSD) ++#elif defined(OS_DARWIN) ++// MPCriticalRegionID m_CriticalRegionID; ++#endif ++public: ++ void Enter(void); ++public: ++ void Leave(void); ++}; + + #endif diff --git a/devel/pcsc-cyberjack/files/patch-cjeca32_stdafx.h b/devel/pcsc-cyberjack/files/patch-cjeca32_stdafx.h new file mode 100644 index 000000000000..03baea477aa8 --- /dev/null +++ b/devel/pcsc-cyberjack/files/patch-cjeca32_stdafx.h @@ -0,0 +1,11 @@ +--- cjeca32/stdafx.h.orig 2024-10-06 15:05:20 UTC ++++ cjeca32/stdafx.h +@@ -59,7 +59,7 @@ + #include "ntstatus.h" + + #include "cjeca32.h" +-#ifdef OS_LINUX ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + #include + #endif +