On Sun, 23 Jun 2002, Richard Levitte - VMS Whacker via RT wrote:
> In message <[EMAIL PROTECTED]> on Mon, 17 Jun 2002 10:01:27
>+0200 (METDST), "Lutz Jaenicke via RT" <[EMAIL PROTECTED]> said:
>
> rt> Obviously Richard missed your submission before leaving for a short
> rt> vacation (he took responsibility for Ticket #75, so I didn't want to
> rt> interfere with him).
> rt> I have bounced your submissions into the request tracker (they were
> rt> sent to openssl-dev instead of rt) so that they won't get lost.
> rt> Probably Richard will take care of it once he is back, so that
> rt> the fixes will be part of beta3.
>
> I'll take care of it in the next few days...
I just discovered that the latest patch I submitted for DOS was
dependent on the SHELL environment variable being set to the bash
binary, which will frequently not be the case. This revised patch
(attached) should work regardless of the SHELL setting in DOS. This
does not include the CYGWIN changes I submitted for ticket #76.
Doug
__
Doug Kaufman
Internet: [EMAIL PROTECTED]
--- openssl-0.9.7/Configure.orig 2002-06-14 12:11:26.000000000 -0800
+++ openssl-0.9.7/Configure 2002-06-23 22:10:14.000000000 -0800
@@ -7,6 +7,7 @@
require 5.000;
use strict;
+use Cwd;
# see INSTALL for instructions.
@@ -520,7 +521,7 @@
"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486
-Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_out_asm}:win32:cygwin-shared:::.dll",
# DJGPP
-"DJGPP", "gcc:-I/dev/env/DJDIR/watt32/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer
-O2 -Wall:::MSDOS:-L$ENV{DJDIR}/watt32/lib -lwatt:BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}::::::::::",
+"DJGPP", "gcc:-I/dev/env/DJDIR/watt32/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer
+-O2 -Wall:::MSDOS:-L/dev/env/DJDIR/watt32/lib -lwatt:BN_LLONG ${x86_gcc_des}
+${x86_gcc_opts}::::::::::",
# Ultrix from Bernhard Simon <[EMAIL PROTECTED]>
"ultrix-cc","cc:-std1 -O -Olimit 1000 -DL_ENDIAN::(unknown):::::::",
@@ -1441,10 +1442,17 @@
} else {
my $make_command = "make -f Makefile.ssl PERL=\'$perl\'";
my $make_targets = "";
+ my $skip_dir;
+ my $crypto = "crypto/";
+ my $curr_dir = cwd;
$make_targets .= " links" if $symlink;
$make_targets .= " depend" if $depflags ne "" && $make_depend;
(system $make_command.$make_targets) == 0 or exit $?
if $make_targets ne "";
+ foreach $skip_dir (@skip) {
+ chdir $crypto.$skip_dir && system ("make links PERL=\'$perl\' -f
+Makefile.ssl");
+ chdir $curr_dir;
+ }
if ( $perl =~ m@^/@) {
&dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "'
. $openssldir . '";');
&dofile("apps/der_chop",$perl,'^#!/', '#!%s');
--- openssl-0.9.7/Makefile.org.orig 2002-06-20 12:09:38.000000000 -0800
+++ openssl-0.9.7/Makefile.org 2002-06-23 17:27:38.000000000 -0800
@@ -600,7 +600,7 @@
do \
if [ -d "$$i" ]; then \
(cd $$i && echo "making dependencies $$i..." && \
- $(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}'
MAKEDEPPROG='${MAKEDEPPROG}' KRB5_INCLUDES='${KRB5_INCLUDES}' PERL='${PERL}' depend )
|| exit 1; \
+ $(MAKE) SDIRS='${SDIRS}' CFLAG='${CFLAG}' DEPFLAG='${DEPFLAG}'
+MAKEDEPPROG='${MAKEDEPPROG}' KRB5_INCLUDES='${KRB5_INCLUDES}' PERL='${PERL}' depend )
+|| exit 1; \
fi; \
done;
--- openssl-0.9.7/crypto/engine/hw_aep.c.orig 2002-03-07 20:07:44.000000000 +0000
+++ openssl-0.9.7/crypto/engine/hw_aep.c 2002-06-14 20:22:30.000000000 +0000
@@ -60,7 +60,7 @@
#include <string.h>
#include <openssl/e_os2.h>
-#ifndef OPENSSL_SYS_MSDOS
+#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__)
#include <sys/types.h>
#include <unistd.h>
#else
--- openssl-0.9.7/util/domd.orig 2002-06-05 00:09:16.000000000 -0800
+++ openssl-0.9.7/util/domd 2002-06-14 07:54:22.000000000 -0800
@@ -17,7 +17,7 @@
if [ "$MAKEDEPEND" = "gcc" ]; then
sed -e '/^# DO NOT DELETE.*/,$d' < Makefile.ssl > Makefile.tmp
echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
- gcc -D OPENSSL_DOING_MAKEDEPEND -M $@ >> Makefile.tmp
+ gcc -D OPENSSL_DOING_MAKEDEPEND -M ${CFLAG} $@ >> Makefile.tmp
${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
rm -f Makefile.tmp
else
