package/openssl/patches/openssl.patch

   1 --- openssl-0.9.7.orig/Configure
   2 +++ openssl-0.9.7/Configure
   3 @@ -1,4 +1,4 @@
   4 -:
   5 +#!/usr/bin/perl
   6  eval 'exec perl -S $0 ${1+"$@"}'
   7      if $running_under_some_shell;
   8  ##
   9 @@ -373,6 +373,40 @@
  10  # assembler versions -- currently defunct:
  11  ##"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer:::(unknown):SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${alpha_asm}",
  12
  13 +# Sane Linux configuration values, stolen from the Debian package....
  14 +"linux-alpha","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  15 +"linux-alpha-ev4","gcc:-DTERMIO -O3 -mcpu=ev4 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  16 +"linux-alpha-ev5","gcc:-DTERMIO -O3 -mcpu=ev5 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  17 +"linux-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  18 +"linux-freebsd-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  19 +"linux-freebsd-i386",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  20 +"linux-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  21 +"linux-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  22 +"linux-ia64","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  23 +#"linux-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC",
  24 +"linux-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  25 +"linux-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -mcpu=i486 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  26 +"linux-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -mcpu=i586 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  27 +"linux-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -mcpu=i686 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  28 +"linux-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  29 +"linux-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  30 +"linux-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  31 +"linux-netbsd-i386",   "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  32 +"linux-netbsd-m68k",   "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  33 +"linux-netbsd-sparc",  "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  34 +"linux-openbsd-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  35 +"linux-openbsd-i386",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  36 +"linux-openbsd-mips","gcc:-O2 -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  37 +"linux-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  38 +"linux-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  39 +"linux-sh3",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  40 +"linux-sh4",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  41 +"linux-sh3eb",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  42 +"linux-sh4eb",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  43 +"linux-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  44 +"linux-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v8 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  45 +"linux-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,-Av8plus -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  46 +"linux-cris",  "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  47  # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the
  48  # bn86-elf.o file file since it is hand tweaked assembler.
  49  "linux-elf",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  50 --- openssl-0.9.7.orig/crypto/md5/asm/md5-sparcv9.S
  51 +++ openssl-0.9.7/crypto/md5/asm/md5-sparcv9.S
  52 @@ -72,14 +72,14 @@
  53  #define Dval   R8
  54
  55  #if defined(MD5_BLOCK_DATA_ORDER)
  56 -# if defined(OPENSSL_SYSNAME_ULTRASPARC)
  57 +/*# if defined(OPENSSL_SYSNAME_ULTRASPARC)*/
  58  #  define      LOAD                    lda
  59  #  define      X(i)                    [%i1+i*4]%asi
  60  #  define      md5_block               md5_block_asm_data_order_aligned
  61  #  define      ASI_PRIMARY_LITTLE      0x88
  62 -# else
  63 +/*# else
  64  #  error "MD5_BLOCK_DATA_ORDER is supported only on UltraSPARC!"
  65 -# endif
  66 +# endif*/
  67  #else
  68  # define       LOAD                    ld
  69  # define       X(i)                    [%i1+i*4]
  70 --- openssl-0.9.7.orig/crypto/opensslconf.h
  71 +++ openssl-0.9.7/crypto/opensslconf.h
  72 @@ -4,17 +4,38 @@
  73  /* OpenSSL was configured with the following options: */
  74  #ifndef OPENSSL_DOING_MAKEDEPEND
  75
  76 +#ifndef OPENSSL_NO_IDEA
  77 +# define OPENSSL_NO_IDEA
  78 +#endif
  79 +#ifndef OPENSSL_NO_MDC2
  80 +# define OPENSSL_NO_MDC2
  81 +#endif
  82 +#ifndef OPENSSL_NO_RC5
  83 +# define OPENSSL_NO_RC5
  84 +#endif
  85  #ifndef OPENSSL_NO_KRB5
  86  # define OPENSSL_NO_KRB5
  87  #endif
  88
  89  #endif /* OPENSSL_DOING_MAKEDEPEND */
  90 +#ifndef OPENSSL_THREADS
  91 +# define OPENSSL_THREADS
  92 +#endif
  93
  94  /* The OPENSSL_NO_* macros are also defined as NO_* if the application
  95     asks for it.  This is a transient feature that is provided for those
  96     who haven't had the time to do the appropriate changes in their
  97     applications.  */
  98  #ifdef OPENSSL_ALGORITHM_DEFINES
  99 +# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
 100 +#  define NO_IDEA
 101 +# endif
 102 +# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
 103 +#  define NO_MDC2
 104 +# endif
 105 +# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
 106 +#  define NO_RC5
 107 +# endif
 108  # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
 109  #  define NO_KRB5
 110  # endif
 111 @@ -27,7 +48,7 @@
 112
 113  #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 114  #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
 115 -#define OPENSSLDIR "/usr/local/ssl"
 116 +#define OPENSSLDIR "/usr/lib/ssl"
 117  #endif
 118  #endif
 119
 120 @@ -79,7 +100,7 @@
 121
 122  #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
 123  #define CONFIG_HEADER_BN_H
 124 -#undef BN_LLONG
 125 +#define BN_LLONG
 126
 127  /* Should we define BN_DIV2W here? */
 128
 129 @@ -98,7 +119,7 @@
 130  #define CONFIG_HEADER_RC4_LOCL_H
 131  /* if this is defined data[i] is used instead of *data, this is a %20
 132   * speedup on x86 */
 133 -#undef RC4_INDEX
 134 +#define RC4_INDEX
 135  #endif
 136
 137  #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
 138 @@ -112,14 +133,14 @@
 139  /* the following is tweaked from a config script, that is why it is a
 140   * protected undef/define */
 141  #ifndef DES_PTR
 142 -#undef DES_PTR
 143 +#define DES_PTR
 144  #endif
 145
 146  /* This helps C compiler generate the correct code for multiple functional
 147   * units.  It reduces register dependancies at the expense of 2 more
 148   * registers */
 149  #ifndef DES_RISC1
 150 -#undef DES_RISC1
 151 +#define DES_RISC1
 152  #endif
 153
 154  #ifndef DES_RISC2
 155 @@ -133,7 +154,7 @@
 156  /* Unroll the inner loop, this sometimes helps, sometimes hinders.
 157   * Very mucy CPU dependant */
 158  #ifndef DES_UNROLL
 159 -#undef DES_UNROLL
 160 +#define DES_UNROLL
 161  #endif
 162
 163  /* These default values were supplied by
 164 --- openssl-0.9.7.orig/ssl/ssl_algs.c
 165 +++ openssl-0.9.7/ssl/ssl_algs.c
 166 @@ -109,3 +109,8 @@
 167         return(1);
 168         }
 169
 170 +#undef SSLeay_add_ssl_algorithms
 171 +int SSLeay_add_ssl_algorithms(void)
 172 +    {
 173 +         return SSL_library_init();
 174 +    }
 175 --- openssl-0.9.7.orig/tools/c_rehash.in
 176 +++ openssl-0.9.7/tools/c_rehash.in
 177 @@ -1,4 +1,4 @@
 178 -#!/usr/local/bin/perl
 179 +#!/usr/bin/perl
 180
 181
 182  # Perl c_rehash script, scan all files in a directory
 183 --- openssl-0.9.7.orig/util/clean-depend.pl
 184 +++ openssl-0.9.7/util/clean-depend.pl
 185 @@ -1,4 +1,4 @@
 186 -#!/usr/local/bin/perl -w
 187 +#!/usr/bin/perl
 188  # Clean the dependency list in a makefile of standard includes...
 189  # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
 190
 191 --- openssl-0.9.7.orig/util/extract-names.pl
 192 +++ openssl-0.9.7/util/extract-names.pl
 193 @@ -1,4 +1,4 @@
 194 -#!/usr/bin/perl
 195 +#!/usr/bin/perl
 196
 197  $/ = "";                       # Eat a paragraph at once.
 198  while(<STDIN>) {
 199 --- openssl-0.9.7.orig/util/mkdef.pl
 200 +++ openssl-0.9.7/util/mkdef.pl
 201 @@ -1,4 +1,4 @@
 202 -#!/usr/local/bin/perl -w
 203 +#!/usr/bin/perl
 204  #
 205  # generate a .def file
 206  #
 207 --- openssl-0.9.7.orig/util/mkerr.pl
 208 +++ openssl-0.9.7/util/mkerr.pl
 209 @@ -1,4 +1,4 @@
 210 -#!/usr/local/bin/perl -w
 211 +#!/usr/bin/perl
 212
 213  my $config = "crypto/err/openssl.ec";
 214  my $debug = 0;
 215 --- openssl-0.9.7.orig/util/mkstack.pl
 216 +++ openssl-0.9.7/util/mkstack.pl
 217 @@ -1,4 +1,4 @@
 218 -#!/usr/local/bin/perl -w
 219 +#!/usr/bin/perl
 220
 221  # This is a utility that searches out "DECLARE_STACK_OF()"
 222  # declarations in .h and .c files, and updates/creates/replaces
 223 --- openssl-0.9.7.orig/util/pod2man.pl
 224 +++ openssl-0.9.7/util/pod2man.pl
 225 @@ -1,4 +1,4 @@
 226 -: #!/usr/bin/perl-5.005
 227 +#!/usr/bin/perl
 228      eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
 229         if $running_under_some_shell;
 230
 231 --- openssl-0.9.7.orig/util/selftest.pl
 232 +++ openssl-0.9.7/util/selftest.pl
 233 @@ -1,4 +1,4 @@
 234 -#!/usr/local/bin/perl -w
 235 +#!/usr/bin/perl
 236  #
 237  # Run the test suite and generate a report
 238  #