Date: Mon, 18 Apr 2011 12:03:18 GMT From: Marcin Cieslak <saper@saper.info> To: FreeBSD-gnats-submit@FreeBSD.org Cc: martin@libchipcard.de, bsdkaffee@gmail.com, jan0sch@gmx.net Subject: ports/156471: [PATCH] devel/libchipcard: [SUMMARIZE CHANGES] Message-ID: <201104181203.p3IC3HTF084089@radziecki.saper.info> Resent-Message-ID: <201104181210.p3ICADvp079088@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 156471 >Category: ports >Synopsis: [PATCH] devel/libchipcard: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Apr 18 12:10:12 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Marcin Cieslak >Release: FreeBSD 9.0-CURRENT amd64 >Organization: http://saper.info >Environment: System: FreeBSD radziecki.saper.info 9.0-CURRENT FreeBSD 9.0-CURRENT #1 r219785M: Mon Mar 21 11:40:40 CET >Description: Update libchipcard from 0.9.1 to 5.0.1test, as released 2010/11/13 There should be an /usr/ports/UPDATING entry added, as the architecture has changed - there is no longer a chipcardd daemon, client configuration file etc. and the config location has changed. This port has been tested to work sucessfully with aqbanking-5.0.5 and gwenhywfar-4.0.9 to use HBCI with Deutsche Bank WebSign card. This port installs drivers for libgwenhywfar for DDV and RSA cards. Added file(s): - files/patch-configure - files/patch-readerstate Removed file(s): - files/patch-src-libchipcard-cards-hbcicard.cpp Port maintainer (martin@libchipcard.de) is cc'd. Generated with FreeBSD Port Tools 0.99 Added file(s): - files/patch-configure - files/patch-readerstate Removed file(s): - files/patch-src-libchipcard-cards-hbcicard.cpp Port maintainer (martin@libchipcard.de) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- libchipcard-5.0.1.t.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/libchipcard/Makefile /usr/home/saper/FreeBSD/ports/libchipcard/Makefile --- /usr/ports/devel/libchipcard/Makefile 2010-12-04 08:31:13.000000000 +0100 +++ /usr/home/saper/FreeBSD/ports/libchipcard/Makefile 2011-04-18 13:59:29.000000000 +0200 @@ -6,35 +6,32 @@ # PORTNAME= libchipcard -PORTVERSION= 0.9.1 +DISTVERSION= 5.0.1test CATEGORIES= devel -MASTER_SITES= SF +MASTER_SITES= http://www.aquamaniac.de/sites/download/download.php?package=02&release=25&file=01&dummy= MAINTAINER= martin@libchipcard.de COMMENT= A library for easy access to chipcards -LIB_DEPENDS= pcsclite.1:${PORTSDIR}/devel/pcsc-lite +LIB_DEPENDS= pcsclite.1:${PORTSDIR}/devel/pcsc-lite \ + gwenhywfar.60:${PORTSDIR}/devel/gwenhywfar +FETCH_ARGS+= -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_OPENSSL= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" -CONFIGURE_ARGS+=--with-distri=freebsd - -MAN1= ctfstool.1 chipcardd.1 geldkarte.1 hbcicard.1 \ - kvkd.1 memcard.1 libchipcard-config.1 readertest.1 - -MAN5= libchipcard.conf.5 chipcardc.conf.5 chipcardd.conf.5 +CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" aq_distrib_name="FreeBSD" +CONFIGURE_ARGS+=--with-pcsc-includes=${LOCALBASE}/include \ + --with-pcsc-libs=${LOCALBASE}/lib +PLIST_SUB= GWEN_PLUGINS="${GWEN_PLUGINS}" +USE_LDCONFIG= yes -post-patch: - ${REINPLACE_CMD} -e "s,LPCSTR,LPCTSTR," ${WRKSRC}/src/libchipcard/engine/reader/ctdriver_pcsc.h - ${REINPLACE_CMD} -e "s,libpcsclite.so.0,libpcsclite.so.1,; \ - s,/usr/local/pcsc/include,${LOCALBASE}/include/PCSC," ${WRKSRC}/configure +GWEN_SHLIB_VER= 60 +GWEN_PLUGINS= ${LOCALBASE}/lib/gwenhywfar/plugins/${GWEN_SHLIB_VER} post-install: - @${INSTALL_SCRIPT} ${WRKSRC}/freebsd/chipcardd.sh ${PREFIX}/etc/rc.d @${SED} -e 's,%%PREFIX%%,${PREFIX},' ${PKGMESSAGE} .include <bsd.port.mk> diff -ruN --exclude=CVS /usr/ports/devel/libchipcard/distinfo /usr/home/saper/FreeBSD/ports/libchipcard/distinfo --- /usr/ports/devel/libchipcard/distinfo 2006-01-22 09:28:21.000000000 +0100 +++ /usr/home/saper/FreeBSD/ports/libchipcard/distinfo 2011-04-06 02:19:39.000000000 +0200 @@ -1,3 +1,2 @@ -MD5 (libchipcard-0.9.1.tar.gz) = 9de5833b693a5221a046d4fe7efcc4c6 -SHA256 (libchipcard-0.9.1.tar.gz) = 126284bc4aa2e931f84744210bb83163f13423d7a563d4fb8f5514983f597ad0 -SIZE (libchipcard-0.9.1.tar.gz) = 724733 +SHA256 (libchipcard-5.0.1test.tar.gz) = c4ea0408972bf906342a3f8d904a7ffa1f0f2df9f649377568fcbeef44ea02b7 +SIZE (libchipcard-5.0.1test.tar.gz) = 736433 diff -ruN --exclude=CVS /usr/ports/devel/libchipcard/files/patch-configure /usr/home/saper/FreeBSD/ports/libchipcard/files/patch-configure --- /usr/ports/devel/libchipcard/files/patch-configure 1970-01-01 01:00:00.000000000 +0100 +++ /usr/home/saper/FreeBSD/ports/libchipcard/files/patch-configure 2011-04-07 01:30:08.000000000 +0200 @@ -0,0 +1,11 @@ +--- configure.orig 2010-11-13 18:14:47.000000000 +0100 ++++ configure 2011-04-07 01:28:50.000000000 +0200 +@@ -16388,7 +16388,7 @@ + $as_echo_n "checking if symbol visibility is supported... " >&6; } + visibility_cflags="" + case `basename $CC` in +- gcc*) ++ cc|gcc*) + gccversion="` ${CC} --version | head -1 | ${SED} 's/.*\([0-9]\.[0-9]\.[0-9]*\).*/\1/' `" + case $gccversion in + 4.*) diff -ruN --exclude=CVS /usr/ports/devel/libchipcard/files/patch-readerstate /usr/home/saper/FreeBSD/ports/libchipcard/files/patch-readerstate --- /usr/ports/devel/libchipcard/files/patch-readerstate 1970-01-01 01:00:00.000000000 +0100 +++ /usr/home/saper/FreeBSD/ports/libchipcard/files/patch-readerstate 2011-04-18 13:51:05.000000000 +0200 @@ -0,0 +1,31 @@ +--- src/lib/client/base/client_p.h.orig 2011-04-18 13:47:27.000000000 +0200 ++++ src/lib/client/base/client_p.h 2011-04-18 13:47:49.000000000 +0200 +@@ -42,7 +42,7 @@ + SCARDCONTEXT scardContext; + + int pnpAvailable; +- SCARD_READERSTATE_A readerStates[MAX_READERS]; ++ SCARD_READERSTATE readerStates[MAX_READERS]; + int readerCount; + int lastUsedReader; + LPSTR readerList; +--- src/lib/client/base/client.c.orig 2011-04-18 13:50:21.000000000 +0200 ++++ src/lib/client/base/client.c 2011-04-18 13:50:42.000000000 +0200 +@@ -872,7 +872,7 @@ + DBG_INFO(LC_LOGDOMAIN, "Creating reader \"%s\"", p); + i=cl->readerCount; + /* preset */ +- memset((void*) &(cl->readerStates[i]), 0, sizeof(SCARD_READERSTATE_A)); ++ memset((void*) &(cl->readerStates[i]), 0, sizeof(SCARD_READERSTATE)); + cl->readerStates[i].szReader=p; + cl->readerStates[i].dwCurrentState=SCARD_STATE_UNAWARE; + /* reader added */ +@@ -948,7 +948,7 @@ + assert(cl); + + /* clear reader list and reader status list */ +- memset((void*) &cl->readerStates, 0, sizeof(SCARD_READERSTATE_A)*MAX_READERS); ++ memset((void*) &cl->readerStates, 0, sizeof(SCARD_READERSTATE)*MAX_READERS); + cl->readerCount=0; + free(cl->readerList); + cl->readerList=NULL; diff -ruN --exclude=CVS /usr/ports/devel/libchipcard/files/patch-src-libchipcard-cards-hbcicard.cpp /usr/home/saper/FreeBSD/ports/libchipcard/files/patch-src-libchipcard-cards-hbcicard.cpp --- /usr/ports/devel/libchipcard/files/patch-src-libchipcard-cards-hbcicard.cpp 2007-11-28 06:39:16.000000000 +0100 +++ /usr/home/saper/FreeBSD/ports/libchipcard/files/patch-src-libchipcard-cards-hbcicard.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ ---- src/libchipcard/cards/hbcicard.cpp.orig 2007-10-12 09:54:53.000000000 +0200 -+++ src/libchipcard/cards/hbcicard.cpp 2007-10-12 09:53:18.000000000 +0200 -@@ -684,8 +684,8 @@ - case k_HBCICARD_TYPE_1: - return _hash2mac1(hash,mac); - default: -- DBG_INFO("LIBCHIPCARD: unknown chip card type (%8x) (%d).", -- (unsigned int)this, -+ DBG_INFO("LIBCHIPCARD: unknown chip card type (%p) (%d).", -+ this, - _type); - return false; - } - diff -ruN --exclude=CVS /usr/ports/devel/libchipcard/pkg-message /usr/home/saper/FreeBSD/ports/libchipcard/pkg-message --- /usr/ports/devel/libchipcard/pkg-message 2005-04-20 14:42:04.000000000 +0200 +++ /usr/home/saper/FreeBSD/ports/libchipcard/pkg-message 2011-04-08 02:19:52.000000000 +0200 @@ -1,8 +1,7 @@ ******************************************************************************* * * -* Example configurations have been installed to: * +* Example configuration has been installed in: * * * -* %%PREFIX%%/share/libchipcard/examples/chipcardc.conf (client configuration) * -* %%PREFIX%%/share/libchipcard/examples/chipcardd.conf (daemon configuration) * +* %%PREFIX%%/etc/chipcard/chipcardc.conf * * * ******************************************************************************* diff -ruN --exclude=CVS /usr/ports/devel/libchipcard/pkg-plist /usr/home/saper/FreeBSD/ports/libchipcard/pkg-plist --- /usr/ports/devel/libchipcard/pkg-plist 2005-04-20 14:42:04.000000000 +0200 +++ /usr/home/saper/FreeBSD/ports/libchipcard/pkg-plist 2011-04-08 02:19:33.000000000 +0200 @@ -1,74 +1,93 @@ +bin/kvkcard bin/cardcommander -bin/ctfstool -bin/geldkarte -bin/hbcicard -bin/libchipcard-config bin/memcard -bin/readertest -etc/rc.d/chipcardd.sh -include/chameleon/chameleon.h -include/chameleon/conf.h -include/chameleon/cryp.h -include/chameleon/debug.h -include/chameleon/directory.h -include/chameleon/error.h -include/chameleon/inetaddr.h -include/chameleon/inetsocket.h -include/chameleon/ipcmessage.h -include/chameleon/ipcmessagelayer.h -include/chameleon/ipcservicelayer.h -include/chameleon/ipctransportlayer.h -include/chameleon/libloader.h -include/chameleon/logger.h -include/chipcard.h -include/chipcard/ctcard.h -include/chipcard/ctcardbase.h -include/chipcard/ctcardtrader.h -include/chipcard/ctcommand.h -include/chipcard/ctcore_public.h -include/chipcard/ctdatacache.h -include/chipcard/cterror.h -include/chipcard/ctfilesystem2.h -include/chipcard/ctgeldkarte.h -include/chipcard/ctinitializer.h -include/chipcard/ctkvkcard.h -include/chipcard/ctmemorycard.h -include/chipcard/ctmisc.h -include/chipcard/ctpointer.h -include/chipcard/ctprocessorcard.h -include/chipcard/ctreadercontext.h -include/chipcard/ctreadertrader.h -include/chipcard/cttlv.h -include/chipcard/ctversion.h -include/chipcard/hbcicard.h -include/chipcard/libchipcard.h -include/chipcard/rsacard.h -include/ctversion.h +bin/geldkarte +bin/chipcard-tool +bin/chipcard-config +etc/chipcard/chipcardc.conf.default +etc/chipcard/chipcardc.conf.example +include/libchipcard5/chipcard/card.h +include/libchipcard5/chipcard/card_imp.h +include/libchipcard5/chipcard/card_l.h +include/libchipcard5/chipcard/cards/ddvcard.h +include/libchipcard5/chipcard/cards/egkcard.h +include/libchipcard5/chipcard/cards/geldkarte.h +include/libchipcard5/chipcard/cards/geldkarte_blog.h +include/libchipcard5/chipcard/cards/geldkarte_llog.h +include/libchipcard5/chipcard/cards/geldkarte_values.h +include/libchipcard5/chipcard/cards/hiinsurancedata.h +include/libchipcard5/chipcard/cards/hipersonaldata.h +include/libchipcard5/chipcard/cards/kvkcard.h +include/libchipcard5/chipcard/cards/memorycard.h +include/libchipcard5/chipcard/cards/processorcard.h +include/libchipcard5/chipcard/cards/starcos.h +include/libchipcard5/chipcard/cards/starcos_keydescr.h +include/libchipcard5/chipcard/cards/zkacard.h +include/libchipcard5/chipcard/chipcard.h +include/libchipcard5/chipcard/client.h +include/libchipcard5/chipcard/ct/ct_card.h +include/libchipcard5/chipcard/sharedstuff/driverinfo.h +include/libchipcard5/chipcard/sharedstuff/misc.h +include/libchipcard5/chipcard/sharedstuff/msgengine.h +include/libchipcard5/chipcard/sharedstuff/pininfo.h +include/libchipcard5/chipcard/tlv.h +include/libchipcard5/chipcard/version.h lib/libchipcard.a lib/libchipcard.la lib/libchipcard.so -lib/libchipcard.so.20 -sbin/chipcardd -sbin/kvkd -share/aclocal/libchipcard.m4 -share/libchipcard/commands/ctcard.cmd -share/libchipcard/commands/ctgeldkarte.cmd -share/libchipcard/commands/ctkvkcard.cmd -share/libchipcard/commands/ctmemorycard.cmd -share/libchipcard/commands/ctprocessorcard.cmd -share/libchipcard/commands/hbcicard.cmd -share/libchipcard/commands/rsacard.cmd -share/libchipcard/drivers/README -share/libchipcard/drivers/ctapi-fake.dsc -share/libchipcard/drivers/cyberjack.dsc -share/libchipcard/drivers/kobil.dsc -share/libchipcard/drivers/orga.dsc -share/libchipcard/drivers/towitoko.dsc -share/libchipcard/examples/chipcardc.conf -share/libchipcard/examples/chipcardd.conf -@dirrm share/libchipcard/examples -@dirrm share/libchipcard/drivers -@dirrm share/libchipcard/commands -@dirrm share/libchipcard -@dirrm include/chipcard -@dirrm include/chameleon +lib/libchipcard.so.6 +share/aclocal/chipcard.m4 +share/chipcard/apps/README +share/chipcard/apps/ddv.xml +share/chipcard/apps/ddv0.xml +share/chipcard/apps/ddv1.xml +share/chipcard/apps/egk.xml +share/chipcard/apps/examplecard.xml +share/chipcard/apps/geldkarte.xml +share/chipcard/apps/kvkcard.xml +share/chipcard/apps/memorycard.xml +share/chipcard/apps/processorcard.xml +share/chipcard/apps/starcoscard-hvb.xml +share/chipcard/apps/starcoscard-vr.xml +share/chipcard/apps/starcoscard.xml +share/chipcard/apps/zkacard.xml +share/chipcard/cards/README +share/chipcard/cards/card.xml +share/chipcard/cards/cyberjack_pcsc/card.xml +share/chipcard/cards/cyberjack_pcsc/kvk.xml +share/chipcard/cards/cyberjack_pcsc/processorcard.xml +share/chipcard/cards/ddv0.xml +share/chipcard/cards/ddv1.xml +share/chipcard/cards/egk.xml +share/chipcard/cards/geldkarte.xml +share/chipcard/cards/generic_pcsc/card.xml +share/chipcard/cards/generic_pcsc/kvk.xml +share/chipcard/cards/generic_pcsc/processorcard.xml +share/chipcard/cards/kvkcard.xml +share/chipcard/cards/memorycard.xml +share/chipcard/cards/processorcard.xml +share/chipcard/cards/starcoscard.xml +share/chipcard/cards/zkacard.xml +share/chipcard/drivers/cyberjack_pcsc.xml +share/chipcard/drivers/generic_pcsc.xml +@dirrmtry share/chipcard/drivers +@dirrmtry share/chipcard/cards/generic_pcsc +@dirrmtry share/chipcard/cards/cyberjack_pcsc +@dirrmtry share/chipcard/cards +@dirrmtry share/chipcard/apps +@dirrmtry share/chipcard +@dirrmtry include/libchipcard5/chipcard/sharedstuff +@dirrmtry include/libchipcard5/chipcard/ct +@dirrmtry include/libchipcard5/chipcard/cards +@dirrmtry include/libchipcard5/chipcard +@dirrmtry include/libchipcard5 +@dirrmtry etc/chipcard +@cwd %%GWEN_PLUGINS%% +ct/ddvcard.a +ct/ddvcard.la +ct/ddvcard.so +ct/ddvcard.xml +ct/starcoscard.a +ct/starcoscard.la +ct/starcoscard.so +ct/starcoscard.xml --- libchipcard-5.0.1.t.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104181203.p3IC3HTF084089>