Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Jan 2018 10:48:49 +0000 (UTC)
From:      Alex Dupre <ale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r459740 - in head/security/pkcs11-dump: . files
Message-ID:  <201801231048.w0NAmnpX094679@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ale
Date: Tue Jan 23 10:48:49 2018
New Revision: 459740
URL: https://svnweb.freebsd.org/changeset/ports/459740

Log:
  Try to fix build on -CURRENT and add LICENSE.

Added:
  head/security/pkcs11-dump/files/patch-pkcs11-dump.cpp   (contents, props changed)
Modified:
  head/security/pkcs11-dump/Makefile
  head/security/pkcs11-dump/files/patch-Makefile.in

Modified: head/security/pkcs11-dump/Makefile
==============================================================================
--- head/security/pkcs11-dump/Makefile	Tue Jan 23 10:35:25 2018	(r459739)
+++ head/security/pkcs11-dump/Makefile	Tue Jan 23 10:48:49 2018	(r459740)
@@ -9,7 +9,9 @@ MASTER_SITES=	https://github.com/alonbl/pkcs11-dump/re
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Allow dumping PKCS\#11 token content
 
-USES=	tar:bzip2 ssl
+LICENSE=	GPLv2
+
+USES=		tar:bzip2 ssl dos2unix
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \

Modified: head/security/pkcs11-dump/files/patch-Makefile.in
==============================================================================
--- head/security/pkcs11-dump/files/patch-Makefile.in	Tue Jan 23 10:35:25 2018	(r459739)
+++ head/security/pkcs11-dump/files/patch-Makefile.in	Tue Jan 23 10:48:49 2018	(r459740)
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2011-04-04 12:52:22.000000000 +0200
-+++ Makefile.in	2011-04-04 12:54:09.000000000 +0200
-@@ -73,8 +73,7 @@
+--- Makefile.in.orig	2018-01-23 10:46:50 UTC
++++ Makefile.in
+@@ -73,8 +73,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES = versioninfo.rc
@@ -10,7 +10,7 @@
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  PROGRAMS = $(bin_PROGRAMS)
  am_pkcs11_dump_OBJECTS = pkcs11-dump.$(OBJEXT)
-@@ -665,7 +664,7 @@
+@@ -665,7 +664,7 @@ check-am: all-am
  check: check-am
  all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h
  installdirs:
@@ -19,7 +19,7 @@
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-am
-@@ -715,8 +714,7 @@
+@@ -715,8 +714,7 @@ info: info-am
  
  info-am:
  

Added: head/security/pkcs11-dump/files/patch-pkcs11-dump.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/pkcs11-dump/files/patch-pkcs11-dump.cpp	Tue Jan 23 10:48:49 2018	(r459740)
@@ -0,0 +1,11 @@
+--- pkcs11-dump.cpp.orig	2018-01-23 10:46:55 UTC
++++ pkcs11-dump.cpp
+@@ -1136,7 +1136,7 @@ Dump (
+ 		for (int j=0;attrdescAttributes[j].nId!=-1;j++) {
+ 			char Buffer[10*1024];
+ 			CK_ATTRIBUTE t[] = {
+-				{attrdescAttributes[j].nId, Buffer, sizeof (Buffer)}
++				{(CK_ATTRIBUTE_TYPE)attrdescAttributes[j].nId, Buffer, sizeof (Buffer)}
+ 			};
+ 
+ 			if (



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801231048.w0NAmnpX094679>