aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Elkins <melkins@tislabs.com>2012-01-05 18:25:13 +0000
committerMichael Elkins <melkins@tislabs.com>2012-01-05 18:25:13 +0000
commit6205868061f3b35b67fc61d4b7995f9b614b0099 (patch)
tree5564716ba753071f857a23821ad939797c9bce42
parent36ff1b3a7dbc5a5310cbac289fac190ea3e95f8e (diff)
parentf44b1e5901eac918f45c3ac3ec1c22efbe6d00cc (diff)
merge with /trunk
svn path=/branches/tk139/; revision=4142
-rw-r--r--openssl/Makefile.in2
-rw-r--r--openssl/openssl-1.0.0e.tar.gzbin4040229 -> 0 bytes
-rw-r--r--openssl/openssl-1.0.0f.tar.gzbin0 -> 4043367 bytes
-rwxr-xr-xopenssl/update-snapshot.sh2
4 files changed, 2 insertions, 2 deletions
diff --git a/openssl/Makefile.in b/openssl/Makefile.in
index 59f5d6fd..b5085c17 100644
--- a/openssl/Makefile.in
+++ b/openssl/Makefile.in
@@ -1,6 +1,6 @@
# $Id$
-VERSION = 1.0.0e
+VERSION = 1.0.0f
OPENSSL_CONFIG_COMMAND = @OPENSSL_CONFIG_COMMAND@
OPENSSL_BUILD_DIRECTORY = ${abs_builddir}/openssl
diff --git a/openssl/openssl-1.0.0e.tar.gz b/openssl/openssl-1.0.0e.tar.gz
deleted file mode 100644
index 346af252..00000000
--- a/openssl/openssl-1.0.0e.tar.gz
+++ /dev/null
Binary files differ
diff --git a/openssl/openssl-1.0.0f.tar.gz b/openssl/openssl-1.0.0f.tar.gz
new file mode 100644
index 00000000..7bce05eb
--- /dev/null
+++ b/openssl/openssl-1.0.0f.tar.gz
Binary files differ
diff --git a/openssl/update-snapshot.sh b/openssl/update-snapshot.sh
index a8723c10..94932f59 100755
--- a/openssl/update-snapshot.sh
+++ b/openssl/update-snapshot.sh
@@ -6,7 +6,7 @@
#version="1.0.0-stable-SNAP-$(date +%Y%m%d)"
-version="1.0.0e"
+version="1.0.0f"
tarball="openssl-${version}.tar.gz"