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 @@ -277,6 +277,11 @@
  54         chop;
  55
  56         ($key,$val)=/^([^=]+)=(.*)/;
  57 +
  58 +       # On some Windows machines, $val has linefeeds at the end, which confuses
  59 +       # subsequent code in this file. So we strip all whitespace at the end.
  60 +       $val =~ s/\s+$//;
  61 +
  62         if ($key eq "RELATIVE_DIRECTORY")
  63                 {
  64                 if ($lib ne "")
  65 @@ -570,7 +575,7 @@
  66  printf OUT <<EOF;
  67  #ifdef $platform_cpp_symbol
  68    /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
  69 -  #define CFLAGS "$cc $cflags"
  70 +  #define CFLAGS "$cflags"
  71    #define PLATFORM "$platform"
  72  EOF
  73  printf OUT "  #define DATE \"%s\"\n", scalar gmtime();
  74 --- misc/openssl-0.9.8k/util/pl/VC-32.pl        2007-07-19 19:39:07.000000000 +0200
  75 +++ misc/build/openssl-0.9.8k/util/pl/VC-32.pl  2008-03-20 13:27:06.000000000 +0100
  76 @@ -28,7 +28,7 @@
  77  $zlib_lib="zlib1.lib";
  78
  79  # C compiler stuff
  80 -$cc='cl';
  81 +$cc=$ENV{'CC'};
  82  if ($FLAVOR =~ /WIN64/)
  83      {
  84      # Note that we currently don't have /WX on Win64! There is a lot of
  85 @@ -99,21 +99,21 @@
  86      }
  87
  88      $cc='$(CC)';
  89 -    $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';
  90 +    $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';
  91      $base_cflags.=" $wcecdefs";
  92 -    $opt_cflags=' /MC /O1i';   # optimize for space, but with intrinsics...
  93 -    $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
  94 +    $opt_cflags=' -MC -O1i';   # optimize for space, but with intrinsics...
  95 +    $dbg_clfags=' -MC -Od -DDEBUG -D_DEBUG';
  96      $lflags="/nologo /opt:ref $wcelflag";
  97      }
  98  else   # Win32
  99      {
 100 -    $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
 101 +    $base_cflags=' -W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
 102      $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE';       # shut up VC8
 103      $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE';      # shut up VC8
 104 -    my $f = $shlib || $fips ?' /MD':' /MT';
 105 +    my $f = $shlib || $fips ?' -MD':' -MT';
 106 -    $lib_cflag='/Zl' if (!$shlib);     # remove /DEFAULTLIBs from static lib
 107 +    $lib_cflag='-Zl' if (!$shlib);     # remove /DEFAULTLIBs from static lib
 108 -    $opt_cflags=$f.' /Ox /O2 /Ob2';
 109 -    $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
 110 +    $opt_cflags=$f.' -Ox -O2 -Ob2';
 111 +    $dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG';
 112      $lflags="/nologo /subsystem:console /opt:ref";
 113      }
 114  $mlflags='';
 115 @@ -134,7 +134,7 @@
 116         }
 117
 118  $obj='.obj';
 119 -$ofile="/Fo";
 120 +$ofile="-Fo.\\";
 121
 122  # EXE linking stuff
 123  $link="link";
 124 @@ -281,7 +281,7 @@
 125         $tmp_def='tmp32dll_$(TARGETCPU)';
 126         }
 127
 128 -$cflags.=" /Fd$out_def";
 129 +$cflags.=" -Fd$out_def";
 130
 131  sub do_lib_rule
 132         {