diff options
author | kris <kris@FreeBSD.org> | 2001-05-20 03:07:21 +0000 |
---|---|---|
committer | kris <kris@FreeBSD.org> | 2001-05-20 03:07:21 +0000 |
commit | d8a086ad8867a06a52ea87d21003aebea4d2137c (patch) | |
tree | f48dbf0518066eb822cedea74ef34e6425c069ff /crypto/openssl/util | |
parent | fbf9b01e961ea8f2f5bdfdef1ade0f5eb587b43b (diff) | |
parent | 12896e829e9474d92c70a1528cc64270e9dc08ad (diff) | |
download | FreeBSD-src-d8a086ad8867a06a52ea87d21003aebea4d2137c.zip FreeBSD-src-d8a086ad8867a06a52ea87d21003aebea4d2137c.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r76866,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'crypto/openssl/util')
-rwxr-xr-x | crypto/openssl/util/clean-depend.pl | 4 | ||||
-rwxr-xr-x | crypto/openssl/util/libeay.num | 5 | ||||
-rwxr-xr-x | crypto/openssl/util/mklink.pl | 7 | ||||
-rwxr-xr-x | crypto/openssl/util/pod2man.pl | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/crypto/openssl/util/clean-depend.pl b/crypto/openssl/util/clean-depend.pl index af676af..0193e72 100755 --- a/crypto/openssl/util/clean-depend.pl +++ b/crypto/openssl/util/clean-depend.pl @@ -15,8 +15,8 @@ while(<STDIN>) { my ($file,$deps)=/^(.*): (.*)$/; next if !defined $deps; my @deps=split ' ',$deps; - @deps=grep(!/^\/usr\/include/,@deps); - @deps=grep(!/^\/usr\/lib\/gcc-lib/,@deps); + @deps=grep(!/^\//,@deps); + @deps=grep(!/^\\$/,@deps); push @{$files{$file}},@deps; } diff --git a/crypto/openssl/util/libeay.num b/crypto/openssl/util/libeay.num index 9f0f598..18b70c2 100755 --- a/crypto/openssl/util/libeay.num +++ b/crypto/openssl/util/libeay.num @@ -779,7 +779,7 @@ des_ede3_cfb64_encrypt 786 EXIST::FUNCTION:DES des_ede3_ofb64_encrypt 787 EXIST::FUNCTION:DES des_enc_read 788 EXIST::FUNCTION:DES des_enc_write 789 EXIST::FUNCTION:DES -des_encrypt 790 EXIST::FUNCTION:DES +des_encrypt1 790 EXIST::FUNCTION:DES des_encrypt2 791 EXIST::FUNCTION:DES des_encrypt3 792 EXIST::FUNCTION:DES des_fcrypt 793 EXIST::FUNCTION:DES @@ -1870,3 +1870,6 @@ X509_keyid_set1 2460 EXIST::FUNCTION: BIO_next 2461 EXIST::FUNCTION: DSO_METHOD_vms 2462 EXIST::FUNCTION: BIO_f_linebuffer 2463 EXIST:VMS:FUNCTION: +BN_bntest_rand 2464 EXIST::FUNCTION: +OPENSSL_issetugid 2465 EXIST::FUNCTION: +BN_rand_range 2466 EXIST::FUNCTION: diff --git a/crypto/openssl/util/mklink.pl b/crypto/openssl/util/mklink.pl index d7b997a..9e9c9a5 100755 --- a/crypto/openssl/util/mklink.pl +++ b/crypto/openssl/util/mklink.pl @@ -48,8 +48,13 @@ foreach $dirname (@from_path) { my $to = join('/', @to_path); my $file; +$symlink_exists=eval {symlink("",""); 1}; foreach $file (@files) { my $err = ""; - symlink("$to/$file", "$from/$file") or $err = " [$!]"; + if ($symlink_exists) { + symlink("$to/$file", "$from/$file") or $err = " [$!]"; + } else { + system ("cp", "$file", "$from/$file") and $err = " [$!]"; + } print $file . " => $from/$file$err\n"; } diff --git a/crypto/openssl/util/pod2man.pl b/crypto/openssl/util/pod2man.pl index f5ec076..c6b64ad 100755 --- a/crypto/openssl/util/pod2man.pl +++ b/crypto/openssl/util/pod2man.pl @@ -416,6 +416,8 @@ if ($name ne 'something') { warn "$0: Improper man page - malformed NAME header in paragraph $. of $ARGV[0]\n" } else { + $n[0] =~ s/\n/ /; + $n[1] =~ s/\n/ /; %namedesc = @n; } } |