This commit was manufactured by cvs2svn to create tag 'initial-import'.

3rdp/build/Common.gmake

-##############
-# NSPR Stuff #
-##############
-
-ifeq ($(shell nspr-config --version > /dev/null 2>&1 && echo YES),YES)
- NSPRDIR ?= $(shell nspr-config --libdir)
- NSPRINCLUDE ?= $(shell nspr-config --includedir)
- NSPR_CFLAGS ?= $(shell nspr-config --cflags)
- NSPR_LIBS ?= $(shell nspr-config --libs)
-else
- ifeq ($(os),sunos)
-  ifeq ($(shell test -f /usr/sfw/lib/mozilla/libnspr4.so && echo "yes"),yes)
-   NSPRDIR ?= /usr/sfw/lib/mozilla
-   ifeq ($(shell test -d /usr/sfw/include/mozilla/nspr && echo "yes"),yes)
-    NSPRINCLUDE ?= /usr/sfw/include/mozilla/nspr
-   endif
-  endif
- endif
-
- ifndef NSPRDIR
-  NSPRDIR := $(SRC_ROOT)$(DIRSEP)..$(DIRSEP)lib$(DIRSEP)mozilla$(DIRSEP)nspr$(DIRSEP)$(machine).$(BUILD)
- endif
-
- #The following is needed for nspr support on Linux
- ifeq ($(os),linux)
-  NSPR_LIBS +=	-ldl
- endif
-
- NSPR_LIBS	+=	-lnspr4
-endif
-
-NSPR_LDFLAGS	+=	-L/usr/local/lib -L$(NSPRDIR)
-
-ifdef NSPRINCLUDE
- NSPR_CFLAGS += -I$(NSPRINCLUDE)
-else
- # Use local NSPR first...
- NSPR_CFLAGS += -I/usr/local/include -I$(SRC_ROOT)$(DIRSEP)..$(DIRSEP)include$(DIRSEP)mozilla$(DIRSEP)nspr
-endif
-
-################
-# Common stuff #
-################
-3RDPODIR :=	$(3RDP_ROOT)/$(CCPRE).$(machine).$(BUILDPATH)
-3RDPSRCDIR :=	$(3RDP_ROOT)/src
-3RDPDISTDIR :=	$(3RDP_ROOT)/dist
-3RDPBUILDDIR :=	$(3RDP_ROOT)/build
-JS_SRC :=	$(3RDP_ROOT)/src/mozjs
-JS_IDIR :=	$(3RDPODIR)/mozjs
-CRYPT_SRC :=	$(3RDP_ROOT)/src/cl
-CRYPT_IDIR :=	$(3RDPODIR)/cl
-
-############
-# JS Stuff #
-############
-
-JS_CFLAGS += -DJAVASCRIPT $(NSPR_CFLAGS)
-JS_LDFLAGS += $(NSPR_LDFLAGS)
-
-ifdef JSLIB
- JS_NOBUILD:=1
-else
- ifdef JSINCLUDE
-  JS_NOBUILD:=1
- else
-  ifdef JSLIBDIR
-   JS_NOBUILD:=1
-  endif
- endif
-endif
-
-ifdef JS_NOBUILD
- ##############################
- # JS Specified on build line #
- ##############################
- ifeq ($(os),sunos)
-  ifeq ($(shell test -f /usr/sfw/lib/mozilla/libmozjs185.so && echo "yes"),yes)
-   JSLIBDIR ?= /usr/sfw/lib/mozilla
-   JSLIB ?= mozjs185
-  endif
- endif
-
- ifndef JSLIB
-  JSLIB	:=	mozjs185
- endif
- JS_DEPS :=
- JS_LIBS += -l$(JSLIB)
-else
- JSINCLUDE := $(JS_IDIR)$(DIRSEP)include/js
- JSLIBDIR := $(JS_IDIR)$(DIRSEP)lib
- JSLIB := mozjs185
- JS_DEPS := js
- JS_LIBS += $(JSLIBDIR)$(DIRSEP)libmozjs185-1.0.a
-endif
-JS_LIBS += $(NSPR_LIBS)
- 
-# Put it all together...
-
-ifdef JSINCLUDE
- JS_CFLAGS += -I$(JSINCLUDE)
-endif
-ifdef JSLIBDIR
- JS_LDFLAGS += -L$(JSLIBDIR)
-endif
-
-##################
-# Cryptlib Stuff #
-##################
-
-ifdef CRYPTLIBINCLUDE
- CRYPTLIB_NOBUILD:=1
-else
- ifdef CRYPTLIBDIR
-  CRYPTLIB_NOBUILD:=1
- endif
-endif
-
-ifdef CRYPTLIB_NOBUILD
- ####################################
- # Cryptlib specified on build line #
- ####################################
- CRYPT_DEPS :=
- CRYPT_LIBS += -lcl
-else
- CRYPTLIBINCLUDE := $(CRYPT_IDIR)
- CRYPTLIBDIR := $(CRYPT_IDIR)
- CRYPT_DEPS := cl
- CRYPT_LIBS += $(CRYPT_IDIR)/libcl.a
- CRYPT_CFLAGS += -DSTATIC_CRYPTLIB -DSTATIC_LIB
-endif
-
-# Put it all together...
-
-ifdef CRYPTLIBINCLUDE
- CRYPT_CFLAGS += -I$(CRYPTLIBINCLUDE)
-endif
-ifdef CRYPTLIBDIR
- CRYPT_LDFLAGS += -L$(CRYPTLIBDIR)
-endif
-

3rdp/build/Common.make

-JS_LIB =       $(3RDPODIR)$(DIRSEP)mozjs$(DIRSEP)lib$(DIRSEP)$(LIBPREFIX)mozjs185-1.0$(LIBFILE)
-CRYPT_LIB =    $(3RDPODIR)$(DIRSEP)cl$(DIRSEP)$(LIBPREFIX)cl$(LIBFILE)
-

3rdp/build/Dynamic-linked-static-lib.patch

---- ../tmp2/tools/ccopts.sh	2019-03-04 16:32:32.000000000 -0500
-+++ tools/ccopts.sh	2019-06-03 16:56:55.005703000 -0400
-@@ -393,7 +393,6 @@
- # of large-displacement jumps, so if you're tuning the code for size/speed
- # you can try -fpic to see if you get any improvement.
- 
--if [ $SHARED -gt 0 ] ; then
- 	case $OSNAME in
- 		'Darwin')
- 			CCARGS="$CCARGS -fPIC -fno-common" ;;
-@@ -420,7 +419,6 @@
- 		*)
- 			CCARGS="$CCARGS -fPIC" ;;
- 	esac ;
--fi
- 
- # Conversely, if we're building a static lib and the system requires it, set
- # up static lib-specific options.

3rdp/build/GNUmakefile

-# $Id$
-
-SRC_ROOT = ../../src
-# Cross platform/compiler definitions
-include $(SRC_ROOT)/build/Common.gmake	# defines clean and output directory rules
-
-JS_CONFIGURE_ARGS += $(EXTRA_JS_CONFIGURE_ARGS) --with-system-nspr --disable-tests --disable-shared-js --enable-threadsafe --prefix=$(shell echo `pwd`$(DIRSEP)$(JS_IDIR))
-ifdef DEBUG
- JS_CONFIGURE_ARGS += --enable-debug-symbols --disable-optimize
-else
- JS_CONFIGURE_ARGS += --enable-optimize=-O3
-endif
-CXXFLAGS = -std=gnu++98
-ifeq ($(shell perl -e 'print "$(machine)"=~/\.arm/?"YES":"NO"'),YES)
- ifeq ($(shell perl -e 'print "$(machine)"=~/\.armv[1-6]/?"YES":"NO"'),YES)
-  JS_CONFIGURE_ARGS += --with-cpu-arch=armv5te
- endif
- ifeq ($(shell perl -e 'print `gcc -v 2>&1`=~/--with-fpu=vfp/?"YES":"NO"'),YES)
-  ifeq ($(shell perl -e 'print `gcc -v 2>&1`=~/--with-float=hard/?"YES":"NO"'),YES)
-   JS_CONFIGURE_ENV += 'CFLAGS=-mfpu=vfp -mfloat-abi=hard'
-   CXXFLAGS += -mfpu=vfp -mfloat-abi=hard
-   JS_CONFIGURE_ENV += 'ASFLAGS=-mfpu=vfp -mfloat-abi=hard'
-  else
-   JS_CONFIGURE_ENV += 'CFLAGS=-msoft-float'
-   CXXFLAGS += -msoft-float
-   JS_CONFIGURE_ENV += 'ASFLAGS=-msoft-float'
-  endif
- endif
-endif
-JS_CONFIGURE_ENV += 'CXXFLAGS=$(CXXFLAGS)'
-
-.PHONY: cryptlib libmozjs
-cryptlib: $(CRYPTLIB_BUILD)
-libmozjs: $(JSLIB_BUILD)
-
-###############
-# Directories #
-###############
-$(3RDPODIR):
-	$(QUIET)$(IFNOTEXIST) mkdir $(3RDPODIR)
-
-$(3RDPSRCDIR):
-	$(QUIET)$(IFNOTEXIST) mkdir $(3RDPSRCDIR)
-
-$(JS_SRC): | $(3RDPSRCDIR)
-	$(QUIET)$(IFNOTEXIST) mkdir $(JS_SRC)
-
-$(JS_IDIR): | $(3RDPODIR)
-	$(QUIET)$(IFNOTEXIST) mkdir $(JS_IDIR)
-
-$(JSLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/libmozjs.tgz $(3RDP_ROOT)$(DIRSEP)build/js_src_jsnativestack_cpp.patch $(3RDP_ROOT)$(DIRSEP)build/js-configure.patch $(3RDP_ROOT)$(DIRSEP)build/js-configure.in.patch | $(JS_SRC) $(JS_IDIR)
-	@echo Creating $@ ...
-	$(QUIET)-rm -rf $(JS_SRC)/*
-	$(QUIET)tar -xzC $(JS_SRC) -f $(3RDPDISTDIR)$(DIRSEP)libmozjs.tgz
-	$(QUIET)echo "pthread_np.h" >> $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src$(DIRSEP)config$(DIRSEP)system-headers
-	$(QUIET)patch -p0 -d $(JS_SRC)$(DIRSEP)js-1.8.5 < js_src_jsnativestack_cpp.patch
-	$(QUIET)patch -p0 -d $(JS_SRC) < js-configure.patch
-	$(QUIET)patch -p0 -d $(JS_SRC) < js-configure.in.patch
-	-$(QUIET)cd $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src && autoconf-2.13
-	$(QUIET)cd $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src && env $(JS_CONFIGURE_ENV) ./configure $(JS_CONFIGURE_ARGS)
-	$(QUIET)$(MAKE) -C $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src
-	$(QUIET)$(MAKE) -C $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src install
-
-$(CRYPT_SRC): | $(3RDPSRCDIR)
-	$(QUIET)$(IFNOTEXIST) mkdir $(CRYPT_SRC)
-
-$(CRYPT_IDIR): | $(3RDPODIR)
-	$(QUIET)$(IFNOTEXIST) mkdir $(CRYPT_IDIR)
-
-$(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-noasm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zz-country.patch $(3RDP_ROOT)$(DIRSEP)build/cl-algorithms.patch $(3RDP_ROOT)$(DIRSEP)build/cl-allow-duplicate-ext.patch $(3RDP_ROOT)$(DIRSEP)build/cl-macosx-minver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-endian.patch $(3RDP_ROOT)$(DIRSEP)build/cl-cryptodev.patch $(3RDP_ROOT)$(DIRSEP)build/cl-posix-me-gently.patch $(3RDP_ROOT)$(DIRSEP)build/cl-tpm-linux.patch $(3RDP_ROOT)$(DIRSEP)build/cl-PAM-noprompts.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zlib.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bigger-maxattribute.patch $(3RDP_ROOT)$(DIRSEP)build/cl-vcxproj.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw-vcver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-build-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-gcc-non-const-time-val.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-odbc.patch | $(CRYPT_SRC) $(CRYPT_IDIR)
-	@echo Creating $@ ...
-	$(QUIET)-rm -rf $(CRYPT_SRC)/*
-	$(QUIET)unzip -oa $(3RDPDISTDIR)$(DIRSEP)cryptlib.zip -d $(CRYPT_SRC)
-	$(QUIET)perl -pi.bak -e 's/\r//' $(CRYPT_SRC)/crypt32.vcxproj
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < terminal-params.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-mingw32-static.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-ranlib.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-vcxproj.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-endian.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-win32-noasm.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-zz-country.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-algorithms.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-allow-duplicate-ext.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-macosx-minver.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-cryptodev.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-posix-me-gently.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-tpm-linux.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-PAM-noprompts.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-zlib.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < Dynamic-linked-static-lib.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < SSL-fix.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-bigger-maxattribute.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-mingw-vcver.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-win32-build-fix.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-gcc-non-const-time-val.patch
-	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-no-odbc.patch
-ifeq ($(CC),mingw32-gcc)
-	$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make directories
-	$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make toolscripts
-	$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make MINGW32_NT-6.1 OSNAME=win32
-else
-ifdef MINGW32
-	$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make target-mingw
-else
-	$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make
-endif
-endif
-	$(QUIET)cp $(CRYPT_SRC)$(DIRSEP)libcl.a $(CRYPT_IDIR)
-	$(QUIET)cp $(CRYPT_SRC)$(DIRSEP)cryptlib.h $(CRYPT_IDIR)

3rdp/build/SSL-fix.patch

---- ../tmp2/session/sess_attr.c	2019-02-05 18:18:28.000000000 -0500
-+++ session/sess_attr.c	2019-06-03 17:06:34.378151000 -0400
-@@ -102,11 +102,13 @@
- 
- 	/* If there's already a network socket specified then we can't set a 
- 	   server name as well */
-+/*
- 	if( sessionInfoPtr->networkSocket != CRYPT_ERROR )
- 		{
- 		return( exitErrorInited( sessionInfoPtr, 
- 								 CRYPT_SESSINFO_NETWORKSOCKET ) );
- 		}
-+*/
- 
- 	/* Parse the server name.  The PKI protocols all use HTTP as their 
- 	   substrate so if it's not SSH or SSL/TLS we require HTTP */

3rdp/build/cl-PAM-noprompts.patch

---- ../tmp2/session/ssh2_authc.c	2018-12-14 17:31:34.000000000 -0500
-+++ session/ssh2_authc.c	2019-06-03 16:41:49.956986000 -0400
-@@ -868,7 +868,7 @@
- 		if( !cryptStatusError( status ) )
- 			{
- 			status = CRYPT_OK;	/* readUint32() returns a count value */
--			if( noPrompts <= 0 || noPrompts > 4 )
-+			if( noPrompts < 0 || noPrompts > 4 )
- 				{
- 				/* Requesting zero or more than a small number of prompts is 
- 				   suspicious */
-@@ -876,49 +876,52 @@
- 				}
- 			}
- 		}
--	if( cryptStatusOK( status ) )
-+	if( noPrompts > 0 )
- 		{
--		status = readString32( &stream, promptBuffer, 
-+		if( cryptStatusOK( status ) )
-+ 			{
-+			status = readString32( &stream, promptBuffer, 
- 							   CRYPT_MAX_TEXTSIZE, &promptLength );
--		if( cryptStatusOK( status ) && promptLength <= 0 )
-+			if( cryptStatusOK( status ) && promptLength <= 0 )
-+				{
-+				/* We must have at least some sort of prompt given that we 
-+				   require num_prompts to be nonzero */
-+				status = CRYPT_ERROR_BADDATA;
-+				}
-+			}
-+		sMemDisconnect( &stream );
-+		if( cryptStatusError( status ) )
- 			{
--			/* We must have at least some sort of prompt given that we 
--			   require num_prompts to be nonzero */
--			status = CRYPT_ERROR_BADDATA;
-+			retExt( status,
-+					( status, SESSION_ERRINFO, 
-+					  "Invalid PAM authentication request packet" ) );
- 			}
--		}
--	sMemDisconnect( &stream );
--	if( cryptStatusError( status ) )
--		{
--		retExt( status,
--				( status, SESSION_ERRINFO, 
--				  "Invalid PAM authentication request packet" ) );
--		}
--	REQUIRES( nameLength >= 0 && nameLength <= CRYPT_MAX_TEXTSIZE );
--	REQUIRES( promptLength >= 1 && promptLength <= CRYPT_MAX_TEXTSIZE );
-+		REQUIRES( nameLength >= 0 && nameLength <= CRYPT_MAX_TEXTSIZE );
-+		REQUIRES( promptLength >= 1 && promptLength <= CRYPT_MAX_TEXTSIZE );
- 
--	/* Make sure that we're being asked for some form of password 
--	   authentication.  This assumes that the prompt string begins with the 
--	   word "password" (which always seems to be the case), if it isn't then 
--	   it may be necessary to do a substring search */
--	if( promptLength < 8 || \
--		!strIsPrintable( promptBuffer, promptLength ) || \
--		strCompare( promptBuffer, "Password", 8 ) )
--		{
--		/* The following may produce somewhat inconsistent results in terms
--		   of what it reports because it's unclear what 'name' actually is, 
--		   on the off chance that something fills this in it could produce
--		   a less appropriate error message than the prompt, but we 
--		   opportunistically try it in case it contains something useful */
--		retExt( CRYPT_ERROR_BADDATA,
--				( CRYPT_ERROR_BADDATA, SESSION_ERRINFO, 
--				  "Server requested unknown PAM authentication type '%s'", 
--				  ( nameLength > 0 ) ? \
--				  sanitiseString( nameBuffer, CRYPT_MAX_TEXTSIZE, \
--								  nameLength ) : \
--				  sanitiseString( promptBuffer, CRYPT_MAX_TEXTSIZE, \
--								  promptLength ) ) );
--		}
-+		/* Make sure that we're being asked for some form of password 
-+		   authentication.  This assumes that the prompt string begins with the 
-+		   word "password" (which always seems to be the case), if it isn't then 
-+		   it may be necessary to do a substring search */
-+		if( promptLength < 8 || \
-+			!strIsPrintable( promptBuffer, promptLength ) || \
-+			strCompare( promptBuffer, "Password", 8 ) )
-+			{
-+			/* The following may produce somewhat inconsistent results in terms
-+			   of what it reports because it's unclear what 'name' actually is, 
-+			   on the off chance that something fills this in it could produce
-+			   a less appropriate error message than the prompt, but we 
-+			   opportunistically try it in case it contains something useful */
-+			retExt( CRYPT_ERROR_BADDATA,
-+					( CRYPT_ERROR_BADDATA, SESSION_ERRINFO, 
-+					  "Server requested unknown PAM authentication type '%s'", 
-+					  ( nameLength > 0 ) ? \
-+					  sanitiseString( nameBuffer, CRYPT_MAX_TEXTSIZE, \
-+									  nameLength ) : \
-+					  sanitiseString( promptBuffer, CRYPT_MAX_TEXTSIZE, \
-+									  promptLength ) ) );
-+			}
-+	}
- 
- 	REQUIRES( passwordPtr != NULL && \
- 			  passwordPtr->valueLength > 0 && \

3rdp/build/cl-algorithms.patch

---- misc/config.h.orig	2018-02-15 02:26:59.017103000 -0500
-+++ misc/config.h	2018-02-15 02:27:50.400787000 -0500
-@@ -9,6 +9,9 @@
- 
- #define _CONFIG_DEFINED
- 
-+#define USE_PROBLEMATIC_ALGORITHMS
-+#define USE_SSH_EXTENDED
-+#define USE_CERTLEVEL_STANDARD
- /****************************************************************************
- *																			*
- *						Custom Configuration Profiles						*

3rdp/build/cl-allow-duplicate-ext.patch

---- cert/ext_add.c.orig	2018-02-24 01:38:55.995138000 -0500
-+++ cert/ext_add.c	2018-02-24 01:39:08.783152000 -0500
-@@ -451,9 +451,11 @@
- 	   a non-blob.  In addition it forces the caller to use the (recommended)
- 	   normal attribute handling mechanism, which allows for proper type
- 	   checking */
-+#if 0
- 	if( !( flags & ATTR_FLAG_BLOB ) && \
- 		oidToAttribute( attributeType, oid, oidLength ) != NULL )
- 		return( CRYPT_ERROR_PERMISSION );
-+#endif
- 
- 	/* Find the correct place in the list to insert the new element */
- 	if( DATAPTR_ISSET( listHead ) )

3rdp/build/cl-bigger-maxattribute.patch

---- ../tmp2/misc/consts.h	2019-02-22 19:36:36.000000000 -0500
-+++ misc/consts.h	2019-06-03 18:05:43.345982000 -0400
-@@ -226,7 +226,7 @@
-    creating things like certs containing MPEGs of themselves playing with
-    their cat */
- 
--#define MAX_ATTRIBUTE_SIZE		1024
-+#define MAX_ATTRIBUTE_SIZE		4096
- 
- /* Some objects contain internal buffers used to process data whose size can 
-    be specified by the user, the following is the minimum and maximum size 

3rdp/build/cl-bn_div.patch

---- bn/bn_div.c.orig	2019-01-21 13:35:22.583819000 -0500
-+++ bn/bn_div.c	2019-01-21 13:35:27.565846000 -0500
-@@ -112,7 +112,7 @@
- /* End changes for cryptlib - pcg */
- 
- /* The old slow way */
--#if 0
-+#if 1
- int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d,
-            BN_CTX *ctx)
- {

3rdp/build/cl-bn_div2.patch

---- bn/bn_div.c.orig	2017-03-23 01:27:30.000000000 -0400
-+++ bn/bn_div.c	2019-01-21 17:23:06.478306000 -0500
-@@ -229,6 +229,9 @@
- #  endif                        /* __GNUC__ */
- # endif                         /* OPENSSL_NO_ASM */
- 
-+#undef REMAINDER_IS_ALREADY_CALCULATED
-+#undef bn_div_words
-+
- /*-
-  * BN_div computes  dv := num / divisor,  rounding towards
-  * zero, and sets up rm  such that  dv*divisor + rm = num  holds.

3rdp/build/cl-cryptodev.patch

---- ../tmp2/tools/ccopts.sh	2019-03-04 16:32:32.000000000 -0500
-+++ tools/ccopts.sh	2019-06-03 16:22:10.631518000 -0400
-@@ -250,13 +250,13 @@
- 	done
- 
- 	# /dev/crypto support
--	for includepath in $DEVCRYPTOPATHS ; do
--		if [ -f $includepath ] ; then
--			echo "/dev/crypto interface detected, enabling crypto hardware support." >&2 ;
--			CCARGS="$CCARGS -DHAS_DEVCRYPTO -I"$(dirname $includepath)"" ;
--			break ;
--		fi
--	done
-+	#for includepath in $DEVCRYPTOPATHS ; do
-+	#	if [ -f $includepath ] ; then
-+	#		echo "/dev/crypto interface detected, enabling crypto hardware support." >&2 ;
-+	#		CCARGS="$CCARGS -DHAS_DEVCRYPTO -I"$(dirname $includepath)"" ;
-+	#		break ;
-+	#	fi
-+	#done
- 
- fi
- if [ -f /usr/include/zlib.h ] ; then

3rdp/build/cl-endian.patch

---- ../tmp2/misc/os_detect.h	2019-01-31 14:57:46.000000000 -0500
-+++ misc/os_detect.h	2019-06-03 18:26:42.394038000 -0400
-@@ -566,6 +566,9 @@
- 	#include <machine/endian.h>
-   #elif defined( __NetBSD__ )
- 	#include <sys/endian.h>
-+  #elif defined( __FreeBSD__ )
-+	#include <sys/endian.h>
-+  #elif defined(__MINGW32__)
-   #else
- 	#include <endian.h>
-   #endif /* Apple vs. everyone else */

3rdp/build/cl-gcc-non-const-time-val.patch

---- misc/consts.h.orig	2019-06-20 12:44:22.683319000 -0400
-+++ misc/consts.h	2019-06-20 12:44:53.191660000 -0400
-@@ -346,7 +346,7 @@
- #define MAX_TIME_VALUE			( YEARS_TO_SECONDS( 2036 - 1970 ) )
- 
- #if ( defined( __clang__ ) && ( __clang_major__ > 5 ) ) || \
--	( defined( __GNUC__ ) && ( __GNUC__ > 6 ) ) || \
-+	( defined( __GNUC__ ) && ( __GNUC__ > 11 ) ) || \
- 	( defined( _MSC_VER ) && VC_GE_2017( _MSC_VER ) )
-   #define CURRENT_TIME_VALUE	( ( DATE_YEAR + DATE_MONTH + DATE_DAY - 30 ) * 86400 )
- #else

3rdp/build/cl-getseed64.patch

---- tools/getseed.sh.orig	2017-07-11 01:19:34.000000000 -0400
-+++ tools/getseed.sh	2018-01-03 02:08:08.240258000 -0500
-@@ -16,7 +16,7 @@
- if [ -e /dev/urandom ] ; then
- 	printf -- "-DFIXED_SEED=0x" ;
- 	if [ $IS64BIT -gt 0 ] ; then
--		printf "%X\n" `od -An -N8 -tu8 < /dev/urandom` ;
-+		printf "%X%X\n" `od -An -N4 -tu4 < /dev/urandom` `od -An -N4 -tu4 < /dev/urandom`;
- 	else
- 		printf "%X\n" `od -An -N4 -tu4 < /dev/urandom` ;
- 	fi ;

3rdp/build/cl-macosx-minver.patch

---- tools/ccopts.sh.orig2	2019-05-31 12:45:50.749075000 -0400
-+++ tools/ccopts.sh	2019-05-31 12:46:06.954741000 -0400
-@@ -305,7 +305,7 @@
- 
- 	case $OSNAME in
- 		'Darwin')
--			CCARGS="$CCARGS -fPIC -fno-common" ;;
-+			CCARGS="$CCARGS -fPIC -fno-common -mmacosx-version-min=10.5" ;;
- 
- 		'CYGWIN_NT-5.0'|'CYGWIN_NT-5.1'|'CYGWIN_NT-6.1')
- 			;;

3rdp/build/cl-mingw-vcver.patch

---- ../tmp2/misc/os_detect.h	2019-01-31 14:57:46.000000000 -0500
-+++ misc/os_detect.h	2019-06-03 18:35:55.358499000 -0400
-@@ -241,10 +241,11 @@
-      preprocessors get confused if they aren't defined */
-   #define VC_16BIT( version )		0
-   #define VC_LE_VC6( version )		0
--  #define VC_GE_2002( version )		0
--  #define VC_LT_2005( version )		0
-+  #define VC_GE_2002( version )		1
-+  #define VC_LT_2005( version )		1
-   #define VC_GE_2005( version )		0
-   #define VC_GE_2008( version )		0
-+  #define VC_LT_2010( version )		1
-   #define VC_GE_2010( version )		0
-   #define VC_GE_2012( version )		0
-   #define VC_GE_2013( version )		0

3rdp/build/cl-mingw32-static.patch

---- makefile.orig	2018-01-09 22:46:54.000000000 -0500
-+++ makefile	2018-01-29 14:27:27.783443000 -0500
-@@ -1894,8 +1894,8 @@
- 
- MINGW32_NT-6.1:
- 	$(MAKE) OSNAME=win32 target-init
--	$(MAKE) $(DEFINES) EXTRAOBJS="$(WIN32ASMOBJS)" \
--		CFLAGS="$(XCFLAGS) -O2 -Wl,--subsystem,windows,--output-def,cl32.def"
-+	$(MAKE) OSNAME=win32 $(DEFINES) EXTRAOBJS="$(WIN32ASMOBJS)" \
-+		CFLAGS="$(XCFLAGS) -O2 -Wl,--subsystem,windows,--output-def,cl32.def -DSTATIC_LIB"
- 
- # NCR MP-RAS: Use the NCR cc.  The "-DNCR_UST" is needed to enable threading
- #			  (User-Space Threads).

3rdp/build/cl-no-odbc.patch

---- tools/ccopts.sh.orig	2019-06-20 12:51:38.118150000 -0400
-+++ tools/ccopts.sh	2019-06-20 12:52:34.479052000 -0400
-@@ -210,7 +210,8 @@
- 	for includepath in $ODBCPATHS ; do
- 		if [ -f $includepath ] ; then
- 			echo "ODBC interface detected, enabling ODBC support." >&2 ;
--			CCARGS="$CCARGS -DHAS_ODBC -I"$(dirname $includepath)"" ;
-+			#CCARGS="$CCARGS -DHAS_ODBC -I"$(dirname $includepath)"" ;
-+			echo "Hah ha ha, no. fuck off." >&2 ;
- 			break ;
- 		fi
- 	done

3rdp/build/cl-posix-me-gently.patch

---- ../tmp2/crypt.h	2019-01-31 14:52:00.000000000 -0500
-+++ crypt.h	2019-06-03 16:26:35.672044000 -0400
-@@ -79,7 +79,7 @@
- #ifndef _POSIX_C_SOURCE 
-   #if defined( __xlc__ ) || defined( __IBMC__ )
- 	#define _POSIX_C_SOURCE			200112L		/* Posix 2001 */
--  #elif defined( __GNUC__ )
-+  #elif defined( __GNUC__ ) && defined( __linux__ )
- 	#define _POSIX_C_SOURCE			200809L		/* Posix 2008 */
- 	#define _DEFAULT_SOURCE			1			/* See note above */
- 	#define _BSD_SOURCE				1			/* Undo breakage */