4 files changed, 19 insertions, 75 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 852ce76ed66c..e685757ab804 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -7,7 +7,8 @@
 
 PORTNAME=	openssl
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+DISTVERSION=	1.0.0a
+PORTREVISION=	2
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/%SUBDIR%/ \
 		ftp://ftp.openssl.org/%SUBDIR%/ \
@@ -1120,12 +1121,6 @@ BROKEN=		Patches do not merge, please change options
 .endif
 # order of PATCHFILES is important
 .if defined(WITH_DTLS_BUGS) || make(makesum)
-PATCHFILES+=	dtls-replay-bug-1.0.0.patch
-PATCHFILES+=	dtls-buffer-bug-1.0.0.patch
-PATCHFILES+=	dtls-timeout-bug-1.0.0.patch
-PATCHFILES+=	dtls-badmac-bug-1.0.0.patch
-PATCHFILES+=	dtls-badmsg-alert-bug-1.0.0.patch
-PATCHFILES+=	dtls-reassembly-bug-1.0.0.patch
 .endif
 .if defined(WITH_DTLS_RENEGOTIATION) || make(makesum)
 PATCHFILES+=    abbreviated-renegotiation.patch
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index a26a39a02c8e..7bc28bbf7f0c 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,33 +1,15 @@
-MD5 (openssl-1.0.0/openssl-1.0.0.tar.gz) = 89eaa86e25b2845f920ec00ae4c864ed
-SHA256 (openssl-1.0.0/openssl-1.0.0.tar.gz) = 1bbf9afc5a6215121ac094147d0a84178294fe4c3d0a231731038fd3717ba7ca
-SIZE (openssl-1.0.0/openssl-1.0.0.tar.gz) = 4010166
-MD5 (openssl-1.0.0/dtls-replay-bug-1.0.0.patch) = 965624f870068b228ae549697769a9ea
-SHA256 (openssl-1.0.0/dtls-replay-bug-1.0.0.patch) = ecd22b870600187648bbd6bcaf7752fc72e79f350386c090c3e77ea29a8e7439
-SIZE (openssl-1.0.0/dtls-replay-bug-1.0.0.patch) = 860
-MD5 (openssl-1.0.0/dtls-buffer-bug-1.0.0.patch) = 6c1c7b62369f0992b3cd8a3874190d71
-SHA256 (openssl-1.0.0/dtls-buffer-bug-1.0.0.patch) = 3794abdf31a206b9f909b4250bbd5ead2dd7a24628add38e09f0ed67b13013ec
-SIZE (openssl-1.0.0/dtls-buffer-bug-1.0.0.patch) = 388
-MD5 (openssl-1.0.0/dtls-timeout-bug-1.0.0.patch) = 4ea76473161328ac84e17606b80ef202
-SHA256 (openssl-1.0.0/dtls-timeout-bug-1.0.0.patch) = 069ba0e8b4137f7754b50e173d50a9f7748f424b003690fc9c7d34b46ac17403
-SIZE (openssl-1.0.0/dtls-timeout-bug-1.0.0.patch) = 442
-MD5 (openssl-1.0.0/dtls-badmac-bug-1.0.0.patch) = 3c83737cd831caa9d059ddc5ac72478a
-SHA256 (openssl-1.0.0/dtls-badmac-bug-1.0.0.patch) = cbdf4594fe4c1e8a02207f1adbee6ad8ea1a68d0f975e072305b5d6dcb96ef1f
-SIZE (openssl-1.0.0/dtls-badmac-bug-1.0.0.patch) = 444
-MD5 (openssl-1.0.0/dtls-badmsg-alert-bug-1.0.0.patch) = a37855ac4977717d6ae2c81b9e9346bf
-SHA256 (openssl-1.0.0/dtls-badmsg-alert-bug-1.0.0.patch) = d666bf237df50a6130a68bce74d6281f75d11f855e78622965199f14a72628bc
-SIZE (openssl-1.0.0/dtls-badmsg-alert-bug-1.0.0.patch) = 2192
-MD5 (openssl-1.0.0/dtls-reassembly-bug-1.0.0.patch) = 4eb20cb6c8cf014942435b4f63197b66
-SHA256 (openssl-1.0.0/dtls-reassembly-bug-1.0.0.patch) = 808011b2d84631aa6f04652b48fdfb1c79778ae95cb5b1d3371be8dc7bb376f3
-SIZE (openssl-1.0.0/dtls-reassembly-bug-1.0.0.patch) = 13328
-MD5 (openssl-1.0.0/abbreviated-renegotiation.patch) = 2409eb80e65effb928032ee18f690dd7
-SHA256 (openssl-1.0.0/abbreviated-renegotiation.patch) = ddbc0683461d364af25b3cd7481d73c6476bfcfb945b3b3c9883f72eabb6367f
-SIZE (openssl-1.0.0/abbreviated-renegotiation.patch) = 6578
-MD5 (openssl-1.0.0/tls-extractor.patch) = 23a88cd05cdb3f2040b0866b87586460
-SHA256 (openssl-1.0.0/tls-extractor.patch) = bb1aa486327fd96f9d6b870f0a1ad2c83dd4c06a96284eb64dde3f833ba5e0d0
-SIZE (openssl-1.0.0/tls-extractor.patch) = 1234
-MD5 (openssl-1.0.0/dtls-sctp-17.patch) = 9037f54f0d851daa8b35fc5ad5f903c0
-SHA256 (openssl-1.0.0/dtls-sctp-17.patch) = b8968a1a01f459033c40fe15e1b77e8941db301a10bb7668baa3961632c23b4c
-SIZE (openssl-1.0.0/dtls-sctp-17.patch) = 51558
-MD5 (openssl-1.0.0/dtls-heartbeats.patch) = a9ad6a0d30f0b8c1dbbcb084a86d719a
-SHA256 (openssl-1.0.0/dtls-heartbeats.patch) = 173bbddfc1812461b5abfc26a27a57a172a4b33acc8c1307307c4f78f97a0ab4
-SIZE (openssl-1.0.0/dtls-heartbeats.patch) = 14113
+MD5 (openssl-1.0.0a/openssl-1.0.0a.tar.gz) = e3873edfffc783624cfbdb65e2249cbd
+SHA256 (openssl-1.0.0a/openssl-1.0.0a.tar.gz) = 18a9bd1fc02b8ef90dded34fafaa9089baaafef278a19fc4e89c2ab0dcf70f63
+SIZE (openssl-1.0.0a/openssl-1.0.0a.tar.gz) = 4015794
+MD5 (openssl-1.0.0a/abbreviated-renegotiation.patch) = 2409eb80e65effb928032ee18f690dd7
+SHA256 (openssl-1.0.0a/abbreviated-renegotiation.patch) = ddbc0683461d364af25b3cd7481d73c6476bfcfb945b3b3c9883f72eabb6367f
+SIZE (openssl-1.0.0a/abbreviated-renegotiation.patch) = 6578
+MD5 (openssl-1.0.0a/tls-extractor.patch) = 23a88cd05cdb3f2040b0866b87586460
+SHA256 (openssl-1.0.0a/tls-extractor.patch) = bb1aa486327fd96f9d6b870f0a1ad2c83dd4c06a96284eb64dde3f833ba5e0d0
+SIZE (openssl-1.0.0a/tls-extractor.patch) = 1234
+MD5 (openssl-1.0.0a/dtls-sctp-17.patch) = 9037f54f0d851daa8b35fc5ad5f903c0
+SHA256 (openssl-1.0.0a/dtls-sctp-17.patch) = b8968a1a01f459033c40fe15e1b77e8941db301a10bb7668baa3961632c23b4c
+SIZE (openssl-1.0.0a/dtls-sctp-17.patch) = 51558
+MD5 (openssl-1.0.0a/dtls-heartbeats.patch) = a9ad6a0d30f0b8c1dbbcb084a86d719a
+SHA256 (openssl-1.0.0a/dtls-heartbeats.patch) = 173bbddfc1812461b5abfc26a27a57a172a4b33acc8c1307307c4f78f97a0ab4
+SIZE (openssl-1.0.0a/dtls-heartbeats.patch) = 14113
diff --git a/security/openssl/files/patch-Configure b/security/openssl/files/patch-Configure
index f13eef1d8358..44cf1069a961 100644
--- a/security/openssl/files/patch-Configure
+++ b/security/openssl/files/patch-Configure
@@ -1,5 +1,5 @@
---- Configure.orig	2010-05-05 10:43:11.000000000 +0200
-+++ Configure	2010-05-05 10:43:12.000000000 +0200
+--- Configure.orig	2010-06-06 10:43:52.000000000 +0200
++++ Configure	2010-06-06 10:43:52.000000000 +0200
 @@ -147,7 +147,7 @@
  # which has to be accompanied by explicit -D_THREAD_SAFE and
  # sometimes -D_REENTRANT. FreeBSD 5.x expands it as -lc_r, which
@@ -39,17 +39,3 @@
  
  "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
-@@ -1816,11 +1817,11 @@
- 	(system $make_command.$make_targets) == 0 or exit $?
- 		if $make_targets ne "";
- 	if ( $perl =~ m@^/@) {
--	    &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";');
-+	    &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";');
- 	    &dofile("apps/CA.pl",$perl,'^#!/', '#!%s');
- 	} else {
- 	    # No path for Perl known ...
--	    &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";');
-+	    &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";',  '^my \$prefix;$', 'my $prefix = "' . $prefix . '";');
- 	    &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s');
- 	}
- 	if ($depflags ne $default_depflags && !$make_depend) {
diff --git a/security/openssl/files/patch-c_rehash.in b/security/openssl/files/patch-c_rehash.in
deleted file mode 100644
index 4ab267b625c5..000000000000
--- a/security/openssl/files/patch-c_rehash.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- tools/c_rehash.in.orig	2009-04-22 18:50:42.000000000 +0200
-+++ tools/c_rehash.in	2010-05-05 10:43:12.000000000 +0200
-@@ -7,6 +7,7 @@
- my $openssl;
- 
- my $dir;
-+my $prefix;
- 
- if(defined $ENV{OPENSSL}) {
- 	$openssl = $ENV{OPENSSL};
-@@ -24,7 +25,7 @@
- }
- my $path_delim = ($pwd =~ /^[a-z]\:/i) ? ';' : ':'; # DOS/Win32 or Unix delimiter?
- 
--$ENV{PATH} .= "$path_delim$dir/bin";
-+$ENV{PATH} = "$prefix/bin" . ($ENV{PATH} ? $path_delim . $ENV{PATH} : ""); # prefix our path
- 
- if(! -x $openssl) {
- 	my $found = 0;