Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/pgoyette-compat]: src Sync with HEAD. 77 conflicts resolved - all of th...
details: https://anonhg.NetBSD.org/src/rev/237afe5674df
branches: pgoyette-compat
changeset: 830559:237afe5674df
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Sat Apr 07 04:11:47 2018 +0000
description:
Sync with HEAD. 77 conflicts resolved - all of them $NetBSD$
diffstat:
bin/ed/ed.1 | 13 +-
bin/ed/main.c | 16 +-
build.sh | 8 +-
crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c | 6 +-
crypto/dist/ipsec-tools/src/racoon/debugrm.c | 98 +-
crypto/dist/ipsec-tools/src/racoon/debugrm.h | 24 +-
crypto/external/bsd/heimdal/dist/kcm/cache.c | 3 +-
crypto/external/bsd/heimdal/dist/kcm/glue.c | 83 +-
crypto/external/bsd/netpgp/dist/include/netpgp.h | 2 +-
crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3 | 8 +-
crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3 | 6 +-
crypto/external/bsd/netpgp/dist/src/libmj/libmj.3 | 8 +-
crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1 | 17 +-
crypto/external/bsd/openssh/Makefile.inc | 4 +-
crypto/external/bsd/openssh/bin/ssh/Makefile | 4 +-
crypto/external/bsd/openssh/dist/PROTOCOL | 16 +-
crypto/external/bsd/openssh/dist/PROTOCOL.certkeys | 10 +-
crypto/external/bsd/openssh/dist/auth-options.c | 1205 +-
crypto/external/bsd/openssh/dist/auth-options.h | 107 +-
crypto/external/bsd/openssh/dist/auth-pam.c | 197 +-
crypto/external/bsd/openssh/dist/auth-pam.h | 14 +-
crypto/external/bsd/openssh/dist/auth-passwd.c | 61 +-
crypto/external/bsd/openssh/dist/auth.c | 363 +-
crypto/external/bsd/openssh/dist/auth.h | 33 +-
crypto/external/bsd/openssh/dist/auth2-hostbased.c | 14 +-
crypto/external/bsd/openssh/dist/auth2-none.c | 8 +-
crypto/external/bsd/openssh/dist/auth2-passwd.c | 8 +-
crypto/external/bsd/openssh/dist/auth2-pubkey.c | 632 +-
crypto/external/bsd/openssh/dist/auth2.c | 13 +-
crypto/external/bsd/openssh/dist/authfd.c | 47 +-
crypto/external/bsd/openssh/dist/authfd.h | 9 +-
crypto/external/bsd/openssh/dist/authfile.c | 12 +-
crypto/external/bsd/openssh/dist/bitmap.c | 5 +-
crypto/external/bsd/openssh/dist/bitmap.h | 4 +-
crypto/external/bsd/openssh/dist/blf.h | 1 +
crypto/external/bsd/openssh/dist/blocks.c | 248 -
crypto/external/bsd/openssh/dist/chacha.h | 1 +
crypto/external/bsd/openssh/dist/channels.c | 86 +-
crypto/external/bsd/openssh/dist/cipher-aesctr.c | 3 +
crypto/external/bsd/openssh/dist/cipher-aesctr.h | 1 +
crypto/external/bsd/openssh/dist/cipher-chachapoly.h | 1 +
crypto/external/bsd/openssh/dist/cipher-ctr-mt.c | 3 +-
crypto/external/bsd/openssh/dist/cipher.c | 25 +-
crypto/external/bsd/openssh/dist/cleanup.c | 4 +-
crypto/external/bsd/openssh/dist/clientloop.c | 61 +-
crypto/external/bsd/openssh/dist/clientloop.h | 6 +-
crypto/external/bsd/openssh/dist/compat.c | 77 +-
crypto/external/bsd/openssh/dist/compat.h | 30 +-
crypto/external/bsd/openssh/dist/crypto_api.h | 9 +-
crypto/external/bsd/openssh/dist/dh.c | 13 +-
crypto/external/bsd/openssh/dist/digest.h | 1 +
crypto/external/bsd/openssh/dist/dns.c | 11 +-
crypto/external/bsd/openssh/dist/dns.h | 7 +-
crypto/external/bsd/openssh/dist/fe25519.h | 1 +
crypto/external/bsd/openssh/dist/fmt_scaled.c | 3 +-
crypto/external/bsd/openssh/dist/ge25519.h | 1 +
crypto/external/bsd/openssh/dist/hash.c | 85 +-
crypto/external/bsd/openssh/dist/hmac.h | 1 +
crypto/external/bsd/openssh/dist/includes.h | 4 +-
crypto/external/bsd/openssh/dist/kex.c | 18 +-
crypto/external/bsd/openssh/dist/kexc25519c.c | 6 +-
crypto/external/bsd/openssh/dist/kexdhc.c | 14 +-
crypto/external/bsd/openssh/dist/kexdhs.c | 12 +-
crypto/external/bsd/openssh/dist/kexecdhc.c | 23 +-
crypto/external/bsd/openssh/dist/kexecdhs.c | 18 +-
crypto/external/bsd/openssh/dist/kexgexc.c | 14 +-
crypto/external/bsd/openssh/dist/kexgexs.c | 12 +-
crypto/external/bsd/openssh/dist/key.c | 21 +-
crypto/external/bsd/openssh/dist/key.h | 5 +-
crypto/external/bsd/openssh/dist/krl.c | 7 +-
crypto/external/bsd/openssh/dist/krl.h | 1 +
crypto/external/bsd/openssh/dist/misc.c | 647 +-
crypto/external/bsd/openssh/dist/misc.h | 23 +-
crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048 | 45 -
crypto/external/bsd/openssh/dist/moduli-gen/moduli.3072 | 38 -
crypto/external/bsd/openssh/dist/moduli-gen/moduli.4096 | 40 -
crypto/external/bsd/openssh/dist/moduli-gen/moduli.6144 | 36 -
crypto/external/bsd/openssh/dist/moduli-gen/moduli.7680 | 35 -
crypto/external/bsd/openssh/dist/moduli-gen/moduli.8192 | 44 -
crypto/external/bsd/openssh/dist/moduli.c | 11 +-
crypto/external/bsd/openssh/dist/monitor.c | 120 +-
crypto/external/bsd/openssh/dist/monitor_wrap.c | 60 +-
crypto/external/bsd/openssh/dist/monitor_wrap.h | 16 +-
crypto/external/bsd/openssh/dist/opacket.c | 5 +-
crypto/external/bsd/openssh/dist/opacket.h | 3 +-
crypto/external/bsd/openssh/dist/packet.c | 36 +-
crypto/external/bsd/openssh/dist/packet.h | 7 +-
crypto/external/bsd/openssh/dist/pathnames.h | 6 +-
crypto/external/bsd/openssh/dist/pfilter.c | 4 +
crypto/external/bsd/openssh/dist/pfilter.h | 1 +
crypto/external/bsd/openssh/dist/poly1305.h | 1 +
crypto/external/bsd/openssh/dist/readconf.c | 80 +-
crypto/external/bsd/openssh/dist/readconf.h | 6 +-
crypto/external/bsd/openssh/dist/readpassphrase.c | 3 +-
crypto/external/bsd/openssh/dist/rijndael.c | 3 +
crypto/external/bsd/openssh/dist/rijndael.h | 1 +
crypto/external/bsd/openssh/dist/sandbox-pledge.c | 3 +
crypto/external/bsd/openssh/dist/sc25519.h | 1 +
crypto/external/bsd/openssh/dist/scp.1 | 47 +-
crypto/external/bsd/openssh/dist/scp.c | 231 +-
crypto/external/bsd/openssh/dist/servconf.c | 560 +-
crypto/external/bsd/openssh/dist/servconf.h | 79 +-
crypto/external/bsd/openssh/dist/serverloop.c | 82 +-
crypto/external/bsd/openssh/dist/session.c | 93 +-
crypto/external/bsd/openssh/dist/sftp-client.c | 24 +-
crypto/external/bsd/openssh/dist/sftp.1 | 94 +-
crypto/external/bsd/openssh/dist/sftp.c | 92 +-
crypto/external/bsd/openssh/dist/ssh-add.c | 78 +-
crypto/external/bsd/openssh/dist/ssh-agent.c | 68 +-
crypto/external/bsd/openssh/dist/ssh-dss.c | 91 +-
crypto/external/bsd/openssh/dist/ssh-ecdsa.c | 12 +-
crypto/external/bsd/openssh/dist/ssh-keygen.1 | 31 +-
crypto/external/bsd/openssh/dist/ssh-keygen.c | 103 +-
crypto/external/bsd/openssh/dist/ssh-keyscan.1 | 104 +-
crypto/external/bsd/openssh/dist/ssh-keyscan.c | 42 +-
crypto/external/bsd/openssh/dist/ssh-keysign.c | 12 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c | 9 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c | 183 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11.c | 9 +-
crypto/external/bsd/openssh/dist/ssh-rsa.c | 49 +-
crypto/external/bsd/openssh/dist/ssh-sandbox.h | 1 +
crypto/external/bsd/openssh/dist/ssh.1 | 59 +-
crypto/external/bsd/openssh/dist/ssh.c | 350 +-
crypto/external/bsd/openssh/dist/ssh_config.5 | 54 +-
crypto/external/bsd/openssh/dist/sshbuf.h | 1 +
crypto/external/bsd/openssh/dist/sshconnect.c | 194 +-
crypto/external/bsd/openssh/dist/sshconnect.h | 6 +-
crypto/external/bsd/openssh/dist/sshconnect2.c | 103 +-
crypto/external/bsd/openssh/dist/sshd.8 | 34 +-
crypto/external/bsd/openssh/dist/sshd.c | 202 +-
crypto/external/bsd/openssh/dist/sshd_config | 5 +-
crypto/external/bsd/openssh/dist/sshd_config.5 | 76 +-
crypto/external/bsd/openssh/dist/ssherr.h | 1 +
crypto/external/bsd/openssh/dist/sshkey.c | 764 +-
crypto/external/bsd/openssh/dist/sshkey.h | 42 +-
crypto/external/bsd/openssh/dist/ttymodes.c | 17 +-
crypto/external/bsd/openssh/dist/umac.c | 200 +-
crypto/external/bsd/openssh/dist/umac128.c | 14 +-
crypto/external/bsd/openssh/dist/utf8.h | 1 +
crypto/external/bsd/openssh/dist/version.h | 8 +-
crypto/external/bsd/openssh/lib/Makefile | 19 +-
crypto/external/bsd/openssh/lib/shlib_version | 4 +-
crypto/external/bsd/openssl.old/mkpc | 6 +-
crypto/external/bsd/openssl/dist/.travis.yml | 2 +-
crypto/external/bsd/openssl/dist/CHANGES | 80 +-
crypto/external/bsd/openssl/dist/Configurations/10-main.conf | 44 +-
crypto/external/bsd/openssl/dist/Configurations/README | 27 +-
crypto/external/bsd/openssl/dist/Configurations/common.tmpl | 6 +-
crypto/external/bsd/openssl/dist/Configurations/descrip.mms.tmpl | 4 +
crypto/external/bsd/openssl/dist/Configurations/unix-Makefile.tmpl | 67 +-
crypto/external/bsd/openssl/dist/Configurations/windows-makefile.tmpl | 15 +-
crypto/external/bsd/openssl/dist/Configure | 127 +-
crypto/external/bsd/openssl/dist/LICENSE | 2 +-
crypto/external/bsd/openssl/dist/NEWS | 7 +
crypto/external/bsd/openssl/dist/README | 2 +-
crypto/external/bsd/openssl/dist/apps/CA.pl.in | 6 +-
crypto/external/bsd/openssl/dist/apps/app_rand.c | 4 +-
crypto/external/bsd/openssl/dist/apps/apps.c | 48 +-
crypto/external/bsd/openssl/dist/apps/apps.h | 13 +-
crypto/external/bsd/openssl/dist/apps/ca.c | 292 +-
crypto/external/bsd/openssl/dist/apps/ciphers.c | 2 +-
crypto/external/bsd/openssl/dist/apps/cms.c | 10 +-
crypto/external/bsd/openssl/dist/apps/dhparam.c | 4 +-
crypto/external/bsd/openssl/dist/apps/dsa.c | 3 +
crypto/external/bsd/openssl/dist/apps/dsaparam.c | 11 +-
crypto/external/bsd/openssl/dist/apps/ecparam.c | 20 +-
crypto/external/bsd/openssl/dist/apps/enc.c | 28 +-
crypto/external/bsd/openssl/dist/apps/errstr.c | 2 +-
crypto/external/bsd/openssl/dist/apps/genrsa.c | 14 +-
crypto/external/bsd/openssl/dist/apps/ocsp.c | 4 +-
crypto/external/bsd/openssl/dist/apps/openssl.c | 19 +-
crypto/external/bsd/openssl/dist/apps/opt.c | 18 +-
crypto/external/bsd/openssl/dist/apps/passwd.c | 20 +-
crypto/external/bsd/openssl/dist/apps/pkcs12.c | 10 +-
crypto/external/bsd/openssl/dist/apps/pkcs8.c | 4 +-
crypto/external/bsd/openssl/dist/apps/pkeyutl.c | 43 +-
crypto/external/bsd/openssl/dist/apps/prime.c | 12 +-
crypto/external/bsd/openssl/dist/apps/progs.pl | 6 +-
crypto/external/bsd/openssl/dist/apps/rand.c | 12 +-
crypto/external/bsd/openssl/dist/apps/req.c | 36 +-
crypto/external/bsd/openssl/dist/apps/s_client.c | 39 +-
crypto/external/bsd/openssl/dist/apps/s_server.c | 27 +-
crypto/external/bsd/openssl/dist/apps/s_socket.c | 53 +-
crypto/external/bsd/openssl/dist/apps/s_time.c | 97 +-
crypto/external/bsd/openssl/dist/apps/speed.c | 29 +-
crypto/external/bsd/openssl/dist/apps/srp.c | 23 +-
crypto/external/bsd/openssl/dist/apps/version.c | 9 +-
crypto/external/bsd/openssl/dist/apps/vms_term_sock.c | 12 +-
crypto/external/bsd/openssl/dist/apps/x509.c | 18 +-
crypto/external/bsd/openssl/dist/config.com | 8 +-
crypto/external/bsd/openssl/dist/crypto/aes/asm/aes-armv4.pl | 14 +-
crypto/external/bsd/openssl/dist/crypto/aes/asm/bsaes-armv7.pl | 14 +-
crypto/external/bsd/openssl/dist/crypto/asn1/a_i2d_fp.c | 3 +
crypto/external/bsd/openssl/dist/crypto/asn1/a_mbstr.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/asn1/a_object.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/asn1/a_strex.c | 23 +-
crypto/external/bsd/openssl/dist/crypto/asn1/ameth_lib.c | 26 +-
crypto/external/bsd/openssl/dist/crypto/asn1/asn1_err.c | 3 +-
crypto/external/bsd/openssl/dist/crypto/asn1/asn1_par.c | 8 +-
crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c | 3 +-
crypto/external/bsd/openssl/dist/crypto/asn1/bio_asn1.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/asn1/tasn_dec.c | 49 +-
crypto/external/bsd/openssl/dist/crypto/asn1/tasn_prn.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/async/arch/async_posix.h | 4 +-
crypto/external/bsd/openssl/dist/crypto/async/async.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/async/async_wait.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/bio/b_addr.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/bio/b_dump.c | 43 +-
crypto/external/bsd/openssl/dist/crypto/bio/b_print.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/bio/b_sock2.c | 15 +-
crypto/external/bsd/openssl/dist/crypto/bio/bf_buff.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/bio/bf_lbuf.c | 11 +-
crypto/external/bsd/openssl/dist/crypto/bio/bf_nbio.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/bio/bf_null.c | 32 +-
crypto/external/bsd/openssl/dist/crypto/bio/bio_cb.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/bio/bio_err.c | 3 +-
crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c | 8 +-
crypto/external/bsd/openssl/dist/crypto/bio/bio_meth.c | 19 +-
crypto/external/bsd/openssl/dist/crypto/bio/bss_acpt.c | 11 +-
crypto/external/bsd/openssl/dist/crypto/bio/bss_conn.c | 20 +-
crypto/external/bsd/openssl/dist/crypto/bio/bss_dgram.c | 9 +-
crypto/external/bsd/openssl/dist/crypto/bio/bss_fd.c | 5 +-
crypto/external/bsd/openssl/dist/crypto/bio/bss_file.c | 14 +-
crypto/external/bsd/openssl/dist/crypto/bio/bss_log.c | 11 +-
crypto/external/bsd/openssl/dist/crypto/bio/bss_mem.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/bio/bss_null.c | 23 +-
crypto/external/bsd/openssl/dist/crypto/bio/bss_sock.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/bn/asm/rsaz-avx2.pl | 15 +-
crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-gcc.c | 14 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_add.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c | 8 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c | 112 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_mont.c | 61 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_print.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/cms/cms_sd.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/comp/c_zlib.c | 8 +-
crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/conf/conf_mod.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/cryptlib.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/des/ecb_enc.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/des/fcrypt.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/des/set_key.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/dsa/dsa_ameth.c | 8 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec_mult.c | 12 +-
crypto/external/bsd/openssl/dist/crypto/ec/ecp_nistp224.c | 7 +-
crypto/external/bsd/openssl/dist/crypto/ec/ecp_nistp256.c | 35 +-
crypto/external/bsd/openssl/dist/crypto/ec/ecp_nistp521.c | 15 +-
crypto/external/bsd/openssl/dist/crypto/ec/ecp_smpl.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/engine/eng_cryptodev.c | 13 +-
crypto/external/bsd/openssl/dist/crypto/engine/eng_fat.c | 1 +
crypto/external/bsd/openssl/dist/crypto/engine/eng_table.c | 7 +-
crypto/external/bsd/openssl/dist/crypto/err/err.c | 8 +
crypto/external/bsd/openssl/dist/crypto/err/err_prn.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/evp/bio_b64.c | 17 +-
crypto/external/bsd/openssl/dist/crypto/evp/bio_enc.c | 7 +-
crypto/external/bsd/openssl/dist/crypto/evp/bio_md.c | 7 +-
crypto/external/bsd/openssl/dist/crypto/evp/bio_ok.c | 7 +-
crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/evp/e_camellia.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/evp/evp_enc.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/evp/evp_err.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/evp/evp_pbe.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c | 21 +-
crypto/external/bsd/openssl/dist/crypto/evp/p5_crpt2.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/include/internal/evp_int.h | 4 +-
crypto/external/bsd/openssl/dist/crypto/init.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/lhash/lhash.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/mem.c | 12 +-
crypto/external/bsd/openssl/dist/crypto/mem_dbg.c | 8 +-
crypto/external/bsd/openssl/dist/crypto/mem_sec.c | 17 +-
crypto/external/bsd/openssl/dist/crypto/objects/obj_dat.c | 29 +-
crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_lcl.h | 16 +
crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_vfy.c | 9 +
crypto/external/bsd/openssl/dist/crypto/pariscid.pl | 4 +-
crypto/external/bsd/openssl/dist/crypto/pem/pem_info.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/pem/pem_lib.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/pem/pvkfmt.c | 22 +-
crypto/external/bsd/openssl/dist/crypto/pkcs7/pk7_doit.c | 10 +-
crypto/external/bsd/openssl/dist/crypto/rand/md_rand.c | 10 +-
crypto/external/bsd/openssl/dist/crypto/rand/rand_egd.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/rand/rand_unix.c | 10 +-
crypto/external/bsd/openssl/dist/crypto/rc4/asm/rc4-c64xplus.pl | 4 +-
crypto/external/bsd/openssl/dist/crypto/rc4/build.info | 2 +-
crypto/external/bsd/openssl/dist/crypto/rsa/rsa_ameth.c | 5 +-
crypto/external/bsd/openssl/dist/crypto/rsa/rsa_gen.c | 34 +-
crypto/external/bsd/openssl/dist/crypto/rsa/rsa_pss.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/x509/t_x509.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/x509/x509_v3.c | 5 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/v3_alt.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/v3_conf.c | 10 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/v3_info.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/v3_lib.c | 25 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/v3_purp.c | 9 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/v3_utl.c | 42 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/v3err.c | 3 +-
crypto/external/bsd/openssl/dist/demos/bio/cmod.cnf | 2 +-
crypto/external/bsd/openssl/dist/doc/apps/ca.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/apps/cms.pod | 2 +-
crypto/external/bsd/openssl/dist/doc/apps/ecparam.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/apps/engine.pod | 12 +-
crypto/external/bsd/openssl/dist/doc/apps/openssl.pod | 2 +-
crypto/external/bsd/openssl/dist/doc/apps/x509.pod | 20 +-
crypto/external/bsd/openssl/dist/doc/apps/x509v3_config.pod | 2 +-
crypto/external/bsd/openssl/dist/doc/crypto/ASN1_STRING_length.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/crypto/BIO_ctrl.pod | 10 +-
crypto/external/bsd/openssl/dist/doc/crypto/BIO_meth_new.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/crypto/BIO_s_mem.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/crypto/BIO_set_callback.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/crypto/BN_zero.pod | 23 +-
crypto/external/bsd/openssl/dist/doc/crypto/EC_POINT_new.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/crypto/ENGINE_add.pod | 12 +-
crypto/external/bsd/openssl/dist/doc/crypto/EVP_CIPHER_meth_new.pod | 31 +-
crypto/external/bsd/openssl/dist/doc/crypto/EVP_EncryptInit.pod | 20 +-
crypto/external/bsd/openssl/dist/doc/crypto/EVP_MD_meth_new.pod | 17 +-
crypto/external/bsd/openssl/dist/doc/crypto/EVP_SignInit.pod | 7 +-
crypto/external/bsd/openssl/dist/doc/crypto/EVP_VerifyInit.pod | 7 +-
crypto/external/bsd/openssl/dist/doc/crypto/OCSP_resp_find_status.pod | 15 +-
crypto/external/bsd/openssl/dist/doc/crypto/OPENSSL_VERSION_NUMBER.pod | 7 +-
crypto/external/bsd/openssl/dist/doc/crypto/PKCS7_sign.pod | 2 +-
crypto/external/bsd/openssl/dist/doc/crypto/PKCS7_sign_add_signer.pod | 2 +-
crypto/external/bsd/openssl/dist/doc/crypto/X509_VERIFY_PARAM_set_flags.pod | 30 +-
crypto/external/bsd/openssl/dist/doc/crypto/X509_get0_notBefore.pod | 2 +-
crypto/external/bsd/openssl/dist/doc/crypto/X509_get_extension_flags.pod | 8 +-
crypto/external/bsd/openssl/dist/doc/crypto/d2i_X509.pod | 24 +-
crypto/external/bsd/openssl/dist/doc/openssl-c-indent.el | 2 +-
crypto/external/bsd/openssl/dist/doc/ssl/SSL_CONF_cmd.pod | 14 +-
crypto/external/bsd/openssl/dist/doc/ssl/SSL_CTX_config.pod | 2 +-
crypto/external/bsd/openssl/dist/doc/ssl/SSL_CTX_dane_enable.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/ssl/SSL_CTX_set_options.pod | 9 +-
crypto/external/bsd/openssl/dist/doc/ssl/ssl.pod | 10 +-
crypto/external/bsd/openssl/dist/engines/afalg/e_afalg.c | 12 +-
crypto/external/bsd/openssl/dist/engines/e_dasync.c | 4 +-
crypto/external/bsd/openssl/dist/include/internal/bio.h | 6 +-
crypto/external/bsd/openssl/dist/include/openssl/asn1.h | 3 +-
crypto/external/bsd/openssl/dist/include/openssl/bio.h | 13 +-
crypto/external/bsd/openssl/dist/include/openssl/e_os2.h | 3 +-
crypto/external/bsd/openssl/dist/include/openssl/evp.h | 3 +-
crypto/external/bsd/openssl/dist/include/openssl/ocsp.h | 18 +-
crypto/external/bsd/openssl/dist/include/openssl/opensslconf.h.in | 4 +-
crypto/external/bsd/openssl/dist/include/openssl/opensslv.h | 13 +-
crypto/external/bsd/openssl/dist/include/openssl/ssl.h | 35 +-
crypto/external/bsd/openssl/dist/include/openssl/x509v3.h | 4 +-
crypto/external/bsd/openssl/dist/ssl/bio_ssl.c | 29 +-
crypto/external/bsd/openssl/dist/ssl/record/rec_layer_d1.c | 29 +-
crypto/external/bsd/openssl/dist/ssl/record/rec_layer_s3.c | 52 +-
crypto/external/bsd/openssl/dist/ssl/record/ssl3_record.c | 15 +-
crypto/external/bsd/openssl/dist/ssl/s3_lib.c | 20 +-
crypto/external/bsd/openssl/dist/ssl/s3_msg.c | 27 +-
crypto/external/bsd/openssl/dist/ssl/ssl_cert.c | 6 +-
crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c | 6 +-
crypto/external/bsd/openssl/dist/ssl/ssl_conf.c | 6 +-
crypto/external/bsd/openssl/dist/ssl/ssl_err.c | 7 +-
crypto/external/bsd/openssl/dist/ssl/ssl_init.c | 6 +-
crypto/external/bsd/openssl/dist/ssl/ssl_lib.c | 118 +-
crypto/external/bsd/openssl/dist/ssl/ssl_locl.h | 2 +-
crypto/external/bsd/openssl/dist/ssl/ssl_sess.c | 6 +-
crypto/external/bsd/openssl/dist/ssl/statem/statem.c | 10 +-
crypto/external/bsd/openssl/dist/ssl/statem/statem_clnt.c | 2 +-
crypto/external/bsd/openssl/dist/ssl/statem/statem_dtls.c | 30 +-
crypto/external/bsd/openssl/dist/ssl/statem/statem_lib.c | 45 +-
crypto/external/bsd/openssl/dist/ssl/statem/statem_locl.h | 3 +-
crypto/external/bsd/openssl/dist/ssl/t1_lib.c | 19 +-
crypto/external/bsd/openssl/dist/ssl/t1_trce.c | 6 +-
crypto/external/bsd/openssl/dist/test/asynciotest.c | 5 +-
crypto/external/bsd/openssl/dist/test/bad_dtls_test.c | 2 +-
crypto/external/bsd/openssl/dist/test/bftest.c | 2 +-
crypto/external/bsd/openssl/dist/test/bntest.c | 2 +-
crypto/external/bsd/openssl/dist/test/build.info | 13 +-
crypto/external/bsd/openssl/dist/test/clienthellotest.c | 8 +-
crypto/external/bsd/openssl/dist/test/d2i_test.c | 2 +-
crypto/external/bsd/openssl/dist/test/dhtest.c | 2 +-
crypto/external/bsd/openssl/dist/test/dsatest.c | 2 +-
crypto/external/bsd/openssl/dist/test/dtlstest.c | 7 +-
crypto/external/bsd/openssl/dist/test/ectest.c | 14 +-
crypto/external/bsd/openssl/dist/test/exptest.c | 8 +-
crypto/external/bsd/openssl/dist/test/fatalerrtest.c | 125 +
crypto/external/bsd/openssl/dist/test/generate_ssl_tests.pl | 2 +-
crypto/external/bsd/openssl/dist/test/handshake_helper.c | 32 +-
crypto/external/bsd/openssl/dist/test/igetest.c | 134 +-
crypto/external/bsd/openssl/dist/test/ocspapitest.c | 168 +
crypto/external/bsd/openssl/dist/test/recipes/04-test_pem.t | 6 +-
crypto/external/bsd/openssl/dist/test/recipes/40-test_rehash.t | 9 +-
crypto/external/bsd/openssl/dist/test/recipes/70-test_sslcbcpadding.t | 4 +-
crypto/external/bsd/openssl/dist/test/recipes/70-test_sslcertstatus.t | 4 +-
crypto/external/bsd/openssl/dist/test/recipes/70-test_sslextension.t | 4 +-
crypto/external/bsd/openssl/dist/test/recipes/70-test_sslmessages.t | 6 +-
crypto/external/bsd/openssl/dist/test/recipes/70-test_sslrecords.t | 4 +-
crypto/external/bsd/openssl/dist/test/recipes/70-test_sslsessiontick.t | 4 +-
crypto/external/bsd/openssl/dist/test/recipes/70-test_sslskewith0p.t | 4 +-
crypto/external/bsd/openssl/dist/test/recipes/70-test_sslvertol.t | 4 +-
crypto/external/bsd/openssl/dist/test/recipes/70-test_tlsextms.t | 4 +-
crypto/external/bsd/openssl/dist/test/recipes/80-test_ocsp.t | 11 +-
crypto/external/bsd/openssl/dist/test/recipes/80-test_ocsp_data/cert.pem | 19 +
crypto/external/bsd/openssl/dist/test/recipes/80-test_ocsp_data/key.pem | 28 +
crypto/external/bsd/openssl/dist/test/recipes/80-test_pkcs12.t | 6 +-
crypto/external/bsd/openssl/dist/test/recipes/80-test_ssl_new.t | 5 +-
crypto/external/bsd/openssl/dist/test/recipes/80-test_ssl_old.t | 7 +-
crypto/external/bsd/openssl/dist/test/recipes/90-test_fatalerr.t | 21 +
crypto/external/bsd/openssl/dist/test/recipes/tconversion.pl | 3 +-
crypto/external/bsd/openssl/dist/test/rsa_test.c | 2 +-
crypto/external/bsd/openssl/dist/test/run_tests.pl | 9 +-
crypto/external/bsd/openssl/dist/test/sanitytest.c | 2 +-
crypto/external/bsd/openssl/dist/test/shlibloadtest.c | 18 +-
crypto/external/bsd/openssl/dist/test/ssl-tests/06-sni-ticket.conf.in | 2 +-
crypto/external/bsd/openssl/dist/test/ssl-tests/08-npn.conf.in | 2 +-
crypto/external/bsd/openssl/dist/test/ssl-tests/09-alpn.conf.in | 2 +-
crypto/external/bsd/openssl/dist/test/ssl-tests/12-ct.conf.in | 2 +-
crypto/external/bsd/openssl/dist/test/ssl-tests/13-fragmentation.conf.in | 2 +-
crypto/external/bsd/openssl/dist/test/ssl-tests/17-renegotiate.conf | 118 +-
crypto/external/bsd/openssl/dist/test/ssl-tests/17-renegotiate.conf.in | 60 +-
crypto/external/bsd/openssl/dist/test/ssl_test.c | 14 +-
crypto/external/bsd/openssl/dist/test/sslapitest.c | 37 +-
crypto/external/bsd/openssl/dist/test/sslcorrupttest.c | 7 +-
crypto/external/bsd/openssl/dist/test/ssltest_old.c | 67 +-
crypto/external/bsd/openssl/dist/test/ssltestlib.c | 27 +-
crypto/external/bsd/openssl/dist/test/ssltestlib.h | 3 +-
crypto/external/bsd/openssl/dist/test/testlib/OpenSSL/Test.pm | 1050 -
crypto/external/bsd/openssl/dist/test/testlib/OpenSSL/Test/Simple.pm | 91 -
crypto/external/bsd/openssl/dist/test/testlib/OpenSSL/Test/Utils.pm | 240 -
crypto/external/bsd/openssl/dist/util/TLSProxy/ClientHello.pm | 242 -
crypto/external/bsd/openssl/dist/util/TLSProxy/Message.pm | 456 -
crypto/external/bsd/openssl/dist/util/TLSProxy/NewSessionTicket.pm | 81 -
crypto/external/bsd/openssl/dist/util/TLSProxy/Proxy.pm | 546 -
crypto/external/bsd/openssl/dist/util/TLSProxy/Record.pm | 330 -
crypto/external/bsd/openssl/dist/util/TLSProxy/ServerHello.pm | 210 -
crypto/external/bsd/openssl/dist/util/TLSProxy/ServerKeyExchange.pm | 134 -
crypto/external/bsd/openssl/dist/util/copy.pl | 3 +-
crypto/external/bsd/openssl/dist/util/dofile.pl | 14 +-
crypto/external/bsd/openssl/dist/util/indent.pro | 3 +-
crypto/external/bsd/openssl/dist/util/libcrypto.num | 2 +
crypto/external/bsd/openssl/dist/util/mkdef.pl | 174 +-
crypto/external/bsd/openssl/dist/util/perl/OpenSSL/Glob.pm | 21 +
crypto/external/bsd/openssl/dist/util/perl/OpenSSL/Test.pm | 1051 +
crypto/external/bsd/openssl/dist/util/perl/OpenSSL/Test/Simple.pm | 91 +
crypto/external/bsd/openssl/dist/util/perl/OpenSSL/Test/Utils.pm | 240 +
crypto/external/bsd/openssl/dist/util/perl/TLSProxy/ClientHello.pm | 242 +
crypto/external/bsd/openssl/dist/util/perl/TLSProxy/Message.pm | 456 +
crypto/external/bsd/openssl/dist/util/perl/TLSProxy/NewSessionTicket.pm | 81 +
crypto/external/bsd/openssl/dist/util/perl/TLSProxy/Proxy.pm | 553 +
crypto/external/bsd/openssl/dist/util/perl/TLSProxy/Record.pm | 339 +
crypto/external/bsd/openssl/dist/util/perl/TLSProxy/ServerHello.pm | 210 +
crypto/external/bsd/openssl/dist/util/perl/TLSProxy/ServerKeyExchange.pm | 134 +
crypto/external/bsd/openssl/dist/util/perl/with_fallback.pm | 25 +
crypto/external/bsd/openssl/dist/util/process_docs.pl | 4 +-
crypto/external/bsd/openssl/dist/util/shlib_wrap.sh.in | 20 +
crypto/external/bsd/openssl/dist/util/with_fallback.pm | 24 -
crypto/external/bsd/openssl/lib/libcrypto/Makefile | 3 +-
crypto/external/bsd/openssl/lib/libcrypto/libc-sha512.c | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/sha.inc | 3 +-
crypto/external/bsd/openssl/mkpc | 6 +-
distrib/evbarm/Makefile | 4 +-
distrib/evbarm/instkernel/ramdisk/Makefile | 12 +-
distrib/evbarm64/ramdisk/Makefile | 40 -
distrib/evbarm64/ramdisk/dot.profile | 64 -
distrib/evbarm64/ramdisk/list | 86 -
distrib/sets/lists/base/ad.aarch64 | 4 +-
distrib/sets/lists/base/shl.mi | 6 +-
distrib/sets/lists/comp/ad.aarch64 | 20 +-
distrib/sets/lists/comp/mi | 5 +-
distrib/sets/lists/debug/ad.aarch64 | 4 +-
distrib/sets/lists/debug/mi | 4 +-
distrib/sets/lists/debug/shl.mi | 4 +-
distrib/sets/lists/tests/mi | 18 +-
distrib/utils/embedded/conf/arm64.conf | 116 +
distrib/utils/embedded/files/arm64_extlinux.conf | 12 +
doc/3RDPARTY | 18 +-
doc/CHANGES | 7 +-
etc/Makefile | 5 +-
etc/etc.evbarm/Makefile.inc | 12 +-
etc/rc.d/sshd | 3 +-
etc/rc.subr | 6 +-
external/bsd/dhcpcd/dist/configure | 57 +-
external/bsd/dhcpcd/dist/src/defs.h | 2 +-
external/bsd/dhcpcd/dist/src/dev/udev.c | 23 +-
external/bsd/dhcpcd/dist/src/dhcp6.c | 11 +-
external/bsd/dhcpcd/dist/src/dhcpcd.c | 24 +-
external/bsd/dhcpcd/dist/src/if-options.c | 27 +-
external/bsd/dhcpcd/dist/src/if-options.h | 2 +-
external/bsd/dhcpcd/dist/src/if.c | 2 +-
external/bsd/dhcpcd/dist/src/ipv4.c | 6 +-
external/bsd/dhcpcd/dist/src/route.c | 44 +-
external/bsd/dhcpcd/dist/src/route.h | 3 +
external/bsd/ntp/dist/ChangeLog | 105 +-
external/bsd/ntp/dist/Makefile.am | 2 +-
external/bsd/ntp/dist/Makefile.in | 3 +-
external/bsd/ntp/dist/NEWS | 333 +-
external/bsd/ntp/dist/aclocal.m4 | 1 +
external/bsd/ntp/dist/adjtimed/Makefile.in | 2 +-
external/bsd/ntp/dist/clockstuff/Makefile.in | 2 +-
external/bsd/ntp/dist/configure | 86 +-
external/bsd/ntp/dist/configure.ac | 2 +
external/bsd/ntp/dist/html/access.html | 4 +-
external/bsd/ntp/dist/html/accopt.html | 182 +-
external/bsd/ntp/dist/html/authentic.html | 38 +-
external/bsd/ntp/dist/html/drivers/driver18.html | 4 +-
external/bsd/ntp/dist/html/drivers/driver40-ja.html | 5 +-
external/bsd/ntp/dist/html/drivers/driver40.html | 5 +-
external/bsd/ntp/dist/html/keygen.html | 464 +-
external/bsd/ntp/dist/html/miscopt.html | 12 +-
external/bsd/ntp/dist/html/monopt.html | 28 +-
external/bsd/ntp/dist/html/ntpq.html | 17 +-
external/bsd/ntp/dist/include/Makefile.in | 1 +
external/bsd/ntp/dist/include/isc/Makefile.in | 1 +
external/bsd/ntp/dist/include/ntp.h | 70 +-
external/bsd/ntp/dist/include/ntp_calendar.h | 25 +-
external/bsd/ntp/dist/include/ntp_config.h | 23 +-
external/bsd/ntp/dist/include/ntp_fp.h | 3 +-
external/bsd/ntp/dist/include/ntp_keyacc.h | 10 +-
external/bsd/ntp/dist/include/ntp_request.h | 11 +-
external/bsd/ntp/dist/include/ntp_stdlib.h | 6 +-
external/bsd/ntp/dist/include/ntpd.h | 44 +-
external/bsd/ntp/dist/include/recvbuff.h | 7 +-
external/bsd/ntp/dist/include/ssl_applink.c | 24 +-
external/bsd/ntp/dist/kernel/Makefile.in | 1 +
external/bsd/ntp/dist/kernel/sys/Makefile.in | 1 +
external/bsd/ntp/dist/libntp/Makefile.in | 1 +
external/bsd/ntp/dist/libntp/a_md5encrypt.c | 250 +-
external/bsd/ntp/dist/libntp/adjtime.c | 6 +-
external/bsd/ntp/dist/libntp/authkeys.c | 128 +-
external/bsd/ntp/dist/libntp/authreadkeys.c | 54 +-
external/bsd/ntp/dist/libntp/libssl_compat.c | 7 +-
external/bsd/ntp/dist/libntp/ntp_calendar.c | 111 +-
external/bsd/ntp/dist/libntp/ssl_init.c | 116 +-
external/bsd/ntp/dist/libntp/statestr.c | 286 +-
external/bsd/ntp/dist/libntp/systime.c | 340 +-
external/bsd/ntp/dist/libntp/work_thread.c | 4 +-
external/bsd/ntp/dist/libparse/Makefile.in | 2 +-
external/bsd/ntp/dist/ntpd/Makefile.in | 2 +-
external/bsd/ntp/dist/ntpd/complete.conf.in | 16 +-
external/bsd/ntp/dist/ntpd/invoke-ntp.conf.texi | 290 +-
external/bsd/ntp/dist/ntpd/invoke-ntp.keys.texi | 14 +-
external/bsd/ntp/dist/ntpd/invoke-ntpd.texi | 4 +-
external/bsd/ntp/dist/ntpd/keyword-gen-utd | 2 +-
external/bsd/ntp/dist/ntpd/keyword-gen.c | 6 +-
external/bsd/ntp/dist/ntpd/ntp.conf.5man | 340 +-
external/bsd/ntp/dist/ntpd/ntp.conf.5mdoc | 342 +-
external/bsd/ntp/dist/ntpd/ntp.conf.def | 338 +-
external/bsd/ntp/dist/ntpd/ntp.conf.html | 356 +-
external/bsd/ntp/dist/ntpd/ntp.conf.man.in | 340 +-
external/bsd/ntp/dist/ntpd/ntp.conf.mdoc.in | 342 +-
external/bsd/ntp/dist/ntpd/ntp.keys.5man | 16 +-
external/bsd/ntp/dist/ntpd/ntp.keys.5mdoc | 16 +-
external/bsd/ntp/dist/ntpd/ntp.keys.def | 12 +-
external/bsd/ntp/dist/ntpd/ntp.keys.html | 14 +-
external/bsd/ntp/dist/ntpd/ntp.keys.man.in | 16 +-
external/bsd/ntp/dist/ntpd/ntp.keys.mdoc.in | 16 +-
external/bsd/ntp/dist/ntpd/ntp_config.c | 497 +-
external/bsd/ntp/dist/ntpd/ntp_control.c | 495 +-
external/bsd/ntp/dist/ntpd/ntp_crypto.c | 14 +-
external/bsd/ntp/dist/ntpd/ntp_io.c | 72 +-
external/bsd/ntp/dist/ntpd/ntp_keyword.h | 2167 +-
external/bsd/ntp/dist/ntpd/ntp_leapsec.c | 24 +-
external/bsd/ntp/dist/ntpd/ntp_parser.y | 81 +-
external/bsd/ntp/dist/ntpd/ntp_peer.c | 63 +-
external/bsd/ntp/dist/ntpd/ntp_proto.c | 427 +-
external/bsd/ntp/dist/ntpd/ntp_refclock.c | 24 +-
external/bsd/ntp/dist/ntpd/ntp_request.c | 53 +-
external/bsd/ntp/dist/ntpd/ntp_restrict.c | 197 +-
external/bsd/ntp/dist/ntpd/ntp_scanner.c | 3 +-
external/bsd/ntp/dist/ntpd/ntp_util.c | 22 +-
external/bsd/ntp/dist/ntpd/ntpd-opts.c | 16 +-
external/bsd/ntp/dist/ntpd/ntpd-opts.h | 8 +-
external/bsd/ntp/dist/ntpd/ntpd.1ntpdman | 6 +-
external/bsd/ntp/dist/ntpd/ntpd.1ntpdmdoc | 4 +-
external/bsd/ntp/dist/ntpd/ntpd.c | 17 +-
external/bsd/ntp/dist/ntpd/ntpd.html | 4 +-
external/bsd/ntp/dist/ntpd/ntpd.man.in | 6 +-
external/bsd/ntp/dist/ntpd/ntpd.mdoc.in | 4 +-
external/bsd/ntp/dist/ntpd/ntpsim.c | 3 +-
external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c | 6 +-
external/bsd/ntp/dist/ntpd/refclock_jjy.c | 30 +-
external/bsd/ntp/dist/ntpd/refclock_palisade.c | 126 +-
external/bsd/ntp/dist/ntpd/refclock_parse.c | 15 +-
external/bsd/ntp/dist/ntpdate/Makefile.in | 2 +-
external/bsd/ntp/dist/ntpdc/Makefile.in | 2 +-
external/bsd/ntp/dist/ntpdc/invoke-ntpdc.texi | 4 +-
external/bsd/ntp/dist/ntpdc/layout.std | 19 +-
external/bsd/ntp/dist/ntpdc/ntpdc-opts.c | 16 +-
external/bsd/ntp/dist/ntpdc/ntpdc-opts.h | 8 +-
external/bsd/ntp/dist/ntpdc/ntpdc.1ntpdcman | 6 +-
external/bsd/ntp/dist/ntpdc/ntpdc.1ntpdcmdoc | 4 +-
external/bsd/ntp/dist/ntpdc/ntpdc.c | 6 +-
external/bsd/ntp/dist/ntpdc/ntpdc.html | 4 +-
external/bsd/ntp/dist/ntpdc/ntpdc.man.in | 6 +-
external/bsd/ntp/dist/ntpdc/ntpdc.mdoc.in | 4 +-
external/bsd/ntp/dist/ntpdc/ntpdc_ops.c | 8 +-
external/bsd/ntp/dist/ntpq/Makefile.am | 6 +-
external/bsd/ntp/dist/ntpq/Makefile.in | 26 +-
external/bsd/ntp/dist/ntpq/invoke-ntpq.texi | 502 +-
external/bsd/ntp/dist/ntpq/ntpq-opts.c | 228 +-
external/bsd/ntp/dist/ntpq/ntpq-opts.def | 738 +-
external/bsd/ntp/dist/ntpq/ntpq-opts.h | 8 +-
external/bsd/ntp/dist/ntpq/ntpq-subs.c | 66 +-
external/bsd/ntp/dist/ntpq/ntpq.1ntpqman | 656 +-
external/bsd/ntp/dist/ntpq/ntpq.1ntpqmdoc | 731 +-
external/bsd/ntp/dist/ntpq/ntpq.c | 343 +-
external/bsd/ntp/dist/ntpq/ntpq.html | 429 +-
external/bsd/ntp/dist/ntpq/ntpq.man.in | 656 +-
external/bsd/ntp/dist/ntpq/ntpq.mdoc.in | 731 +-
external/bsd/ntp/dist/ntpq/ntpq.texi | 2 +-
external/bsd/ntp/dist/ntpsnmpd/Makefile.in | 2 +-
external/bsd/ntp/dist/ntpsnmpd/invoke-ntpsnmpd.texi | 2 +-
external/bsd/ntp/dist/ntpsnmpd/netsnmp_daemonize.c | 4 +-
external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c | 16 +-
external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h | 8 +-
external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd.1ntpsnmpdman | 6 +-
external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc | 4 +-
external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd.html | 2 +-
external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd.man.in | 6 +-
external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd.mdoc.in | 4 +-
external/bsd/ntp/dist/packageinfo.sh | 2 +-
external/bsd/ntp/dist/parseutil/Makefile.in | 1 +
external/bsd/ntp/dist/scripts/Makefile.in | 1 +
external/bsd/ntp/dist/scripts/build/Makefile.in | 1 +
external/bsd/ntp/dist/scripts/build/UpdatePoint | 22 +-
external/bsd/ntp/dist/scripts/calc_tickadj/Makefile.in | 1 +
external/bsd/ntp/dist/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman | 6 +-
external/bsd/ntp/dist/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc | 4 +-
external/bsd/ntp/dist/scripts/calc_tickadj/calc_tickadj.html | 2 +-
external/bsd/ntp/dist/scripts/calc_tickadj/calc_tickadj.man.in | 6 +-
external/bsd/ntp/dist/scripts/calc_tickadj/calc_tickadj.mdoc.in | 4 +-
external/bsd/ntp/dist/scripts/calc_tickadj/invoke-calc_tickadj.texi | 2 +-
external/bsd/ntp/dist/scripts/invoke-plot_summary.texi | 4 +-
external/bsd/ntp/dist/scripts/invoke-summary.texi | 4 +-
external/bsd/ntp/dist/scripts/lib/Makefile.in | 1 +
external/bsd/ntp/dist/scripts/ntp-wait/Makefile.in | 1 +
external/bsd/ntp/dist/scripts/ntp-wait/invoke-ntp-wait.texi | 4 +-
external/bsd/ntp/dist/scripts/ntp-wait/ntp-wait-opts | 4 +-
external/bsd/ntp/dist/scripts/ntp-wait/ntp-wait.1ntp-waitman | 6 +-
external/bsd/ntp/dist/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc | 4 +-
external/bsd/ntp/dist/scripts/ntp-wait/ntp-wait.html | 4 +-
external/bsd/ntp/dist/scripts/ntp-wait/ntp-wait.man.in | 6 +-
external/bsd/ntp/dist/scripts/ntp-wait/ntp-wait.mdoc.in | 4 +-
external/bsd/ntp/dist/scripts/ntpsweep/Makefile.in | 1 +
external/bsd/ntp/dist/scripts/ntpsweep/invoke-ntpsweep.texi | 4 +-
external/bsd/ntp/dist/scripts/ntpsweep/ntpsweep-opts | 4 +-
external/bsd/ntp/dist/scripts/ntpsweep/ntpsweep.1ntpsweepman | 6 +-
external/bsd/ntp/dist/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc | 4 +-
external/bsd/ntp/dist/scripts/ntpsweep/ntpsweep.html | 4 +-
external/bsd/ntp/dist/scripts/ntpsweep/ntpsweep.man.in | 6 +-
external/bsd/ntp/dist/scripts/ntpsweep/ntpsweep.mdoc.in | 4 +-
external/bsd/ntp/dist/scripts/ntptrace/Makefile.in | 1 +
external/bsd/ntp/dist/scripts/ntptrace/invoke-ntptrace.texi | 4 +-
external/bsd/ntp/dist/scripts/ntptrace/ntptrace-opts | 4 +-
external/bsd/ntp/dist/scripts/ntptrace/ntptrace.1ntptraceman | 6 +-
external/bsd/ntp/dist/scripts/ntptrace/ntptrace.1ntptracemdoc | 4 +-
external/bsd/ntp/dist/scripts/ntptrace/ntptrace.html | 4 +-
external/bsd/ntp/dist/scripts/ntptrace/ntptrace.man.in | 6 +-
external/bsd/ntp/dist/scripts/ntptrace/ntptrace.mdoc.in | 4 +-
external/bsd/ntp/dist/scripts/plot_summary-opts | 4 +-
external/bsd/ntp/dist/scripts/plot_summary.1plot_summaryman | 6 +-
external/bsd/ntp/dist/scripts/plot_summary.1plot_summarymdoc | 4 +-
external/bsd/ntp/dist/scripts/plot_summary.html | 4 +-
external/bsd/ntp/dist/scripts/plot_summary.man.in | 6 +-
external/bsd/ntp/dist/scripts/plot_summary.mdoc.in | 4 +-
external/bsd/ntp/dist/scripts/summary-opts | 4 +-
external/bsd/ntp/dist/scripts/summary.1summaryman | 6 +-
external/bsd/ntp/dist/scripts/summary.1summarymdoc | 4 +-
external/bsd/ntp/dist/scripts/summary.html | 4 +-
external/bsd/ntp/dist/scripts/summary.man.in | 6 +-
external/bsd/ntp/dist/scripts/summary.mdoc.in | 4 +-
external/bsd/ntp/dist/scripts/update-leap/Makefile.in | 1 +
external/bsd/ntp/dist/scripts/update-leap/invoke-update-leap.texi | 107 +-
external/bsd/ntp/dist/scripts/update-leap/update-leap-opts | 4 +-
external/bsd/ntp/dist/scripts/update-leap/update-leap.1update-leapman | 6 +-
external/bsd/ntp/dist/scripts/update-leap/update-leap.1update-leapmdoc | 4 +-
external/bsd/ntp/dist/scripts/update-leap/update-leap.html | 53 +-
external/bsd/ntp/dist/scripts/update-leap/update-leap.in | 769 +-
external/bsd/ntp/dist/scripts/update-leap/update-leap.man.in | 6 +-
external/bsd/ntp/dist/scripts/update-leap/update-leap.mdoc.in | 4 +-
external/bsd/ntp/dist/sntp/Makefile.in | 1 -
external/bsd/ntp/dist/sntp/check-libntp.mf | 1 -
external/bsd/ntp/dist/sntp/configure | 56 +-
external/bsd/ntp/dist/sntp/crypto.c | 244 +-
external/bsd/ntp/dist/sntp/crypto.h | 5 +-
external/bsd/ntp/dist/sntp/harden/linux | 4 +-
external/bsd/ntp/dist/sntp/include/version.def | 2 +-
external/bsd/ntp/dist/sntp/include/version.texi | 6 +-
external/bsd/ntp/dist/sntp/invoke-sntp.texi | 50 +-
external/bsd/ntp/dist/sntp/m4/ntp_af_unspec.m4 | 23 +
external/bsd/ntp/dist/sntp/m4/ntp_harden.m4 | 12 +-
external/bsd/ntp/dist/sntp/m4/ntp_libevent.m4 | 8 +-
external/bsd/ntp/dist/sntp/m4/ntp_openssl.m4 | 7 +-
external/bsd/ntp/dist/sntp/m4/version.m4 | 2 +-
external/bsd/ntp/dist/sntp/main.c | 34 +-
external/bsd/ntp/dist/sntp/networking.c | 10 +-
external/bsd/ntp/dist/sntp/sntp-opts.c | 197 +-
external/bsd/ntp/dist/sntp/sntp-opts.def | 1 +
external/bsd/ntp/dist/sntp/sntp-opts.h | 8 +-
external/bsd/ntp/dist/sntp/sntp.1sntpman | 11 +-
external/bsd/ntp/dist/sntp/sntp.1sntpmdoc | 9 +-
external/bsd/ntp/dist/sntp/sntp.html | 50 +-
external/bsd/ntp/dist/sntp/sntp.man.in | 11 +-
external/bsd/ntp/dist/sntp/sntp.mdoc.in | 9 +-
external/bsd/ntp/dist/sntp/tests/Makefile.am | 26 +-
external/bsd/ntp/dist/sntp/tests/Makefile.in | 24 +-
external/bsd/ntp/dist/sntp/tests/crypto.c | 116 +-
external/bsd/ntp/dist/sntp/tests/keyFile.c | 8 +-
external/bsd/ntp/dist/sntp/tests/packetHandling.c | 7 +-
external/bsd/ntp/dist/sntp/tests/packetProcessing.c | 41 +-
external/bsd/ntp/dist/sntp/tests/run-crypto.c | 26 +-
external/bsd/ntp/dist/sntp/tests/run-keyFile.c | 10 +-
external/bsd/ntp/dist/sntp/tests/run-kodDatabase.c | 10 +-
external/bsd/ntp/dist/sntp/tests/run-kodFile.c | 10 +-
external/bsd/ntp/dist/sntp/tests/run-networking.c | 10 +-
external/bsd/ntp/dist/sntp/tests/run-packetHandling.c | 10 +-
external/bsd/ntp/dist/sntp/tests/run-packetProcessing.c | 48 +-
external/bsd/ntp/dist/sntp/tests/run-t-log.c | 10 +-
external/bsd/ntp/dist/sntp/tests/run-utilities.c | 10 +-
external/bsd/ntp/dist/sntp/tests/testconf.yml | 9 +
external/bsd/ntp/dist/sntp/unity/auto/generate_test_runner.rb | 6 +-
external/bsd/ntp/dist/sntp/utilities.c | 4 +-
external/bsd/ntp/dist/sntp/version.c | 4 +-
external/bsd/ntp/dist/tests/Makefile.in | 1 +
external/bsd/ntp/dist/tests/bug-2803/Makefile.am | 14 +-
external/bsd/ntp/dist/tests/bug-2803/Makefile.in | 15 +-
external/bsd/ntp/dist/tests/bug-2803/run-bug-2803.c | 12 +-
external/bsd/ntp/dist/tests/bug-2803/testconf.yml | 9 +
external/bsd/ntp/dist/tests/libntp/Makefile.am | 91 +-
external/bsd/ntp/dist/tests/libntp/Makefile.in | 327 +-
external/bsd/ntp/dist/tests/libntp/a_md5encrypt.c | 14 +-
external/bsd/ntp/dist/tests/libntp/authkeys.c | 220 +-
external/bsd/ntp/dist/tests/libntp/run-a_md5encrypt.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-atoint.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-atouint.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-authkeys.c | 36 +-
external/bsd/ntp/dist/tests/libntp/run-buftvtots.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-calendar.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-caljulian.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-caltontp.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-calyearstart.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-clocktime.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-decodenetnum.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-hextoint.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-hextolfp.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-humandate.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-lfpfunc.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-lfptostr.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-modetoa.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-msyslog.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-netof.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-numtoa.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-numtohost.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-octtoint.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-prettydate.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-recvbuff.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-refidsmear.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-refnumtoa.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-sfptostr.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-socktoa.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-ssl_init.c | 24 +-
external/bsd/ntp/dist/tests/libntp/run-statestr.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-strtolfp.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-timespecops.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-timevalops.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-tsafememcmp.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-tstotv.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-tvtots.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-uglydate.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-vi64ops.c | 10 +-
external/bsd/ntp/dist/tests/libntp/run-ymd2yd.c | 10 +-
external/bsd/ntp/dist/tests/libntp/ssl_init.c | 33 +-
external/bsd/ntp/dist/tests/libntp/testconf.yml | 9 +
external/bsd/ntp/dist/tests/libntp/timespecops.c | 17 +-
external/bsd/ntp/dist/tests/libntp/timevalops.c | 18 +-
external/bsd/ntp/dist/tests/ntpd/Makefile.am | 31 +-
external/bsd/ntp/dist/tests/ntpd/Makefile.in | 29 +-
external/bsd/ntp/dist/tests/ntpd/leapsec.c | 292 +-
external/bsd/ntp/dist/tests/ntpd/ntp_prio_q.c | 42 +-
external/bsd/ntp/dist/tests/ntpd/ntp_restrict.c | 119 +-
external/bsd/ntp/dist/tests/ntpd/rc_cmdlength.c | 9 +-
external/bsd/ntp/dist/tests/ntpd/run-leapsec.c | 77 +-
external/bsd/ntp/dist/tests/ntpd/run-ntp_prio_q.c | 22 +-
external/bsd/ntp/dist/tests/ntpd/run-ntp_restrict.c | 26 +-
external/bsd/ntp/dist/tests/ntpd/run-rc_cmdlength.c | 12 +-
external/bsd/ntp/dist/tests/ntpd/run-t-ntp_scanner.c | 32 +-
external/bsd/ntp/dist/tests/ntpd/run-t-ntp_signd.c | 10 +-
external/bsd/ntp/dist/tests/ntpd/t-ntp_scanner.c | 72 +-
external/bsd/ntp/dist/tests/ntpd/testconf.yml | 9 +
external/bsd/ntp/dist/tests/ntpq/Makefile.am | 13 +-
external/bsd/ntp/dist/tests/ntpq/Makefile.in | 12 +-
external/bsd/ntp/dist/tests/ntpq/run-t-ntpq.c | 10 +-
external/bsd/ntp/dist/tests/ntpq/testconf.yml | 9 +
external/bsd/ntp/dist/tests/sandbox/Makefile.am | 18 +-
external/bsd/ntp/dist/tests/sandbox/Makefile.in | 25 +-
external/bsd/ntp/dist/tests/sandbox/run-modetoa.c | 10 +-
external/bsd/ntp/dist/tests/sandbox/run-uglydate.c | 10 +-
external/bsd/ntp/dist/tests/sandbox/run-ut-2803.c | 10 +-
external/bsd/ntp/dist/tests/sandbox/testconf.yml | 9 +
external/bsd/ntp/dist/tests/sec-2853/Makefile.am | 17 +-
external/bsd/ntp/dist/tests/sec-2853/Makefile.in | 23 +-
external/bsd/ntp/dist/tests/sec-2853/run-sec-2853.c | 10 +-
external/bsd/ntp/dist/tests/sec-2853/testconf.yml | 9 +
external/bsd/ntp/dist/util/Makefile.in | 2 +-
external/bsd/ntp/dist/util/invoke-ntp-keygen.texi | 1123 +-
external/bsd/ntp/dist/util/ntp-keygen-opts.c | 331 +-
external/bsd/ntp/dist/util/ntp-keygen-opts.def | 1106 +-
external/bsd/ntp/dist/util/ntp-keygen-opts.h | 40 +-
external/bsd/ntp/dist/util/ntp-keygen.1ntp-keygenman | 1053 +-
external/bsd/ntp/dist/util/ntp-keygen.1ntp-keygenmdoc | 990 +-
external/bsd/ntp/dist/util/ntp-keygen.html | 1061 +-
external/bsd/ntp/dist/util/ntp-keygen.man.in | 1053 +-
external/bsd/ntp/dist/util/ntp-keygen.mdoc.in | 990 +-
external/bsd/ntp/importdate | 2 +-
external/bsd/ntp/include/config.h | 37 +-
external/bsd/ntp/ntp2netbsd | 4 +-
external/gpl3/gcc/dist/gcc/config/vax/builtins.md | 12 +-
external/gpl3/gcc/dist/gcc/config/vax/predicates.md | 13 +
external/gpl3/gcc/lib/libasan/Makefile | 4 +-
external/gpl3/gcc/usr.bin/backend/Makefile | 26 +-
external/mit/xorg/lib/libxcb/dri3/Makefile | 4 +-
lib/libc/Makefile | 6 +-
lib/libc/shlib_version | 3 +-
lib/libkvm/kvm_aarch64.c | 10 +-
lib/libutil/Makefile | 3 +-
lib/libutil/opendisk.3 | 51 +-
libexec/ld.elf_so/arch/arm/Makefile.inc | 3 +-
libexec/ld.elf_so/arch/arm/mdreloc.c | 30 +-
libexec/ld.elf_so/arch/i386/Makefile.inc | 3 +-
libexec/ld.elf_so/arch/i386/mdreloc.c | 33 +-
libexec/ld.elf_so/arch/powerpc/Makefile.inc | 3 +-
libexec/ld.elf_so/arch/powerpc/ppc_reloc.c | 40 +-
libexec/ld.elf_so/arch/sparc/Makefile.inc | 3 +-
libexec/ld.elf_so/arch/sparc/mdreloc.c | 42 +-
libexec/ld.elf_so/arch/sparc64/Makefile.inc | 3 +-
libexec/ld.elf_so/arch/sparc64/mdreloc.c | 44 +-
libexec/ld.elf_so/arch/x86_64/Makefile.inc | 3 +-
libexec/ld.elf_so/arch/x86_64/mdreloc.c | 33 +-
libexec/ld.elf_so/reloc.c | 94 +-
libexec/ld.elf_so/rtld.c | 6 +-
libexec/ld.elf_so/rtld.h | 6 +-
sbin/disklabel/main.c | 5 +-
sbin/dmesg/dmesg.8 | 9 +-
sbin/dmesg/dmesg.c | 120 +-
sbin/fsck_lfs/bufcache.c | 4 +-
sbin/fsck_lfs/bufcache.h | 4 +-
sbin/mbrlabel/mbrlabel.c | 69 +-
share/man/man4/man4.macppc/awacs.4 | 9 +-
share/man/man4/man4.macppc/obio.4 | 19 +-
share/man/man4/man4.macppc/snapper.4 | 10 +-
share/man/man4/options.4 | 3 +-
share/mk/bsd.README | 4 +-
share/mk/bsd.own.mk | 12 +-
sys/arch/Makefile | 6 +-
sys/arch/aarch64/aarch64/TODO | 16 +
sys/arch/aarch64/aarch64/aarch64_machdep.c | 256 +-
sys/arch/aarch64/aarch64/aarch64_reboot.c | 260 +
sys/arch/aarch64/aarch64/bus_dma.c | 36 -
sys/arch/aarch64/aarch64/bus_space.c | 749 +-
sys/arch/aarch64/aarch64/bus_space_asm_generic.S | 1284 +
sys/arch/aarch64/aarch64/bus_space_notimpl.S | 155 +
sys/arch/aarch64/aarch64/copyinout.S | 314 +
sys/arch/aarch64/aarch64/core_machdep.c | 16 +-
sys/arch/aarch64/aarch64/cpu.c | 450 +
sys/arch/aarch64/aarch64/cpu_machdep.c | 141 +-
sys/arch/aarch64/aarch64/cpufunc.c | 279 +
sys/arch/aarch64/aarch64/cpufunc_asm_armv8.S | 258 +
sys/arch/aarch64/aarch64/cpuswitch.S | 463 +
sys/arch/aarch64/aarch64/db_disasm.c | 63 +-
sys/arch/aarch64/aarch64/db_interface.c | 162 +-
sys/arch/aarch64/aarch64/db_machdep.c | 852 +-
sys/arch/aarch64/aarch64/db_trace.c | 286 +-
sys/arch/aarch64/aarch64/disasm.c | 3655 +
sys/arch/aarch64/aarch64/disasm.h | 41 +
sys/arch/aarch64/aarch64/exception.S | 36 -
sys/arch/aarch64/aarch64/exec_machdep.c | 12 +-
sys/arch/aarch64/aarch64/fault.c | 323 +
sys/arch/aarch64/aarch64/fpu.c | 87 +-
sys/arch/aarch64/aarch64/fusu.S | 168 +
sys/arch/aarch64/aarch64/genassym.cf | 153 +-
sys/arch/aarch64/aarch64/idle_machdep.S | 91 +-
sys/arch/aarch64/aarch64/locore.S | 983 +-
sys/arch/aarch64/aarch64/locore_el2.S | 157 +
sys/arch/aarch64/aarch64/netbsd32_machdep.c | 123 +
sys/arch/aarch64/aarch64/pmap.c | 2160 +-
sys/arch/aarch64/aarch64/process_machdep.c | 27 +-
sys/arch/aarch64/aarch64/sig_machdep.c | 6 +-
sys/arch/aarch64/aarch64/sys_machdep.c | 15 +-
sys/arch/aarch64/aarch64/syscall.c | 17 +-
sys/arch/aarch64/aarch64/trap.c | 649 +-
sys/arch/aarch64/aarch64/vectors.S | 190 +-
sys/arch/aarch64/aarch64/vm_machdep.c | 57 +-
sys/arch/aarch64/conf/Makefile.aarch64 | 15 +-
sys/arch/aarch64/conf/files.aarch64 | 124 +-
sys/arch/aarch64/conf/kern.ldscript | 19 +-
sys/arch/aarch64/conf/std.aarch64 | 11 +-
sys/arch/aarch64/dev/a64gic_mainbus.c | 92 -
sys/arch/aarch64/dev/a64gtmr.c | 315 -
sys/arch/aarch64/dev/a64gtmr_intr.h | 44 -
sys/arch/aarch64/dev/a64gtmr_var.h | 51 -
sys/arch/aarch64/dev/cpu.c | 36 -
sys/arch/aarch64/dev/cpucore.c | 36 -
sys/arch/aarch64/dev/cpunode.c | 36 -
sys/arch/aarch64/dev/mainbus.c | 36 -
sys/arch/aarch64/include/Makefile | 9 +-
sys/arch/aarch64/include/aout_machdep.h | 13 +-
sys/arch/aarch64/include/armreg.h | 747 +-
sys/arch/aarch64/include/asm.h | 102 +-
sys/arch/aarch64/include/bus_defs.h | 378 -
sys/arch/aarch64/include/bus_funcs.h | 568 +-
sys/arch/aarch64/include/cpu.h | 87 +-
sys/arch/aarch64/include/cpufunc.h | 156 +
sys/arch/aarch64/include/db_machdep.h | 180 +-
sys/arch/aarch64/include/disklabel.h | 75 +-
sys/arch/aarch64/include/frame.h | 29 +-
sys/arch/aarch64/include/hypervisor.h | 86 +
sys/arch/aarch64/include/intr.h | 153 -
sys/arch/aarch64/include/locore.h | 127 +-
sys/arch/aarch64/include/machdep.h | 174 +
sys/arch/aarch64/include/mcontext.h | 138 +-
sys/arch/aarch64/include/netbsd32_machdep.h | 72 +
sys/arch/aarch64/include/param.h | 68 +-
sys/arch/aarch64/include/pmap.h | 191 +-
sys/arch/aarch64/include/pmc.h | 11 -
sys/arch/aarch64/include/proc.h | 4 +-
sys/arch/aarch64/include/psl.h | 8 -
sys/arch/aarch64/include/pte.h | 218 +-
sys/arch/aarch64/include/reg.h | 4 +-
sys/arch/aarch64/include/signal.h | 46 +-
sys/arch/aarch64/include/sysarch.h | 6 +-
sys/arch/aarch64/include/trap.h | 8 -
sys/arch/aarch64/include/types.h | 26 +-
sys/arch/aarch64/include/userret.h | 5 +
sys/arch/aarch64/include/vmparam.h | 66 +-
sys/arch/amd64/amd64/db_interface.c | 10 +-
sys/arch/amd64/amd64/genassym.cf | 3 +-
sys/arch/amd64/amd64/locore.S | 2 +-
sys/arch/amd64/amd64/machdep.c | 7 +-
sys/arch/amd64/amd64/spl.S | 20 +-
sys/arch/amd64/amd64/vector.S | 22 +-
sys/arch/arm/arm/cpufunc.c | 23 +-
sys/arch/arm/arm/psci_arm.S | 6 +-
sys/arch/arm/arm32/armv7_generic_space.c | 7 +-
sys/arch/arm/arm32/bus_dma.c | 83 +-
sys/arch/arm/arm32/pmap.c | 18 +-
sys/arch/arm/broadcom/bcm2835_genfb.c | 9 +-
sys/arch/arm/broadcom/bcm2835_space.c | 716 -
sys/arch/arm/broadcom/bcm2835reg.h | 12 +-
sys/arch/arm/broadcom/bcm2835var.h | 6 +-
sys/arch/arm/broadcom/bcm283x_platform.c | 164 +-
sys/arch/arm/broadcom/bcm283x_platform.h | 49 +
sys/arch/arm/broadcom/files.bcm2835 | 45 +-
sys/arch/arm/conf/files.arm | 3 +-
sys/arch/arm/cortex/gic.c | 7 +-
sys/arch/arm/cortex/gtmr.c | 81 +-
sys/arch/arm/fdt/cpu_fdt.c | 16 +-
sys/arch/arm/include/arm32/pmap.h | 11 +-
sys/arch/arm/include/armreg.h | 127 +-
sys/arch/arm/include/asm.h | 72 +-
sys/arch/arm/include/bus_defs.h | 42 +-
sys/arch/arm/include/bus_funcs.h | 67 +-
sys/arch/arm/include/cpu.h | 10 +-
sys/arch/arm/include/cpuconf.h | 23 +-
sys/arch/arm/include/cpufunc.h | 19 +-
sys/arch/arm/include/db_machdep.h | 11 +-
sys/arch/arm/include/disklabel.h | 5 +-
sys/arch/arm/include/locore.h | 10 +-
sys/arch/arm/include/mcontext.h | 164 +-
sys/arch/arm/include/signal.h | 5 +-
sys/arch/arm/nvidia/files.tegra | 13 +-
sys/arch/arm/nvidia/tegra_pcie.c | 6 +-
sys/arch/arm/nvidia/tegra_platform.c | 26 +-
sys/arch/arm/nvidia/tegra_platform.h | 39 +
sys/arch/arm/nvidia/tegra_pmc.c | 9 +-
sys/arch/arm/nvidia/tegra_reg.h | 7 +-
sys/arch/arm/nvidia/tegra_soc.c | 19 +-
sys/arch/arm/nvidia/tegra_timer.c | 7 +-
sys/arch/arm/pic/pic.c | 11 +-
sys/arch/arm/pic/pic_splfuncs.c | 11 +-
sys/arch/arm/sunxi/files.sunxi | 40 +-
sys/arch/arm/sunxi/sun4i_a10_ccu.c | 337 +-
sys/arch/arm/sunxi/sun4i_a10_gpio.c | 68 +-
sys/arch/arm/sunxi/sun50i_a64_gpio.c | 102 +-
sys/arch/arm/sunxi/sun50i_h6_gpio.c | 88 +-
sys/arch/arm/sunxi/sun5i_a13_gpio.c | 34 +-
sys/arch/arm/sunxi/sun6i_a31_gpio.c | 172 +-
sys/arch/arm/sunxi/sun7i_a20_gpio.c | 96 +-
sys/arch/arm/sunxi/sun8i_a83t_gpio.c | 104 +-
sys/arch/arm/sunxi/sun8i_h3_gpio.c | 100 +-
sys/arch/arm/sunxi/sun9i_a80_gpio.c | 176 +-
sys/arch/arm/sunxi/sunxi_ccu.c | 27 +-
sys/arch/arm/sunxi/sunxi_ccu.h | 25 +-
sys/arch/arm/sunxi/sunxi_ccu_display.c | 144 +
sys/arch/arm/sunxi/sunxi_ccu_fractional.c | 58 +-
sys/arch/arm/sunxi/sunxi_debe.c | 896 +
sys/arch/arm/sunxi/sunxi_debereg.h | 138 +
sys/arch/arm/sunxi/sunxi_dep.c | 114 +
sys/arch/arm/sunxi/sunxi_display.h | 39 +
sys/arch/arm/sunxi/sunxi_gpio.c | 8 +-
sys/arch/arm/sunxi/sunxi_hdmi.c | 1229 +
sys/arch/arm/sunxi/sunxi_hdmireg.h | 299 +
sys/arch/arm/sunxi/sunxi_platform.c | 49 +-
sys/arch/arm/sunxi/sunxi_platform.h | 4 +-
sys/arch/arm/sunxi/sunxi_tcon.c | 859 +
sys/arch/arm/sunxi/sunxi_tconreg.h | 125 +
sys/arch/atari/conf/ATARITT | 4 +-
sys/arch/atari/conf/FALCON | 4 +-
sys/arch/atari/conf/HADES | 10 +-
sys/arch/atari/conf/HADES.in | 9 +-
sys/arch/atari/conf/MILAN-ISAIDE | 4 +-
sys/arch/atari/conf/MILAN-PCIIDE | 4 +-
sys/arch/atari/conf/SMALL030 | 4 +-
sys/arch/evbarm/conf/GENERIC | 266 +
sys/arch/evbarm/conf/GENERIC.common | 5 +-
sys/arch/evbarm/conf/GENERIC64 | 291 +
sys/arch/evbarm/conf/RPI64 | 262 +
sys/arch/evbarm/conf/SUNXI | 10 +-
sys/arch/evbarm/conf/files.evbarm | 9 +-
sys/arch/evbarm/conf/files.fdt | 4 +-
sys/arch/evbarm/conf/files.generic | 15 +
sys/arch/evbarm/conf/files.generic64 | 15 +
sys/arch/evbarm/conf/files.rpi | 15 +-
sys/arch/evbarm/conf/files.sunxi | 13 +-
sys/arch/evbarm/conf/files.tegra | 13 +-
sys/arch/evbarm/conf/mk.generic | 32 +
sys/arch/evbarm/conf/mk.generic64 | 23 +
sys/arch/evbarm/conf/std.generic | 33 +
sys/arch/evbarm/conf/std.generic64 | 33 +
sys/arch/evbarm/fdt/fdt_machdep.c | 98 +-
sys/arch/evbarm/fdt/fdt_start.S | 85 +
sys/arch/evbarm/fdt/platform.h | 16 +-
sys/arch/evbarm/include/bootconfig.h | 9 +-
sys/arch/evbarm/include/cpu.h | 6 +-
sys/arch/evbarm/include/cpu_counter.h | 6 +-
sys/arch/evbarm/include/db_machdep.h | 6 +-
sys/arch/evbarm/include/elf_machdep.h | 6 +-
sys/arch/evbarm/include/frame.h | 6 +-
sys/arch/evbarm/include/isa_machdep.h | 6 +-
sys/arch/evbarm/include/lock.h | 6 +-
sys/arch/evbarm/include/netbsd32_machdep.h | 6 +-
sys/arch/evbarm/include/param.h | 6 +-
sys/arch/evbarm/include/pcb.h | 6 +-
sys/arch/evbarm/include/pmap.h | 6 +-
sys/arch/evbarm/include/pmc.h | 4 +-
sys/arch/evbarm/include/proc.h | 6 +-
sys/arch/evbarm/include/profile.h | 6 +-
sys/arch/evbarm/include/ptrace.h | 6 +-
sys/arch/evbarm/include/reg.h | 6 +-
sys/arch/evbarm/include/setjmp.h | 6 +-
sys/arch/evbarm/include/types.h | 8 +-
sys/arch/evbarm/include/vmparam.h | 10 +-
sys/arch/evbarm/rpi/genassym.cf | 3 +-
sys/arch/evbarm/stand/Makefile | 6 +-
sys/arch/evbarm/tegra/tegra_start.S | 5 +-
sys/arch/evbarm64/Makefile | 5 -
sys/arch/evbarm64/a64emul/a64emul_machdep.c | 36 -
sys/arch/evbarm64/a64emul/obio_mainbus.c | 36 -
sys/arch/evbarm64/a64emul/obio_var.h | 48 -
sys/arch/evbarm64/a64emul/plcom_obio.c | 101 -
sys/arch/evbarm64/a64emul/sm_mainbus.c | 36 -
sys/arch/evbarm64/conf/A64EMUL | 250 -
sys/arch/evbarm64/conf/Makefile.evbarm64.inc | 23 -
sys/arch/evbarm64/conf/files.a64emul | 14 -
sys/arch/evbarm64/conf/files.evbarm64 | 8 -
sys/arch/evbarm64/conf/std.a64emul | 14 -
sys/arch/evbarm64/conf/std.evbarm64 | 5 -
sys/arch/evbarm64/include/Makefile | 8 -
sys/arch/evbarm64/include/ansi.h | 3 -
sys/arch/evbarm64/include/asm.h | 3 -
sys/arch/evbarm64/include/bswap.h | 3 -
sys/arch/evbarm64/include/bus_defs.h | 3 -
sys/arch/evbarm64/include/bus_funcs.h | 3 -
sys/arch/evbarm64/include/cdefs.h | 3 -
sys/arch/evbarm64/include/cpu.h | 3 -
sys/arch/evbarm64/include/cpu_counter.h | 3 -
sys/arch/evbarm64/include/db_machdep.h | 3 -
sys/arch/evbarm64/include/disklabel.h | 3 -
sys/arch/evbarm64/include/elf_machdep.h | 3 -
sys/arch/evbarm64/include/endian.h | 3 -
sys/arch/evbarm64/include/endian_machdep.h | 3 -
sys/arch/evbarm64/include/frame.h | 3 -
sys/arch/evbarm64/include/int_const.h | 3 -
sys/arch/evbarm64/include/int_fmtio.h | 3 -
sys/arch/evbarm64/include/int_limits.h | 3 -
sys/arch/evbarm64/include/int_mwgwtypes.h | 3 -
sys/arch/evbarm64/include/int_types.h | 3 -
sys/arch/evbarm64/include/intr.h | 3 -
sys/arch/evbarm64/include/kcore.h | 3 -
sys/arch/evbarm64/include/limits.h | 3 -
sys/arch/evbarm64/include/lock.h | 3 -
sys/arch/evbarm64/include/mcontext.h | 3 -
sys/arch/evbarm64/include/mutex.h | 3 -
sys/arch/evbarm64/include/param.h | 45 -
sys/arch/evbarm64/include/pcb.h | 3 -
sys/arch/evbarm64/include/pmap.h | 7 -
sys/arch/evbarm64/include/pmc.h | 3 -
sys/arch/evbarm64/include/proc.h | 3 -
sys/arch/evbarm64/include/profile.h | 3 -
sys/arch/evbarm64/include/psl.h | 3 -
sys/arch/evbarm64/include/pte.h | 5 -
sys/arch/evbarm64/include/ptrace.h | 3 -
sys/arch/evbarm64/include/reg.h | 3 -
sys/arch/evbarm64/include/rwlock.h | 3 -
sys/arch/evbarm64/include/setjmp.h | 3 -
sys/arch/evbarm64/include/signal.h | 3 -
sys/arch/evbarm64/include/trap.h | 3 -
sys/arch/evbarm64/include/types.h | 10 -
sys/arch/evbarm64/include/vmparam.h | 3 -
sys/arch/evbarm64/include/wchar_limits.h | 3 -
sys/arch/i386/i386/db_interface.c | 10 +-
sys/arch/i386/i386/machdep.c | 11 +-
sys/arch/i386/i386/spl.S | 16 +-
sys/arch/i386/i386/vector.S | 12 +-
sys/arch/i386/stand/efiboot/TODO.efiboot | 1 -
sys/arch/i386/stand/efiboot/boot.c | 10 +-
sys/arch/i386/stand/efiboot/devopen.c | 20 +-
sys/arch/i386/stand/efiboot/devopen.h | 5 +-
sys/arch/i386/stand/efiboot/efidisk.c | 36 +-
sys/arch/i386/stand/efiboot/efidisk.h | 3 +-
sys/arch/i386/stand/lib/biosdisk.c | 6 +-
sys/arch/i386/stand/lib/biosdisk.h | 8 +-
sys/arch/i386/stand/lib/bootmenu.c | 6 +-
sys/arch/i386/stand/lib/bootmenu.h | 4 +-
sys/arch/vax/include/vmparam.h | 4 +-
sys/arch/vax/vax/ctu.c | 16 +-
sys/arch/vax/vax/machdep.c | 15 +-
sys/arch/vax/vax/pmap.c | 34 +-
sys/arch/x86/include/cpu.h | 6 +-
sys/arch/x86/include/intr.h | 6 +-
sys/arch/x86/include/specialreg.h | 25 +-
sys/arch/x86/x86/cpu.c | 5 +-
sys/arch/x86/x86/dbregs.c | 7 +-
sys/arch/x86/x86/identcpu.c | 5 +-
sys/arch/x86/x86/intr.c | 8 +-
sys/arch/x86/x86/lapic.c | 8 +-
sys/arch/x86/x86/spectre.c | 276 +-
sys/arch/x86/x86/svs.c | 17 +-
sys/arch/x86/x86/x86_machdep.c | 33 +-
sys/dev/acpi/acpi_mcfg.c | 7 +-
sys/dev/cardbus/ahc_cardbus.c | 6 +-
sys/dev/clk/clk.c | 14 +-
sys/dev/clk/clk.h | 3 +-
sys/dev/clk/clk_backend.h | 3 +-
sys/dev/fdt/connector_fdt.c | 129 +
sys/dev/fdt/connector_fdt.h | 41 +
sys/dev/fdt/fdt_port.c | 370 +
sys/dev/fdt/fdt_port.h | 108 +
sys/dev/fdt/files.fdt | 12 +-
sys/dev/fdt/panel_fdt.c | 192 +
sys/dev/fdt/panel_fdt.h | 62 +
sys/dev/fdt/simplefb.c | 9 +-
sys/dev/ic/aic7xxx.c | 22 +-
sys/dev/ieee1394/fwohcireg.h | 4 +-
sys/dev/pci/fwohci_pci.c | 12 +-
sys/dev/pci/if_rtwn.c | 6 +-
sys/dev/pci/ixgbe/if_bypass.c | 51 +-
sys/dev/pci/ixgbe/if_fdir.c | 2 +-
sys/dev/pci/ixgbe/if_sriov.c | 14 +-
sys/dev/pci/ixgbe/ix_txrx.c | 65 +-
sys/dev/pci/ixgbe/ixgbe.c | 92 +-
sys/dev/pci/ixgbe/ixgbe.h | 5 +-
sys/dev/pci/ixgbe/ixgbe_82598.c | 7 +-
sys/dev/pci/ixgbe/ixgbe_82598.h | 4 +-
sys/dev/pci/ixgbe/ixgbe_82599.c | 31 +-
sys/dev/pci/ixgbe/ixgbe_82599.h | 4 +-
sys/dev/pci/ixgbe/ixgbe_api.c | 20 +-
sys/dev/pci/ixgbe/ixgbe_api.h | 4 +-
sys/dev/pci/ixgbe/ixgbe_common.c | 45 +-
sys/dev/pci/ixgbe/ixgbe_common.h | 5 +-
sys/dev/pci/ixgbe/ixgbe_dcb.c | 12 +-
sys/dev/pci/ixgbe/ixgbe_dcb.h | 2 +-
sys/dev/pci/ixgbe/ixgbe_dcb_82598.c | 24 +-
sys/dev/pci/ixgbe/ixgbe_dcb_82598.h | 2 +-
sys/dev/pci/ixgbe/ixgbe_dcb_82599.c | 27 +-
sys/dev/pci/ixgbe/ixgbe_dcb_82599.h | 2 +-
sys/dev/pci/ixgbe/ixgbe_fdir.h | 2 +-
sys/dev/pci/ixgbe/ixgbe_mbx.c | 4 +-
sys/dev/pci/ixgbe/ixgbe_mbx.h | 4 +-
sys/dev/pci/ixgbe/ixgbe_osdep.c | 4 +-
sys/dev/pci/ixgbe/ixgbe_osdep.h | 4 +-
sys/dev/pci/ixgbe/ixgbe_phy.c | 23 +-
sys/dev/pci/ixgbe/ixgbe_phy.h | 4 +-
sys/dev/pci/ixgbe/ixgbe_rss.h | 2 +-
sys/dev/pci/ixgbe/ixgbe_sriov.h | 4 +-
sys/dev/pci/ixgbe/ixgbe_type.h | 11 +-
sys/dev/pci/ixgbe/ixgbe_vf.c | 11 +-
sys/dev/pci/ixgbe/ixgbe_vf.h | 4 +-
sys/dev/pci/ixgbe/ixgbe_x540.c | 2 +-
sys/dev/pci/ixgbe/ixgbe_x540.h | 2 +-
sys/dev/pci/ixgbe/ixgbe_x550.c | 29 +-
sys/dev/pci/ixgbe/ixgbe_x550.h | 3 -
sys/dev/pci/ixgbe/ixv.c | 66 +-
sys/dev/pci/pcidevs | 14 +-
sys/dev/pci/pcidevs.h | 16 +-
sys/dev/pci/pcidevs_data.h | 18340 +++++----
sys/dev/tc/stic.c | 6 +-
sys/dev/usb/udl.c | 8 +-
sys/dev/usb/usbdevs | 7 +-
sys/dev/usb/usbdevs.h | 9 +-
sys/dev/usb/usbdevs_data.h | 8456 ++--
sys/external/bsd/drm2/include/drm/bus_dma_hacks.h | 4 +-
sys/kern/subr_log.c | 101 +-
sys/kern/subr_prf.c | 96 +-
sys/kern/sysv_msg.c | 8 +-
sys/kern/tty.c | 8 +-
sys/lib/libsa/bootcfg.c | 14 +-
sys/lib/libsa/bootcfg.h | 4 +-
sys/miscfs/kernfs/kernfs_vnops.c | 9 +-
sys/net/if_ipsec.c | 48 +-
sys/net/if_media.c | 23 +-
sys/net/if_spppsubr.c | 4 +-
sys/net/npf/npf_inet.c | 12 +-
sys/net/route.c | 6 +-
sys/netinet/in.c | 6 +-
sys/netinet/ip_output.c | 6 +-
sys/netinet/ip_var.h | 15 +-
sys/netinet/sctp_output.c | 6 +-
sys/netinet/tcp_input.c | 45 +-
sys/netinet/tcp_output.c | 127 +-
sys/netinet6/in6.c | 8 +-
sys/netipsec/ipsec.c | 83 +-
sys/netipsec/ipsec.h | 9 +-
sys/netipsec/ipsecif.c | 64 +-
sys/netipsec/ipsecif.h | 3 +-
sys/rump/listsrcdirs | 4 +-
sys/rump/net/lib/libshmif/shmif_user.c | 5 +-
sys/sys/msgbuf.h | 8 +-
sys/uvm/uvm_emap.c | 6 +-
sys/uvm/uvm_readahead.c | 6 +-
tests/net/arp/t_arp.sh | 106 +-
tests/net/net_common.sh | 18 +-
tests/usr.bin/c++/Makefile | 14 +-
tests/usr.bin/c++/t_asan_double_free.sh | 212 +
tests/usr.bin/c++/t_asan_global_buffer_overflow.sh | 211 +
tests/usr.bin/c++/t_asan_heap_overflow.sh | 212 +
tests/usr.bin/c++/t_asan_off_by_one.sh | 233 +
tests/usr.bin/c++/t_asan_uaf.sh | 205 +
tests/usr.bin/cc/Makefile | 10 +-
tests/usr.bin/cc/t_asan_double_free.sh | 211 +
tests/usr.bin/cc/t_asan_global_buffer_overflow.sh | 211 +
tests/usr.bin/cc/t_asan_heap_overflow.sh | 212 +
tests/usr.bin/cc/t_asan_off_by_one.sh | 233 +
tests/usr.bin/cc/t_asan_uaf.sh | 205 +
tools/headerlist | 4 +-
usr.bin/make/make.1 | 5 +-
usr.bin/make/parse.c | 85 +-
usr.bin/patch/pch.c | 8 +-
usr.sbin/cpuctl/arch/i386.c | 10 +-
usr.sbin/ofctl/Makefile | 3 +-
usr.sbin/racoon/Makefile | 8 +-
usr.sbin/sysinst/arch/evbarm64/Makefile | 11 -
usr.sbin/sysinst/arch/evbarm64/md.c | 228 -
usr.sbin/sysinst/arch/evbarm64/md.h | 72 -
usr.sbin/sysinst/arch/evbarm64/msg.md.en | 48 -
usr.sbin/tpctl/Makefile | 7 +-
1245 files changed, 70858 insertions(+), 40451 deletions(-)
diffs (truncated from 163360 to 300 lines):
diff -r 4056833fe45d -r 237afe5674df bin/ed/ed.1
--- a/bin/ed/ed.1 Tue Apr 03 08:29:44 2018 +0000
+++ b/bin/ed/ed.1 Sat Apr 07 04:11:47 2018 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: ed.1,v 1.31 2017/07/03 21:33:23 wiz Exp $
+.\" $NetBSD: ed.1,v 1.31.4.1 2018/04/07 04:11:47 pgoyette Exp $
.\" $OpenBSD: ed.1,v 1.42 2003/07/27 13:25:43 jmc Exp $
.\"
.\" Copyright (c) 1993 Andrew Moore, Talke Studio.
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd January 23, 2002
+.Dd April 23, 2002
.Dt ED 1
.Os
.Sh NAME
@@ -34,7 +34,7 @@
.Sh SYNOPSIS
.Nm
.Op Fl
-.Op Fl Esx
+.Op Fl ESsx
.Op Fl p Ar string
.Op Ar file
.Sh DESCRIPTION
@@ -130,6 +130,12 @@
.It Fl E
Enables the use of extended regular expressions instead of the basic
regular expressions that are normally used.
+.It Fl S
+Disables using of the
+.Dq !
+command (execuring a subshell).
+Intended to be used by batch jobs like
+.Xr patch 1 .
.It Fl p Ar string
Specifies a command prompt.
This may be toggled on and off with the
@@ -955,6 +961,7 @@
.Xr sed 1 ,
.Xr sh 1 ,
.Xr vi 1 ,
+.Xr patch 1 ,
.Xr regex 3
.Pp
USD:09-10
diff -r 4056833fe45d -r 237afe5674df bin/ed/main.c
--- a/bin/ed/main.c Tue Apr 03 08:29:44 2018 +0000
+++ b/bin/ed/main.c Sat Apr 07 04:11:47 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.28 2016/03/02 19:11:28 christos Exp $ */
+/* $NetBSD: main.c,v 1.28.14.1 2018/04/07 04:11:47 pgoyette Exp $ */
/* main.c: This file contains the main control and user-interface routines
for the ed line editor. */
@@ -39,7 +39,7 @@
#if 0
static char *rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
#else
-__RCSID("$NetBSD: main.c,v 1.28 2016/03/02 19:11:28 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.28.14.1 2018/04/07 04:11:47 pgoyette Exp $");
#endif
#endif /* not lint */
@@ -94,6 +94,7 @@
int red = 0; /* if set, restrict shell/directory access */
int ere = 0; /* if set, use extended regexes */
int scripted = 0; /* if set, suppress diagnostics */
+int secure = 0; /* is set, ! is not allowed */
int sigflags = 0; /* if set, signals received while mutex set */
int sigactive = 0; /* if set, signal handlers are enabled */
@@ -105,7 +106,7 @@
const char *dps = "*"; /* default command-line prompt */
-static const char usage[] = "Usage: %s [-] [-sxE] [-p string] [name]\n";
+static const char usage[] = "Usage: %s [-] [-ESsx] [-p string] [name]\n";
/* ed: line editor */
int
@@ -118,7 +119,7 @@
red = (n = strlen(argv[0])) > 2 && argv[0][n - 3] == 'r';
top:
- while ((c = getopt(argc, argv, "p:sxE")) != -1)
+ while ((c = getopt(argc, argv, "p:sxES")) != -1)
switch(c) {
case 'p': /* set prompt */
prompt = optarg;
@@ -137,6 +138,9 @@
case 'E':
ere = REG_EXTENDED;
break;
+ case 'S': /* ! is not allowed */
+ secure = 1;
+ break;
default:
fprintf(stderr, usage, getprogname());
exit(1);
@@ -861,6 +865,10 @@
printf("%ld\n", addr_cnt ? second_addr : addr_last);
break;
case '!':
+ if (secure) {
+ seterrmsg("'!' not allowed");
+ return ERR;
+ }
if (addr_cnt > 0) {
seterrmsg("unexpected address");
return ERR;
diff -r 4056833fe45d -r 237afe5674df build.sh
--- a/build.sh Tue Apr 03 08:29:44 2018 +0000
+++ b/build.sh Sat Apr 07 04:11:47 2018 +0000
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.324 2018/01/24 09:04:40 skrll Exp $
+# $NetBSD: build.sh,v 1.324.2.1 2018/04/07 04:11:47 pgoyette Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -651,8 +651,8 @@
MACHINE=evbarm MACHINE_ARCH=earmv7eb ALIAS=evbearmv7-eb
MACHINE=evbarm MACHINE_ARCH=earmv7hf ALIAS=evbearmv7hf-el
MACHINE=evbarm MACHINE_ARCH=earmv7hfeb ALIAS=evbearmv7hf-eb
-MACHINE=evbarm64 MACHINE_ARCH=aarch64 ALIAS=evbarm64-el DEFAULT
-MACHINE=evbarm64 MACHINE_ARCH=aarch64eb ALIAS=evbarm64-eb
+MACHINE=evbarm MACHINE_ARCH=aarch64 ALIAS=evbarm64-el DEFAULT
+MACHINE=evbarm MACHINE_ARCH=aarch64eb ALIAS=evbarm64-eb
MACHINE=evbcf MACHINE_ARCH=coldfire
MACHINE=evbmips MACHINE_ARCH= NO_DEFAULT
MACHINE=evbmips MACHINE_ARCH=mips64eb ALIAS=evbmips64-eb
@@ -1932,7 +1932,7 @@
eval cat <<EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.324 2018/01/24 09:04:40 skrll Exp $
+# Generated from: \$NetBSD: build.sh,v 1.324.2.1 2018/04/07 04:11:47 pgoyette Exp $
# with these arguments: ${_args}
#
diff -r 4056833fe45d -r 237afe5674df crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c
--- a/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c Tue Apr 03 08:29:44 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c Sat Apr 07 04:11:47 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: crypto_openssl.c,v 1.27 2018/02/07 03:59:03 christos Exp $ */
+/* $NetBSD: crypto_openssl.c,v 1.27.2.1 2018/04/07 04:11:47 pgoyette Exp $ */
/* Id: crypto_openssl.c,v 1.47 2006/05/06 20:42:09 manubsd Exp */
@@ -2331,6 +2331,7 @@
goto end;
if (!DH_set0_pqg(dh, p, NULL, g))
goto end;
+ p = g = NULL;
if (publen != 0)
DH_set_length(dh, publen);
@@ -2395,9 +2396,11 @@
if (!DH_set0_pqg(dh, p, NULL, g))
goto end;
+ p = g = NULL;
if (!DH_set0_key(dh, pub_key, priv_key))
goto end;
+ pub_key = priv_key = NULL;
if ((v = racoon_calloc(prime->l, sizeof(u_char))) == NULL)
goto end;
@@ -2565,7 +2568,6 @@
return rsa_pub;
out:
BN_free(exp);
- BN_free(exp);
RSA_free(rsa_pub);
return NULL;
}
diff -r 4056833fe45d -r 237afe5674df crypto/dist/ipsec-tools/src/racoon/debugrm.c
--- a/crypto/dist/ipsec-tools/src/racoon/debugrm.c Tue Apr 03 08:29:44 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/debugrm.c Sat Apr 07 04:11:47 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: debugrm.c,v 1.3 2006/09/09 16:22:09 manu Exp $ */
+/* $NetBSD: debugrm.c,v 1.3.86.1 2018/04/07 04:11:47 pgoyette Exp $ */
/* $KAME: debugrm.c,v 1.6 2001/12/13 16:07:46 sakane Exp $ */
@@ -51,37 +51,38 @@
#define DRMLISTSIZE 1024
struct drm_list_t {
- void *ptr;
+ const void *ptr;
char msg[100];
};
static struct drm_list_t drmlist[DRMLISTSIZE];
static int drm_unknown;
-static void DRM_add __P((void *, char *));
-static void DRM_del __P((void *));
-static void DRM_setmsg __P((char *, int, void *, int, char *, int, char *));
+static void DRM_add(const void *, const char *);
+static void DRM_del(const void *);
+static void DRM_setmsg(char *, size_t, const void *, size_t, const char *,
+ size_t, const char *);
void
-DRM_init()
+DRM_init(void)
{
- int i;
+ size_t i;
drm_unknown = 0;
- for (i = 0; i < sizeof(drmlist)/sizeof(drmlist[0]); i++)
+ for (i = 0; i < __arraycount(drmlist); i++)
drmlist[i].ptr = 0;
}
void
-DRM_dump()
+DRM_dump(void)
{
FILE *fp;
- int i;
+ size_t i;
fp = fopen(DRMDUMPFILE, "w");
if (fp == NULL)
err(1, "fopen"); /*XXX*/
fprintf(fp, "drm_unknown=%d\n", drm_unknown);
- for (i = 0; i < sizeof(drmlist)/sizeof(drmlist[0]); i++) {
+ for (i = 0; i < __arraycount(drmlist); i++) {
if (drmlist[i].ptr)
fprintf(fp, "%s\n", drmlist[i].msg);
}
@@ -89,12 +90,10 @@
}
static void
-DRM_add(p, msg)
- void *p;
- char *msg;
+DRM_add(const void *p, const char *msg)
{
- int i;
- for (i = 0; i < sizeof(drmlist)/sizeof(drmlist[0]); i++) {
+ size_t i;
+ for (i = 0; i < __arraycount(drmlist); i++) {
if (!drmlist[i].ptr) {
drmlist[i].ptr = p;
strlcpy(drmlist[i].msg, msg, sizeof(drmlist[i].msg));
@@ -104,15 +103,14 @@
}
static void
-DRM_del(p)
- void *p;
+DRM_del(const void *p)
{
- int i;
+ size_t i;
if (!p)
return;
- for (i = 0; i < sizeof(drmlist)/sizeof(drmlist[0]); i++) {
+ for (i = 0; i < __arraycount(drmlist); i++) {
if (drmlist[i].ptr == p) {
drmlist[i].ptr = 0;
return;
@@ -122,10 +120,8 @@
}
static void
-DRM_setmsg(buf, buflen, ptr, size, file, line, func)
- char *buf, *file, *func;
- int buflen, size, line;
- void *ptr;
+DRM_setmsg(char *buf, size_t buflen, const void *ptr, size_t size,
+ const char *file, size_t line, const char *func)
{
time_t t;
struct tm *tm;
@@ -136,14 +132,11 @@
len = strftime(buf, buflen, "%Y/%m/%d:%T ", tm);
snprintf(buf + len, buflen - len, "%p %6d %s:%d:%s",
- ptr, size, file , line, func);
+ ptr, size, file, line, func);
}
void *
-DRM_malloc(file, line, func, size)
- char *file, *func;
- int line;
- size_t size;
+DRM_malloc(const char *file, size_t line, const char *func, size_t size)
Home |
Main Index |
Thread Index |
Old Index