[[EMAIL PROTECTED] - Tue Jun 4 19:47:25 2002]:
OK, I've a few comments:
> --- openssl-0.9.7/Configure.orig 2002-05-30
10:08:08.000000000 -0800
> +++ openssl-0.9.7/Configure 2002-06-02 15:23:38.000000000 -0800
> @@ -513,6 +513,9 @@
> "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer
-O3
> -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des}
> ${x86_gcc_opts}::::::::::win32",
> "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/dev/env/DJDIR/watt32/lib
> -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::",
> +
Since install.djgpp says something about $DJDIR, shouldn't
/dev/env/DJDIR be replaced with $ENV{DJDIR}? Could you check that
it works correctly if you make such a change?
[...]
> @@ -1226,6 +1230,50 @@
> close(IN);
> close(OUT);
>
> +my $dir;
> +my $crypt1;
> +my $crypt2;
> +my $crypt3;
> +my $crypt4;
> +my $crypt5;
> +my $crypt6;
> +my $symlink_exists;
> +mkdir ('include/openssl', 0777) unless -d 'include/openssl';
> +$symlink_exists=eval {symlink("",""); 1};
> +foreach $dir (@skip) {
> + $crypt1=join('','crypto/', "$dir", '/', "$dir", 'test.c');
> + $crypt2=join('', 'test/', "$dir", 'test.c');
> + $crypt3=join('', '../', "$crypt1");
> + $crypt4=join('', 'crypto/', "$dir", '/', "$dir", '.h');
> + $crypt5=join('', 'include/openssl/', "$dir", '.h');
> + $crypt6=join('', '../../', "$crypt4");
> + if ($symlink_exists) {
> + unlink "$crypt2";
> + unlink "$crypt5";
> + symlink("$crypt3", "$crypt2");
> + symlink("$crypt6", "$crypt5");
> + } else {
> + open (OLD, "<$crypt1") or die "Can't open $crypt1\n";
> + open (NEW, ">$crypt2") or die "Can't open $crypt2\n";
> + open (OLD1, "<$crypt4") or die "Can't open $crypt4\n";
> + open (NEW1, ">$crypt5") or die "Can't open $crypt5\n";
> + binmode(OLD);
> + binmode(NEW);
> + while (<OLD>) {
> + (print NEW $_);
> + }
> + binmode(OLD1);
> + binmode(NEW1);
> + while (<OLD1>) {
> + (print NEW1 $_);
> + }
> + close (OLD);
> + close (NEW);
> + close (OLD1);
> + close (NEW1);
> + }
> + }
> +
No, no, no and no. I will not do that. Sorry, all I see with that
is a maintainance nightmare.
However, I did ask on openssl-dev, just a moment ago, if the
automagic 'make depend' should be reenabled. Could you test that
such an option works properly?
> --- openssl-0.9.7/util/mklink.pl.orig Wed Apr 4 15:50:22 2001
> +++ openssl-0.9.7/util/mklink.pl Thu Apr 18 18:42:26 2002
> @@ -18,10 +18,10 @@
> my $from = shift;
> my @files = @ARGV;
>
> -my @from_path = split(/\//, $from);
> +my @from_path = split(/[\\\/]/, $from);
> my $pwd = `pwd`;
> chop($pwd);
> -my @pwd_path = split(/\//, $pwd);
> +my @pwd_path = split(/[\\\/]/, $pwd);
>
> my @to_path = ();
>
> @@ -52,9 +52,18 @@
> foreach $file (@files) {
> my $err = "";
> if ($symlink_exists) {
> + unlink "$from/$file";
> symlink("$to/$file", "$from/$file") or $err = " [$!]";
> } else {
> - system ("cp", "$file", "$from/$file") and $err = " [$!]";
> + open (OLD, "<$file") or die "Can't open $file: $!";
> + open (NEW, ">$from/$file") or die "Can't open $from/$file:
$!";
> + binmode(OLD);
> + binmode(NEW);
> + while (<OLD>) {
> + (print NEW $_);
> + }
> + close (OLD) or die "Can't close $file: $!";
> + close (NEW) or die "Can't close $from/$file: $!";
> }
> print $file . " => $from/$file$err\n";
> }
I don't remember our conversation on this, so bear with me: does the
call to cp not work? If it does, is this really necessary?
> --- openssl-0.9.7/tools/c_rehash.in.orig Fri Aug 17 04:35:58
2001
> +++ openssl-0.9.7/tools/c_rehash.in Thu Apr 18 18:42:26 2002
> @@ -17,7 +17,7 @@
>
> $ENV{PATH} .= ":$dir/bin";
>
> -if(! -f $openssl) {
> +if(! -x $openssl) {
> my $found = 0;
> foreach (split /:/, $ENV{PATH}) {
> if(-f "$_/$openssl") {
I can understand changing -f to -x, but then, is there a reason you
didn't change the second -f?
> --- openssl-0.9.7/crypto/des/Makefile.ssl.orig Sat Apr 6
20:06:28
> 2002
> +++ openssl-0.9.7/crypto/des/Makefile.ssl Thu Apr 18 18:42:26
2002
> @@ -108,7 +108,7 @@
>
> links:
> @$(TOP)/util/point.sh Makefile.ssl Makefile
> - @$(TOP)/util/point.sh ../../perlasm asm/perlasm
> + @$(TOP)/util/point.sh `cd ../perlasm;pwd` asm/perlasm
> @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl
$(EXHEADER)
> @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
> @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
Yeah, yeah, I'd prefer not to have to do that, but that means
poing.sh becomes more complicated... *sigh*
--
Richard Levitte
[EMAIL PROTECTED]
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List [EMAIL PROTECTED]
Automated List Manager [EMAIL PROTECTED]
