Date: Thu, 11 Apr 2002 03:07:36 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9564 for review Message-ID: <200204111007.g3BA7aX74412@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9564 Change 9564 by peter@peter_daintree on 2002/04/11 03:07:06 IFC @9563 - hopefully I got everthing needed for the loader. Affected files ... ... //depot/projects/ia64/UPDATING#8 integrate ... //depot/projects/ia64/etc/defaults/rc.conf#9 integrate ... //depot/projects/ia64/etc/rc.network#13 integrate ... //depot/projects/ia64/lib/libc/stdio/scanf.3#3 integrate ... //depot/projects/ia64/lib/libpam/libpam/Makefile#8 integrate ... //depot/projects/ia64/lib/libpam/modules/Makefile.inc#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_deny/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_ftp/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_kerberosIV/Makefile#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_krb5/Makefile#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_lastlog/Makefile#2 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_login_access/Makefile#2 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_nologin/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_opie/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_opieaccess/Makefile#2 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_passwdqc/Makefile#2 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_permit/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_radius/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_rootok/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_securetty/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_self/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_ssh/Makefile#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_tacplus/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_unix/Makefile#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_wheel/Makefile#3 integrate ... //depot/projects/ia64/share/man/man4/tcp.4#3 integrate ... //depot/projects/ia64/share/mk/bsd.obj.mk#3 integrate ... //depot/projects/ia64/share/mk/bsd.prog.mk#5 integrate ... //depot/projects/ia64/sys/boot/common/module.c#3 integrate ... //depot/projects/ia64/sys/boot/efi/libefi/efifs.c#4 integrate ... //depot/projects/ia64/sys/boot/i386/boot2/boot2.c#5 integrate ... //depot/projects/ia64/sys/conf/files.ia64#4 integrate ... //depot/projects/ia64/sys/conf/options.ia64#2 integrate ... //depot/projects/ia64/sys/dev/ata/ata-raid.h#6 integrate ... //depot/projects/ia64/sys/dev/ciss/ciss.c#4 integrate ... //depot/projects/ia64/sys/dev/wi/if_wavelan_ieee.h#5 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi.c#13 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#3 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#2 integrate ... //depot/projects/ia64/sys/dev/wi/if_wireg.h#8 integrate ... //depot/projects/ia64/sys/dev/wi/if_wivar.h#3 integrate ... //depot/projects/ia64/sys/dev/wi/wi_hostap.c#1 branch ... //depot/projects/ia64/sys/dev/wi/wi_hostap.h#1 branch ... //depot/projects/ia64/sys/i386/i386/machdep.c#15 integrate ... //depot/projects/ia64/sys/i386/include/cpufunc.h#7 integrate ... //depot/projects/ia64/sys/ia64/ia32/Makefile#1 branch ... //depot/projects/ia64/sys/ia64/ia32/ia32_proto.h#1 branch ... //depot/projects/ia64/sys/ia64/ia32/ia32_syscall.h#1 branch ... //depot/projects/ia64/sys/ia64/ia32/ia32_sysent.c#1 branch ... //depot/projects/ia64/sys/ia64/ia32/imgact_ia32.c#1 branch ... //depot/projects/ia64/sys/ia64/ia32/imgact_ia32.h#1 branch ... //depot/projects/ia64/sys/ia64/ia32/syscalls.conf#1 branch ... //depot/projects/ia64/sys/ia64/ia32/syscalls.master#1 branch ... //depot/projects/ia64/sys/ia64/ia64/support.s#3 integrate ... //depot/projects/ia64/sys/ia64/ia64/swtch.s#6 integrate ... //depot/projects/ia64/sys/ia64/ia64/trap.c#20 integrate ... //depot/projects/ia64/sys/ia64/include/ia64_cpu.h#4 integrate ... //depot/projects/ia64/sys/ia64/include/pcb.h#3 integrate ... //depot/projects/ia64/sys/ia64/include/signal.h#2 integrate ... //depot/projects/ia64/sys/libkern/bsearch.c#3 integrate ... //depot/projects/ia64/sys/net/if_ef.c#3 integrate ... //depot/projects/ia64/sys/net/if_ieee80211.h#2 integrate ... //depot/projects/ia64/sys/netinet/in.h#9 integrate ... //depot/projects/ia64/sys/netinet/ip_ecn.c#2 integrate ... //depot/projects/ia64/sys/netinet/tcp_input.c#8 integrate ... //depot/projects/ia64/sys/netinet/tcp_subr.c#9 integrate ... //depot/projects/ia64/sys/pc98/i386/machdep.c#13 integrate ... //depot/projects/ia64/sys/pci/if_rl.c#8 integrate ... //depot/projects/ia64/sys/pci/if_rlreg.h#3 integrate ... //depot/projects/ia64/usr.sbin/cron/lib/misc.c#2 integrate ... //depot/projects/ia64/usr.sbin/kldxref/ef.c#4 integrate ... //depot/projects/ia64/usr.sbin/kldxref/ef.h#2 integrate ... //depot/projects/ia64/usr.sbin/rpc.lockd/lockd.c#5 integrate Differences ... ==== //depot/projects/ia64/UPDATING#8 (text+ko) ==== @@ -1,9 +1,8 @@ Updating Information for FreeBSD current users This file is maintained and copyrighted by M. Warner Losh -<imp@village.org>. Please send new entries directly to him. See end -of file for further details. For commonly done items, please see the -COMMON ITEMS: section later in the file. +<imp@village.org>. See end of file for further details. For commonly +done items, please see the COMMON ITEMS: section later in the file. NOTE TO PEOPLE WHO THINK THAT 5.0-CURRENT IS SLOW: FreeBSD 5.0-CURRENT has many debugging features turned on, in @@ -802,6 +801,11 @@ of the config file has changed as well. Please see GENERIC or NEWCARD for examples of the new format. + Indirectly, this also breaks USERCONFIG. Unless a newer entry + says that it has been fixed, assume that must use the hints mechanism + in the loader if you need to use a machine with very old ISA cards + in it. + 20000522: A new set of binutils went into the tree today. Anybody building a kernel after this point is advised that they need @@ -973,16 +977,13 @@ and it only starts on March 15, 2000. Updating files can found in previous releases if your system is older than this. -Please filter your entries through Warner Losh (imp@village.org) so -that the style, formatting, etc of this file can be maintained. - Copyright information: -Copyright 1998, 2001 M. Warner Losh. All Rights Reserved. +Copyright 1998, 2002 M. Warner Losh. All Rights Reserved. Redistribution, publication, translation and use, with or without modification, in full or in part, in any form or format of this -document are permitted. +document are permitted without further permission from the author. THIS DOCUMENT IS PROVIDED BY WARNER LOSH ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -1002,4 +1003,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.197 2002/04/05 07:42:42 gshapiro Exp $ +$FreeBSD: src/UPDATING,v 1.199 2002/04/11 05:45:17 imp Exp $ ==== //depot/projects/ia64/etc/defaults/rc.conf#9 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.144 2002/04/06 18:02:52 asmodai Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.146 2002/04/11 08:48:52 peter Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -31,7 +31,7 @@ pccard_conf="/etc/defaults/pccard.conf" # pccardd(8) config file pccard_ether_delay="5" # Delay before trying to start dhclient in pccard_ether removable_interfaces="" # Removable network interfaces for /etc/pccard_ether. -local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs. +local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs. script_name_sep=" " # Change if your startup scripts' names contain spaces rc_conf_files="/etc/rc.conf /etc/rc.conf.local" fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. ==== //depot/projects/ia64/etc/rc.network#13 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.network,v 1.132 2002/04/01 18:33:45 dougb Exp $ +# $FreeBSD: src/etc/rc.network,v 1.133 2002/04/10 22:30:54 peter Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -853,15 +853,20 @@ [Yy][Ee][Ss]) if [ -x /usr/bin/ssh-keygen ]; then if [ ! -f /etc/ssh/ssh_host_key ]; then - echo ' creating ssh RSA host key'; - /usr/bin/ssh-keygen -trsa1 -N "" \ + echo ' creating ssh protocol v1 RSA host key'; + /usr/bin/ssh-keygen -t rsa1 -N "" \ -f /etc/ssh/ssh_host_key fi if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then - echo ' creating ssh DSA host key'; - /usr/bin/ssh-keygen -tdsa -N "" \ + echo ' creating ssh protocol v2 DSA host key'; + /usr/bin/ssh-keygen -t dsa -N "" \ -f /etc/ssh/ssh_host_dsa_key fi + if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then + echo ' creating ssh protocol v2 RSA host key'; + /usr/bin/ssh-keygen -t rsa -N "" \ + -f /etc/ssh/ssh_host_rsa_key + fi fi ;; esac ==== //depot/projects/ia64/lib/libc/stdio/scanf.3#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)scanf.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/stdio/scanf.3,v 1.14 2002/03/10 09:20:28 dd Exp $ +.\" $FreeBSD: src/lib/libc/stdio/scanf.3,v 1.15 2002/04/10 20:52:49 trhodes Exp $ .\" .Dd December 11, 1993 .Dt SCANF 3 @@ -422,13 +422,6 @@ .Fn sscanf conform to .St -isoC . -.Sh HISTORY -The functions -.Fn vscanf , -.Fn vsscanf -and -.Fn vfscanf -are new to this release. .Sh BUGS The current situation with .Cm %F ==== //depot/projects/ia64/lib/libpam/libpam/Makefile#8 (text+ko) ==== @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.31 2002/04/08 12:34:53 des Exp $ +# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.32 2002/04/10 17:46:59 ru Exp $ # OPENPAM = ${.CURDIR}/../../../contrib/openpam @@ -141,19 +141,19 @@ STATICOBJS += openpam_static_modules.o CLEANFILES += openpam_static.o -_EXTRADEPEND: openpam_static.c +# We want to add to _EXTRADEPEND actions, not to override them. +_EXTRADEPEND: _EXTRADEPEND_openpam_static.c +_EXTRADEPEND_openpam_static.c: openpam_static.c ${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \ ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*} \ ${.ALLSRC} -.if ${OBJFORMAT} == elf -CLEANFILES+= setdef0.o openpam_static_modules.o setdef1.o \ - setdef0.c setdef1.c setdefs.h +CLEANFILES+= openpam_static_modules.o openpam_static_modules.o: openpam_static.o ${STATIC_MODULES} +.if ${OBJFORMAT} == elf ${LD} -o ${.TARGET} -r --whole-archive ${.ALLSRC} .else -openpam_static_modules.o: openpam_static.o ${STATIC_MODULES} ${LD} -o ${.TARGET} -r -Bforcearchive ${.ALLSRC} .endif ==== //depot/projects/ia64/lib/libpam/modules/Makefile.inc#4 (text+ko) ==== @@ -1,9 +1,10 @@ -# $FreeBSD: src/lib/libpam/modules/Makefile.inc,v 1.10 2002/04/06 19:32:37 des Exp $ +# $FreeBSD: src/lib/libpam/modules/Makefile.inc,v 1.11 2002/04/10 18:06:58 ru Exp $ PAMDIR= ${.CURDIR}/../../../../contrib/openpam INTERNALLIB= yes INTERNALSTATICLIB=yes +SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR} CFLAGS+= -I${PAMDIR}/include CFLAGS+= -I${.CURDIR}/../../libpam ==== //depot/projects/ia64/lib/libpam/modules/pam_deny/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_deny/Makefile,v 1.5 2002/03/05 21:56:08 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_deny/Makefile,v 1.6 2002/04/10 18:07:00 ru Exp $ LIB= pam_deny -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_deny.c MAN= pam_deny.8 ==== //depot/projects/ia64/lib/libpam/modules/pam_ftp/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_ftp/Makefile,v 1.3 2002/03/05 21:56:08 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_ftp/Makefile,v 1.4 2002/04/10 18:07:00 ru Exp $ LIB= pam_ftp -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_ftp.c MAN= pam_ftp.8 ==== //depot/projects/ia64/lib/libpam/modules/pam_kerberosIV/Makefile#4 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_kerberosIV/Makefile,v 1.10 2002/04/07 12:53:58 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_kerberosIV/Makefile,v 1.11 2002/04/10 18:07:00 ru Exp $ LIB= pam_kerberosIV -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_kerberosIV.c klogin.c NO_WERROR= yes CFLAGS+= -DKERBEROS ==== //depot/projects/ia64/lib/libpam/modules/pam_krb5/Makefile#4 (text+ko) ==== @@ -22,16 +22,15 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_krb5/Makefile,v 1.7 2002/04/07 04:44:16 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_krb5/Makefile,v 1.9 2002/04/10 18:07:01 ru Exp $ LIB= pam_krb5 -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_krb5.c NO_WERROR= yes DPADD= ${LIBKRB5} ${LIBGSSAPI} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBCOM_ERR} ${LIBROKEN} LDADD= -lkrb5 -lgssapi -lasn1 -lcrypto -lcrypt -lcom_err \ - -L${.OBJDIR}/../../../../kerberos5/lib/libroken -lroken + -lroken MAN= pam_krb5.8 .include <bsd.lib.mk> ==== //depot/projects/ia64/lib/libpam/modules/pam_lastlog/Makefile#2 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_lastlog/Makefile,v 1.3 2002/03/05 21:56:14 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_lastlog/Makefile,v 1.4 2002/04/10 18:07:01 ru Exp $ LIB= pam_lastlog -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_lastlog.c DPADD= ${LIBUTIL} LDADD= -lutil ==== //depot/projects/ia64/lib/libpam/modules/pam_login_access/Makefile#2 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_login_access/Makefile,v 1.3 2002/03/05 21:56:14 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_login_access/Makefile,v 1.4 2002/04/10 18:07:01 ru Exp $ LIB= pam_login_access -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_login_access.c login_access.c MAN= pam_login_access.8 ==== //depot/projects/ia64/lib/libpam/modules/pam_nologin/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_nologin/Makefile,v 1.5 2002/03/05 21:56:14 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_nologin/Makefile,v 1.6 2002/04/10 18:07:02 ru Exp $ LIB= pam_nologin -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_nologin.c DPADD= ${LIBUTIL} LDADD= -lutil ==== //depot/projects/ia64/lib/libpam/modules/pam_opie/Makefile#3 (text+ko) ==== @@ -23,10 +23,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_opie/Makefile,v 1.7 2002/03/05 21:56:21 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_opie/Makefile,v 1.8 2002/04/10 18:07:02 ru Exp $ LIB= pam_opie -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_opie.c DPADD= ${LIBOPIE} LDADD= -lopie ==== //depot/projects/ia64/lib/libpam/modules/pam_opieaccess/Makefile#2 (text+ko) ==== @@ -1,7 +1,6 @@ -# $FreeBSD: src/lib/libpam/modules/pam_opieaccess/Makefile,v 1.2 2002/03/05 21:56:22 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_opieaccess/Makefile,v 1.3 2002/04/10 18:07:02 ru Exp $ LIB= pam_opieaccess -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= ${LIB}.c DPADD= ${LIBOPIE} LDADD= -lopie ==== //depot/projects/ia64/lib/libpam/modules/pam_passwdqc/Makefile#2 (text+ko) ==== @@ -1,9 +1,8 @@ -# $FreeBSD: src/lib/libpam/modules/pam_passwdqc/Makefile,v 1.1 2002/04/04 16:08:28 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_passwdqc/Makefile,v 1.2 2002/04/10 18:07:02 ru Exp $ SRCDIR= ${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc LIB= pam_passwdqc -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c CFLAGS+= -I${SRCDIR} -DPAM_AUTHTOK_RECOVER_ERR=PAM_AUTHTOK_RECOVERY_ERR MAN= #pam_passwdqc.8 ==== //depot/projects/ia64/lib/libpam/modules/pam_permit/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_permit/Makefile,v 1.5 2002/03/05 21:56:22 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_permit/Makefile,v 1.6 2002/04/10 18:07:03 ru Exp $ LIB= pam_permit -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_permit.c MAN= pam_permit.8 ==== //depot/projects/ia64/lib/libpam/modules/pam_radius/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_radius/Makefile,v 1.10 2002/03/05 21:56:22 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_radius/Makefile,v 1.11 2002/04/10 18:07:03 ru Exp $ LIB= pam_radius -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_radius.c DPADD= ${LIBRADIUS} LDADD= -lradius ==== //depot/projects/ia64/lib/libpam/modules/pam_rootok/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_rootok/Makefile,v 1.4 2002/03/05 21:56:23 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_rootok/Makefile,v 1.5 2002/04/10 18:07:03 ru Exp $ LIB= pam_rootok -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_rootok.c MAN= pam_rootok.8 ==== //depot/projects/ia64/lib/libpam/modules/pam_securetty/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_securetty/Makefile,v 1.3 2002/03/05 21:56:23 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_securetty/Makefile,v 1.4 2002/04/10 18:07:04 ru Exp $ LIB= pam_securetty -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_securetty.c MAN= pam_securetty.8 ==== //depot/projects/ia64/lib/libpam/modules/pam_self/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_self/Makefile,v 1.2 2002/03/05 21:56:24 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_self/Makefile,v 1.3 2002/04/10 18:07:04 ru Exp $ LIB= pam_self -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_self.c MAN= pam_self.8 ==== //depot/projects/ia64/lib/libpam/modules/pam_ssh/Makefile#4 (text+ko) ==== @@ -1,10 +1,9 @@ # PAM module for SSH -# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.12 2002/03/05 21:56:24 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.13 2002/04/10 18:07:04 ru Exp $ SSHSRC= ${.CURDIR}/../../../../crypto/openssh LIB= pam_ssh -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_ssh.c CFLAGS+= -I${SSHSRC} DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ==== //depot/projects/ia64/lib/libpam/modules/pam_tacplus/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_tacplus/Makefile,v 1.6 2002/03/05 21:56:24 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_tacplus/Makefile,v 1.7 2002/04/10 18:07:05 ru Exp $ LIB= pam_tacplus -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_tacplus.c DPADD= ${LIBTACPLUS} LDADD= -ltacplus ==== //depot/projects/ia64/lib/libpam/modules/pam_unix/Makefile#4 (text+ko) ==== @@ -22,13 +22,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_unix/Makefile,v 1.13 2002/03/18 12:55:10 cjc Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_unix/Makefile,v 1.15 2002/04/10 18:07:05 ru Exp $ LIB= pam_unix -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_unix.c pw_copy.c pw_yp.c pw_util.c ypxfr_misc.c ${GENSRCS} CFLAGS+= -DYP -Dyp_error=warnx \ - -I${.OBJDIR} \ + -I. \ -I${.CURDIR}/../../../../libexec/ypxfr \ -I${.CURDIR}/../../../../usr.sbin/vipw \ -I${.CURDIR}/../../../../usr.bin/chpass \ ==== //depot/projects/ia64/lib/libpam/modules/pam_wheel/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_wheel/Makefile,v 1.4 2002/03/05 21:56:25 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_wheel/Makefile,v 1.5 2002/04/10 18:07:05 ru Exp $ LIB= pam_wheel -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_wheel.c MAN= pam_wheel.8 ==== //depot/projects/ia64/share/man/man4/tcp.4#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.23 2002/01/21 12:09:13 mpp Exp $ +.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.24 2002/04/10 19:52:21 silby Exp $ .\" .Dd February 14, 1995 .Dt TCP 4 @@ -255,13 +255,6 @@ Flush packets in the .Tn TCP reassembly queue if the system is low on mbufs. -.\" -.\" This option should go away and become the default. -.\" -.It tcp.tcp_lq_overflow -If a connection is dropped due to a listen queue overflow, delete the -cloned route associated with the connection if it does not have any -prior information. .It tcp.blackhole If enabled, disable sending of RST when a connection is attempted to a port where there is not a socket accepting connections. @@ -290,12 +283,10 @@ .It tcp.pcbcount Number of active process control blocks (read-only). -.It tcp.strict_rfc1948 -Enable strict RFC 1948 (Defending Against Sequence Number Attacks) -compliance. -Setting this variable to a non-zero value will disable reseeding and -will disable the use of randomized initial sequence numbers in favor -of MD5-generated initial sequence numbers. +.It tcp.syncookies +Determines whether or not syn cookies should be generated for +outbound syn-ack packets. Syn cookies are a great help during +syn flood attacks, and are enabled by default. .It tcp.isn_reseed_interval The interval (in seconds) specifying how often the secret data used in RFC 1948 initial sequence number calculations should be reseeded. ==== //depot/projects/ia64/share/mk/bsd.obj.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.obj.mk,v 1.38 2002/02/06 18:08:31 ru Exp $ +# $FreeBSD: src/share/mk/bsd.obj.mk,v 1.39 2002/04/11 08:54:21 ru Exp $ # # The include file <bsd.obj.mk> handles creating the 'obj' directory # and cleaning up object files, etc. @@ -144,7 +144,7 @@ echo "LDADD -> $$ldadd1" ; \ fi .else - @dpadd=`echo \`ld -Bstatic -f ${LDDESTDIR} ${LDADD}\`` ; \ + @dpadd=`echo \`ld -Bstatic -f ${LDADD}\`` ; \ if [ "$$dpadd" != "${DPADD}" ] ; then \ echo ${.CURDIR} ; \ echo "LDADD -> $$dpadd" ; \ ==== //depot/projects/ia64/share/mk/bsd.prog.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.105 2002/04/07 14:58:12 ru Exp $ +# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.106 2002/04/11 08:54:21 ru Exp $ .if !target(__initialized__) __initialized__: @@ -32,7 +32,7 @@ OBJS+= ${SRCS:N*.h:R:S/$/.o/g} ${PROG}: ${OBJS} - ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDDESTDIR} ${LDADD} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} .else !defined(SRCS) @@ -47,7 +47,7 @@ OBJS= ${PROG}.o ${PROG}: ${OBJS} - ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDDESTDIR} ${LDADD} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} .endif .endif @@ -74,7 +74,7 @@ .if defined(PROG) _EXTRADEPEND: .if ${OBJFORMAT} == aout - echo ${PROG}: `${CC} -Wl,-f ${CFLAGS} ${LDFLAGS} ${LDDESTDIR} \ + echo ${PROG}: `${CC} -Wl,-f ${CFLAGS} ${LDFLAGS} \ ${LDADD:S/^/-Wl,/}` >> ${DEPENDFILE} .else echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE} ==== //depot/projects/ia64/sys/boot/common/module.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/module.c,v 1.22 2001/11/16 21:08:40 iedowse Exp $ + * $FreeBSD: src/sys/boot/common/module.c,v 1.23 2002/04/11 10:00:44 peter Exp $ */ /* @@ -937,6 +937,8 @@ mdp->d_flags = 0; STAILQ_INSERT_TAIL(&moduledir_list, mdp, d_link); } + if (*ep == 0) + break; } /* * Delete unused directories if any ==== //depot/projects/ia64/sys/boot/efi/libefi/efifs.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.5 2002/03/30 01:36:03 marcel Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.6 2002/04/11 09:50:11 peter Exp $ */ #include <sys/param.h> @@ -233,6 +233,8 @@ sb->st_mode = S_IRUSR | S_IWUSR; if (info->Attribute & EFI_FILE_DIRECTORY) sb->st_mode |= S_IFDIR; + else + sb->st_mode |= S_IFREG; sb->st_size = info->FileSize; free(buf); ==== //depot/projects/ia64/sys/boot/i386/boot2/boot2.c#5 (text+ko) ==== @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.38 2002/03/23 19:40:27 pb Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.39 2002/04/11 09:21:10 pb Exp $ */ #include <sys/param.h> @@ -37,6 +37,11 @@ #include "boot2.h" #include "lib.h" +#define IO_KEYBOARD 1 +#define IO_SERIAL 2 + +#define SECOND 18 /* Circa that many ticks in a second. */ + #define RBX_ASKNAME 0x0 /* -a */ #define RBX_SINGLE 0x1 /* -s */ #define RBX_DFLTROOT 0x5 /* -r */ @@ -138,7 +143,7 @@ static struct bootinfo bootinfo; static int ls; static uint32_t fs_off; -static uint8_t ioctrl = 0x1; +static uint8_t ioctrl = IO_KEYBOARD; void exit(int); static void load(const char *); @@ -281,34 +286,43 @@ bootinfo.bi_memsizes_valid++; for (i = 0; i < N_BIOS_GEOM; i++) bootinfo.bi_bios_geom[i] = drvinfo(i); - autoboot = 2; + + /* Process configuration file */ + + autoboot = 1; readfile(PATH_CONFIG, cmd, sizeof(cmd)); if (*cmd) { printf("%s: %s", PATH_CONFIG, cmd); if (parse(cmd)) autoboot = 0; + /* Do not process this command twice */ *cmd = 0; } + + /* + * Try to exec stage 3 boot loader. If interrupted by a keypress, + * or in case of failure, try to load a kernel directly instead. + */ + if (autoboot && !*kname) { - if (autoboot == 2) { - memcpy(kname, PATH_BOOT3, sizeof(PATH_BOOT3)); - if (!keyhit(0x37)) { - load(kname); - autoboot = 1; - } + memcpy(kname, PATH_BOOT3, sizeof(PATH_BOOT3)); + if (!keyhit(3*SECOND)) { + load(kname); + memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL)); } - if (autoboot == 1) - memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL)); } + + /* Present the user with the boot2 prompt. */ + for (;;) { printf(" \n>> FreeBSD/i386 BOOT\n" "Default: %u:%s(%u,%c)%s\n" "boot: ", dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit, 'a' + dsk.part, kname); - if (ioctrl & 0x2) + if (ioctrl & IO_SERIAL) sio_flush(); - if (!autoboot || keyhit(0x5a)) + if (!autoboot || keyhit(5*SECOND)) getstr(cmd, sizeof(cmd)); else putchar('\n'); @@ -447,9 +461,9 @@ opts |= 1 << RBX_DUAL | 1 << RBX_SERIAL; opts &= ~(1 << RBX_PROBEKBD); } - ioctrl = opts & 1 << RBX_DUAL ? 0x3 : - opts & 1 << RBX_SERIAL ? 0x2 : 0x1; - if (ioctrl & 0x2) + ioctrl = opts & 1 << RBX_DUAL ? (IO_SERIAL|IO_KEYBOARD) : + opts & 1 << RBX_SERIAL ? IO_SERIAL : IO_KEYBOARD; + if (ioctrl & IO_SERIAL) sio_init(); } else { for (q = arg--; *q && *q != '('; q++); @@ -794,9 +808,9 @@ static int xputc(int c) { - if (ioctrl & 0x1) + if (ioctrl & IO_KEYBOARD) putc(c); - if (ioctrl & 0x2) + if (ioctrl & IO_SERIAL) sio_putc(c); return c; } @@ -807,9 +821,9 @@ if (opts & 1 << RBX_NOINTR) return 0; for (;;) { - if (ioctrl & 0x1 && getc(1)) + if (ioctrl & IO_KEYBOARD && getc(1)) return fn ? 1 : getc(0); - if (ioctrl & 0x2 && sio_ischar()) + if (ioctrl & IO_SERIAL && sio_ischar()) return fn ? 1 : sio_getc(); if (fn) return 0; ==== //depot/projects/ia64/sys/conf/files.ia64#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.29 2002/04/03 04:42:14 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.30 2002/04/10 19:35:50 dfr Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -22,6 +22,8 @@ ia64/acpica/acpi_wakeup.c optional acpica ia64/acpica/OsdEnvironment.c optional acpica ia64/acpica/madt.c optional acpica +ia64/ia32/ia32_sysent.c optional ia32 +ia64/ia32/imgact_ia32.c optional ia32 ia64/ia64/ia64-gdbstub.c optional ddb ia64/ia64/ia64dump.c standard ia64/ia64/autoconf.c standard ==== //depot/projects/ia64/sys/conf/options.ia64#2 (text+ko) ==== @@ -1,8 +1,10 @@ -# $FreeBSD: src/sys/conf/options.ia64,v 1.8 2001/09/29 11:46:22 dfr Exp $ +# $FreeBSD: src/sys/conf/options.ia64,v 1.9 2002/04/10 19:35:50 dfr Exp $ # Options specific to the ia64 platform kernels ITANIUM opt_global.h +IA32 opt_ia32.h + PAGE_SIZE_4K opt_global.h PAGE_SIZE_8K opt_global.h PAGE_SIZE_16K opt_global.h ==== //depot/projects/ia64/sys/dev/ata/ata-raid.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.17 2002/04/02 13:47:23 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.18 2002/04/11 08:52:32 sos Exp $ */ /* misc defines */ @@ -158,8 +158,8 @@ u_int32_t dummy_0; u_int64_t magic_0; -#define PR_MAGIC0(x) ((u_int64_t)x.device->channel->unit << 48) | \ - ((u_int64_t)(x.device->unit != 0) << 56) +#define PR_MAGIC0(x) (x.device ? ((u_int64_t)x.device->channel->unit<<48) | \ + ((u_int64_t)(x.device->unit != 0) << 56) : 0) u_int16_t magic_1; u_int32_t magic_2; u_int8_t filler1[470]; ==== //depot/projects/ia64/sys/dev/ciss/ciss.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.3 2001/12/18 08:01:48 peter Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.4 2002/04/11 09:28:09 ps Exp $ */ /* @@ -1999,8 +1999,9 @@ * Create a SIM. */ if ((sc->ciss_cam_sim = cam_sim_alloc(ciss_cam_action, ciss_cam_poll, "ciss", sc, - device_get_unit(sc->ciss_dev), 1, + device_get_unit(sc->ciss_dev), sc->ciss_cfg->max_outstanding_commands, + 1, sc->ciss_cam_devq)) == NULL) { ciss_printf(sc, "can't allocate CAM SIM\n"); return(ENOMEM); ==== //depot/projects/ia64/sys/dev/wi/if_wavelan_ieee.h#5 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/wi/if_wavelan_ieee.h,v 1.11 2002/04/04 06:28:16 imp Exp $ + * $FreeBSD: src/sys/dev/wi/if_wavelan_ieee.h,v 1.12 2002/04/11 07:21:16 imp Exp $ */ #ifndef _IF_WAVELAN_IEEE_H @@ -50,6 +50,7 @@ #ifndef SIOCGWAVELAN #define SIOCGWAVELAN SIOCGIFGENERIC #endif +#define WI_RID_MONITOR_MODE 0x0500 /* * Technically I don't think there's a limit to a record @@ -113,6 +114,13 @@ #define WI_STYPE_MGMT_AUTH 0x00B0 /* authentication */ #define WI_STYPE_MGMT_DEAUTH 0x00C0 /* deauthentication */ +#define WI_STYPE_CTL_PSPOLL 0x00A0 +#define WI_STYPE_CTL_RTS 0x00B0 +#define WI_STYPE_CTL_CTS 0x00C0 +#define WI_STYPE_CTL_ACK 0x00D0 +#define WI_STYPE_CTL_CFEND 0x00E0 +#define WI_STYPE_CTL_CFENDACK 0x00F0 + struct wi_mgmt_hdr { u_int16_t frame_ctl; u_int16_t duration; @@ -209,7 +217,7 @@ #define IV_EVERY100_FRAME 0x60 /* every 100 frame IV reuse */ #define HOST_DECRYPT 0x80 #define WI_RID_WEP_MAPTABLE 0xFC29 -#define WI_RID_AUTH_CNTL 0xFC2A +#define WI_RID_CNFAUTHMODE 0xFC2A #define WI_RID_ROAMING_MODE 0xFC2D #define WI_RID_BASIC_RATE 0xFCB3 #define WI_RID_SUPPORT_RATE 0xFCB4 @@ -221,7 +229,11 @@ #define WI_RID_CREATE_IBSS 0xFC81 /* create IBSS */ #define WI_RID_FRAG_THRESH 0xFC82 /* frag len, unicast msg xmit */ #define WI_RID_RTS_THRESH 0xFC83 /* frame len for RTS/CTS handshake */ -#define WI_RID_TX_RATE 0xFC84 /* data rate for message xmit */ +#define WI_RID_TX_RATE 0xFC84 /* data rate for message xmit + * 0 == Fixed 1mbps + * 1 == Fixed 2mbps + * 2 == auto fallback + */ #define WI_RID_PROMISC 0xFC85 /* enable promisc mode */ #define WI_RID_FRAG_THRESH0 0xFC90 #define WI_RID_FRAG_THRESH1 0xFC91 ==== //depot/projects/ia64/sys/dev/wi/if_wi.c#13 (text+ko) ==== @@ -95,12 +95,16 @@ #include <net/bpf.h> #include <dev/wi/if_wavelan_ieee.h> +#ifdef WI_HOSTAP +#include <dev/wi/wi_hostap.h> +#include <sys/random.h> +#endif #include <dev/wi/if_wivar.h> #include <dev/wi/if_wireg.h> #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.93 2002/04/04 22:22:31 imp Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.95 2002/04/11 07:21:16 imp Exp $"; #endif static void wi_intr(void *); @@ -124,7 +128,6 @@ static int wi_alloc_nicmem(struct wi_softc *, int, int *); static void wi_inquire(void *); static void wi_setdef(struct wi_softc *, struct wi_req *); -static int wi_mgmt_xmit(struct wi_softc *, caddr_t, int); #ifdef WICACHE static @@ -214,6 +217,7 @@ struct ifnet *ifp; int error; + /* XXX maybe we need the splimp stuff here XXX */ sc = device_get_softc(dev); ifp = &sc->arpcom.ac_if; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204111007.g3BA7aX74412>