Date: Wed, 9 Dec 2009 22:27:13 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r200320 - in projects/ppc64: . bin/date bin/sh contrib/bind9 contrib/bind9/bin/named contrib/bind9/lib/dns contrib/bind9/lib/dns/include/dns contrib/bind9/lib/isc/ia64/include/isc contr... Message-ID: <200912092227.nB9MRDfL041300@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Wed Dec 9 22:27:12 2009 New Revision: 200320 URL: http://svn.freebsd.org/changeset/base/200320 Log: IFC Added: projects/ppc64/lib/csu/i386-elf/crt1_c.c - copied unchanged from r200319, head/lib/csu/i386-elf/crt1_c.c projects/ppc64/lib/csu/i386-elf/crt1_s.S - copied unchanged from r200319, head/lib/csu/i386-elf/crt1_s.S projects/ppc64/lib/libulog/ - copied from r200319, head/lib/libulog/ projects/ppc64/libexec/ulog-helper/ - copied from r200319, head/libexec/ulog-helper/ projects/ppc64/share/man/man4/amdsbwd.4 - copied unchanged from r200319, head/share/man/man4/amdsbwd.4 projects/ppc64/share/man/man4/man4.powerpc/adb.4 - copied unchanged from r200319, head/share/man/man4/man4.powerpc/adb.4 projects/ppc64/share/man/man4/man4.powerpc/akbd.4 - copied unchanged from r200319, head/share/man/man4/man4.powerpc/akbd.4 projects/ppc64/share/man/man4/man4.powerpc/ams.4 - copied unchanged from r200319, head/share/man/man4/man4.powerpc/ams.4 projects/ppc64/share/man/man4/man4.powerpc/cuda.4 - copied unchanged from r200319, head/share/man/man4/man4.powerpc/cuda.4 projects/ppc64/sys/compat/linux/linux_videodev.h - copied unchanged from r200319, head/sys/compat/linux/linux_videodev.h projects/ppc64/sys/compat/linux/linux_videodev_compat.h - copied unchanged from r200319, head/sys/compat/linux/linux_videodev_compat.h projects/ppc64/sys/dev/amdsbwd/ - copied from r200319, head/sys/dev/amdsbwd/ projects/ppc64/sys/modules/amdsbwd/ - copied from r200319, head/sys/modules/amdsbwd/ projects/ppc64/tools/regression/bin/sh/execution/redir1.0 - copied unchanged from r200319, head/tools/regression/bin/sh/execution/redir1.0 projects/ppc64/tools/regression/bin/sh/execution/redir2.0 - copied unchanged from r200319, head/tools/regression/bin/sh/execution/redir2.0 Deleted: projects/ppc64/etc/rc.d/ip6fw projects/ppc64/etc/rc.firewall6 projects/ppc64/lib/csu/i386-elf/crt1.c Modified: projects/ppc64/MAINTAINERS projects/ppc64/ObsoleteFiles.inc projects/ppc64/bin/date/Makefile projects/ppc64/bin/date/date.c projects/ppc64/bin/sh/eval.c projects/ppc64/bin/sh/redir.c projects/ppc64/contrib/bind9/CHANGES projects/ppc64/contrib/bind9/bin/named/query.c projects/ppc64/contrib/bind9/lib/dns/api projects/ppc64/contrib/bind9/lib/dns/include/dns/types.h projects/ppc64/contrib/bind9/lib/dns/masterdump.c projects/ppc64/contrib/bind9/lib/dns/rbtdb.c projects/ppc64/contrib/bind9/lib/dns/resolver.c projects/ppc64/contrib/bind9/lib/dns/validator.c projects/ppc64/contrib/bind9/lib/isc/ia64/include/isc/atomic.h projects/ppc64/contrib/bind9/version projects/ppc64/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt projects/ppc64/contrib/bsnmp/snmp_mibII/mibII.c projects/ppc64/contrib/bsnmp/snmp_mibII/mibII.h projects/ppc64/contrib/bsnmp/snmp_mibII/mibII_begemot.c projects/ppc64/contrib/bsnmp/snmp_mibII/mibII_tree.def projects/ppc64/contrib/gcc/config/freebsd-spec.h projects/ppc64/contrib/groff/tmac/doc-syms projects/ppc64/contrib/netcat/FREEBSD-vendor projects/ppc64/contrib/ntp/ntpd/ntp_io.c projects/ppc64/crypto/openssl/ssl/s3_lib.c projects/ppc64/crypto/openssl/ssl/s3_pkt.c projects/ppc64/crypto/openssl/ssl/s3_srvr.c projects/ppc64/etc/Makefile projects/ppc64/etc/defaults/rc.conf projects/ppc64/etc/mtree/BSD.var.dist projects/ppc64/etc/rc.d/Makefile projects/ppc64/etc/rc.d/ipfw projects/ppc64/etc/rc.firewall projects/ppc64/lib/Makefile projects/ppc64/lib/bind/config.h projects/ppc64/lib/csu/amd64/Makefile projects/ppc64/lib/csu/arm/Makefile projects/ppc64/lib/csu/i386-elf/Makefile projects/ppc64/lib/csu/ia64/Makefile projects/ppc64/lib/csu/mips/Makefile projects/ppc64/lib/csu/powerpc/Makefile projects/ppc64/lib/csu/sparc64/Makefile projects/ppc64/lib/libc/gen/exec.c projects/ppc64/lib/libc/gen/fdevname.c projects/ppc64/lib/libc/gen/getlogin.c projects/ppc64/lib/libc/gen/getttyent.c projects/ppc64/lib/libc/gen/nlist.c projects/ppc64/lib/libc/gen/pause.c projects/ppc64/lib/libc/gen/pwcache.c projects/ppc64/lib/libc/gen/raise.c projects/ppc64/lib/libc/gen/sem_init.3 projects/ppc64/lib/libc/gen/sleep.c projects/ppc64/lib/libc/gen/termios.c projects/ppc64/lib/libc/gen/timezone.c projects/ppc64/lib/libc/gen/usleep.c projects/ppc64/lib/libc/gmon/gmon.c projects/ppc64/lib/libc/nls/es_ES.ISO8859-1.msg projects/ppc64/lib/libc/posix1e/acl_to_text.c projects/ppc64/lib/libc/rpc/svc.c projects/ppc64/lib/libc/stdio/findfp.c projects/ppc64/lib/libc/stdio/funopen.c projects/ppc64/lib/libc/stdio/printf.3 projects/ppc64/lib/libc/stdlib/getenv.3 projects/ppc64/lib/libc/stdlib/getenv.c projects/ppc64/lib/libc/stdlib/system.c projects/ppc64/lib/libc/string/strcat.3 projects/ppc64/lib/libc/string/strcmp.3 projects/ppc64/lib/libc/sys/__error.c projects/ppc64/lib/libc/sys/setpgid.2 projects/ppc64/lib/libutil/libutil.h projects/ppc64/libexec/Makefile projects/ppc64/libexec/rtld-elf/rtld.c projects/ppc64/release/i386/fixit_crunch.conf projects/ppc64/release/pc98/fixit-small_crunch.conf projects/ppc64/release/pc98/fixit_crunch.conf projects/ppc64/release/picobsd/bridge/PICOBSD projects/ppc64/release/picobsd/bridge/crunch.conf projects/ppc64/release/picobsd/build/picobsd projects/ppc64/rescue/rescue/Makefile projects/ppc64/sbin/atacontrol/atacontrol.c projects/ppc64/sbin/geom/class/mirror/geom_mirror.c projects/ppc64/sbin/geom/class/mirror/gmirror.8 projects/ppc64/sbin/init/Makefile projects/ppc64/sbin/init/init.c projects/ppc64/sbin/ipfw/dummynet.c projects/ppc64/sbin/ipfw/ipfw2.c projects/ppc64/sbin/reboot/Makefile projects/ppc64/sbin/reboot/reboot.c projects/ppc64/share/man/man4/Makefile projects/ppc64/share/man/man4/ipsec.4 projects/ppc64/share/man/man4/man4.powerpc/Makefile projects/ppc64/share/man/man4/man4.powerpc/pmu.4 projects/ppc64/share/man/man9/VOP_OPENCLOSE.9 projects/ppc64/share/man/man9/ifnet.9 projects/ppc64/share/misc/committers-src.dot projects/ppc64/share/mk/bsd.libnames.mk projects/ppc64/share/mk/bsd.subdir.mk projects/ppc64/sys/amd64/acpica/acpi_switch.S projects/ppc64/sys/amd64/amd64/identcpu.c projects/ppc64/sys/amd64/amd64/mca.c projects/ppc64/sys/amd64/conf/NOTES projects/ppc64/sys/amd64/include/mca.h projects/ppc64/sys/amd64/include/specialreg.h projects/ppc64/sys/arm/conf/AVILA projects/ppc64/sys/arm/conf/CAMBRIA projects/ppc64/sys/arm/mv/mv_sata.c projects/ppc64/sys/boot/i386/gptboot/gptboot.c projects/ppc64/sys/boot/i386/libi386/biosmem.c projects/ppc64/sys/boot/i386/libi386/libi386.h projects/ppc64/sys/boot/i386/loader/main.c projects/ppc64/sys/boot/i386/zfsboot/zfsboot.c projects/ppc64/sys/boot/pc98/btx/btx/btx.S projects/ppc64/sys/boot/pc98/libpc98/biosmem.c projects/ppc64/sys/boot/pc98/loader/main.c projects/ppc64/sys/boot/zfs/zfsimpl.c projects/ppc64/sys/cam/ata/ata_all.c projects/ppc64/sys/cam/ata/ata_all.h projects/ppc64/sys/cam/ata/ata_da.c projects/ppc64/sys/cam/ata/ata_pmp.c projects/ppc64/sys/cam/ata/ata_xpt.c projects/ppc64/sys/cam/cam_periph.h projects/ppc64/sys/cam/scsi/scsi_cd.c projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/ppc64/sys/compat/freebsd32/syscalls.master projects/ppc64/sys/compat/linux/linux_ioctl.c projects/ppc64/sys/compat/linux/linux_ioctl.h projects/ppc64/sys/conf/NOTES projects/ppc64/sys/conf/files projects/ppc64/sys/conf/files.amd64 projects/ppc64/sys/conf/files.i386 projects/ppc64/sys/conf/options projects/ppc64/sys/dev/aac/aac.c projects/ppc64/sys/dev/aac/aac_cam.c projects/ppc64/sys/dev/aac/aacvar.h projects/ppc64/sys/dev/ahci/ahci.c projects/ppc64/sys/dev/ata/ata-all.c projects/ppc64/sys/dev/ata/ata-all.h projects/ppc64/sys/dev/ata/ata-disk.c projects/ppc64/sys/dev/ata/ata-dma.c projects/ppc64/sys/dev/ata/ata-lowlevel.c projects/ppc64/sys/dev/ata/ata-pci.c projects/ppc64/sys/dev/ata/ata-pci.h projects/ppc64/sys/dev/ata/ata-queue.c projects/ppc64/sys/dev/ata/ata-sata.c projects/ppc64/sys/dev/ata/ata_if.m projects/ppc64/sys/dev/ata/atapi-cd.c projects/ppc64/sys/dev/ata/atapi-fd.c projects/ppc64/sys/dev/ata/atapi-tape.c projects/ppc64/sys/dev/ata/chipsets/ata-acard.c projects/ppc64/sys/dev/ata/chipsets/ata-acerlabs.c projects/ppc64/sys/dev/ata/chipsets/ata-ahci.c projects/ppc64/sys/dev/ata/chipsets/ata-amd.c projects/ppc64/sys/dev/ata/chipsets/ata-ati.c projects/ppc64/sys/dev/ata/chipsets/ata-cenatek.c projects/ppc64/sys/dev/ata/chipsets/ata-cypress.c projects/ppc64/sys/dev/ata/chipsets/ata-cyrix.c projects/ppc64/sys/dev/ata/chipsets/ata-highpoint.c projects/ppc64/sys/dev/ata/chipsets/ata-intel.c projects/ppc64/sys/dev/ata/chipsets/ata-ite.c projects/ppc64/sys/dev/ata/chipsets/ata-jmicron.c projects/ppc64/sys/dev/ata/chipsets/ata-marvell.c projects/ppc64/sys/dev/ata/chipsets/ata-micron.c projects/ppc64/sys/dev/ata/chipsets/ata-national.c projects/ppc64/sys/dev/ata/chipsets/ata-netcell.c projects/ppc64/sys/dev/ata/chipsets/ata-nvidia.c projects/ppc64/sys/dev/ata/chipsets/ata-promise.c projects/ppc64/sys/dev/ata/chipsets/ata-serverworks.c projects/ppc64/sys/dev/ata/chipsets/ata-siliconimage.c projects/ppc64/sys/dev/ata/chipsets/ata-sis.c projects/ppc64/sys/dev/ata/chipsets/ata-via.c projects/ppc64/sys/dev/bge/if_bge.c projects/ppc64/sys/dev/bge/if_bgereg.h projects/ppc64/sys/dev/cxgb/common/cxgb_common.h projects/ppc64/sys/dev/cxgb/cxgb_t3fw.h projects/ppc64/sys/dev/e1000/LICENSE projects/ppc64/sys/dev/e1000/e1000_80003es2lan.c projects/ppc64/sys/dev/e1000/e1000_80003es2lan.h projects/ppc64/sys/dev/e1000/e1000_82541.c projects/ppc64/sys/dev/e1000/e1000_82571.c projects/ppc64/sys/dev/e1000/e1000_82575.c projects/ppc64/sys/dev/e1000/e1000_82575.h projects/ppc64/sys/dev/e1000/e1000_api.c projects/ppc64/sys/dev/e1000/e1000_defines.h projects/ppc64/sys/dev/e1000/e1000_hw.h projects/ppc64/sys/dev/e1000/e1000_ich8lan.c projects/ppc64/sys/dev/e1000/e1000_ich8lan.h projects/ppc64/sys/dev/e1000/e1000_mac.c projects/ppc64/sys/dev/e1000/e1000_manage.c projects/ppc64/sys/dev/e1000/e1000_osdep.h projects/ppc64/sys/dev/e1000/e1000_phy.c projects/ppc64/sys/dev/e1000/e1000_phy.h projects/ppc64/sys/dev/e1000/e1000_regs.h projects/ppc64/sys/dev/e1000/if_em.c projects/ppc64/sys/dev/e1000/if_em.h projects/ppc64/sys/dev/e1000/if_igb.c projects/ppc64/sys/dev/e1000/if_igb.h projects/ppc64/sys/dev/hatm/if_hatm.c projects/ppc64/sys/dev/hwpmc/hwpmc_mod.c projects/ppc64/sys/dev/hwpmc/hwpmc_x86.c projects/ppc64/sys/dev/ichsmb/ichsmb_pci.c projects/ppc64/sys/dev/if_ndis/if_ndis.c projects/ppc64/sys/dev/iir/iir_ctrl.c projects/ppc64/sys/dev/isp/isp_freebsd.c projects/ppc64/sys/dev/isp/isp_freebsd.h projects/ppc64/sys/dev/ixgbe/ixgbe.c projects/ppc64/sys/dev/ixgbe/ixgbe.h projects/ppc64/sys/dev/ixgbe/ixgbe_82598.c projects/ppc64/sys/dev/ixgbe/ixgbe_82599.c projects/ppc64/sys/dev/ixgbe/ixgbe_api.c projects/ppc64/sys/dev/ixgbe/ixgbe_api.h projects/ppc64/sys/dev/ixgbe/ixgbe_common.c projects/ppc64/sys/dev/ixgbe/ixgbe_common.h projects/ppc64/sys/dev/ixgbe/ixgbe_osdep.h projects/ppc64/sys/dev/ixgbe/ixgbe_phy.c projects/ppc64/sys/dev/ixgbe/ixgbe_phy.h projects/ppc64/sys/dev/ixgbe/ixgbe_type.h projects/ppc64/sys/dev/pci/pci.c projects/ppc64/sys/dev/puc/pucdata.c projects/ppc64/sys/dev/siis/siis.c projects/ppc64/sys/dev/siis/siis.h projects/ppc64/sys/dev/uart/uart_bus_pci.c projects/ppc64/sys/dev/usb/controller/ehci_pci.c projects/ppc64/sys/dev/usb/controller/uhci_pci.c projects/ppc64/sys/dev/usb/input/atp.c projects/ppc64/sys/dev/usb/input/uhid.c projects/ppc64/sys/dev/usb/net/if_axe.c projects/ppc64/sys/dev/usb/net/if_cdce.c projects/ppc64/sys/dev/usb/serial/uftdi.c projects/ppc64/sys/dev/usb/usbdevs projects/ppc64/sys/dev/xen/blkfront/blkfront.c projects/ppc64/sys/dev/xen/blkfront/block.h projects/ppc64/sys/dev/xen/netfront/netfront.c projects/ppc64/sys/fs/nfs/nfs_commonacl.c projects/ppc64/sys/fs/nfs/nfs_commonport.c projects/ppc64/sys/fs/nfs/nfs_commonsubs.c projects/ppc64/sys/fs/nfs/nfs_var.h projects/ppc64/sys/fs/nfs/nfsport.h projects/ppc64/sys/fs/nfsclient/nfs_clrpcops.c projects/ppc64/sys/fs/nfsclient/nfs_clvnops.c projects/ppc64/sys/fs/nfsserver/nfs_nfsdcache.c projects/ppc64/sys/fs/ntfs/ntfs.h projects/ppc64/sys/fs/ntfs/ntfs_subr.c projects/ppc64/sys/fs/ntfs/ntfs_vfsops.c projects/ppc64/sys/fs/portalfs/portal_vnops.c projects/ppc64/sys/geom/mirror/g_mirror.c projects/ppc64/sys/geom/mirror/g_mirror.h projects/ppc64/sys/gnu/fs/reiserfs/reiserfs_vfsops.c projects/ppc64/sys/i386/conf/NOTES projects/ppc64/sys/i386/i386/dump_machdep.c projects/ppc64/sys/i386/i386/identcpu.c projects/ppc64/sys/i386/i386/machdep.c projects/ppc64/sys/i386/i386/mca.c projects/ppc64/sys/i386/include/mca.h projects/ppc64/sys/i386/include/specialreg.h projects/ppc64/sys/ia64/ia64/clock.c projects/ppc64/sys/ia64/ia64/exception.S projects/ppc64/sys/ia64/ia64/genassym.c projects/ppc64/sys/ia64/ia64/interrupt.c projects/ppc64/sys/ia64/ia64/machdep.c projects/ppc64/sys/ia64/ia64/mp_machdep.c projects/ppc64/sys/ia64/ia64/pmap.c projects/ppc64/sys/ia64/include/bus.h projects/ppc64/sys/ia64/include/cpufunc.h projects/ppc64/sys/ia64/include/ia64_cpu.h projects/ppc64/sys/ia64/include/kdb.h projects/ppc64/sys/ia64/include/param.h projects/ppc64/sys/ia64/include/pcpu.h projects/ppc64/sys/ia64/include/pmap.h projects/ppc64/sys/kern/kern_sig.c projects/ppc64/sys/kern/subr_bus.c projects/ppc64/sys/kern/tty.c projects/ppc64/sys/kern/vfs_acl.c projects/ppc64/sys/kern/vfs_syscalls.c projects/ppc64/sys/kern/vfs_vnops.c projects/ppc64/sys/modules/Makefile projects/ppc64/sys/net/if.c projects/ppc64/sys/net/if_dead.c projects/ppc64/sys/net/if_var.h projects/ppc64/sys/net80211/ieee80211_hostap.c projects/ppc64/sys/netinet/in.h projects/ppc64/sys/netinet/ip_carp.c projects/ppc64/sys/netinet/ip_fw.h projects/ppc64/sys/netinet/ipfw/ip_dummynet.c projects/ppc64/sys/netinet/ipfw/ip_fw2.c projects/ppc64/sys/netinet/raw_ip.c projects/ppc64/sys/netipsec/ipcomp_var.h projects/ppc64/sys/netipsec/xform_ipcomp.c projects/ppc64/sys/nfsserver/nfs_serv.c projects/ppc64/sys/opencrypto/cryptosoft.c projects/ppc64/sys/opencrypto/deflate.c projects/ppc64/sys/pc98/conf/NOTES projects/ppc64/sys/powerpc/aim/machdep.c projects/ppc64/sys/powerpc/conf/GENERIC projects/ppc64/sys/powerpc/include/spr.h projects/ppc64/sys/powerpc/include/vmparam.h projects/ppc64/sys/powerpc/powermac/ata_dbdma.c projects/ppc64/sys/powerpc/powermac/ata_kauai.c projects/ppc64/sys/powerpc/powermac/ata_macio.c projects/ppc64/sys/powerpc/psim/ata_iobus.c projects/ppc64/sys/sparc64/sparc64/stack_machdep.c projects/ppc64/sys/sparc64/sparc64/trap.c projects/ppc64/sys/sun4v/sun4v/stack_machdep.c projects/ppc64/sys/sys/ata.h projects/ppc64/sys/sys/bus.h projects/ppc64/sys/sys/param.h projects/ppc64/sys/vm/uma_int.h projects/ppc64/tools/regression/bin/sh/builtins/fc1.0 projects/ppc64/tools/regression/bin/sh/errors/backquote-error1.0 projects/ppc64/tools/regression/bin/sh/parser/for1.0 projects/ppc64/tools/regression/environ/Makefile.envctl projects/ppc64/tools/regression/environ/envctl.c projects/ppc64/tools/regression/environ/envtest.t projects/ppc64/tools/tools/sysbuild/sysbuild.sh projects/ppc64/usr.bin/Makefile projects/ppc64/usr.bin/calendar/calendars/calendar.freebsd projects/ppc64/usr.bin/make/proc.c projects/ppc64/usr.bin/netstat/if.c projects/ppc64/usr.bin/netstat/ipsec.c projects/ppc64/usr.bin/netstat/main.c projects/ppc64/usr.bin/netstat/netstat.1 projects/ppc64/usr.bin/netstat/netstat.h projects/ppc64/usr.bin/systat/Makefile projects/ppc64/usr.bin/systat/vmstat.c projects/ppc64/usr.bin/users/Makefile projects/ppc64/usr.bin/users/users.c projects/ppc64/usr.bin/w/Makefile projects/ppc64/usr.bin/w/w.c projects/ppc64/usr.bin/wall/Makefile projects/ppc64/usr.bin/wall/wall.c projects/ppc64/usr.bin/who/Makefile projects/ppc64/usr.bin/who/who.c projects/ppc64/usr.bin/write/Makefile projects/ppc64/usr.bin/write/write.c projects/ppc64/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c projects/ppc64/usr.sbin/freebsd-update/freebsd-update.sh projects/ppc64/usr.sbin/lastlogin/Makefile projects/ppc64/usr.sbin/lastlogin/lastlogin.c projects/ppc64/usr.sbin/mountd/exports.5 projects/ppc64/usr.sbin/nfsd/nfsv4.4 projects/ppc64/usr.sbin/nfsd/stablerestart.5 projects/ppc64/usr.sbin/pw/pw_user.c projects/ppc64/usr.sbin/repquota/repquota.c projects/ppc64/usr.sbin/sysinstall/user.c projects/ppc64/usr.sbin/ypserv/yp_main.c projects/ppc64/usr.sbin/ypserv/yp_server.c Directory Properties: projects/ppc64/ (props changed) projects/ppc64/contrib/bind9/ (props changed) projects/ppc64/sys/ (props changed) projects/ppc64/sys/dev/xen/xenpci/ (props changed) Modified: projects/ppc64/MAINTAINERS ============================================================================== --- projects/ppc64/MAINTAINERS Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/MAINTAINERS Wed Dec 9 22:27:12 2009 (r200320) @@ -124,6 +124,8 @@ usr.bin/bluetooth emax Pre-commit review usr.sbin/bluetooth emax Pre-commit review preferred. gnu/usr.bin/send-pr bugmaster Pre-commit review requested. ncurses rafan Heads-up appreciated, try not to break it. +*env(3) secteam Due to the problematic security history of this + code, please have patches reviewed by secteam. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. Modified: projects/ppc64/ObsoleteFiles.inc ============================================================================== --- projects/ppc64/ObsoleteFiles.inc Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/ObsoleteFiles.inc Wed Dec 9 22:27:12 2009 (r200320) @@ -14,8 +14,14 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20091202: unify rc.firewall and rc.firewall6. +OLD_FILES+=etc/rc.d/ip6fw +OLD_FILES+=etc/rc.firewall6 +OLD_FILES+=usr/share/examples/etc/rc.firewall6 # 20091117: removal of rc.early(8) link OLD_FILES+=usr/share/man/man8/rc.early.8.gz +# 20091117: usr/share/zoneinfo/GMT link removed +OLD_FILES+=usr/share/zoneinfo/GMT # 20091027: pselect.3 implemented as syscall OLD_FILES+=usr/share/man/man3/pselect.3.gz # 20091005: fusword.9 and susword.9 removed Modified: projects/ppc64/bin/date/Makefile ============================================================================== --- projects/ppc64/bin/date/Makefile Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/bin/date/Makefile Wed Dec 9 22:27:12 2009 (r200320) @@ -3,7 +3,7 @@ PROG= date SRCS= date.c netdate.c vary.c -DPADD= ${LIBUTIL} -LDADD= -lutil +DPADD= ${LIBULOG} +LDADD= -lulog .include <bsd.prog.mk> Modified: projects/ppc64/bin/date/date.c ============================================================================== --- projects/ppc64/bin/date/date.c Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/bin/date/date.c Wed Dec 9 22:27:12 2009 (r200320) @@ -48,11 +48,12 @@ __FBSDID("$FreeBSD$"); #include <ctype.h> #include <err.h> #include <locale.h> -#include <libutil.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <syslog.h> +#define _ULOG_POSIX_NAMES +#include <ulog.h> #include <unistd.h> #include "extern.h" @@ -181,6 +182,7 @@ main(int argc, char *argv[]) static void setthetime(const char *fmt, const char *p, int jflag, int nflag) { + struct utmpx utx; struct tm *lt; struct timeval tv; const char *dot, *t; @@ -271,12 +273,16 @@ setthetime(const char *fmt, const char * if (!jflag) { /* set the time */ if (nflag || netsettime(tval)) { - logwtmp("|", "date", ""); + utx.ut_type = OLD_TIME; + gettimeofday(&utx.ut_tv, NULL); + pututxline(&utx); tv.tv_sec = tval; tv.tv_usec = 0; if (settimeofday(&tv, (struct timezone *)NULL)) err(1, "settimeofday (timeval)"); - logwtmp("{", "date", ""); + utx.ut_type = NEW_TIME; + gettimeofday(&utx.ut_tv, NULL); + pututxline(&utx); } if ((p = getlogin()) == NULL) Modified: projects/ppc64/bin/sh/eval.c ============================================================================== --- projects/ppc64/bin/sh/eval.c Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/bin/sh/eval.c Wed Dec 9 22:27:12 2009 (r200320) @@ -883,7 +883,6 @@ cmddone: #ifdef DEBUG trputs("normal command: "); trargs(argv); #endif - clearredir(); redirect(cmd->ncmd.redirect, 0); for (sp = varlist.list ; sp ; sp = sp->next) setvareq(sp->text, VEXPORT|VSTACK); Modified: projects/ppc64/bin/sh/redir.c ============================================================================== --- projects/ppc64/bin/sh/redir.c Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/bin/sh/redir.c Wed Dec 9 22:27:12 2009 (r200320) @@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$"); #define EMPTY -2 /* marks an unused slot in redirtab */ +#define CLOSED -1 /* fd was not open before redir */ #define PIPESIZE 4096 /* amount of buffering in a pipe */ @@ -101,7 +102,6 @@ redirect(union node *redir, int flags) struct redirtab *sv = NULL; int i; int fd; - int try; char memory[10]; /* file descriptors to write to memory */ for (i = 10 ; --i >= 0 ; ) @@ -116,38 +116,30 @@ redirect(union node *redir, int flags) } for (n = redir ; n ; n = n->nfile.next) { fd = n->nfile.fd; - try = 0; if ((n->nfile.type == NTOFD || n->nfile.type == NFROMFD) && n->ndup.dupfd == fd) continue; /* redirect from/to same file descriptor */ if ((flags & REDIR_PUSH) && sv->renamed[fd] == EMPTY) { INTOFF; -again: if ((i = fcntl(fd, F_DUPFD, 10)) == -1) { switch (errno) { case EBADF: - if (!try) { - openredirect(n, memory); - try++; - goto again; - } - /* FALLTHROUGH*/ + i = CLOSED; + break; default: INTON; error("%d: %s", fd, strerror(errno)); break; } - } - if (!try) { - sv->renamed[fd] = i; - } + } else + (void)fcntl(i, F_SETFD, FD_CLOEXEC); + sv->renamed[fd] = i; INTON; } if (fd == 0) fd0_redirected++; - if (!try) - openredirect(n, memory); + openredirect(n, memory); } if (memory[1]) out1 = &memout; Modified: projects/ppc64/contrib/bind9/CHANGES ============================================================================== --- projects/ppc64/contrib/bind9/CHANGES Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/bind9/CHANGES Wed Dec 9 22:27:12 2009 (r200320) @@ -1,3 +1,9 @@ + --- 9.6.1-P2 released --- + +2772. [security] When validating, track whether pending data was from + the additional section or not and only return it if + validates as secure. [RT #20438] + --- 9.6.1-P1 released --- 2640. [security] A specially crafted update packet will cause named Modified: projects/ppc64/contrib/bind9/bin/named/query.c ============================================================================== --- projects/ppc64/contrib/bind9/bin/named/query.c Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/bind9/bin/named/query.c Wed Dec 9 22:27:12 2009 (r200320) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.c,v 1.313.20.7 2009/03/13 01:38:51 marka Exp $ */ +/* $Id: query.c,v 1.313.20.7.12.1 2009/11/18 23:58:04 marka Exp $ */ /*! \file */ @@ -116,6 +116,8 @@ #define DNS_GETDB_NOLOG 0x02U #define DNS_GETDB_PARTIAL 0x04U +#define PENDINGOK(x) (((x) & DNS_DBFIND_PENDINGOK) != 0) + typedef struct client_additionalctx { ns_client_t *client; dns_rdataset_t *rdataset; @@ -1761,8 +1763,8 @@ query_addadditional2(void *arg, dns_name */ if (result == ISC_R_SUCCESS && additionaltype == dns_rdatasetadditional_fromcache && - (rdataset->trust == dns_trust_pending || - rdataset->trust == dns_trust_glue) && + (DNS_TRUST_PENDING(rdataset->trust) || + DNS_TRUST_GLUE(rdataset->trust)) && !validate(client, db, fname, rdataset, sigrdataset)) { dns_rdataset_disassociate(rdataset); if (dns_rdataset_isassociated(sigrdataset)) @@ -1801,8 +1803,8 @@ query_addadditional2(void *arg, dns_name */ if (result == ISC_R_SUCCESS && additionaltype == dns_rdatasetadditional_fromcache && - (rdataset->trust == dns_trust_pending || - rdataset->trust == dns_trust_glue) && + (DNS_TRUST_PENDING(rdataset->trust) || + DNS_TRUST_GLUE(rdataset->trust)) && !validate(client, db, fname, rdataset, sigrdataset)) { dns_rdataset_disassociate(rdataset); if (dns_rdataset_isassociated(sigrdataset)) @@ -2601,14 +2603,14 @@ query_addbestns(ns_client_t *client) { /* * Attempt to validate RRsets that are pending or that are glue. */ - if ((rdataset->trust == dns_trust_pending || - (sigrdataset != NULL && sigrdataset->trust == dns_trust_pending)) + if ((DNS_TRUST_PENDING(rdataset->trust) || + (sigrdataset != NULL && DNS_TRUST_PENDING(sigrdataset->trust))) && !validate(client, db, fname, rdataset, sigrdataset) && - (client->query.dboptions & DNS_DBFIND_PENDINGOK) == 0) + !PENDINGOK(client->query.dboptions)) goto cleanup; - if ((rdataset->trust == dns_trust_glue || - (sigrdataset != NULL && sigrdataset->trust == dns_trust_glue)) && + if ((DNS_TRUST_GLUE(rdataset->trust) || + (sigrdataset != NULL && DNS_TRUST_GLUE(sigrdataset->trust))) && !validate(client, db, fname, rdataset, sigrdataset) && SECURE(client) && WANTDNSSEC(client)) goto cleanup; @@ -3716,6 +3718,8 @@ query_find(ns_client_t *client, dns_fetc dns_rdataset_t *noqname; isc_boolean_t resuming; int line = -1; + dns_rdataset_t tmprdataset; + unsigned int dboptions; CTRACE("query_find"); @@ -3933,9 +3937,49 @@ query_find(ns_client_t *client, dns_fetc /* * Now look for an answer in the database. */ + dboptions = client->query.dboptions; + if (sigrdataset == NULL && client->view->enablednssec) { + /* + * If the client doesn't want DNSSEC we still want to + * look for any data pending validation to save a remote + * lookup if possible. + */ + dns_rdataset_init(&tmprdataset); + sigrdataset = &tmprdataset; + dboptions |= DNS_DBFIND_PENDINGOK; + } + refind: result = dns_db_find(db, client->query.qname, version, type, - client->query.dboptions, client->now, - &node, fname, rdataset, sigrdataset); + dboptions, client->now, &node, fname, + rdataset, sigrdataset); + /* + * If we have found pending data try to validate it. + * If the data does not validate as secure and we can't + * use the unvalidated data requery the database with + * pending disabled to prevent infinite looping. + */ + if (result != ISC_R_SUCCESS || !DNS_TRUST_PENDING(rdataset->trust)) + goto validation_done; + if (validate(client, db, fname, rdataset, sigrdataset)) + goto validation_done; + if (rdataset->trust != dns_trust_pending_answer || + !PENDINGOK(client->query.dboptions)) { + dns_rdataset_disassociate(rdataset); + if (sigrdataset != NULL && + dns_rdataset_isassociated(sigrdataset)) + dns_rdataset_disassociate(sigrdataset); + if (sigrdataset == &tmprdataset) + sigrdataset = NULL; + dns_db_detachnode(db, &node); + dboptions &= ~DNS_DBFIND_PENDINGOK; + goto refind; + } + validation_done: + if (sigrdataset == &tmprdataset) { + if (dns_rdataset_isassociated(sigrdataset)) + dns_rdataset_disassociate(sigrdataset); + sigrdataset = NULL; + } resume: CTRACE("query_find: resume"); Modified: projects/ppc64/contrib/bind9/lib/dns/api ============================================================================== --- projects/ppc64/contrib/bind9/lib/dns/api Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/bind9/lib/dns/api Wed Dec 9 22:27:12 2009 (r200320) @@ -1,3 +1,3 @@ -LIBINTERFACE = 52 +LIBINTERFACE = 53 LIBREVISION = 0 -LIBAGE = 2 +LIBAGE = 0 Modified: projects/ppc64/contrib/bind9/lib/dns/include/dns/types.h ============================================================================== --- projects/ppc64/contrib/bind9/lib/dns/include/dns/types.h Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/bind9/lib/dns/include/dns/types.h Wed Dec 9 22:27:12 2009 (r200320) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: types.h,v 1.130.50.3 2009/01/29 22:40:35 jinmei Exp $ */ +/* $Id: types.h,v 1.130.50.3.12.1 2009/11/18 23:58:04 marka Exp $ */ #ifndef DNS_TYPES_H #define DNS_TYPES_H 1 @@ -258,40 +258,52 @@ enum { dns_trust_none = 0, #define dns_trust_none ((dns_trust_t)dns_trust_none) - /*% Subject to DNSSEC validation but has not yet been validated */ - dns_trust_pending = 1, -#define dns_trust_pending ((dns_trust_t)dns_trust_pending) + /*% + * Subject to DNSSEC validation but has not yet been validated + * dns_trust_pending_additional (from the additional section). + */ + dns_trust_pending_additional = 1, +#define dns_trust_pending_additional \ + ((dns_trust_t)dns_trust_pending_additional) + + dns_trust_pending_answer = 2, +#define dns_trust_pending_answer ((dns_trust_t)dns_trust_pending_answer) /*% Received in the additional section of a response. */ - dns_trust_additional = 2, + dns_trust_additional = 3, #define dns_trust_additional ((dns_trust_t)dns_trust_additional) /* Received in a referral response. */ - dns_trust_glue = 3, + dns_trust_glue = 4, #define dns_trust_glue ((dns_trust_t)dns_trust_glue) /* Answer from a non-authoritative server */ - dns_trust_answer = 4, + dns_trust_answer = 5, #define dns_trust_answer ((dns_trust_t)dns_trust_answer) /* Received in the authority section as part of an authoritative response */ - dns_trust_authauthority = 5, + dns_trust_authauthority = 6, #define dns_trust_authauthority ((dns_trust_t)dns_trust_authauthority) /* Answer from an authoritative server */ - dns_trust_authanswer = 6, + dns_trust_authanswer = 7, #define dns_trust_authanswer ((dns_trust_t)dns_trust_authanswer) /* Successfully DNSSEC validated */ - dns_trust_secure = 7, + dns_trust_secure = 8, #define dns_trust_secure ((dns_trust_t)dns_trust_secure) /* This server is authoritative */ - dns_trust_ultimate = 8 + dns_trust_ultimate = 9 #define dns_trust_ultimate ((dns_trust_t)dns_trust_ultimate) }; +#define DNS_TRUST_PENDING(x) ((x) == dns_trust_pending_answer || \ + (x) == dns_trust_pending_additional) +#define DNS_TRUST_GLUE(x) ((x) == dns_trust_glue) + + /*% * Name checking severities. */ Modified: projects/ppc64/contrib/bind9/lib/dns/masterdump.c ============================================================================== --- projects/ppc64/contrib/bind9/lib/dns/masterdump.c Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/bind9/lib/dns/masterdump.c Wed Dec 9 22:27:12 2009 (r200320) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: masterdump.c,v 1.94.50.2 2009/01/18 23:47:40 tbox Exp $ */ +/* $Id: masterdump.c,v 1.94.50.2.12.1 2009/11/18 23:58:04 marka Exp $ */ /*! \file */ @@ -775,7 +775,8 @@ dump_order_compare(const void *a, const static const char *trustnames[] = { "none", - "pending", + "pending-additional", + "pending-answer", "additional", "glue", "answer", Modified: projects/ppc64/contrib/bind9/lib/dns/rbtdb.c ============================================================================== --- projects/ppc64/contrib/bind9/lib/dns/rbtdb.c Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/bind9/lib/dns/rbtdb.c Wed Dec 9 22:27:12 2009 (r200320) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rbtdb.c,v 1.270.12.6 2009/05/06 23:34:30 jinmei Exp $ */ +/* $Id: rbtdb.c,v 1.270.12.6.10.1 2009/11/18 23:58:04 marka Exp $ */ /*! \file */ @@ -4005,7 +4005,7 @@ cache_zonecut_callback(dns_rbtnode_t *no } if (dname_header != NULL && - (dname_header->trust != dns_trust_pending || + (!DNS_TRUST_PENDING(dname_header->trust) || (search->options & DNS_DBFIND_PENDINGOK) != 0)) { /* * We increment the reference count on node to ensure that @@ -4548,7 +4548,7 @@ cache_find(dns_db_t *db, dns_name_t *nam if (found == NULL || (found->trust == dns_trust_glue && ((options & DNS_DBFIND_GLUEOK) == 0)) || - (found->trust == dns_trust_pending && + (DNS_TRUST_PENDING(found->trust) && ((options & DNS_DBFIND_PENDINGOK) == 0))) { /* * If there is an NS rdataset at this node, then this is the Modified: projects/ppc64/contrib/bind9/lib/dns/resolver.c ============================================================================== --- projects/ppc64/contrib/bind9/lib/dns/resolver.c Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/bind9/lib/dns/resolver.c Wed Dec 9 22:27:12 2009 (r200320) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.384.14.14 2009/06/02 23:47:13 tbox Exp $ */ +/* $Id: resolver.c,v 1.384.14.14.8.1 2009/11/18 23:58:04 marka Exp $ */ /*! \file */ @@ -4293,6 +4293,7 @@ cache_name(fetchctx_t *fctx, dns_name_t * for it, unless it is glue. */ if (secure_domain && rdataset->trust != dns_trust_glue) { + dns_trust_t trust; /* * RRSIGs are validated as part of validating the * type they cover. @@ -4329,12 +4330,34 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* + * Reject out of bailiwick additional records + * without RRSIGs as they can't possibly validate + * as "secure" and as we will never never want to + * store these as "answers" after validation. + */ + if (rdataset->trust == dns_trust_additional && + sigrdataset == NULL && EXTERNAL(rdataset)) + continue; + + /* + * XXXMPA: If we store as "answer" after validating + * then we need to do bailiwick processing and + * also need to track whether RRsets are in or + * out of bailiwick. This will require a another + * pending trust level. + * * Cache this rdataset/sigrdataset pair as - * pending data. + * pending data. Track whether it was additional + * or not. */ - rdataset->trust = dns_trust_pending; + if (rdataset->trust == dns_trust_additional) + trust = dns_trust_pending_additional; + else + trust = dns_trust_pending_answer; + + rdataset->trust = trust; if (sigrdataset != NULL) - sigrdataset->trust = dns_trust_pending; + sigrdataset->trust = trust; if (!need_validation || !ANSWER(rdataset)) { addedrdataset = ardataset; result = dns_db_addrdataset(fctx->cache, node, @@ -4682,7 +4705,7 @@ ncache_message(fetchctx_t *fctx, dns_adb for (trdataset = ISC_LIST_HEAD(tname->list); trdataset != NULL; trdataset = ISC_LIST_NEXT(trdataset, link)) - trdataset->trust = dns_trust_pending; + trdataset->trust = dns_trust_pending_answer; result = dns_message_nextname(fctx->rmessage, DNS_SECTION_AUTHORITY); } Modified: projects/ppc64/contrib/bind9/lib/dns/validator.c ============================================================================== --- projects/ppc64/contrib/bind9/lib/dns/validator.c Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/bind9/lib/dns/validator.c Wed Dec 9 22:27:12 2009 (r200320) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: validator.c,v 1.164.12.9 2009/05/07 23:47:12 tbox Exp $ */ +/* $Id: validator.c,v 1.164.12.9.8.1 2009/11/18 23:58:04 marka Exp $ */ #include <config.h> @@ -1607,7 +1607,7 @@ get_key(dns_validator_t *val, dns_rdata_ * We have an rrset for the given keyname. */ val->keyset = &val->frdataset; - if (val->frdataset.trust == dns_trust_pending && + if (DNS_TRUST_PENDING(val->frdataset.trust) && dns_rdataset_isassociated(&val->fsigrdataset)) { /* @@ -1622,7 +1622,7 @@ get_key(dns_validator_t *val, dns_rdata_ if (result != ISC_R_SUCCESS) return (result); return (DNS_R_WAIT); - } else if (val->frdataset.trust == dns_trust_pending) { + } else if (DNS_TRUST_PENDING(val->frdataset.trust)) { /* * Having a pending key with no signature means that * something is broken. @@ -2243,7 +2243,7 @@ validatezonekey(dns_validator_t *val) { * We have DS records. */ val->dsset = &val->frdataset; - if (val->frdataset.trust == dns_trust_pending && + if (DNS_TRUST_PENDING(val->frdataset.trust) && dns_rdataset_isassociated(&val->fsigrdataset)) { result = create_validator(val, @@ -2256,7 +2256,7 @@ validatezonekey(dns_validator_t *val) { if (result != ISC_R_SUCCESS) return (result); return (DNS_R_WAIT); - } else if (val->frdataset.trust == dns_trust_pending) { + } else if (DNS_TRUST_PENDING(val->frdataset.trust)) { /* * There should never be an unsigned DS. */ @@ -3337,7 +3337,7 @@ proveunsecure(dns_validator_t *val, isc_ * There is no DS. If this is a delegation, * we maybe done. */ - if (val->frdataset.trust == dns_trust_pending) { + if (DNS_TRUST_PENDING(val->frdataset.trust)) { result = create_fetch(val, tname, dns_rdatatype_ds, dsfetched2, Modified: projects/ppc64/contrib/bind9/lib/isc/ia64/include/isc/atomic.h ============================================================================== --- projects/ppc64/contrib/bind9/lib/isc/ia64/include/isc/atomic.h Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/bind9/lib/isc/ia64/include/isc/atomic.h Wed Dec 9 22:27:12 2009 (r200320) @@ -41,7 +41,7 @@ isc_atomic_xadd(isc_int32_t *p, isc_int3 for (prev = *(volatile isc_int32_t *)p; ; prev = swapped) { swapped = prev + val; __asm__ volatile( - "mov ar.ccv=%2;" + "mov ar.ccv=%2;;" "cmpxchg4.acq %0=%4,%3,ar.ccv" : "=r" (swapped), "=m" (*p) : "r" (prev), "r" (swapped), "m" (*p) @@ -84,7 +84,7 @@ isc_atomic_cmpxchg(isc_int32_t *p, isc_i isc_int32_t ret; __asm__ volatile( - "mov ar.ccv=%2;" + "mov ar.ccv=%2;;" "cmpxchg4.acq %0=%4,%3,ar.ccv" : "=r" (ret), "=m" (*p) : "r" (cmpval), "r" (val), "m" (*p) Modified: projects/ppc64/contrib/bind9/version ============================================================================== --- projects/ppc64/contrib/bind9/version Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/bind9/version Wed Dec 9 22:27:12 2009 (r200320) @@ -1,4 +1,4 @@ -# $Id: version,v 1.43.12.5.8.1 2009/07/28 14:18:08 marka Exp $ +# $Id: version,v 1.43.12.5.8.2 2009/11/18 23:58:04 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -7,4 +7,4 @@ MAJORVER=9 MINORVER=6 PATCHVER=1 RELEASETYPE=-P -RELEASEVER=1 +RELEASEVER=2 Modified: projects/ppc64/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt ============================================================================== --- projects/ppc64/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt Wed Dec 9 22:27:12 2009 (r200320) @@ -39,7 +39,7 @@ IMPORTS FROM BEGEMOT-IP-MIB; begemotMib2 MODULE-IDENTITY - LAST-UPDATED "200602130000Z" + LAST-UPDATED "200908030000Z" ORGANIZATION "German Aerospace Center" CONTACT-INFO " Hartmut Brandt @@ -54,6 +54,12 @@ begemotMib2 MODULE-IDENTITY E-mail: harti@freebsd.org" DESCRIPTION "The MIB for private mib2 stuff." + REVISION "200908030000Z" + DESCRIPTION + "Second edition adds begemotIfDataPoll object." + REVISION "200602130000Z" + DESCRIPTION + "Initial revision." ::= { begemotIp 1 } begemotIfMaxspeed OBJECT-TYPE @@ -87,4 +93,14 @@ begemotIfForcePoll OBJECT-TYPE bit rate in its MIB." ::= { begemotMib2 3 } +begemotIfDataPoll OBJECT-TYPE + SYNTAX TimeTicks + UNITS "deciseconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The rate at which the mib2 module will poll interface data." + DEFVAL { 100 } + ::= { begemotMib2 4 } + END Modified: projects/ppc64/contrib/bsnmp/snmp_mibII/mibII.c ============================================================================== --- projects/ppc64/contrib/bsnmp/snmp_mibII/mibII.c Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/bsnmp/snmp_mibII/mibII.c Wed Dec 9 22:27:12 2009 (r200320) @@ -117,6 +117,15 @@ u_int mibif_hc_update_interval; /* HC update timer handle */ static void *hc_update_timer; +/* Idle poll timer */ +static void *mibII_poll_timer; + +/* interfaces' data poll interval */ +u_int mibII_poll_ticks; + +/* Idle poll hook */ +static void mibII_idle(void *arg __unused); + /*****************************/ static const struct asn_oid oid_ifMIB = OIDX_ifMIB; @@ -410,6 +419,20 @@ mibif_reset_hc_timer(void) mibif_hc_update_interval = ticks; } +/** + * Restart the idle poll timer. + */ +void +mibif_restart_mibII_poll_timer(void) +{ + if (mibII_poll_timer != NULL) + timer_stop(mibII_poll_timer); + + if ((mibII_poll_timer = timer_start_repeat(mibII_poll_ticks * 10, + mibII_poll_ticks * 10, mibII_idle, NULL, module)) == NULL) + syslog(LOG_ERR, "timer_start(%u): %m", mibII_poll_ticks); +} + /* * Fetch new MIB data. */ @@ -1553,7 +1576,7 @@ get_cloners(void) * Idle function */ static void -mibII_idle(void) +mibII_idle(void *arg __unused) { struct mibifa *ifa; @@ -1608,6 +1631,10 @@ mibII_start(void) ipForward_reg = or_register(&oid_ipForward, "The MIB module for the display of CIDR multipath IP Routes.", module); + + mibII_poll_timer = NULL; + mibII_poll_ticks = MIBII_POLL_TICKS; + mibif_restart_mibII_poll_timer(); } /* @@ -1651,6 +1678,11 @@ mibII_init(struct lmodule *mod, int argc static int mibII_fini(void) { + if (mibII_poll_timer != NULL ) { + timer_stop(mibII_poll_timer); + mibII_poll_timer = NULL; + } + if (route_fd != NULL) fd_deselect(route_fd); if (route != -1) @@ -1690,7 +1722,7 @@ const struct snmp_module config = { "This module implements the interface and ip groups.", mibII_init, mibII_fini, - mibII_idle, /* idle */ + NULL, /* idle */ NULL, /* dump */ NULL, /* config */ mibII_start, Modified: projects/ppc64/contrib/bsnmp/snmp_mibII/mibII.h ============================================================================== --- projects/ppc64/contrib/bsnmp/snmp_mibII/mibII.h Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/bsnmp/snmp_mibII/mibII.h Wed Dec 9 22:27:12 2009 (r200320) @@ -211,6 +211,14 @@ extern u_int mibif_hc_update_interval; /* re-compute update interval */ void mibif_reset_hc_timer(void); +/* interfaces' data poll interval */ +extern u_int mibII_poll_ticks; + +/* restart the data poll timer */ +void mibif_restart_mibII_poll_timer(void); + +#define MIBII_POLL_TICKS 100 + /* get interfaces and interface addresses. */ void mib_fetch_interfaces(void); Modified: projects/ppc64/contrib/bsnmp/snmp_mibII/mibII_begemot.c ============================================================================== --- projects/ppc64/contrib/bsnmp/snmp_mibII/mibII_begemot.c Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/bsnmp/snmp_mibII/mibII_begemot.c Wed Dec 9 22:27:12 2009 (r200320) @@ -59,6 +59,11 @@ op_begemot_mibII(struct snmp_context *ct ctx->scratch->int1 = mibif_force_hc_update_interval; mibif_force_hc_update_interval = value->v.uint32; return (SNMP_ERR_NOERROR); + + case LEAF_begemotIfDataPoll: + ctx->scratch->int1 = mibII_poll_ticks; + mibII_poll_ticks = value->v.uint32; + return (SNMP_ERR_NOERROR); } abort(); @@ -68,6 +73,10 @@ op_begemot_mibII(struct snmp_context *ct case LEAF_begemotIfForcePoll: mibif_force_hc_update_interval = ctx->scratch->int1; return (SNMP_ERR_NOERROR); + + case LEAF_begemotIfDataPoll: + mibII_poll_ticks = ctx->scratch->int1; + return (SNMP_ERR_NOERROR); } abort(); @@ -78,6 +87,10 @@ op_begemot_mibII(struct snmp_context *ct mibif_force_hc_update_interval = ctx->scratch->int1; mibif_reset_hc_timer(); return (SNMP_ERR_NOERROR); + + case LEAF_begemotIfDataPoll: + mibif_restart_mibII_poll_timer(); + return (SNMP_ERR_NOERROR); } abort(); } @@ -98,6 +111,10 @@ op_begemot_mibII(struct snmp_context *ct case LEAF_begemotIfForcePoll: value->v.uint32 = mibif_force_hc_update_interval; return (SNMP_ERR_NOERROR); + + case LEAF_begemotIfDataPoll: + value->v.uint32 = mibII_poll_ticks; + return (SNMP_ERR_NOERROR); } abort(); } Modified: projects/ppc64/contrib/bsnmp/snmp_mibII/mibII_tree.def ============================================================================== --- projects/ppc64/contrib/bsnmp/snmp_mibII/mibII_tree.def Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/bsnmp/snmp_mibII/mibII_tree.def Wed Dec 9 22:27:12 2009 (r200320) @@ -240,6 +240,7 @@ (1 begemotIfMaxspeed COUNTER64 op_begemot_mibII GET) (2 begemotIfPoll TIMETICKS op_begemot_mibII GET) (3 begemotIfForcePoll TIMETICKS op_begemot_mibII GET SET) + (4 begemotIfDataPoll TIMETICKS op_begemot_mibII GET SET) ) ) ) Modified: projects/ppc64/contrib/gcc/config/freebsd-spec.h ============================================================================== --- projects/ppc64/contrib/gcc/config/freebsd-spec.h Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/gcc/config/freebsd-spec.h Wed Dec 9 22:27:12 2009 (r200320) @@ -103,9 +103,10 @@ Boston, MA 02110-1301, USA. */ %{p:gcrt1.o%s} \ %{!p: \ %{profile:gcrt1.o%s} \ - %{!profile:crt1.o%s}}}} \ + %{!profile: \ + %{pie: Scrt1.o%s;:crt1.o%s}}}}} \ crti.o%s \ - %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}" + %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}" /* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386. Here we tack on our own magical crtend.o file (see crtstuff.c) which provides part of @@ -113,8 +114,7 @@ Boston, MA 02110-1301, USA. */ entering `main', followed by the normal "finalizer" file, `crtn.o'. */ #define FBSD_ENDFILE_SPEC "\ - %{!shared:crtend.o%s} \ - %{shared:crtendS.o%s} \ + %{shared|pie:crtendS.o%s;:crtend.o%s} \ crtn.o%s " /* Provide a LIB_SPEC appropriate for FreeBSD as configured and as Modified: projects/ppc64/contrib/groff/tmac/doc-syms ============================================================================== --- projects/ppc64/contrib/groff/tmac/doc-syms Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/groff/tmac/doc-syms Wed Dec 9 22:27:12 2009 (r200320) @@ -777,6 +777,7 @@ .ds doc-str-Lb-librt \*[Px] \*[doc-str-Lb]Real-time Library (librt, \-lrt) .ds doc-str-Lb-libtermcap Termcap Access Library (libtermcap, \-ltermcap) .ds doc-str-Lb-libusbhid USB Human Interface Devices Library (libusbhid, \-lusbhid) +.ds doc-str-Lb-libulog User Login Record Library (libulog, \-lulog) .ds doc-str-Lb-libutil System Utilities Library (libutil, \-lutil) .ds doc-str-Lb-libx86_64 x86_64 Architecture Library (libx86_64, \-lx86_64) .ds doc-str-Lb-libz Compression Library (libz, \-lz) Modified: projects/ppc64/contrib/netcat/FREEBSD-vendor ============================================================================== --- projects/ppc64/contrib/netcat/FREEBSD-vendor Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/netcat/FREEBSD-vendor Wed Dec 9 22:27:12 2009 (r200320) @@ -1,5 +1,5 @@ # $FreeBSD$ Project: netcat (aka src/usr.bin/nc in OpenBSD) ProjectURL: http://www.openbsd.org/ -Version: 4.4 +Version: 4.5 License: BSD Modified: projects/ppc64/contrib/ntp/ntpd/ntp_io.c ============================================================================== --- projects/ppc64/contrib/ntp/ntpd/ntp_io.c Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/contrib/ntp/ntpd/ntp_io.c Wed Dec 9 22:27:12 2009 (r200320) @@ -65,6 +65,12 @@ #endif /* IPV6 Multicast Support */ #endif /* IPv6 Support */ +#ifdef INCLUDE_IPV6_SUPPORT +#include <netinet/in.h> +#include <net/if_var.h> +#include <netinet/in_var.h> +#endif /* !INCLUDE_IPV6_SUPPORT */ + extern int listen_to_virtual_ips; extern const char *specific_interface; @@ -1137,6 +1143,36 @@ set_wildcard_reuse(int family, int on) } #endif /* OS_NEEDS_REUSEADDR_FOR_IFADDRBIND */ +#ifdef INCLUDE_IPV6_SUPPORT +static isc_boolean_t +is_anycast(struct sockaddr *sa, char *name) +{ +#if defined(SIOCGIFAFLAG_IN6) && defined(IN6_IFF_ANYCAST) + struct in6_ifreq ifr6; + int fd; + u_int32_t flags6; + + if (sa->sa_family != AF_INET6) + return ISC_FALSE; + if ((fd = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) + return ISC_FALSE; + memset(&ifr6, 0, sizeof(ifr6)); + memcpy(&ifr6.ifr_addr, (struct sockaddr_in6 *)sa, + sizeof(struct sockaddr_in6)); + strlcpy(ifr6.ifr_name, name, IF_NAMESIZE); + if (ioctl(fd, SIOCGIFAFLAG_IN6, &ifr6) < 0) { + close(fd); + return ISC_FALSE; + } + close(fd); + flags6 = ifr6.ifr_ifru.ifru_flags6; + if ((flags6 & IN6_IFF_ANYCAST) != 0) + return ISC_TRUE; +#endif /* !SIOCGIFAFLAG_IN6 || !IN6_IFF_ANYCAST */ + return ISC_FALSE; +} +#endif /* !INCLUDE_IPV6_SUPPORT */ + /* * update_interface strategy * @@ -1276,6 +1312,11 @@ update_interfaces( if (is_wildcard_addr(&interface.sin)) continue; +#ifdef INCLUDE_IPV6_SUPPORT + if (is_anycast((struct sockaddr *)&interface.sin, isc_if.name)) + continue; +#endif /* !INCLUDE_IPV6_SUPPORT */ + /* * map to local *address* in order * to map all duplicate interfaces to an interface structure Modified: projects/ppc64/crypto/openssl/ssl/s3_lib.c ============================================================================== --- projects/ppc64/crypto/openssl/ssl/s3_lib.c Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/crypto/openssl/ssl/s3_lib.c Wed Dec 9 22:27:12 2009 (r200320) @@ -2592,6 +2592,9 @@ int ssl3_renegotiate(SSL *s) if (s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) return(0); + if (1) + return(0); + s->s3->renegotiate=1; return(1); } Modified: projects/ppc64/crypto/openssl/ssl/s3_pkt.c ============================================================================== --- projects/ppc64/crypto/openssl/ssl/s3_pkt.c Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/crypto/openssl/ssl/s3_pkt.c Wed Dec 9 22:27:12 2009 (r200320) @@ -983,9 +983,7 @@ start: if (s->msg_callback) s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->s3->handshake_fragment, 4, s, s->msg_callback_arg); - if (SSL_is_init_finished(s) && - !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) && - !s->s3->renegotiate) + if (0) { ssl3_renegotiate(s); if (ssl3_renegotiate_check(s)) @@ -1116,8 +1114,7 @@ start: /* Unexpected handshake message (Client Hello, or protocol violation) */ if ((s->s3->handshake_fragment_len >= 4) && !s->in_handshake) { - if (((s->state&SSL_ST_MASK) == SSL_ST_OK) && - !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)) + if (0) { #if 0 /* worked only because C operator preferences are not as expected (and * because this is not really needed for clients except for detecting Modified: projects/ppc64/crypto/openssl/ssl/s3_srvr.c ============================================================================== --- projects/ppc64/crypto/openssl/ssl/s3_srvr.c Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/crypto/openssl/ssl/s3_srvr.c Wed Dec 9 22:27:12 2009 (r200320) @@ -718,6 +718,13 @@ int ssl3_get_client_hello(SSL *s) #endif STACK_OF(SSL_CIPHER) *ciphers=NULL; + if (s->new_session) + { + al=SSL_AD_HANDSHAKE_FAILURE; + SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, ERR_R_INTERNAL_ERROR); + goto f_err; + } + /* We do this so that we will respond with our native type. * If we are TLSv1 and we get SSLv3, we will respond with TLSv1, * This down switching should be handled by a different method. Modified: projects/ppc64/etc/Makefile ============================================================================== --- projects/ppc64/etc/Makefile Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/etc/Makefile Wed Dec 9 22:27:12 2009 (r200320) @@ -15,7 +15,7 @@ BIN1= auth.conf \ inetd.conf libalias.conf login.access login.conf mac.conf motd \ netconfig network.subr networks newsyslog.conf nsswitch.conf \ phones profile protocols \ - rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ + rc rc.bsdextended rc.firewall rc.initdiskless \ rc.sendmail rc.shutdown \ rc.subr remote rpc services shells \ sysctl.conf syslog.conf Modified: projects/ppc64/etc/defaults/rc.conf ============================================================================== --- projects/ppc64/etc/defaults/rc.conf Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/etc/defaults/rc.conf Wed Dec 9 22:27:12 2009 (r200320) @@ -118,7 +118,10 @@ firewall_type="UNKNOWN" # Firewall type firewall_quiet="NO" # Set to YES to suppress rule display firewall_logging="NO" # Set to YES to enable events logging firewall_flags="" # Flags passed to ipfw when type is a file -firewall_client_net="192.0.2.0/24" # Network address for "client" firewall. +firewall_client_net="192.0.2.0/24" # IPv4 Network address for "client" + # firewall. +#firewall_client_net_ipv6="2001:db8:2:1::/64" # IPv6 network prefix for + # "client" firewall. firewall_simple_iif="ed1" # Inside network interface for "simple" # firewall. firewall_simple_inet="192.0.2.16/28" # Inside network address for "simple" @@ -127,12 +130,22 @@ firewall_simple_oif="ed0" # Outside netw # firewall. firewall_simple_onet="192.0.2.0/28" # Outside network address for "simple" # firewall. +#firewall_simple_iif_ipv6="ed1" # Inside IPv6 network interface for "simple" + # firewall. +#firewall_simple_inet_ipv6="2001:db8:2:800::/56" # Inside IPv6 network prefix + # for "simple" firewall. +#firewall_simple_oif_ipv6="ed0" # Outside IPv6 network interface for "simple" + # firewall. +#firewall_simple_onet_ipv6="2001:db8:2:0::/56" # Outside IPv6 network prefix + # for "simple" firewall. firewall_myservices="" # List of TCP ports on which this host # offers services for "workstation" firewall. firewall_allowservices="" # List of IPs which have access to # $firewall_myservices for "workstation" # firewall. -firewall_trusted="" # List of IPs which have full access to this +firewall_trusted="" # List of IPv4s which have full access to this + # host for "workstation" firewall. +firewall_trusted_ipv6="" # List of IPv6s which have full access to this # host for "workstation" firewall. firewall_logdeny="NO" # Set to YES to log default denied incoming # packets for "workstation" firewall. @@ -472,13 +485,6 @@ ipv6_faith_prefix="NO" # Set faith pref # faithd(8) setup. ipv6_ipv4mapping="NO" # Set to "YES" to enable IPv4 mapped IPv6 addr # communication. (like ::ffff:a.b.c.d) -ipv6_firewall_enable="NO" # Set to YES to enable IPv6 firewall - # functionality -ipv6_firewall_script="/etc/rc.firewall6" # Which script to run to set up the IPv6 firewall -ipv6_firewall_type="UNKNOWN" # IPv6 Firewall type (see /etc/rc.firewall6) -ipv6_firewall_quiet="NO" # Set to YES to suppress rule display -ipv6_firewall_logging="NO" # Set to YES to enable events logging -ipv6_firewall_flags="" # Flags passed to ip6fw when type is a file ipv6_ipfilter_rules="/etc/ipf6.rules" # rules definition file for ipfilter, # see /usr/src/contrib/ipfilter/rules # for examples Modified: projects/ppc64/etc/mtree/BSD.var.dist ============================================================================== --- projects/ppc64/etc/mtree/BSD.var.dist Wed Dec 9 22:10:45 2009 (r200319) +++ projects/ppc64/etc/mtree/BSD.var.dist Wed Dec 9 22:27:12 2009 (r200320) @@ -32,7 +32,7 @@ db entropy uname=operator gname=operator mode=0700 .. *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912092227.nB9MRDfL041300>