39 files changed, 134 insertions, 130 deletions

diff --git a/security/dcetest/Makefile b/security/dcetest/Makefile
index aa52beb75753..46d9cf209b7e 100644
--- a/security/dcetest/Makefile
+++ b/security/dcetest/Makefile
@@ -9,6 +9,9 @@ MASTER_SITES=	PACKETSTORM/UNIX/scanners
 MAINTAINER=	onatan@gmail.com
 COMMENT=	Utility to dump MSRPC endpoint information from Windows systems
 
+USES=	dos2unix
+DOS2UNIX_GLOB=	*.c
+
 ALL_TARGET=	dcetest
 MAKE_ARGS=	CC="${CC}"
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/security/dcetest/files/patch-Makefile b/security/dcetest/files/patch-Makefile
index 9a12138dcf38..30349d5cd210 100644
--- a/security/dcetest/files/patch-Makefile
+++ b/security/dcetest/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Sat Jan 11 06:22:46 2003
-+++ Makefile	Sat Jan 11 06:23:10 2003
+--- Makefile.orig	2001-08-20 20:40:40 UTC
++++ Makefile
 @@ -1,6 +1,6 @@
  .SUFFIXES: .a .o .c
  CC              =  gcc
diff --git a/security/dcetest/files/patch-dcetest.c b/security/dcetest/files/patch-dcetest.c
index 23347da6137d..d5bc9b507c0e 100644
--- a/security/dcetest/files/patch-dcetest.c
+++ b/security/dcetest/files/patch-dcetest.c
@@ -1,11 +1,11 @@
---- dcetest.c.orig	Tue Feb 15 11:32:36 2005
-+++ dcetest.c	Tue Feb 15 11:31:48 2005
-@@ -359,7 +359,7 @@
-   int tint;

-   char annotation[EPT_MAX_ANNOTATION_SIZE+1];

-   int floor, floors;

--  int address_type;

-+  int address_type=0;

- 

-   char tmp_address[200];

-   char tmp_address2[200];

+--- dcetest.c.orig	2016-06-20 15:23:56 UTC
++++ dcetest.c
+@@ -359,7 +359,7 @@ dce_parse_enum_response(const unsigned c
+   int tint;
+   char annotation[EPT_MAX_ANNOTATION_SIZE+1];
+   int floor, floors;
+-  int address_type;
++  int address_type=0;
+ 
+   char tmp_address[200];
+   char tmp_address2[200];
diff --git a/security/dcetest/files/patch-tcpstuff.c b/security/dcetest/files/patch-tcpstuff.c
index d05de6c8575b..4abe4a655478 100644
--- a/security/dcetest/files/patch-tcpstuff.c
+++ b/security/dcetest/files/patch-tcpstuff.c
@@ -1,6 +1,6 @@
---- tcpstuff.c.orig	Sat Jan 11 06:46:08 2003
-+++ tcpstuff.c	Sat Jan 11 06:50:59 2003
-@@ -229,6 +229,7 @@
+--- tcpstuff.c.orig	2016-06-20 15:23:56 UTC
++++ tcpstuff.c
+@@ -229,6 +229,7 @@ make_tcp_listener(unsigned short localpo
  
  
  /* this function takes in a listenFd and returns an acceptedFd */
@@ -8,7 +8,7 @@
  int
  tcp_accept(int listenFd)
  {
-@@ -242,12 +243,14 @@
+@@ -242,12 +243,14 @@ tcp_accept(int listenFd)
  			 (struct sockaddr *)&clientAddr,
  			 &addrLen)) < 0)
      {
@@ -25,7 +25,7 @@
    lingerVal.l_onoff = 0;
    lingerVal.l_linger = 0;
    if (setsockopt(clientFd, SOL_SOCKET, SO_LINGER,
-@@ -260,3 +263,4 @@
+@@ -260,3 +263,4 @@ tcp_accept(int listenFd)
    return(clientFd);
    
  }
diff --git a/security/dcetest/files/patch-tcpstuff.h b/security/dcetest/files/patch-tcpstuff.h
index 165719123746..152ac0e6d1fb 100644
--- a/security/dcetest/files/patch-tcpstuff.h
+++ b/security/dcetest/files/patch-tcpstuff.h
@@ -1,6 +1,6 @@
---- tcpstuff.h.orig	Sat Jan 11 06:48:15 2003
-+++ tcpstuff.h	Sat Jan 11 06:48:54 2003
-@@ -42,5 +42,7 @@
+--- tcpstuff.h.orig	2001-08-20 20:29:56 UTC
++++ tcpstuff.h
+@@ -42,5 +42,7 @@ make_tcp_listener(unsigned short localpo
  int
  write_uint32(int fd,uint32 data);
  
diff --git a/security/iaikpkcs11wrapper/Makefile b/security/iaikpkcs11wrapper/Makefile
index 27efc672eacc..ba5a1e7d72e3 100644
--- a/security/iaikpkcs11wrapper/Makefile
+++ b/security/iaikpkcs11wrapper/Makefile
@@ -14,12 +14,13 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USES=		dos2unix gmake zip
 USE_JAVA=	yes
-DOS2UNIX_FILES=	Makefile
+DOS2UNIX_GLOB=	Makefile *.c
+DOS2UNIX_WRKSRC=	${WRKDIR}/src/native
 JAVA_VERSION=	1.6+
 JAVA_OS=	native
 ALL_TARGET=	release
 
-PLIST_FILES=	lib/libpkcs11wrapper.so %%JAVAJARDIR%%/iaikPkcs11Wrapper.jar
+PLIST_FILES=	lib/libpkcs11wrapper.so ${JAVAJARDIR}/iaikPkcs11Wrapper.jar
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
diff --git a/security/iaikpkcs11wrapper/files/patch-Makefile b/security/iaikpkcs11wrapper/files/patch-Makefile
index 1fbed912d449..83168fe0d96b 100644
--- a/security/iaikpkcs11wrapper/files/patch-Makefile
+++ b/security/iaikpkcs11wrapper/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2013-10-30 08:34:48.105849638 +0000
-+++ Makefile	2013-10-30 08:35:06.293848426 +0000
+--- Makefile.orig	2016-06-20 15:16:34 UTC
++++ Makefile
 @@ -1,4 +1,3 @@
 -CC = gcc
  SOURCE_DIR = ../../common/
diff --git a/security/iaikpkcs11wrapper/files/patch-native_src_pkcs11wrapper.c b/security/iaikpkcs11wrapper/files/patch-native_src_pkcs11wrapper.c
index bbf6cb1dc775..ae78b05f0565 100644
--- a/security/iaikpkcs11wrapper/files/patch-native_src_pkcs11wrapper.c
+++ b/security/iaikpkcs11wrapper/files/patch-native_src_pkcs11wrapper.c
@@ -1,44 +1,44 @@
---- ../../common/pkcs11wrapper.c.orig	2011-11-03 12:15:18.000000000 +0100
-+++ ../../common/pkcs11wrapper.c	2011-11-13 21:55:57.000000000 +0100
-@@ -1258,6 +1258,7 @@
- 	jobject jAttribute;

- 	CK_RV rv;

- 	CK_ULONG error = 0;

-+	CK_BBOOL array = FALSE;

-   ModuleData *moduleData;

-   CK_FUNCTION_LIST_PTR ckpFunctions;

- 

-@@ -1328,9 +1329,11 @@
- 			for (j=0; j<length; j++){

- 				ckAttributeArray[j].pValue = NULL_PTR;

- 			}

-+			array = TRUE;

- 		}

- 	}

- 

-+	if (array == TRUE) {

- 	// get ulValueLen of the attributes of a CKF_ARRAY_ATTRIBUTE if present

- 	rv = (*ckpFunctions->C_GetAttributeValue)(ckSessionHandle, ckObjectHandle, ckpAttributes, ckAttributesLength);

- 	if(ckAssertReturnValueOK(env, rv, __FUNCTION__) != CK_ASSERT_OK) {

-@@ -1343,6 +1346,7 @@
- 	  TRACE0(tag_call, __FUNCTION__, "exiting ");

- 		return ;

- 	}

-+	}

- 

- 	/* now, the ulValueLength field of each attribute should hold the exact buffer length needed

- 	 * to allocate the needed buffers accordingly

-@@ -4474,11 +4478,12 @@
- 	jpTemp = (jchar*) malloc((*ckpLength) * sizeof(jchar));

-   if (jpTemp == NULL && (*ckpLength)!=0) { *ckpArray = NULL_PTR; throwOutOfMemoryError(env); return 1; }

- 	(*env)->GetCharArrayRegion(env, jArray, 0, *ckpLength, jpTemp);

--	*ckpArray = (CK_UTF8CHAR_PTR) malloc (*ckpLength * sizeof(CK_UTF8CHAR));

-+	*ckpArray = (CK_UTF8CHAR_PTR) malloc ((*ckpLength + 1) * sizeof(CK_UTF8CHAR));

-   if (*ckpArray == NULL && (*ckpLength)!=0) { free(jpTemp); throwOutOfMemoryError(env); return 2; }

- 	for (i=0; i<(*ckpLength); i++) {

- 		(*ckpArray)[i] = jCharToCKUTF8Char(jpTemp[i]);

- 	}

-+	(*ckpArray)[*ckpLength] = NULL_PTR;

- 	free(jpTemp);

-   return 0;

- }

+--- ../../common/pkcs11wrapper.c.orig	2016-06-20 15:16:34 UTC
++++ ../../common/pkcs11wrapper.c
+@@ -1258,6 +1258,7 @@ JNIEXPORT void JNICALL Java_iaik_pkcs_pk
+ 	jobject jAttribute;
+ 	CK_RV rv;
+ 	CK_ULONG error = 0;
++	CK_BBOOL array = FALSE;
+   ModuleData *moduleData;
+   CK_FUNCTION_LIST_PTR ckpFunctions;
+ 
+@@ -1328,9 +1329,11 @@ JNIEXPORT void JNICALL Java_iaik_pkcs_pk
+ 			for (j=0; j<length; j++){
+ 				ckAttributeArray[j].pValue = NULL_PTR;
+ 			}
++			array = TRUE;
+ 		}
+ 	}
+ 
++	if (array == TRUE) {
+ 	// get ulValueLen of the attributes of a CKF_ARRAY_ATTRIBUTE if present
+ 	rv = (*ckpFunctions->C_GetAttributeValue)(ckSessionHandle, ckObjectHandle, ckpAttributes, ckAttributesLength);
+ 	if(ckAssertReturnValueOK(env, rv, __FUNCTION__) != CK_ASSERT_OK) {
+@@ -1343,6 +1346,7 @@ JNIEXPORT void JNICALL Java_iaik_pkcs_pk
+ 	  TRACE0(tag_call, __FUNCTION__, "exiting ");
+ 		return ;
+ 	}
++	}
+ 
+ 	/* now, the ulValueLength field of each attribute should hold the exact buffer length needed
+ 	 * to allocate the needed buffers accordingly
+@@ -4474,11 +4478,12 @@ int jCharArrayToCKUTF8CharArray(JNIEnv *
+ 	jpTemp = (jchar*) malloc((*ckpLength) * sizeof(jchar));
+   if (jpTemp == NULL && (*ckpLength)!=0) { *ckpArray = NULL_PTR; throwOutOfMemoryError(env); return 1; }
+ 	(*env)->GetCharArrayRegion(env, jArray, 0, *ckpLength, jpTemp);
+-	*ckpArray = (CK_UTF8CHAR_PTR) malloc (*ckpLength * sizeof(CK_UTF8CHAR));
++	*ckpArray = (CK_UTF8CHAR_PTR) malloc ((*ckpLength + 1) * sizeof(CK_UTF8CHAR));
+   if (*ckpArray == NULL && (*ckpLength)!=0) { free(jpTemp); throwOutOfMemoryError(env); return 2; }
+ 	for (i=0; i<(*ckpLength); i++) {
+ 		(*ckpArray)[i] = jCharToCKUTF8Char(jpTemp[i]);
+ 	}
++	(*ckpArray)[*ckpLength] = NULL_PTR;
+ 	free(jpTemp);
+   return 0;
+ }
diff --git a/security/trousers/Makefile b/security/trousers/Makefile
index 3b9849efdcc5..40dc05ea3a3f 100644
--- a/security/trousers/Makefile
+++ b/security/trousers/Makefile
@@ -17,7 +17,8 @@ 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=		alias autoreconf gmake iconv libtool pkgconfig
+USES=		dos2unix alias autoreconf gmake iconv libtool pkgconfig
+DOS2UNIX_GLOB=	*.h *.c
 USE_OPENSSL=	YES
 USE_LDCONFIG=	YES
 USE_RC_SUBR=	tcsd
@@ -40,8 +41,6 @@ GROUPS=		_tss
 OPTIONS_DEFINE=	DEBUG
 DEBUG_CONFIGURE_ENABLE=	debug
 
-.include <bsd.port.options.mk>
-
 post-install:
 	${INSTALL_DATA} \
 	    ${WRKSRC}/dist/tcsd.conf ${STAGEDIR}${PREFIX}/etc/tcsd.conf.sample
diff --git a/security/trousers/files/patch-configure.in b/security/trousers/files/patch-configure.in
index 489a28fb5fea..a121c3790eb3 100644
--- a/security/trousers/files/patch-configure.in
+++ b/security/trousers/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	2014-04-25 03:05:43.000000000 +0900
-+++ configure.in	2016-05-19 02:57:32.524179000 +0900
-@@ -52,7 +52,7 @@
+--- configure.in.orig	2014-04-24 18:05:43 UTC
++++ configure.in
+@@ -52,7 +52,7 @@ AC_ARG_WITH(openssl,
  		AC_MSG_ERROR([$OPENSSL_INCLUDE_DIR or $OPENSSL_LIB_DIR doen't exist!])
  	 else
  		AC_MSG_RESULT([yes])
@@ -9,7 +9,7 @@
  		AC_SUBST([OPENSSL_LIB_DIR])
  	 fi],
  	[AC_MSG_RESULT([no])
-@@ -72,6 +72,21 @@
+@@ -72,6 +72,21 @@ AC_ARG_ENABLE(gcov,
  		[CFLAGS="$CFLAGS -ftest-coverage -fprofile-arcs"
  		 AC_MSG_RESULT([*** Enabling gcov at user request ***])],)
  
@@ -31,7 +31,7 @@
  # profiling support
  AC_ARG_ENABLE(gprof,
  		[AC_HELP_STRING([--enable-gprof], [enable profiling with gprof [default=off]])],
-@@ -356,6 +371,8 @@
+@@ -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])])
@@ -40,7 +40,7 @@
  AC_CHECK_FUNC(daemon, [ AC_DEFINE(HAVE_DAEMON, 1, [daemon function is available]) ])
   
  if test "x${GCC}" = "xyes"; then
-@@ -363,6 +380,7 @@
+@@ -363,6 +380,7 @@ if test "x${GCC}" = "xyes"; then
  fi
  
  CFLAGS="$CFLAGS -I../include \
diff --git a/security/trousers/files/patch-dist-Makefile.am b/security/trousers/files/patch-dist_Makefile.am
index ba062c7db9d1..ba062c7db9d1 100644
--- a/security/trousers/files/patch-dist-Makefile.am
+++ b/security/trousers/files/patch-dist_Makefile.am
diff --git a/security/trousers/files/patch-dist-tcsd.conf.in b/security/trousers/files/patch-dist_tcsd.conf.in
index a9e13e89ff82..a9e13e89ff82 100644
--- a/security/trousers/files/patch-dist-tcsd.conf.in
+++ b/security/trousers/files/patch-dist_tcsd.conf.in
diff --git a/security/trousers/files/patch-src-include-biosem.h b/security/trousers/files/patch-src_include_biosem.h
index e19865e4d540..0f8086c4cff5 100644
--- a/security/trousers/files/patch-src-include-biosem.h
+++ b/security/trousers/files/patch-src_include_biosem.h
@@ -1,4 +1,4 @@
---- src/include/biosem.h.orig	2014-04-24 18:05:44 UTC
+--- src/include/biosem.h.orig	2016-06-20 15:21:26 UTC
 +++ src/include/biosem.h
 @@ -26,7 +26,7 @@ typedef struct {
  	UINT32 eventType;
diff --git a/security/trousers/files/patch-src-include-linux-tpm.h b/security/trousers/files/patch-src_include_linux_tpm.h
index 9ecc4cfa2fe2..ae6cd78deb23 100644
--- a/security/trousers/files/patch-src-include-linux-tpm.h
+++ b/security/trousers/files/patch-src_include_linux_tpm.h
@@ -1,4 +1,4 @@
---- src/include/linux/tpm.h.orig	2014-04-24 18:05:44 UTC
+--- src/include/linux/tpm.h.orig	2016-06-20 15:21:26 UTC
 +++ src/include/linux/tpm.h
 @@ -20,6 +20,8 @@
  #include <linux/ioctl.h>
diff --git a/security/trousers/files/patch-src-include-tcs_tsp.h b/security/trousers/files/patch-src_include_tcs__tsp.h
index 4a99f4a7140c..fd8164a7f58c 100644
--- a/security/trousers/files/patch-src-include-tcs_tsp.h
+++ b/security/trousers/files/patch-src_include_tcs__tsp.h
@@ -1,4 +1,4 @@
---- src/include/tcs_tsp.h.orig	2014-04-24 18:05:44 UTC
+--- src/include/tcs_tsp.h.orig	2016-06-20 15:21:26 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 */
diff --git a/security/trousers/files/patch-src-include-tcs_utils.h b/security/trousers/files/patch-src_include_tcs__utils.h
index d0aa6c1cb0c0..4eee71c78339 100644
--- a/security/trousers/files/patch-src-include-tcs_utils.h
+++ b/security/trousers/files/patch-src_include_tcs__utils.h
@@ -1,4 +1,4 @@
---- src/include/tcs_utils.h.orig	2014-04-24 18:05:44 UTC
+--- src/include/tcs_utils.h.orig	2016-06-20 15:21:26 UTC
 +++ src/include/tcs_utils.h
 @@ -18,6 +18,20 @@
  #include "tcs_tsp.h"
diff --git a/security/trousers/files/patch-src-include-tcsd.h b/security/trousers/files/patch-src_include_tcsd.h
index 86f62b7a2c8a..6d5943f0a5ce 100644
--- a/security/trousers/files/patch-src-include-tcsd.h
+++ b/security/trousers/files/patch-src_include_tcsd.h
@@ -1,4 +1,4 @@
---- src/include/tcsd.h.orig	2014-04-24 18:05:44 UTC
+--- src/include/tcsd.h.orig	2016-06-20 15:21:26 UTC
 +++ src/include/tcsd.h
 @@ -53,14 +53,22 @@ struct tcsd_config
  #define TCSD_DEFAULT_CONFIG_FILE	ETC_PREFIX "/tcsd.conf"
diff --git a/security/trousers/files/patch-src-include-tcsd_ops.h b/security/trousers/files/patch-src_include_tcsd__ops.h
index 54fdb60ac2d1..72bc79e976dd 100644
--- a/security/trousers/files/patch-src-include-tcsd_ops.h
+++ b/security/trousers/files/patch-src_include_tcsd__ops.h
@@ -1,4 +1,4 @@
---- src/include/tcsd_ops.h.orig	2014-04-24 18:05:44 UTC
+--- src/include/tcsd_ops.h.orig	2016-06-20 15:21:26 UTC
 +++ src/include/tcsd_ops.h
 @@ -123,7 +123,7 @@
  
diff --git a/security/trousers/files/patch-src-include-threads.h b/security/trousers/files/patch-src_include_threads.h
index f0949695be3a..feeb1b0e8795 100644
--- a/security/trousers/files/patch-src-include-threads.h
+++ b/security/trousers/files/patch-src_include_threads.h
@@ -1,4 +1,4 @@
---- src/include/threads.h.orig	2014-04-24 18:05:44 UTC
+--- src/include/threads.h.orig	2016-06-20 15:21:26 UTC
 +++ src/include/threads.h
 @@ -31,7 +31,7 @@
  #define COND_SIGNAL(c)		pthread_cond_signal(c)
diff --git a/security/trousers/files/patch-src-include-trousers_types.h b/security/trousers/files/patch-src_include_trousers__types.h
index 902bea8de528..147d7097af9f 100644
--- a/security/trousers/files/patch-src-include-trousers_types.h
+++ b/security/trousers/files/patch-src_include_trousers__types.h
@@ -1,4 +1,4 @@
---- src/include/trousers_types.h.orig	2014-04-24 18:05:44 UTC
+--- src/include/trousers_types.h.orig	2016-06-20 15:21:26 UTC
 +++ src/include/trousers_types.h
 @@ -11,6 +11,14 @@
  #ifndef _TROUSERS_TYPES_H_
diff --git a/security/trousers/files/patch-src-include-tss-platform.h b/security/trousers/files/patch-src_include_tss_platform.h
index f9fcd406a650..67273bc34cc5 100644
--- a/security/trousers/files/patch-src-include-tss-platform.h
+++ b/security/trousers/files/patch-src_include_tss_platform.h
@@ -1,11 +1,11 @@
---- src/include/tss/platform.h.orig	2014-04-24 18:05:44 UTC
+--- src/include/tss/platform.h.orig	2016-06-20 15:21:26 UTC
 +++ src/include/tss/platform.h
 @@ -15,7 +15,7 @@ There are platform dependent and general
- #if !defined(WIN32)

- #include <stdint.h>

-    typedef uint8_t            BYTE;

--   typedef int8_t             TSS_BOOL;

-+   typedef uint8_t            TSS_BOOL;

-    typedef uint16_t           UINT16;

-    typedef uint32_t           UINT32;

-    typedef uint64_t           UINT64;

+ #if !defined(WIN32)
+ #include <stdint.h>
+    typedef uint8_t            BYTE;
+-   typedef int8_t             TSS_BOOL;
++   typedef uint8_t            TSS_BOOL;
+    typedef uint16_t           UINT16;
+    typedef uint32_t           UINT32;
+    typedef uint64_t           UINT64;
diff --git a/security/trousers/files/patch-src-tcs-Makefile.am b/security/trousers/files/patch-src_tcs_Makefile.am
index c9ff1d9cb775..637037d3a9f3 100644
--- a/security/trousers/files/patch-src-tcs-Makefile.am
+++ b/security/trousers/files/patch-src_tcs_Makefile.am
@@ -1,5 +1,5 @@
---- src/tcs/Makefile.am.orig	2014-04-25 03:05:44.000000000 +0900
-+++ src/tcs/Makefile.am	2016-05-19 15:26:50.732611000 +0900
+--- src/tcs/Makefile.am.orig	2014-04-24 18:05:44 UTC
++++ src/tcs/Makefile.am
 @@ -1,8 +1,7 @@
 -noinst_LIBRARIES=libtcs.a
 +noinst_LIBRARIES=libtcs.a libtcs_emu.a
@@ -11,7 +11,7 @@
  
  libtcs_a_SOURCES=log.c \
  		 tcs_caps.c \
-@@ -91,7 +90,7 @@
+@@ -91,7 +90,7 @@ endif
  if TSS_BUILD_KEY
  libtcs_a_SOURCES+=tcsi_key.c tcs_key.c tcs_key_mem_cache.c tcs_context_key.c rpc/@RPC@/rpc_key.c \
  		  crypto/@CRYPTO_PACKAGE@/crypto.c
@@ -20,7 +20,7 @@
  endif
  if TSS_BUILD_MAINT
  libtcs_a_SOURCES+=tcsi_maint.c rpc/@RPC@/rpc_maint.c
-@@ -140,3 +139,143 @@
+@@ -140,3 +139,143 @@ if TSS_BUILD_CMK
  libtcs_a_SOURCES+=tcsi_cmk.c rpc/@RPC@/rpc_cmk.c
  libtcs_a_CFLAGS+=-DTSS_BUILD_CMK
  endif
diff --git a/security/trousers/files/patch-src-tcs-ps-ps_utils.c b/security/trousers/files/patch-src_tcs_ps_ps__utils.c
index cc2dfab9a58b..679a2d8c60af 100644
--- a/security/trousers/files/patch-src-tcs-ps-ps_utils.c
+++ b/security/trousers/files/patch-src_tcs_ps_ps__utils.c
@@ -1,4 +1,4 @@
---- src/tcs/ps/ps_utils.c.orig	2014-04-24 18:05:44 UTC
+--- src/tcs/ps/ps_utils.c.orig	2016-06-20 15:21:26 UTC
 +++ src/tcs/ps/ps_utils.c
 @@ -16,10 +16,18 @@
  #if defined(HAVE_BYTEORDER_H)
diff --git a/security/trousers/files/patch-src-tcs-ps-tcsps.c b/security/trousers/files/patch-src_tcs_ps_tcsps.c
index 3f79d1b0e626..3b3e96224e97 100644
--- a/security/trousers/files/patch-src-tcs-ps-tcsps.c
+++ b/security/trousers/files/patch-src_tcs_ps_tcsps.c
@@ -1,4 +1,4 @@
---- src/tcs/ps/tcsps.c.orig	2014-04-24 18:05:44 UTC
+--- src/tcs/ps/tcsps.c.orig	2016-06-20 15:21:26 UTC
 +++ src/tcs/ps/tcsps.c
 @@ -24,6 +24,11 @@
  #define LE_16 htole16
diff --git a/security/trousers/files/patch-src-tcs-rpc-tcstp-rpc.c b/security/trousers/files/patch-src_tcs_rpc_tcstp_rpc.c
index e71911c4848a..d37d36ba5ef2 100644
--- a/security/trousers/files/patch-src-tcs-rpc-tcstp-rpc.c
+++ b/security/trousers/files/patch-src_tcs_rpc_tcstp_rpc.c
@@ -1,4 +1,4 @@
---- src/tcs/rpc/tcstp/rpc.c.orig	2014-04-24 18:05:44 UTC
+--- src/tcs/rpc/tcstp/rpc.c.orig	2016-06-20 15:21:26 UTC
 +++ src/tcs/rpc/tcstp/rpc.c
 @@ -16,6 +16,7 @@
  #if (defined (__OpenBSD__) || defined (__FreeBSD__))
diff --git a/security/trousers/files/patch-src-tcs-tcs_aik.c b/security/trousers/files/patch-src_tcs_tcs__aik.c
index 53868fd76836..c4e4113c72b7 100644
--- a/security/trousers/files/patch-src-tcs-tcs_aik.c
+++ b/security/trousers/files/patch-src_tcs_tcs__aik.c
@@ -1,4 +1,4 @@
---- src/tcs/tcs_aik.c.orig	2014-04-24 18:05:44 UTC
+--- src/tcs/tcs_aik.c.orig	2016-06-20 15:21:26 UTC
 +++ src/tcs/tcs_aik.c
 @@ -66,7 +66,7 @@ UnloadBlob_SYMMETRIC_KEY(UINT64 *offset,
  	UnloadBlob_UINT16(offset, &key->size, blob);
diff --git a/security/trousers/files/patch-src-tcs-tcs_auth_mgr.c b/security/trousers/files/patch-src_tcs_tcs__auth__mgr.c
index 7088a4f889b6..ef5f296530e3 100644
--- a/security/trousers/files/patch-src-tcs-tcs_auth_mgr.c
+++ b/security/trousers/files/patch-src_tcs_tcs__auth__mgr.c
@@ -1,4 +1,4 @@
---- src/tcs/tcs_auth_mgr.c.orig	2014-04-24 18:05:44 UTC
+--- src/tcs/tcs_auth_mgr.c.orig	2016-06-20 15:21:26 UTC
 +++ src/tcs/tcs_auth_mgr.c
 @@ -108,7 +108,7 @@ void
  auth_mgr_swap_in()
diff --git a/security/trousers/files/patch-src-tcsd-Makefile.am b/security/trousers/files/patch-src_tcsd_Makefile.am
index 2a067281633c..eb41644dabf3 100644
--- a/security/trousers/files/patch-src-tcsd-Makefile.am
+++ b/security/trousers/files/patch-src_tcsd_Makefile.am
@@ -1,5 +1,5 @@
---- src/tcsd/Makefile.am.orig	2014-04-25 03:05:44.000000000 +0900
-+++ src/tcsd/Makefile.am	2016-05-19 03:00:08.951991000 +0900
+--- src/tcsd/Makefile.am.orig	2014-04-24 18:05:44 UTC
++++ src/tcsd/Makefile.am
 @@ -1,11 +1,17 @@
 -sbin_PROGRAMS=tcsd
 +sbin_PROGRAMS=tcsd tcsd_emu
diff --git a/security/trousers/files/patch-src-tcsd-svrside.c b/security/trousers/files/patch-src_tcsd_svrside.c
index dfc6eee35206..e7248c692afa 100644
--- a/security/trousers/files/patch-src-tcsd-svrside.c
+++ b/security/trousers/files/patch-src_tcsd_svrside.c
@@ -1,4 +1,4 @@
---- src/tcsd/svrside.c.orig	2014-04-24 18:05:44 UTC
+--- src/tcsd/svrside.c.orig	2016-06-20 15:21:26 UTC
 +++ src/tcsd/svrside.c
 @@ -92,12 +92,19 @@ tcsd_signal_term(int signal)
  	term = 1;
diff --git a/security/trousers/files/patch-src-tddl-Makefile.am b/security/trousers/files/patch-src_tddl_Makefile.am
index 639175af6f47..639175af6f47 100644
--- a/security/trousers/files/patch-src-tddl-Makefile.am
+++ b/security/trousers/files/patch-src_tddl_Makefile.am
diff --git a/security/trousers/files/patch-src-trspi-Makefile.am b/security/trousers/files/patch-src_trspi_Makefile.am
index e834550f5121..439a229f7d3c 100644
--- a/security/trousers/files/patch-src-trspi-Makefile.am
+++ b/security/trousers/files/patch-src_trspi_Makefile.am
@@ -1,5 +1,5 @@
---- src/trspi/Makefile.am.orig	2014-04-25 03:05:44.000000000 +0900
-+++ src/trspi/Makefile.am	2016-05-19 03:16:29.786606000 +0900
+--- src/trspi/Makefile.am.orig	2014-04-24 18:05:44 UTC
++++ src/trspi/Makefile.am
 @@ -1,7 +1,8 @@
  noinst_LTLIBRARIES=libtrousers.la
  
diff --git a/security/trousers/files/patch-src-tspi-Makefile.am b/security/trousers/files/patch-src_tspi_Makefile.am
index 66be8ad0b6a5..658a5f6b04c5 100644
--- a/security/trousers/files/patch-src-tspi-Makefile.am
+++ b/security/trousers/files/patch-src_tspi_Makefile.am
@@ -1,6 +1,6 @@
---- src/tspi/Makefile.am.orig	2014-04-25 03:05:44.000000000 +0900
-+++ src/tspi/Makefile.am	2016-05-19 03:04:18.883005000 +0900
-@@ -17,9 +17,9 @@
+--- src/tspi/Makefile.am.orig	2014-04-24 18:05: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.
  # 6. If any interfaces have been removed since the last public release, then set age to 0.
  
diff --git a/security/trousers/files/patch-src-tspi-ps-ps_utils.c b/security/trousers/files/patch-src_tspi_ps_ps__utils.c
index 0bb38d1cbbc2..1c83180cf7bc 100644
--- a/security/trousers/files/patch-src-tspi-ps-ps_utils.c
+++ b/security/trousers/files/patch-src_tspi_ps_ps__utils.c
@@ -1,4 +1,4 @@
---- src/tspi/ps/ps_utils.c.orig	2014-04-24 18:05:44 UTC
+--- src/tspi/ps/ps_utils.c.orig	2016-06-20 15:21:26 UTC
 +++ src/tspi/ps/ps_utils.c
 @@ -22,7 +22,7 @@
  #include "tspps.h"
diff --git a/security/trousers/files/patch-src-tspi-ps-tspps.c b/security/trousers/files/patch-src_tspi_ps_tspps.c
index d58f17d5f48c..48f55a0eae7b 100644
--- a/security/trousers/files/patch-src-tspi-ps-tspps.c
+++ b/security/trousers/files/patch-src_tspi_ps_tspps.c
@@ -1,4 +1,4 @@
---- src/tspi/ps/tspps.c.orig	2014-04-24 18:05:44 UTC
+--- src/tspi/ps/tspps.c.orig	2016-06-20 15:21:26 UTC
 +++ src/tspi/ps/tspps.c
 @@ -29,6 +29,11 @@
  #define LE_16 htole16
diff --git a/security/trousers/files/patch-src-tspi-rpc-hosttable.c b/security/trousers/files/patch-src_tspi_rpc_hosttable.c
index 144ec14535ad..0acd9ec1a845 100644
--- a/security/trousers/files/patch-src-tspi-rpc-hosttable.c
+++ b/security/trousers/files/patch-src_tspi_rpc_hosttable.c
@@ -1,4 +1,4 @@
---- src/tspi/rpc/hosttable.c.orig	2014-04-24 18:05:44 UTC
+--- src/tspi/rpc/hosttable.c.orig	2016-06-20 15:21:26 UTC
 +++ src/tspi/rpc/hosttable.c
 @@ -51,6 +51,8 @@ host_table_final()
  {
diff --git a/security/trousers/files/patch-src-tspi-rpc-tcstp-rpc.c b/security/trousers/files/patch-src_tspi_rpc_tcstp_rpc.c
index 5de4c2079f55..b26709a8b271 100644
--- a/security/trousers/files/patch-src-tspi-rpc-tcstp-rpc.c
+++ b/security/trousers/files/patch-src_tspi_rpc_tcstp_rpc.c
@@ -1,4 +1,4 @@
---- src/tspi/rpc/tcstp/rpc.c.orig	2014-04-24 18:05:44 UTC
+--- src/tspi/rpc/tcstp/rpc.c.orig	2016-06-20 15:21:26 UTC
 +++ src/tspi/rpc/tcstp/rpc.c
 @@ -304,7 +304,7 @@ recv_from_socket(int sock, void *buffer,
  		errno = 0;
diff --git a/security/trousers/files/patch-src-tspi-tsp_tcsi_param.c b/security/trousers/files/patch-src_tspi_tsp__tcsi__param.c
index 5aae426603a1..aa975ed99421 100644
--- a/security/trousers/files/patch-src-tspi-tsp_tcsi_param.c
+++ b/security/trousers/files/patch-src_tspi_tsp__tcsi__param.c
@@ -1,4 +1,4 @@
---- src/tspi/tsp_tcsi_param.c.orig	2014-04-24 18:05:44 UTC
+--- src/tspi/tsp_tcsi_param.c.orig	2016-06-20 15:21:26 UTC
 +++ src/tspi/tsp_tcsi_param.c
 @@ -11,7 +11,12 @@
  #include <stdlib.h>
diff --git a/security/xorsearch/Makefile b/security/xorsearch/Makefile
index 2f290977a854..2f45ce918fb3 100644
--- a/security/xorsearch/Makefile
+++ b/security/xorsearch/Makefile
@@ -10,16 +10,17 @@ DISTNAME=	XORSearch_V1_2_0
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Search for a given string in an XOR or ROL encoded binary file
 
-USES=		zip
-WRKSRC=		${WRKDIR}
+USES=		dos2unix zip
+DOS2UNIX_GLOB=	*.c
+NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/xorsearch
 
 do-build:
-	${CC} -o ${WRKDIR}/XORSearch ${WRKDIR}/XORSearch.c
+	${CC} -o ${WRKSRC}/XORSearch ${WRKSRC}/XORSearch.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/XORSearch \
+	${INSTALL_PROGRAM} ${WRKSRC}/XORSearch \
 		${STAGEDIR}${PREFIX}/bin/xorsearch
 
 .include <bsd.port.mk>
diff --git a/security/xorsearch/files/patch-XORSearch.c b/security/xorsearch/files/patch-XORSearch.c
index b42befea1a63..20d6023363da 100644
--- a/security/xorsearch/files/patch-XORSearch.c
+++ b/security/xorsearch/files/patch-XORSearch.c
@@ -1,10 +1,10 @@
---- XORSearch.c.orig	Tue Dec 18 07:27:32 2007
-+++ XORSearch.c	Tue Dec 18 07:27:38 2007
+--- XORSearch.c.orig	2016-06-20 15:09:40 UTC
++++ XORSearch.c
 @@ -20,7 +20,6 @@
- #include <stdio.h>

- #include <stdlib.h>

- #include <sys/stat.h>

--#include <malloc.h>

- #include <string.h>

- #include <ctype.h>

- #include <limits.h>

+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/stat.h>
+-#include <malloc.h>
+ #include <string.h>
+ #include <ctype.h>
+ #include <limits.h>