From owner-svn-src-user@FreeBSD.ORG Mon Mar 9 06:02:07 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 264F41065670; Mon, 9 Mar 2009 06:02:07 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 105488FC0C; Mon, 9 Mar 2009 06:02:07 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n29627TI011353; Mon, 9 Mar 2009 06:02:07 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n29625Jg011323; Mon, 9 Mar 2009 06:02:05 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200903090602.n29625Jg011323@svn.freebsd.org> From: Lawrence Stewart Date: Mon, 9 Mar 2009 06:02:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189554 - in user/lstewart/alq_varlen_8.x: . contrib/bind9 contrib/bsnmp/snmp_mibII contrib/cpio contrib/csup contrib/file contrib/gdtoa contrib/ncurses contrib/netcat contrib/ntp contr... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2009 06:02:07 -0000 Author: lstewart Date: Mon Mar 9 06:02:05 2009 New Revision: 189554 URL: http://svn.freebsd.org/changeset/base/189554 Log: Merge r188705:188939 from head. Added: user/lstewart/alq_varlen_8.x/sys/boot/ficl/mips/ - copied from r188939, head/sys/boot/ficl/mips/ user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-raid-ddf.h - copied unchanged from r188939, head/sys/dev/ata/ata-raid-ddf.h user/lstewart/alq_varlen_8.x/sys/legacy/ - copied from r188939, head/sys/legacy/ user/lstewart/alq_varlen_8.x/sys/powerpc/include/altivec.h - copied unchanged from r188939, head/sys/powerpc/include/altivec.h user/lstewart/alq_varlen_8.x/sys/powerpc/powerpc/altivec.c - copied unchanged from r188939, head/sys/powerpc/powerpc/altivec.c Deleted: user/lstewart/alq_varlen_8.x/sys/dev/usb/ user/lstewart/alq_varlen_8.x/sys/dev/usb2/include/Makefile user/lstewart/alq_varlen_8.x/sys/dev/usb2/include/usb2_devid.h user/lstewart/alq_varlen_8.x/sys/dev/usb2/include/usb2_devtable.h user/lstewart/alq_varlen_8.x/sys/modules/aue/ user/lstewart/alq_varlen_8.x/sys/modules/axe/ user/lstewart/alq_varlen_8.x/sys/modules/cdce/ user/lstewart/alq_varlen_8.x/sys/modules/cue/ user/lstewart/alq_varlen_8.x/sys/modules/ehci/ user/lstewart/alq_varlen_8.x/sys/modules/kue/ user/lstewart/alq_varlen_8.x/sys/modules/ohci/ user/lstewart/alq_varlen_8.x/sys/modules/rue/ user/lstewart/alq_varlen_8.x/sys/modules/rum/ user/lstewart/alq_varlen_8.x/sys/modules/slhci/ user/lstewart/alq_varlen_8.x/sys/modules/u3g/ user/lstewart/alq_varlen_8.x/sys/modules/uark/ user/lstewart/alq_varlen_8.x/sys/modules/ubsa/ user/lstewart/alq_varlen_8.x/sys/modules/ucom/ user/lstewart/alq_varlen_8.x/sys/modules/udav/ user/lstewart/alq_varlen_8.x/sys/modules/udbp/ user/lstewart/alq_varlen_8.x/sys/modules/ufm/ user/lstewart/alq_varlen_8.x/sys/modules/ufoma/ user/lstewart/alq_varlen_8.x/sys/modules/uftdi/ user/lstewart/alq_varlen_8.x/sys/modules/ugen/ user/lstewart/alq_varlen_8.x/sys/modules/uhci/ user/lstewart/alq_varlen_8.x/sys/modules/uhid/ user/lstewart/alq_varlen_8.x/sys/modules/uipaq/ user/lstewart/alq_varlen_8.x/sys/modules/ukbd/ user/lstewart/alq_varlen_8.x/sys/modules/ulpt/ user/lstewart/alq_varlen_8.x/sys/modules/umass/ user/lstewart/alq_varlen_8.x/sys/modules/umct/ user/lstewart/alq_varlen_8.x/sys/modules/umodem/ user/lstewart/alq_varlen_8.x/sys/modules/ums/ user/lstewart/alq_varlen_8.x/sys/modules/upgt/ user/lstewart/alq_varlen_8.x/sys/modules/uplcom/ user/lstewart/alq_varlen_8.x/sys/modules/ural/ user/lstewart/alq_varlen_8.x/sys/modules/urio/ user/lstewart/alq_varlen_8.x/sys/modules/urtw/ user/lstewart/alq_varlen_8.x/sys/modules/usb/ user/lstewart/alq_varlen_8.x/sys/modules/uscanner/ user/lstewart/alq_varlen_8.x/sys/modules/uslcom/ user/lstewart/alq_varlen_8.x/sys/modules/uvisor/ user/lstewart/alq_varlen_8.x/sys/modules/uvscom/ user/lstewart/alq_varlen_8.x/sys/modules/zyd/ user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/rescue/Files/root/change_password user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/rescue/Files/root/save_cfg user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/rescue/Files/root/save_sshkeys user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/rescue/Files/root/updatep1 user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/rescue/Files/root/updatep2 Modified: user/lstewart/alq_varlen_8.x/ (props changed) user/lstewart/alq_varlen_8.x/Makefile.inc1 user/lstewart/alq_varlen_8.x/UPDATING user/lstewart/alq_varlen_8.x/contrib/bind9/ (props changed) user/lstewart/alq_varlen_8.x/contrib/bsnmp/snmp_mibII/mibII.c user/lstewart/alq_varlen_8.x/contrib/cpio/ (props changed) user/lstewart/alq_varlen_8.x/contrib/csup/ (props changed) user/lstewart/alq_varlen_8.x/contrib/file/ (props changed) user/lstewart/alq_varlen_8.x/contrib/gdtoa/ (props changed) user/lstewart/alq_varlen_8.x/contrib/ncurses/ (props changed) user/lstewart/alq_varlen_8.x/contrib/netcat/ (props changed) user/lstewart/alq_varlen_8.x/contrib/ntp/ (props changed) user/lstewart/alq_varlen_8.x/contrib/openbsm/ (props changed) user/lstewart/alq_varlen_8.x/contrib/openpam/ (props changed) user/lstewart/alq_varlen_8.x/contrib/openpam/include/security/openpam.h user/lstewart/alq_varlen_8.x/contrib/openpam/lib/openpam_dynamic.c user/lstewart/alq_varlen_8.x/contrib/pf/ (props changed) user/lstewart/alq_varlen_8.x/contrib/sendmail/ (props changed) user/lstewart/alq_varlen_8.x/contrib/top/ (props changed) user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/ (props changed) user/lstewart/alq_varlen_8.x/crypto/openssh/ (props changed) user/lstewart/alq_varlen_8.x/crypto/openssl/ (props changed) user/lstewart/alq_varlen_8.x/etc/defaults/rc.conf user/lstewart/alq_varlen_8.x/etc/rc.d/defaultroute user/lstewart/alq_varlen_8.x/gnu/lib/csu/Makefile user/lstewart/alq_varlen_8.x/gnu/lib/libssp/Makefile user/lstewart/alq_varlen_8.x/lib/csu/Makefile.inc user/lstewart/alq_varlen_8.x/lib/libc/ (props changed) user/lstewart/alq_varlen_8.x/lib/libc/arm/sys/Ovfork.S user/lstewart/alq_varlen_8.x/lib/libc/mips/Symbol.map user/lstewart/alq_varlen_8.x/lib/libc/mips/sys/Ovfork.S user/lstewart/alq_varlen_8.x/lib/libc/stdtime/ (props changed) user/lstewart/alq_varlen_8.x/lib/libc/string/ffsll.c (props changed) user/lstewart/alq_varlen_8.x/lib/libc/string/flsll.c (props changed) user/lstewart/alq_varlen_8.x/lib/libpam/modules/Makefile.inc user/lstewart/alq_varlen_8.x/lib/libstand/Makefile user/lstewart/alq_varlen_8.x/lib/libthr/Makefile user/lstewart/alq_varlen_8.x/lib/libutil/ (props changed) user/lstewart/alq_varlen_8.x/libexec/rtld-elf/Makefile user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD.hints user/lstewart/alq_varlen_8.x/release/picobsd/bridge/crunch.conf user/lstewart/alq_varlen_8.x/release/picobsd/build/picobsd user/lstewart/alq_varlen_8.x/release/picobsd/floppy.tree/etc/ttys user/lstewart/alq_varlen_8.x/rescue/librescue/Makefile user/lstewart/alq_varlen_8.x/rescue/rescue/Makefile user/lstewart/alq_varlen_8.x/sbin/ (props changed) user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.8 user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.c user/lstewart/alq_varlen_8.x/sbin/geom/class/journal/gjournal.8 user/lstewart/alq_varlen_8.x/sbin/ifconfig/ifieee80211.c user/lstewart/alq_varlen_8.x/share/man/man4/geom.4 user/lstewart/alq_varlen_8.x/share/man/man4/iwi.4 user/lstewart/alq_varlen_8.x/share/man/man5/rc.conf.5 user/lstewart/alq_varlen_8.x/share/man/man5/src.conf.5 user/lstewart/alq_varlen_8.x/share/man/man9/Makefile user/lstewart/alq_varlen_8.x/share/man/man9/disk.9 user/lstewart/alq_varlen_8.x/share/misc/bsd-family-tree user/lstewart/alq_varlen_8.x/share/misc/committers-ports.dot user/lstewart/alq_varlen_8.x/share/misc/committers-src.dot user/lstewart/alq_varlen_8.x/share/mk/bsd.cpu.mk user/lstewart/alq_varlen_8.x/share/zoneinfo/ (props changed) user/lstewart/alq_varlen_8.x/sys/ (props changed) user/lstewart/alq_varlen_8.x/sys/amd64/amd64/fpu.c user/lstewart/alq_varlen_8.x/sys/amd64/amd64/local_apic.c user/lstewart/alq_varlen_8.x/sys/amd64/amd64/pmap.c user/lstewart/alq_varlen_8.x/sys/amd64/linux32/linux32_machdep.c user/lstewart/alq_varlen_8.x/sys/arm/arm/cpufunc_asm_sheeva.S (props changed) user/lstewart/alq_varlen_8.x/sys/arm/conf/AVILA user/lstewart/alq_varlen_8.x/sys/arm/conf/CAMBRIA user/lstewart/alq_varlen_8.x/sys/boot/Makefile user/lstewart/alq_varlen_8.x/sys/boot/Makefile.inc user/lstewart/alq_varlen_8.x/sys/boot/i386/loader/Makefile user/lstewart/alq_varlen_8.x/sys/boot/ia64/common/Makefile user/lstewart/alq_varlen_8.x/sys/boot/ia64/efi/Makefile user/lstewart/alq_varlen_8.x/sys/boot/ia64/ski/Makefile user/lstewart/alq_varlen_8.x/sys/boot/pc98/loader/Makefile user/lstewart/alq_varlen_8.x/sys/boot/powerpc/ofw/Makefile user/lstewart/alq_varlen_8.x/sys/boot/sparc64/loader/Makefile user/lstewart/alq_varlen_8.x/sys/compat/linux/linux_stats.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/kern_ndis.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/kern_windrv.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/subr_ndis.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/subr_usbd.c user/lstewart/alq_varlen_8.x/sys/conf/files user/lstewart/alq_varlen_8.x/sys/conf/files.powerpc user/lstewart/alq_varlen_8.x/sys/conf/kern.mk user/lstewart/alq_varlen_8.x/sys/contrib/pf/ (props changed) user/lstewart/alq_varlen_8.x/sys/dev/aac/aac.c user/lstewart/alq_varlen_8.x/sys/dev/aac/aac_debug.c user/lstewart/alq_varlen_8.x/sys/dev/aac/aac_pci.c user/lstewart/alq_varlen_8.x/sys/dev/aac/aacreg.h user/lstewart/alq_varlen_8.x/sys/dev/aac/aacvar.h user/lstewart/alq_varlen_8.x/sys/dev/acpica/acpi_cpu.c user/lstewart/alq_varlen_8.x/sys/dev/arcmsr/arcmsr.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-all.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-all.h user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-card.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-cbus.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-disk.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-dma.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-isa.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-pci.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-pci.h user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-queue.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-raid.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-raid.h user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-sata.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-usb.c user/lstewart/alq_varlen_8.x/sys/dev/ata/atapi-cd.c user/lstewart/alq_varlen_8.x/sys/dev/ata/atapi-fd.c user/lstewart/alq_varlen_8.x/sys/dev/ata/atapi-tape.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-acard.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-acerlabs.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-ahci.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-highpoint.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-intel.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-jmicron.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-marvell.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-netcell.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-nvidia.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-promise.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-serverworks.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-siliconimage.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-sis.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-via.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ah.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ah.h user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ah_internal.h user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c user/lstewart/alq_varlen_8.x/sys/dev/ath/if_ath.c user/lstewart/alq_varlen_8.x/sys/dev/ath/if_athvar.h user/lstewart/alq_varlen_8.x/sys/dev/cfi/cfi_bus_ixp4xx.c user/lstewart/alq_varlen_8.x/sys/dev/ciss/ciss.c user/lstewart/alq_varlen_8.x/sys/dev/cx/if_cx.c user/lstewart/alq_varlen_8.x/sys/dev/firewire/firewire.c user/lstewart/alq_varlen_8.x/sys/dev/firewire/firewire.h user/lstewart/alq_varlen_8.x/sys/dev/firewire/sbp.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis_pccard.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis_pci.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis_usb.c user/lstewart/alq_varlen_8.x/sys/dev/md/md.c user/lstewart/alq_varlen_8.x/sys/dev/mmc/mmcsd.c user/lstewart/alq_varlen_8.x/sys/dev/mxge/eth_z8e.h user/lstewart/alq_varlen_8.x/sys/dev/mxge/ethp_z8e.h user/lstewart/alq_varlen_8.x/sys/dev/mxge/if_mxge.c user/lstewart/alq_varlen_8.x/sys/dev/mxge/if_mxge_var.h user/lstewart/alq_varlen_8.x/sys/dev/mxge/mxge_mcp.h user/lstewart/alq_varlen_8.x/sys/dev/mxge/rss_eth_z8e.h user/lstewart/alq_varlen_8.x/sys/dev/mxge/rss_ethp_z8e.h user/lstewart/alq_varlen_8.x/sys/dev/sdhci/sdhci.c user/lstewart/alq_varlen_8.x/sys/dev/tsec/if_tsec.c user/lstewart/alq_varlen_8.x/sys/dev/tsec/if_tsec.h user/lstewart/alq_varlen_8.x/sys/dev/tsec/if_tsec_ocp.c user/lstewart/alq_varlen_8.x/sys/dev/tsec/if_tsecreg.h user/lstewart/alq_varlen_8.x/sys/dev/usb2/bluetooth/ng_ubt2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/bluetooth/ubtbcmfw2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/controller/usb2_bus.h user/lstewart/alq_varlen_8.x/sys/dev/usb2/controller/usb2_controller.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/core/usb2_device.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_aue2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_auereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_axe2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_axereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_cdce2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_cdcereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_cue2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_cuereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_kue2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_kuefw.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_kuereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_rue2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_ruereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_udav2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_udavreg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/image/uscanner2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/input/uhid2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/input/ums2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/misc/udbp2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/misc/ufm2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/quirk/usb2_quirk.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/u3g2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/uark2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/ubsa2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/uchcom2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/ucycom2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/ufoma2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/uftdi2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/ugensa2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/uipaq2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/ulpt2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/umct2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/umodem2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/umoscom2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/uplcom2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/uslcom2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/uvisor2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/uvscom2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/sound/uaudio2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/storage/ata-usb2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/storage/umass2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/storage/urio2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/storage/ustorage2_fs.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_rum2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_rumfw.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_rumreg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_rumvar.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_ural2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_uralreg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_uralvar.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_zyd2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_zydfw.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_zydreg.h (props changed) user/lstewart/alq_varlen_8.x/sys/fs/tmpfs/tmpfs_vnops.c user/lstewart/alq_varlen_8.x/sys/fs/udf/udf_vnops.c user/lstewart/alq_varlen_8.x/sys/geom/geom_dev.c user/lstewart/alq_varlen_8.x/sys/geom/part/g_part.c user/lstewart/alq_varlen_8.x/sys/geom/part/g_part_bsd.c user/lstewart/alq_varlen_8.x/sys/geom/part/g_part_ebr.c user/lstewart/alq_varlen_8.x/sys/geom/part/g_part_if.m user/lstewart/alq_varlen_8.x/sys/i386/acpica/acpi_wakeup.c user/lstewart/alq_varlen_8.x/sys/i386/i386/local_apic.c user/lstewart/alq_varlen_8.x/sys/i386/i386/pmap.c user/lstewart/alq_varlen_8.x/sys/i386/ibcs2/ibcs2_sysi86.c user/lstewart/alq_varlen_8.x/sys/i386/isa/npx.c user/lstewart/alq_varlen_8.x/sys/i386/linux/linux_machdep.c user/lstewart/alq_varlen_8.x/sys/kern/kern_osd.c user/lstewart/alq_varlen_8.x/sys/kern/kern_proc.c user/lstewart/alq_varlen_8.x/sys/kern/tty_pts.c user/lstewart/alq_varlen_8.x/sys/kern/vfs_cache.c user/lstewart/alq_varlen_8.x/sys/kern/vfs_syscalls.c user/lstewart/alq_varlen_8.x/sys/legacy/dev/usb/ (props changed) user/lstewart/alq_varlen_8.x/sys/mips/mips/elf64_machdep.c (props changed) user/lstewart/alq_varlen_8.x/sys/modules/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/bluetooth_fw/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/bluetooth_ng/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/core/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/ethernet_aue/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/ethernet_axe/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/ethernet_cdce/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/ethernet_cue/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/ethernet_dav/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/ethernet_kue/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/ethernet_rue/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/input_hid/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/input_kbd/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/input_ms/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/misc_dbp/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/misc_fm/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/quirk/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/scanner/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_3g/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_ark/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_bsa/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_bser/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_chcom/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_cycom/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_foma/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_ftdi/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_gensa/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_ipaq/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_lpt/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_mct/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_modem/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_moscom/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_plcom/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_slcom/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_visor/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_vscom/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/sound/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/storage_ata/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/storage_fs/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/storage_mass/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/storage_rio/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/template/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/wlan_ral/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/wlan_rum/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/wlan_zyd/Makefile user/lstewart/alq_varlen_8.x/sys/net80211/_ieee80211.h user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_ioctl.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_node.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_phy.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_proto.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_regdomain.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_scan.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_scan_sta.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_tdma.c user/lstewart/alq_varlen_8.x/sys/netinet/sctp_constants.h user/lstewart/alq_varlen_8.x/sys/netinet/sctp_header.h user/lstewart/alq_varlen_8.x/sys/netinet/sctp_input.c user/lstewart/alq_varlen_8.x/sys/netinet/sctp_output.c user/lstewart/alq_varlen_8.x/sys/netinet/sctp_output.h user/lstewart/alq_varlen_8.x/sys/netinet/sctp_pcb.c user/lstewart/alq_varlen_8.x/sys/netinet/sctp_structs.h user/lstewart/alq_varlen_8.x/sys/netinet/sctp_uio.h user/lstewart/alq_varlen_8.x/sys/netinet/sctp_usrreq.c user/lstewart/alq_varlen_8.x/sys/netinet/sctputil.c user/lstewart/alq_varlen_8.x/sys/nfsclient/nfs_vnops.c user/lstewart/alq_varlen_8.x/sys/nfsclient/nfsnode.h user/lstewart/alq_varlen_8.x/sys/powerpc/aim/machdep.c user/lstewart/alq_varlen_8.x/sys/powerpc/aim/swtch.S user/lstewart/alq_varlen_8.x/sys/powerpc/aim/trap.c user/lstewart/alq_varlen_8.x/sys/powerpc/aim/trap_subr.S user/lstewart/alq_varlen_8.x/sys/powerpc/conf/MPC85XX user/lstewart/alq_varlen_8.x/sys/powerpc/include/pcb.h user/lstewart/alq_varlen_8.x/sys/powerpc/include/pcpu.h user/lstewart/alq_varlen_8.x/sys/powerpc/powerpc/genassym.c user/lstewart/alq_varlen_8.x/sys/sys/disk.h user/lstewart/alq_varlen_8.x/sys/sys/jail.h user/lstewart/alq_varlen_8.x/sys/sys/osd.h user/lstewart/alq_varlen_8.x/sys/sys/param.h user/lstewart/alq_varlen_8.x/sys/sys/syscallsubr.h user/lstewart/alq_varlen_8.x/sys/sys/vnode.h user/lstewart/alq_varlen_8.x/sys/vm/swap_pager.c user/lstewart/alq_varlen_8.x/sys/vm/vm_object.c user/lstewart/alq_varlen_8.x/tools/build/options/WITHOUT_LIBPTHREAD user/lstewart/alq_varlen_8.x/tools/build/options/makeman user/lstewart/alq_varlen_8.x/tools/regression/fstest/fstest.c user/lstewart/alq_varlen_8.x/tools/regression/lib/msun/test-conj.t (props changed) user/lstewart/alq_varlen_8.x/tools/tools/net80211/wlantxtime/wlantxtime.c user/lstewart/alq_varlen_8.x/usr.bin/calendar/calendars/calendar.freebsd user/lstewart/alq_varlen_8.x/usr.bin/csup/ (props changed) user/lstewart/alq_varlen_8.x/usr.bin/ktrdump/ktrdump.c user/lstewart/alq_varlen_8.x/usr.bin/printenv/printenv.c user/lstewart/alq_varlen_8.x/usr.bin/procstat/ (props changed) user/lstewart/alq_varlen_8.x/usr.bin/talk/get_names.c user/lstewart/alq_varlen_8.x/usr.bin/truncate/truncate.c user/lstewart/alq_varlen_8.x/usr.bin/vmstat/vmstat.c user/lstewart/alq_varlen_8.x/usr.bin/window/compress.c user/lstewart/alq_varlen_8.x/usr.bin/window/context.c user/lstewart/alq_varlen_8.x/usr.bin/window/lcmd1.c user/lstewart/alq_varlen_8.x/usr.bin/window/lcmd2.c user/lstewart/alq_varlen_8.x/usr.bin/window/scanner.c user/lstewart/alq_varlen_8.x/usr.bin/window/startup.c user/lstewart/alq_varlen_8.x/usr.bin/window/string.c user/lstewart/alq_varlen_8.x/usr.bin/window/ttoutput.c user/lstewart/alq_varlen_8.x/usr.bin/window/tttermcap.c user/lstewart/alq_varlen_8.x/usr.bin/window/ttzapple.c user/lstewart/alq_varlen_8.x/usr.bin/window/var.c user/lstewart/alq_varlen_8.x/usr.bin/window/wwdump.c user/lstewart/alq_varlen_8.x/usr.bin/window/wwend.c user/lstewart/alq_varlen_8.x/usr.bin/window/wwenviron.c user/lstewart/alq_varlen_8.x/usr.bin/window/wwflush.c user/lstewart/alq_varlen_8.x/usr.bin/window/wwinit.c user/lstewart/alq_varlen_8.x/usr.bin/window/wwpty.c user/lstewart/alq_varlen_8.x/usr.bin/window/wwspawn.c user/lstewart/alq_varlen_8.x/usr.bin/window/xx.c user/lstewart/alq_varlen_8.x/usr.sbin/Makefile user/lstewart/alq_varlen_8.x/usr.sbin/dumpcis/cardinfo.h (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/dumpcis/cis.h (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/fwcontrol/fwcontrol.c user/lstewart/alq_varlen_8.x/usr.sbin/lmcconfig/lmcconfig.c user/lstewart/alq_varlen_8.x/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/makefs/ffs/ffs_subr.c (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/makefs/getid.c (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/rpc.yppasswdd/yppasswdd_server.c user/lstewart/alq_varlen_8.x/usr.sbin/rtadvd/rrenum.c user/lstewart/alq_varlen_8.x/usr.sbin/zic/ (props changed) Modified: user/lstewart/alq_varlen_8.x/Makefile.inc1 ============================================================================== --- user/lstewart/alq_varlen_8.x/Makefile.inc1 Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/Makefile.inc1 Mon Mar 9 06:02:05 2009 (r189554) @@ -230,7 +230,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ - -DWITHOUT_SSP \ + SSP_CFLAGS= \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF @@ -240,8 +240,9 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ + SSP_CFLAGS= \ BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS \ - -DNO_WARNS -DNO_CTF -DWITHOUT_SSP + -DNO_WARNS -DNO_CTF # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ @@ -458,7 +459,7 @@ build32: .if ${MK_KERBEROS} != "no" .for _t in obj depend all cd ${.CURDIR}/kerberos5/tools; \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ ${_t} .endfor .endif @@ -481,7 +482,7 @@ build32: .endfor .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic cd ${.CURDIR}/${_dir}; \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ build-tools .endfor cd ${.CURDIR}; \ @@ -782,14 +783,14 @@ buildkernel: @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; \ MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF \ + ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF \ -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) .for target in obj depend all cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \ MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ - ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF ${target} + ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF ${target} .endfor .endif .if !defined(NO_KERNELDEPEND) Modified: user/lstewart/alq_varlen_8.x/UPDATING ============================================================================== --- user/lstewart/alq_varlen_8.x/UPDATING Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/UPDATING Mon Mar 9 06:02:05 2009 (r189554) @@ -22,13 +22,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090217: + The rc.conf(5) option if_up_delay has been renamed to + defaultroute_delay to better reflect its purpose. If you have + customized this setting in /etc/rc.conf you need to update it to + use the new name. + 20090216: xorg 7.4 wants to configure its input devices via hald which does not yet work with USB2. If the keyboard/mouse does not work in xorg then add Option "AllowEmptyInput" "off" to your ServerLayout section. This will cause X to use the configured - kbd and mouse sections from your xorg.conf + kbd and mouse sections from your xorg.conf. 20090215: The GENERIC kernels for all architectures now default to the new USB2 @@ -36,7 +42,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. problem arises please report it and optionally revert to the old USB stack. If you are loading USB kernel modules or have a custom kernel that includes GENERIC then ensure that usb names are also changed over, - eg uftdi -> usb2_serial_ftdi + eg uftdi -> usb2_serial_ftdi. 20090203: The ichsmb(4) driver has been changed to require SMBus slave @@ -74,13 +80,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. the base system (it was a port). 20081216: - The afdata and ifnet locks have been changed from mutexes to + The afdata and ifnet locks have been changed from mutexes to rwlocks, network modules will need to be re-compiled. 20081214: __FreeBSD_version 800059 incorporates the new arp-v2 rewrite. RTF_CLONING, RTF_LLINFO and RTF_WASCLONED flags are eliminated. - The new code reduced struct rtentry{} by 16 bytes on 32-bit + The new code reduced struct rtentry{} by 16 bytes on 32-bit architecture and 40 bytes on 64-bit architecture. The userland applications "arp" and "ndp" have been updated accordingly. The output from "netstat -r" shows only routing entries and Modified: user/lstewart/alq_varlen_8.x/contrib/bsnmp/snmp_mibII/mibII.c ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/bsnmp/snmp_mibII/mibII.c Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/contrib/bsnmp/snmp_mibII/mibII.c Mon Mar 9 06:02:05 2009 (r189554) @@ -1013,7 +1013,7 @@ handle_rtmsg(struct rt_msghdr *rtm) break; case RTM_IFINFO: - ifm = (struct if_msghdr *)rtm; + ifm = (struct if_msghdr *)(void *)rtm; mib_extract_addrs(ifm->ifm_addrs, (u_char *)(ifm + 1), addrs); if ((ifp = mib_find_if_sys(ifm->ifm_index)) == NULL) break; Modified: user/lstewart/alq_varlen_8.x/contrib/openpam/include/security/openpam.h ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openpam/include/security/openpam.h Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/contrib/openpam/include/security/openpam.h Mon Mar 9 06:02:05 2009 (r189554) @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2007 Dag-Erling Smørgrav + * Copyright (c) 2004-2008 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam.h 408 2007-12-21 11:36:24Z des $ + * $Id: openpam.h 418 2008-12-13 22:39:24Z des $ */ #ifndef SECURITY_OPENPAM_H_INCLUDED @@ -309,18 +309,17 @@ struct pam_module { * Infrastructure for static modules using GCC linker sets. * You are not expected to understand this. */ -#if defined(__FreeBSD__) +#if !defined(PAM_SOEXT) # define PAM_SOEXT ".so" -#else -# undef NO_STATIC_MODULES -# define NO_STATIC_MODULES #endif -#if defined(__GNUC__) && !defined(__PIC__) && !defined(NO_STATIC_MODULES) +#if defined(OPENPAM_STATIC_MODULES) +# if !defined(__GNUC__) +# error "Don't know how to build static modules on non-GNU compilers" +# endif /* gcc, static linking */ # include # include -# define OPENPAM_STATIC_MODULES # define PAM_EXTERN static # define PAM_MODULE_ENTRY(name) \ static char _pam_name[] = name PAM_SOEXT; \ Modified: user/lstewart/alq_varlen_8.x/contrib/openpam/lib/openpam_dynamic.c ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openpam/lib/openpam_dynamic.c Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/contrib/openpam/lib/openpam_dynamic.c Mon Mar 9 06:02:05 2009 (r189554) @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2007 Dag-Erling Smørgrav + * Copyright (c) 2004-2008 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,9 +32,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_dynamic.c 408 2007-12-21 11:36:24Z des $ + * $Id: openpam_dynamic.c 417 2008-02-14 18:36:22Z des $ */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include #include @@ -57,6 +61,7 @@ pam_module_t * openpam_dynamic(const char *path) { + const pam_module_t *dlmodule; pam_module_t *module; const char *prefix; char *vpath; @@ -64,8 +69,6 @@ openpam_dynamic(const char *path) int i; dlh = NULL; - if ((module = calloc(1, sizeof *module)) == NULL) - goto buf_err; /* Prepend the standard prefix if not an absolute pathname. */ if (path[0] != '/') @@ -75,33 +78,37 @@ openpam_dynamic(const char *path) /* try versioned module first, then unversioned module */ if (asprintf(&vpath, "%s%s.%d", prefix, path, LIB_MAJ) < 0) - goto buf_err; + goto err; if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) { openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror()); *strrchr(vpath, '.') = '\0'; if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) { openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror()); FREE(vpath); - FREE(module); return (NULL); } } FREE(vpath); + if ((module = calloc(1, sizeof *module)) == NULL) + goto buf_err; if ((module->path = strdup(path)) == NULL) goto buf_err; module->dlh = dlh; + dlmodule = dlsym(dlh, "_pam_module"); for (i = 0; i < PAM_NUM_PRIMITIVES; ++i) { - module->func[i] = (pam_func_t)dlsym(dlh, _pam_sm_func_name[i]); + module->func[i] = dlmodule ? dlmodule->func[i] : + (pam_func_t)dlsym(dlh, _pam_sm_func_name[i]); if (module->func[i] == NULL) openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s", path, _pam_sm_func_name[i], dlerror()); } return (module); - buf_err: - openpam_log(PAM_LOG_ERROR, "%m"); +buf_err: if (dlh != NULL) dlclose(dlh); FREE(module); +err: + openpam_log(PAM_LOG_ERROR, "%m"); return (NULL); } Modified: user/lstewart/alq_varlen_8.x/etc/defaults/rc.conf ============================================================================== --- user/lstewart/alq_varlen_8.x/etc/defaults/rc.conf Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/etc/defaults/rc.conf Mon Mar 9 06:02:05 2009 (r189554) @@ -105,6 +105,7 @@ background_dhclient="YES" # Start dhcp c #background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background. synchronous_dhclient="NO" # Start dhclient directly on configured # interfaces during startup. +defaultroute_delay="30" # Time to wait for a default route on a DHCP interface. wpa_supplicant_program="/usr/sbin/wpa_supplicant" wpa_supplicant_flags="-s" # Extra flags to pass to wpa_supplicant wpa_supplicant_conf_file="/etc/wpa_supplicant.conf" @@ -189,7 +190,6 @@ tcp_drop_synfin="NO" # Set to YES to dr icmp_drop_redirect="NO" # Set to YES to ignore ICMP REDIRECT packets icmp_log_redirect="NO" # Set to YES to log ICMP REDIRECT packets network_interfaces="auto" # List of network interfaces (or "auto"). -if_up_delay="30" # Time to wait for interfaces to come up. cloned_interfaces="" # List of cloned network interfaces to create. #cloned_interfaces="gif0 gif1 gif2 gif3" # Pre-cloning GENERIC config. ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration. Modified: user/lstewart/alq_varlen_8.x/etc/rc.d/defaultroute ============================================================================== --- user/lstewart/alq_varlen_8.x/etc/rc.d/defaultroute Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/etc/rc.d/defaultroute Mon Mar 9 06:02:05 2009 (r189554) @@ -35,16 +35,16 @@ defaultroute_start() fi # Wait for a default route - delay=${if_up_delay} + delay=${defaultroute_delay} while [ ${delay} -gt 0 ]; do defif=`get_default_if -inet` if [ -n "${defif}" ]; then - if [ ${delay} -ne ${if_up_delay} ]; then + if [ ${delay} -ne ${defaultroute_delay} ]; then echo -n "($defif)" fi break fi - if [ ${delay} -eq ${if_up_delay} ]; then + if [ ${delay} -eq ${defaultroute_delay} ]; then echo -n "Waiting ${delay}s for the default route interface: " else echo -n . Modified: user/lstewart/alq_varlen_8.x/gnu/lib/csu/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/gnu/lib/csu/Makefile Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/gnu/lib/csu/Makefile Mon Mar 9 06:02:05 2009 (r189554) @@ -1,5 +1,8 @@ # $FreeBSD$ +.include +MK_SSP= no + GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs CCDIR= ${.CURDIR}/../../usr.bin/cc @@ -19,7 +22,6 @@ CFLAGS+= -I${GCCLIB}/include -I${GCCDIR} -I${CCDIR}/cc_tools CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG} MKDEP= -DCRT_BEGIN -WITHOUT_SSP= .if ${MACHINE_ARCH} == "ia64" BEGINSRC= crtbegin.asm Modified: user/lstewart/alq_varlen_8.x/gnu/lib/libssp/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/gnu/lib/libssp/Makefile Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/gnu/lib/libssp/Makefile Mon Mar 9 06:02:05 2009 (r189554) @@ -1,5 +1,8 @@ # $FreeBSD$ +.include +MK_SSP= no + GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs SRCDIR= ${GCCLIB}/libssp @@ -10,7 +13,6 @@ LIB= ssp SHLIB_MAJOR= 0 SHLIBDIR?= /lib NO_PROFILE= -WITHOUT_SSP= SRCS= ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \ memset-chk.c snprintf-chk.c sprintf-chk.c stpcpy-chk.c \ Modified: user/lstewart/alq_varlen_8.x/lib/csu/Makefile.inc ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/csu/Makefile.inc Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/lib/csu/Makefile.inc Mon Mar 9 06:02:05 2009 (r189554) @@ -1,3 +1,3 @@ # $FreeBSD$ -WITHOUT_SSP= +SSP_CFLAGS= Modified: user/lstewart/alq_varlen_8.x/lib/libc/arm/sys/Ovfork.S ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libc/arm/sys/Ovfork.S Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/lib/libc/arm/sys/Ovfork.S Mon Mar 9 06:02:05 2009 (r189554) @@ -35,9 +35,6 @@ __FBSDID("$FreeBSD$"); #include "SYS.h" -WARN_REFERENCES(vfork, \ - "warning: reference to compatibility vfork(); include for correct reference") - /* * pid = vfork(); * Modified: user/lstewart/alq_varlen_8.x/lib/libc/mips/Symbol.map ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libc/mips/Symbol.map Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/lib/libc/mips/Symbol.map Mon Mar 9 06:02:05 2009 (r189554) @@ -34,7 +34,6 @@ FBSD_1.0 { vfork; brk; cerror; /* XXX - Should this be .cerror (see sys/cerror.S)? */ - fork; sbrk; }; @@ -57,12 +56,9 @@ FBSDprivate_1.0 { __siglongjmp; __sys_vfork; _vfork; - _brk; end; /* XXX - Should this be _end (see sys/brk.S)? */ curbrk; minbrk; _brk; - __sys_fork; - _fork; _sbrk; }; Modified: user/lstewart/alq_varlen_8.x/lib/libc/mips/sys/Ovfork.S ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libc/mips/sys/Ovfork.S Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/lib/libc/mips/sys/Ovfork.S Mon Mar 9 06:02:05 2009 (r189554) @@ -41,9 +41,6 @@ __FBSDID("$FreeBSD$"); ASMSTR("$NetBSD: compat_Ovfork.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $") #endif /* LIBC_SCCS and not lint */ -WARN_REFERENCES(vfork, \ - "warning: reference to compatibility vfork(); include for correct reference") - /* * pid = vfork(); * Modified: user/lstewart/alq_varlen_8.x/lib/libpam/modules/Makefile.inc ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libpam/modules/Makefile.inc Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/lib/libpam/modules/Makefile.inc Mon Mar 9 06:02:05 2009 (r189554) @@ -19,4 +19,7 @@ DPADD+= ${LIBPAM} LDADD+= -lpam .endif +.c.o: + ${CC} ${CFLAGS} -DOPENPAM_STATIC_MODULES -c ${.IMPSRC} + .include "../Makefile.inc" Modified: user/lstewart/alq_varlen_8.x/lib/libstand/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libstand/Makefile Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/lib/libstand/Makefile Mon Mar 9 06:02:05 2009 (r189554) @@ -6,13 +6,15 @@ # quite large. # +.include +MK_SSP= no + LIB= stand NO_PROFILE= NO_PIC= INCS= stand.h MAN= libstand.3 -WITHOUT_SSP= CFLAGS+= -ffreestanding -Wformat CFLAGS+= -I${.CURDIR} Modified: user/lstewart/alq_varlen_8.x/lib/libthr/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libthr/Makefile Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/lib/libthr/Makefile Mon Mar 9 06:02:05 2009 (r189554) @@ -8,9 +8,8 @@ # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. -WITHOUT_SSP= - .include +MK_SSP= no .if ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib Modified: user/lstewart/alq_varlen_8.x/libexec/rtld-elf/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/libexec/rtld-elf/Makefile Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/libexec/rtld-elf/Makefile Mon Mar 9 06:02:05 2009 (r189554) @@ -1,8 +1,7 @@ # $FreeBSD$ -WITHOUT_SSP= - .include +MK_SSP= no PROG?= ld-elf.so.1 SRCS= rtld_start.S \ Modified: user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD ============================================================================== --- user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD Mon Mar 9 06:02:05 2009 (r189554) @@ -7,6 +7,10 @@ options MD_ROOT_SIZE=3200 # same as def_sz hints "PICOBSD.hints" + +# values accessible through getenv() +# env "PICOBSD.env" + cpu I486_CPU cpu I586_CPU cpu I686_CPU @@ -68,7 +72,7 @@ device sc device npx # Serial (COM) ports -device sio +device uart # Audio support #device pcm @@ -107,10 +111,10 @@ device pty # Pseudo-ttys (telnet etc) device md # Memory "disks" #device gif 4 # IPv6 and IPv4 tunneling #device faith 1 # IPv6-to-IPv4 relaying (translation) -#device tap +device tap -options DEVICE_POLLING +#options DEVICE_POLLING # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! -#device bpf # Berkeley packet filter +device bpf # Berkeley packet filter Modified: user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD.hints ============================================================================== --- user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD.hints Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD.hints Mon Mar 9 06:02:05 2009 (r189554) @@ -22,13 +22,13 @@ hint.sc.0.at="isa" hint.npx.0.at="nexus" hint.npx.0.port="0x0F0" hint.npx.0.irq="13" -hint.sio.0.at="isa" -hint.sio.0.port="0x3F8" -hint.sio.0.flags="0x10" -hint.sio.0.irq="4" -hint.sio.1.at="isa" -hint.sio.1.port="0x2F8" -hint.sio.1.irq="3" +hint.uart.0.at="isa" +hint.uart.0.port="0x3F8" +hint.uart.0.flags="0x10" +hint.uart.0.irq="4" +hint.uart.1.at="isa" +hint.uart.1.port="0x2F8" +hint.uart.1.irq="3" hint.ed.0.at="isa" hint.ed.0.port="0x280" hint.ed.0.irq="5" Modified: user/lstewart/alq_varlen_8.x/release/picobsd/bridge/crunch.conf ============================================================================== --- user/lstewart/alq_varlen_8.x/release/picobsd/bridge/crunch.conf Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/release/picobsd/bridge/crunch.conf Mon Mar 9 06:02:05 2009 (r189554) @@ -94,7 +94,7 @@ progs w # 0KB. progs msg # 0KB. ln msg dmesg progs reboot # 0KB. -#progs less # 36KB +progs less # 36KB #ln less more #progs more # 12KB special more srcdir /usr/ports/misc/44bsd-more/work @@ -181,4 +181,5 @@ libs -ledit -lutil -lmd -lcrypt -lmp -lm libs -lz -lpcap -lwrap libs -ltermcap -lgnuregex # -lcurses libs -lgeom +libs -lsbuf libs -lbsdxml # used by ifconfig Modified: user/lstewart/alq_varlen_8.x/release/picobsd/build/picobsd ============================================================================== --- user/lstewart/alq_varlen_8.x/release/picobsd/build/picobsd Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/release/picobsd/build/picobsd Mon Mar 9 06:02:05 2009 (r189554) @@ -21,7 +21,6 @@ # Makefile.conf Makefile used to build the kernel # config shell variables, sourced here. # mfs.mtree mtree config file -# # floppy.tree/ files which go on the floppy # mfs_tree/ files which go onto the mfs # @@ -29,10 +28,13 @@ # PICOBSD kernel config file # config shell variables, sourced here. # crunch.conf crunchgen configuration +# mfs.mtree overrides ${PICO_TREE}/mfs.mtree # floppy.tree.exclude files from floppy.tree/ which we do not need here. -# floppy.tree/ local additions to the floppy.tree +# floppy.tree/ local additions to ${PICO_TREE}/mfs_free # floppy.tree.${site}/ same as above, site specific. # mfs_tree/ local additions to the mfs_free +# buildtree.mk optional makefile to build an extension for floppy tree +# (generated in buildtree/ ) # #--- The main entry point is at the end. @@ -98,6 +100,7 @@ set_defaults() { EDITOR=${EDITOR:-vi} fd_size=${fd_size:-1440} + o_use_loader="yes" # use /boot/loader o_all_in_mfs="yes" # put all files in mfs so you can boot and run # the image via diskless boot. o_clean="" # do not clean @@ -127,6 +130,7 @@ set_defaults() { # mountpoint used to build memory filesystems c_fs=fs.PICOBSD # filename used for the memory filesystem c_img=picobsd.bin # filename used for the picobsd image + generate_iso="NO" # don't generate the iso image # select the right memory disk name case `uname -r` in @@ -146,6 +150,7 @@ set_defaults() { trap fail 15 } +# use the new build infrastructure create_includes_and_libraries2() { local no log "create_includes_and_libraries2() for ${SRC}" @@ -158,7 +163,7 @@ create_includes_and_libraries2() { export MAKEOBJDIRPREFIX ( cd ${SRC}; # make -DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R -DPICOBSD buildworld - make _+_= $no toolchain + make _+_= $no toolchain _includes _libraries ) } @@ -207,7 +212,7 @@ create_includes_and_libraries() { # set_type looks in user or system directories for the floppy type # specified as first argument, and sets variables according to the config. -# file. Sets THETYPE, SITE, name, MY_TREE and BUILDDIR +# file. Also sets MY_TREE and BUILDDIR and SITE set_type() { local a i @@ -255,6 +260,13 @@ set_msgs() { # OK \t3. Site-info: ${SITE}\n\t4. Full-path: ${MY_TREE}\n" } +# build the iso image +build_iso_image() { + log "build_iso_image()" + clear + set_msgs + printf "${MSG}---> Build the iso image not ready yet\n\n" +} # Main build procedure. build_image() { @@ -307,10 +319,6 @@ build_package() { echo "##############################################" >>build.status for z in bridge dial router net isp ; do set_type ${z} - if [ "${name}" = "" ] ; then - echo "*** TYPE=${z} not found" >>build.status - continue - fi echo "---------------------------------------------">>build.status echo "Building TYPE=${z}, SIZE=${MFS_SIZE}" >>build.status msg="(ok)" # error message @@ -484,10 +492,10 @@ populate_floppy_fs() { # OK dst=${BUILDDIR}/floppy.tree log "pwd=`pwd` Populating floppy filesystem..." - # clean relics from old compilations. - rm -rf ${dst} || true - mkdir ${dst} + rm -rf ${dst} || true # clean relics from old compilations. + mkdir ${dst} # create a clean tree + # compute exclude list for generic tree excl=${MY_TREE}/floppy.tree.exclude if [ -f ${excl} ] ; then log "Files excluded from generic tree: `echo;cat ${excl}`" @@ -495,29 +503,26 @@ populate_floppy_fs() { # OK else excl="" fi - (cd ${PICO_TREE}/floppy.tree ; tar -cf - --exclude CVS --exclude .svn \ - ${excl} . ) | \ + # copy from the floppy trees into the destination + for FLOPPY_TREE in ${PICO_TREE}/floppy.tree ${MY_TREE}/floppy.tree \ + ${MY_TREE}/floppy.tree.${SITE} ; do + if [ -d ${FLOPPY_TREE} ] ; then + (cd ${FLOPPY_TREE} ; tar -cf - --exclude CVS \ + --exclude .svn ${excl} . ) | \ (cd ${dst} ; tar x${o_tarv}f - ) - log "Copied from generic floppy-tree `echo; ls -laR ${dst}`" - - srcdir=${MY_TREE}/floppy.tree - if [ -d ${srcdir} ] ; then - log "update with type-specific files:" - (cd ${srcdir} ; tar -cf - --exclude CVS --exclude .svn . ) | \ - (cd ${dst} ; tar x${o_tarv}f - ) - log "Copied from type floppy-tree `echo; ls -laR ${dst}`" - else - log "No type-specific floppy-tree" - fi - if [ -d ${srcdir}.${SITE} ] ; then - log "Update with site-specific (${SITE}) files:" - (cd ${srcdir}.${SITE} ; tar -cf - --exclude CVS --exclude .svn . ) | \ - (cd ${dst} ; tar x${o_tarv}f - ) - log "Copied from site floppy-tree `echo; ls -laR ${dst}`" - else - log "No site-specific floppy-tree" - fi + log "Copied from ${FLOPPY_TREE}" + fi + excl="" # reset the exclude list. + done + # add local manipulation + if [ -f ${MY_TREE}/buildtree.mk ] ; then + log "building local floppy tree" + ${BINMAKE} -C ${dst} -f ${MY_TREE}/buildtree.mk floppy.tree + fi + + # compress the files in etc/, just in case + # XXX this should be done in the makefile. # gzip returns an error if it fails to compress some file (cd $dst ; gzip -9 etc/* log "Compressed files in etc/ `echo; ls -l etc`" @@ -532,13 +537,12 @@ populate_floppy_fs() { # OK # Finally, if required, make a copy of the floppy.tree onto /fd populate_mfs_tree() { - local a dst + local a dst MFS_TREE log "populate_mfs_tree()" dst=${BUILDDIR}/mfs.tree - # clean relics from old compilations. - rm -rf ${dst} || true - mkdir ${dst} + rm -rf ${dst} || true # clean relics from old compilations. + mkdir ${dst} # create a fresh tree log "pwd=`pwd`, Populating MFS tree..." @@ -555,7 +559,7 @@ populate_mfs_tree() { ln -s /dev/null ${dst}/var/run/log ln -s /etc/termcap ${dst}/usr/share/misc/termcap - + ### now build the crunched binaries ### ( cd ${BUILDDIR}/crunch log "Making and installing crunch1 from `pwd` src ${SRC}..." @@ -599,12 +603,18 @@ populate_mfs_tree() { fi done + if [ -f ${MY_TREE}/buildtree.mk ] ; then + log "building local floppy tree" + ${BINMAKE} -C ${dst} -f ${MY_TREE}/buildtree.mk mfs.tree + fi + if [ "${o_all_in_mfs}" = "yes" ]; then log "Copy generic floppy_tree into MFS..." - # this may fail in case the floppy is empty + # ignore failure in case the floppy is empty cp -Rp ${BUILDDIR}/floppy.tree/* ${dst}/fd || true fi + # 4.x compatibility - create device nodes if [ "${o_no_devfs}" != "" ] ; then # create device entries using MAKEDEV (cd ${dst}/dev @@ -623,19 +633,21 @@ populate_mfs_tree() { log "importing ${import_files} into mfs" # We do it in a chroot environment on the target so # symlinks are followed correctly. - cp `which tar` ${dst}/my_copy_of_tar + # Make sure we have a statically linked tar there. + mkdir -p ${dst}/rescue + cp /rescue/tar ${dst}/rescue (cd ${l_usrtree}/.. ; tar cf - ${import_files} ) | \ - (chroot ${dst} /my_copy_of_tar xf - ) - rm ${dst}/my_copy_of_tar + (chroot ${dst} /rescue/tar xPf - ) + rm -rf ${dst}/rescue fi (cd ${BUILDDIR} # override the owner echo "/set uid=0 gid=0" > mtree.out - mtree -c -p ${dst} -k "" >> mtree.out + mtree -ic -p ${dst} -k "" >> mtree.out log "mtre.out at ${BUILDDIR}/mtree.out" makefs -t ffs -o bsize=4096 -o fsize=512 \ - -s ${MFS_SIZE}k -f 100 -F mtree.out ${c_fs} ${dst} + -s ${MFS_SIZE}k -f 1000 -F mtree.out ${c_fs} ${dst} ls -l ${c_fs} ) log "done mfs image" } @@ -712,14 +724,16 @@ fill_floppy_image() { fi log "Labeling floppy image" - log "patch ${c_boot2} to boot /kernel right away" b2=${BUILDDIR}/boot2 # modified boot2 cp -f ${c_boot2} ${b2} chmod 0644 ${b2} - set `strings -at d ${b2} | grep "/boot/loader"` - echo -e "/kernel\0\0\0\0\0" | \ - dd of=${b2} obs=$1 oseek=1 conv=notrunc 2>/dev/null + if [ ${o_use_loader} = "no" ] ; then + log "patch ${c_boot2} to boot /kernel right away" + set `strings -at d ${b2} | grep "/boot/loader"` + echo -e "/kernel\0\0\0\0\0" | \ + dd of=${b2} obs=$1 oseek=1 conv=notrunc 2>/dev/null + fi chmod 0444 ${b2} dst=${BUILDDIR}/image.tree @@ -739,22 +753,39 @@ fill_floppy_image() { if [ ${mfs_start} -gt 0 -a ${mfs_size} -ge ${imgsize} ] ; then mfs_ofs=$((${mfs_start} + 8192)) log "Preload kernel with file ${c_fs} at ${mfs_ofs}" + logverbose "`ls -l ${c_fs}` to fit in ${mfs_size}" dd if=${c_fs} ibs=8192 iseek=1 of=kernel obs=${mfs_ofs} \ - oseek=1 conv=notrunc 2> /dev/null + oseek=1 conv=notrunc # 2> /dev/null else log "not loading mfs, size ${mfs_size} img ${imgsize}" fi log "Compress with kgzip and copy to floppy image" - kgzip -o kernel.gz kernel - cp -p kernel.gz ${dst}/kernel || fail $? no_space "copying kernel" + if [ ${o_use_loader} = "no" ] ; then + kgzip -o kernel.gz kernel + cp -p kernel.gz ${dst}/kernel || fail $? no_space "copying kernel" + else + gzip kernel + mkdir -p ${dst}/boot/kernel + echo "hint.acpi.0.disabled=\"1\"" > ${dst}/boot/loader.conf + echo "console=\"comconsole\"" >> ${dst}/boot/loader.conf + cp -p /boot/loader ${dst}/boot/loader || fail $? no_space "copying bootloader" + cp -p kernel.gz ${dst}/boot/kernel/kernel.gz || fail $? no_space "copying kernel" + fi - log "Now transfer floppy tree if not already in MFS image" # now transfer the floppy tree. If it is already in mfs, dont bother. if [ "${o_all_in_mfs}" != "yes" ] ; then + log "Now transfer floppy tree if not already in MFS image" cp -Rp floppy.tree/* ${dst} || \ fail $? no_space "copying floppy tree" fi ) + + # add local manipulation to the image + if [ -f ${MY_TREE}/buildtree.mk ] ; then + ${BINMAKE} -C ${dst} -f ${MY_TREE}/buildtree.mk image.tree + fi + + log "image used `du -s ${dst}` of ${blocks}k" (cd ${BUILDDIR} makefs -t ffs -o bsize=4096 -o fsize=512 \ -s ${blocks}k -f 50 ${c_img} ${dst} @@ -764,9 +795,19 @@ fill_floppy_image() { ${l_label} -f `pwd`/${c_img} | sed -e '/ c:/{p;s/c:/a:/;}' | \ ${l_label} -R -f `pwd`/${c_img} /dev/stdin ${l_label} -f `pwd`/${c_img} + ls -l ${c_img} - logverbose "after disklabel" - ) + ${l_label} -f `pwd`/${c_img} + logverbose "after disklabel" + ) + + echo "BUILDDIR ${BUILDDIR}" + if [ "${generate_iso}" = "YES" ]; then + echo "generate_iso ${generate_iso}" + #build_iso_image() + exit 1 + fi + # dump the primary and secondary boot # XXX primary is 512 bytes dd if=${c_boot1} of=${BUILDDIR}/${c_img} conv=notrunc 2>/dev/null @@ -781,7 +822,8 @@ fill_floppy_image() { rm -rf ${BUILDDIR}/floppy.tree || true # cleanup # df -ik ${dst} | colrm 70 > .build.reply rm -rf ${dst} - rm ${BUILDDIR}/kernel.gz ${BUILDDIR}/${c_fs} + rm ${BUILDDIR}/${c_fs} + # rm ${BUILDDIR}/kernel.gz } # This function creates variables which depend on the source tree in use: @@ -824,8 +866,7 @@ set_build_parameters() { # arguments. set_defaults -args="" -while [ x"$1" != x ]; do +while [ true ]; do case $1 in --src) # set the source path instead of /usr/src SRC=`(cd $2; pwd)` @@ -840,12 +881,17 @@ while [ x"$1" != x ]; do shift ;; + --no_loader) # omit /boot/loader, just rely on boot2 + # (it may have problems with kernels > 4MB) + o_use_loader="no" + ;; + --all_in_mfs) o_all_in_mfs="yes" ;; --no_all_in_mfs) - o_all_in_mfs="" + o_all_in_mfs="no" ;; --modules) # also build kernel modules @@ -865,21 +911,24 @@ while [ x"$1" != x ]; do o_tarv="v" # tar verbose flag o_makeopts="-d l" # be verbose ;; + + --iso) # generate iso image + generate_iso="YES" + ;; + *) - args="$args $1" # accumulate args + break ;; esac shift done set_build_parameters # things that depend on ${SRC} +set_type $1 $2 # type and site, respectively # If $1="package", it creates a neat set of floppies -set -- ${args} [ "$1" = "package" ] && build_package -set_type $args # type and site, respectively - [ "${o_interactive}" != "NO" ] && main_dialog if [ "${o_clean}" = "YES" ] ; then Modified: user/lstewart/alq_varlen_8.x/release/picobsd/floppy.tree/etc/ttys ============================================================================== --- user/lstewart/alq_varlen_8.x/release/picobsd/floppy.tree/etc/ttys Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/release/picobsd/floppy.tree/etc/ttys Mon Mar 9 06:02:05 2009 (r189554) @@ -1,6 +1,8 @@ # # @(#)ttys 5.1 (Berkeley) 4/17/89 # +# $FreeBSD$ +# # name getty type status comments # # This entry needed for asking password when init goes to single-user mode @@ -30,4 +32,4 @@ ttyp6 none network secure ttyp7 none network secure ttyp8 none network secure ttyp9 none network secure -ttyd0 "/usr/libexec/getty std.9600" dialup on secure +ttyu0 "/usr/libexec/getty std.9600" dialup on secure Modified: user/lstewart/alq_varlen_8.x/rescue/librescue/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/rescue/librescue/Makefile Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/rescue/librescue/Makefile Mon Mar 9 06:02:05 2009 (r189554) @@ -2,9 +2,8 @@ # $FreeBSD$ # -WITHOUT_SSP= - .include +MK_SSP= no # Certain library entries have hard-coded references to # /bin, /sbin, etc, that require those entries to be Modified: user/lstewart/alq_varlen_8.x/rescue/rescue/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/rescue/rescue/Makefile Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/rescue/rescue/Makefile Mon Mar 9 06:02:05 2009 (r189554) @@ -2,9 +2,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 NO_MAN= -WITHOUT_SSP= .include +MK_SSP= no PROG= rescue BINDIR?=/rescue Modified: user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.8 ============================================================================== --- user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.8 Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.8 Mon Mar 9 06:02:05 2009 (r189554) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 14, 2008 +.Dd February 21, 2009 .Dt ATACONTROL 8 .Os .Sh NAME @@ -180,9 +180,7 @@ Modes are given like case does not matter. .Pp Currently supported modes are: -.Cm PIO0 , PIO1 , PIO2 , PIO3 , PIO4 , -.Cm WDMA2 , -.Cm UDMA2 +.Cm BIOSPIO , PIO0 , PIO1 , PIO2 , PIO3 , PIO4 , WDMA2 , UDMA2 (alias .Cm UDMA33 ) , .Cm UDMA4 @@ -190,11 +188,13 @@ Currently supported modes are: .Cm UDMA66 ) , .Cm UDMA5 (alias -.Cm UDMA100 ) -and +.Cm UDMA100 ) , .Cm UDMA6 (alias -.Cm UDMA133 ) . +.Cm UDMA133 ) , +.Cm SATA150 , SATA300 , USB , USB1 , USB2 +and +.Cm BIOSDMA . .It Ic cap Show detailed info about the device on .Ar device . Modified: user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.c ============================================================================== --- user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.c Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.c Mon Mar 9 06:02:05 2009 (r189554) @@ -82,6 +82,11 @@ str2mode(char *str) if (!strcasecmp(str, "UDMA100")) return ATA_UDMA5; if (!strcasecmp(str, "UDMA6")) return ATA_UDMA6; if (!strcasecmp(str, "UDMA133")) return ATA_UDMA6; + if (!strcasecmp(str, "SATA150")) return ATA_SA150; + if (!strcasecmp(str, "SATA300")) return ATA_SA300; + if (!strcasecmp(str, "USB")) return ATA_USB; + if (!strcasecmp(str, "USB1")) return ATA_USB1; + if (!strcasecmp(str, "USB2")) return ATA_USB2; if (!strcasecmp(str, "BIOSDMA")) return ATA_DMA; return -1; } @@ -364,6 +369,8 @@ main(int argc, char **argv) fd = open_dev(argv[2], O_RDONLY); if (argc == 4) { mode = str2mode(argv[3]); + if (mode == -1) + errx(1, "unknown mode"); if (ioctl(fd, IOCATASMODE, &mode) < 0) warn("ioctl(IOCATASMODE)"); } Modified: user/lstewart/alq_varlen_8.x/sbin/geom/class/journal/gjournal.8 ============================================================================== --- user/lstewart/alq_varlen_8.x/sbin/geom/class/journal/gjournal.8 Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/sbin/geom/class/journal/gjournal.8 Mon Mar 9 06:02:05 2009 (r189554) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2006-2007 Pawel Jakub Dawidek +.\" Copyright (c) 2006-2009 Pawel Jakub Dawidek .\" All rights reserved. .\" *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***