diff options
author | Hiroki Sato <hrs@FreeBSD.org> | 2016-05-18 17:19:40 +0000 |
---|---|---|
committer | Hiroki Sato <hrs@FreeBSD.org> | 2016-05-18 17:19:40 +0000 |
commit | 10c3aa0757d552917cab78b7f314f748b8268be8 (patch) | |
tree | 39ec2b2ccdcc01701125097638ce7dab483cea87 /security | |
parent | Create new port graphics/py3-pygraphviz: (diff) |
Update to 1.3.8.
Notes
Notes:
svn path=/head/; revision=415458
Diffstat (limited to 'security')
-rw-r--r-- | security/tpm-tools/Makefile | 6 | ||||
-rw-r--r-- | security/tpm-tools/distinfo | 5 | ||||
-rw-r--r-- | security/tpm-tools/files/patch-lib-Makefile.am | 11 | ||||
-rw-r--r-- | security/tpm-tools/files/patch-lib-Makefile.in | 20 | ||||
-rw-r--r-- | security/tpm-tools/files/patch-lib-tpm_utils.c | 8 | ||||
-rw-r--r-- | security/tpm-tools/files/patch-src-cmds-Makefile.am | 10 | ||||
-rw-r--r-- | security/tpm-tools/files/patch-src-cmds-Makefile.in | 10 | ||||
-rw-r--r-- | security/tpm-tools/files/patch-src-data_mgmt-Makefile.am | 11 | ||||
-rw-r--r-- | security/tpm-tools/files/patch-src-data_mgmt-Makefile.in | 11 | ||||
-rw-r--r-- | security/tpm-tools/files/patch-src-data_mgmt-data_protect.c | 6 | ||||
-rw-r--r-- | security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvread.c | 10 | ||||
-rw-r--r-- | security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvwrite.c | 27 | ||||
-rw-r--r-- | security/tpm-tools/files/patch-src-tpm_mgmt-tpm_present.c | 6 | ||||
-rw-r--r-- | security/tpm-tools/files/patch-src-tpm_mgmt-tpm_takeownership.c | 6 | ||||
-rw-r--r-- | security/tpm-tools/pkg-plist | 44 |
15 files changed, 146 insertions, 45 deletions
diff --git a/security/tpm-tools/Makefile b/security/tpm-tools/Makefile index e240f2487f8b..3b22b5711dd1 100644 --- a/security/tpm-tools/Makefile +++ b/security/tpm-tools/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tpm-tools -PORTVERSION= 1.3.5 -PORTREVISION= 3 +PORTVERSION= 1.3.8 CATEGORIES= security MASTER_SITES= SF/trousers/${PORTNAME}/${PORTVERSION} @@ -24,9 +23,10 @@ USES= gettext gmake iconv libtool USE_LDCONFIG= YES GNU_CONFIGURE= YES LIBS+= -L${LOCALBASE}/lib -lintl +INSTALL_TARGET= install-strip post-patch: @${REINPLACE_CMD} '/^libtpm_unseal_la_LIBADD =/s/$$/ -lcrypto/' \ - ${WRKSRC}/lib/Makefile.in + ${WRKSRC}/lib/Makefile.in .include <bsd.port.mk> diff --git a/security/tpm-tools/distinfo b/security/tpm-tools/distinfo index ccf684a2125c..5593970244fc 100644 --- a/security/tpm-tools/distinfo +++ b/security/tpm-tools/distinfo @@ -1,2 +1,3 @@ -SHA256 (tpm-tools-1.3.5.tar.gz) = 60717336302bffff5044ed945a79f07594962fa3b989cf37f6eb042874d8fc45 -SIZE (tpm-tools-1.3.5.tar.gz) = 439922 +TIMESTAMP = 1463578786 +SHA256 (tpm-tools-1.3.8.tar.gz) = 66eb4ff095542403db6b4bd4b574e8a5c08084fe4e9e5aa9a829ee84e20bea83 +SIZE (tpm-tools-1.3.8.tar.gz) = 473339 diff --git a/security/tpm-tools/files/patch-lib-Makefile.am b/security/tpm-tools/files/patch-lib-Makefile.am new file mode 100644 index 000000000000..30a2845499a7 --- /dev/null +++ b/security/tpm-tools/files/patch-lib-Makefile.am @@ -0,0 +1,11 @@ +--- lib/Makefile.am.orig 2012-05-17 17:50:39 UTC ++++ lib/Makefile.am +@@ -44,7 +44,7 @@ libtpm_utils_la_SOURCES = tpm_utils.c \ + # + # TSPI interface library + libtpm_tspi_la_SOURCES = tpm_tspi.c +-libtpm_tspi_la_LIBADD = libtpm_utils.la -ldl ++libtpm_tspi_la_LIBADD = libtpm_utils.la + + # + # PKCS#11 interface library diff --git a/security/tpm-tools/files/patch-lib-Makefile.in b/security/tpm-tools/files/patch-lib-Makefile.in new file mode 100644 index 000000000000..07904a9866a7 --- /dev/null +++ b/security/tpm-tools/files/patch-lib-Makefile.in @@ -0,0 +1,20 @@ +--- lib/Makefile.in.orig 2012-05-17 19:09:27 UTC ++++ lib/Makefile.in +@@ -298,7 +298,7 @@ libtpm_utils_la_SOURCES = tpm_utils.c \ + # + # TSPI interface library + libtpm_tspi_la_SOURCES = tpm_tspi.c +-libtpm_tspi_la_LIBADD = libtpm_utils.la -ldl ++libtpm_tspi_la_LIBADD = libtpm_utils.la + @P11_SUPPORT_TRUE@libtpm_pkcs11_la_SOURCES = tpm_pkcs11.c + @P11_SUPPORT_TRUE@libtpm_pkcs11_la_LIBADD = libtpm_utils.la + +@@ -327,7 +327,7 @@ libtpm_tspi_la_LIBADD = libtpm_utils.la + # Unseal library - for addition to existing apps, counter part of seal cmd + libtpm_unseal_la_SOURCES = tpm_unseal.c + libtpm_unseal_la_LDFLAGS = -shared -version-info 1:0:0 +-libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la ++libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la -lcrypto + all: all-am + + .SUFFIXES: diff --git a/security/tpm-tools/files/patch-lib-tpm_utils.c b/security/tpm-tools/files/patch-lib-tpm_utils.c index 944a9d7190c6..aa3b584a66c8 100644 --- a/security/tpm-tools/files/patch-lib-tpm_utils.c +++ b/security/tpm-tools/files/patch-lib-tpm_utils.c @@ -1,6 +1,6 @@ ---- lib/tpm_utils.c.orig 2010-02-02 02:17:23.000000000 +0900 -+++ lib/tpm_utils.c 2013-07-24 22:00:15.000000000 +0900 -@@ -55,6 +55,7 @@ +--- lib/tpm_utils.c.orig 2010-09-30 17:28:09 UTC ++++ lib/tpm_utils.c +@@ -55,6 +55,7 @@ genericOptHandler( int a_iNumArgs, char CmdHelpFunction tCmdHelp = ( a_tCmdHelpFunction ) ? a_tCmdHelpFunction : logCmdHelp; @@ -8,7 +8,7 @@ char szShortOpts[strlen( pszGenShortOpts ) + ( ( a_pszShortOpts == NULL ) ? 0 : strlen( a_pszShortOpts ) ) + 1]; -@@ -64,12 +65,36 @@ +@@ -64,12 +65,36 @@ genericOptHandler( int a_iNumArgs, char int iOpt; int rc; diff --git a/security/tpm-tools/files/patch-src-cmds-Makefile.am b/security/tpm-tools/files/patch-src-cmds-Makefile.am index fb9a9b2727ca..5d7b6d075850 100644 --- a/security/tpm-tools/files/patch-src-cmds-Makefile.am +++ b/security/tpm-tools/files/patch-src-cmds-Makefile.am @@ -1,11 +1,11 @@ ---- src/cmds/Makefile.am.orig 2010-02-02 02:17:23.000000000 +0900 -+++ src/cmds/Makefile.am 2010-10-25 01:55:31.067559744 +0900 -@@ -30,7 +30,7 @@ +--- src/cmds/Makefile.am.orig 2011-08-15 17:52:08 UTC ++++ src/cmds/Makefile.am +@@ -30,7 +30,7 @@ else AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX endif --LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -+LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la +-LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto ++LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -lcrypto tpm_sealdata_SOURCES = tpm_sealdata.c tpm_unsealdata_SOURCES = tpm_unsealdata.c diff --git a/security/tpm-tools/files/patch-src-cmds-Makefile.in b/security/tpm-tools/files/patch-src-cmds-Makefile.in index df7974a5ecb6..c5dca7605a53 100644 --- a/security/tpm-tools/files/patch-src-cmds-Makefile.in +++ b/security/tpm-tools/files/patch-src-cmds-Makefile.in @@ -1,11 +1,11 @@ ---- src/cmds/Makefile.in.orig 2010-02-02 05:59:31.000000000 +0900 -+++ src/cmds/Makefile.in 2010-10-25 01:55:31.069555531 +0900 -@@ -242,7 +242,7 @@ +--- src/cmds/Makefile.in.orig 2012-05-17 19:09:27 UTC ++++ src/cmds/Makefile.in +@@ -245,7 +245,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @TSS_LIB_IS_12_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX @TSS_LIB_IS_12_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX -DTSS_LIB_IS_12 --LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -+LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la +-LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto ++LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -lcrypto tpm_sealdata_SOURCES = tpm_sealdata.c tpm_unsealdata_SOURCES = tpm_unsealdata.c all: all-am diff --git a/security/tpm-tools/files/patch-src-data_mgmt-Makefile.am b/security/tpm-tools/files/patch-src-data_mgmt-Makefile.am new file mode 100644 index 000000000000..59e59879f42f --- /dev/null +++ b/security/tpm-tools/files/patch-src-data_mgmt-Makefile.am @@ -0,0 +1,11 @@ +--- src/data_mgmt/Makefile.am.orig 2012-05-17 17:50:29 UTC ++++ src/data_mgmt/Makefile.am +@@ -38,7 +38,7 @@ noinst_HEADERS = data_common.h \ + # Common build flags + AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX + +-LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl ++LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi + + + # diff --git a/security/tpm-tools/files/patch-src-data_mgmt-Makefile.in b/security/tpm-tools/files/patch-src-data_mgmt-Makefile.in new file mode 100644 index 000000000000..ad9ba4954c84 --- /dev/null +++ b/security/tpm-tools/files/patch-src-data_mgmt-Makefile.in @@ -0,0 +1,11 @@ +--- src/data_mgmt/Makefile.in.orig 2012-05-17 19:09:27 UTC ++++ src/data_mgmt/Makefile.in +@@ -274,7 +274,7 @@ noinst_HEADERS = data_common.h \ + # + # Common build flags + AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX +-LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl ++LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi + + # + # TPM Token initialization command diff --git a/security/tpm-tools/files/patch-src-data_mgmt-data_protect.c b/security/tpm-tools/files/patch-src-data_mgmt-data_protect.c index 5e6c765dbae9..0b9e66b15171 100644 --- a/security/tpm-tools/files/patch-src-data_mgmt-data_protect.c +++ b/security/tpm-tools/files/patch-src-data_mgmt-data_protect.c @@ -1,6 +1,6 @@ ---- src/data_mgmt/data_protect.c.orig 2013-07-24 22:04:32.000000000 +0900 -+++ src/data_mgmt/data_protect.c 2013-07-24 22:04:59.000000000 +0900 -@@ -425,6 +425,7 @@ +--- src/data_mgmt/data_protect.c.orig 2012-05-17 17:49:58 UTC ++++ src/data_mgmt/data_protect.c +@@ -437,6 +437,7 @@ main( int a_iArgc, CK_OBJECT_HANDLE hObject; CK_MECHANISM tMechanism = { CKM_AES_ECB, NULL, 0 }; diff --git a/security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvread.c b/security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvread.c new file mode 100644 index 000000000000..8f2de7135816 --- /dev/null +++ b/security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvread.c @@ -0,0 +1,10 @@ +--- src/tpm_mgmt/tpm_nvread.c.orig 2011-08-17 12:20:35 UTC ++++ src/tpm_mgmt/tpm_nvread.c +@@ -19,6 +19,7 @@ + * http://www.opensource.org/licenses/cpl1.0.php. + */ + ++#include <sys/stat.h> + #include <limits.h> + #include <ctype.h> + #include <fcntl.h> diff --git a/security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvwrite.c b/security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvwrite.c new file mode 100644 index 000000000000..94e4d0e22e34 --- /dev/null +++ b/security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvwrite.c @@ -0,0 +1,27 @@ +--- src/tpm_mgmt/tpm_nvwrite.c.orig 2011-08-17 12:20:35 UTC ++++ src/tpm_mgmt/tpm_nvwrite.c +@@ -33,6 +33,7 @@ static BOOL nvindex_set; + static unsigned int nvindex; + static unsigned int offset; + static unsigned int length; ++static int lengthp; + static int fillvalue = -1; + static const char *filename; + static BOOL passWellKnown; +@@ -60,6 +61,7 @@ static int parse(const int aOpt, const c + if (parseHexOrDecimal(aArg, &length, 0, UINT_MAX, + "length of data") != 0) + return -1; ++ lengthp = 1; + break; + + case 'n': +@@ -220,7 +222,7 @@ int main(int argc, char **argv) + close(fd); + fd = -1; + } else if (fillvalue >= 0) { +- if (length < 0) { ++ if (lengthp == 0) { + logError(_("Requiring size parameter.\n")); + return -1; + } diff --git a/security/tpm-tools/files/patch-src-tpm_mgmt-tpm_present.c b/security/tpm-tools/files/patch-src-tpm_mgmt-tpm_present.c index a458d50c3422..180f3e0c7e8a 100644 --- a/security/tpm-tools/files/patch-src-tpm_mgmt-tpm_present.c +++ b/security/tpm-tools/files/patch-src-tpm_mgmt-tpm_present.c @@ -1,6 +1,6 @@ ---- src/tpm_mgmt/tpm_present.c.orig 2009-08-20 23:46:31.000000000 +0900 -+++ src/tpm_mgmt/tpm_present.c 2013-07-24 22:02:07.000000000 +0900 -@@ -168,9 +168,10 @@ +--- src/tpm_mgmt/tpm_present.c.orig 2012-05-17 17:49:58 UTC ++++ src/tpm_mgmt/tpm_present.c +@@ -168,9 +168,10 @@ static BOOL confirmLifeLock(TSS_HCONTEXT TSS_HPOLICY hTpmPolicy; char *pwd = NULL; int pswd_len; diff --git a/security/tpm-tools/files/patch-src-tpm_mgmt-tpm_takeownership.c b/security/tpm-tools/files/patch-src-tpm_mgmt-tpm_takeownership.c index 58f619a35ed8..35b73beaae80 100644 --- a/security/tpm-tools/files/patch-src-tpm_mgmt-tpm_takeownership.c +++ b/security/tpm-tools/files/patch-src-tpm_mgmt-tpm_takeownership.c @@ -1,6 +1,6 @@ ---- src/tpm_mgmt/tpm_takeownership.c.orig 2013-07-24 22:02:59.000000000 +0900 -+++ src/tpm_mgmt/tpm_takeownership.c 2013-07-24 22:03:53.000000000 +0900 -@@ -77,6 +77,7 @@ +--- src/tpm_mgmt/tpm_takeownership.c.orig 2010-09-30 17:28:09 UTC ++++ src/tpm_mgmt/tpm_takeownership.c +@@ -77,6 +77,7 @@ int main(int argc, char **argv) {"srk-well-known", no_argument, NULL, 'z'}, }; diff --git a/security/tpm-tools/pkg-plist b/security/tpm-tools/pkg-plist index ac91423bc0f4..6e6cf28cbcca 100644 --- a/security/tpm-tools/pkg-plist +++ b/security/tpm-tools/pkg-plist @@ -9,23 +9,6 @@ include/tpm_tools/tpm_unseal.h lib/libtpm_unseal.so lib/libtpm_unseal.so.1 lib/libtpm_unseal.so.1.0.0 -sbin/tpm_changeownerauth -sbin/tpm_clear -sbin/tpm_createek -sbin/tpm_getpubek -sbin/tpm_resetdalock -sbin/tpm_restrictpubek -sbin/tpm_restrictsrk -sbin/tpm_revokeek -sbin/tpm_selftest -sbin/tpm_setactive -sbin/tpm_setclearable -sbin/tpm_setenable -sbin/tpm_setoperatorauth -sbin/tpm_setownable -sbin/tpm_setpresence -sbin/tpm_takeownership -sbin/tpm_version man/man1/tpm_sealdata.1.gz man/man1/tpm_version.1.gz man/man1/tpmtoken_import.1.gz @@ -40,6 +23,11 @@ man/man8/tpm_changeownerauth.8.gz man/man8/tpm_clear.8.gz man/man8/tpm_createek.8.gz man/man8/tpm_getpubek.8.gz +man/man8/tpm_nvdefine.8.gz +man/man8/tpm_nvinfo.8.gz +man/man8/tpm_nvread.8.gz +man/man8/tpm_nvrelease.8.gz +man/man8/tpm_nvwrite.8.gz man/man8/tpm_resetdalock.8.gz man/man8/tpm_restrictpubek.8.gz man/man8/tpm_revokeek.8.gz @@ -51,3 +39,25 @@ man/man8/tpm_setoperatorauth.8.gz man/man8/tpm_setownable.8.gz man/man8/tpm_setpresence.8.gz man/man8/tpm_takeownership.8.gz +sbin/tpm_changeownerauth +sbin/tpm_clear +sbin/tpm_createek +sbin/tpm_getpubek +sbin/tpm_nvdefine +sbin/tpm_nvinfo +sbin/tpm_nvread +sbin/tpm_nvrelease +sbin/tpm_nvwrite +sbin/tpm_resetdalock +sbin/tpm_restrictpubek +sbin/tpm_restrictsrk +sbin/tpm_revokeek +sbin/tpm_selftest +sbin/tpm_setactive +sbin/tpm_setclearable +sbin/tpm_setenable +sbin/tpm_setoperatorauth +sbin/tpm_setownable +sbin/tpm_setpresence +sbin/tpm_takeownership +sbin/tpm_version |