From: Richard W.M. Jones <"Richard W.M. Jones "> Date: Mon, 2 Feb 2009 19:08:07 +0000 (+0000) Subject: Various build fixes. X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=c4a9cee7c1203beac375663ad289c0e83c8f76b3;p=fedora-mingw.git Various build fixes. --- diff --git a/openssl/mingw32-openssl-0.9.8g-header-files.patch b/openssl/mingw32-openssl-0.9.8g-header-files.patch deleted file mode 100644 index a69da5c..0000000 --- a/openssl/mingw32-openssl-0.9.8g-header-files.patch +++ /dev/null @@ -1,157 +0,0 @@ -Fix the location of certain header files. - - - RWMJ 2008-09-30 - -diff -ur openssl-0.9.8g.orig/apps/speed.c openssl-0.9.8g.mingw/apps/speed.c ---- openssl-0.9.8g.orig/apps/speed.c 2008-09-30 14:16:16.000000000 +0100 -+++ openssl-0.9.8g.mingw/apps/speed.c 2008-09-30 14:53:25.000000000 +0100 -@@ -165,7 +165,7 @@ - #include - #endif - #ifndef OPENSSL_NO_CAMELLIA --#include -+#include "../crypto/camellia/camellia.h" - #endif - #ifndef OPENSSL_NO_MD2 - #include -@@ -202,7 +202,7 @@ - #include - #endif - #ifndef OPENSSL_NO_SEED --#include -+#include "../crypto/seed/seed.h" - #endif - #ifndef OPENSSL_NO_BF - #include -diff -ur openssl-0.9.8g.orig/crypto/camellia/cmll_cbc.c openssl-0.9.8g.mingw/crypto/camellia/cmll_cbc.c ---- openssl-0.9.8g.orig/crypto/camellia/cmll_cbc.c 2006-12-02 12:00:27.000000000 +0000 -+++ openssl-0.9.8g.mingw/crypto/camellia/cmll_cbc.c 2008-09-30 14:29:02.000000000 +0100 -@@ -58,7 +58,7 @@ - #include - #include - --#include -+#include "camellia.h" - #include "cmll_locl.h" - - void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out, -diff -ur openssl-0.9.8g.orig/crypto/camellia/cmll_cfb.c openssl-0.9.8g.mingw/crypto/camellia/cmll_cfb.c ---- openssl-0.9.8g.orig/crypto/camellia/cmll_cfb.c 2006-06-09 23:31:05.000000000 +0100 -+++ openssl-0.9.8g.mingw/crypto/camellia/cmll_cfb.c 2008-09-30 14:29:25.000000000 +0100 -@@ -113,7 +113,7 @@ - #include - #include - --#include -+#include "camellia.h" - #include "cmll_locl.h" - #include "e_os.h" - -diff -ur openssl-0.9.8g.orig/crypto/camellia/cmll_ctr.c openssl-0.9.8g.mingw/crypto/camellia/cmll_ctr.c ---- openssl-0.9.8g.orig/crypto/camellia/cmll_ctr.c 2006-06-09 23:31:05.000000000 +0100 -+++ openssl-0.9.8g.mingw/crypto/camellia/cmll_ctr.c 2008-09-30 14:29:36.000000000 +0100 -@@ -56,7 +56,7 @@ - #endif - #include - --#include -+#include "camellia.h" - #include "cmll_locl.h" - - /* NOTE: the IV/counter CTR mode is big-endian. The rest of the Camellia code -diff -ur openssl-0.9.8g.orig/crypto/camellia/cmll_ecb.c openssl-0.9.8g.mingw/crypto/camellia/cmll_ecb.c ---- openssl-0.9.8g.orig/crypto/camellia/cmll_ecb.c 2006-06-09 23:31:05.000000000 +0100 -+++ openssl-0.9.8g.mingw/crypto/camellia/cmll_ecb.c 2008-09-30 14:28:50.000000000 +0100 -@@ -56,7 +56,7 @@ - #endif - #include - --#include -+#include "camellia.h" - #include "cmll_locl.h" - - void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out, -diff -ur openssl-0.9.8g.orig/crypto/camellia/cmll_misc.c openssl-0.9.8g.mingw/crypto/camellia/cmll_misc.c ---- openssl-0.9.8g.orig/crypto/camellia/cmll_misc.c 2007-01-21 13:16:21.000000000 +0000 -+++ openssl-0.9.8g.mingw/crypto/camellia/cmll_misc.c 2008-09-30 14:28:37.000000000 +0100 -@@ -50,7 +50,7 @@ - */ - - #include --#include -+#include "camellia.h" - #include "cmll_locl.h" - - const char CAMELLIA_version[]="CAMELLIA" OPENSSL_VERSION_PTEXT; -diff -ur openssl-0.9.8g.orig/crypto/camellia/cmll_ofb.c openssl-0.9.8g.mingw/crypto/camellia/cmll_ofb.c ---- openssl-0.9.8g.orig/crypto/camellia/cmll_ofb.c 2006-06-09 23:31:05.000000000 +0100 -+++ openssl-0.9.8g.mingw/crypto/camellia/cmll_ofb.c 2008-09-30 14:29:14.000000000 +0100 -@@ -111,7 +111,7 @@ - # endif - #endif - #include --#include -+#include "camellia.h" - #include "cmll_locl.h" - - /* The input and output encrypted as though 128bit ofb mode is being -diff -ur openssl-0.9.8g.orig/crypto/evp/e_camellia.c openssl-0.9.8g.mingw/crypto/evp/e_camellia.c ---- openssl-0.9.8g.orig/crypto/evp/e_camellia.c 2006-08-31 21:56:52.000000000 +0100 -+++ openssl-0.9.8g.mingw/crypto/evp/e_camellia.c 2008-09-30 14:31:31.000000000 +0100 -@@ -59,7 +59,7 @@ - #include - #include - #include --#include -+#include "../camellia/camellia.h" - #include "evp_locl.h" - - static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, -diff -ur openssl-0.9.8g.orig/crypto/evp/e_seed.c openssl-0.9.8g.mingw/crypto/evp/e_seed.c ---- openssl-0.9.8g.orig/crypto/evp/e_seed.c 2007-07-04 13:56:32.000000000 +0100 -+++ openssl-0.9.8g.mingw/crypto/evp/e_seed.c 2008-09-30 14:31:46.000000000 +0100 -@@ -59,7 +59,7 @@ - #include - #include - #ifndef OPENSSL_NO_SEED --#include -+#include "../seed/seed.h" - #include "evp_locl.h" - - static int seed_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc); -diff -ur openssl-0.9.8g.orig/crypto/seed/seed.c openssl-0.9.8g.mingw/crypto/seed/seed.c ---- openssl-0.9.8g.orig/crypto/seed/seed.c 2007-04-24 00:50:10.000000000 +0100 -+++ openssl-0.9.8g.mingw/crypto/seed/seed.c 2008-09-30 14:29:58.000000000 +0100 -@@ -32,7 +32,7 @@ - #include - #endif - --#include -+#include "seed.h" - #include "seed_locl.h" - - static seed_word SS[4][256] = { { -diff -ur openssl-0.9.8g.orig/crypto/seed/seed_ecb.c openssl-0.9.8g.mingw/crypto/seed/seed_ecb.c ---- openssl-0.9.8g.orig/crypto/seed/seed_ecb.c 2007-04-24 00:50:10.000000000 +0100 -+++ openssl-0.9.8g.mingw/crypto/seed/seed_ecb.c 2008-09-30 14:30:21.000000000 +0100 -@@ -49,7 +49,7 @@ - * - */ - --#include -+#include "seed.h" - - void SEED_ecb_encrypt(const unsigned char *in, unsigned char *out, const SEED_KEY_SCHEDULE *ks, int enc) - { -diff -ur openssl-0.9.8g.orig/crypto/seed/seed_locl.h openssl-0.9.8g.mingw/crypto/seed/seed_locl.h ---- openssl-0.9.8g.orig/crypto/seed/seed_locl.h 2008-09-30 14:16:15.000000000 +0100 -+++ openssl-0.9.8g.mingw/crypto/seed/seed_locl.h 2008-09-30 14:30:10.000000000 +0100 -@@ -27,7 +27,7 @@ - #define HEADER_SEED_LOCL_H - - #include "openssl/e_os2.h" --#include -+#include "seed.h" - - - #ifdef SEED_LONG /* need 32-bit type */ diff --git a/openssl/mingw32-openssl-0.9.8g-configure.patch b/openssl/mingw32-openssl-0.9.8j-configure.patch similarity index 72% rename from openssl/mingw32-openssl-0.9.8g-configure.patch rename to openssl/mingw32-openssl-0.9.8j-configure.patch index cfd214e..73feff1 100644 --- a/openssl/mingw32-openssl-0.9.8g-configure.patch +++ b/openssl/mingw32-openssl-0.9.8j-configure.patch @@ -10,7 +10,7 @@ diff -ur openssl-0.9.8g.orig/Configure openssl-0.9.8g.mingw/Configure # MinGW -"mingw", "gcc:-mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall -D_WIN32_WINNT=0x333:::MINGW32:-lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_coff_asm}:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin -shared:.dll.a", -+"mingw", "i686-pc-mingw32-gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall -D_WIN32_WINNT=0x333 -DMK1MF_BUILD:::MINGW32:-lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_coff_asm}:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-shared:.dll.a:i686-pc-mingw32-ranlib", ++"mingw", "MINGW32_CC:-DL_ENDIAN -Wall MINGW32_CFLAGS -D_WIN32_WINNT=0x333 -DMK1MF_BUILD:::MINGW32:-lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_coff_asm}:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-shared:.dll.a:MINGW32_RANLIB", # UWIN "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32", diff --git a/openssl/mingw32-openssl-0.9.8j-header-files.patch b/openssl/mingw32-openssl-0.9.8j-header-files.patch new file mode 100644 index 0000000..55d1203 --- /dev/null +++ b/openssl/mingw32-openssl-0.9.8j-header-files.patch @@ -0,0 +1,141 @@ +--- ./crypto/seed/seed_ecb.c.mingw-header-files 2007-04-24 01:50:10.000000000 +0200 ++++ ./crypto/seed/seed_ecb.c 2009-02-02 18:28:55.000000000 +0100 +@@ -49,7 +49,7 @@ + * + */ + +-#include ++#include "seed.h" + + void SEED_ecb_encrypt(const unsigned char *in, unsigned char *out, const SEED_KEY_SCHEDULE *ks, int enc) + { +--- ./crypto/seed/seed_locl.h.mingw-header-files 2009-02-02 18:28:48.000000000 +0100 ++++ ./crypto/seed/seed_locl.h 2009-02-02 18:28:55.000000000 +0100 +@@ -27,7 +27,7 @@ + #define HEADER_SEED_LOCL_H + + #include "openssl/e_os2.h" +-#include ++#include "seed.h" + + + #ifdef SEED_LONG /* need 32-bit type */ +--- ./crypto/seed/seed.c.mingw-header-files 2007-04-24 01:50:10.000000000 +0200 ++++ ./crypto/seed/seed.c 2009-02-02 18:28:55.000000000 +0100 +@@ -32,7 +32,7 @@ + #include + #endif + +-#include ++#include "seed.h" + #include "seed_locl.h" + + static seed_word SS[4][256] = { { +--- ./crypto/camellia/cmll_cbc.c.mingw-header-files 2006-12-02 13:00:27.000000000 +0100 ++++ ./crypto/camellia/cmll_cbc.c 2009-02-02 18:28:54.000000000 +0100 +@@ -58,7 +58,7 @@ + #include + #include + +-#include ++#include "camellia.h" + #include "cmll_locl.h" + + void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out, +--- ./crypto/camellia/cmll_cfb.c.mingw-header-files 2006-06-10 00:31:05.000000000 +0200 ++++ ./crypto/camellia/cmll_cfb.c 2009-02-02 18:28:54.000000000 +0100 +@@ -113,7 +113,7 @@ + #include + #include + +-#include ++#include "camellia.h" + #include "cmll_locl.h" + #include "e_os.h" + +--- ./crypto/camellia/cmll_ofb.c.mingw-header-files 2006-06-10 00:31:05.000000000 +0200 ++++ ./crypto/camellia/cmll_ofb.c 2009-02-02 18:28:55.000000000 +0100 +@@ -111,7 +111,7 @@ + # endif + #endif + #include +-#include ++#include "camellia.h" + #include "cmll_locl.h" + + /* The input and output encrypted as though 128bit ofb mode is being +--- ./crypto/camellia/cmll_misc.c.mingw-header-files 2009-02-02 18:29:19.000000000 +0100 ++++ ./crypto/camellia/cmll_misc.c 2009-02-02 18:29:32.000000000 +0100 +@@ -50,7 +50,7 @@ + */ + + #include +-#include ++#include "camellia.h" + #include "cmll_locl.h" + #include + #ifdef OPENSSL_FIPS +--- ./crypto/camellia/cmll_ecb.c.mingw-header-files 2006-06-10 00:31:05.000000000 +0200 ++++ ./crypto/camellia/cmll_ecb.c 2009-02-02 18:28:54.000000000 +0100 +@@ -56,7 +56,7 @@ + #endif + #include + +-#include ++#include "camellia.h" + #include "cmll_locl.h" + + void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out, +--- ./crypto/camellia/cmll_ctr.c.mingw-header-files 2006-06-10 00:31:05.000000000 +0200 ++++ ./crypto/camellia/cmll_ctr.c 2009-02-02 18:28:54.000000000 +0100 +@@ -56,7 +56,7 @@ + #endif + #include + +-#include ++#include "camellia.h" + #include "cmll_locl.h" + + /* NOTE: the IV/counter CTR mode is big-endian. The rest of the Camellia code +--- ./crypto/evp/e_seed.c.mingw-header-files 2007-07-04 14:56:32.000000000 +0200 ++++ ./crypto/evp/e_seed.c 2009-02-02 18:28:55.000000000 +0100 +@@ -59,7 +59,7 @@ + #include + #include + #ifndef OPENSSL_NO_SEED +-#include ++#include "../seed/seed.h" + #include "evp_locl.h" + + static int seed_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc); +--- ./crypto/evp/e_camellia.c.mingw-header-files 2008-09-21 12:24:08.000000000 +0200 ++++ ./crypto/evp/e_camellia.c 2009-02-02 18:28:55.000000000 +0100 +@@ -59,7 +59,7 @@ + #include + #include + #include +-#include ++#include "../camellia/camellia.h" + #include "evp_locl.h" + + static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, +--- ./apps/speed.c.mingw-header-files 2009-01-07 11:48:22.000000000 +0100 ++++ ./apps/speed.c 2009-02-02 18:28:54.000000000 +0100 +@@ -165,7 +165,7 @@ + #include + #endif + #ifndef OPENSSL_NO_CAMELLIA +-#include ++#include "../crypto/camellia/camellia.h" + #endif + #ifndef OPENSSL_NO_MD2 + #include +@@ -202,7 +202,7 @@ + #include + #endif + #ifndef OPENSSL_NO_SEED +-#include ++#include "../crypto/seed/seed.h" + #endif + #ifndef OPENSSL_NO_BF + #include diff --git a/openssl/mingw32-openssl.spec b/openssl/mingw32-openssl.spec index d4d0d98..bc1b081 100644 --- a/openssl/mingw32-openssl.spec +++ b/openssl/mingw32-openssl.spec @@ -27,7 +27,7 @@ Name: mingw32-openssl Version: 0.9.8j -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW port of the OpenSSL toolkit License: OpenSSL @@ -80,8 +80,8 @@ Patch49: openssl-0.9.8j-fips-no-pairwise.patch # Backported fixes including security fixes # MinGW-specific patches. -Patch100: mingw32-openssl-0.9.8g-header-files.patch -Patch101: mingw32-openssl-0.9.8g-configure.patch +Patch100: mingw32-openssl-0.9.8j-header-files.patch +Patch101: mingw32-openssl-0.9.8j-configure.patch Patch102: mingw32-openssl-0.9.8j-shared.patch Patch103: mingw32-openssl-0.9.8g-global.patch Patch104: mingw32-openssl-0.9.8g-sfx.patch @@ -329,6 +329,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 2 2009 Levente Farkas - 0.9.8j-2 +- Various build fixes. + * Wed Jan 28 2009 Levente Farkas - 0.9.8j-1 - update to new upstream version. diff --git a/openssl/openssl-0.9.8a-enginesdir.patch b/openssl/openssl-0.9.8a-enginesdir.patch deleted file mode 100644 index 0c33b74..0000000 --- a/openssl/openssl-0.9.8a-enginesdir.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- openssl-0.9.8a/Configure.enginesdir 2005-11-04 15:06:37.000000000 +0100 -+++ openssl-0.9.8a/Configure 2005-11-07 14:15:12.000000000 +0100 -@@ -560,6 +560,7 @@ - - my $prefix=""; - my $openssldir=""; -+my $enginesdir=""; - my $exe_ext=""; - my $install_prefix=""; - my $no_threads=0; -@@ -739,6 +740,10 @@ - { - $openssldir=$1; - } -+ elsif (/^--enginesdir=(.*)$/) -+ { -+ $enginesdir=$1; -+ } - elsif (/^--install.prefix=(.*)$/) - { - $install_prefix=$1; -@@ -923,7 +928,7 @@ - - $openssldir=$prefix . "/ssl" if $openssldir eq ""; - $openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/])/; -- -+$enginesdir="$prefix/lib/engines" if $enginesdir eq ""; - - print "IsMK1MF=$IsMK1MF\n"; - -@@ -1430,7 +1435,7 @@ - if (/^#define\s+OPENSSLDIR/) - { print OUT "#define OPENSSLDIR \"$openssldir\"\n"; } - elsif (/^#define\s+ENGINESDIR/) -- { print OUT "#define ENGINESDIR \"$prefix/lib/engines\"\n"; } -+ { print OUT "#define ENGINESDIR \"$enginesdir\"\n"; } - elsif (/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/) - { printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n" - if $export_var_as_fn;