openssl/openssl.patch

   1 --- misc/openssl-0.9.8o/crypto/x509v3/v3_pci.c  2007-03-05 01:06:47.000000000 +0100
   2 +++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pci.c    2010-03-26 12:04:20.961547300 +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.8o/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100
  13 +++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pcia.c   2010-03-26 12:04:20.961547300 +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.8o/ms/do_ms.bat    2009-07-28 14:51:19.000000000 +0200
  24 +++ misc/build/openssl-0.9.8o/ms/do_ms.bat      2010-03-26 12:19:19.399047300 +0100
  25 @@ -1,11 +1,11 @@
  26
  27 -perl util\mkfiles.pl >MINFO
  28 -perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
  29 -perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
  30 +%1 util\mkfiles.pl >MINFO
  31 +%1 util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
  32 +%1 util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
  33  if x%OSVERSION% == x goto skipce
  34 -perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak
  35 -perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
  36 +%1 util\mk1mf.pl no-asm VC-CE >ms\ce.mak
  37 +%1 util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
  38  :skipce
  39
  40 -perl util\mkdef.pl 32 libeay > ms\libeay32.def
  41 -perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
  42 +%1 util\mkdef.pl 32 libeay > ms\libeay32.def
  43 +%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def
  44 --- misc/openssl-0.9.8o/util/mk1mf.pl   2009-09-20 14:46:42.000000000 +0200
  45 +++ misc/build/openssl-0.9.8o/util/mk1mf.pl     2010-03-26 12:04:20.977172300 +0100
  46 @@ -128,7 +128,7 @@
  47  $inc_def="outinc";
  48  $tmp_def="tmp";
  49
  50 -$perl="perl" unless defined $perl;
  51 +$perl="$ENV{PERL}" unless defined $perl;
  52  $mkdir="-mkdir" unless defined $mkdir;
  53
  54  ($ssl,$crypto)=("ssl","crypto");
  55 @@ -290,6 +290,11 @@
  56         chop;
  57
  58         ($key,$val)=/^([^=]+)=(.*)/;
  59 +
  60 +       # On some Windows machines, $val has linefeeds at the end, which confuses
  61 +       # subsequent code in this file. So we strip all whitespace at the end.
  62 +       $val =~ s/\s+$//;
  63 +
  64         if ($key eq "RELATIVE_DIRECTORY")
  65                 {
  66                 if ($lib ne "")
  67 @@ -730,7 +735,7 @@
  68  printf OUT <<EOF;
  69  #ifdef $platform_cpp_symbol
  70    /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
  71 -  #define CFLAGS "$cc $cflags"
  72 +  #define CFLAGS "$cflags"
  73    #define PLATFORM "$platform"
  74  EOF
  75  printf OUT "  #define DATE \"%s\"\n", scalar gmtime();
  76 --- misc/openssl-0.9.8o/util/pl/VC-32.pl        2010-02-04 02:10:24.000000000 +0100
  77 +++ misc/build/openssl-0.9.8o/util/pl/VC-32.pl  2010-03-26 12:04:20.977172300 +0100
  78 @@ -32,7 +32,7 @@
  79  $l_flags =~ s/-L(\S+)/\/libpath:$1/g;
  80
  81  # C compiler stuff
  82 -$cc='cl';
  83 +$cc=$ENV{'CC'};
  84  if ($FLAVOR =~ /WIN64/)
  85      {
  86      # Note that we currently don't have /WX on Win64! There is a lot of
  87 @@ -103,21 +103,21 @@
  88      }
  89
  90      $cc='$(CC)';
  91 -    $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';
  92 +    $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';
  93      $base_cflags.=" $wcecdefs";
  94 -    $opt_cflags=' /MC /O1i';   # optimize for space, but with intrinsics...
  95 -    $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
  96 +    $opt_cflags=' -MC -O1i';   # optimize for space, but with intrinsics...
  97 +    $dbg_clfags=' -MC -Od -DDEBUG -D_DEBUG';
  98      $lflags="/nologo /opt:ref $wcelflag";
  99      }
 100  else   # Win32
 101      {
 102 -    $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
 103 +    $base_cflags=' -W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
 104      $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE';       # shut up VC8
 105      $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE';      # shut up VC8
 106 -    my $f = $shlib || $fips ?' /MD':' /MT';
 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 +    my $f = $shlib || $fips ?' -MD':' -MT';
 111 +    $lib_cflag='-Zl' if (!$shlib);     # remove /DEFAULTLIBs from static lib
 112 +    $opt_cflags=$f.' -Ox -O2 -Ob2';
 113 +    $dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG';
 114      $lflags="/nologo /subsystem:console /opt:ref";
 115      }
 116  $mlflags='';
 117 @@ -138,7 +138,7 @@
 118         }
 119
 120  $obj='.obj';
 121 -$ofile="/Fo";
 122 +$ofile="-Fo.\\";
 123
 124  # EXE linking stuff
 125  $link="link";
 126 @@ -298,7 +298,7 @@
 127         $tmp_def='tmp32dll_$(TARGETCPU)';
 128         }
 129
 130 -$cflags.=" /Fd$out_def";
 131 +$cflags.=" -Fd$out_def";
 132
 133  sub do_lib_rule
 134         {