openssl/openssl.patch

   1 --- misc/openssl-0.9.8k/crypto/x509v3/v3_pci.c  2007-03-05 01:06:47.000000000 +0100
   2 +++ misc/build/openssl-0.9.8k/crypto/x509v3/v3_pci.c    2008-03-20 13:30:16.000000000 +0100
   3 @@ -2,7 +2,7 @@
   4  /* Contributed to the OpenSSL Project 2004
   5   * by Richard Levitte (richard@levitte.org)
   6   */
   7 -/* Copyright (c) 2004 Kungliga Tekniska Högskolan
   8 +/* Copyright (c) 2004 Kungliga Tekniska Hoegskolan
   9   * (Royal Institute of Technology, Stockholm, Sweden).
  10   * All rights reserved.
  11   *
  12 --- misc/openssl-0.9.8k/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100
  13 +++ misc/build/openssl-0.9.8k/crypto/x509v3/v3_pcia.c   2008-03-20 13:30:47.000000000 +0100
  14 @@ -2,7 +2,7 @@
  15  /* Contributed to the OpenSSL Project 2004
  16   * by Richard Levitte (richard@levitte.org)
  17   */
  18 -/* Copyright (c) 2004 Kungliga Tekniska Högskolan
  19 +/* Copyright (c) 2004 Kungliga Tekniska Hoegskolan
  20   * (Royal Institute of Technology, Stockholm, Sweden).
  21   * All rights reserved.
  22   *
  23 --- misc/openssl-0.9.8k/ms/do_ms.bat    2005-05-17 02:07:13.000000000 +0200
  24 +++ misc/build/openssl-0.9.8k/ms/do_ms.bat      2008-03-20 13:27:06.000000000 +0100
  25 @@ -1,9 +1,8 @@
  26 +%1 util\mkfiles.pl >MINFO
  27 +%1 util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
  28 +%1 util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
  29 +%1 util\mk1mf.pl no-asm VC-CE >ms\ce.mak
  30 +%1 util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
  31
  32 -perl util\mkfiles.pl >MINFO
  33 -perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
  34 -perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
  35 -perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak
  36 -perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
  37 -
  38 -perl util\mkdef.pl 32 libeay > ms\libeay32.def
  39 -perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
  40 +%1 util\mkdef.pl 32 libeay > ms\libeay32.def
  41 +%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def
  42 --- misc/openssl-0.9.8k/util/mk1mf.pl   2007-08-13 00:31:14.000000000 +0200
  43 +++ misc/build/openssl-0.9.8k/util/mk1mf.pl     2008-03-20 13:27:06.000000000 +0100
  44 @@ -115,7 +115,7 @@
  45  $inc_def="outinc";
  46  $tmp_def="tmp";
  47
  48 -$perl="perl" unless defined $perl;
  49 +$perl="$ENV{PERL}" unless defined $perl;
  50  $mkdir="-mkdir" unless defined $mkdir;
  51
  52  ($ssl,$crypto)=("ssl","crypto");
  53 @@ -570,7 +570,7 @@
  54  printf OUT <<EOF;
  55  #ifdef $platform_cpp_symbol
  56    /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
  57 -  #define CFLAGS "$cc $cflags"
  58 +  #define CFLAGS "$cflags"
  59    #define PLATFORM "$platform"
  60  EOF
  61  printf OUT "  #define DATE \"%s\"\n", scalar gmtime();
  62 --- misc/openssl-0.9.8k/util/pl/VC-32.pl        2007-07-19 19:39:07.000000000 +0200
  63 +++ misc/build/openssl-0.9.8k/util/pl/VC-32.pl  2008-03-20 13:27:06.000000000 +0100
  64 @@ -28,7 +28,7 @@
  65  $zlib_lib="zlib1.lib";
  66
  67  # C compiler stuff
  68 -$cc='cl';
  69 +$cc=$ENV{'CC'};
  70  if ($FLAVOR =~ /WIN64/)
  71      {
  72      # Note that we currently don't have /WX on Win64! There is a lot of
  73 @@ -99,21 +99,21 @@
  74      }
  75
  76      $cc='$(CC)';
  77 -    $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';
  78 +    $base_cflags=' -W3 -WX -GF -Gy -nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';
  79      $base_cflags.=" $wcecdefs";
  80 -    $opt_cflags=' /MC /O1i';   # optimize for space, but with intrinsics...
  81 -    $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
  82 +    $opt_cflags=' -MC -O1i';   # optimize for space, but with intrinsics...
  83 +    $dbg_clfags=' -MC -Od -DDEBUG -D_DEBUG';
  84      $lflags="/nologo /opt:ref $wcelflag";
  85      }
  86  else   # Win32
  87      {
  88 -    $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
  89 +    $base_cflags=' -W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
  90      $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE';       # shut up VC8
  91      $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE';      # shut up VC8
  92 -    my $f = $shlib || $fips ?' /MD':' /MT';
  93 +    my $f = $shlib || $fips ?' -MD':' -MT';
  94 -    $lib_cflag='/Zl' if (!$shlib);     # remove /DEFAULTLIBs from static lib
  95 +    $lib_cflag='-Zl' if (!$shlib);     # remove /DEFAULTLIBs from static lib
  96 -    $opt_cflags=$f.' /Ox /O2 /Ob2';
  97 -    $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
  98 +    $opt_cflags=$f.' -Ox -O2 -Ob2';
  99 +    $dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG';
 100      $lflags="/nologo /subsystem:console /opt:ref";
 101      }
 102  $mlflags='';
 103 @@ -134,7 +134,7 @@
 104         }
 105
 106  $obj='.obj';
 107 -$ofile="/Fo";
 108 +$ofile="-Fo.\\";
 109
 110  # EXE linking stuff
 111  $link="link";
 112 @@ -281,7 +281,7 @@
 113         $tmp_def='tmp32dll_$(TARGETCPU)';
 114         }
 115
 116 -$cflags.=" /Fd$out_def";
 117 +$cflags.=" -Fd$out_def";
 118
 119  sub do_lib_rule
 120         {