Richard W.M. Jones wrote:
> I didn't really look into it in detail yet, but I got a build failure
> in Koji:
>
> http://koji.fedoraproject.org/koji/getfile?taskID=1097899&name=build.log
>
> It built fine on my local machine though.
it's really strange, since centos's patch can work with it:-(
anyway here is a patch for the spec file and two new patch. of course
0.9.8j replace the previous 0.9.8g patches. previously i forget to send
the configure patch and header was updated.
ps. you can also remove openssl-0.9.8a-enginesdir.patch from hg.
--
Levente "Si vis pacem para bellum!"
--- ./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 <openssl/seed.h>
+#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 <openssl/seed.h>
+#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 <memory.h>
#endif
-#include <openssl/seed.h>
+#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 <stdio.h>
#include <string.h>
-#include <openssl/camellia.h>
+#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 <assert.h>
#include <string.h>
-#include <openssl/camellia.h>
+#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 <assert.h>
-#include <openssl/camellia.h>
+#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 <openssl/opensslv.h>
-#include <openssl/camellia.h>
+#include "camellia.h"
#include "cmll_locl.h"
#include <openssl/crypto.h>
#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 <assert.h>
-#include <openssl/camellia.h>
+#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 <assert.h>
-#include <openssl/camellia.h>
+#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 <string.h>
#include <assert.h>
#ifndef OPENSSL_NO_SEED
-#include <openssl/seed.h>
+#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 <openssl/err.h>
#include <string.h>
#include <assert.h>
-#include <openssl/camellia.h>
+#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 <openssl/aes.h>
#endif
#ifndef OPENSSL_NO_CAMELLIA
-#include <openssl/camellia.h>
+#include "../crypto/camellia/camellia.h"
#endif
#ifndef OPENSSL_NO_MD2
#include <openssl/md2.h>
@@ -202,7 +202,7 @@
#include <openssl/idea.h>
#endif
#ifndef OPENSSL_NO_SEED
-#include <openssl/seed.h>
+#include "../crypto/seed/seed.h"
#endif
#ifndef OPENSSL_NO_BF
#include <openssl/blowfish.h>
diff -r 9ce8bc84c7bc openssl/mingw32-openssl.spec
--- a/openssl/mingw32-openssl.spec Mon Feb 02 15:27:49 2009 +0000
+++ b/openssl/mingw32-openssl.spec Mon Feb 02 18:44:42 2009 +0100
@@ -80,8 +80,8 @@ Patch49: openssl-0.9.8j-fips-no-p
# 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
The 'mingw' target to Configure has some problems with cross-compilation.
- RWMJ 2008-09-30
diff -ur openssl-0.9.8g.orig/Configure openssl-0.9.8g.mingw/Configure
--- openssl-0.9.8g.orig/Configure 2008-09-30 14:16:16.000000000 +0100
+++ openssl-0.9.8g.mingw/Configure 2008-09-30 14:59:34.000000000 +0100
@@ -468,7 +468,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 -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", "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",
_______________________________________________
fedora-mingw mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/fedora-mingw
