[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/emerge/portage/testing/openssl-msys-src
From:       Patrick von Reth <patrick.vonreth () gmail ! com>
Date:       2010-04-25 15:13:10
Message-ID: 20100425151310.CC0C2AC8A3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1118647 by vonreth:

fixed patch

 M  +0 -127    openssl-1.0.0.diff  


--- trunk/kdesupport/emerge/portage/testing/openssl-msys-src/openssl-1.0.0.diff \
#1118646:1118647 @@ -1,24 +1,3 @@
-diff -Nru openssl-1.0.0.orig/Configure openssl-1.0.0/Configure
---- openssl-1.0.0.orig/Configure	2010-01-19 22:40:54.000000000 +0100
-+++ openssl-1.0.0/Configure	2010-04-25 16:23:07.241942800 +0200
-@@ -503,7 +503,7 @@
- "BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX \
                EXPORT_VAR_AS_FN:${no_asm}:win32",
- 
- # MinGW
--"mingw", "gcc:-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 \
-march=i486 -Wall:::MINGW32:-lws2_32 -lgdi32 -lcrypt32:BN_LLONG ${x86_gcc_des} \
${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL \
                -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a",
-+"mingw", "gcc:-mno-cygwin -DL_ENDIAN -DOPENSSL_NO_CAPIENG -DWIN32_LEAN_AND_MEAN \
-fomit-frame-pointer -O3 -march=i486 -Wall:::MINGW32:-lws2_32 -lgdi32 \
-lcrypt32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} \
EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL \
                -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a",
- # As for OPENSSL_USE_APPLINK. Applink makes it possible to use .dll
- # compiled with one compiler with application compiled with another
- # compiler. It's possible to engage Applink support in mingw64 build,
-@@ -584,7 +584,7 @@
- 
- my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
- 		    VC-NT VC-CE VC-WIN32 debug-VC-WIN32
--		    BC-32 
-+		    BC-32 mingw mingw64
- 		    netware-clib netware-clib-bsdsock
- 		    netware-libc netware-libc-bsdsock);
- 
 diff -Nru openssl-1.0.0.orig/include/openssl/dtls1.h \
                openssl-1.0.0/include/openssl/dtls1.h
 --- openssl-1.0.0.orig/include/openssl/dtls1.h	2009-09-09 19:05:42.000000000 +0200
 +++ openssl-1.0.0/include/openssl/dtls1.h	2010-04-25 16:27:01.187323700 +0200
@@ -31,100 +10,6 @@
  #elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
  #include <sys/timeval.h>
  #else
-diff -Nru openssl-1.0.0.orig/ms/mingw64.bat openssl-1.0.0/ms/mingw64.bat
---- openssl-1.0.0.orig/ms/mingw64.bat	1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.0/ms/mingw64.bat	2010-04-25 16:23:07.295945900 +0200
-@@ -0,0 +1,90 @@
-+@rem OpenSSL with Mingw32+GNU as
-+@rem ---------------------------
-+
-+perl Configure mingw64 %1 %2 %3 %4 %5 %6 %7 %8
-+
-+@echo off
-+
-+perl -e "exit 1 if '%1' eq 'no-asm'"
-+if errorlevel 1 goto noasm
-+
-+echo Generating x86_64 for GNU assember
-+
-+echo Bignum
-+cd crypto\bn\asm
-+perl bn-586.pl gaswin > bn-win32.s
-+perl co-586.pl gaswin > co-win32.s
-+cd ..\..\..
-+
-+echo DES
-+cd crypto\des\asm
-+perl des-586.pl gaswin > d-win32.s
-+cd ..\..\..
-+
-+echo crypt
-+cd crypto\des\asm
-+perl crypt586.pl gaswin > y-win32.s
-+cd ..\..\..
-+
-+echo Blowfish
-+cd crypto\bf\asm
-+perl bf-586.pl gaswin > b-win32.s
-+cd ..\..\..
-+
-+echo CAST5
-+cd crypto\cast\asm
-+perl cast-586.pl gaswin > c-win32.s
-+cd ..\..\..
-+
-+echo RC4
-+cd crypto\rc4\asm
-+perl rc4-586.pl gaswin > r4-win32.s
-+cd ..\..\..
-+
-+echo MD5
-+cd crypto\md5\asm
-+perl md5-586.pl gaswin > m5-win32.s
-+cd ..\..\..
-+
-+echo SHA1
-+cd crypto\sha\asm
-+perl sha1-586.pl gaswin > s1-win32.s
-+cd ..\..\..
-+
-+echo RIPEMD160
-+cd crypto\ripemd\asm
-+perl rmd-586.pl gaswin > rm-win32.s
-+cd ..\..\..
-+
-+echo RC5\32
-+cd crypto\rc5\asm
-+perl rc5-586.pl gaswin > r5-win32.s
-+cd ..\..\..
-+
-+:noasm
-+
-+echo Generating makefile
-+perl util\mkfiles.pl >MINFO
-+perl util\mk1mf.pl gaswin Mingw32 >ms\mingw32a.mak
-+echo Generating DLL definition files
-+perl util\mkdef.pl 32 libeay >ms\libeay32.def
-+if errorlevel 1 goto end
-+perl util\mkdef.pl 32 ssleay >ms\ssleay32.def
-+if errorlevel 1 goto end
-+
-+rem copy ms\tlhelp32.h outinc
-+
-+echo Building the libraries
-+mingw32-make -f ms/mingw32a.mak
-+if errorlevel 1 goto end
-+
-+echo Generating the DLLs and input libraries
-+dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def \
                out/libcrypto.a -lws2_32 -lgdi32
-+if errorlevel 1 goto end
-+dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def \
                out/libssl.a out/libeay32.a
-+if errorlevel 1 goto end
-+
-+echo Done compiling OpenSSL
-+
-+:end
-+
 diff -Nru openssl-1.0.0.orig/ssl/dtls1.h openssl-1.0.0/ssl/dtls1.h
 --- openssl-1.0.0.orig/ssl/dtls1.h	2009-09-09 19:05:42.000000000 +0200
 +++ openssl-1.0.0/ssl/dtls1.h	2010-04-25 16:26:18.163862900 +0200
@@ -149,15 +34,3 @@
  #else
  #include OPENSSL_UNISTD
  #endif
-diff -Nru 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 12:19:16.000000000 +0200
-+++ openssl-1.0.0/util/pl/Mingw32.pl	2010-04-25 16:23:07.307946600 +0200
-@@ -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)
- 	{


[prev in list] [next in list] [prev in thread] [next in thread]