From owner-p4-projects@FreeBSD.ORG Mon Jul 21 15:36:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACB8F37B404; Mon, 21 Jul 2003 15:36:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6759D37B401 for ; Mon, 21 Jul 2003 15:36:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FBFD43F3F for ; Mon, 21 Jul 2003 15:35:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6LMZw0U074030 for ; Mon, 21 Jul 2003 15:35:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6LMZuRk074003 for perforce@freebsd.org; Mon, 21 Jul 2003 15:35:56 -0700 (PDT) Date: Mon, 21 Jul 2003 15:35:56 -0700 (PDT) Message-Id: <200307212235.h6LMZuRk074003@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 34794 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jul 2003 22:36:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=34794 Change 34794 by peter@peter_daintree on 2003/07/21 15:35:05 IFC @34793 Affected files ... .. //depot/projects/hammer/MAINTAINERS#12 integrate .. //depot/projects/hammer/Makefile#11 integrate .. //depot/projects/hammer/bin/ed/Makefile#6 integrate .. //depot/projects/hammer/bin/ed/re.c#2 integrate .. //depot/projects/hammer/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd.h.fixed#2 delete .. //depot/projects/hammer/contrib/openpam/include/security/pam_types.h#6 integrate .. //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.c#2 integrate .. //depot/projects/hammer/contrib/top/commands.c#2 integrate .. //depot/projects/hammer/contrib/top/machine.h#2 integrate .. //depot/projects/hammer/contrib/top/top.c#2 integrate .. //depot/projects/hammer/crypto/telnet/arpa/telnet.h#3 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/auth-proto.h#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/auth.c#3 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/auth.h#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/enc-proto.h#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/enc_des.c#4 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/encrypt.c#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/encrypt.h#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/genget.c#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/getent.c#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/kerberos.c#3 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/kerberos5.c#3 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/key-proto.h#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/krb4encpwd.c#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/misc-proto.h#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/misc.c#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/misc.h#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/pk.c#3 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/pk.h#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/read_password.c#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/rsaencpwd.c#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/sra.c#2 delete .. //depot/projects/hammer/crypto/telnet/telnet/authenc.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnet/commands.c#7 delete .. //depot/projects/hammer/crypto/telnet/telnet/defines.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnet/externs.h#3 delete .. //depot/projects/hammer/crypto/telnet/telnet/fdset.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnet/general.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnet/main.c#5 delete .. //depot/projects/hammer/crypto/telnet/telnet/network.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnet/ring.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnet/ring.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnet/sys_bsd.c#4 delete .. //depot/projects/hammer/crypto/telnet/telnet/telnet.1#2 delete .. //depot/projects/hammer/crypto/telnet/telnet/telnet.c#5 delete .. //depot/projects/hammer/crypto/telnet/telnet/terminal.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnet/types.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnet/utilities.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnetd/authenc.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnetd/defs.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnetd/ext.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnetd/global.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnetd/pathnames.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnetd/slc.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnetd/state.c#4 delete .. //depot/projects/hammer/crypto/telnet/telnetd/sys_term.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnetd/telnetd.8#2 delete .. //depot/projects/hammer/crypto/telnet/telnetd/telnetd.c#6 delete .. //depot/projects/hammer/crypto/telnet/telnetd/telnetd.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnetd/termstat.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnetd/utility.c#3 delete .. //depot/projects/hammer/etc/defaults/pccard.conf#8 integrate .. //depot/projects/hammer/kerberos5/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/Makefile.inc#7 integrate .. //depot/projects/hammer/kerberos5/lib/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/lib/libasn1/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/lib/libgssapi/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/lib/libhdb/Makefile#6 integrate .. //depot/projects/hammer/kerberos5/lib/libkadm5clnt/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/lib/libkadm5srv/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/lib/libkrb5/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/lib/libroken/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/lib/libsl/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/lib/libtelnet/Makefile#3 delete .. //depot/projects/hammer/kerberos5/lib/libvers/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/libexec/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/libexec/hprop/Makefile#4 integrate .. //depot/projects/hammer/kerberos5/libexec/hpropd/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/libexec/ipropd-master/Makefile#6 integrate .. //depot/projects/hammer/kerberos5/libexec/ipropd-slave/Makefile#6 integrate .. //depot/projects/hammer/kerberos5/libexec/kadmind/Makefile#4 integrate .. //depot/projects/hammer/kerberos5/libexec/kdc/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/libexec/kpasswdd/Makefile#4 integrate .. //depot/projects/hammer/kerberos5/libexec/telnetd/Makefile#4 delete .. //depot/projects/hammer/kerberos5/usr.bin/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/usr.bin/kadmin/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/usr.bin/kdestroy/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/usr.bin/kinit/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/usr.bin/klist/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/usr.bin/kpasswd/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/usr.bin/krb5-config/Makefile#6 integrate .. //depot/projects/hammer/kerberos5/usr.bin/ksu/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/usr.bin/telnet/Makefile#4 delete .. //depot/projects/hammer/kerberos5/usr.sbin/kstash/Makefile#4 integrate .. //depot/projects/hammer/kerberos5/usr.sbin/ktutil/Makefile#5 integrate .. //depot/projects/hammer/lib/Makefile#21 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#10 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/makecontext.c#3 branch .. //depot/projects/hammer/lib/libc/amd64/gen/signalcontext.c#3 branch .. //depot/projects/hammer/lib/libc/gen/getpwent.c#8 integrate .. //depot/projects/hammer/lib/libc/gen/raise.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/time.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/time.c#2 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_radius/pam_radius.c#5 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#11 integrate .. //depot/projects/hammer/lib/libpthread/arch/amd64/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/context.S#1 branch .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/enter_uts.S#1 branch .. //depot/projects/hammer/lib/libpthread/arch/amd64/include/atomic_ops.h#1 branch .. //depot/projects/hammer/lib/libpthread/arch/amd64/include/ksd.h#1 branch .. //depot/projects/hammer/lib/libpthread/arch/amd64/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libpthread/arch/i386/include/ksd.h#4 integrate .. //depot/projects/hammer/lib/libpthread/pthread.map#3 integrate .. //depot/projects/hammer/lib/libpthread/test/sigsuspend_d.c#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_init.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#10 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_concurrency.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#12 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#9 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_find_thread.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#11 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#17 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_nanosleep.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#13 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_raise.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#15 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigmask.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigpending.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#8 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#8 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_yield.c#5 integrate .. //depot/projects/hammer/lib/libtelnet/Makefile#2 integrate .. //depot/projects/hammer/lib/libtelnet/genget.c#2 delete .. //depot/projects/hammer/lib/libtelnet/getent.c#2 delete .. //depot/projects/hammer/lib/libtelnet/misc-proto.h#2 delete .. //depot/projects/hammer/lib/libtelnet/misc.c#2 delete .. //depot/projects/hammer/lib/libtelnet/misc.h#2 delete .. //depot/projects/hammer/lib/libthr/arch/alpha/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libthr/arch/alpha/alpha/_curthread.c#1 branch .. //depot/projects/hammer/libexec/Makefile#18 integrate .. //depot/projects/hammer/libexec/getty/main.c#4 integrate .. //depot/projects/hammer/libexec/telnetd/Makefile#2 integrate .. //depot/projects/hammer/libexec/telnetd/defs.h#2 delete .. //depot/projects/hammer/libexec/telnetd/ext.h#2 delete .. //depot/projects/hammer/libexec/telnetd/global.c#3 delete .. //depot/projects/hammer/libexec/telnetd/pathnames.h#2 delete .. //depot/projects/hammer/libexec/telnetd/slc.c#3 delete .. //depot/projects/hammer/libexec/telnetd/state.c#4 delete .. //depot/projects/hammer/libexec/telnetd/sys_term.c#3 delete .. //depot/projects/hammer/libexec/telnetd/telnetd.8#2 delete .. //depot/projects/hammer/libexec/telnetd/telnetd.c#5 delete .. //depot/projects/hammer/libexec/telnetd/telnetd.h#2 delete .. //depot/projects/hammer/libexec/telnetd/termstat.c#3 delete .. //depot/projects/hammer/libexec/telnetd/utility.c#3 delete .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#35 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#10 integrate .. //depot/projects/hammer/rescue/librescue/Makefile#3 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#4 integrate .. //depot/projects/hammer/sbin/atm/ilmid/ilmid.c#7 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#13 integrate .. //depot/projects/hammer/sbin/mount/mount.c#6 integrate .. //depot/projects/hammer/sbin/ping6/ping6.c#4 integrate .. //depot/projects/hammer/sbin/umount/umount.8#5 integrate .. //depot/projects/hammer/sbin/umount/umount.c#6 integrate .. //depot/projects/hammer/secure/Makefile#3 integrate .. //depot/projects/hammer/secure/Makefile.inc#2 integrate .. //depot/projects/hammer/secure/lib/Makefile#7 integrate .. //depot/projects/hammer/secure/lib/libtelnet/Makefile#3 delete .. //depot/projects/hammer/secure/libexec/Makefile#5 integrate .. //depot/projects/hammer/secure/libexec/telnetd/Makefile#2 delete .. //depot/projects/hammer/secure/usr.bin/Makefile#6 integrate .. //depot/projects/hammer/secure/usr.bin/telnet/Makefile#2 delete .. //depot/projects/hammer/share/man/man4/Makefile#18 integrate .. //depot/projects/hammer/share/man/man4/an.4#3 integrate .. //depot/projects/hammer/share/man/man4/ath.4#5 integrate .. //depot/projects/hammer/share/man/man4/ath_hal.4#2 integrate .. //depot/projects/hammer/share/man/man4/fxp.4#5 integrate .. //depot/projects/hammer/share/man/man4/harp.4#1 branch .. //depot/projects/hammer/share/man/man4/patm.4#2 integrate .. //depot/projects/hammer/share/man/man4/sbp.4#4 integrate .. //depot/projects/hammer/share/man/man4/twe.4#2 integrate .. //depot/projects/hammer/share/man/man4/wi.4#13 integrate .. //depot/projects/hammer/share/man/man4/wlan.4#2 integrate .. //depot/projects/hammer/share/man/man9/Makefile#15 integrate .. //depot/projects/hammer/share/man/man9/mtx_pool.9#2 integrate .. //depot/projects/hammer/share/man/man9/zone.9#5 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#11 integrate .. //depot/projects/hammer/sys/alpha/conf/NOTES#4 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#2 integrate .. //depot/projects/hammer/sys/boot/ia64/skiload/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/ia64/skiload/ldscript.ia64#2 integrate .. //depot/projects/hammer/sys/boot/ia64/skiload/main.c#4 integrate .. //depot/projects/hammer/sys/boot/ia64/skiload/start.S#1 branch .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#16 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/hammer/sys/conf/NOTES#23 integrate .. //depot/projects/hammer/sys/conf/files#24 integrate .. //depot/projects/hammer/sys/conf/files.alpha#8 integrate .. //depot/projects/hammer/sys/conf/options#20 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#8 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_isab.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#10 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#7 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#12 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#6 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_eisa.c#3 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_mca.c#3 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_pccard.c#5 integrate .. //depot/projects/hammer/sys/dev/ep/if_epreg.h#2 integrate .. //depot/projects/hammer/sys/dev/ep/if_epvar.h#3 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#16 integrate .. //depot/projects/hammer/sys/dev/firewire/fwdma.c#4 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#13 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#7 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#18 integrate .. //depot/projects/hammer/sys/dev/harp/if_harp.c#1 branch .. //depot/projects/hammer/sys/dev/hatm/if_hatm.c#4 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#13 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#13 integrate .. //depot/projects/hammer/sys/dev/safe/safe.c#1 branch .. //depot/projects/hammer/sys/dev/safe/safereg.h#1 branch .. //depot/projects/hammer/sys/dev/safe/safevar.h#1 branch .. //depot/projects/hammer/sys/dev/syscons/dragon/dragon_saver.c#2 integrate .. //depot/projects/hammer/sys/dev/syscons/fire/fire_saver.c#2 integrate .. //depot/projects/hammer/sys/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/hammer/sys/dev/syscons/warp/warp_saver.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.c#4 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#15 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#14 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/wi/if_wivar.h#7 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#10 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#17 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#12 integrate .. //depot/projects/hammer/sys/i386/isa/vesa.c#5 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#6 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#15 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#15 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#9 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#11 integrate .. //depot/projects/hammer/sys/modules/Makefile#23 integrate .. //depot/projects/hammer/sys/modules/harp/Makefile#1 branch .. //depot/projects/hammer/sys/modules/safe/Makefile#1 branch .. //depot/projects/hammer/sys/net/if.c#8 integrate .. //depot/projects/hammer/sys/net/if_atm.h#7 integrate .. //depot/projects/hammer/sys/net/if_media.h#6 integrate .. //depot/projects/hammer/sys/net/route.h#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/hammer/sys/netatm/atm_subr.c#5 integrate .. //depot/projects/hammer/sys/netatm/uni/unisig_msg.c#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#14 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/hammer/sys/pc98/pc98/pc98gdc.c#5 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#17 integrate .. //depot/projects/hammer/sys/pci/if_dcreg.h#10 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#16 integrate .. //depot/projects/hammer/sys/sparc64/include/cache.h#4 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#8 integrate .. //depot/projects/hammer/sys/sys/kse.h#12 integrate .. //depot/projects/hammer/sys/sys/mutex.h#6 integrate .. //depot/projects/hammer/sys/sys/proc.h#29 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#6 integrate .. //depot/projects/hammer/sys/sys/syscall.h#15 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#15 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#15 integrate .. //depot/projects/hammer/sys/sys/systm.h#6 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#12 integrate .. //depot/projects/hammer/sys/vm/swap_pager.h#7 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#14 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#17 integrate .. //depot/projects/hammer/sys/vm/vm_swap.c#7 delete .. //depot/projects/hammer/tools/tools/tinderbox/www/index.cgi#3 integrate .. //depot/projects/hammer/usr.bin/Makefile#16 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#10 integrate .. //depot/projects/hammer/usr.bin/getconf/getconf.c#4 integrate .. //depot/projects/hammer/usr.bin/sockstat/sockstat.c#5 integrate .. //depot/projects/hammer/usr.bin/telnet/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/telnet/README#2 delete .. //depot/projects/hammer/usr.bin/telnet/commands.c#6 delete .. //depot/projects/hammer/usr.bin/telnet/defines.h#2 delete .. //depot/projects/hammer/usr.bin/telnet/externs.h#3 delete .. //depot/projects/hammer/usr.bin/telnet/fdset.h#2 delete .. //depot/projects/hammer/usr.bin/telnet/general.h#2 delete .. //depot/projects/hammer/usr.bin/telnet/main.c#4 delete .. //depot/projects/hammer/usr.bin/telnet/network.c#4 delete .. //depot/projects/hammer/usr.bin/telnet/ring.c#3 delete .. //depot/projects/hammer/usr.bin/telnet/ring.h#2 delete .. //depot/projects/hammer/usr.bin/telnet/sys_bsd.c#4 delete .. //depot/projects/hammer/usr.bin/telnet/telnet.1#3 delete .. //depot/projects/hammer/usr.bin/telnet/telnet.c#6 delete .. //depot/projects/hammer/usr.bin/telnet/terminal.c#4 delete .. //depot/projects/hammer/usr.bin/telnet/types.h#2 delete .. //depot/projects/hammer/usr.bin/telnet/utilities.c#4 delete .. //depot/projects/hammer/usr.bin/top/machine.c#5 integrate .. //depot/projects/hammer/usr.bin/top/top.local.1#2 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.8#3 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.c#4 integrate .. //depot/projects/hammer/usr.sbin/lpr/lpr/printcap.5#3 integrate .. //depot/projects/hammer/usr.sbin/mountd/mountd.c#5 integrate .. //depot/projects/hammer/usr.sbin/pccard/pccardc/enabler.c#2 integrate .. //depot/projects/hammer/usr.sbin/traceroute6/traceroute6.c#4 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#12 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.74 2003/07/15 16:52:08 dwmalone Exp $ +$FreeBSD: src/MAINTAINERS,v 1.75 2003/07/19 00:17:36 markm Exp $ subsystem login notes ----------------------------- @@ -13,9 +13,8 @@ NEWCARD imp Pre-commit review requested. OLDCARD imp Pre-commit review requested. wi imp Pre-commit review requested. -telnet markm commits _must_ be made to src/crypto/telnet - first, only then to "base" telnet via "make - unifdef". The "base" commit _must_ be made. +telnet markm please ensure that a security-aware person + sanity-checks your work. secure/* markm please ensure that a security-aware person sanity-checks your work. kerberos5/* markm please ensure that a security-aware person ==== //depot/projects/hammer/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.284 2003/07/04 17:35:26 ru Exp $ +# $FreeBSD: src/Makefile,v 1.286 2003/07/20 12:38:29 ru Exp $ # # The user-driven targets are: # @@ -65,7 +65,7 @@ hierarchy install installcheck installkernel installkernel.debug\ reinstallkernel reinstallkernel.debug installmost installworld \ libraries lint maninstall \ - mk most obj objlink regress rerelease tags update \ + most obj objlink regress rerelease tags update \ _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend @@ -143,7 +143,7 @@ # upgrade_checks: @if ! (cd ${.CURDIR}/tools/regression/usr.bin/make && \ - PATH=${PATH} ${MAKE} >/dev/null 2>&1); \ + PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ (cd ${.CURDIR} && make make); \ fi ==== //depot/projects/hammer/bin/ed/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.26 2003/06/29 10:03:35 ru Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.28 2003/07/20 12:26:24 ru Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c @@ -8,7 +8,7 @@ .if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) DISTRIBUTION=crypto CFLAGS+=-DDES -WARNS= 2 +WARNS?= 2 DPADD= ${LIBCRYPTO} LDADD= -lcrypto .endif ==== //depot/projects/hammer/bin/ed/re.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ed/re.c,v 1.19 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/re.c,v 1.20 2003/07/20 10:24:09 ru Exp $"); #include "ed.h" @@ -41,10 +41,10 @@ pattern_t * get_compiled_pattern(void) { - static pattern_t *exp = NULL; + static pattern_t *expr = NULL; static char error[1024]; - char *exps; + char *exprs; char delimiter; int n; @@ -52,27 +52,27 @@ errmsg = "invalid pattern delimiter"; return NULL; } else if (delimiter == '\n' || *++ibufp == '\n' || *ibufp == delimiter) { - if (!exp) + if (!expr) errmsg = "no previous pattern"; - return exp; - } else if ((exps = extract_pattern(delimiter)) == NULL) + return expr; + } else if ((exprs = extract_pattern(delimiter)) == NULL) return NULL; /* buffer alloc'd && not reserved */ - if (exp && !patlock) - regfree(exp); - else if ((exp = (pattern_t *) malloc(sizeof(pattern_t))) == NULL) { + if (expr && !patlock) + regfree(expr); + else if ((expr = (pattern_t *) malloc(sizeof(pattern_t))) == NULL) { fprintf(stderr, "%s\n", strerror(errno)); errmsg = "out of memory"; return NULL; } patlock = 0; - if ((n = regcomp(exp, exps, 0))) { - regerror(n, exp, error, sizeof error); + if ((n = regcomp(expr, exprs, 0))) { + regerror(n, expr, error, sizeof error); errmsg = error; - free(exp); - return exp = NULL; + free(expr); + return expr = NULL; } - return exp; + return expr; } ==== //depot/projects/hammer/bin/setfacl/setfacl.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.7 2002/12/30 15:36:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.8 2003/07/18 16:00:26 rwatson Exp $"); #include #include @@ -153,7 +153,7 @@ entry = zmalloc(sizeof(struct sf_entry)); entry->acl = acl_from_text(optarg); if (entry->acl == NULL) - err(1, "acl_from_text() failed"); + err(1, "%s", optarg); entry->op = OP_MERGE_ACL; TAILQ_INSERT_TAIL(&entrylist, entry, next); break; @@ -164,7 +164,7 @@ entry = zmalloc(sizeof(struct sf_entry)); entry->acl = acl_from_text(optarg); if (entry->acl == NULL) - err(1, "acl_from_text() failed"); + err(1, "%s", optarg); entry->op = OP_REMOVE_ACL; TAILQ_INSERT_TAIL(&entrylist, entry, next); break; ==== //depot/projects/hammer/contrib/openpam/include/security/pam_types.h#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/pam_types.h#12 $ + * $P4: //depot/projects/openpam/include/security/pam_types.h#13 $ */ #ifndef _PAM_TYPES_H_INCLUDED @@ -47,22 +47,22 @@ * XSSO 5.1.1 */ struct pam_message { - int msg_style; - const char *msg; + int msg_style; + char *msg; }; struct pam_response { - char *resp; - int resp_retcode; + char *resp; + int resp_retcode; }; /* * XSSO 5.1.2 */ struct pam_conv { - int (*conv)(int, const struct pam_message **, - struct pam_response **, void *); - void *appdata_ptr; + int (*conv)(int, const struct pam_message **, + struct pam_response **, void *); + void *appdata_ptr; }; /* @@ -75,9 +75,9 @@ * Solaris 9 */ typedef struct pam_repository { - char *type; - void *scope; - size_t scope_len; + char *type; + void *scope; + size_t scope_len; } pam_repository_t; #ifdef __cplusplus ==== //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.c#2 (text+ko) ==== @@ -30,6 +30,7 @@ * SUCH DAMAGE. * * $Id: mount_smbfs.c,v 1.17 2002/04/10 04:17:51 bp Exp $ + * $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.c,v 1.2 2003/07/20 11:27:54 tjr Exp $ */ #include #include @@ -75,7 +76,7 @@ extern void dropsuid(); extern int loadsmbvfs(); #else - struct vfsconf vfc; + struct xvfsconf vfc; #endif /* APPLE */ char *next; int opt, error, mntflags, caseopt; ==== //depot/projects/hammer/contrib/top/commands.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ * Copyright (c) 1984, 1989, William LeFebvre, Rice University * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University * - * $FreeBSD: src/contrib/top/commands.c,v 1.5 2002/01/24 17:52:26 dwmalone Exp $ + * $FreeBSD: src/contrib/top/commands.c,v 1.6 2003/07/17 23:56:40 julian Exp $ */ /* @@ -71,6 +71,7 @@ d - change number of displays to show\n\ e - list errors generated by last \"kill\" or \"renice\" command\n\ i - toggle the displaying of idle processes\n\ +H - toggle the displaying of threads\n\ I - same as 'i'\n\ k - kill processes; send a signal to a list of processes\n\ n or # - change number of processes to display\n", stdout); ==== //depot/projects/hammer/contrib/top/machine.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.5 2002/01/24 17:58:42 dwmalone Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.6 2003/07/17 23:56:40 julian Exp $ */ /* @@ -59,6 +59,7 @@ int idle; /* show idle processes */ int self; /* show self */ int system; /* show system processes */ + int thread; /* show threads */ int uid; /* only this uid (unless uid == -1) */ char *command; /* only this command (unless == NULL) */ }; ==== //depot/projects/hammer/contrib/top/top.c#2 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.9 2002/01/24 17:55:40 dwmalone Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.10 2003/07/17 23:56:40 julian Exp $ */ /* @@ -192,9 +192,9 @@ fd_set readfds; #ifdef ORDER - static char command_chars[] = "\f qh?en#sdkriIuto"; + static char command_chars[] = "\f qh?en#sdkriIutHo"; #else - static char command_chars[] = "\f qh?en#sdkriIut"; + static char command_chars[] = "\f qh?en#sdkriIutH"; #endif /* these defines enumerate the "strchr"s of the commands in command_chars */ #define CMD_redraw 0 @@ -214,8 +214,9 @@ #define CMD_idletog2 13 #define CMD_user 14 #define CMD_selftog 15 +#define CMD_thrtog 16 #ifdef ORDER -#define CMD_order 16 +#define CMD_order 17 #endif /* set the buffer for stdout */ @@ -245,6 +246,7 @@ ps.self = -1; ps.system = No; ps.uid = -1; + ps.thread = No; ps.command = NULL; /* get preset options from the environment */ @@ -270,7 +272,7 @@ optind = 1; } - while ((i = getopt(ac, av, "SIbinquvs:d:U:o:t")) != EOF) + while ((i = getopt(ac, av, "SIHbinquvs:d:U:o:t")) != EOF) { switch(i) { @@ -365,10 +367,14 @@ ps.self = (ps.self == -1) ? getpid() : -1; break; + case 'H': + ps.thread = !ps.thread; + break; + default: fprintf(stderr, "\ Top version %s\n\ -Usage: %s [-ISbinqut] [-d x] [-s x] [-o field] [-U username] [number]\n", +Usage: %s [-HISbinqut] [-d x] [-s x] [-o field] [-U username] [number]\n", version_string(), myname); exit(1); } @@ -955,6 +961,13 @@ } break; + case CMD_thrtog: + ps.thread = !ps.thread; + new_message(MT_standout | MT_delayed, + " %sisplaying threads.", + ps.thread ? "D" : "Not d"); + putchar('\r'); + break; #ifdef ORDER case CMD_order: new_message(MT_standout, ==== //depot/projects/hammer/etc/defaults/pccard.conf#8 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.260 2003/04/10 17:16:01 shiba Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.261 2003/07/19 05:40:06 imp Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -544,6 +544,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# D-Link DFE-670 Fast Ethernet Card +card "D-Link" "DFE-670TXD" + config auto "ed" ? 0x80010 + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # D-Link DME-560T LAN/FAX/MODEM Card (as Ethernet) card "D-Link" "DME560T" config default "ed" ? ==== //depot/projects/hammer/kerberos5/Makefile#5 (text+ko) ==== @@ -1,9 +1,10 @@ -# $FreeBSD: src/kerberos5/Makefile,v 1.14 2003/05/05 07:58:42 markm Exp $ +# $FreeBSD: src/kerberos5/Makefile,v 1.15 2003/07/16 20:59:13 markm Exp $ SUBDIR= doc lib libexec usr.bin usr.sbin # These are the programs which depend on Kerberos. -KPROGS= lib/libpam secure/lib/libssh secure/usr.bin/ssh secure/usr.sbin/sshd +KPROGS= lib/libpam \ + secure/lib/libssh secure/usr.bin/ssh secure/usr.sbin/sshd # This target is used to rebuild these programs WITH Kerberos. kerberize: ==== //depot/projects/hammer/kerberos5/Makefile.inc#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/Makefile.inc,v 1.17 2003/07/02 23:46:37 ru Exp $ +# $FreeBSD: src/kerberos5/Makefile.inc,v 1.19 2003/07/18 13:21:55 markm Exp $ DISTRIBUTION?= crypto NOLINT= true @@ -7,7 +7,6 @@ KRB5DIR= ${.CURDIR}/../../../crypto/heimdal ROKENDIR= ${.CURDIR}/../../lib/libroken -TELNETDIR= ${.CURDIR}/../../../crypto/telnet CFLAGS+=-I${INCLUDEOBJDIR} -DHAVE_CONFIG_H @@ -62,59 +61,53 @@ LIBSL= ${.CURDIR}/../../lib/libsl/libsl.a .endif -.if exists(${.OBJDIR}/../../lib/libtelnet) -LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a -.else -LIBTELNET= ${.CURDIR}/../../lib/libtelnet/libtelnet.a -.endif - COMPILE_ET= compile_et -.ORDER: asn1_err.c asn1_err.h -asn1_err.c asn1_err.h: ${KRB5DIR}/lib/asn1/asn1_err.et +.ORDER: asn1_err.c ${.OBJDIR}/asn1_err.h +asn1_err.c ${.OBJDIR}/asn1_err.h: ${KRB5DIR}/lib/asn1/asn1_err.et test -e ${.OBJDIR}/asn1_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} asn1_err.et CLEANFILES+=asn1_err.h asn1_err.c asn1_err.et -.ORDER: hdb_err.c hdb_err.h -hdb_err.c hdb_err.h: ${KRB5DIR}/lib/hdb/hdb_err.et +.ORDER: hdb_err.c ${.OBJDIR}/hdb_err.h +hdb_err.c ${.OBJDIR}/hdb_err.h: ${KRB5DIR}/lib/hdb/hdb_err.et test -e ${.OBJDIR}/hdb_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} hdb_err.et CLEANFILES+=hdb_err.h hdb_err.c hdb_err.et -.ORDER: heim_err.c heim_err.h -heim_err.c heim_err.h: ${KRB5DIR}/lib/krb5/heim_err.et +.ORDER: heim_err.c ${.OBJDIR}/heim_err.h +heim_err.c ${.OBJDIR}/heim_err.h: ${KRB5DIR}/lib/krb5/heim_err.et test -e ${.OBJDIR}/heim_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} heim_err.et CLEANFILES+=heim_err.h heim_err.c heim_err.et -.ORDER: krb5_err.c krb5_err.h -krb5_err.c krb5_err.h: ${KRB5DIR}/lib/krb5/krb5_err.et +.ORDER: krb5_err.c ${.OBJDIR}/krb5_err.h +krb5_err.c ${.OBJDIR}/krb5_err.h: ${KRB5DIR}/lib/krb5/krb5_err.et test -e ${.OBJDIR}/krb5_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} krb5_err.et CLEANFILES+=krb5_err.h krb5_err.c krb5_err.et -.ORDER: kadm5_err.c kadm5_err.h -kadm5_err.c kadm5_err.h: \ +.ORDER: kadm5_err.c ${.OBJDIR}/kadm5_err.h +kadm5_err.c ${.OBJDIR}/kadm5_err.h: \ ${KRB5DIR}/lib/kadm5/kadm5_err.et test -e ${.OBJDIR}/kadm5_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} kadm5_err.et CLEANFILES+=kadm5_err.h kadm5_err.c kadm5_err.et -.ORDER: k524_err.c k524_err.h -k524_err.c k524_err.h: \ +.ORDER: k524_err.c ${.OBJDIR}/k524_err.h +k524_err.c ${.OBJDIR}/k524_err.h: \ ${KRB5DIR}/lib/krb5/k524_err.et test -e ${.OBJDIR}/k524_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} k524_err.et CLEANFILES+=k524_err.h k524_err.c k524_err.et -roken.h: make-roken +${.OBJDIR}/roken.h: make-roken ./make-roken > tmp.h ;\ if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \ else rm -f roken.h; mv tmp.h roken.h; fi ==== //depot/projects/hammer/kerberos5/lib/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/kerberos5/lib/Makefile,v 1.7 2003/03/09 21:56:50 markm Exp $ +# $FreeBSD: src/kerberos5/lib/Makefile,v 1.8 2003/07/16 20:59:13 markm Exp $ -SUBDIR= libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl libgssapi libtelnet +SUBDIR= libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl libgssapi .include ==== //depot/projects/hammer/kerberos5/lib/libasn1/Makefile#5 (text+ko) ==== @@ -1,14 +1,25 @@ -# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.18 2003/04/05 20:30:29 imp Exp $ +# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.19 2003/07/18 13:21:55 markm Exp $ LIB= asn1 -CFLAGS+=-I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I${INCLUDEOBJDIR} \ + +SRCS= \ + der_get.c \ + der_put.c \ + der_free.c \ + der_length.c \ + der_copy.c \ + timegm.c \ + asn1_err.c \ + ${.OBJDIR}/asn1_err.h \ + ${.OBJDIR}/krb5_asn1.h \ + ${.OBJDIR}/roken.h \ + ${GEN:S/.x/.c/g} + +CFLAGS+=-I${KRB5DIR}/include \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/roken \ + -I${INCLUDEOBJDIR} \ -I${.OBJDIR} -SRCS= der_get.c der_put.c der_free.c der_length.c der_copy.c \ - timegm.c asn1_err.c asn1_err.h krb5_asn1.h roken.h \ - ${GEN:S/.x/.c/g} GEN= \ asn1_APOptions.x \ @@ -63,7 +74,7 @@ asn1_TransitedEncoding.x \ asn1_UNSIGNED.x -INCS= krb5_asn1.h asn1_err.h +INCS= ${.OBJDIR}/krb5_asn1.h ${.OBJDIR}/asn1_err.h .include @@ -71,7 +82,7 @@ .PATH: ${KRB5DIR}/lib/vers .PATH: ${KRB5DIR}/lib/roken -beforedepend all: roken.h +beforedepend all: ${.OBJDIR}/roken.h .for I in ${GEN} ${I:S/.x/.c/}: ${I} @@ -80,7 +91,7 @@ CLEANFILES+= ${GEN:S/.x/.c/g} krb5_asn1.h asn1_files -${GEN} krb5_asn1.h: asn1_compile k5.asn1 +${GEN} ${.OBJDIR}/krb5_asn1.h: asn1_compile k5.asn1 ./asn1_compile ${KRB5DIR}/lib/asn1/k5.asn1 krb5_asn1 build-tools: make-print-version make-roken asn1_compile @@ -101,25 +112,26 @@ symbol.c \ getarg.c \ warnerr.c \ - print_version.o \ + ${.OBJDIR}/print_version.o \ get_window_size.c \ strupr.c ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.OODATE} ${LDADD} -parse.o: parse.c roken.h +${.OBJDIR}/parse.o: ${.OBJDIR}/parse.c ${.OBJDIR}/roken.h -.ORDER: parse.c parse.h -parse.h parse.c: parse.y +.ORDER: ${.OBJDIR}/parse.c ${.OBJDIR}/parse.h +${.OBJDIR}/parse.h ${.OBJDIR}/parse.c: parse.y ${YACC} -d ${.OODATE} cp y.tab.c parse.c cp y.tab.h parse.h -lex.o: lex.l parse.h roken.h +lex.o: lex.l ${.OBJDIR}/parse.h ${.OBJDIR}/roken.h -print_version.o: print_version.h print_version.c roken.h +${.OBJDIR}/print_version.o: ${.OBJDIR}/print_version.h print_version.c \ + ${.OBJDIR}/roken.h ${CC} ${CFLAGS} -c -o ${.TARGET} ${KRB5DIR}/lib/vers/print_version.c -print_version.h: make-print-version +${.OBJDIR}/print_version.h: make-print-version ./make-print-version print_version.h make-print-version: make-print-version.c ==== //depot/projects/hammer/kerberos5/lib/libgssapi/Makefile#2 (text+ko) ==== @@ -1,56 +1,63 @@ -# $FreeBSD: src/kerberos5/lib/libgssapi/Makefile,v 1.4 2002/05/12 16:00:49 ru Exp $ +# $FreeBSD: src/kerberos5/lib/libgssapi/Makefile,v 1.5 2003/07/18 13:21:55 markm Exp $ LIB= gssapi -CFLAGS+=-I${KRB5DIR}/lib/gssapi \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/des \ - -I${KRB5DIR}/include \ - -I${ASN1OBJDIR} \ + +SRCS= \ + 8003.c \ + accept_sec_context.c \ + acquire_cred.c \ + add_oid_set_member.c \ + canonicalize_name.c \ + compare_name.c \ + context_time.c \ + copy_ccache.c \ + create_emtpy_oid_set.c \ + decapsulate.c \ + delete_sec_context.c \ + display_name.c \ + display_status.c \ + duplicate_name.c \ + encapsulate.c \ + export_sec_context.c \ + export_name.c \ + external.c \ + get_mic.c \ + gssapi.h \ + gssapi_locl.h \ + import_name.c \ + import_sec_context.c \ + indicate_mechs.c \ + init.c \ + init_sec_context.c \ + inquire_context.c \ + inquire_cred.c \ + release_buffer.c \ + release_cred.c \ + release_name.c \ + release_oid_set.c \ + test_oid_set_member.c \ + unwrap.c \ + v1.c \ + verify_mic.c \ + wrap.c \ + address_to_krb5addr.c \ + ${.OBJDIR}/heim_err.h \ + ${.OBJDIR}/krb5_err.h \ + ${.OBJDIR}/k524_err.h + +CFLAGS+=-I${KRB5DIR}/lib/gssapi \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/des \ + -I${KRB5DIR}/include \ + -I${ASN1OBJDIR} \ -I${.OBJDIR} -SRCS= \ - 8003.c \ >>> TRUNCATED FOR MAIL (1000 lines) <<<