svn commit: r453354 - in head/security/libbeid: . files

Tijl Coosemans tijl at FreeBSD.org
Thu Nov 2 18:11:31 UTC 2017 

Author: tijl
Date: Thu Nov  2 18:11:29 2017
New Revision: 453354
URL: https://svnweb.freebsd.org/changeset/ports/453354

Log:
  Update to 4.3.4.

Added:
  head/security/libbeid/files/patch-scripts_build-aux_genver.sh   (contents, props changed)
Deleted:
  head/security/libbeid/files/patch-cardlayer
Modified:
  head/security/libbeid/Makefile
  head/security/libbeid/distinfo
  head/security/libbeid/files/patch-Makefile.am
  head/security/libbeid/files/patch-configure.ac
  head/security/libbeid/files/patch-dialogs

Modified: head/security/libbeid/Makefile
==============================================================================
--- head/security/libbeid/Makefile	Thu Nov  2 17:26:23 2017	(r453353)
+++ head/security/libbeid/Makefile	Thu Nov  2 18:11:29 2017	(r453354)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libbeid
-PORTVERSION=	4.2.8
+PORTVERSION=	4.3.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
@@ -30,8 +30,12 @@ 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

Modified: head/security/libbeid/distinfo
==============================================================================
--- head/security/libbeid/distinfo	Thu Nov  2 17:26:23 2017	(r453353)
+++ head/security/libbeid/distinfo	Thu Nov  2 18:11:29 2017	(r453354)
@@ -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

Modified: head/security/libbeid/files/patch-Makefile.am
==============================================================================
--- head/security/libbeid/files/patch-Makefile.am	Thu Nov  2 17:26:23 2017	(r453353)
+++ head/security/libbeid/files/patch-Makefile.am	Thu Nov  2 18:11:29 2017	(r453354)
@@ -1,10 +1,14 @@
---- 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:

Modified: head/security/libbeid/files/patch-configure.ac
==============================================================================
--- head/security/libbeid/files/patch-configure.ac	Thu Nov  2 17:26:23 2017	(r453353)
+++ head/security/libbeid/files/patch-configure.ac	Thu Nov  2 18:11:29 2017	(r453354)
@@ -1,23 +1,15 @@
---- 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 at 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])
  
@@ -36,9 +28,9 @@
  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

Modified: head/security/libbeid/files/patch-dialogs
==============================================================================
--- head/security/libbeid/files/patch-dialogs	Thu Nov  2 17:26:23 2017	(r453353)
+++ head/security/libbeid/files/patch-dialogs	Thu Nov  2 18:11:29 2017	(r453354)
@@ -1,6 +1,17 @@
---- 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();
  

Added: head/security/libbeid/files/patch-scripts_build-aux_genver.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/libbeid/files/patch-scripts_build-aux_genver.sh	Thu Nov  2 18:11:29 2017	(r453354)
@@ -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

More information about the svn-ports-all mailing list