# HG changeset patch
# User Mark Brand <address@hidden>
# Date 1275595563 -7200
# Node ID 0969921020ebc7ac8a2e7b58626f74338cac3019
# Parent  1106fa8baa3be5e11ebe5bd531c367116c58c3cd
upgrade package openssl

Removed patch and sed hacks that seem obsolete.

diff --git a/src/openssl-1-mingw.patch b/src/openssl-1-mingw.patch
deleted file mode 100644
--- a/src/openssl-1-mingw.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-This patch has been taken from:
-http://www.mail-archive.com/address@hidden/msg27484.html
-
-diff -ru openssl-1.0.0-orig/apps/speed.c openssl-1.0.0/apps/speed.c
---- openssl-1.0.0-orig/apps/speed.c	2010-03-03 14:56:18.000000000 -0500
-+++ openssl-1.0.0/apps/speed.c	2010-03-30 02:06:56.763000000 -0400
-@@ -295,7 +295,7 @@
- 		if (thr==NULL)
- 			{
- 			DWORD ret=GetLastError();
--			BIO_printf(bio_err,"unable to CreateThread (%d)",ret);
-+			BIO_printf(bio_err,"unable to CreateThread (%u)",ret);
- 			ExitProcess(ret);
- 			}
- 		CloseHandle(thr);		/* detach the thread	*/
-diff -ru openssl-1.0.0-orig/Configure openssl-1.0.0/Configure
---- openssl-1.0.0-orig/Configure	2010-01-19 16:40:54.000000000 -0500
-+++ openssl-1.0.0/Configure	2010-03-30 02:06:49.782000000 -0400
-@@ -1035,6 +1035,8 @@
- 
- my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
- 
-+$IsMK1MF=1 if ($target eq "mingw" && $^O ne "cygwin" && !is_msys());
-+
- $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/);
- $exe_ext=".nlm" if ($target =~ /netware/);
- $exe_ext=".pm"  if ($target =~ /vos/);
-@@ -2040,3 +2042,11 @@
- 	print STDERR "No sanity errors detected!\n" if $errorcnt == 0;
- 	return $errorcnt;
- 	}
-+
-+# Attempt to detect MSYS environment
-+
-+sub is_msys
-+	{
-+	return 1 if (exists $ENV{"TERM"} && $ENV{"TERM"} eq "msys");
-+	return 0;
-+	}
-diff -ru openssl-1.0.0-orig/util/pl/Mingw32.pl openssl-1.0.0/util/pl/Mingw32.pl
---- openssl-1.0.0-orig/util/pl/Mingw32.pl	2008-04-17 06:19:16.000000000 -0400
-+++ openssl-1.0.0/util/pl/Mingw32.pl	2010-03-30 02:06:53.097000000 -0400
-@@ -19,7 +19,7 @@
- if ($debug)
- 	{ $cflags="-DL_ENDIAN -DDSO_WIN32 -g2 -ggdb"; }
- else
--	{ $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -mcpu=i486 -Wall"; }
-+	{ $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -march=i486 -Wall"; }
- 
- if ($gaswin and !$no_asm)
- 	{
-@@ -66,6 +66,7 @@
- $shlibp=".a";
- $lfile='';
- 
-+$asmtype='coff';
- $asm='as';
- $afile='-o ';
- #$bn_asm_obj="";
diff --git a/src/openssl.mk b/src/openssl.mk
--- a/src/openssl.mk
+++ b/src/openssl.mk
@@ -4,8 +4,8 @@
 # openssl
 PKG             := openssl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.0
-$(PKG)_CHECKSUM := 3f800ea9fa3da1c0f576d689be7dca3d55a4cb62
+$(PKG)_VERSION  := 1.0.0a
+$(PKG)_CHECKSUM := b837a9f75a51f456bd533690cf04d3d5714812dc
 $(PKG)_SUBDIR   := openssl-$($(PKG)_VERSION)
 $(PKG)_FILE     := openssl-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.openssl.org/
@@ -21,13 +21,7 @@
 endef
 
 define $(PKG)_BUILD
-    # workarounds according to
-    # http://wagner.pp.ru/~vitus/articles/openssl-mingw.html
-    $(SED) -i 's,^$$IsMK1MF=1.*,,' '$(1)'/Configure
-    $(SED) -i 's,static type _hide_##name,type _hide_##name,' '$(1)'/e_os2.h
-
-    # use winsock2 instead of winsock
-    $(SED) -i 's,wsock32,ws2_32,g' '$(1)'/Configure
+    # although ws3_32 is used, winsock 1 headers are still referenced
     find '$(1)' -type f -exec \
         $(SED) -i 's,winsock\.h,winsock2.h,g' {} \;