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