From owner-p4-projects@FreeBSD.ORG Sat Jul 19 22:01:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 103A237B404; Sat, 19 Jul 2003 22:01:13 -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 981DE37B401 for ; Sat, 19 Jul 2003 22:01:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8ED5943F93 for ; Sat, 19 Jul 2003 22:01:11 -0700 (PDT) (envelope-from marcel@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 h6K51B0U088472 for ; Sat, 19 Jul 2003 22:01:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6K51A16088469 for perforce@freebsd.org; Sat, 19 Jul 2003 22:01:10 -0700 (PDT) Date: Sat, 19 Jul 2003 22:01:10 -0700 (PDT) Message-Id: <200307200501.h6K51A16088469@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34741 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: Sun, 20 Jul 2003 05:01:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=34741 Change 34741 by marcel@marcel_nfs on 2003/07/19 22:00:55 IFC @34738 Affected files ... .. //depot/projects/ia64/MAINTAINERS#34 integrate .. //depot/projects/ia64/Makefile#28 integrate .. //depot/projects/ia64/bin/setfacl/setfacl.c#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h.fixed#3 delete .. //depot/projects/ia64/contrib/top/commands.c#3 integrate .. //depot/projects/ia64/contrib/top/machine.h#3 integrate .. //depot/projects/ia64/contrib/top/top.c#4 integrate .. //depot/projects/ia64/etc/defaults/pccard.conf#21 integrate .. //depot/projects/ia64/kerberos5/Makefile.inc#11 integrate .. //depot/projects/ia64/kerberos5/lib/libasn1/Makefile#8 integrate .. //depot/projects/ia64/kerberos5/lib/libgssapi/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/lib/libhdb/Makefile#9 integrate .. //depot/projects/ia64/kerberos5/lib/libkadm5clnt/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/lib/libkadm5srv/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/lib/libkrb5/Makefile#6 integrate .. //depot/projects/ia64/kerberos5/lib/libroken/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/lib/libsl/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/lib/libvers/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/libexec/hprop/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/libexec/hpropd/Makefile#7 integrate .. //depot/projects/ia64/kerberos5/libexec/ipropd-master/Makefile#8 integrate .. //depot/projects/ia64/kerberos5/libexec/ipropd-slave/Makefile#8 integrate .. //depot/projects/ia64/kerberos5/libexec/kadmind/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/libexec/kdc/Makefile#8 integrate .. //depot/projects/ia64/kerberos5/libexec/kpasswdd/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kadmin/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kdestroy/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kinit/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/usr.bin/klist/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kpasswd/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/usr.bin/krb5-config/Makefile#9 integrate .. //depot/projects/ia64/kerberos5/usr.bin/ksu/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/usr.sbin/kstash/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/usr.sbin/ktutil/Makefile#8 integrate .. //depot/projects/ia64/lib/Makefile#31 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/makecontext.c#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/signalcontext.c#1 branch .. //depot/projects/ia64/lib/libc/gen/getpwent.c#14 integrate .. //depot/projects/ia64/lib/libc/gen/raise.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/time.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/time.c#3 integrate .. //depot/projects/ia64/lib/libpthread/Makefile#11 integrate .. //depot/projects/ia64/lib/libpthread/arch/amd64/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/context.S#1 branch .. //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/enter_uts.S#1 branch .. //depot/projects/ia64/lib/libpthread/arch/amd64/include/atomic_ops.h#1 branch .. //depot/projects/ia64/lib/libpthread/arch/amd64/include/ksd.h#1 branch .. //depot/projects/ia64/lib/libpthread/arch/amd64/include/pthread_md.h#1 branch .. //depot/projects/ia64/lib/libpthread/arch/i386/include/ksd.h#4 integrate .. //depot/projects/ia64/lib/libpthread/pthread.map#3 integrate .. //depot/projects/ia64/lib/libpthread/test/sigsuspend_d.c#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/Makefile.inc#9 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_attr_init.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#10 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_concurrency.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#14 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_create.c#12 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_find_thread.c#5 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_init.c#13 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#25 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_mutex.c#7 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_nanosleep.c#6 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#16 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_raise.c#1 branch .. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#17 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigmask.c#6 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigpending.c#6 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigsuspend.c#8 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigwait.c#10 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_yield.c#5 integrate .. //depot/projects/ia64/lib/libthr/arch/alpha/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libthr/arch/alpha/alpha/_curthread.c#1 branch .. //depot/projects/ia64/libexec/getty/main.c#8 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#106 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#27 integrate .. //depot/projects/ia64/rescue/librescue/Makefile#3 integrate .. //depot/projects/ia64/rescue/rescue/Makefile#6 integrate .. //depot/projects/ia64/sbin/atm/ilmid/ilmid.c#8 integrate .. //depot/projects/ia64/sbin/mount/mount.c#10 integrate .. //depot/projects/ia64/sbin/umount/umount.8#6 integrate .. //depot/projects/ia64/sbin/umount/umount.c#8 integrate .. //depot/projects/ia64/secure/libexec/telnetd/Makefile#6 delete .. //depot/projects/ia64/share/man/man4/an.4#4 integrate .. //depot/projects/ia64/share/man/man4/ath.4#4 integrate .. //depot/projects/ia64/share/man/man4/ath_hal.4#2 integrate .. //depot/projects/ia64/share/man/man4/sbp.4#9 integrate .. //depot/projects/ia64/share/man/man4/wi.4#27 integrate .. //depot/projects/ia64/share/man/man4/wlan.4#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#46 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#19 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#25 integrate .. //depot/projects/ia64/sys/conf/files#89 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#34 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#13 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_isab.c#3 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#18 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_pccard.c#14 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#16 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep.c#9 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_eisa.c#4 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_isa.c#5 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_mca.c#3 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_pccard.c#8 integrate .. //depot/projects/ia64/sys/dev/ep/if_epreg.h#2 integrate .. //depot/projects/ia64/sys/dev/ep/if_epvar.h#3 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#34 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdma.c#4 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#29 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#21 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#15 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#38 integrate .. //depot/projects/ia64/sys/dev/hatm/if_hatm.c#4 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#31 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#31 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#26 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#13 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#22 integrate .. //depot/projects/ia64/sys/i386/isa/vesa.c#9 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#44 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#60 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#60 integrate .. //depot/projects/ia64/sys/kern/kern_umtx.c#6 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#30 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#31 integrate .. //depot/projects/ia64/sys/kern/uipc_mbuf.c#20 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#33 integrate .. //depot/projects/ia64/sys/net/if.c#24 integrate .. //depot/projects/ia64/sys/net/if_atm.h#8 integrate .. //depot/projects/ia64/sys/net/route.h#8 integrate .. //depot/projects/ia64/sys/netatm/atm_subr.c#13 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_msg.c#6 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#28 integrate .. //depot/projects/ia64/sys/netinet/raw_ip.c#23 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#22 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#42 integrate .. //depot/projects/ia64/sys/pci/if_dcreg.h#16 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#37 integrate .. //depot/projects/ia64/sys/sparc64/include/cache.h#7 integrate .. //depot/projects/ia64/sys/sys/kse.h#13 integrate .. //depot/projects/ia64/sys/sys/proc.h#71 integrate .. //depot/projects/ia64/sys/sys/socketvar.h#29 integrate .. //depot/projects/ia64/sys/sys/syscall.h#29 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#29 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#32 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#32 integrate .. //depot/projects/ia64/sys/vm/swap_pager.h#11 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#43 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#60 integrate .. //depot/projects/ia64/sys/vm/vm_swap.c#22 delete .. //depot/projects/ia64/tools/tools/tinderbox/www/index.cgi#4 integrate .. //depot/projects/ia64/usr.bin/sockstat/sockstat.c#5 integrate .. //depot/projects/ia64/usr.bin/top/machine.c#6 integrate .. //depot/projects/ia64/usr.bin/top/top.local.1#2 integrate .. //depot/projects/ia64/usr.sbin/arp/arp.8#6 integrate .. //depot/projects/ia64/usr.sbin/arp/arp.c#13 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpr/printcap.5#5 integrate .. //depot/projects/ia64/usr.sbin/mountd/mountd.c#7 integrate .. //depot/projects/ia64/usr.sbin/pccard/pccardc/enabler.c#2 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#34 (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/ia64/Makefile#28 (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.285 2003/07/19 23:17:08 ru Exp $ # # The user-driven targets are: # @@ -141,7 +141,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/ia64/bin/setfacl/setfacl.c#5 (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/ia64/contrib/top/commands.c#3 (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/ia64/contrib/top/machine.h#3 (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/ia64/contrib/top/top.c#4 (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/ia64/etc/defaults/pccard.conf#21 (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/ia64/kerberos5/Makefile.inc#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/Makefile.inc,v 1.18 2003/07/16 20:59:13 markm Exp $ +# $FreeBSD: src/kerberos5/Makefile.inc,v 1.19 2003/07/18 13:21:55 markm Exp $ DISTRIBUTION?= crypto NOLINT= true @@ -63,51 +63,51 @@ 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/ia64/kerberos5/lib/libasn1/Makefile#8 (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/ia64/kerberos5/lib/libgssapi/Makefile#4 (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 \ - 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 - -INCS= gssapi.h heim_err.h krb5_err.h k524_err.h +INCS= gssapi.h \ + ${.OBJDIR}/heim_err.h \ + ${.OBJDIR}/krb5_err.h \ + ${.OBJDIR}/k524_err.h .include ==== //depot/projects/ia64/kerberos5/lib/libhdb/Makefile#9 (text+ko) ==== @@ -1,40 +1,41 @@ -# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.12 2003/06/18 09:11:33 mr Exp $ +# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.13 2003/07/18 13:21:55 markm Exp $ LIB= hdb -CFLAGS+=-I${KRB5DIR}/include \ - -I${INCLUDEOBJDIR} \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/hdb \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I${.OBJDIR} \ - -I${ASN1OBJDIR} \ - ${LDAPCFLAGS} SRCS= \ - common.c \ - db.c \ - db3.c \ - hdb-ldap.c \ - hdb.c \ - keytab.c \ - mkey.c \ - ndbm.c \ - print.c \ - hdb_err.c \ - hdb_err.h \ - hdb_asn1.h \ - k524_err.h \ - krb5_err.h \ - heim_err.h \ + common.c \ + db.c \ + db3.c \ + hdb-ldap.c \ + hdb.c \ + keytab.c \ + mkey.c \ + ndbm.c \ + print.c \ + hdb_err.c \ + ${.OBJDIR}/hdb_err.h \ + ${.OBJDIR}/hdb_asn1.h \ + ${.OBJDIR}/k524_err.h \ + ${.OBJDIR}/krb5_err.h \ + ${.OBJDIR}/heim_err.h \ ${GEN:S/.x/.c/g} -GEN= \ - asn1_Key.x \ - asn1_GENERATION.x \ - asn1_Event.x \ - asn1_HDBFlags.x \ - asn1_hdb_entry.x \ +CFLAGS+=-I${KRB5DIR}/include \ + -I${INCLUDEOBJDIR} \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/hdb \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/roken \ + -I${.OBJDIR} \ + -I${ASN1OBJDIR} \ + ${LDAPCFLAGS} + +GEN= \ + asn1_Key.x \ + asn1_GENERATION.x \ + asn1_Event.x \ + asn1_HDBFlags.x \ + asn1_hdb_entry.x \ asn1_Salt.x .include @@ -53,7 +54,7 @@ CLEANFILES+= ${GEN:S/.x/.c/g} hdb_asn1.h asn1_files -${GEN} hdb_asn1.h: asn1_compile hdb.asn1 +${GEN} ${.OBJDIR}/hdb_asn1.h: asn1_compile hdb.asn1 ./asn1_compile ${KRB5DIR}/lib/hdb/hdb.asn1 hdb_asn1 asn1_compile: parse.o lex.o main.c hash.c symbol.c emalloc.c gen.c \ ==== //depot/projects/ia64/kerberos5/lib/libkadm5clnt/Makefile#2 (text+ko) ==== @@ -1,39 +1,40 @@ -# $FreeBSD: src/kerberos5/lib/libkadm5clnt/Makefile,v 1.3 2001/02/14 19:47:15 markm Exp $ +# $FreeBSD: src/kerberos5/lib/libkadm5clnt/Makefile,v 1.4 2003/07/18 13:21:55 markm Exp $ LIB= kadm5clnt -CFLAGS+=-I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/kadm5 \ - -I${KRB5DIR}/lib/hdb \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I${ASN1OBJDIR} \ - -I${HDBOBJDIR} \ - -I${.OBJDIR} SRCS= \ - admin.h \ - chpass_c.c \ - common_glue.c \ - create_c.c \ - delete_c.c \ - destroy_c.c \ - flush_c.c \ - free.c \ - get_c.c \ - get_princs_c.c \ - init_c.c \ - kadm5_err.c \ - kadm5_err.h \ - kadm5_locl.h \ - marshall.c \ - modify_c.c \ - private.h \ - privs_c.c \ - randkey_c.c \ - rename_c.c \ - send_recv.c \ - client_glue.c + chpass_c.c \ + common_glue.c \ + create_c.c \ + delete_c.c \ + destroy_c.c \ + flush_c.c \ + free.c \ + get_c.c \ + get_princs_c.c \ + init_c.c \ + kadm5_err.c \ + marshall.c \ + modify_c.c \ + privs_c.c \ + randkey_c.c \ + rename_c.c \ + send_recv.c \ + client_glue.c \ + admin.h \ + private.h \ + kadm5_locl.h \ + ${.OBJDIR}/kadm5_err.h + +CFLAGS+=-I${KRB5DIR}/include \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kadm5 \ + -I${KRB5DIR}/lib/hdb \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/roken \ + -I${ASN1OBJDIR} \ + -I${HDBOBJDIR} \ + -I${.OBJDIR} .include ==== //depot/projects/ia64/kerberos5/lib/libkadm5srv/Makefile#2 (text+ko) ==== @@ -1,48 +1,49 @@ -# $FreeBSD: src/kerberos5/lib/libkadm5srv/Makefile,v 1.3 2001/02/14 19:47:18 markm Exp $ +# $FreeBSD: src/kerberos5/lib/libkadm5srv/Makefile,v 1.4 2003/07/18 13:21:55 markm Exp $ LIB= kadm5srv -CFLAGS+=-I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/kadm5 \ - -I${KRB5DIR}/lib/hdb \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I${ASN1OBJDIR} \ - -I${HDBOBJDIR} \ - -I${.OBJDIR} SRCS= \ - acl.c \ - admin.h \ - bump_pw_expire.c \ - chpass_s.c \ - common_glue.c \ - context_s.c \ - create_s.c \ - delete_s.c \ - destroy_s.c \ - ent_setup.c \ - error.c \ - flush_s.c \ - free.c \ - get_princs_s.c \ - get_s.c \ - init_s.c \ - kadm5_err.c \ - kadm5_err.h \ - kadm5_locl.h \ - keys.c \ - log.c \ - marshall.c \ - modify_s.c \ - private.h \ - privs_s.c \ - randkey_s.c \ - rename_s.c \ - set_keys.c \ - set_modifier.c \ - password_quality.c \ - server_glue.c + acl.c \ + bump_pw_expire.c \ + chpass_s.c \ + common_glue.c \ + context_s.c \ + create_s.c \ + delete_s.c \ + destroy_s.c \ + ent_setup.c \ + error.c \ + flush_s.c \ + free.c \ + get_princs_s.c \ + get_s.c \ + init_s.c \ + kadm5_err.c \ + keys.c \ + log.c \ + marshall.c \ + modify_s.c \ + privs_s.c \ + randkey_s.c \ + rename_s.c \ + set_keys.c \ + set_modifier.c \ + password_quality.c \ + server_glue.c \ + admin.h \ + kadm5_locl.h \ + private.h \ + ${.OBJDIR}/kadm5_err.h + +CFLAGS+=-I${KRB5DIR}/include \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kadm5 \ + -I${KRB5DIR}/lib/hdb \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/roken \ + -I${ASN1OBJDIR} \ + -I${HDBOBJDIR} \ + -I${.OBJDIR} .include ==== //depot/projects/ia64/kerberos5/lib/libkrb5/Makefile#6 (text+ko) ==== @@ -1,148 +1,154 @@ -# $FreeBSD: src/kerberos5/lib/libkrb5/Makefile,v 1.12 2003/03/09 21:56:51 markm Exp $ +# $FreeBSD: src/kerberos5/lib/libkrb5/Makefile,v 1.13 2003/07/18 13:21:55 markm Exp $ LIB= krb5 -CFLAGS+=-I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/des \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/include \ - -I${KRB5OBJDIR} \ + +SRCS= \ + acl.c \ + add_et_list.c \ + addr_families.c \ + aname_to_localname.c \ + appdefault.c \ + asn1_glue.c \ + auth_context.c \ + build_ap_req.c \ + build_auth.c \ + cache.c \ + changepw.c \ + codec.c \ + config_file.c \ + config_file_netinfo.c \ + convert_creds.c \ + constants.c \ + context.c \ + copy_host_realm.c \ + crc.c \ + creds.c \ + crypto.c \ + data.c \ + eai_to_heim_errno.c \ + error_string.c \ + expand_hostname.c \ + fcache.c \ + free.c \ + free_host_realm.c \ + generate_seq_number.c \ + generate_subkey.c \ + get_addrs.c \ + get_cred.c \ + get_default_principal.c \ + get_default_realm.c \ + get_for_creds.c \ + get_host_realm.c \ + get_in_tkt.c \ + get_in_tkt_pw.c \ + get_in_tkt_with_keytab.c \ + get_in_tkt_with_skey.c \ + get_port.c \ + init_creds.c \ + init_creds_pw.c \ + keyblock.c \ + keytab.c \ + keytab_any.c \ + keytab_file.c \ + keytab_memory.c \ + keytab_keyfile.c \ + keytab_krb4.c \ + krbhst.c \ + kuserok.c \ + log.c \ + mcache.c \ + misc.c \ + mk_error.c \ + mk_priv.c \ + mk_rep.c \ >>> TRUNCATED FOR MAIL (1000 lines) <<<