Re: Port amd64 - Build is still broken from OpenSSL?

[Kurt Schreiner <ks%ub.uni-mainz.de@localhost>]

Hi,

On Mon, Jun 06, 2011 at 04:57:51AM -0700, Paul Goyette wrote:
> #      link  amd/amd
> /test-bed/tools/bin/x86_64--netbsd-gcc    --sysroot=/test-bed/dst 
> -Wl,--fatal-warnings     -o amd  am_ops.o amd.o amfs_auto.o amfs_generic.o 
> amfs_direct.o amfs_error.o amfs_host.o amfs_link.o amfs_linkx.o amfs_nfsl.o 
> amfs_nfsx.o amfs_program.o amfs_root.o amfs_toplvl.o amfs_union.o amq_subr.o 
> amq_svc.o autil.o clock.o conf.o get_args.o info_exec.o info_file.o 
> info_ndbm.o info_passwd.o info_sun.o info_union.o map.o mapc.o mntfs.o 
> nfs_prot_svc.o nfs_start.o nfs_subr.o ops_cdfs.o ops_efs.o ops_mfs.o 
> ops_nfs.o ops_nfs3.o ops_nullfs.o ops_pcfs.o ops_tfs.o ops_tmpfs.o ops_udf.o 
> ops_ufs.o ops_umapfs.o ops_unionfs.o opts.o readdir.o restart.o rpc_fwd.o 
> sched.o srvr_amfs_auto.o srvr_nfs.o sun_map.o sun_map_parse.o sun_map_tok.o 
> conf_parse.o conf_tok.o info_hesiod.o info_ldap.o info_nis.o 
> -L/test-bed/obj/external/bsd/am-utils/lib/libamu -lamu -lldap  -lrpcsvc 
> -L/test-bed/obj/external/bsd/am-utils/lib/libamu -lamu       
> -Wl,-rpath-link,/test-bed/dst/lib  -L=/lib
> /test-bed/dst/usr/lib/libssl.so.8: undefined reference to 
> `SRP_generate_server_master_secret'
> /test-bed/dst/usr/lib/libssl.so.8: undefined reference to 
> `SRP_have_to_put_srp_username'
> /test-bed/dst/usr/lib/libssl.so.8: undefined reference to `SSL_SRP_CTX_free'
> /test-bed/dst/usr/lib/libssl.so.8: undefined reference to `SSL_SRP_CTX_init'
> /test-bed/dst/usr/lib/libssl.so.8: undefined reference to `SRP_Calc_A_param'
> /test-bed/dst/usr/lib/libssl.so.8: undefined reference to 
> `SSL_srp_server_param_with_username'
> /test-bed/dst/usr/lib/libssl.so.8: undefined reference to 
> `SRP_generate_client_master_secret'
> /test-bed/dst/usr/lib/libssl.so.8: undefined reference to 
> `SSL_CTX_SRP_CTX_init'
> /test-bed/dst/usr/lib/libssl.so.8: undefined reference to 
> `SSL_CTX_SRP_CTX_free'
> collect2: ld returned 1 exit status

"build.sh distribution" is running fine for me with the attached patches.

HTH
Kurt

Index: crypto/external/bsd/openssl/bin/Makefile
===================================================================
RCS file: /cvsroot/src/crypto/external/bsd/openssl/bin/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- crypto/external/bsd/openssl/bin/Makefile    19 Jul 2009 23:33:34 -0000      
1.2
+++ crypto/external/bsd/openssl/bin/Makefile    6 Jun 2011 09:34:23 -0000
@@ -36,6 +36,7 @@
        rsa.c rsautl.c dsa.c dsaparam.c \
        x509.c genrsa.c gendsa.c prime.c s_server.c s_client.c speed.c \
        s_time.c version.c sess_id.c \
+       srp.c \
        ciphers.c nseq.c pkcs12.c pkcs8.c spkac.c smime.c rand.c engine.c ocsp.c
 
 CPPFLAGS+= -DMONOLITH -DUSE_SSL -I${OPENSSLSRC}
Index: crypto/external/bsd/openssl/lib/libcrypto/rsa.inc
===================================================================
RCS file: /cvsroot/src/crypto/external/bsd/openssl/lib/libcrypto/rsa.inc,v
retrieving revision 1.2
diff -u -r1.2 rsa.inc
--- crypto/external/bsd/openssl/lib/libcrypto/rsa.inc   6 Jun 2011 08:04:19 
-0000       1.2
+++ crypto/external/bsd/openssl/lib/libcrypto/rsa.inc   6 Jun 2011 09:34:24 
-0000
@@ -8,7 +8,7 @@
 .PATH: ${OPENSSLSRC}/crypto/rsa
 
 
-RSA_SRCS = rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c \
+RSA_SRCS = rsa_crpt.c rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c 
rsa_err.c \
        rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c rsa_null.c \
        rsa_asn1.c rsa_x931.c rsa_depr.c rsa_ameth.c rsa_pmeth.c rsa_pss.c \
        rsa_prn.c rsa_crpt.c
Index: crypto/external/bsd/openssl/lib/libssl/ssl.inc
===================================================================
RCS file: /cvsroot/src/crypto/external/bsd/openssl/lib/libssl/ssl.inc,v
retrieving revision 1.2
diff -u -r1.2 ssl.inc
--- crypto/external/bsd/openssl/lib/libssl/ssl.inc      27 Dec 2009 00:48:56 
-0000      1.2
+++ crypto/external/bsd/openssl/lib/libssl/ssl.inc      6 Jun 2011 09:34:24 
-0000
@@ -18,6 +18,7 @@
 SRCS+= s3_meth.c   s3_srvr.c s3_clnt.c  s3_lib.c  s3_enc.c s3_pkt.c s3_both.c \
        s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c          s23_pkt.c \
        t1_meth.c   t1_srvr.c t1_clnt.c  t1_lib.c  t1_enc.c t1_reneg.c \
+       tls_srp.c \
        ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \
        ssl_ciph.c ssl_stat.c ssl_rsa.c \
        ssl_asn1.c ssl_txt.c ssl_algs.c \
Index: distrib/sets/lists/base/shl.mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/base/shl.mi,v
retrieving revision 1.586
diff -u -r1.586 shl.mi
--- distrib/sets/lists/base/shl.mi      5 Jun 2011 23:09:51 -0000       1.586
+++ distrib/sets/lists/base/shl.mi      6 Jun 2011 09:34:27 -0000
@@ -180,7 +180,8 @@
 ./usr/lib/libcrypt.so.1.0                      base-sys-shlib
 ./usr/lib/libcrypto.so                         base-crypto-shlib       crypto
 ./usr/lib/libcrypto.so.6                       base-crypto-shlib       crypto
-./usr/lib/libcrypto.so.6.1                     base-crypto-shlib       crypto
+./usr/lib/libcrypto.so.6.1                     base-crypto-shlib       obsolete
+./usr/lib/libcrypto.so.6.2                     base-crypto-shlib       crypto
 ./usr/lib/libctf.so                            base-sys-shlib          dtrace
 ./usr/lib/libctf.so.2                          base-sys-shlib          dtrace
 ./usr/lib/libctf.so.2.0                                base-sys-shlib          
dtrace
Index: distrib/sets/lists/comp/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/comp/mi,v
retrieving revision 1.1628
diff -u -r1.1628 mi
--- distrib/sets/lists/comp/mi  3 Jun 2011 18:43:38 -0000       1.1628
+++ distrib/sets/lists/comp/mi  6 Jun 2011 09:34:37 -0000
@@ -1787,6 +1787,7 @@
 ./usr/include/openssl/buffer.h                 comp-c-include          crypto
 ./usr/include/openssl/camellia.h               comp-c-include          crypto
 ./usr/include/openssl/cast.h                   comp-c-include          crypto
+./usr/include/openssl/cmac.h                   comp-c-include          crypto
 ./usr/include/openssl/cms.h                    comp-c-include          crypto
 ./usr/include/openssl/comp.h                   comp-c-include          crypto
 ./usr/include/openssl/conf.h                   comp-c-include          crypto
@@ -1839,6 +1840,7 @@
 ./usr/include/openssl/rsaref.h                 comp-obsolete           obsolete
 ./usr/include/openssl/safestack.h              comp-c-include          crypto
 ./usr/include/openssl/sha.h                    comp-c-include          crypto
+./usr/include/openssl/srp.h                    comp-c-include          crypto
 ./usr/include/openssl/ssl.h                    comp-c-include          crypto
 ./usr/include/openssl/ssl2.h                   comp-c-include          crypto
 ./usr/include/openssl/ssl23.h                  comp-c-include          crypto