Module Name: src Committed By: martin Date: Mon May 4 14:03:12 UTC 2020
Modified Files: src/crypto/external/bsd/netpgp/lib/verify [netbsd-9]: Makefile Added Files: src/crypto/external/bsd/netpgp/lib/verify [netbsd-9]: verify.map Log Message: Pull up following revision(s) (requested by christos in ticket #887): crypto/external/bsd/netpgp/lib/verify/Makefile: revision 1.13 crypto/external/bsd/netpgp/lib/verify/verify.map: revision 1.1 Add a linker map to hide all the symbols the this library accidentally exported. In particular the following symbols: DSA_SIG_free DSA_SIG_new DSA_do_sign DSA_do_verify DSA_free DSA_new DSA_size RSA_check_key RSA_free RSA_generate_key RSA_new RSA_private_decrypt RSA_private_encrypt RSA_public_decrypt RSA_public_encrypt conflict with libcrypto and break pkg_add which links against both libraries. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.2.1 \ src/crypto/external/bsd/netpgp/lib/verify/Makefile cvs rdiff -u -r0 -r1.1.2.2 \ src/crypto/external/bsd/netpgp/lib/verify/verify.map Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/external/bsd/netpgp/lib/verify/Makefile diff -u src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.10 src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.10.2.1 --- src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.10 Mon Feb 4 04:05:15 2019 +++ src/crypto/external/bsd/netpgp/lib/verify/Makefile Mon May 4 14:03:12 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/02/04 04:05:15 mrg Exp $ +# $NetBSD: Makefile,v 1.10.2.1 2020/05/04 14:03:12 martin Exp $ LIB=netpgpverify SRCS+=b64.c @@ -30,5 +30,7 @@ INCSDIR=/usr/include/netpgp .if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc" COPTS+= -Wno-error=implicit-fallthrough .endif +LDFLAGS+=-Wl,--version-script=${.CURDIR}/verify.map + .include <bsd.lib.mk> Added files: Index: src/crypto/external/bsd/netpgp/lib/verify/verify.map diff -u /dev/null src/crypto/external/bsd/netpgp/lib/verify/verify.map:1.1.2.2 --- /dev/null Mon May 4 14:03:12 2020 +++ src/crypto/external/bsd/netpgp/lib/verify/verify.map Mon May 4 14:03:12 2020 @@ -0,0 +1,17 @@ +NETPGPVERIFY_5_0 { + global: + pgpv_new; + pgpv_new_cursor; + pgpv_read_pubring; + pgpv_read_ssh_pubkeys; + pgpv_verify; + pgpv_get_verified; + pgpv_dump; + pgpv_get_entry; + pgpv_get_cursor_num; + pgpv_get_cursor_str; + pgpv_get_cursor_element; + pgpv_close; + pgpv_cursor_close; + local: *; +};