-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

Let me start by saying that if this is more appropriate for
tech-security, or any other list, please let me know.

I'm trying to patch the last few SAs in NetBSD 1.5.3.  Things
appear to have gone awry for me.

If I try to just update lib/libcrypto or lib/libssl, things
break:

/usr/src-1.5.3/lib/libssl/../../crypto/dist/openssl/ssl/s2_lib.c:278: syntax error
mkdep: compile failed.
*** Error code 1

Stop.

/usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/conf/conf_lib.c:63: openssl/conf_api.h: No such file or directory
/usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/conf/conf_api.c:69: openssl/conf_api.h: No such file or directory
/usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/conf/conf_def.c:66: openssl/conf_api.h: No such file or directory
/usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/cryptlib.c:105: #error "Inconsistency between crypto.h and cryptlib.c"
/usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/dso/dso_dl.c:61: openssl/dso.h: No such file or directory
/usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/dso/dso_dlfcn.c:61: openssl/dso.h: No such file or directory
/usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/dso/dso_err.c:63: openssl/dso.h: No such file or directory
/usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/dso/dso_lib.c:62: openssl/dso.h: No such file or directory
/usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/dso/dso_null.c:64: openssl/dso.h: No such file or directory
/usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/dso/dso_openssl.c:61: openssl/dso.h: No such file or directory
/usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/dso/dso_win32.c:62: openssl/dso.h: No such file or directory
/usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/dso/dso_vms.c:70: openssl/dso.h: No such file or directory
/usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/err/err_all.c:85: openssl/dso.h: No such file or directory
In file included from /usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/md4/md4_dgst.c:60:
/usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/md4/md4_locl.h:62: openssl/md4.h: No such file or directory
/usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/md4/md4_one.c:61: openssl/md4.h: No such file or directory
/usr/src-1.5.3/lib/libcrypto/../../crypto/dist/openssl/crypto/stack/stack.c:112: arguments given to macro `sk_new_null'
mkdep: compile failed.
*** Error code 1

Stop.


make build (or make cleandir dependall) at /src results in

cleandir ===> usr.bin/openssl
"/usr/src-1.5.3/usr.bin/openssl/Makefile", line 47: Malformed conditional (${MKCRYPTO_MDC2} == "no")
"/usr/src-1.5.3/usr.bin/openssl/Makefile", line 47: Need an operator
"/usr/src-1.5.3/usr.bin/openssl/Makefile", line 49: if-less else
"/usr/src-1.5.3/usr.bin/openssl/Makefile", line 49: Need an operator
"/usr/src-1.5.3/usr.bin/openssl/Makefile", line 52: if-less endif
"/usr/src-1.5.3/usr.bin/openssl/Makefile", line 52: Need an operator
Fatal errors encountered -- cannot continue
*** Error code 1

Stop.
*** Error code 1

Stop.

I _believe_ everything that needs to be updated from the
netbsd-1-5 branch has been, so, any pointers would be highly
appreciated.

TIA,
Chris
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (NetBSD)
Comment: Processed by Mailcrypt 3.5.6 and Gnu Privacy Guard <http://www.gnupg.org/>

iD8DBQFAjWSNP65RBOOHTzERAkThAKDLYh7MxIUsghIGal4KcNLdUFep+gCeNYfV
FVSux1DsD+DYF32QvcsYEQw=
=kYYv
-----END PGP SIGNATURE-----