PERFORCE change 49275 for review
Peter Wemm
peter at FreeBSD.org
Thu Mar 18 14:56:49 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=49275
Change 49275 by peter at peter_daintree on 2004/03/18 14:56:24
IFC @49274
Affected files ...
.. //depot/projects/hammer/Makefile.inc1#44 integrate
.. //depot/projects/hammer/UPDATING#35 integrate
.. //depot/projects/hammer/UPDATING.64BTT#4 integrate
.. //depot/projects/hammer/bin/ps/ps.1#10 integrate
.. //depot/projects/hammer/bin/ps/ps.c#7 integrate
.. //depot/projects/hammer/bin/sh/Makefile#6 integrate
.. //depot/projects/hammer/contrib/binutils/include/getopt.h#3 delete
.. //depot/projects/hammer/contrib/binutils/libiberty/getopt.c#2 delete
.. //depot/projects/hammer/contrib/binutils/libiberty/getopt1.c#2 delete
.. //depot/projects/hammer/crypto/openssl/CHANGES#4 integrate
.. //depot/projects/hammer/crypto/openssl/Configure#4 integrate
.. //depot/projects/hammer/crypto/openssl/FAQ#4 integrate
.. //depot/projects/hammer/crypto/openssl/LICENSE#3 integrate
.. //depot/projects/hammer/crypto/openssl/Makefile.org#4 integrate
.. //depot/projects/hammer/crypto/openssl/Makefile.ssl#4 integrate
.. //depot/projects/hammer/crypto/openssl/NEWS#4 integrate
.. //depot/projects/hammer/crypto/openssl/README#4 integrate
.. //depot/projects/hammer/crypto/openssl/apps/CA.pl#4 integrate
.. //depot/projects/hammer/crypto/openssl/apps/Makefile.ssl#4 integrate
.. //depot/projects/hammer/crypto/openssl/apps/apps.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/apps/apps.h#3 integrate
.. //depot/projects/hammer/crypto/openssl/apps/asn1pars.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/apps/ca.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/apps/der_chop#3 integrate
.. //depot/projects/hammer/crypto/openssl/apps/dgst.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/apps/enc.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/apps/engine.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/apps/ocsp.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/apps/openssl.cnf#4 integrate
.. //depot/projects/hammer/crypto/openssl/apps/pkcs12.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/apps/pkcs7.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/apps/req.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/apps/rsautl.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/apps/s_socket.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/apps/s_time.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/apps/speed.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/apps/x509.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/certs/expired/vsign3.pem#1 branch
.. //depot/projects/hammer/crypto/openssl/certs/vsign3.pem#2 integrate
.. //depot/projects/hammer/crypto/openssl/config#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/aes/Makefile.ssl#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/aes/aes_cbc.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/asn1/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/asn1/a_gentm.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/asn1/a_mbstr.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/asn1/a_strex.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/asn1/a_time.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/asn1/a_utctm.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/asn1/asn1_lib.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/asn1/asn1_par.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/asn1/asn_moid.c#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/asn1/t_pkey.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/asn1/x_long.c#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/bf/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/bio/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/bio/b_dump.c#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/bio/b_print.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/bio/b_sock.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/bio/bio_cb.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/bio/bss_conn.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/bio/bss_file.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/bn/Makefile.ssl#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/bn/asm/bn-586.pl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/bn/bn_lcl.h#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/bn/bn_lib.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/bn/bn_print.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/buffer/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/cast/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/comp/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/conf/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/conf/conf_def.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/conf/conf_mod.c#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/cversion.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/des/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/des/cfb_enc.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/des/ecb_enc.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/dh/Makefile.ssl#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/dsa/Makefile.ssl#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/dso/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/dso/dso_lib.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/ec/Makefile.ssl#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/ec/ecp_smpl.c#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/engine/Makefile.ssl#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/engine/eng_ctrl.c#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/engine/eng_fat.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/engine/engine.h#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/engine/hw_cryptodev.c#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/err/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/err/err.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/evp/Makefile.ssl#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/evp/bio_ok.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/evp/digest.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/evp/evp.h#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/evp/evp_enc.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/evp/evp_pbe.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/evp/evp_pkey.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/hmac/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/idea/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/krb5/Makefile.ssl#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/lhash/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/md2/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/md4/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/md5/Makefile.ssl#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/mdc2/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/mem.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/mem_dbg.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/objects/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/objects/obj_dat.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/objects/obj_dat.pl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/ocsp/Makefile.ssl#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/ocsp/ocsp_ext.c#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/ocsp/ocsp_lib.c#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/ocsp/ocsp_vfy.c#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/opensslconf.h#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/opensslv.h#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/pem/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/pem/pem_lib.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/pem/pem_pkey.c#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/pkcs12/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/pkcs7/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/pkcs7/pk7_doit.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/rand/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/rand/rand_egd.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/rand/rand_unix.c#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/rand/rand_win.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/rand/randfile.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/rc2/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/rc4/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/rc5/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/ripemd/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/rsa/Makefile.ssl#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/sha/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/sha/asm/sha1-586.pl#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/stack/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/threads/mttest.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/txt_db/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/ui/Makefile.ssl#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/ui/ui_lib.c#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/x509/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/x509/by_dir.c#2 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/x509/x509.h#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/x509/x509_txt.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/x509/x509_vfy.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/x509/x509_vfy.h#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/x509/x509type.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/x509v3/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_alt.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_crld.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_info.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_purp.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/doc/apps/config.pod#2 integrate
.. //depot/projects/hammer/crypto/openssl/doc/apps/openssl.pod#3 integrate
.. //depot/projects/hammer/crypto/openssl/doc/apps/s_client.pod#4 integrate
.. //depot/projects/hammer/crypto/openssl/doc/apps/s_time.pod#1 branch
.. //depot/projects/hammer/crypto/openssl/doc/apps/smime.pod#3 integrate
.. //depot/projects/hammer/crypto/openssl/doc/crypto/BIO_f_ssl.pod#2 integrate
.. //depot/projects/hammer/crypto/openssl/doc/crypto/CONF_modules_free.pod#1 branch
.. //depot/projects/hammer/crypto/openssl/doc/crypto/CONF_modules_load_file.pod#1 branch
.. //depot/projects/hammer/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#2 integrate
.. //depot/projects/hammer/crypto/openssl/doc/crypto/EVP_DigestInit.pod#3 integrate
.. //depot/projects/hammer/crypto/openssl/doc/crypto/OPENSSL_config.pod#1 branch
.. //depot/projects/hammer/crypto/openssl/doc/crypto/OPENSSL_load_builtin_modules.pod#1 branch
.. //depot/projects/hammer/crypto/openssl/doc/crypto/OpenSSL_add_all_algorithms.pod#2 integrate
.. //depot/projects/hammer/crypto/openssl/doc/crypto/RSA_print.pod#3 integrate
.. //depot/projects/hammer/crypto/openssl/doc/crypto/d2i_DSAPublicKey.pod#2 integrate
.. //depot/projects/hammer/crypto/openssl/doc/crypto/d2i_RSAPublicKey.pod#3 integrate
.. //depot/projects/hammer/crypto/openssl/doc/crypto/des.pod#3 integrate
.. //depot/projects/hammer/crypto/openssl/doc/crypto/pem.pod#2 integrate
.. //depot/projects/hammer/crypto/openssl/doc/crypto/ui.pod#2 integrate
.. //depot/projects/hammer/crypto/openssl/doc/ssl/SSL_COMP_add_compression_method.pod#2 integrate
.. //depot/projects/hammer/crypto/openssl/doc/ssleay.txt#2 integrate
.. //depot/projects/hammer/crypto/openssl/openssl.spec#4 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/kssl.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/s2_clnt.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/s2_enc.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/s2_lib.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/s2_pkt.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/s2_srvr.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/s3_clnt.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/s3_enc.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/s3_lib.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/s3_pkt.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/s3_srvr.c#5 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/ssl.h#3 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/ssl_asn1.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/ssl_cert.c#3 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/ssl_ciph.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/ssl_lib.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/ssl_sess.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/ssl/ssltest.c#4 integrate
.. //depot/projects/hammer/crypto/openssl/test/Makefile.ssl#4 integrate
.. //depot/projects/hammer/crypto/openssl/tools/Makefile.ssl#3 integrate
.. //depot/projects/hammer/crypto/openssl/tools/c_rehash#4 integrate
.. //depot/projects/hammer/crypto/openssl/util/extract-names.pl#3 integrate
.. //depot/projects/hammer/crypto/openssl/util/mk1mf.pl#4 integrate
.. //depot/projects/hammer/crypto/openssl/util/mkdef.pl#4 integrate
.. //depot/projects/hammer/crypto/openssl/util/pl/OS2-EMX.pl#2 integrate
.. //depot/projects/hammer/etc/rc.d/savecore#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/gasp/Makefile#8 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/Makefile#10 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/i386/bfd.h#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/powerpc/bfd.h#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/patch/patch.1#2 integrate
.. //depot/projects/hammer/include/stdio.h#6 integrate
.. //depot/projects/hammer/lib/libalias/alias.c#5 integrate
.. //depot/projects/hammer/lib/libalias/alias.h#5 integrate
.. //depot/projects/hammer/lib/libalias/alias_cuseeme.c#3 integrate
.. //depot/projects/hammer/lib/libalias/alias_db.c#6 integrate
.. //depot/projects/hammer/lib/libalias/alias_ftp.c#3 integrate
.. //depot/projects/hammer/lib/libalias/alias_irc.c#3 integrate
.. //depot/projects/hammer/lib/libalias/alias_local.h#4 integrate
.. //depot/projects/hammer/lib/libalias/alias_nbt.c#4 integrate
.. //depot/projects/hammer/lib/libalias/alias_old.c#2 integrate
.. //depot/projects/hammer/lib/libalias/alias_pptp.c#3 integrate
.. //depot/projects/hammer/lib/libalias/alias_proxy.c#4 integrate
.. //depot/projects/hammer/lib/libalias/alias_skinny.c#3 integrate
.. //depot/projects/hammer/lib/libalias/alias_smedia.c#3 integrate
.. //depot/projects/hammer/lib/libalias/alias_util.c#3 integrate
.. //depot/projects/hammer/lib/libc/alpha/gen/flt_rounds.c#2 integrate
.. //depot/projects/hammer/lib/libc/alpha/gen/fpgetround.c#2 integrate
.. //depot/projects/hammer/lib/libc/alpha/gen/fpgetsticky.c#2 integrate
.. //depot/projects/hammer/lib/libc/alpha/gen/fpsetround.c#2 integrate
.. //depot/projects/hammer/lib/libc/alpha/gen/fpsetsticky.c#2 integrate
.. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_qp.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/feof.c#2 integrate
.. //depot/projects/hammer/lib/libc/stdio/ferror.c#2 integrate
.. //depot/projects/hammer/lib/libc/stdio/fileno.c#3 integrate
.. //depot/projects/hammer/lib/libc/stdio/getc.3#5 integrate
.. //depot/projects/hammer/lib/libc/stdio/getc.c#3 integrate
.. //depot/projects/hammer/lib/libc/stdio/putc.3#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/putc.c#3 integrate
.. //depot/projects/hammer/lib/libc/stdio/putchar.c#3 integrate
.. //depot/projects/hammer/lib/libc/stdio/stdio.3#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#11 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#60 integrate
.. //depot/projects/hammer/sbin/vinum/commands.c#11 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/Makefile.inc#5 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/Makefile.man#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_STRING_length.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_STRING_new.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_ctrl.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_base64.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_buffer.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_cipher.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_md.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_null.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_ssl.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_find_type.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_new.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_push.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_read.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_accept.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_bio.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_connect.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_fd.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_file.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_mem.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_null.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_socket.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_set_callback.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_should_retry.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_CTX_new.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_CTX_start.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_add.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_add_word.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_bn2bin.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_cmp.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_copy.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_generate_prime.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_mod_inverse.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_new.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_num_bytes.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_rand.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_set_bit.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_swap.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/BN_zero.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/CONF_modules_free.3#1 branch
.. //depot/projects/hammer/secure/lib/libcrypto/man/CONF_modules_load_file.3#1 branch
.. //depot/projects/hammer/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/DH_generate_key.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/DH_generate_parameters.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/DH_get_ex_new_index.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/DH_new.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/DH_set_method.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/DH_size.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_SIG_new.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_do_sign.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_dup_DH.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_generate_key.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_generate_parameters.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_new.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_set_method.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_sign.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_size.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_GET_LIB.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_clear_error.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_error_string.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_get_error.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_load_strings.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_print_errors.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_put_error.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_remove_state.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_BytesToKey.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_DigestInit.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_EncryptInit.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_OpenInit.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_PKEY_new.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_SealInit.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_SignInit.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_VerifyInit.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/OBJ_nid2obj.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/OPENSSL_config.3#1 branch
.. //depot/projects/hammer/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#1 branch
.. //depot/projects/hammer/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS12_create.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS12_parse.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS7_decrypt.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS7_encrypt.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS7_sign.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS7_verify.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_add.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_bytes.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_cleanup.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_egd.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_load_file.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_set_rand_method.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_blinding_on.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_check_key.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_generate_key.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_new.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_print.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_private_encrypt.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_public_encrypt.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_set_method.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_sign.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_size.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/X509_NAME_print_ex.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/X509_new.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/bio.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/blowfish.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/bn.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/bn_internal.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/buffer.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/crypto.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_DHparams.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_CRL.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_NAME.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_REQ.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_SIG.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/des.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/dh.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/dsa.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/engine.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/err.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/evp.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/hmac.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/lh_stats.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/lhash.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/md5.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/mdc2.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/pem.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/rand.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/rc4.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/ripemd.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/rsa.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/sha.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/threads.3#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/ui.3#2 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/man/ui_compat.3#2 integrate
.. //depot/projects/hammer/share/man/man4/de.4#3 integrate
.. //depot/projects/hammer/share/man/man4/firewire.4#6 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/arl.4#2 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#31 integrate
.. //depot/projects/hammer/share/man/man9/bus_alloc_resource.9#6 integrate
.. //depot/projects/hammer/sys/alpha/isa/isa.c#9 integrate
.. //depot/projects/hammer/sys/alpha/osf1/osf1_misc.c#8 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#58 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#8 integrate
.. //depot/projects/hammer/sys/amd64/isa/atpic.c#35 integrate
.. //depot/projects/hammer/sys/amd64/isa/isa.c#9 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#10 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_misc.c#18 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#12 integrate
.. //depot/projects/hammer/sys/conf/NOTES#37 integrate
.. //depot/projects/hammer/sys/conf/kern.pre.mk#20 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/CHANGES.txt#7 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acconfig.h#9 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acglobal.h#9 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acmacros.h#8 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acobject.h#8 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/actbl2.h#6 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/actypes.h#8 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acutils.h#9 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/amlcode.h#6 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslutils.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbexec.c#9 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dsmethod.c#9 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/excreate.c#7 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exmutex.c#6 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsaccess.c#8 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsalloc.c#9 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nseval.c#6 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/psparse.c#8 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/psscope.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/uteval.c#7 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utglobal.c#9 integrate
.. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr.c#7 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#3 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.h#2 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#3 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.h#2 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#2 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#3 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_norm.c#2 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_osfp.c#2 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_table.c#2 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pfvar.h#2 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_pci.c#11 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdInterrupt.c#5 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi.c#26 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#15 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#16 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#13 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#6 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_timer.c#6 integrate
.. //depot/projects/hammer/sys/dev/adlink/adlink.c#7 integrate
.. //depot/projects/hammer/sys/dev/advansys/adv_eisa.c#6 integrate
.. //depot/projects/hammer/sys/dev/advansys/adv_isa.c#6 integrate
.. //depot/projects/hammer/sys/dev/advansys/adv_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/advansys/adw_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/aha/aha_isa.c#8 integrate
.. //depot/projects/hammer/sys/dev/aha/aha_mca.c#7 integrate
.. //depot/projects/hammer/sys/dev/ahb/ahb.c#9 integrate
.. //depot/projects/hammer/sys/dev/aic/aic_cbus.c#3 integrate
.. //depot/projects/hammer/sys/dev/aic/aic_isa.c#3 integrate
.. //depot/projects/hammer/sys/dev/aic/aic_pccard.c#5 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/ahc_eisa.c#10 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#13 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#12 integrate
.. //depot/projects/hammer/sys/dev/amd/amd.c#9 integrate
.. //depot/projects/hammer/sys/dev/amr/amr_pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/an/if_an.c#16 integrate
.. //depot/projects/hammer/sys/dev/ar/if_ar.c#9 integrate
.. //depot/projects/hammer/sys/dev/arl/if_arl.c#2 integrate
.. //depot/projects/hammer/sys/dev/arl/if_arl_isa.c#2 integrate
.. //depot/projects/hammer/sys/dev/arl/if_arlreg.h#2 integrate
.. //depot/projects/hammer/sys/dev/asr/asr.c#9 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#22 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-cbus.c#5 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#31 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.c#18 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/awi/if_awi_pccard.c#9 integrate
.. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#6 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#29 integrate
.. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#11 integrate
.. //depot/projects/hammer/sys/dev/buslogic/bt_eisa.c#7 integrate
.. //depot/projects/hammer/sys/dev/buslogic/bt_isa.c#6 integrate
.. //depot/projects/hammer/sys/dev/buslogic/bt_mca.c#6 integrate
.. //depot/projects/hammer/sys/dev/buslogic/bt_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#11 integrate
.. //depot/projects/hammer/sys/dev/ciss/ciss.c#19 integrate
.. //depot/projects/hammer/sys/dev/cm/smc90cx6.c#8 integrate
.. //depot/projects/hammer/sys/dev/cnw/if_cnw.c#8 integrate
.. //depot/projects/hammer/sys/dev/cs/if_cs.c#10 integrate
.. //depot/projects/hammer/sys/dev/ct/ct_isa.c#8 integrate
.. //depot/projects/hammer/sys/dev/digi/digi_pci.c#3 integrate
.. //depot/projects/hammer/sys/dev/dpt/dpt_isa.c#6 integrate
.. //depot/projects/hammer/sys/dev/dpt/dpt_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/dpt/dpt_scsi.c#11 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_irq.h#3 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed.c#15 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.c#23 integrate
.. //depot/projects/hammer/sys/dev/en/if_en_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/ep/if_ep.c#12 integrate
.. //depot/projects/hammer/sys/dev/ep/if_ep_eisa.c#6 integrate
.. //depot/projects/hammer/sys/dev/ex/if_ex.c#8 integrate
.. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#7 integrate
.. //depot/projects/hammer/sys/dev/fb/s3_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/fe/if_fe.c#10 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#21 integrate
.. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#29 integrate
.. //depot/projects/hammer/sys/dev/gem/if_gem_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/gfb/gfb_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/gx/if_gx.c#10 integrate
.. //depot/projects/hammer/sys/dev/hatm/if_hatm.c#10 integrate
.. //depot/projects/hammer/sys/dev/hfa/hfa_freebsd.c#4 integrate
.. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#10 integrate
.. //depot/projects/hammer/sys/dev/hme/if_hme_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/hme/if_hme_sbus.c#5 integrate
.. //depot/projects/hammer/sys/dev/ichsmb/ichsmb_pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/ida/ida_eisa.c#7 integrate
.. //depot/projects/hammer/sys/dev/ida/ida_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/idt/idt_pci.c#3 integrate
.. //depot/projects/hammer/sys/dev/ie/if_ie.c#10 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#3 integrate
.. //depot/projects/hammer/sys/dev/iir/iir_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/ips/ips_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#6 integrate
.. //depot/projects/hammer/sys/dev/joy/joy.c#5 integrate
.. //depot/projects/hammer/sys/dev/lge/if_lge.c#14 integrate
.. //depot/projects/hammer/sys/dev/lnc/if_lnc_cbus.c#6 integrate
.. //depot/projects/hammer/sys/dev/lnc/if_lnc_isa.c#6 integrate
.. //depot/projects/hammer/sys/dev/lnc/if_lnc_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/matcd/matcd_isa.c#3 integrate
.. //depot/projects/hammer/sys/dev/mcd/mcd_isa.c#5 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#26 integrate
.. //depot/projects/hammer/sys/dev/mlx/mlx.c#7 integrate
.. //depot/projects/hammer/sys/dev/mlx/mlx_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/mly/mly.c#10 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/musycc/musycc.c#7 integrate
.. //depot/projects/hammer/sys/dev/my/if_my.c#13 integrate
.. //depot/projects/hammer/sys/dev/ncv/ncr53c500_pccard.c#9 integrate
.. //depot/projects/hammer/sys/dev/nge/if_nge.c#14 integrate
.. //depot/projects/hammer/sys/dev/nsp/nsp_pccard.c#8 integrate
.. //depot/projects/hammer/sys/dev/owi/if_owi.c#6 integrate
.. //depot/projects/hammer/sys/dev/patm/if_patm_attach.c#5 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccard.c#17 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#23 integrate
.. //depot/projects/hammer/sys/dev/pci/isa_pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/pcic/i82365.c#6 integrate
.. //depot/projects/hammer/sys/dev/pcic/i82365_isa.c#3 integrate
.. //depot/projects/hammer/sys/dev/pdq/if_fea.c#5 integrate
.. //depot/projects/hammer/sys/dev/pdq/if_fpa.c#5 integrate
.. //depot/projects/hammer/sys/dev/ppbus/if_plip.c#7 integrate
.. //depot/projects/hammer/sys/dev/ppbus/lpbb.c#3 integrate
.. //depot/projects/hammer/sys/dev/ppbus/lpt.c#6 integrate
.. //depot/projects/hammer/sys/dev/ppbus/pcfclock.c#6 integrate
.. //depot/projects/hammer/sys/dev/ppbus/ppi.c#6 integrate
.. //depot/projects/hammer/sys/dev/ppbus/pps.c#6 integrate
.. //depot/projects/hammer/sys/dev/ppbus/vpo.c#6 integrate
.. //depot/projects/hammer/sys/dev/ppc/ppc.c#3 integrate
.. //depot/projects/hammer/sys/dev/pst/pst-pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/puc/puc.c#9 integrate
.. //depot/projects/hammer/sys/dev/ray/if_ray.c#9 integrate
.. //depot/projects/hammer/sys/dev/rc/rc.c#6 integrate
.. //depot/projects/hammer/sys/dev/re/if_re.c#11 integrate
.. //depot/projects/hammer/sys/dev/rp/rp_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/sab/sab.c#10 integrate
.. //depot/projects/hammer/sys/dev/safe/safe.c#4 integrate
.. //depot/projects/hammer/sys/dev/sbni/if_sbni_isa.c#6 integrate
.. //depot/projects/hammer/sys/dev/sbni/if_sbni_pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/sbsh/if_sbsh.c#4 integrate
.. //depot/projects/hammer/sys/dev/scd/scd_isa.c#4 integrate
.. //depot/projects/hammer/sys/dev/si/si_eisa.c#3 integrate
.. //depot/projects/hammer/sys/dev/si/si_isa.c#4 integrate
.. //depot/projects/hammer/sys/dev/si/si_pci.c#3 integrate
.. //depot/projects/hammer/sys/dev/sio/sio.c#28 integrate
.. //depot/projects/hammer/sys/dev/sn/if_sn.c#13 integrate
.. //depot/projects/hammer/sys/dev/snc/if_snc.c#4 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/ess.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/gusc.c#2 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/gusmidi.c#2 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/mpu.c#4 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/mss.c#5 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/sb16.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/sb8.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/sbc.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/uartsio.c#4 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/als4000.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/au88x0.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/aureal.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/cmi.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/cs4281.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/csa.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/csamidi.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/csapcm.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/ds1.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/fm801.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/ich.c#11 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/maestro3.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/neomagic.c#4 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/solo.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/t4dwave.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/via82c686.c#8 integrate
.. //depot/projects/hammer/sys/dev/sr/if_sr.c#10 integrate
.. //depot/projects/hammer/sys/dev/stg/tmc18c30_subr.c#3 integrate
.. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#11 integrate
.. //depot/projects/hammer/sys/dev/syscons/syscons.c#14 integrate
.. //depot/projects/hammer/sys/dev/tdfx/tdfx_pci.c#10 integrate
.. //depot/projects/hammer/sys/dev/trm/trm.c#13 integrate
.. //depot/projects/hammer/sys/dev/twe/twe_freebsd.c#10 integrate
.. //depot/projects/hammer/sys/dev/tx/if_tx.c#14 integrate
.. //depot/projects/hammer/sys/dev/txp/if_txp.c#10 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_core.c#5 integrate
.. //depot/projects/hammer/sys/dev/ubsec/ubsec.c#10 integrate
.. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/usb/ohci_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/usb/uftdi.c#9 integrate
.. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#32 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs.h#31 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#31 integrate
.. //depot/projects/hammer/sys/dev/vx/if_vx_eisa.c#6 integrate
.. //depot/projects/hammer/sys/dev/vx/if_vx_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi.c#25 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi_pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/wl/if_wl.c#10 integrate
.. //depot/projects/hammer/sys/dev/xe/if_xe.c#14 integrate
.. //depot/projects/hammer/sys/dev/zs/zs_macio.c#3 integrate
.. //depot/projects/hammer/sys/dev/zs/zs_sbus.c#3 integrate
.. //depot/projects/hammer/sys/geom/geom_subr.c#26 integrate
.. //depot/projects/hammer/sys/i386/bios/smapi.c#6 integrate
.. //depot/projects/hammer/sys/i386/bios/smbios.c#3 integrate
.. //depot/projects/hammer/sys/i386/bios/vpd.c#3 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#8 integrate
.. //depot/projects/hammer/sys/i386/isa/atpic.c#8 integrate
.. //depot/projects/hammer/sys/i386/isa/ic/scd1400.h#2 delete
.. //depot/projects/hammer/sys/i386/isa/if_el.c#7 integrate
.. //depot/projects/hammer/sys/i386/isa/isa.c#3 integrate
.. //depot/projects/hammer/sys/i386/isa/mse.c#6 integrate
.. //depot/projects/hammer/sys/i386/isa/spic.c#7 integrate
.. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_isa.c#4 integrate
.. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_pci.c#5 integrate
.. //depot/projects/hammer/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#6 integrate
.. //depot/projects/hammer/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#6 integrate
.. //depot/projects/hammer/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#5 integrate
.. //depot/projects/hammer/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#5 integrate
.. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_avm_a1.c#4 integrate
.. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_ctx_s0P.c#4 integrate
.. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_drn_ngo.c#4 integrate
.. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#4 integrate
.. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#5 integrate
.. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_isic_pnp.c#5 integrate
.. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_itk_ix1.c#4 integrate
.. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s016.c#5 integrate
.. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s0163.c#4 integrate
.. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s08.c#5 integrate
.. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_usr_sti.c#4 integrate
.. //depot/projects/hammer/sys/i4b/layer1/itjc/i4b_itjc_pci.c#10 integrate
.. //depot/projects/hammer/sys/i4b/layer1/iwic/i4b_iwic_pci.c#5 integrate
.. //depot/projects/hammer/sys/ia64/isa/isa.c#2 integrate
.. //depot/projects/hammer/sys/isa/atkbd_isa.c#4 integrate
.. //depot/projects/hammer/sys/isa/atkbdc_isa.c#5 integrate
.. //depot/projects/hammer/sys/isa/fd.c#14 integrate
.. //depot/projects/hammer/sys/isa/isa_common.c#11 integrate
.. //depot/projects/hammer/sys/isa/orm.c#4 integrate
.. //depot/projects/hammer/sys/isa/psm.c#14 integrate
.. //depot/projects/hammer/sys/kern/imgact_elf.c#15 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#23 integrate
.. //depot/projects/hammer/sys/kern/kern_proc.c#25 integrate
.. //depot/projects/hammer/sys/kern/sysv_sem.c#13 integrate
.. //depot/projects/hammer/sys/kern/uipc_cow.c#12 integrate
.. //depot/projects/hammer/sys/modules/arl/Makefile#2 integrate
.. //depot/projects/hammer/sys/net/if_tap.c#12 integrate
.. //depot/projects/hammer/sys/net/if_tapvar.h#4 integrate
.. //depot/projects/hammer/sys/net/if_tun.c#13 integrate
.. //depot/projects/hammer/sys/netatalk/ddp_usrreq.c#7 integrate
.. //depot/projects/hammer/sys/netatalk/ddp_var.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#4 integrate
.. //depot/projects/hammer/sys/netgraph/ng_pppoe.h#5 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#11 integrate
.. //depot/projects/hammer/sys/pc98/pc98/canbus.c#2 integrate
.. //depot/projects/hammer/sys/pc98/pc98/fd.c#14 integrate
.. //depot/projects/hammer/sys/pc98/pc98/mse.c#5 integrate
.. //depot/projects/hammer/sys/pc98/pc98/olpt.c#5 integrate
.. //depot/projects/hammer/sys/pc98/pc98/pc98kbd.c#5 integrate
.. //depot/projects/hammer/sys/pc98/pc98/ppc.c#5 integrate
.. //depot/projects/hammer/sys/pc98/pc98/sio.c#17 integrate
.. //depot/projects/hammer/sys/pccard/mecia.c#3 integrate
.. //depot/projects/hammer/sys/pccard/pcic_pci.c#8 integrate
.. //depot/projects/hammer/sys/pci/agp.c#11 integrate
.. //depot/projects/hammer/sys/pci/agp_amd.c#8 integrate
.. //depot/projects/hammer/sys/pci/agp_i810.c#12 integrate
.. //depot/projects/hammer/sys/pci/alpm.c#6 integrate
.. //depot/projects/hammer/sys/pci/amdpm.c#6 integrate
.. //depot/projects/hammer/sys/pci/if_dc.c#31 integrate
.. //depot/projects/hammer/sys/pci/if_de.c#13 integrate
.. //depot/projects/hammer/sys/pci/if_mn.c#7 integrate
.. //depot/projects/hammer/sys/pci/if_pcn.c#17 integrate
.. //depot/projects/hammer/sys/pci/if_rl.c#30 integrate
.. //depot/projects/hammer/sys/pci/if_sf.c#18 integrate
.. //depot/projects/hammer/sys/pci/if_sis.c#24 integrate
.. //depot/projects/hammer/sys/pci/if_sk.c#22 integrate
.. //depot/projects/hammer/sys/pci/if_ste.c#18 integrate
.. //depot/projects/hammer/sys/pci/if_ti.c#19 integrate
.. //depot/projects/hammer/sys/pci/if_tl.c#16 integrate
.. //depot/projects/hammer/sys/pci/if_vr.c#17 integrate
.. //depot/projects/hammer/sys/pci/if_wb.c#17 integrate
.. //depot/projects/hammer/sys/pci/if_xl.c#32 integrate
.. //depot/projects/hammer/sys/pci/intpm.c#6 integrate
.. //depot/projects/hammer/sys/pci/ncr.c#10 integrate
.. //depot/projects/hammer/sys/pci/viapm.c#6 integrate
.. //depot/projects/hammer/sys/pci/xrpu.c#9 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#6 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/openpic_macio.c#3 integrate
.. //depot/projects/hammer/sys/powerpc/psim/openpic_iobus.c#2 integrate
.. //depot/projects/hammer/sys/sparc64/isa/isa.c#7 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/eeprom_ebus.c#3 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/eeprom_fhc.c#3 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/eeprom_sbus.c#3 integrate
.. //depot/projects/hammer/sys/sys/bus.h#9 integrate
.. //depot/projects/hammer/sys/sys/wait.h#2 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#8 integrate
.. //depot/projects/hammer/sys/vm/vm_mmap.c#20 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#12 integrate
.. //depot/projects/hammer/usr.bin/netstat/main.c#6 integrate
.. //depot/projects/hammer/usr.bin/xinstall/Makefile#4 integrate
.. //depot/projects/hammer/usr.bin/xinstall/pathnames.h#2 delete
.. //depot/projects/hammer/usr.bin/xinstall/xinstall.c#8 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#46 integrate
.. //depot/projects/hammer/usr.sbin/arlconfig/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/arlconfig/arlconfig.8#2 integrate
.. //depot/projects/hammer/usr.sbin/arlconfig/arlconfig.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ofwdump/ofw_util.c#4 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/rtsock.c#4 integrate
Differences ...
==== //depot/projects/hammer/Makefile.inc1#44 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.417 2004/03/14 16:44:27 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.418 2004/03/18 10:17:03 ru Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -537,20 +537,36 @@
@echo "===> ${_kernel}"
mkdir -p ${KRNLOBJDIR}
.if !defined(NO_KERNELCONFIG)
+ @echo
+ @echo "--------------------------------------------------------------"
+ @echo ">>> stage 1: configuring the kernel"
+ @echo "--------------------------------------------------------------"
cd ${KRNLCONFDIR}; \
PATH=${TMPPATH} \
config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
${KERNCONFDIR}/${_kernel}
.endif
.if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN)
+ @echo
+ @echo "--------------------------------------------------------------"
+ @echo ">>> stage 2.1: cleaning up the object tree"
+ @echo "--------------------------------------------------------------"
cd ${KRNLOBJDIR}/${_kernel}; \
${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} ${CLEANDIR}
.endif
+ @echo
+ @echo "--------------------------------------------------------------"
+ @echo ">>> stage 2.2: rebuilding the object tree"
+ @echo "--------------------------------------------------------------"
+ cd ${KRNLOBJDIR}/${_kernel}; \
+ ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} obj
+ @echo
+ @echo "--------------------------------------------------------------"
+ @echo ">>> stage 2.3: build tools"
+ @echo "--------------------------------------------------------------"
cd ${KRNLOBJDIR}/${_kernel}; \
MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
${MAKE} -DNO_CPU_CFLAGS -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
- cd ${KRNLOBJDIR}/${_kernel}; \
- ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} obj
# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
.for target in obj depend all
@@ -560,9 +576,17 @@
.endfor
.endif
.if !defined(NO_KERNELDEPEND)
+ @echo
+ @echo "--------------------------------------------------------------"
+ @echo ">>> stage 3.1: making dependencies"
+ @echo "--------------------------------------------------------------"
cd ${KRNLOBJDIR}/${_kernel}; \
${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} depend -DNO_MODULES_OBJ
.endif
+ @echo
+ @echo "--------------------------------------------------------------"
+ @echo ">>> stage 3.2: building everything"
+ @echo "--------------------------------------------------------------"
cd ${KRNLOBJDIR}/${_kernel}; \
${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} all -DNO_MODULES_OBJ
@echo "--------------------------------------------------------------"
==== //depot/projects/hammer/UPDATING#35 (text+ko) ====
@@ -27,8 +27,8 @@
20040308:
The packet filter (pf) is now installed with the base system. Make
sure to run mergemaster -p before installworld to create required
- user accounts. If you do not want to build pf with your system you
- can use the NO_PF knob in make.conf.
+ user account ("proxy"). If you do not want to build pf with your
+ system you can use the NO_PF knob in make.conf.
Also note that pf requires "options PFIL_HOOKS" in the kernel. The
pf system consists of the following three devices:
device pf # required
@@ -1548,4 +1548,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.299 2004/03/10 17:39:05 gad Exp $
+$FreeBSD: src/UPDATING,v 1.300 2004/03/18 00:50:40 obrien Exp $
==== //depot/projects/hammer/UPDATING.64BTT#4 (text+ko) ====
@@ -28,7 +28,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#
# -------+---------+---------+---------+---------+---------+---------+---------+
-# $FreeBSD: src/UPDATING.64BTT,v 1.4 2004/03/10 17:39:05 gad Exp $
+# $FreeBSD: src/UPDATING.64BTT,v 1.5 2004/03/17 01:59:47 gad Exp $
# -------+---------+---------+---------+---------+---------+---------+---------+
If you are in too much of a hurry to read this file, then this is not the
@@ -97,6 +97,13 @@
that port and make sure you can get it working *before* you
make the change to use 64-bit time_t's.
+Step Pre-4: For people using database-related ports:
+ Ports like PostgreSQL may change how they store data after
+ they are recompiled for 64-bTT. So, you may have to do a
+ full dump of your data while you still have a 32-bTT system,
+ and do a matching initdb/restore of your data after the port
+ has been recompiled on the upgraded 64-bTT system.
+
After you have built and installed that src-snapshot with 32-bit time_t's,
edit the file /usr/src/sys/sparc64/include/_types.h
find the line:
==== //depot/projects/hammer/bin/ps/ps.1#10 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ps.1 8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/ps/ps.1,v 1.66 2004/01/21 16:25:36 cperciva Exp $
+.\" $FreeBSD: src/bin/ps/ps.1,v 1.67 2004/03/17 22:46:58 gad Exp $
.\"
.Dd April 18, 1994
.Dt PS 1
@@ -45,7 +45,10 @@
.Op Fl N Ar system
.Op Fl O Ar fmt
.Op Fl o Ar fmt
-.Op Fl p Ar pid
+.Oo Fl p Ar pid Ns Xo
+.Op , Ns Ar pid Ns No ...
+.Xc
+.Oc
.Op Fl t Ar tty
.Oo Fl U Ar username Ns Xo
.Op , Ns Ar username Ns No ...
@@ -146,7 +149,7 @@
the standard header.
.It Fl p
Display information associated with the specified process
-.Tn ID .
+.Tn ID(s) .
.It Fl r
Sort by current cpu usage, instead of by process
.Tn ID .
==== //depot/projects/hammer/bin/ps/ps.c#7 (text+ko) ====
@@ -44,7 +44,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.64 2004/02/22 17:59:31 deischen Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.66 2004/03/18 01:28:23 gad Exp $");
#include <sys/param.h>
#include <sys/user.h>
@@ -54,6 +54,7 @@
#include <ctype.h>
#include <err.h>
+#include <errno.h>
#include <fcntl.h>
#include <kvm.h>
#include <limits.h>
@@ -99,6 +100,7 @@
static void dynsizevars(KINFO *);
static void sizevars(void);
static void usage(void);
+static pid_t *getpids(const char *, int *);
static uid_t *getuids(const char *, int *);
static char dfmt[] = "pid,tt,state,time,command";
@@ -125,10 +127,11 @@
struct varent *vent;
struct winsize ws;
dev_t ttydev;
- pid_t pid;
+ pid_t *pids;
uid_t *uids;
- int all, ch, flag, i, _fmt, lineno, nentries, nocludge, dropgid;
- int prtheader, wflag, what, xflg, uid, nuids, showthreads;
+ int all, ch, dropgid, flag, _fmt, i, lineno;
+ int nentries, nocludge, noutput, npids, nuids, pid;
+ int prtheader, showthreads, uid, wflag, what, xflg;
char *cols;
char errbuf[_POSIX2_LINE_MAX];
const char *cp, *nlistf, *memf;
@@ -168,9 +171,8 @@
}
all = _fmt = prtheader = wflag = xflg = 0;
- pid = -1;
- nuids = 0;
- uids = NULL;
+ npids = nuids = 0;
+ pids = uids = NULL;
ttydev = NODEV;
dropgid = 0;
memf = nlistf = _PATH_DEVNULL;
@@ -239,7 +241,7 @@
break;
#endif
case 'p':
- pid = atol(optarg);
+ pids = getpids(optarg, &npids);
xflg = 1;
break;
case 'r':
@@ -333,7 +335,7 @@
parsefmt(dfmt, 0);
/* XXX - should be cleaner */
- if (!all && ttydev == NODEV && pid == -1 && !nuids) {
+ if (!all && ttydev == NODEV && !npids && !nuids) {
if ((uids = malloc(sizeof (*uids))) == NULL)
errx(1, "malloc failed");
nuids = 1;
@@ -354,9 +356,9 @@
} else if (ttydev != NODEV) {
what = KERN_PROC_TTY | showthreads;
flag = ttydev;
- } else if (pid != -1) {
+ } else if (npids == 1) {
what = KERN_PROC_PID | showthreads;
- flag = pid;
+ flag = *pids;
} else {
what = showthreads != 0 ? KERN_PROC_ALL : KERN_PROC_PROC;
flag = 0;
@@ -365,15 +367,18 @@
/*
* select procs
*/
- if ((kp = kvm_getprocs(kd, what, flag, &nentries)) == 0 || nentries < 0)
+ kp = kvm_getprocs(kd, what, flag, &nentries);
+ if ((kp == 0 && nentries != 0) || nentries < 0)
errx(1, "%s", kvm_geterr(kd));
- if ((kinfo = malloc(nentries * sizeof(*kinfo))) == NULL)
- errx(1, "malloc failed");
- for (i = nentries; --i >= 0; ++kp) {
- kinfo[i].ki_p = kp;
- if (needuser)
- saveuser(&kinfo[i]);
- dynsizevars(&kinfo[i]);
+ if (nentries > 0) {
+ if ((kinfo = malloc(nentries * sizeof(*kinfo))) == NULL)
+ errx(1, "malloc failed");
+ for (i = nentries; --i >= 0; ++kp) {
+ kinfo[i].ki_p = kp;
+ if (needuser)
+ saveuser(&kinfo[i]);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list