svn commit: r399904 - in head/security/libbeid: . files
Tijl Coosemans
tijl at FreeBSD.org
Wed Oct 21 11:53:38 UTC 2015
Author: tijl
Date: Wed Oct 21 11:53:36 2015
New Revision: 399904
URL: https://svnweb.freebsd.org/changeset/ports/399904
Log:
Update to 4.1.8
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-configure.ac
head/security/libbeid/files/patch-dialogs
head/security/libbeid/files/patch-pkcs11
Modified: head/security/libbeid/Makefile
==============================================================================
--- head/security/libbeid/Makefile Wed Oct 21 11:03:47 2015 (r399903)
+++ head/security/libbeid/Makefile Wed Oct 21 11:53:36 2015 (r399904)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libbeid
-PORTVERSION= 4.1.2
+PORTVERSION= 4.1.8
DISTVERSIONPREFIX= v
CATEGORIES= security
@@ -27,7 +27,7 @@ DOS2UNIX_FILES= cardcomm/pkcs11/src/comm
cardcomm/pkcs11/src/log.h
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-static
+CONFIGURE_ARGS= --disable-static --with-gtkvers=2
INSTALL_TARGET= install-strip
post-patch:
Modified: head/security/libbeid/distinfo
==============================================================================
--- head/security/libbeid/distinfo Wed Oct 21 11:03:47 2015 (r399903)
+++ head/security/libbeid/distinfo Wed Oct 21 11:53:36 2015 (r399904)
@@ -1,2 +1,2 @@
-SHA256 (Fedict-eid-mw-v4.1.2_GH0.tar.gz) = 5332de389ef752553141419c62ead39dd521c8f1cde5b8e3350370de55084477
-SIZE (Fedict-eid-mw-v4.1.2_GH0.tar.gz) = 7412374
+SHA256 (Fedict-eid-mw-v4.1.8_GH0.tar.gz) = 229c3126e90453531df2f18419007580f3ff2f416f15bd1458e0a8c93800947b
+SIZE (Fedict-eid-mw-v4.1.8_GH0.tar.gz) = 7566483
Modified: head/security/libbeid/files/patch-cardlayer
==============================================================================
--- head/security/libbeid/files/patch-cardlayer Wed Oct 21 11:03:47 2015 (r399903)
+++ head/security/libbeid/files/patch-cardlayer Wed Oct 21 11:53:36 2015 (r399904)
@@ -1,21 +1,6 @@
---- 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
- {
-- size_t tmpHeader = fwrite(&header, sizeof(tCacheHeader), 1, f);
-- tmpHeader = tmpHeader; //avoid warning
-- size_t tmpData = fwrite(oData.GetBytes(), 1, oData.Size(), f);
-- tmpData = tmpData; //avoid warning
-+ (void)fwrite(&header, sizeof(tCacheHeader), 1, f);
-+ (void)fwrite(oData.GetBytes(), 1, oData.Size(), f);
- fclose(f);
- }
- }
---- cardcomm/pkcs11/src/cardlayer/card.cpp.orig 2015-02-19 13:59:02 UTC
+--- cardcomm/pkcs11/src/cardlayer/card.cpp.orig 2015-10-09 08:01:44 UTC
+++ cardcomm/pkcs11/src/cardlayer/card.cpp
-@@ -301,7 +301,7 @@ tCacheInfo CCard::GetCacheInfo(const std
+@@ -160,7 +160,7 @@ tCacheInfo CCard::GetCacheInfo(const std
{
// By default no caching, card must implement this method
// to allow certain files to be cached (in a certain way).
Modified: head/security/libbeid/files/patch-common
==============================================================================
--- head/security/libbeid/files/patch-common Wed Oct 21 11:03:47 2015 (r399903)
+++ head/security/libbeid/files/patch-common Wed Oct 21 11:53:36 2015 (r399904)
@@ -1,13 +1,3 @@
---- 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"
-
--const static unsigned long EXTRA_INCREMENT_LEN = 10;
-
- /***************** ByteArray **************************/
-
--- 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)
Modified: head/security/libbeid/files/patch-configure.ac
==============================================================================
--- head/security/libbeid/files/patch-configure.ac Wed Oct 21 11:03:47 2015 (r399903)
+++ head/security/libbeid/files/patch-configure.ac Wed Oct 21 11:53:36 2015 (r399904)
@@ -1,10 +1,10 @@
---- configure.ac.orig 2015-02-19 13:59:02 UTC
+--- configure.ac.orig 2015-10-09 08:01:44 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],
+- m4_esyscmd_s(echo "4.1.6-"$(git describe --dirty|sed -e 's/-/./g')),
++ [4.1.8-release],
[servicedesk at fedict.be],,
[http://eid.belgium.be])
@@ -15,12 +15,12 @@
-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])
+ PKG_CHECK_MODULES([PCSC],[libpcsclite >= 1.4.4],
+@@ -104,7 +103,6 @@ MAINVERSION=$(echo $PACKAGE_VERSION|sed
+ AC_DEFINE_UNQUOTED([MAINVERSION], $MAINVERSION, [do not change this])
+ AC_SUBST(MAINVERSION)
--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_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 rpm/eid-mw.spec])
-AC_CONFIG_SUBDIRS([plugins_tools/xpi])
+AC_CONFIG_FILES([Makefile cardcomm/pkcs11/src/Makefile])
Modified: head/security/libbeid/files/patch-dialogs
==============================================================================
--- head/security/libbeid/files/patch-dialogs Wed Oct 21 11:03:47 2015 (r399903)
+++ head/security/libbeid/files/patch-dialogs Wed Oct 21 11:53:36 2015 (r399904)
@@ -112,11 +112,11 @@
{"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].."},
---- cardcomm/pkcs11/src/dialogs/dialogsgtk/dlgs_gtk.cpp.orig 2015-02-19 13:59:02 UTC
+--- cardcomm/pkcs11/src/dialogs/dialogsgtk/dlgs_gtk.cpp.orig 2015-10-09 08:01:44 UTC
+++ cardcomm/pkcs11/src/dialogs/dialogsgtk/dlgs_gtk.cpp
-@@ -55,12 +55,14 @@ extern "C"
-
-
+@@ -48,12 +48,14 @@ extern "C"
+ void dlg_log_error(const char* label);
+ }
+static
bool MW_PERROR(tLevel level, tModule mod, const char* comment)
Modified: head/security/libbeid/files/patch-pkcs11
==============================================================================
--- head/security/libbeid/files/patch-pkcs11 Wed Oct 21 11:03:47 2015 (r399903)
+++ head/security/libbeid/files/patch-pkcs11 Wed Oct 21 11:53:36 2015 (r399904)
@@ -1,6 +1,6 @@
---- cardcomm/pkcs11/src/log.h.orig 2015-06-02 08:02:25 UTC
+--- cardcomm/pkcs11/src/log.h.orig 2015-10-21 10:16:26 UTC
+++ cardcomm/pkcs11/src/log.h
-@@ -60,42 +60,42 @@ typedef struct P11_MAP_TYPE
+@@ -64,42 +64,42 @@ typedef struct P11_MAP_TYPE
static P11_MAP_TYPE const P11_CLASS_TYPES[]=
{
@@ -71,7 +71,7 @@
};
static P11_MAP_TYPE const P11_ATTR_TYPES[]= {
-@@ -159,7 +159,7 @@ static P11_MAP_TYPE const P11_ATTR_TYPES
+@@ -163,7 +163,7 @@ static P11_MAP_TYPE const P11_ATTR_TYPES
{ CKA_RESET_ON_INIT, "CKA_RESET_ON_INIT", 0 },
{ CKA_HAS_RESET, "CKA_HAS_RESET", 0 },
{ CKA_VENDOR_DEFINED, "CKA_VENDOR_DEFINED", 0 },
More information about the svn-ports-head
mailing list