From 1fcd03f22bd481b4fffec2e8ad8efa3bb31051a5 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Wed, 18 Nov 2009 06:28:01 +0000
Subject: Update to new OpenSSL snapshot, to track TLS negotiation protocol
 bugfixes.  While we're at this, switch to 1.0.0-stable snapshot series, with
 goal of eventually converging on OpenSSL 1.0.0.

This included a few changes to track OpenSSL:

- The "STRING" type used in the OpenSSL stack macros became
  "OPENSSL_STRING".

- OpenSSL has deprecated the MD2 digest algorithm, so POW code can't
  refer to it unconditionally (perhaps I should remove support for it
  from POW entirely, but for now I just honor the compile-time
  conditional).

- OpenSSL's configuration script was whining that I should run "make
  depend", so I do that now as part of the OpenSSL library build.

svn path=/openssl/Makefile; revision=2883
---
 openssl/Makefile                                  |  12 ++++++++++--
 openssl/openssl-1.0.0-stable-SNAP-20091118.tar.gz | Bin 0 -> 3988497 bytes
 openssl/openssl-SNAP-20090310.tar.gz              | Bin 3936276 -> 0 bytes
 openssl/update-snapshot.sh                        |   2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 openssl/openssl-1.0.0-stable-SNAP-20091118.tar.gz
 delete mode 100644 openssl/openssl-SNAP-20090310.tar.gz

(limited to 'openssl')

diff --git a/openssl/Makefile b/openssl/Makefile
index 425a7457..35a800bc 100644
--- a/openssl/Makefile
+++ b/openssl/Makefile
@@ -1,6 +1,8 @@
 # $Id$
 
-VERSION = SNAP-20090310
+VERSION = 1.0.0-stable-SNAP-20091118
+
+OPTIONS = enable-rfc3779 enable-cms no-dso enable-shared --prefix=`pwd`
 
 # Kludge alert:
 #
@@ -25,8 +27,14 @@ clean:
 	rm -rf openssl-${VERSION} openssl
 	cd tests; ${MAKE} $@
 
+# Ordinarily we let ./config guess the platform target.  When
+# debugging, we usually need to specify an explicit target, in which
+# case it's probably easier to use ./Configure.
+
 openssl-${VERSION}/Makefile: openssl-${VERSION}/config
-	cd openssl-${VERSION}; PERL=/usr/bin/perl ./config enable-rfc3779 enable-cms no-dso enable-shared --prefix=`pwd`
+	cd openssl-${VERSION}; PERL=/usr/bin/perl ./config ${OPTIONS}
+#	cd openssl-${VERSION}; PERL=/usr/bin/perl ./Configure debug-BSD-x86-elf ${OPTIONS}
+	cd openssl-${VERSION}; ${MAKE} depend
 
 openssl-${VERSION}/config: openssl-${VERSION}.tar.gz
 	gzip -c -d openssl-${VERSION}.tar.gz | tar -xf -
diff --git a/openssl/openssl-1.0.0-stable-SNAP-20091118.tar.gz b/openssl/openssl-1.0.0-stable-SNAP-20091118.tar.gz
new file mode 100644
index 00000000..40de00cd
Binary files /dev/null and b/openssl/openssl-1.0.0-stable-SNAP-20091118.tar.gz differ
diff --git a/openssl/openssl-SNAP-20090310.tar.gz b/openssl/openssl-SNAP-20090310.tar.gz
deleted file mode 100644
index ccc4661a..00000000
Binary files a/openssl/openssl-SNAP-20090310.tar.gz and /dev/null differ
diff --git a/openssl/update-snapshot.sh b/openssl/update-snapshot.sh
index 74ae157d..02e51b89 100755
--- a/openssl/update-snapshot.sh
+++ b/openssl/update-snapshot.sh
@@ -4,7 +4,7 @@
 # Fetch today's OpenSSL snapshot and do everything needed to make it
 # the current code other than the svn commit.
 
-version="SNAP-$(date +%Y%m%d)"
+version="1.0.0-stable-SNAP-$(date +%Y%m%d)"
 
 tarball="openssl-${version}.tar.gz"
 
-- 
cgit v1.2.3