Attachment 237958 Details for Bug 229361 – shar file

shar file

pcsc-cyberjack.shar (text/plain), 9.92 KB, created by Martin Müßler on 2022-11-08 21:26:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Müßler

Created: 2022-11-08 21:26:22 UTC

Size: 9.92 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	pcsc-cyberjack
>#	pcsc-cyberjack/files
>#	pcsc-cyberjack/files/patch-libcyberjack_libdialog_dialog.c
>#	pcsc-cyberjack/files/patch-cjeca32_Debug.cpp
>#	pcsc-cyberjack/files/patch-include_driver_Platform__unix.h
>#	pcsc-cyberjack/files/patch-libcyberjack_checksuite_cm__distri.cpp
>#	pcsc-cyberjack/files/patch-include_driver_Debug.h
>#	pcsc-cyberjack/files/patch-ifd-Makefile.am
>#	pcsc-cyberjack/files/patch-cjeca32_RSCTCriticalSection.cpp
>#	pcsc-cyberjack/files/patch-configure.ac
>#	pcsc-cyberjack/pkg-descr
>#	pcsc-cyberjack/Makefile
>#	pcsc-cyberjack/pkg-plist
>#	pcsc-cyberjack/distinfo
>#
>echo c - pcsc-cyberjack
>mkdir -p pcsc-cyberjack > /dev/null 2>&1
>echo c - pcsc-cyberjack/files
>mkdir -p pcsc-cyberjack/files > /dev/null 2>&1
>echo x - pcsc-cyberjack/files/patch-libcyberjack_libdialog_dialog.c
>sed 's/^X//' >pcsc-cyberjack/files/patch-libcyberjack_libdialog_dialog.c << '9588b090886d665491f53285c8e75450'
>X--- libcyberjack/libdialog/dialog.c.orig	2021-11-03 13:00:16 UTC
>X+++ libcyberjack/libdialog/dialog.c
>X@@ -22,7 +22,7 @@
>X  *                                                                         *
>X  ***************************************************************************/
>X 
>X-
>X+#include "config.h"
>X #include "Platform.h"
>X #include "dialog_p.h"
>X #include "network.h"
>X@@ -30,7 +30,11 @@
>X #include <sys/types.h>
>X #include <sys/stat.h>
>X #include <pwd.h>
>X+#ifdef OS_FREEBSD
>X+#include <utmpx.h>
>X+#else
>X #include <utmp.h>
>X+#endif
>X 
>X #include <errno.h>
>X #include <string.h>
>X@@ -120,11 +124,19 @@ static int rsct_dialog_mk_socket() {
>X 
>X static int rsct_dialog_mk_socket() {
>X   char buffer[256];
>X+#ifdef OS_FREEBSD
>X+  struct utmpx *u_tmp_p;
>X+#else
>X   struct utmp *u_tmp_p;
>X+#endif
>X   struct passwd *pw;
>X   int sk;
>X 
>X+#ifdef OS_FREEBSD
>X+  while ((u_tmp_p = getutxent()) != NULL) {
>X+#else
>X   while ((u_tmp_p = getutent()) != NULL) {
>X+#endif
>X     DEBUGPI("RSCT: ut_type=%d, ut_line=[%s]\n",
>X 	    u_tmp_p->ut_type,
>X 	    u_tmp_p->ut_line);
>X@@ -136,7 +148,11 @@ static int rsct_dialog_mk_socket() {
>X 
>X   if (u_tmp_p==NULL) {
>X     DEBUGPE("RSCT: No user logged in at XServer :0 (%s (%d))\n", strerror(errno), errno);
>X+#ifdef OS_FREEBSD
>X+    endutxent();
>X+#else
>X     endutent();
>X+#endif
>X     return -1;
>X   }
>X 
>X@@ -144,18 +160,31 @@ static int rsct_dialog_mk_socket() {
>X   if (pw==NULL) {
>X     DEBUGPE("RSCT: Could not get home folder for user [%s]: %s (%d)\n",
>X 	    u_tmp_p->ut_user, strerror(errno), errno);
>X+#ifdef OS_FREEBSD
>X+    endutxent();
>X+#else
>X     endutent();
>X+#endif
>X     return -1;
>X   }
>X 
>X   if (pw->pw_dir==NULL || *(pw->pw_dir)==0) {
>X     DEBUGPE("RSCT: User [%s] has no home folder\n", u_tmp_p->ut_user);
>X+#ifdef OS_FREEBSD
>X+    endutxent();
>X+#else
>X     endutent();
>X+#endif
>X     return -1;
>X   }
>X   strncpy(buffer, pw->pw_dir, sizeof(buffer)-1);
>X   strncat(buffer, "/.cyberJack_gui_sock", sizeof(buffer)-1);
>X+#ifdef OS_FREEBSD
>X+  endutxent();
>X+#else
>X   endutent();
>X+#endif
>X+
>X 
>X   sk=rsct_net_connect_by_path(buffer);
>X   if (sk==-1) {
>9588b090886d665491f53285c8e75450
>echo x - pcsc-cyberjack/files/patch-cjeca32_Debug.cpp
>sed 's/^X//' >pcsc-cyberjack/files/patch-cjeca32_Debug.cpp << '92693147885718d2e8a89464886bb218'
>X--- cjeca32/Debug.cpp.orig	2021-11-03 13:00:16 UTC
>X+++ cjeca32/Debug.cpp
>X@@ -141,7 +141,7 @@ CDebug Debug(0xffffffff);
>X
>X
>X
>X-#elif defined(OS_LINUX) || defined(OS_DARWIN)
>X+#elif defined(OS_LINUX) || defined(OS_DARWIN) || defined(OS_FREEBSD)
>X
>X #if defined(OS_DARWIN)
>X # define DEBUG_DEFAULT_LOGFILE "/Library/Logs/cj.log"
>92693147885718d2e8a89464886bb218
>echo x - pcsc-cyberjack/files/patch-include_driver_Platform__unix.h
>sed 's/^X//' >pcsc-cyberjack/files/patch-include_driver_Platform__unix.h << '0d584ffdbbc5a9a944a72eb39cd02f05'
>X--- include/driver/Platform_unix.h.orig	2021-11-03 13:00:16 UTC
>X+++ include/driver/Platform_unix.h
>X@@ -40,7 +40,7 @@
>X #include <string.h>
>X #include <stdint.h>
>X 
>X-#ifndef OS_DARWIN
>X+#if !defined(OS_DARWIN) && !defined(OS_FREEBSD)
>X # include <malloc.h>
>X #endif
>X 
>0d584ffdbbc5a9a944a72eb39cd02f05
>echo x - pcsc-cyberjack/files/patch-libcyberjack_checksuite_cm__distri.cpp
>sed 's/^X//' >pcsc-cyberjack/files/patch-libcyberjack_checksuite_cm__distri.cpp << 'd78c9fe8d3acbf5b8dbb56973142d725'
>X--- libcyberjack/checksuite/cm_distri.cpp.orig	2021-11-03 13:00:16 UTC
>X+++ libcyberjack/checksuite/cm_distri.cpp
>X@@ -10,8 +10,9 @@
>X  ***************************************************************************/
>X 
>X 
>X+#include "config.h"
>X+#include "Platform.h"
>X 
>X-
>X #include "cm_distri.h"
>X #include "checksuite.h"
>X 
>X@@ -21,6 +22,10 @@
>X #include <string.h>
>X #include <unistd.h>
>X 
>X+#ifdef OS_FREEBSD
>X+#include <sys/types.h>
>X+#include <sys/wait.h>
>X+#endif
>X 
>X 
>X bool CM_Distri::check(std::string &xmlString,
>d78c9fe8d3acbf5b8dbb56973142d725
>echo x - pcsc-cyberjack/files/patch-include_driver_Debug.h
>sed 's/^X//' >pcsc-cyberjack/files/patch-include_driver_Debug.h << 'b1b53aec943f7b6081f5489ec7484ca9'
>X--- include/driver/Debug.h.orig	2021-11-03 13:00:16 UTC
>X+++ include/driver/Debug.h
>X@@ -42,14 +42,14 @@ class CJECA32_PRIVATE_CLASS CDebug (public)
>X public:
>X 	~CDebug(void);
>X 
>X-#if defined(OS_LINUX) || defined(OS_DARWIN)
>X+#if defined(OS_LINUX) || defined(OS_DARWIN) || defined(OS_FREEBSD)
>X 	void setLevelMask(unsigned int nLevelMask);
>X 	void setLogFileName(const char *fname);
>X #endif
>X 	
>X private:
>X    unsigned int m_nLevelMask;
>X-#if defined(OS_LINUX) || defined(OS_DARWIN)
>X+#if defined(OS_LINUX) || defined(OS_DARWIN) || defined(OS_FREEBSD)
>X        char *m_logFileName;
>X #endif
>X };
>b1b53aec943f7b6081f5489ec7484ca9
>echo x - pcsc-cyberjack/files/patch-ifd-Makefile.am
>sed 's/^X//' >pcsc-cyberjack/files/patch-ifd-Makefile.am << '258bf727e8ae4f948f02d452a74b70b2'
>X--- ifd/Makefile.am.orig	2021-11-03 13:00:16 UTC
>X+++ ifd/Makefile.am
>X@@ -23,6 +23,11 @@ bundleosxdir=$(usbdropdir)/libifd-cyberjack.bundle/Con
>X bundleosx_LTLIBRARIES=libifd-cyberjack.la
>X endif
>X 
>X+if IS_FREEBSD
>X+bundlefreebsddir=$(usbdropdir)/libifd-cyberjack.bundle/Contents/FreeBSD
>X+bundlefreebsd_LTLIBRARIES=libifd-cyberjack.la
>X+endif
>X+
>X libifd_cyberjack_la_SOURCES=ifd.cpp
>X libifd_cyberjack_la_LDFLAGS=-version-info @CYBERJACK_SO_CURRENT@:@CYBERJACK_SO_REVISION@:@CYBERJACK_SO_AGE@ -no-undefined
>X #libifd_cyberjack_la_LIBADD=$(top_builddir)/cjeca32/libeca.la $(top_builddir)/cjeca32/ausb/libausb.la
>258bf727e8ae4f948f02d452a74b70b2
>echo x - pcsc-cyberjack/files/patch-cjeca32_RSCTCriticalSection.cpp
>sed 's/^X//' >pcsc-cyberjack/files/patch-cjeca32_RSCTCriticalSection.cpp << '902308f8fa705d2105f657836b5016d8'
>X--- cjeca32/RSCTCriticalSection.cpp.orig	2021-11-03 13:00:16 UTC
>X+++ cjeca32/RSCTCriticalSection.cpp
>X@@ -22,7 +22,7 @@ void CRSCTCriticalSection::Leave(void)
>X 	LeaveCriticalSection(&m_hCritSec);
>X }
>X 
>X-#elif defined(OS_LINUX)
>X+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
>X 
>X CRSCTCriticalSection::CRSCTCriticalSection(void){
>X }
>902308f8fa705d2105f657836b5016d8
>echo x - pcsc-cyberjack/files/patch-configure.ac
>sed 's/^X//' >pcsc-cyberjack/files/patch-configure.ac << '119e2d17e333297a3d81e9cb40b05776'
>X--- configure.ac.orig	2021-11-03 13:00:16 UTC
>X+++ configure.ac
>X@@ -221,6 +221,7 @@ fi
>X AM_CONDITIONAL(IS_WINDOWS, [test "$OS_TYPE" = "windows"])
>X AM_CONDITIONAL(IS_OSX, [test "$OSYSTEM" = "osx"])
>X AM_CONDITIONAL(IS_LINUX, [test "$OSYSTEM" = "linux"])
>X+AM_CONDITIONAL(IS_FREEBSD, [test "$OSYSTEM" = "freebsd"])
>X 
>X AC_SUBST(cyberjack_sys_is_windows)
>X AC_SUBST(cyberjack_config_file)
>119e2d17e333297a3d81e9cb40b05776
>echo x - pcsc-cyberjack/pkg-descr
>sed 's/^X//' >pcsc-cyberjack/pkg-descr << 'fa27a7853451296faa120302e5806d4d'
>XThis driver package contains a working PC/SC driver for
>Xthe Reiner SCT cyberJack card readers.
>fa27a7853451296faa120302e5806d4d
>echo x - pcsc-cyberjack/Makefile
>sed 's/^X//' >pcsc-cyberjack/Makefile << 'f6f41a2522897840ce56e53ded0f81df'
>XPORTNAME=	pcsc-cyberjack
>XDISTVERSION=	3.99.5final.SP15
>XCATEGORIES=	devel security
>XMASTER_SITES=	https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP15/
>XDISTNAME=	${PORTNAME}_${DISTVERSION}
>X
>XMAINTAINER=	tm@NetBSD.org
>XCOMMENT=	Reiner SCT cyberJack card reader pcsc driver
>XWWW=		https://www.reiner-sct.de
>X
>XLICENSE=	GPLv2 LGPL20
>XLICENSE_COMB=	dual
>XLICENSE_FILE_GPLv2=	${WRKSRC}/COPYRIGHT.GPL
>XLICENSE_FILE_LGPL20=	${WRKSRC}/COPYRIGHT.LGPL
>X
>XLIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite \
>X		libxml2.so:textproc/libxml2
>X
>XUSES=		dos2unix gmake libtool tar:bzip2 autoreconf compiler:gcc-c++11-lib
>X
>XUSE_LDCONFIG=	yes
>XGNU_CONFIGURE=	yes
>X
>XWRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
>X
>XCONFIGURE_ARGS=	--enable-release --with-usbdropdir=${PREFIX}/lib/pcsc/drivers
>XCONFIGURE_ENV=	LIBUSB_CFLAGS="-I${LOCALBASE}/include" \
>X		LIBUSB_LIBS="-L${LOCALBASE}/lib -lusb"
>XCXXFLAGS+=	-Wno-c++11-narrowing
>XCPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>XLDFLAGS+=	${PTHREAD_LIBS}
>X
>XPLIST_SUB=	VER=${PORTVERSION}
>X
>X.include <bsd.port.mk>
>f6f41a2522897840ce56e53ded0f81df
>echo x - pcsc-cyberjack/pkg-plist
>sed 's/^X//' >pcsc-cyberjack/pkg-plist << 'cc4d1408f9ab51fd1583f3d53d5d2472'
>Xlib/pcsc/drivers/libifd-cyberjack.bundle/Contents/FreeBSD/libifd-cyberjack.a
>Xlib/pcsc/drivers/libifd-cyberjack.bundle/Contents/FreeBSD/libifd-cyberjack.so
>Xlib/pcsc/drivers/libifd-cyberjack.bundle/Contents/FreeBSD/libifd-cyberjack.so.6
>Xlib/pcsc/drivers/libifd-cyberjack.bundle/Contents/FreeBSD/libifd-cyberjack.so.6.0.0
>Xlib/pcsc/drivers/libifd-cyberjack.bundle/Contents/Info.plist
>Xlib/pcsc/drivers/libifd-cyberjack.bundle/Contents/PkgInfo
>cc4d1408f9ab51fd1583f3d53d5d2472
>echo x - pcsc-cyberjack/distinfo
>sed 's/^X//' >pcsc-cyberjack/distinfo << '466ec9471d290dc67ffa5f8295d64893'
>XTIMESTAMP = 1667424080
>XSHA256 (pcsc-cyberjack_3.99.5final.SP15.tar.bz2) = acb7c2832450718756713767c4b3ef500832d652ed51b35110b910b11ebd467a
>XSIZE (pcsc-cyberjack_3.99.5final.SP15.tar.bz2) = 1681827
>466ec9471d290dc67ffa5f8295d64893
>exit
>

Actions: View

Attachments on bug 229361: 194672 | 208016 | 237958