5 files changed, 59 insertions, 0 deletions

diff --git a/security/cryptlib/files/patch-makefile b/security/cryptlib/files/patch-makefile
new file mode 100644
index 000000000000..1838beb283d7
--- /dev/null
+++ b/security/cryptlib/files/patch-makefile
@@ -0,0 +1,11 @@
+--- makefile.orig	Fri Jul 14 08:16:12 2006
++++ makefile	Fri Jul 14 08:17:26 2006
+@@ -1349,7 +1349,7 @@
+ FreeBSD:
+ 	@./tools/buildasm.sh $(AS) $(OBJPATH)
+ 	make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \
+-		-fomit-frame-pointer -O3 -pthread"
++		%%CFLAGS%% %%PTHREAD_CFLAGS%% %%PTHREAD_LIBS%%"
+ NetBSD:
+ 	@./tools/buildasm.sh $(AS) $(OBJPATH)
+ 	make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \
diff --git a/security/cryptlib/files/patch-misc_config.h b/security/cryptlib/files/patch-misc_config.h
new file mode 100644
index 000000000000..9da114d400c5
--- /dev/null
+++ b/security/cryptlib/files/patch-misc_config.h
@@ -0,0 +1,10 @@
+--- misc/config.h.orig	Fri Jul 14 08:18:03 2006
++++ misc/config.h	Fri Jul 14 08:19:19 2006
+@@ -168,6 +168,7 @@
+ 
+ /* General device usage */
+ 
++#define USE_PKCS11
+ #if defined( USE_PKCS11 ) || defined( USE_FORTEZZA ) || defined( USE_CRYPTOAPI )
+   #define USE_DEVICES
+ #endif /* Device types */
diff --git a/security/cryptlib/files/patch-misc_os_spec.c b/security/cryptlib/files/patch-misc_os_spec.c
new file mode 100644
index 000000000000..f8554713156c
--- /dev/null
+++ b/security/cryptlib/files/patch-misc_os_spec.c
@@ -0,0 +1,11 @@
+--- misc/os_spec.c.orig	Fri Jul 14 08:46:10 2006
++++ misc/os_spec.c	Fri Jul 14 08:46:38 2006
+@@ -1275,7 +1275,7 @@
+ 	return( sysCaps );
+ 	}
+ 
+-#elif defined( __GNUC__ ) && defined( __i386__ )
++#elif defined( __GNUC__ ) && defined( __i386__ ) && !defined(__FreeBSD__)
+ 
+ #if SYSCAP_FLAG_RDTSC != 0x01
+   #error Need to sync SYSCAP_FLAG_RDTSC with equivalent asm definition
diff --git a/security/cryptlib/files/patch-misc_os_spec.h b/security/cryptlib/files/patch-misc_os_spec.h
new file mode 100644
index 000000000000..8f630aeab4e2
--- /dev/null
+++ b/security/cryptlib/files/patch-misc_os_spec.h
@@ -0,0 +1,11 @@
+--- misc/os_spec.h.orig	Fri Jul 14 08:31:41 2006
++++ misc/os_spec.h	Fri Jul 14 08:31:18 2006
+@@ -481,7 +481,7 @@
+ 
+ #if defined( __WINDOWS__ ) || \
+ 	( defined( __UNIX__ ) && \
+-	  ( ( defined( sun ) && OSVERSION > 4 ) || defined( __linux__ ) || \
++	  ( ( defined( sun ) && OSVERSION > 4 ) || defined( __linux__ ) || defined(__FreeBSD__) || \
+ 		defined( _AIX ) || ( defined( __APPLE__ ) && !defined( __MAC__ ) ) ) )
+   #define DYNAMIC_LOAD
+ 
diff --git a/security/cryptlib/files/patch-tools_ccopts.sh b/security/cryptlib/files/patch-tools_ccopts.sh
new file mode 100644
index 000000000000..9e438eb8b043
--- /dev/null
+++ b/security/cryptlib/files/patch-tools_ccopts.sh
@@ -0,0 +1,16 @@
+--- tools/ccopts.sh.orig	Fri Jul 14 08:37:59 2006
++++ tools/ccopts.sh	Fri Jul 14 08:38:19 2006
+@@ -129,13 +129,6 @@
+ # "version gcc" (we can't use just "gcc" by itself since this appears
+ # elsewhere in the gcc -v output).
+ 
+-if [ `uname -m | grep "i[3,4,5,6]86"` > /dev/null ] ; then
+-	if [ `gcc --version 2>&1 | head -n 1 | tr -d '[A-Za-z]. ()' | cut -c 1` -gt 2 ] ; then
+-		CCARGS="$CCARGS -march=pentium" ;
+-	else
+-		CCARGS="$CCARGS -mcpu=pentium" ;
+-	fi
+-fi
+ 
+ # Check for gcc 4.x with its stupid default setting of -Wpointer-sign,
+ # which leads to endless warnings about signed vs.unsigned char problems -