svn commit: r426349 - in head/security/trousers: . files
Hiroki Sato
hrs at FreeBSD.org
Sat Nov 19 03:22:19 UTC 2016
Author: hrs
Date: Sat Nov 19 03:22:15 2016
New Revision: 426349
URL: https://svnweb.freebsd.org/changeset/ports/426349
Log:
Update to 0.3.14. TrouSerS has been under 3-clause BSDL since 0.3.11.
Added:
head/security/trousers/files/patch-configure.ac
- copied, changed from r426348, head/security/trousers/files/patch-configure.in
Deleted:
head/security/trousers/files/patch-configure.in
head/security/trousers/files/patch-src_tcs_ps_ps__utils.c
head/security/trousers/files/patch-src_tspi_ps_ps__utils.c
Modified:
head/security/trousers/Makefile
head/security/trousers/distinfo
head/security/trousers/files/patch-dist_Makefile.am
head/security/trousers/files/patch-dist_tcsd.conf.in
head/security/trousers/files/patch-src_include_biosem.h
head/security/trousers/files/patch-src_include_linux_tpm.h
head/security/trousers/files/patch-src_include_tcs__tsp.h
head/security/trousers/files/patch-src_include_tcs__utils.h
head/security/trousers/files/patch-src_include_tcsd.h
head/security/trousers/files/patch-src_include_tcsd__ops.h
head/security/trousers/files/patch-src_include_threads.h
head/security/trousers/files/patch-src_include_trousers__types.h
head/security/trousers/files/patch-src_include_tss_platform.h
head/security/trousers/files/patch-src_tcs_Makefile.am
head/security/trousers/files/patch-src_tcs_ps_tcsps.c
head/security/trousers/files/patch-src_tcs_rpc_tcstp_rpc.c
head/security/trousers/files/patch-src_tcs_tcs__aik.c
head/security/trousers/files/patch-src_tcs_tcs__auth__mgr.c
head/security/trousers/files/patch-src_tcsd_Makefile.am
head/security/trousers/files/patch-src_tcsd_svrside.c
head/security/trousers/files/patch-src_tddl_Makefile.am
head/security/trousers/files/patch-src_trspi_Makefile.am
head/security/trousers/files/patch-src_tspi_Makefile.am
head/security/trousers/files/patch-src_tspi_ps_tspps.c
head/security/trousers/files/patch-src_tspi_rpc_hosttable.c
head/security/trousers/files/patch-src_tspi_rpc_tcstp_rpc.c
head/security/trousers/files/patch-src_tspi_tsp__tcsi__param.c
Modified: head/security/trousers/Makefile
==============================================================================
--- head/security/trousers/Makefile Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/Makefile Sat Nov 19 03:22:15 2016 (r426349)
@@ -2,24 +2,22 @@
# $FreeBSD$
PORTNAME= trousers
-PORTVERSION= 0.3.13
-PORTREVISION= 1
+PORTVERSION= 0.3.14
CATEGORIES= security
MASTER_SITES= SF
MAINTAINER= hrs at FreeBSD.org
COMMENT= Open-source TCG Software Stack
-LICENSE= CPL
-LICENSE_NAME= Common Public License
+LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
BUILD_DEPENDS= tpm-emulator>=0.7.4_1:emulators/tpm-emulator
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= dos2unix alias autoreconf gmake iconv libtool pkgconfig ssl
DOS2UNIX_GLOB= *.h *.c
+NO_WRKSUBDIR= yes
USE_LDCONFIG= YES
USE_RC_SUBR= tcsd
INSTALL_TARGET= install-strip
@@ -32,8 +30,6 @@ CONFIGURE_ARGS= --with-gui=none --enable
RANLIB=:
MAKE_ENV= ICONV_LIB=${ICONV_LIB} \
ICONV_PREFIX=${ICONV_PREFIX}
-CFLAGS+= -I${OPENSSLINC}
-LDFLAGS+= -L${OPENSSLLIB}
SUB_FILES= pkg-message
SUB_LIST= USERS="${USERS}" GROUPS="${GROUPS}"
PLIST_SUB= USERS="${USERS}" GROUPS="${GROUPS}"
Modified: head/security/trousers/distinfo
==============================================================================
--- head/security/trousers/distinfo Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/distinfo Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463562404
-SHA256 (trousers-0.3.13.tar.gz) = bb908e4a3c88a17b247a4fc8e0fff3419d8a13170fe7bdfbe0e2c5c082a276d3
-SIZE (trousers-0.3.13.tar.gz) = 1371901
+TIMESTAMP = 1479521351
+SHA256 (trousers-0.3.14.tar.gz) = 95db55beb1556b12be9b4cf3123a3a59c7a70cc890d731fae93e6949305fb63b
+SIZE (trousers-0.3.14.tar.gz) = 3462743
Copied and modified: head/security/trousers/files/patch-configure.ac (from r426348, head/security/trousers/files/patch-configure.in)
==============================================================================
--- head/security/trousers/files/patch-configure.in Fri Nov 18 23:39:38 2016 (r426348, copy source)
+++ head/security/trousers/files/patch-configure.ac Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,6 +1,6 @@
---- configure.in.orig 2014-04-24 18:05:43 UTC
-+++ configure.in
-@@ -52,7 +52,7 @@ AC_ARG_WITH(openssl,
+--- configure.ac.orig 2016-11-09 20:26:34 UTC
++++ configure.ac
+@@ -58,7 +58,7 @@ AC_ARG_WITH(openssl,
AC_MSG_ERROR([$OPENSSL_INCLUDE_DIR or $OPENSSL_LIB_DIR doen't exist!])
else
AC_MSG_RESULT([yes])
@@ -9,21 +9,21 @@
AC_SUBST([OPENSSL_LIB_DIR])
fi],
[AC_MSG_RESULT([no])
-@@ -72,6 +72,21 @@ AC_ARG_ENABLE(gcov,
+@@ -78,6 +78,21 @@ AC_ARG_ENABLE(gcov,
[CFLAGS="$CFLAGS -ftest-coverage -fprofile-arcs"
AC_MSG_RESULT([*** Enabling gcov at user request ***])],)
+# Check for tss user
+AC_ARG_WITH(tssuser,
-+ [ --with-tssuser[[=USER]] set tss user [[tss]]],
-+ [tss_user=$withval],
-+ [tss_user=tss]
++ [ --with-tssuser[[=USER]] set tss user [[tss]]],
++ [tss_user=$withval],
++ [tss_user=tss]
+)
+# Check for tss group
+AC_ARG_WITH(tssgroup,
-+ [ --with-tssgroup[[=GROUP]] set tss group [[tss]]],
-+ [tss_group=$withval],
-+ [tss_group=tss]
++ [ --with-tssgroup[[=GROUP]] set tss group [[tss]]],
++ [tss_group=$withval],
++ [tss_group=tss]
+)
+AC_SUBST(TSS_USER_NAME, $tss_user)
+AC_SUBST(TSS_GROUP_NAME, $tss_group)
@@ -31,16 +31,7 @@
# profiling support
AC_ARG_ENABLE(gprof,
[AC_HELP_STRING([--enable-gprof], [enable profiling with gprof [default=off]])],
-@@ -356,6 +371,8 @@ AC_PROG_LIBTOOL
- AC_C_BIGENDIAN([AC_DEFINE(_BIG_ENDIAN, 1, [big-endian host])])
- AC_CHECK_DECL(htole32, [AC_DEFINE(HTOLE_DEFINED, 1, [htole32 function is available])])
- AC_CHECK_HEADER(sys/byteorder.h, [AC_DEFINE(HAVE_BYTEORDER_H, 1, [sys/byteorder.h header])])
-+AC_CHECK_HEADER(endian.h, [AC_DEFINE(HAVE_ENDIAN_H, 1, [endian.h header])])
-+AC_CHECK_HEADER(sys/endian.h, [AC_DEFINE(HAVE_SYS_ENDIAN_H, 1, [sys/endian.h header])])
- AC_CHECK_FUNC(daemon, [ AC_DEFINE(HAVE_DAEMON, 1, [daemon function is available]) ])
-
- if test "x${GCC}" = "xyes"; then
-@@ -363,6 +380,7 @@ if test "x${GCC}" = "xyes"; then
+@@ -369,6 +384,7 @@ if test "x${GCC}" = "xyes"; then
fi
CFLAGS="$CFLAGS -I../include \
Modified: head/security/trousers/files/patch-dist_Makefile.am
==============================================================================
--- head/security/trousers/files/patch-dist_Makefile.am Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-dist_Makefile.am Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- dist/Makefile.am.orig 2014-04-24 18:05:43 UTC
+--- dist/Makefile.am.orig 2014-07-23 19:42:44 UTC
+++ dist/Makefile.am
@@ -1,14 +1,14 @@
EXTRA_DIST = system.data.auth system.data.noauth \
Modified: head/security/trousers/files/patch-dist_tcsd.conf.in
==============================================================================
--- head/security/trousers/files/patch-dist_tcsd.conf.in Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-dist_tcsd.conf.in Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- dist/tcsd.conf.in.orig 2014-04-24 18:05:43 UTC
+--- dist/tcsd.conf.in.orig 2014-07-23 19:42:44 UTC
+++ dist/tcsd.conf.in
@@ -35,7 +35,7 @@
# log data. The interface to this log is usually provided by the TPM
Modified: head/security/trousers/files/patch-src_include_biosem.h
==============================================================================
--- head/security/trousers/files/patch-src_include_biosem.h Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_include_biosem.h Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/include/biosem.h.orig 2016-06-20 15:21:26 UTC
+--- src/include/biosem.h.orig 2016-11-19 03:09:49 UTC
+++ src/include/biosem.h
@@ -26,7 +26,7 @@ typedef struct {
UINT32 eventType;
Modified: head/security/trousers/files/patch-src_include_linux_tpm.h
==============================================================================
--- head/security/trousers/files/patch-src_include_linux_tpm.h Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_include_linux_tpm.h Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/include/linux/tpm.h.orig 2016-06-20 15:21:26 UTC
+--- src/include/linux/tpm.h.orig 2016-11-19 03:09:49 UTC
+++ src/include/linux/tpm.h
@@ -20,6 +20,8 @@
#include <linux/ioctl.h>
Modified: head/security/trousers/files/patch-src_include_tcs__tsp.h
==============================================================================
--- head/security/trousers/files/patch-src_include_tcs__tsp.h Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_include_tcs__tsp.h Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/include/tcs_tsp.h.orig 2016-06-20 15:21:26 UTC
+--- src/include/tcs_tsp.h.orig 2016-11-19 03:09:49 UTC
+++ src/include/tcs_tsp.h
@@ -79,7 +79,13 @@ struct key_disk_cache
/* XXX Get rid of this, there's no reason to set an arbitrary limit */
Modified: head/security/trousers/files/patch-src_include_tcs__utils.h
==============================================================================
--- head/security/trousers/files/patch-src_include_tcs__utils.h Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_include_tcs__utils.h Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/include/tcs_utils.h.orig 2016-06-20 15:21:26 UTC
+--- src/include/tcs_utils.h.orig 2016-11-19 03:09:49 UTC
+++ src/include/tcs_utils.h
@@ -18,6 +18,20 @@
#include "tcs_tsp.h"
Modified: head/security/trousers/files/patch-src_include_tcsd.h
==============================================================================
--- head/security/trousers/files/patch-src_include_tcsd.h Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_include_tcsd.h Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/include/tcsd.h.orig 2016-06-20 15:21:26 UTC
+--- src/include/tcsd.h.orig 2016-11-19 03:09:49 UTC
+++ src/include/tcsd.h
@@ -53,14 +53,22 @@ struct tcsd_config
#define TCSD_DEFAULT_CONFIG_FILE ETC_PREFIX "/tcsd.conf"
Modified: head/security/trousers/files/patch-src_include_tcsd__ops.h
==============================================================================
--- head/security/trousers/files/patch-src_include_tcsd__ops.h Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_include_tcsd__ops.h Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/include/tcsd_ops.h.orig 2016-06-20 15:21:26 UTC
+--- src/include/tcsd_ops.h.orig 2016-11-19 03:09:49 UTC
+++ src/include/tcsd_ops.h
@@ -123,7 +123,7 @@
Modified: head/security/trousers/files/patch-src_include_threads.h
==============================================================================
--- head/security/trousers/files/patch-src_include_threads.h Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_include_threads.h Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/include/threads.h.orig 2016-06-20 15:21:26 UTC
+--- src/include/threads.h.orig 2016-11-19 03:09:49 UTC
+++ src/include/threads.h
@@ -31,7 +31,7 @@
#define COND_SIGNAL(c) pthread_cond_signal(c)
Modified: head/security/trousers/files/patch-src_include_trousers__types.h
==============================================================================
--- head/security/trousers/files/patch-src_include_trousers__types.h Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_include_trousers__types.h Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/include/trousers_types.h.orig 2016-06-20 15:21:26 UTC
+--- src/include/trousers_types.h.orig 2016-11-19 03:09:49 UTC
+++ src/include/trousers_types.h
@@ -11,6 +11,14 @@
#ifndef _TROUSERS_TYPES_H_
@@ -24,19 +24,3 @@
typedef struct tdTSS_KEY {
union {
-@@ -118,11 +126,10 @@ typedef struct tdTSS_KEY {
- BYTE *encData;
- } TSS_KEY;
-
--#if (defined (__linux) || defined (linux) || defined (SOLARIS) || defined (__GLIBC__))
--#define BSD_CONST
--#elif (defined (__OpenBSD__) || defined (__FreeBSD__))
-+#if defined (__FreeBSD__)
- #define BSD_CONST const
--#endif
--
-+#else
-+#define BSD_CONST /* */
-+#endif
-
- #endif
Modified: head/security/trousers/files/patch-src_include_tss_platform.h
==============================================================================
--- head/security/trousers/files/patch-src_include_tss_platform.h Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_include_tss_platform.h Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/include/tss/platform.h.orig 2016-06-20 15:21:26 UTC
+--- src/include/tss/platform.h.orig 2016-11-19 03:09:49 UTC
+++ src/include/tss/platform.h
@@ -15,7 +15,7 @@ There are platform dependent and general
#if !defined(WIN32)
Modified: head/security/trousers/files/patch-src_tcs_Makefile.am
==============================================================================
--- head/security/trousers/files/patch-src_tcs_Makefile.am Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_tcs_Makefile.am Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/tcs/Makefile.am.orig 2014-04-24 18:05:44 UTC
+--- src/tcs/Makefile.am.orig 2014-07-23 19:42:44 UTC
+++ src/tcs/Makefile.am
@@ -1,8 +1,7 @@
-noinst_LIBRARIES=libtcs.a
Modified: head/security/trousers/files/patch-src_tcs_ps_tcsps.c
==============================================================================
--- head/security/trousers/files/patch-src_tcs_ps_tcsps.c Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_tcs_ps_tcsps.c Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,6 +1,6 @@
---- src/tcs/ps/tcsps.c.orig 2016-06-20 15:21:26 UTC
+--- src/tcs/ps/tcsps.c.orig 2016-11-19 03:09:49 UTC
+++ src/tcs/ps/tcsps.c
-@@ -24,6 +24,11 @@
+@@ -30,6 +30,11 @@
#define LE_16 htole16
#define LE_32 htole32
#define LE_64 htole64
@@ -12,7 +12,7 @@
#else
#define LE_16(x) (x)
#define LE_32(x) (x)
-@@ -33,6 +38,26 @@
+@@ -39,6 +44,26 @@
#include <fcntl.h>
#include <limits.h>
@@ -39,7 +39,7 @@
#include "trousers/tss.h"
#include "trousers_types.h"
#include "tcsps.h"
-@@ -43,6 +68,25 @@
+@@ -49,6 +74,25 @@
#include "tcsd_wrap.h"
#include "tcsd.h"
Modified: head/security/trousers/files/patch-src_tcs_rpc_tcstp_rpc.c
==============================================================================
--- head/security/trousers/files/patch-src_tcs_rpc_tcstp_rpc.c Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_tcs_rpc_tcstp_rpc.c Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/tcs/rpc/tcstp/rpc.c.orig 2016-06-20 15:21:26 UTC
+--- src/tcs/rpc/tcstp/rpc.c.orig 2016-11-19 03:09:49 UTC
+++ src/tcs/rpc/tcstp/rpc.c
@@ -16,6 +16,7 @@
#if (defined (__OpenBSD__) || defined (__FreeBSD__))
Modified: head/security/trousers/files/patch-src_tcs_tcs__aik.c
==============================================================================
--- head/security/trousers/files/patch-src_tcs_tcs__aik.c Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_tcs_tcs__aik.c Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/tcs/tcs_aik.c.orig 2016-06-20 15:21:26 UTC
+--- src/tcs/tcs_aik.c.orig 2016-11-19 03:09:49 UTC
+++ src/tcs/tcs_aik.c
@@ -66,7 +66,7 @@ UnloadBlob_SYMMETRIC_KEY(UINT64 *offset,
UnloadBlob_UINT16(offset, &key->size, blob);
Modified: head/security/trousers/files/patch-src_tcs_tcs__auth__mgr.c
==============================================================================
--- head/security/trousers/files/patch-src_tcs_tcs__auth__mgr.c Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_tcs_tcs__auth__mgr.c Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/tcs/tcs_auth_mgr.c.orig 2016-06-20 15:21:26 UTC
+--- src/tcs/tcs_auth_mgr.c.orig 2016-11-19 03:09:49 UTC
+++ src/tcs/tcs_auth_mgr.c
@@ -108,7 +108,7 @@ void
auth_mgr_swap_in()
Modified: head/security/trousers/files/patch-src_tcsd_Makefile.am
==============================================================================
--- head/security/trousers/files/patch-src_tcsd_Makefile.am Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_tcsd_Makefile.am Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,6 +1,6 @@
---- src/tcsd/Makefile.am.orig 2014-04-24 18:05:44 UTC
+--- src/tcsd/Makefile.am.orig 2016-09-01 02:44:20 UTC
+++ src/tcsd/Makefile.am
-@@ -1,11 +1,17 @@
+@@ -1,10 +1,15 @@
-sbin_PROGRAMS=tcsd
+sbin_PROGRAMS=tcsd tcsd_emu
@@ -8,14 +8,12 @@
-tcsd_LDADD=${top_builddir}/src/tcs/libtcs.a ${top_builddir}/src/tddl/libtddl.a -lpthread @CRYPTOLIB@
+tcsd_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -I${top_srcdir}/src/include -fPIE -DPIE -I at OPENSSL_INCLUDE_DIR@
+tcsd_LDADD=${top_builddir}/src/tcs/libtcs.a ${top_builddir}/src/tddl/libtddl.a -lpthread -L at OPENSSL_LIB_DIR@ @CRYPTOLIB@
- tcsd_LDFLAGS=-pie -Wl,-z,relro -Wl,-z,now
-
+ tcsd_LDFLAGS=@TCSD_LDFLAGS@
tcsd_SOURCES=svrside.c tcsd_conf.c tcsd_threads.c platform.c
+tcsd_emu_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -I${top_srcdir}/src/include -fPIE -DPIE -I at OPENSSL_INCLUDE_DIR@
+tcsd_emu_LDADD=${top_builddir}/src/tcs/libtcs_emu.a -ltddl -L${LOCALBASE}/lib/tddl_emu -lpthread -L at OPENSSL_LIB_DIR@ @CRYPTOLIB@
-+tcsd_emu_LDFLAGS=-pie -Wl,-z,relro -Wl,-z,now -Wl,-rpath=${LOCALBASE}/lib/tddl_emu:${LOCALBASE}/lib
-+
++tcsd_emu_LDFLAGS=@TCSD_LDFLAGS@ -Wl,-rpath=${LOCALBASE}/lib/tddl_emu:${LOCALBASE}/lib
+tcsd_emu_SOURCES=svrside.c tcsd_conf.c tcsd_threads.c platform.c
+
if TSS_BUILD_PS
Modified: head/security/trousers/files/patch-src_tcsd_svrside.c
==============================================================================
--- head/security/trousers/files/patch-src_tcsd_svrside.c Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_tcsd_svrside.c Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/tcsd/svrside.c.orig 2016-06-20 15:21:26 UTC
+--- src/tcsd/svrside.c.orig 2016-11-19 03:09:49 UTC
+++ src/tcsd/svrside.c
@@ -92,12 +92,19 @@ tcsd_signal_term(int signal)
term = 1;
Modified: head/security/trousers/files/patch-src_tddl_Makefile.am
==============================================================================
--- head/security/trousers/files/patch-src_tddl_Makefile.am Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_tddl_Makefile.am Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/tddl/Makefile.am.orig 2014-04-24 18:05:44 UTC
+--- src/tddl/Makefile.am.orig 2014-07-23 19:42:44 UTC
+++ src/tddl/Makefile.am
@@ -1,4 +1,11 @@
+libdir=@libdir@/tddl
Modified: head/security/trousers/files/patch-src_trspi_Makefile.am
==============================================================================
--- head/security/trousers/files/patch-src_trspi_Makefile.am Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_trspi_Makefile.am Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/trspi/Makefile.am.orig 2014-04-24 18:05:44 UTC
+--- src/trspi/Makefile.am.orig 2014-07-23 19:42:44 UTC
+++ src/trspi/Makefile.am
@@ -1,7 +1,8 @@
noinst_LTLIBRARIES=libtrousers.la
Modified: head/security/trousers/files/patch-src_tspi_Makefile.am
==============================================================================
--- head/security/trousers/files/patch-src_tspi_Makefile.am Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_tspi_Makefile.am Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/tspi/Makefile.am.orig 2014-04-24 18:05:44 UTC
+--- src/tspi/Makefile.am.orig 2014-07-23 19:42:44 UTC
+++ src/tspi/Makefile.am
@@ -17,9 +17,9 @@ libtspi_la_LIBADD=${top_builddir}/src/tr
# 5. If any interfaces have been added since the last public release, then increment age.
Modified: head/security/trousers/files/patch-src_tspi_ps_tspps.c
==============================================================================
--- head/security/trousers/files/patch-src_tspi_ps_tspps.c Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_tspi_ps_tspps.c Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,6 +1,6 @@
---- src/tspi/ps/tspps.c.orig 2016-06-20 15:21:26 UTC
+--- src/tspi/ps/tspps.c.orig 2016-11-19 03:09:49 UTC
+++ src/tspi/ps/tspps.c
-@@ -29,6 +29,11 @@
+@@ -35,6 +35,11 @@
#define LE_16 htole16
#define LE_32 htole32
#define LE_64 htole64
@@ -12,7 +12,7 @@
#else
#define LE_16(x) (x)
#define LE_32(x) (x)
-@@ -43,9 +48,13 @@
+@@ -49,9 +54,13 @@
#include "tspps.h"
#include "tsplog.h"
@@ -26,7 +26,7 @@
static MUTEX_DECLARE_INIT(user_ps_path);
#endif
static struct flock fl;
-@@ -60,9 +69,7 @@ get_user_ps_path(char **file)
+@@ -66,9 +75,7 @@ get_user_ps_path(char **file)
TSS_RESULT result;
char *file_name = NULL, *home_dir = NULL;
struct passwd *pwp;
@@ -36,7 +36,7 @@
struct stat stat_buf;
char buf[PASSWD_BUFSIZE];
uid_t euid;
-@@ -72,10 +79,6 @@ get_user_ps_path(char **file)
+@@ -78,10 +85,6 @@ get_user_ps_path(char **file)
*file = strdup(file_name);
return (*file) ? TSS_SUCCESS : TSPERR(TSS_E_OUTOFMEMORY);
}
@@ -47,7 +47,7 @@
euid = geteuid();
#if defined (SOLARIS)
-@@ -88,32 +91,14 @@ get_user_ps_path(char **file)
+@@ -94,32 +97,14 @@ get_user_ps_path(char **file)
*/
rc = snprintf(buf, sizeof (buf), "%s/%d", TSS_USER_PS_DIR, euid);
#else
Modified: head/security/trousers/files/patch-src_tspi_rpc_hosttable.c
==============================================================================
--- head/security/trousers/files/patch-src_tspi_rpc_hosttable.c Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_tspi_rpc_hosttable.c Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/tspi/rpc/hosttable.c.orig 2016-06-20 15:21:26 UTC
+--- src/tspi/rpc/hosttable.c.orig 2016-11-19 03:09:49 UTC
+++ src/tspi/rpc/hosttable.c
@@ -51,6 +51,8 @@ host_table_final()
{
@@ -9,16 +9,16 @@
MUTEX_LOCK(ht->lock);
for (hte = ht->entries; hte; hte = next) {
-@@ -84,6 +86,8 @@ __tspi_add_table_entry(TSS_HCONTEXT tspC
- {
- struct host_table_entry *entry, *tmp;
+@@ -85,6 +87,8 @@ __tspi_add_table_entry(TSS_HCONTEXT tspC
+ struct host_table_entry *entry, *tmp;
+ int hostlen;
-+ if( ht == NULL ) return TSPERR(TSS_E_OUTOFMEMORY);
++ if( ht == NULL ) return TSPERR(TSS_E_OUTOFMEMORY);
+
- entry = calloc(1, sizeof(struct host_table_entry));
- if (entry == NULL) {
- LogError("malloc of %zd bytes failed.", sizeof(struct host_table_entry));
-@@ -134,6 +138,8 @@ remove_table_entry(TSS_HCONTEXT tspConte
+ entry = calloc(1, sizeof(struct host_table_entry));
+ if (entry == NULL) {
+ LogError("malloc of %zd bytes failed.", sizeof(struct host_table_entry));
+@@ -144,6 +148,8 @@ remove_table_entry(TSS_HCONTEXT tspConte
{
struct host_table_entry *hte, *prev = NULL;
@@ -27,7 +27,7 @@
MUTEX_LOCK(ht->lock);
for (hte = ht->entries; hte; prev = hte, hte = hte->next) {
-@@ -158,6 +164,8 @@ get_table_entry(TSS_HCONTEXT tspContext)
+@@ -168,6 +174,8 @@ get_table_entry(TSS_HCONTEXT tspContext)
{
struct host_table_entry *index = NULL;
Modified: head/security/trousers/files/patch-src_tspi_rpc_tcstp_rpc.c
==============================================================================
--- head/security/trousers/files/patch-src_tspi_rpc_tcstp_rpc.c Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_tspi_rpc_tcstp_rpc.c Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,4 +1,4 @@
---- src/tspi/rpc/tcstp/rpc.c.orig 2016-06-20 15:21:26 UTC
+--- src/tspi/rpc/tcstp/rpc.c.orig 2016-11-19 03:09:49 UTC
+++ src/tspi/rpc/tcstp/rpc.c
@@ -304,7 +304,7 @@ recv_from_socket(int sock, void *buffer,
errno = 0;
Modified: head/security/trousers/files/patch-src_tspi_tsp__tcsi__param.c
==============================================================================
--- head/security/trousers/files/patch-src_tspi_tsp__tcsi__param.c Fri Nov 18 23:39:38 2016 (r426348)
+++ head/security/trousers/files/patch-src_tspi_tsp__tcsi__param.c Sat Nov 19 03:22:15 2016 (r426349)
@@ -1,15 +1,14 @@
---- src/tspi/tsp_tcsi_param.c.orig 2016-06-20 15:21:26 UTC
+--- src/tspi/tsp_tcsi_param.c.orig 2016-11-19 03:09:49 UTC
+++ src/tspi/tsp_tcsi_param.c
-@@ -11,7 +11,12 @@
- #include <stdlib.h>
- #include <string.h>
+@@ -13,7 +13,10 @@
#include <stdio.h>
-+#if !defined(__FreeBSD__)
- #include <bits/local_lim.h>
-+#else
+
+
+-#ifndef __APPLE__
++#ifdef __FreeBSD__
+#include <sys/param.h>
-+#define HOST_NAME_MAX MAXHOSTNAMELEN
-+#endif
- #include "trousers/tss.h"
- #include "trousers/trousers.h"
- #include "trousers_types.h"
++#define HOST_NAME_MAX MAXHOSTNAMELEN
++#elif !defined(__APPLE__)
+ #include <limits.h>
+ #else
+ #define HOST_NAME_MAX 64
More information about the svn-ports-all
mailing list