Index: head/security/libbeid/Makefile =================================================================== --- head/security/libbeid/Makefile (revision 453353) +++ head/security/libbeid/Makefile (revision 453354) @@ -1,42 +1,46 @@ # $FreeBSD$ PORTNAME= libbeid -PORTVERSION= 4.2.8 +PORTVERSION= 4.3.4 DISTVERSIONPREFIX= v CATEGORIES= security MAINTAINER= tijl@FreeBSD.org COMMENT= Belgian eID PKCS #11 module LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite USE_GITHUB= yes GH_ACCOUNT= Fedict GH_PROJECT= eid-mw USES= autoreconf gettext-tools libtool pkgconfig USE_GNOME= gtk30 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-p11kit --disable-static --with-gtkvers=3 INSTALL_TARGET= install-strip OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext-runtime +post-patch: + @${ECHO_CMD} ${PORTVERSION}-release > ${WRKSRC}/.version + post-install: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/pkgconfig + ${RM} -r ${STAGEDIR}${PREFIX}/lib/mozilla + ${RM} -r ${STAGEDIR}${PREFIX}/libdata/pkgconfig ${MKDIR} ${STAGEDIR}${PREFIX}/lib/pkcs11 ${LN} -s ../libbeidpkcs11.so.0 \ ${STAGEDIR}${PREFIX}/lib/pkcs11/beidpkcs11.so ${MKDIR} ${STAGEDIR}${PREFIX}/share/p11-kit/modules ${INSTALL_DATA} ${WRKSRC}/cardcomm/pkcs11/src/beid.module \ ${STAGEDIR}${PREFIX}/share/p11-kit/modules .include Index: head/security/libbeid/distinfo =================================================================== --- head/security/libbeid/distinfo (revision 453353) +++ head/security/libbeid/distinfo (revision 453354) @@ -1,3 +1,3 @@ -TIMESTAMP = 1494948688 -SHA256 (Fedict-eid-mw-v4.2.8_GH0.tar.gz) = 6b998bd14897f640e29f9140ee457ea963162a409c7aff646e3346b0b0ae2e65 -SIZE (Fedict-eid-mw-v4.2.8_GH0.tar.gz) = 7076407 +TIMESTAMP = 1509642563 +SHA256 (Fedict-eid-mw-v4.3.4_GH0.tar.gz) = 3f89c490fa53a56e3f7a0ae17adb2b7cecfd19f258dd818e8570b6e4b3fdc9ab +SIZE (Fedict-eid-mw-v4.3.4_GH0.tar.gz) = 7516859 Index: head/security/libbeid/files/patch-cardlayer =================================================================== --- head/security/libbeid/files/patch-cardlayer (revision 453353) +++ head/security/libbeid/files/patch-cardlayer (nonexistent) @@ -1,22 +0,0 @@ ---- cardcomm/pkcs11/src/cardlayer/threadpool.cpp.orig 2017-05-10 13:28:54 UTC -+++ cardcomm/pkcs11/src/cardlayer/threadpool.cpp -@@ -90,7 +90,7 @@ void CEventCallbackThread::Run() - m_bRunning = false; - } - --void CEventCallbackThread::Stop() -+void CEventCallbackThread::Stop(unsigned long ulSleepFrequency) - { - m_bStop = true; - } ---- cardcomm/pkcs11/src/cardlayer/threadpool.h.orig 2017-05-10 13:28:54 UTC -+++ cardcomm/pkcs11/src/cardlayer/threadpool.h -@@ -47,7 +47,7 @@ public: - - void Run(); - -- void Stop(); -+ void Stop(unsigned long ulSleepFrequency=100); - - bool HasStopped(); - Property changes on: head/security/libbeid/files/patch-cardlayer ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/libbeid/files/patch-Makefile.am =================================================================== --- head/security/libbeid/files/patch-Makefile.am (revision 453353) +++ head/security/libbeid/files/patch-Makefile.am (revision 453354) @@ -1,11 +1,15 @@ ---- Makefile.am.orig 2017-05-10 13:28:54 UTC +--- Makefile.am.orig 2017-10-27 12:42:43 UTC +++ Makefile.am -@@ -1,7 +1,7 @@ +@@ -1,11 +1,7 @@ ACLOCAL_AMFLAGS = -I scripts/m4 EXTRA_DIST = scripts/build-aux/config.rpath scripts/build-aux/genver.sh .version debian rpm doc --SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer +-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi +- +-if GTK +-SUBDIRS += plugins_tools/aboutmw/gtk plugins_tools/eid-viewer +-endif +SUBDIRS=cardcomm/pkcs11/src xpipackage: $(MAKE) -C plugins_tools/xpi xpipackage Index: head/security/libbeid/files/patch-configure.ac =================================================================== --- head/security/libbeid/files/patch-configure.ac (revision 453353) +++ head/security/libbeid/files/patch-configure.ac (revision 453354) @@ -1,56 +1,48 @@ ---- configure.ac.orig 2017-05-10 13:28:54 UTC +--- configure.ac.orig 2017-10-27 12:42:43 UTC +++ configure.ac -@@ -1,6 +1,6 @@ - AC_PREREQ([2.61]) - AC_INIT([eid-mw], -- m4_esyscmd_s(scripts/build-aux/genver.sh), -+ [4.2.8-release], - [servicedesk@fedict.be],, - [http://eid.belgium.be]) - -@@ -64,8 +64,6 @@ then - AC_MSG_ERROR([At least one version of GTK is required.]) +@@ -70,8 +70,6 @@ fi + AM_CONDITIONAL(GTK, [test "$have_gtk" != "no"]) + if test "$have_gtk" != "no" + then +- PKG_CHECK_MODULES([XML2], [libxml-2.0]) +- PKG_CHECK_MODULES([libproxy], [libproxy-1.0]) fi --PKG_CHECK_MODULES([XML2], [libxml-2.0]) --PKG_CHECK_MODULES([libproxy], [libproxy-1.0]) - ########################################################################### - ####### read user-specific requests from --enable directives ###### -@@ -105,18 +103,6 @@ AC_FUNC_MALLOC +@@ -119,18 +117,6 @@ AC_FUNC_MALLOC AC_FUNC_REALLOC AC_CHECK_FUNCS([gethostbyname socket strerror ftime memchr memset mkdir select strchr strdup strerror strncasecmp strrchr strstr strtol strtoul vasprintf]) -# we only need libjpeg for the test suite, so don't worry if it's not available... -AC_CHECK_LIB(jpeg, jpeg_mem_src, [HAVE_JPEGLIB=1; JPEG_LIBS='-ljpeg'], [HAVE_JPEGLIB=0]) -AM_CONDITIONAL([JPEG], [test x$HAVE_JPEGLIB = x1]) -AC_SUBST([JPEG_LIBS]) -AC_DEFINE_UNQUOTED([HAVE_JPEGLIB], $HAVE_JPEGLIB, [Define to 1 if you have libjpeg installed]) - -PKG_CHECK_MODULES(SSL, "openssl", [HAVE_OPENSSL=1]) -PKG_CHECK_VAR(SSL_PREFIX, "openssl", "exec_prefix",, AC_MSG_ERROR([Could not find exec_prefix for openssl])) -AC_DEFINE_UNQUOTED([HAVE_OPENSSL], $HAVE_OPENSSL, [Define to 1 if you have OpenSSL installed]) -AC_SUBST(SSL_PREFIX) - -PKG_CHECK_MODULES(CURL, "libcurl", [HAVE_CURL=1]) MAINVERSION=$(echo $PACKAGE_VERSION|sed -e 's/-.*$//') AC_DEFINE_UNQUOTED([MAINVERSION], $MAINVERSION, [do not change this]) AC_SUBST(MAINVERSION) -@@ -159,16 +145,6 @@ AC_CONFIG_FILES([Makefile - cardcomm/pkcs11/src/Makefile +@@ -174,16 +160,6 @@ AC_CONFIG_FILES([Makefile cardcomm/pkcs11/src/libbeidpkcs11.pc + cardcomm/pkcs11/src/beidpkcs11.json cardcomm/pkcs11/src/dialogs/dialogsgtk/po/Makefile.in - doc/sdk/include/rsaref220/Makefile - tests/unit/Makefile - plugins_tools/util/Makefile - plugins_tools/aboutmw/gtk/Makefile - plugins_tools/aboutmw/gtk/po/Makefile.in - plugins_tools/eid-viewer/Makefile - plugins_tools/eid-viewer/test/Makefile - plugins_tools/eid-viewer/gtk/po/Makefile.in - plugins_tools/eid-viewer/gtk/eid-viewer.desktop.sh - rpm/eid-mw.spec]) -AC_CONFIG_SUBDIRS([plugins_tools/xpi]) + ]) AC_OUTPUT Index: head/security/libbeid/files/patch-dialogs =================================================================== --- head/security/libbeid/files/patch-dialogs (revision 453353) +++ head/security/libbeid/files/patch-dialogs (revision 453354) @@ -1,11 +1,22 @@ ---- cardcomm/pkcs11/src/dialogs/dialogsgtk/parent.c.orig 2017-05-10 13:28:54 UTC +--- cardcomm/pkcs11/src/dialogs/dialogsgtk/beid-badpin.c.orig 2017-10-27 12:42:43 UTC ++++ cardcomm/pkcs11/src/dialogs/dialogsgtk/beid-badpin.c +@@ -43,7 +43,7 @@ int main(int argc, char *argv[]) { + // create new message dialog with CANCEL button in standard places, in center of user's screen + /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +- char* msg; ++ char const *msg; + int attempts; + + if ((argc == 2) && (argv[1] != NULL) && (strlen(argv[1]) == 1) +--- cardcomm/pkcs11/src/dialogs/dialogsgtk/parent.c.orig 2017-10-27 12:42:43 UTC +++ cardcomm/pkcs11/src/dialogs/dialogsgtk/parent.c -@@ -12,7 +12,7 @@ ssize_t get_parent_path(char *exec_path, +@@ -12,7 +12,7 @@ ssize_t get_parent_path(char *exec_path, size_t exec_p ssize_t exec_path_len = -1; pid_t ppid = getppid(); - snprintf(proc_path, sizeof(proc_path) - 1, "/proc/%d/exe", ppid); + snprintf(proc_path, sizeof(proc_path) - 1, "/proc/%d/file", ppid); if ((exec_path_len = readlink(proc_path, exec_path, exec_path_size - 1)) != -1) { exec_path[exec_path_len] = '\0'; } else { Index: head/security/libbeid/files/patch-scripts_build-aux_genver.sh =================================================================== --- head/security/libbeid/files/patch-scripts_build-aux_genver.sh (nonexistent) +++ head/security/libbeid/files/patch-scripts_build-aux_genver.sh (revision 453354) @@ -0,0 +1,16 @@ +--- scripts/build-aux/genver.sh.orig 2017-10-27 12:42:43 UTC ++++ scripts/build-aux/genver.sh +@@ -1,11 +1,11 @@ + #!/bin/sh + +-GITDESC=$(git describe --dirty|sed -e 's/-/./g' 2>/dev/null) ++GITDESC=$(git describe --dirty 2>/dev/null | sed -e 's/-/./g') + VERCLEAN=$(echo $GITDESC|sed -Ee 's/^.*v([0-9]+\.[0-9]+(\.[0-9]+|bp)).*$/\1/') + + GITDESC="$VERCLEAN-$GITDESC" + +-if [ -z "$GITDESC" ]; then ++if [ "$GITDESC" = "-" ]; then + if [ -f ".version" ]; then + GITDESC=$(cat .version) + else Property changes on: head/security/libbeid/files/patch-scripts_build-aux_genver.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property