svn commit: r388311 - in head/security/libbeid: . files
Tijl Coosemans
tijl at FreeBSD.org
Tue Jun 2 09:23:18 UTC 2015
Author: tijl
Date: Tue Jun 2 09:23:15 2015
New Revision: 388311
URL: https://svnweb.freebsd.org/changeset/ports/388311
Log:
Update to 4.1.2
Added:
head/security/libbeid/files/patch-Makefile.am (contents, props changed)
head/security/libbeid/files/patch-configure.ac (contents, props changed)
Modified:
head/security/libbeid/Makefile
head/security/libbeid/distinfo
head/security/libbeid/files/patch-cardlayer
head/security/libbeid/files/patch-common
head/security/libbeid/files/patch-dialogs
head/security/libbeid/files/patch-pkcs11
head/security/libbeid/pkg-descr
head/security/libbeid/pkg-plist
Modified: head/security/libbeid/Makefile
==============================================================================
--- head/security/libbeid/Makefile Tue Jun 2 09:13:42 2015 (r388310)
+++ head/security/libbeid/Makefile Tue Jun 2 09:23:15 2015 (r388311)
@@ -1,30 +1,37 @@
# $FreeBSD$
PORTNAME= libbeid
-PORTVERSION= 4.0.6.1614
+PORTVERSION= 4.1.2
+DISTVERSIONPREFIX= v
CATEGORIES= security
-MASTER_SITES= http://tijl.fastmail.fm/mirror/
MAINTAINER= tijl at FreeBSD.org
-COMMENT= Belgian eID support libraries
+COMMENT= Belgian eID PKCS #11 module
LICENSE= LGPL3
+LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
-USES= autoreconf dos2unix libtool pkgconfig tar:xz
+USE_GITHUB= yes
+GH_ACCOUNT= Fedict
+GH_PROJECT= eid-mw
+
+USES= autoreconf dos2unix libtool pkgconfig
USE_GNOME= gtk20
-DOS2UNIX_FILES= common/src/datafile.cpp common/src/logbase.cpp \
- common/src/util.cpp dialogs/src/dialogs.h pkcs11/src/asn1.c \
- pkcs11/src/log.h pkcs11/src/cal.cpp pkcs11/src/cal.h
+DOS2UNIX_FILES= cardcomm/pkcs11/src/common/datafile.cpp \
+ cardcomm/pkcs11/src/common/logbase.cpp \
+ cardcomm/pkcs11/src/common/util.cpp \
+ cardcomm/pkcs11/src/dialogs/dialogs.h \
+ cardcomm/pkcs11/src/log.h
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-static
INSTALL_TARGET= install-strip
post-patch:
- @${REINPLACE_CMD} -e '/svn_revision/d' -e '/SUBDIRS/s/xpi//' \
- ${WRKSRC}/Makefile.am ${WRKSRC}/configure.ac
+ @${REINPLACE_CMD} '/^libbeidpkcs11_la_LIBADD =/s/-ldl//' \
+ ${WRKSRC}/cardcomm/pkcs11/src/Makefile.am
.include <bsd.port.mk>
Modified: head/security/libbeid/distinfo
==============================================================================
--- head/security/libbeid/distinfo Tue Jun 2 09:13:42 2015 (r388310)
+++ head/security/libbeid/distinfo Tue Jun 2 09:23:15 2015 (r388311)
@@ -1,2 +1,2 @@
-SHA256 (libbeid-4.0.6.1614.tar.xz) = 0f5c433aae3c7a9fd0bd324f1ffc58eca106f6090fef8c04f10f6bafe5712cbf
-SIZE (libbeid-4.0.6.1614.tar.xz) = 451560
+SHA256 (Fedict-eid-mw-v4.1.2_GH0.tar.gz) = 5332de389ef752553141419c62ead39dd521c8f1cde5b8e3350370de55084477
+SIZE (Fedict-eid-mw-v4.1.2_GH0.tar.gz) = 7412374
Added: head/security/libbeid/files/patch-Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/libbeid/files/patch-Makefile.am Tue Jun 2 09:23:15 2015 (r388311)
@@ -0,0 +1,11 @@
+--- Makefile.am.orig 2015-02-19 13:59:02 UTC
++++ Makefile.am
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I scripts/m4
+ EXTRA_DIST = scripts/build-aux/config.rpath debian build-debian.sh rpm doc
+
+-SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk
++SUBDIRS=cardcomm/pkcs11/src
+
+ xpipackage:
+ $(MAKE) -C plugins_tools/xpi xpipackage
Modified: head/security/libbeid/files/patch-cardlayer
==============================================================================
--- head/security/libbeid/files/patch-cardlayer Tue Jun 2 09:13:42 2015 (r388310)
+++ head/security/libbeid/files/patch-cardlayer Tue Jun 2 09:23:15 2015 (r388311)
@@ -1,7 +1,5 @@
-Index: cardlayer/src/cache.cpp
-===================================================================
---- cardlayer/src/cache.cpp (revision 1614)
-+++ cardlayer/src/cache.cpp (working copy)
+--- cardcomm/pkcs11/src/cardlayer/cache.cpp.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/cardlayer/cache.cpp
@@ -203,10 +203,8 @@ void CCache::DiskStoreFile(const std::st
; // TODO: log
else
@@ -15,10 +13,8 @@ Index: cardlayer/src/cache.cpp
fclose(f);
}
}
-Index: cardlayer/src/card.cpp
-===================================================================
---- cardlayer/src/card.cpp (revision 1614)
-+++ cardlayer/src/card.cpp (working copy)
+--- cardcomm/pkcs11/src/cardlayer/card.cpp.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/cardlayer/card.cpp
@@ -301,7 +301,7 @@ tCacheInfo CCard::GetCacheInfo(const std
{
// By default no caching, card must implement this method
@@ -28,10 +24,8 @@ Index: cardlayer/src/card.cpp
return dontCache;
}
-Index: cardlayer/src/pkcs15.cpp
-===================================================================
---- cardlayer/src/pkcs15.cpp (revision 1614)
-+++ cardlayer/src/pkcs15.cpp (working copy)
+--- cardcomm/pkcs11/src/cardlayer/pkcs15.cpp.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/cardlayer/pkcs15.cpp
@@ -27,7 +27,7 @@ namespace eIDMW
{
@@ -56,10 +50,8 @@ Index: cardlayer/src/pkcs15.cpp
m_poParser(NULL)
{
Clear();
-Index: cardlayer/src/pkcs15.h
-===================================================================
---- cardlayer/src/pkcs15.h (revision 1614)
-+++ cardlayer/src/pkcs15.h (working copy)
+--- cardcomm/pkcs11/src/cardlayer/pkcs15.h.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/cardlayer/pkcs15.h
@@ -90,7 +90,6 @@ namespace eIDMW
private:
@@ -68,11 +60,9 @@ Index: cardlayer/src/pkcs15.h
PKCS15Parser *m_poParser;
#ifdef WIN32
-Index: cardlayer/src/reader.cpp
-===================================================================
---- cardlayer/src/reader.cpp (revision 1614)
-+++ cardlayer/src/reader.cpp (working copy)
-@@ -280,8 +280,7 @@ std::string CReader::GetSerialNr()
+--- cardcomm/pkcs11/src/cardlayer/reader.cpp.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/cardlayer/reader.cpp
+@@ -284,8 +284,7 @@ std::string CReader::GetSerialNr()
}
catch(CMWException &e)
{
@@ -82,11 +72,9 @@ Index: cardlayer/src/reader.cpp
return m_oPKCS15.GetSerialNr();
}
}
-Index: cardlayer/src/threadpool.cpp
-===================================================================
---- cardlayer/src/threadpool.cpp (revision 1614)
-+++ cardlayer/src/threadpool.cpp (working copy)
-@@ -79,7 +79,7 @@ void CEventCallbackThread::Run()
+--- cardcomm/pkcs11/src/cardlayer/threadpool.cpp.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/cardlayer/threadpool.cpp
+@@ -81,7 +81,7 @@ void CEventCallbackThread::Run()
m_bRunning = false;
}
@@ -95,10 +83,8 @@ Index: cardlayer/src/threadpool.cpp
{
m_bStop = true;
}
-Index: cardlayer/src/threadpool.h
-===================================================================
---- cardlayer/src/threadpool.h (revision 1614)
-+++ cardlayer/src/threadpool.h (working copy)
+--- cardcomm/pkcs11/src/cardlayer/threadpool.h.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/cardlayer/threadpool.h
@@ -42,7 +42,7 @@ public:
void Run();
Modified: head/security/libbeid/files/patch-common
==============================================================================
--- head/security/libbeid/files/patch-common Tue Jun 2 09:13:42 2015 (r388310)
+++ head/security/libbeid/files/patch-common Tue Jun 2 09:23:15 2015 (r388311)
@@ -1,7 +1,5 @@
-Index: common/src/bytearrayreader.cpp
-===================================================================
---- common/src/bytearrayreader.cpp (revision 1614)
-+++ common/src/bytearrayreader.cpp (working copy)
+--- cardcomm/pkcs11/src/common/bytearrayreader.cpp.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/common/bytearrayreader.cpp
@@ -24,7 +24,6 @@
#include "bytearrayreader.h"
#include "bytearray.h"
@@ -10,10 +8,8 @@ Index: common/src/bytearrayreader.cpp
/***************** ByteArray **************************/
-Index: common/src/datafile.cpp
-===================================================================
---- common/src/datafile.cpp (revision 1614)
-+++ common/src/datafile.cpp (working copy)
+--- cardcomm/pkcs11/src/common/datafile.cpp.orig 2015-06-02 08:02:25 UTC
++++ cardcomm/pkcs11/src/common/datafile.cpp
@@ -249,8 +249,7 @@ bool CDataFile::Load(bool bLock)
while ( !bDone )
{
@@ -34,17 +30,13 @@ Index: common/src/datafile.cpp
return nLength;
}
-Index: common/src/logbase.cpp
-===================================================================
---- common/src/logbase.cpp.orig 2014-09-30 18:10:35 UTC
-+++ common/src/logbase.cpp
-@@ -29,12 +29,8 @@
- #include "mw_util.h"
+--- cardcomm/pkcs11/src/common/logbase.cpp.orig 2015-06-02 08:02:25 UTC
++++ cardcomm/pkcs11/src/common/logbase.cpp
+@@ -30,11 +30,7 @@
#ifndef WIN32
--#include <malloc.h>
+ #include <stdlib.h>
-#ifdef LINUX
-+#include <stdlib.h>
#include "wintypes.h"
-#else
-#include "PCSC/wintypes.h"
@@ -60,10 +52,8 @@ Index: common/src/logbase.cpp
m_f = fopen(utilStringNarrow(filename).c_str(),"a, ccs=UTF-8");
if (m_f == NULL) err=errno;
#endif
-Index: common/src/mw_util.h
-===================================================================
---- common/src/mw_util.h (revision 1614)
-+++ common/src/mw_util.h (working copy)
+--- cardcomm/pkcs11/src/common/mw_util.h.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/common/mw_util.h
@@ -38,7 +38,6 @@
#endif
@@ -72,11 +62,9 @@ Index: common/src/mw_util.h
#endif
#ifndef HAVE_ERRNO_T
-Index: common/src/util.cpp
-===================================================================
---- common/src/util.cpp (revision 1614)
-+++ common/src/util.cpp (working copy)
-@@ -348,7 +348,7 @@ void GetProcessName(wchar_t *wBuffer,uns
+--- cardcomm/pkcs11/src/common/util.cpp.orig 2015-06-02 08:02:25 UTC
++++ cardcomm/pkcs11/src/common/util.cpp
+@@ -376,7 +376,7 @@ void GetProcessName(wchar_t *wBuffer,uns
/* Get our PID and build the name of the link in /proc */
pid = getpid();
Added: head/security/libbeid/files/patch-configure.ac
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/libbeid/files/patch-configure.ac Tue Jun 2 09:23:15 2015 (r388311)
@@ -0,0 +1,27 @@
+--- configure.ac.orig 2015-02-19 13:59:02 UTC
++++ configure.ac
+@@ -1,6 +1,6 @@
+ AC_PREREQ([2.61])
+ AC_INIT([eid-mw],
+- m4_esyscmd_s(echo "4.1.2-"$(git describe --dirty|sed -e 's/-/./g')),
++ [4.1.2-release],
+ [servicedesk at fedict.be],,
+ [http://eid.belgium.be])
+
+@@ -26,7 +26,6 @@ AS_VAR_IF([GXX],[yes],[],AC_MSG_ERROR([G
+ # Checks for header files.
+ AC_CHECK_HEADERS([fcntl.h float.h limits.h netinet/in.h stdlib.h string.h sys/file.h sys/ioctl.h sys/time.h unistd.h malloc.h memory.h sys/timeb.h termios.h])
+
+-AM_GNU_GETTEXT([external])
+
+ ###### pcsc-lite ##########
+ AC_MSG_CHECKING([custom pcsc-lite installation])
+@@ -99,7 +98,6 @@ AC_DEFINE_UNQUOTED([HAVE_JPEGLIB], $HAVE
+ PKG_CHECK_MODULES(SSL, "openssl", [HAVE_OPENSSL=1], [HAVE_OPENSSL=0])
+ AC_DEFINE_UNQUOTED([HAVE_OPENSSL], $HAVE_OPENSSL, [Define to 1 if you have OpenSSL installed])
+
+-AC_CONFIG_FILES([Makefile cardcomm/pkcs11/src/Makefile tests/unit/Makefile plugins_tools/aboutmw/gtk/Makefile plugins_tools/aboutmw/gtk/about-eid-mw.desktop.sh plugins_tools/aboutmw/gtk/po/Makefile.in])
+-AC_CONFIG_SUBDIRS([plugins_tools/xpi])
++AC_CONFIG_FILES([Makefile cardcomm/pkcs11/src/Makefile])
+
+ AC_OUTPUT
Modified: head/security/libbeid/files/patch-dialogs
==============================================================================
--- head/security/libbeid/files/patch-dialogs Tue Jun 2 09:13:42 2015 (r388310)
+++ head/security/libbeid/files/patch-dialogs Tue Jun 2 09:23:15 2015 (r388311)
@@ -1,7 +1,5 @@
-Index: dialogs/src/dialogs.h
-===================================================================
---- dialogs/src/dialogs.h (revision 1614)
-+++ dialogs/src/dialogs.h (working copy)
+--- cardcomm/pkcs11/src/dialogs/dialogs.h.orig 2015-06-02 08:02:25 UTC
++++ cardcomm/pkcs11/src/dialogs/dialogs.h
@@ -27,6 +27,7 @@
#ifndef __DIALOGS_H__
#define __DIALOGS_H__
@@ -10,11 +8,9 @@ Index: dialogs/src/dialogs.h
#include <string>
#ifdef WIN32
-Index: dialogs/src/dialogsgtk/beid-askaccess.c
-===================================================================
---- dialogs/src/dialogsgtk/beid-askaccess.c (revision 1614)
-+++ dialogs/src/dialogsgtk/beid-askaccess.c (working copy)
-@@ -32,7 +32,7 @@
+--- cardcomm/pkcs11/src/dialogs/dialogsgtk/beid-askaccess.c.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/dialogs/dialogsgtk/beid-askaccess.c
+@@ -31,7 +31,7 @@
enum { MSG_ACCESS_CARD_TITLE=1, MSG_ACCESS_CARD_QUESTION };
@@ -23,11 +19,9 @@ Index: dialogs/src/dialogsgtk/beid-askac
{"en", "beID: Card Access", "The application [%s] wants to access the eID card. Do you want to accept it?"},
{"nl", "beID: Lezen Kaart", "Het Programma [%s] vraagt toegang tot de eID kaart. Wil U dit toelaten?"},
{"fr", "beID: Lecture de Carte", "l'application [%s] essaye d'accéder à la carte eID. Acceptez-vous?"},
-Index: dialogs/src/dialogsgtk/beid-askpin.c
-===================================================================
---- dialogs/src/dialogsgtk/beid-askpin.c (revision 1614)
-+++ dialogs/src/dialogsgtk/beid-askpin.c (working copy)
-@@ -35,7 +35,7 @@
+--- cardcomm/pkcs11/src/dialogs/dialogsgtk/beid-askpin.c.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/dialogs/dialogsgtk/beid-askpin.c
+@@ -34,7 +34,7 @@
#define EXIT_ERROR 2
enum { MSG_PIN_CODE_REQUIRED=1, MSG_PLEASE_ENTER_PIN };
@@ -36,7 +30,7 @@ Index: dialogs/src/dialogsgtk/beid-askpi
{"en", "beID: PIN Code Required", "The application\n[%s]\nrequests your eID PIN code."},
{"nl", "beID: PINcode Vereist", "Het programma\n[%s]\nvraagt uw eID PINcode"},
{"fr", "beID: Code PIN Necessaire", "l'application\n[%s]\nvous demande votre code PIN eID"},
-@@ -58,7 +58,7 @@ typedef struct
+@@ -57,7 +57,7 @@ typedef struct
///////////////////////////////////////////////////////////////////////////////////////////
void update_pin_label(PinDialogInfo *pindialog)
{
@@ -45,19 +39,17 @@ Index: dialogs/src/dialogsgtk/beid-askpi
gchar tmp[MAX_PIN_LENGTH*6];
tmp[0]='\0';
for(i=0;i<strlen(pindialog->pin);i++)
-Index: dialogs/src/dialogsgtk/beid-badpin.c
-===================================================================
---- dialogs/src/dialogsgtk/beid-badpin.c (revision 1614)
-+++ dialogs/src/dialogsgtk/beid-badpin.c (working copy)
+--- cardcomm/pkcs11/src/dialogs/dialogsgtk/beid-badpin.c.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/dialogs/dialogsgtk/beid-badpin.c
@@ -16,6 +16,7 @@
* http://www.gnu.org/licenses/.
**************************************************************************** */
+#include <ctype.h>
#include <gtk/gtk.h>
- #include <gtk/gtkenums.h>
#include <gdk/gdkkeysyms.h>
-@@ -31,7 +32,7 @@
+ #include <glib.h>
+@@ -30,7 +31,7 @@
#define EXIT_ERROR 2
enum msgs { MSG_INCORRECT_PIN_CODE=1, MSG_N_ATTEMPTS_LEFT, MSG_LAST_ATTEMPT };
@@ -66,19 +58,17 @@ Index: dialogs/src/dialogsgtk/beid-badpi
{"en", "beID: Incorrect PIN Code", "You have entered an incorrect PIN code.\nPlease note that you have only %d attempts left before your PIN is blocked.", "You have entered an incorrect PIN code.\nPlease note that at the next incorrect entry your PIN code will be blocked."},
{"nl", "beID: Foutive PINcode", "U hebt een foutive PIN code ingegeven.\nGelieve te noteren dat u nog slechts %d pogingen hebt alvorens uw PIN code geblokkeerd wordt.", "U hebt een foutive PIN code ingegeven.\nGelieve te noteren dat bij de volgende incorrecte ingave uw PIN code geblokkeerd wordt."},
{"fr", "beID: Code PIN incorrect", "Vous avez entré un code PIN incorrect.\nVeuillez noter qu'il ne vous reste plus que %d tentatives avant que votre PIN soit bloqué", "Vous avez entré un code PIN incorrect.\nVieullez noter qu'a la prochaine entree incorrecte votre code PIN sera bloqué"},
-Index: dialogs/src/dialogsgtk/beid-changepin.c
-===================================================================
---- dialogs/src/dialogsgtk/beid-changepin.c (revision 1614)
-+++ dialogs/src/dialogsgtk/beid-changepin.c (working copy)
+--- cardcomm/pkcs11/src/dialogs/dialogsgtk/beid-changepin.c.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/dialogs/dialogsgtk/beid-changepin.c
@@ -17,6 +17,7 @@
* http://www.gnu.org/licenses/.
**************************************************************************** */
+#include <ctype.h>
#include <gtk/gtk.h>
- #include <gtk/gtkenums.h>
#include <gdk/gdkkeysyms.h>
-@@ -37,7 +38,7 @@
+ #include <glib.h>
+@@ -36,7 +37,7 @@
#define EXIT_ERROR 2
enum { MSG_CHANGE_PIN_CODE=1, MSG_PLEASE_ENTER_OLD_AND_NEW_PINS, MSG_CURRENT_PIN, MSG_NEW_PIN, MSG_NEW_PIN_AGAIN };
@@ -87,10 +77,8 @@ Index: dialogs/src/dialogsgtk/beid-chang
{"en", "beID: Change PIN Code", "Request from Application [%s]:\n\nPlease enter your current eID PIN, followed by your new eID PIN (twice)", "Current PIN:", "New PIN:", "New PIN (again):"},
{"nl", "beID: PIN Code Wijzigen", "Verzoek van programma [%s]:\n\nGelieve Uw bestaande eID PIN code, en tweemaal uw nieuwe eID PINcode in te voeren.", "Huidige PIN:", "Nieuwe PIN:", "Nieuwe PIN (opnieuw):"},
{"fr", "beID: Changement de code PIN", "Demande de l'application [%s]:\n\nVeuillez entrer votre code PIN eID existant, suivi de votre nouveau code PIN eID (2 fois)", "Code PIN existant:", "Nouveau code PIN:","Nouveau code PIN (verification):"},
-Index: dialogs/src/dialogsgtk/beid-i18n.h
-===================================================================
---- dialogs/src/dialogsgtk/beid-i18n.h (revision 1614)
-+++ dialogs/src/dialogsgtk/beid-i18n.h (working copy)
+--- cardcomm/pkcs11/src/dialogs/dialogsgtk/beid-i18n.h.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/dialogs/dialogsgtk/beid-i18n.h
@@ -1,7 +1,7 @@
-char* _MSG_(int msgnum)
+char const *_MSG_(int msgnum)
@@ -102,11 +90,9 @@ Index: dialogs/src/dialogsgtk/beid-i18n.
if(lang!=NULL && strlen(lang)==5 && lang[2]=='_')
{
int i;
-Index: dialogs/src/dialogsgtk/beid-spr-askpin.c
-===================================================================
---- dialogs/src/dialogsgtk/beid-spr-askpin.c (revision 1614)
-+++ dialogs/src/dialogsgtk/beid-spr-askpin.c (working copy)
-@@ -34,7 +34,7 @@
+--- cardcomm/pkcs11/src/dialogs/dialogsgtk/beid-spr-askpin.c.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/dialogs/dialogsgtk/beid-spr-askpin.c
+@@ -33,7 +33,7 @@
#define EXIT_ERROR 2
enum { MSG_PIN_CODE_REQUIRED=1, MSG_PLEASE_ENTER_PIN };
@@ -115,11 +101,9 @@ Index: dialogs/src/dialogsgtk/beid-spr-a
{"en", "beID: PIN Code Required", "The application [%s] requests your eID PIN code on the secure pinpad reader:\n[%s].."},
{"nl", "beID: PINcode Vereist", "Het programma [%s] vraagt uw eID PIN code in te geven op de beveiligde kaartlezer:\n[%s]."},
{"fr", "beID: Code PIN Necessaire", "l'application [%s] vous demande d'entrer votre code PIN eID sur le lecteur securise\n[%s].."},
-Index: dialogs/src/dialogsgtk/beid-spr-changepin.c
-===================================================================
---- dialogs/src/dialogsgtk/beid-spr-changepin.c (revision 1614)
-+++ dialogs/src/dialogsgtk/beid-spr-changepin.c (working copy)
-@@ -34,7 +34,7 @@
+--- cardcomm/pkcs11/src/dialogs/dialogsgtk/beid-spr-changepin.c.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/dialogs/dialogsgtk/beid-spr-changepin.c
+@@ -33,7 +33,7 @@
#define EXIT_ERROR 2
enum { MSG_CHANGE_PIN_CODE=1, MSG_PLEASE_CHANGE_PIN };
@@ -128,16 +112,14 @@ Index: dialogs/src/dialogsgtk/beid-spr-c
{"en", "beID: Change PIN Code", "Request from Application [%s]:\n\nPlease change your eID PIN code on the secure pinpad reader:\n[%s].."},
{"nl", "beID: Wijziging PINcode", "Verzoek van programma [%s]:\n\nGelieve uw eID PIN code op de beveiligde kaartlezer:\n[%s]\nte willen wijzigen."},
{"fr", "beID: Changement de code PIN", "Demande de l'application [%s]:\n\nVeuillez changer votre code PIN eID sur le lecteur securise\n[%s].."},
-Index: dialogs/src/dialogsgtk/dlgs_gtk.cpp
-===================================================================
---- dialogs/src/dialogsgtk/dlgs_gtk.cpp (revision 1614)
-+++ dialogs/src/dialogsgtk/dlgs_gtk.cpp (working copy)
-@@ -56,12 +56,13 @@ extern "C"
+--- cardcomm/pkcs11/src/dialogs/dialogsgtk/dlgs_gtk.cpp.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/dialogs/dialogsgtk/dlgs_gtk.cpp
+@@ -55,12 +55,14 @@ extern "C"
--bool MW_PERROR(tLevel level, tModule mod, char* comment)
-+static bool MW_PERROR(tLevel level, tModule mod, char const *comment)
++static
+ bool MW_PERROR(tLevel level, tModule mod, const char* comment)
{
char err_txt[256],log_txt[1024];
wchar_t wide_log_txt[1024];
@@ -148,10 +130,8 @@ Index: dialogs/src/dialogsgtk/dlgs_gtk.c
mbstowcs(wide_log_txt,log_txt,sizeof(wide_log_txt)/sizeof(wchar_t));
return MWLOG(level,mod,wide_log_txt);
}
-Index: dialogs/src/dialogsgtk/parent.c
-===================================================================
---- dialogs/src/dialogsgtk/parent.c (revision 1614)
-+++ dialogs/src/dialogsgtk/parent.c (working copy)
+--- cardcomm/pkcs11/src/dialogs/dialogsgtk/parent.c.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/dialogs/dialogsgtk/parent.c
@@ -1,4 +1,6 @@
+#include <stdio.h>
#include <stdlib.h>
@@ -168,10 +148,8 @@ Index: dialogs/src/dialogsgtk/parent.c
if((exec_path_len=readlink(proc_path,exec_path,exec_path_size-1))!=-1)
exec_path[exec_path_len]='\0';
return exec_path_len;
-Index: dialogs/src/dialogsgtk/parent.h
-===================================================================
---- dialogs/src/dialogsgtk/parent.h (revision 1614)
-+++ dialogs/src/dialogsgtk/parent.h (working copy)
+--- cardcomm/pkcs11/src/dialogs/dialogsgtk/parent.h.orig 2015-02-19 13:59:02 UTC
++++ cardcomm/pkcs11/src/dialogs/dialogsgtk/parent.h
@@ -1,2 +1,4 @@
+#include <sys/types.h>
+
Modified: head/security/libbeid/files/patch-pkcs11
==============================================================================
--- head/security/libbeid/files/patch-pkcs11 Tue Jun 2 09:13:42 2015 (r388310)
+++ head/security/libbeid/files/patch-pkcs11 Tue Jun 2 09:23:15 2015 (r388311)
@@ -1,102 +1,5 @@
-Index: pkcs11/src/asn1.c
-===================================================================
---- pkcs11/src/asn1.c (revision 1614)
-+++ pkcs11/src/asn1.c (working copy)
-@@ -253,7 +253,7 @@ for (; *p_cPath; p_cPath++)
- /* check if we are decoding inside a BIT STRING: iNumTag == parent_tag */
- /* first octet of bit string is the number of unused bits at the end of the bitstring */
- /* in CER/DER: unused bits are always zero. And if they aren't zero, we still don't need to know the nr. of unused bits */
-- if ((iNumTag == 0x03) )
-+ if (iNumTag == 0x03)
- {
- p_cDat++;
- iLen--;
-Index: pkcs11/src/cal.cpp
-===================================================================
---- pkcs11/src/cal.cpp (revision 1614)
-+++ pkcs11/src/cal.cpp (working copy)
-@@ -945,7 +945,7 @@ CK_RV cal_get_card_data(CK_SLOT_ID hSlot
- std::string szReader;
- // char cBuffer[250];
- // unsigned char ucBuffer[250];
-- char* plabel = NULL;
-+ char const *plabel = NULL;
- CTLVBuffer oTLVBuffer;
- P11_SLOT *pSlot = NULL;
- CK_ATTRIBUTE ID_DATA[]= BEID_TEMPLATE_ID_DATA;
-@@ -1141,8 +1141,8 @@ CK_RV cal_read_ID_files(CK_SLOT_ID hSlot
- std::string szReader;
- char cBuffer[256];
- // unsigned char ucBuffer[250];
-- char* plabel = NULL;
-- char* pobjectID = NULL;
-+ char const *plabel = NULL;
-+ char const *pobjectID = NULL;
- unsigned long ulLen=0;
- CTLVBuffer oTLVBuffer;
- CTLVBuffer oTLVBufferAddress;//need second buffer object, as memory is only freed when this object is destructed
-@@ -1176,7 +1176,7 @@ CK_RV cal_read_ID_files(CK_SLOT_ID hSlot
- pobjectID = BEID_OBJECTID_ID;
- ret = p11_add_slot_ID_object(pSlot, ID_DATA, sizeof(ID_DATA)/sizeof(CK_ATTRIBUTE), CK_TRUE, CKO_DATA, CK_FALSE, &hObject,
- (CK_VOID_PTR)plabel, (CK_ULONG)strlen(plabel),(CK_VOID_PTR) oFileData.GetBytes(),(CK_ULONG)oFileData.Size(),
-- pobjectID, (CK_ULONG)strlen(pobjectID));
-+ (CK_VOID_PTR)pobjectID, (CK_ULONG)strlen(pobjectID));
- if (ret) goto cleanup;
-
- oTLVBuffer.ParseTLV(oFileData.GetBytes(), oFileData.Size());
-@@ -1190,7 +1190,7 @@ CK_RV cal_read_ID_files(CK_SLOT_ID hSlot
- oTLVBuffer.FillUTF8Data(ID_LABELS[i].tag, cBuffer, &ulLen);
- plabel = ID_LABELS[i].name;
- ret = p11_add_slot_ID_object(pSlot, ID_DATA, sizeof(ID_DATA)/sizeof(CK_ATTRIBUTE), CK_TRUE, CKO_DATA, CK_FALSE, &hObject,
-- (CK_VOID_PTR)plabel, (CK_ULONG)strlen(plabel),(CK_VOID_PTR) cBuffer,ulLen,pobjectID, (CK_ULONG)strlen(pobjectID));
-+ (CK_VOID_PTR)plabel, (CK_ULONG)strlen(plabel),(CK_VOID_PTR) cBuffer,ulLen,(CK_VOID_PTR)pobjectID, (CK_ULONG)strlen(pobjectID));
- if (ret) goto cleanup;
- }
- if(dataType != CACHED_DATA_TYPE_ALL){
-@@ -1202,7 +1202,7 @@ CK_RV cal_read_ID_files(CK_SLOT_ID hSlot
- pobjectID = BEID_OBJECTID_ADDRESS;
- ret = p11_add_slot_ID_object(pSlot, ID_DATA, sizeof(ID_DATA)/sizeof(CK_ATTRIBUTE), CK_TRUE, CKO_DATA, CK_FALSE, &hObject,
- (CK_VOID_PTR)plabel, (CK_ULONG)strlen(plabel),(CK_VOID_PTR) oFileData.GetBytes(),(CK_ULONG)oFileData.Size(),
-- pobjectID, (CK_ULONG)strlen(pobjectID));
-+ (CK_VOID_PTR)pobjectID, (CK_ULONG)strlen(pobjectID));
- if (ret) goto cleanup;
- oTLVBufferAddress.ParseTLV(oFileData.GetBytes(), oFileData.Size());
- nrOfItems = sizeof(ADDRESS_LABELS)/sizeof(BEID_DATA_LABELS_NAME);
-@@ -1214,7 +1214,7 @@ CK_RV cal_read_ID_files(CK_SLOT_ID hSlot
- plabel = ADDRESS_LABELS[i].name;
- ret = p11_add_slot_ID_object(pSlot, ID_DATA, sizeof(ID_DATA)/sizeof(CK_ATTRIBUTE), CK_TRUE, CKO_DATA, CK_FALSE, &hObject,
- (CK_VOID_PTR)plabel, (CK_ULONG)strlen(plabel),(CK_VOID_PTR) cBuffer,ulLen,
-- pobjectID, (CK_ULONG)strlen(pobjectID));
-+ (CK_VOID_PTR)pobjectID, (CK_ULONG)strlen(pobjectID));
- if (ret) goto cleanup;
- }
- if(dataType != CACHED_DATA_TYPE_ALL){
-@@ -1226,7 +1226,7 @@ CK_RV cal_read_ID_files(CK_SLOT_ID hSlot
- oFileData = oReader.ReadFile(BEID_FILE_PHOTO);
- ret = p11_add_slot_ID_object(pSlot, ID_DATA, sizeof(ID_DATA)/sizeof(CK_ATTRIBUTE), CK_TRUE, CKO_DATA, CK_FALSE, &hObject,
- (CK_VOID_PTR)plabel, (CK_ULONG)strlen(plabel),(CK_VOID_PTR) oFileData.GetBytes(),(CK_ULONG)oFileData.Size(),
-- pobjectID, (CK_ULONG)strlen(BEID_OBJECTID_PHOTO));
-+ (CK_VOID_PTR)pobjectID, (CK_ULONG)strlen(BEID_OBJECTID_PHOTO));
- if (ret) goto cleanup;
- if(dataType != CACHED_DATA_TYPE_ALL){
- break;
-Index: pkcs11/src/cal.h
-===================================================================
---- pkcs11/src/cal.h (revision 1614)
-+++ pkcs11/src/cal.h (working copy)
-@@ -184,7 +184,7 @@ extern "C" {
-
- typedef struct BEID_DATA_LABELS_NAME {
- unsigned char tag;
-- char* name;
-+ char const * name;
- }BEID_DATA_LABELS_NAME;
-
- #define BEID_LABEL_DATA_FILE "DATA_FILE"
-Index: pkcs11/src/log.h
-===================================================================
---- pkcs11/src/log.h (revision 1614)
-+++ pkcs11/src/log.h (working copy)
+--- cardcomm/pkcs11/src/log.h.orig 2015-06-02 08:02:25 UTC
++++ cardcomm/pkcs11/src/log.h
@@ -60,42 +60,42 @@ typedef struct P11_MAP_TYPE
static P11_MAP_TYPE const P11_CLASS_TYPES[]=
Modified: head/security/libbeid/pkg-descr
==============================================================================
--- head/security/libbeid/pkg-descr Tue Jun 2 09:13:42 2015 (r388310)
+++ head/security/libbeid/pkg-descr Tue Jun 2 09:23:15 2015 (r388311)
@@ -1,4 +1,3 @@
-Support libraries for Belgian government-issued electronic identity cards.
-A PKCS #11 module is included that can be used with Mozilla Firefox.
+PKCS #11 module for Belgian government-issued electronic identity cards.
-WWW: https://code.google.com/p/eid-mw/
+WWW: https://github.com/Fedict/eid-mw/
Modified: head/security/libbeid/pkg-plist
==============================================================================
--- head/security/libbeid/pkg-plist Tue Jun 2 09:13:42 2015 (r388310)
+++ head/security/libbeid/pkg-plist Tue Jun 2 09:23:15 2015 (r388311)
@@ -1,8 +1,3 @@
-lib/libbeidcardlayer.so
-lib/libbeidcommon.so
-lib/libbeidcommon.so.0
-lib/libbeidcommon.so.0.0.0
-lib/libbeiddialogs.so
lib/libbeidpkcs11.so
lib/libbeidpkcs11.so.0
lib/libbeidpkcs11.so.0.0.0
More information about the svn-ports-all
mailing list