From owner-svn-ports-all@freebsd.org Tue Jan 23 10:48:50 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F3EAECA88F; Tue, 23 Jan 2018 10:48:50 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6192A74626; Tue, 23 Jan 2018 10:48:50 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9FA6557DA; Tue, 23 Jan 2018 10:48:49 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0NAmnbC094682; Tue, 23 Jan 2018 10:48:49 GMT (envelope-from ale@FreeBSD.org) Received: (from ale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0NAmnpX094679; Tue, 23 Jan 2018 10:48:49 GMT (envelope-from ale@FreeBSD.org) Message-Id: <201801231048.w0NAmnpX094679@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ale set sender to ale@FreeBSD.org using -f From: Alex Dupre Date: Tue, 23 Jan 2018 10:48:49 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: ale X-SVN-Commit-Paths: in head/security/pkcs11-dump: . files X-SVN-Commit-Revision: 459740 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jan 2018 10:48:50 -0000 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 (