Attachment 208016 Details for Bug 229361 – pcsc-cyberjack shar-file

pcsc-cyberjack shar-file

pcsc-cyberjack.shar (text/plain), 9.23 KB, created by Thomas Merkel on 2019-10-02 10:11:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Merkel

Created: 2019-10-02 10:11:15 UTC

Size: 9.23 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/pkg-descr
>#	pcsc-cyberjack/Makefile
>#	pcsc-cyberjack/distinfo
>#	pcsc-cyberjack/pkg-plist
>#	pcsc-cyberjack/files
>#	pcsc-cyberjack/files/patch-dialog.c
>#	pcsc-cyberjack/files/patch-Platform_unix.h
>#	pcsc-cyberjack/files/patch-os_freebsd
>#	pcsc-cyberjack/files/patch-cm_distri.cpp
>#	pcsc-cyberjack/files/patch-configure.ac
>#	pcsc-cyberjack/files/patch-ifd-Makefile.am
>#
>echo c - pcsc-cyberjack
>mkdir -p pcsc-cyberjack > /dev/null 2>&1
>echo x - pcsc-cyberjack/pkg-descr
>sed 's/^X//' >pcsc-cyberjack/pkg-descr << 'fa27a7853451296faa120302e5806d4d'
>Xpcsc-lite driver for the Reiner SCT cyberJack card readers
>fa27a7853451296faa120302e5806d4d
>echo x - pcsc-cyberjack/Makefile
>sed 's/^X//' >pcsc-cyberjack/Makefile << 'f6f41a2522897840ce56e53ded0f81df'
>X# $FreeBSD$
>X
>XPORTNAME=	pcsc-cyberjack
>X#PORTVERSION=	3.99.5.12
>XDISTVERSION=	3.99.5final.SP12
>XCATEGORIES=	security
>XMASTER_SITES=	http://downloads.reiner-sct.de/LINUX/V3.99.5_SP12/
>X
>XMAINTAINER=	tm@NetBSD.org
>XCOMMENT=	Reiner SCT cyberJack card reader pcsc driver
>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=	gmake libtool tar:bzip2 autoreconf compiler:gcc-c++11-lib
>X
>XUSE_LDCONFIG=	yes
>XGNU_CONFIGURE=	yes
>X
>XWRKSRC=		${WRKDIR}/pcsc-cyberjack-${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/distinfo
>sed 's/^X//' >pcsc-cyberjack/distinfo << '466ec9471d290dc67ffa5f8295d64893'
>XTIMESTAMP = 1530015110
>XSHA256 (pcsc-cyberjack-3.99.5final.SP12.tar.bz2) = 32dc370111119a86ca598154b82b72d8c0a003dd09342a6d2fda14aa96aff312
>XSIZE (pcsc-cyberjack-3.99.5final.SP12.tar.bz2) = 957583
>466ec9471d290dc67ffa5f8295d64893
>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 c - pcsc-cyberjack/files
>mkdir -p pcsc-cyberjack/files > /dev/null 2>&1
>echo x - pcsc-cyberjack/files/patch-dialog.c
>sed 's/^X//' >pcsc-cyberjack/files/patch-dialog.c << 'd6d63cde7db6ef19f84da4ab25e83934'
>X--- libcyberjack/libdialog/dialog.c.orig	2011-11-11 08:13:13.000000000 +0100
>X+++ libcyberjack/libdialog/dialog.c	2013-01-19 23:05:27.659736536 +0100
>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 @@
>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 @@
>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 @@
>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) {
>d6d63cde7db6ef19f84da4ab25e83934
>echo x - pcsc-cyberjack/files/patch-Platform_unix.h
>sed 's/^X//' >pcsc-cyberjack/files/patch-Platform_unix.h << '8aa03ac35ce7f8be514492392c11e288'
>X--- include/driver/Platform_unix.h.orig	2013-01-19 22:19:15.826736863 +0100
>X+++ include/driver/Platform_unix.h	2013-01-19 22:20:42.815736285 +0100
>X@@ -39,7 +39,7 @@
>X #include <ctype.h>
>X #include <string.h>
>X 
>X-#ifndef OS_DARWIN
>X+#if !defined(OS_DARWIN) && !defined(OS_FREEBSD)
>X # include <malloc.h>
>X #endif
>X 
>8aa03ac35ce7f8be514492392c11e288
>echo x - pcsc-cyberjack/files/patch-os_freebsd
>sed 's/^X//' >pcsc-cyberjack/files/patch-os_freebsd << '144eb7ef03cbc18d3dba582c9660d23d'
>X--- cjeca32/Debug.cpp.orig	2013-01-19 22:30:58.983736881 +0100
>X+++ cjeca32/Debug.cpp	2013-01-19 22:35:24.457770463 +0100
>X@@ -139,7 +139,7 @@
>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"
>X--- cjeca32/RSCTCriticalSection.cpp.orig	2013-01-19 22:30:58.986736570 +0100
>X+++ cjeca32/RSCTCriticalSection.cpp	2013-01-19 22:33:42.206737418 +0100
>X@@ -22,7 +22,7 @@
>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 }
>X--- include/driver/Debug.h.orig	2013-01-19 22:30:58.992736009 +0100
>X+++ include/driver/Debug.h	2013-01-19 22:35:43.141747628 +0100
>X@@ -42,14 +42,14 @@
>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 };
>144eb7ef03cbc18d3dba582c9660d23d
>echo x - pcsc-cyberjack/files/patch-cm_distri.cpp
>sed 's/^X//' >pcsc-cyberjack/files/patch-cm_distri.cpp << '6760d90dd450e586aa40b6970746d78b'
>X--- libcyberjack/checksuite/cm_distri.cpp.orig	2018-06-26 14:29:27.056505000 +0200
>X+++ libcyberjack/checksuite/cm_distri.cpp	2018-06-26 14:30:14.869438000 +0200
>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,
>6760d90dd450e586aa40b6970746d78b
>echo x - pcsc-cyberjack/files/patch-configure.ac
>sed 's/^X//' >pcsc-cyberjack/files/patch-configure.ac << '119e2d17e333297a3d81e9cb40b05776'
>X--- configure.ac.orig	2018-06-26 15:26:28.648441000 +0200
>X+++ configure.ac	2018-06-26 15:26:51.565030000 +0200
>X@@ -219,6 +219,7 @@
>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/files/patch-ifd-Makefile.am
>sed 's/^X//' >pcsc-cyberjack/files/patch-ifd-Makefile.am << '258bf727e8ae4f948f02d452a74b70b2'
>X--- ifd/Makefile.am.orig	2018-06-26 15:11:01.895689000 +0200
>X+++ ifd/Makefile.am	2018-06-26 15:11:49.437588000 +0200
>X@@ -23,6 +23,11 @@
>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
>exit
>

Actions: View

Attachments on bug 229361: 194672 | 208016 | 237958