Update to 3.4.0 release and add support for amd64.

4 files changed, 32 insertions, 23 deletions

diff --git a/security/cryptlib/files/patch-makefile b/security/cryptlib/files/patch-makefile
index 902731f768e8..cd8ba11a643e 100644
--- a/security/cryptlib/files/patch-makefile
+++ b/security/cryptlib/files/patch-makefile
@@ -1,11 +1,11 @@
---- makefile.orig	Sat Jan 27 22:14:40 2007
-+++ makefile	Fri Mar 30 14:40:47 2007
-@@ -1340,7 +1340,7 @@
+--- makefile.orig	2010-11-19 04:08:54.000000000 +0100
++++ makefile	2011-03-04 15:30:09.000000000 +0100
+@@ -1651,7 +1651,7 @@ FreeBSD:
  	@if uname -m | grep "i[3,4,5,6]86" > /dev/null; then \
  		./tools/buildasm.sh $(AS) $(OBJPATH) ; \
  		make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \
--			-fomit-frame-pointer -O3 -pthread" ; \
+-			-fomit-frame-pointer -pthread" ; \
 +			%%CFLAGS%% %%PTHREAD_CFLAGS%%" ; \
  	else \
- 		make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \
- 			-fomit-frame-pointer -O3 -pthread" ; \
+ 		make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" ; \
+ 	fi
diff --git a/security/cryptlib/files/patch-misc_config.h b/security/cryptlib/files/patch-misc_config.h
index 9da114d400c5..da378cfe73f0 100644
--- a/security/cryptlib/files/patch-misc_config.h
+++ b/security/cryptlib/files/patch-misc_config.h
@@ -1,6 +1,6 @@
---- 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 @@
+--- misc/config.h.orig	2010-12-21 02:29:54.000000000 +0100
++++ misc/config.h	2011-03-04 15:31:57.000000000 +0100
+@@ -287,6 +287,7 @@
  
  /* General device usage */
  
diff --git a/security/cryptlib/files/patch-misc_os_spec.h b/security/cryptlib/files/patch-misc_os_spec.h
index 8f630aeab4e2..5b604454c142 100644
--- a/security/cryptlib/files/patch-misc_os_spec.h
+++ b/security/cryptlib/files/patch-misc_os_spec.h
@@ -1,6 +1,6 @@
---- 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 @@
+--- misc/os_spec.h.orig	2010-10-13 23:58:52.000000000 +0200
++++ misc/os_spec.h	2011-03-04 15:31:57.000000000 +0100
+@@ -601,7 +601,7 @@ typedef unsigned char		BYTE;
  
  #if defined( __WINDOWS__ ) || \
  	( defined( __UNIX__ ) && \
diff --git a/security/cryptlib/files/patch-tools_ccopts.sh b/security/cryptlib/files/patch-tools_ccopts.sh
index 9e438eb8b043..e1b43d127496 100644
--- a/security/cryptlib/files/patch-tools_ccopts.sh
+++ b/security/cryptlib/files/patch-tools_ccopts.sh
@@ -1,16 +1,25 @@
---- 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).
+--- tools/ccopts.sh.orig	2010-12-19 00:57:12.000000000 +0100
++++ tools/ccopts.sh	2011-03-04 15:33:54.000000000 +0100
+@@ -341,22 +341,6 @@ fi
+ # in situations that also use shared libs, in the case of x86-64 the use
+ # of PIC should have minimum overhead so it shouldn't be a big deal.
  
--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" ;
+-if [ "$ARCH" = "i586" -o "$ARCH" = "i686" -o "$ARCH" = "x86_64" ] ; then
+-	if [ "$GCC_VER" -ge 30 ] ; then
+-		case $ARCH in
+-			'x86_64')
+-				CCARGS="$CCARGS -march=opteron -fPIC" ;;
+-
+-			'i686')
+-				CCARGS="$CCARGS -march=pentiumpro" ;;
+-
+-			*)
+-				CCARGS="$CCARGS -march=pentium" ;;
+-		esac ;
 -	else
 -		CCARGS="$CCARGS -mcpu=pentium" ;
--	fi
+-	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 -
+ # gcc 4.x for 64-bit architectures has an optimiser bug that removes an
+ # empty-list check in cryptlib's list-management code (this has been