From e550fc601adcffc3a0c28e1710c2c3e7e6e00a9f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 19 Jun 2010 20:08:08 +0000 Subject: [PATCH] Properly regenerate def files with mkdef.pl and drop linker-fix.patch --- mingw32-openssl-1.0.0a-linker-fix.patch | 45 ------------------------- mingw32-openssl.spec | 9 ++--- 2 files changed, 5 insertions(+), 49 deletions(-) delete mode 100644 mingw32-openssl-1.0.0a-linker-fix.patch diff --git a/mingw32-openssl-1.0.0a-linker-fix.patch b/mingw32-openssl-1.0.0a-linker-fix.patch deleted file mode 100644 index 937cc40..0000000 --- a/mingw32-openssl-1.0.0a-linker-fix.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up openssl-1.0.0a/util/libeay.num.mingw-linker-fix openssl-1.0.0a/util/libeay.num ---- openssl-1.0.0a/util/libeay.num.mingw-linker-fix 2010-04-13 20:08:50.000000000 +0300 -+++ openssl-1.0.0a/util/libeay.num 2010-06-19 19:03:07.000000000 +0300 -@@ -1084,7 +1084,6 @@ BIO_s_socks4a_connect - PROXY_set_connect_mode 1112 NOEXIST::FUNCTION: - RAND_SSLeay 1113 EXIST::FUNCTION: - RAND_set_rand_method 1114 EXIST::FUNCTION: --RSA_memory_lock 1115 EXIST::FUNCTION:RSA - bn_sub_words 1116 EXIST::FUNCTION: - bn_mul_normal 1117 NOEXIST::FUNCTION: - bn_mul_comba8 1118 NOEXIST::FUNCTION: -@@ -2844,17 +2843,8 @@ sk_is_sorted - X509_check_ca 3286 EXIST::FUNCTION: - private_idea_set_encrypt_key 3287 NOEXIST::FUNCTION: - HMAC_CTX_set_flags 3288 EXIST::FUNCTION:HMAC --private_SHA_Init 3289 NOEXIST::FUNCTION: --private_CAST_set_key 3290 NOEXIST::FUNCTION: --private_RIPEMD160_Init 3291 NOEXIST::FUNCTION: - private_RC5_32_set_key 3292 NOEXIST::FUNCTION: --private_MD5_Init 3293 NOEXIST::FUNCTION: --private_RC4_set_key 3294 NOEXIST::FUNCTION: - private_MDC2_Init 3295 NOEXIST::FUNCTION: --private_RC2_set_key 3296 NOEXIST::FUNCTION: --private_MD4_Init 3297 NOEXIST::FUNCTION: --private_BF_set_key 3298 NOEXIST::FUNCTION: --private_MD2_Init 3299 NOEXIST::FUNCTION: - d2i_PROXY_CERT_INFO_EXTENSION 3300 EXIST::FUNCTION: - PROXY_POLICY_it 3301 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: - PROXY_POLICY_it 3301 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: -@@ -3318,7 +3308,6 @@ X509_policy_check - EVP_PKEY_get_attr_by_NID 3721 EXIST::FUNCTION: - STORE_set_ex_data 3722 NOEXIST::FUNCTION: - ENGINE_get_ECDSA 3723 EXIST::FUNCTION:ENGINE --EVP_ecdsa 3724 EXIST::FUNCTION:SHA - BN_BLINDING_get_flags 3725 EXIST::FUNCTION: - PKCS12_add_cert 3726 EXIST::FUNCTION: - STORE_OBJECT_new 3727 NOEXIST::FUNCTION: -@@ -3702,7 +3691,6 @@ FIPS_rsa_free - FIPS_dsa_sig_encode 4089 NOEXIST::FUNCTION: - CRYPTO_dbg_remove_all_info 4090 NOEXIST::FUNCTION: - OPENSSL_init 4091 NOEXIST::FUNCTION: --private_Camellia_set_key 4092 NOEXIST::FUNCTION: - CRYPTO_strdup 4093 EXIST::FUNCTION: - JPAKE_STEP3A_process 4094 EXIST::FUNCTION:JPAKE - JPAKE_STEP1_release 4095 EXIST::FUNCTION:JPAKE diff --git a/mingw32-openssl.spec b/mingw32-openssl.spec index 9711b92..139f6bf 100644 --- a/mingw32-openssl.spec +++ b/mingw32-openssl.spec @@ -85,9 +85,6 @@ Patch53: openssl-1.0.0-name-hash.patch Patch101: mingw32-openssl-1.0.0-beta3-libversion.patch # Fix engines/ install target after lib rename Patch102: mingw32-openssl-1.0.0a-sfx.patch -# Ugly patch to fix a compilation error (the linker can't find -# some symbols mentioned in an autogenerated .def file) -Patch103: mingw32-openssl-1.0.0a-linker-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -181,7 +178,6 @@ Static version of the MinGW port of the OpenSSL toolkit. %patch101 -p1 -b .mingw-libversion %patch102 -p1 -b .mingw-sfx -%patch103 -p1 -b .mingw-linker-fix # Use _mingw32_cflags instead of hardcoded ones sed -i -e '/^"mingw"/ s/-fomit-frame-pointer -O3 -march=i486 -Wall/%{_mingw32_cflags}/' Configure @@ -207,6 +203,10 @@ make TABLE PERL=%{__perl} shared mingw # --with-krb5-flavor=MIT # -I%{_mingw32_prefix}/kerberos/include -L%{_mingw32_prefix}/kerberos/%{_lib} + +# Regenerate def files as we disabled some algorithms above +perl util/mkdef.pl crypto ssl update + make depend make all build-shared @@ -349,6 +349,7 @@ rm -rf $RPM_BUILD_ROOT - Use sed to fix up cflags instead of unmaintainable patch - Rebased mingw32 specific patches - Disabled capieng to fix build +- Properly regenerate def files with mkdef.pl and drop linker-fix.patch * Thu Nov 26 2009 Kalev Lember - 1.0.0-0.6.beta4 - Merged patches from native Fedora openssl (up to 1.0.0-0.16.beta4)