Date: Thu, 5 Jun 2014 16:03:56 +0000 (UTC) From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r267117 - in user/dchagin/lemul: . bin/sh contrib/openpam/lib/libpam crypto/openssl/ssl etc etc/etc.amd64 etc/etc.i386 etc/mtree include include/xlocale lib/libc/gen lib/libc/stdio lib/... Message-ID: <201406051603.s55G3usQ041729@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dchagin Date: Thu Jun 5 16:03:55 2014 New Revision: 267117 URL: http://svnweb.freebsd.org/changeset/base/267117 Log: MFH. Added: user/dchagin/lemul/.arclint - copied unchanged from r267116, head/.arclint user/dchagin/lemul/include/xlocale/_strings.h - copied unchanged from r267116, head/include/xlocale/_strings.h user/dchagin/lemul/share/vt/ - copied from r267116, head/share/vt/ user/dchagin/lemul/sys/arm/conf/ARNDALE-OCTA - copied unchanged from r267116, head/sys/arm/conf/ARNDALE-OCTA user/dchagin/lemul/sys/arm/conf/EXYNOS5.common - copied unchanged from r267116, head/sys/arm/conf/EXYNOS5.common user/dchagin/lemul/sys/arm/conf/EXYNOS5250 - copied unchanged from r267116, head/sys/arm/conf/EXYNOS5250 user/dchagin/lemul/sys/arm/conf/EXYNOS5420 - copied unchanged from r267116, head/sys/arm/conf/EXYNOS5420 user/dchagin/lemul/sys/arm/conf/RADXA-LITE - copied unchanged from r267116, head/sys/arm/conf/RADXA-LITE user/dchagin/lemul/sys/arm/conf/RK3188 - copied unchanged from r267116, head/sys/arm/conf/RK3188 user/dchagin/lemul/sys/arm/samsung/exynos/exynos_uart.c - copied unchanged from r267116, head/sys/arm/samsung/exynos/exynos_uart.c user/dchagin/lemul/sys/arm/samsung/exynos/exynos_uart.h - copied unchanged from r267116, head/sys/arm/samsung/exynos/exynos_uart.h user/dchagin/lemul/sys/arm/samsung/exynos/std.exynos5250 - copied unchanged from r267116, head/sys/arm/samsung/exynos/std.exynos5250 user/dchagin/lemul/sys/arm/samsung/exynos/std.exynos5420 - copied unchanged from r267116, head/sys/arm/samsung/exynos/std.exynos5420 user/dchagin/lemul/sys/boot/fdt/dts/arm/exynos5.dtsi - copied unchanged from r267116, head/sys/boot/fdt/dts/arm/exynos5.dtsi user/dchagin/lemul/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts - copied unchanged from r267116, head/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts user/dchagin/lemul/sys/boot/fdt/dts/arm/exynos5420.dtsi - copied unchanged from r267116, head/sys/boot/fdt/dts/arm/exynos5420.dtsi user/dchagin/lemul/sys/boot/fdt/dts/arm/rk3188-radxa-lite.dts - copied unchanged from r267116, head/sys/boot/fdt/dts/arm/rk3188-radxa-lite.dts user/dchagin/lemul/sys/boot/usb/storage/ - copied from r267116, head/sys/boot/usb/storage/ user/dchagin/lemul/sys/dev/usb/controller/saf1761_otg_boot.c - copied unchanged from r267116, head/sys/dev/usb/controller/saf1761_otg_boot.c user/dchagin/lemul/sys/dev/virtio/virtio_config.h - copied unchanged from r267116, head/sys/dev/virtio/virtio_config.h user/dchagin/lemul/sys/dev/virtio/virtio_ids.h - copied unchanged from r267116, head/sys/dev/virtio/virtio_ids.h user/dchagin/lemul/sys/modules/usb/saf1761otg/ - copied from r267116, head/sys/modules/usb/saf1761otg/ user/dchagin/lemul/tools/ifnet/ - copied from r267116, head/tools/ifnet/ user/dchagin/lemul/usr.sbin/bsnmpd/modules/snmp_lm75/ - copied from r267116, head/usr.sbin/bsnmpd/modules/snmp_lm75/ Deleted: user/dchagin/lemul/sys/arm/conf/EXYNOS5250.common user/dchagin/lemul/sys/arm/samsung/exynos/std.exynos5 user/dchagin/lemul/sys/arm/samsung/exynos/uart.c user/dchagin/lemul/sys/arm/samsung/exynos/uart.h user/dchagin/lemul/sys/dev/vt/hw/xboxfb/ user/dchagin/lemul/sys/modules/usb/saf1761/ user/dchagin/lemul/tools/build/options/WITHOUT_TESTS Modified: user/dchagin/lemul/bin/sh/arith_yacc.c user/dchagin/lemul/bin/sh/exec.c user/dchagin/lemul/contrib/openpam/lib/libpam/openpam_configure.c user/dchagin/lemul/crypto/openssl/ssl/d1_both.c user/dchagin/lemul/crypto/openssl/ssl/s3_clnt.c user/dchagin/lemul/crypto/openssl/ssl/s3_pkt.c user/dchagin/lemul/crypto/openssl/ssl/s3_srvr.c user/dchagin/lemul/crypto/openssl/ssl/ssl3.h user/dchagin/lemul/etc/etc.amd64/ttys user/dchagin/lemul/etc/etc.i386/ttys user/dchagin/lemul/etc/mtree/BSD.usr.dist user/dchagin/lemul/etc/mtree/BSD.var.dist user/dchagin/lemul/etc/snmpd.config user/dchagin/lemul/include/strings.h user/dchagin/lemul/include/xlocale/Makefile user/dchagin/lemul/include/xlocale/_string.h user/dchagin/lemul/lib/libc/gen/sem_wait.3 user/dchagin/lemul/lib/libc/stdio/fmemopen.c user/dchagin/lemul/lib/libc/stdio/fopen.3 user/dchagin/lemul/lib/libc/string/strcasecmp.3 user/dchagin/lemul/lib/libc/sys/mlock.2 user/dchagin/lemul/lib/libcrypt/crypt.c user/dchagin/lemul/lib/libpmc/libpmc.c user/dchagin/lemul/lib/libstand/printf.c user/dchagin/lemul/lib/libstand/stand.h user/dchagin/lemul/lib/libusb/libusb-1.0.pc user/dchagin/lemul/lib/libvmmapi/vmmapi.c user/dchagin/lemul/lib/libvmmapi/vmmapi.h user/dchagin/lemul/release/doc/en_US.ISO8859-1/relnotes/article.xml user/dchagin/lemul/sbin/geom/class/label/glabel.8 user/dchagin/lemul/sbin/ipfw/dummynet.c user/dchagin/lemul/sbin/ipfw/ipfw.8 user/dchagin/lemul/sbin/ipfw/ipfw2.h user/dchagin/lemul/share/man/man4/carp.4 user/dchagin/lemul/share/man/man4/iwn.4 user/dchagin/lemul/share/man/man4/man4.arm/ti_adc.4 user/dchagin/lemul/share/man/man4/netmap.4 user/dchagin/lemul/share/man/man4/snd_envy24.4 user/dchagin/lemul/share/man/man4/snd_envy24ht.4 user/dchagin/lemul/share/man/man5/passwd.5 user/dchagin/lemul/share/man/man5/src.conf.5 user/dchagin/lemul/share/man/man9/Makefile user/dchagin/lemul/share/man/man9/mbuf.9 user/dchagin/lemul/share/man/man9/socket.9 user/dchagin/lemul/share/misc/bsd-family-tree user/dchagin/lemul/share/misc/committers-src.dot user/dchagin/lemul/sys/Makefile user/dchagin/lemul/sys/amd64/amd64/exception.S user/dchagin/lemul/sys/amd64/amd64/sys_machdep.c user/dchagin/lemul/sys/amd64/amd64/trap.c user/dchagin/lemul/sys/amd64/include/vmm.h (contents, props changed) user/dchagin/lemul/sys/amd64/include/vmm_dev.h (contents, props changed) user/dchagin/lemul/sys/amd64/vmm/intel/vmx.c user/dchagin/lemul/sys/amd64/vmm/io/vlapic.c user/dchagin/lemul/sys/amd64/vmm/vmm.c user/dchagin/lemul/sys/amd64/vmm/vmm_dev.c user/dchagin/lemul/sys/arm/arm/locore.S user/dchagin/lemul/sys/arm/broadcom/bcm2835/bcm2835_bsc.c user/dchagin/lemul/sys/arm/broadcom/bcm2835/files.bcm2835 user/dchagin/lemul/sys/arm/conf/ARNDALE user/dchagin/lemul/sys/arm/conf/CHROMEBOOK user/dchagin/lemul/sys/arm/conf/RADXA user/dchagin/lemul/sys/arm/rockchip/files.rk30xx user/dchagin/lemul/sys/arm/samsung/exynos/chrome_ec.c user/dchagin/lemul/sys/arm/samsung/exynos/chrome_kb.c user/dchagin/lemul/sys/arm/samsung/exynos/chrome_kb.h user/dchagin/lemul/sys/arm/samsung/exynos/exynos5_ehci.c user/dchagin/lemul/sys/arm/samsung/exynos/exynos5_i2c.c user/dchagin/lemul/sys/arm/samsung/exynos/exynos5_pad.c user/dchagin/lemul/sys/arm/samsung/exynos/files.exynos5 user/dchagin/lemul/sys/arm/ti/am335x/am335x_pwm.c user/dchagin/lemul/sys/arm/ti/ti_adc.c user/dchagin/lemul/sys/arm/ti/ti_adcreg.h user/dchagin/lemul/sys/arm/ti/ti_adcvar.h user/dchagin/lemul/sys/arm/ti/ti_i2c.c user/dchagin/lemul/sys/arm/xscale/i80321/ep80219_machdep.c user/dchagin/lemul/sys/arm/xscale/i80321/iq31244_machdep.c user/dchagin/lemul/sys/arm/xscale/i8134x/crb_machdep.c user/dchagin/lemul/sys/arm/xscale/ixp425/avila_machdep.c user/dchagin/lemul/sys/arm/xscale/pxa/pxa_machdep.c user/dchagin/lemul/sys/boot/fdt/dts/arm/beaglebone-black.dts user/dchagin/lemul/sys/boot/fdt/dts/arm/beaglebone.dts user/dchagin/lemul/sys/boot/fdt/dts/arm/exynos5250-arndale.dts user/dchagin/lemul/sys/boot/fdt/dts/arm/exynos5250-chromebook-snow.dts user/dchagin/lemul/sys/boot/fdt/dts/arm/exynos5250-chromebook-spring.dts user/dchagin/lemul/sys/boot/fdt/dts/arm/exynos5250.dtsi user/dchagin/lemul/sys/boot/fdt/dts/mips/beripad-de4.dts user/dchagin/lemul/sys/boot/forth/brand.4th user/dchagin/lemul/sys/boot/mips/beri/loader/Makefile user/dchagin/lemul/sys/boot/mips/beri/loader/loader.ldscript user/dchagin/lemul/sys/boot/mips/beri/loader/main.c user/dchagin/lemul/sys/boot/usb/Makefile user/dchagin/lemul/sys/boot/usb/bsd_kernel.c user/dchagin/lemul/sys/boot/usb/bsd_kernel.h user/dchagin/lemul/sys/boot/usb/bsd_usbloader_test.c user/dchagin/lemul/sys/boot/usb/usb_busdma_loader.c user/dchagin/lemul/sys/cam/scsi/scsi_sg.c user/dchagin/lemul/sys/cam/scsi/scsi_sg.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c user/dchagin/lemul/sys/compat/freebsd32/freebsd32_ioctl.c user/dchagin/lemul/sys/compat/freebsd32/freebsd32_ioctl.h user/dchagin/lemul/sys/compat/linux/linux_ioctl.c user/dchagin/lemul/sys/conf/files user/dchagin/lemul/sys/ddb/db_command.c user/dchagin/lemul/sys/dev/bxe/bxe.c user/dchagin/lemul/sys/dev/bxe/bxe.h user/dchagin/lemul/sys/dev/bxe/bxe_debug.c user/dchagin/lemul/sys/dev/bxe/bxe_stats.c user/dchagin/lemul/sys/dev/cfe/cfe_console.c user/dchagin/lemul/sys/dev/cxgbe/t4_sge.c user/dchagin/lemul/sys/dev/dc/dcphy.c user/dchagin/lemul/sys/dev/dc/pnphy.c user/dchagin/lemul/sys/dev/drm2/radeon/radeon_device.c user/dchagin/lemul/sys/dev/e1000/if_em.c user/dchagin/lemul/sys/dev/e1000/if_em.h user/dchagin/lemul/sys/dev/e1000/if_igb.c user/dchagin/lemul/sys/dev/e1000/if_lem.c user/dchagin/lemul/sys/dev/e1000/if_lem.h user/dchagin/lemul/sys/dev/fxp/if_fxp.c user/dchagin/lemul/sys/dev/fxp/if_fxpvar.h user/dchagin/lemul/sys/dev/fxp/inphy.c user/dchagin/lemul/sys/dev/gpio/gpioiic.c user/dchagin/lemul/sys/dev/hpt27xx/hpt27xx_osm_bsd.c user/dchagin/lemul/sys/dev/hwpmc/hwpmc_core.c user/dchagin/lemul/sys/dev/hwpmc/hwpmc_intel.c user/dchagin/lemul/sys/dev/hwpmc/pmc_events.h user/dchagin/lemul/sys/dev/iicbus/iic.c user/dchagin/lemul/sys/dev/mfi/mfi.c user/dchagin/lemul/sys/dev/mfi/mfi_cam.c user/dchagin/lemul/sys/dev/mfi/mfi_disk.c user/dchagin/lemul/sys/dev/mfi/mfi_syspd.c user/dchagin/lemul/sys/dev/mfi/mfivar.h user/dchagin/lemul/sys/dev/mii/brgphy.c user/dchagin/lemul/sys/dev/mii/e1000phy.c user/dchagin/lemul/sys/dev/mii/ip1000phy.c user/dchagin/lemul/sys/dev/mii/jmphy.c user/dchagin/lemul/sys/dev/mii/mii.c user/dchagin/lemul/sys/dev/mii/miivar.h user/dchagin/lemul/sys/dev/mii/nsphy.c user/dchagin/lemul/sys/dev/mii/rgephy.c user/dchagin/lemul/sys/dev/mii/truephy.c user/dchagin/lemul/sys/dev/netmap/netmap_generic.c user/dchagin/lemul/sys/dev/netmap/netmap_kern.h user/dchagin/lemul/sys/dev/sound/pci/emu10k1.c user/dchagin/lemul/sys/dev/uart/uart_dev_ns8250.c user/dchagin/lemul/sys/dev/usb/controller/dwc_otg.c user/dchagin/lemul/sys/dev/usb/controller/saf1761_otg.c user/dchagin/lemul/sys/dev/usb/controller/saf1761_otg.h user/dchagin/lemul/sys/dev/usb/controller/saf1761_otg_fdt.c user/dchagin/lemul/sys/dev/usb/controller/saf1761_otg_reg.h user/dchagin/lemul/sys/dev/usb/controller/usb_controller.c user/dchagin/lemul/sys/dev/usb/usb_busdma.h user/dchagin/lemul/sys/dev/usb/usb_freebsd.h user/dchagin/lemul/sys/dev/usb/usb_freebsd_loader.h user/dchagin/lemul/sys/dev/usb/usb_msctest.c user/dchagin/lemul/sys/dev/usb/usb_msctest.h user/dchagin/lemul/sys/dev/usb/wlan/if_rsu.c user/dchagin/lemul/sys/dev/usb/wlan/if_rsureg.h user/dchagin/lemul/sys/dev/usb/wlan/if_run.c user/dchagin/lemul/sys/dev/virtio/network/if_vtnet.c user/dchagin/lemul/sys/dev/virtio/pci/virtio_pci.c user/dchagin/lemul/sys/dev/virtio/virtio.c user/dchagin/lemul/sys/dev/virtio/virtio.h user/dchagin/lemul/sys/dev/virtio/virtqueue.c user/dchagin/lemul/sys/dev/vt/font/vt_font_default.c user/dchagin/lemul/sys/dev/vt/vt.h user/dchagin/lemul/sys/dev/vt/vt_buf.c user/dchagin/lemul/sys/dev/vt/vt_core.c user/dchagin/lemul/sys/fs/tmpfs/tmpfs_subr.c user/dchagin/lemul/sys/geom/part/g_part_apm.c user/dchagin/lemul/sys/geom/part/g_part_gpt.c user/dchagin/lemul/sys/geom/part/g_part_pc98.c user/dchagin/lemul/sys/i386/conf/PAE user/dchagin/lemul/sys/i386/conf/XEN user/dchagin/lemul/sys/i386/i386/trap.c user/dchagin/lemul/sys/kern/kern_dtrace.c user/dchagin/lemul/sys/kern/kern_poll.c user/dchagin/lemul/sys/kern/kern_timeout.c user/dchagin/lemul/sys/kern/subr_rman.c user/dchagin/lemul/sys/kern/subr_taskqueue.c user/dchagin/lemul/sys/kern/uipc_mbuf.c user/dchagin/lemul/sys/mips/conf/BERI_DE4_BASE user/dchagin/lemul/sys/mips/mips/trap.c user/dchagin/lemul/sys/modules/Makefile user/dchagin/lemul/sys/modules/usb/Makefile user/dchagin/lemul/sys/net/if.c user/dchagin/lemul/sys/net/if_media.h user/dchagin/lemul/sys/net/if_var.h user/dchagin/lemul/sys/net/ifq.h user/dchagin/lemul/sys/net/route.c user/dchagin/lemul/sys/net/rtsock.c user/dchagin/lemul/sys/netgraph/ng_pipe.c user/dchagin/lemul/sys/netinet/in.h user/dchagin/lemul/sys/netinet/in_pcb.c user/dchagin/lemul/sys/netinet/ip_dummynet.h user/dchagin/lemul/sys/netinet/ip_options.c user/dchagin/lemul/sys/netinet/ip_output.c user/dchagin/lemul/sys/netinet/sctp_output.c user/dchagin/lemul/sys/netinet/tcp_timewait.c user/dchagin/lemul/sys/netinet/udp_var.h user/dchagin/lemul/sys/netinet6/ip6_forward.c user/dchagin/lemul/sys/netinet6/ip6_ipsec.c user/dchagin/lemul/sys/netinet6/ip6_ipsec.h user/dchagin/lemul/sys/netinet6/ip6_output.c user/dchagin/lemul/sys/netinet6/ip6_var.h user/dchagin/lemul/sys/netinet6/nd6.c user/dchagin/lemul/sys/netinet6/nd6_nbr.c user/dchagin/lemul/sys/netipsec/ipsec6.h user/dchagin/lemul/sys/netipsec/ipsec_input.c user/dchagin/lemul/sys/netipsec/ipsec_output.c user/dchagin/lemul/sys/netipsec/xform_ipip.c user/dchagin/lemul/sys/netpfil/ipfw/ip_dn_io.c user/dchagin/lemul/sys/netpfil/ipfw/ip_dummynet.c user/dchagin/lemul/sys/netpfil/pf/pf.c user/dchagin/lemul/sys/powerpc/aim/trap.c user/dchagin/lemul/sys/sys/dtrace_bsd.h user/dchagin/lemul/sys/sys/param.h user/dchagin/lemul/sys/sys/pmc.h user/dchagin/lemul/sys/ufs/ffs/ffs_vfsops.c user/dchagin/lemul/tests/sys/netinet/fibs_test.sh user/dchagin/lemul/tests/sys/netinet/udp_dontroute.c user/dchagin/lemul/tools/build/options/WITH_TESTS user/dchagin/lemul/tools/regression/lib/libc/stdio/test-fmemopen.c user/dchagin/lemul/tools/tools/vt/fontcvt/fontcvt.c user/dchagin/lemul/tools/tools/vt/mkkfont/mkkfont.c user/dchagin/lemul/usr.bin/calendar/Makefile user/dchagin/lemul/usr.bin/calendar/calendars/calendar.freebsd user/dchagin/lemul/usr.bin/netstat/main.c user/dchagin/lemul/usr.bin/netstat/netstat.1 user/dchagin/lemul/usr.bin/printf/printf.c user/dchagin/lemul/usr.bin/printf/tests/Makefile user/dchagin/lemul/usr.bin/printf/tests/regress.m2.out user/dchagin/lemul/usr.bin/printf/tests/regress.sh user/dchagin/lemul/usr.bin/top/machine.c user/dchagin/lemul/usr.bin/users/users.c user/dchagin/lemul/usr.bin/yes/yes.1 user/dchagin/lemul/usr.sbin/bhyve/bhyverun.c user/dchagin/lemul/usr.sbin/bhyve/inout.c user/dchagin/lemul/usr.sbin/bhyve/pci_lpc.c user/dchagin/lemul/usr.sbin/bhyve/pci_virtio_block.c user/dchagin/lemul/usr.sbin/bhyvectl/bhyvectl.c user/dchagin/lemul/usr.sbin/bsnmpd/modules/Makefile user/dchagin/lemul/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3 user/dchagin/lemul/usr.sbin/kbdcontrol/kbdcontrol.c user/dchagin/lemul/usr.sbin/kbdcontrol/path.h user/dchagin/lemul/usr.sbin/makefs/ffs/mkfs.c user/dchagin/lemul/usr.sbin/mixer/mixer.8 user/dchagin/lemul/usr.sbin/pmcstat/pmcstat.h user/dchagin/lemul/usr.sbin/unbound/local-setup/local-unbound-setup.sh user/dchagin/lemul/usr.sbin/usbdump/usbdump.c user/dchagin/lemul/usr.sbin/vidcontrol/path.h user/dchagin/lemul/usr.sbin/vidcontrol/vidcontrol.c Directory Properties: user/dchagin/lemul/ (props changed) user/dchagin/lemul/contrib/openpam/ (props changed) user/dchagin/lemul/crypto/openssl/ (props changed) user/dchagin/lemul/etc/ (props changed) user/dchagin/lemul/include/ (props changed) user/dchagin/lemul/lib/libc/ (props changed) user/dchagin/lemul/lib/libvmmapi/ (props changed) user/dchagin/lemul/sbin/ (props changed) user/dchagin/lemul/sbin/ipfw/ (props changed) user/dchagin/lemul/share/ (props changed) user/dchagin/lemul/share/man/man4/ (props changed) user/dchagin/lemul/sys/ (props changed) user/dchagin/lemul/sys/amd64/vmm/ (props changed) user/dchagin/lemul/sys/boot/ (props changed) user/dchagin/lemul/sys/cddl/contrib/opensolaris/ (props changed) user/dchagin/lemul/sys/conf/ (props changed) user/dchagin/lemul/usr.bin/calendar/ (props changed) user/dchagin/lemul/usr.sbin/bhyve/ (props changed) user/dchagin/lemul/usr.sbin/bhyvectl/ (props changed) Copied: user/dchagin/lemul/.arclint (from r267116, head/.arclint) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/dchagin/lemul/.arclint Thu Jun 5 16:03:55 2014 (r267117, copy of r267116, head/.arclint) @@ -0,0 +1,9 @@ +{ + "linters": { + "python": { + "type": "pep8", + "exclude": "(contrib)", + "include": "(\\.py$)" + } + } +} Modified: user/dchagin/lemul/bin/sh/arith_yacc.c ============================================================================== --- user/dchagin/lemul/bin/sh/arith_yacc.c Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/bin/sh/arith_yacc.c Thu Jun 5 16:03:55 2014 (r267117) @@ -139,7 +139,7 @@ static arith_t do_binop(int op, arith_t case ARITH_SUB: return (uintmax_t)a - (uintmax_t)b; case ARITH_LSHIFT: - return a << b; + return (uintmax_t)a << b; case ARITH_RSHIFT: return a >> b; case ARITH_LT: Modified: user/dchagin/lemul/bin/sh/exec.c ============================================================================== --- user/dchagin/lemul/bin/sh/exec.c Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/bin/sh/exec.c Thu Jun 5 16:03:55 2014 (r267117) @@ -362,15 +362,13 @@ find_command(const char *name, struct cm e = ENOENT; idx = -1; -loop: - while ((fullname = padvance(&path, name)) != NULL) { - stunalloc(fullname); + for (;(fullname = padvance(&path, name)) != NULL; stunalloc(fullname)) { idx++; if (pathopt) { if (prefix("func", pathopt)) { /* handled below */ } else { - goto loop; /* ignore unimplemented options */ + continue; /* ignore unimplemented options */ } } if (fullname[0] != '/') @@ -378,13 +376,12 @@ loop: if (stat(fullname, &statb) < 0) { if (errno != ENOENT && errno != ENOTDIR) e = errno; - goto loop; + continue; } e = EACCES; /* if we fail, this will be the error */ if (!S_ISREG(statb.st_mode)) - goto loop; + continue; if (pathopt) { /* this is a %func directory */ - stalloc(strlen(fullname) + 1); readcmdfile(fullname); if ((cmdp = cmdlookup(name, 0)) == NULL || cmdp->cmdtype != CMDFUNCTION) error("%s not defined in %s", name, fullname); @@ -405,6 +402,7 @@ loop: #endif TRACE(("searchexec \"%s\" returns \"%s\"\n", name, fullname)); INTOFF; + stunalloc(fullname); cmdp = cmdlookup(name, 1); if (cmdp->cmdtype == CMDFUNCTION) cmdp = &loc_cmd; Modified: user/dchagin/lemul/contrib/openpam/lib/libpam/openpam_configure.c ============================================================================== --- user/dchagin/lemul/contrib/openpam/lib/libpam/openpam_configure.c Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/contrib/openpam/lib/libpam/openpam_configure.c Thu Jun 5 16:03:55 2014 (r267117) @@ -1,6 +1,6 @@ /*- * Copyright (c) 2001-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2012 Dag-Erling Smørgrav + * Copyright (c) 2004-2014 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -193,6 +193,7 @@ openpam_parse_chain(pam_handle_t *pamh, openpam_log(PAM_LOG_ERROR, "%s(%d): missing or invalid facility", filename, lineno); + errno = EINVAL; goto fail; } if (facility != fclt && facility != PAM_FACILITY_ANY) { @@ -208,18 +209,28 @@ openpam_parse_chain(pam_handle_t *pamh, openpam_log(PAM_LOG_ERROR, "%s(%d): missing or invalid service name", filename, lineno); + errno = EINVAL; goto fail; } if (wordv[i] != NULL) { openpam_log(PAM_LOG_ERROR, "%s(%d): garbage at end of line", filename, lineno); + errno = EINVAL; goto fail; } ret = openpam_load_chain(pamh, servicename, fclt); FREEV(wordc, wordv); - if (ret < 0) + if (ret < 0) { + /* + * Bogus errno, but this ensures that the + * outer loop does not just ignore the + * error and keep searching. + */ + if (errno == ENOENT) + errno = EINVAL; goto fail; + } continue; } @@ -229,6 +240,7 @@ openpam_parse_chain(pam_handle_t *pamh, openpam_log(PAM_LOG_ERROR, "%s(%d): missing or invalid control flag", filename, lineno); + errno = EINVAL; goto fail; } @@ -238,6 +250,7 @@ openpam_parse_chain(pam_handle_t *pamh, openpam_log(PAM_LOG_ERROR, "%s(%d): missing or invalid module name", filename, lineno); + errno = EINVAL; goto fail; } @@ -247,8 +260,11 @@ openpam_parse_chain(pam_handle_t *pamh, this->flag = ctlf; /* load module */ - if ((this->module = openpam_load_module(modulename)) == NULL) + if ((this->module = openpam_load_module(modulename)) == NULL) { + if (errno == ENOENT) + errno = ENOEXEC; goto fail; + } /* * The remaining items in wordv are the module's @@ -281,7 +297,11 @@ openpam_parse_chain(pam_handle_t *pamh, * The loop ended because openpam_readword() returned NULL, which * can happen for four different reasons: an I/O error (ferror(f) * is true), a memory allocation failure (ferror(f) is false, - * errno is non-zero) + * feof(f) is false, errno is non-zero), the file ended with an + * unterminated quote or backslash escape (ferror(f) is false, + * feof(f) is true, errno is non-zero), or the end of the file was + * reached without error (ferror(f) is false, feof(f) is true, + * errno is zero). */ if (ferror(f) || errno != 0) goto syserr; @@ -402,6 +422,9 @@ openpam_load_chain(pam_handle_t *pamh, } ret = openpam_load_file(pamh, service, facility, filename, style); + /* success */ + if (ret > 0) + RETURNN(ret); /* the file exists, but an error occurred */ if (ret == -1 && errno != ENOENT) RETURNN(ret); @@ -411,7 +434,8 @@ openpam_load_chain(pam_handle_t *pamh, } /* no hit */ - RETURNN(0); + errno = ENOENT; + RETURNN(-1); } /* @@ -432,8 +456,10 @@ openpam_configure(pam_handle_t *pamh, openpam_log(PAM_LOG_ERROR, "invalid service name"); RETURNC(PAM_SYSTEM_ERR); } - if (openpam_load_chain(pamh, service, PAM_FACILITY_ANY) < 0) - goto load_err; + if (openpam_load_chain(pamh, service, PAM_FACILITY_ANY) < 0) { + if (errno != ENOENT) + goto load_err; + } for (fclt = 0; fclt < PAM_NUM_FACILITIES; ++fclt) { if (pamh->chains[fclt] != NULL) continue; Modified: user/dchagin/lemul/crypto/openssl/ssl/d1_both.c ============================================================================== --- user/dchagin/lemul/crypto/openssl/ssl/d1_both.c Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/crypto/openssl/ssl/d1_both.c Thu Jun 5 16:03:55 2014 (r267117) @@ -627,7 +627,16 @@ dtls1_reassemble_fragment(SSL *s, struct frag->msg_header.frag_off = 0; } else + { frag = (hm_fragment*) item->data; + if (frag->msg_header.msg_len != msg_hdr->msg_len) + { + item = NULL; + frag = NULL; + goto err; + } + } + /* If message is already reassembled, this must be a * retransmit and can be dropped. @@ -784,6 +793,7 @@ dtls1_get_message_fragment(SSL *s, int s int i,al; struct hm_header_st msg_hdr; + redo: /* see if we have the required fragment already */ if ((frag_len = dtls1_retrieve_buffered_fragment(s,max,ok)) || *ok) { @@ -842,8 +852,7 @@ dtls1_get_message_fragment(SSL *s, int s s->msg_callback_arg); s->init_num = 0; - return dtls1_get_message_fragment(s, st1, stn, - max, ok); + goto redo; } else /* Incorrectly formated Hello request */ { Modified: user/dchagin/lemul/crypto/openssl/ssl/s3_clnt.c ============================================================================== --- user/dchagin/lemul/crypto/openssl/ssl/s3_clnt.c Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/crypto/openssl/ssl/s3_clnt.c Thu Jun 5 16:03:55 2014 (r267117) @@ -559,6 +559,7 @@ int ssl3_connect(SSL *s) case SSL3_ST_CR_FINISHED_A: case SSL3_ST_CR_FINISHED_B: + s->s3->flags |= SSL3_FLAGS_CCS_OK; ret=ssl3_get_finished(s,SSL3_ST_CR_FINISHED_A, SSL3_ST_CR_FINISHED_B); if (ret <= 0) goto end; @@ -915,6 +916,7 @@ int ssl3_get_server_hello(SSL *s) SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT); goto f_err; } + s->s3->flags |= SSL3_FLAGS_CCS_OK; s->hit=1; } else /* a miss or crap from the other end */ @@ -2510,6 +2512,13 @@ int ssl3_send_client_key_exchange(SSL *s int ecdh_clnt_cert = 0; int field_size = 0; + if (s->session->sess_cert == NULL) + { + ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE); + SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_UNEXPECTED_MESSAGE); + goto err; + } + /* Did we send out the client's * ECDH share for use in premaster * computation as part of client certificate? Modified: user/dchagin/lemul/crypto/openssl/ssl/s3_pkt.c ============================================================================== --- user/dchagin/lemul/crypto/openssl/ssl/s3_pkt.c Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/crypto/openssl/ssl/s3_pkt.c Thu Jun 5 16:03:55 2014 (r267117) @@ -1301,6 +1301,15 @@ start: goto f_err; } + if (!(s->s3->flags & SSL3_FLAGS_CCS_OK)) + { + al=SSL_AD_UNEXPECTED_MESSAGE; + SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_CCS_RECEIVED_EARLY); + goto f_err; + } + + s->s3->flags &= ~SSL3_FLAGS_CCS_OK; + rr->length=0; if (s->msg_callback) @@ -1435,7 +1444,7 @@ int ssl3_do_change_cipher_spec(SSL *s) if (s->s3->tmp.key_block == NULL) { - if (s->session == NULL) + if (s->session == NULL || s->session->master_key_length == 0) { /* might happen if dtls1_read_bytes() calls this */ SSLerr(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC,SSL_R_CCS_RECEIVED_EARLY); Modified: user/dchagin/lemul/crypto/openssl/ssl/s3_srvr.c ============================================================================== --- user/dchagin/lemul/crypto/openssl/ssl/s3_srvr.c Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/crypto/openssl/ssl/s3_srvr.c Thu Jun 5 16:03:55 2014 (r267117) @@ -673,6 +673,7 @@ int ssl3_accept(SSL *s) case SSL3_ST_SR_CERT_VRFY_A: case SSL3_ST_SR_CERT_VRFY_B: + s->s3->flags |= SSL3_FLAGS_CCS_OK; /* we should decide if we expected this one */ ret=ssl3_get_cert_verify(s); if (ret <= 0) goto end; @@ -700,6 +701,7 @@ int ssl3_accept(SSL *s) case SSL3_ST_SR_FINISHED_A: case SSL3_ST_SR_FINISHED_B: + s->s3->flags |= SSL3_FLAGS_CCS_OK; ret=ssl3_get_finished(s,SSL3_ST_SR_FINISHED_A, SSL3_ST_SR_FINISHED_B); if (ret <= 0) goto end; @@ -770,7 +772,10 @@ int ssl3_accept(SSL *s) s->s3->tmp.next_state=SSL3_ST_SR_FINISHED_A; #else if (s->s3->next_proto_neg_seen) + { + s->s3->flags |= SSL3_FLAGS_CCS_OK; s->s3->tmp.next_state=SSL3_ST_SR_NEXT_PROTO_A; + } else s->s3->tmp.next_state=SSL3_ST_SR_FINISHED_A; #endif Modified: user/dchagin/lemul/crypto/openssl/ssl/ssl3.h ============================================================================== --- user/dchagin/lemul/crypto/openssl/ssl/ssl3.h Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/crypto/openssl/ssl/ssl3.h Thu Jun 5 16:03:55 2014 (r267117) @@ -399,6 +399,7 @@ typedef struct ssl3_buffer_st * effected, but we can't prevent that. */ #define SSL3_FLAGS_SGC_RESTART_DONE 0x0040 +#define SSL3_FLAGS_CCS_OK 0x0080 #ifndef OPENSSL_NO_SSL_INTERN Modified: user/dchagin/lemul/etc/etc.amd64/ttys ============================================================================== --- user/dchagin/lemul/etc/etc.amd64/ttys Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/etc/etc.amd64/ttys Thu Jun 5 16:03:55 2014 (r267117) @@ -41,7 +41,7 @@ ttyv7 "/usr/libexec/getty Pc" xterm on ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. -ttyu0 "/usr/libexec/getty std.9600" dialup off secure +ttyu0 "/usr/libexec/getty std.9600" vt100 onifconsole secure ttyu1 "/usr/libexec/getty std.9600" dialup off secure ttyu2 "/usr/libexec/getty std.9600" dialup off secure ttyu3 "/usr/libexec/getty std.9600" dialup off secure Modified: user/dchagin/lemul/etc/etc.i386/ttys ============================================================================== --- user/dchagin/lemul/etc/etc.i386/ttys Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/etc/etc.i386/ttys Thu Jun 5 16:03:55 2014 (r267117) @@ -41,7 +41,7 @@ ttyv7 "/usr/libexec/getty Pc" xterm on ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. -ttyu0 "/usr/libexec/getty std.9600" dialup off secure +ttyu0 "/usr/libexec/getty std.9600" vt100 onifconsole secure ttyu1 "/usr/libexec/getty std.9600" dialup off secure ttyu2 "/usr/libexec/getty std.9600" dialup off secure ttyu3 "/usr/libexec/getty std.9600" dialup off secure Modified: user/dchagin/lemul/etc/mtree/BSD.usr.dist ============================================================================== --- user/dchagin/lemul/etc/mtree/BSD.usr.dist Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/etc/mtree/BSD.usr.dist Thu Jun 5 16:03:55 2014 (r267117) @@ -101,6 +101,10 @@ .. include .. + includes + include + .. + .. .. bsdinstall .. Modified: user/dchagin/lemul/etc/mtree/BSD.var.dist ============================================================================== --- user/dchagin/lemul/etc/mtree/BSD.var.dist Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/etc/mtree/BSD.var.dist Thu Jun 5 16:03:55 2014 (r267117) @@ -96,6 +96,8 @@ .. .. unbound uname=unbound gname=unbound mode=0755 + conf.d uname=unbound gname=unbound mode=0755 + .. .. yp .. Modified: user/dchagin/lemul/etc/snmpd.config ============================================================================== --- user/dchagin/lemul/etc/snmpd.config Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/etc/snmpd.config Thu Jun 5 16:03:55 2014 (r267117) @@ -279,6 +279,11 @@ begemotSnmpdModulePath."mibII" = "/usr/l #begemotNgControlNodeName = "snmpd" # +# LM75 Sensor module +# +#begemotSnmpdModulePath."lm75" = "/usr/lib/snmp_lm75.so" + +# # pf(4) module # #begemotSnmpdModulePath."pf" = "/usr/lib/snmp_pf.so" Modified: user/dchagin/lemul/include/strings.h ============================================================================== --- user/dchagin/lemul/include/strings.h Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/include/strings.h Thu Jun 5 16:03:55 2014 (r267117) @@ -59,6 +59,10 @@ char *rindex(const char *, int) __pure; #endif int strcasecmp(const char *, const char *) __pure; int strncasecmp(const char *, const char *, size_t) __pure; + +#if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_) +#include <xlocale/_strings.h> +#endif __END_DECLS #endif /* _STRINGS_H_ */ Modified: user/dchagin/lemul/include/xlocale/Makefile ============================================================================== --- user/dchagin/lemul/include/xlocale/Makefile Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/include/xlocale/Makefile Thu Jun 5 16:03:55 2014 (r267117) @@ -2,7 +2,7 @@ NO_OBJ= INCS= _ctype.h _inttypes.h _langinfo.h _locale.h _monetary.h _stdio.h\ - _stdlib.h _string.h _time.h _uchar.h _wchar.h + _stdlib.h _string.h _strings.h _time.h _uchar.h _wchar.h INCSDIR=${INCLUDEDIR}/xlocale .include <bsd.prog.mk> Modified: user/dchagin/lemul/include/xlocale/_string.h ============================================================================== --- user/dchagin/lemul/include/xlocale/_string.h Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/include/xlocale/_string.h Thu Jun 5 16:03:55 2014 (r267117) @@ -53,9 +53,7 @@ size_t strxfrm_l(char *, const char *, #ifdef _XLOCALE_H_ #ifndef _XLOCALE_STRING2_H #define _XLOCALE_STRING2_H -int strcasecmp_l(const char *, const char *, locale_t); char *strcasestr_l(const char *, const char *, locale_t); -int strncasecmp_l(const char *, const char *, size_t, locale_t); #endif /* _XLOCALE_STRING2_H */ #endif /* _XLOCALE_H_ */ Copied: user/dchagin/lemul/include/xlocale/_strings.h (from r267116, head/include/xlocale/_strings.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/dchagin/lemul/include/xlocale/_strings.h Thu Jun 5 16:03:55 2014 (r267117, copy of r267116, head/include/xlocale/_strings.h) @@ -0,0 +1,48 @@ +/*- + * Copyright (c) 2011, 2012 The FreeBSD Foundation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _LOCALE_T_DEFINED +#define _LOCALE_T_DEFINED +typedef struct _xlocale *locale_t; +#endif + +/* + * This file is included from both strings.h and xlocale.h. We need to expose + * the declarations unconditionally if we are included from xlocale.h, but only + * if we are in POSIX2008 mode if included from string.h. + */ + +#ifndef _XLOCALE_STRINGS1_H +#define _XLOCALE_STRINGS1_H + +/* + * POSIX2008 functions + */ +int strcasecmp_l(const char *, const char *, locale_t); +int strncasecmp_l(const char *, const char *, size_t, locale_t); +#endif /* _XLOCALE_STRINGS1_H */ Modified: user/dchagin/lemul/lib/libc/gen/sem_wait.3 ============================================================================== --- user/dchagin/lemul/lib/libc/gen/sem_wait.3 Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/lib/libc/gen/sem_wait.3 Thu Jun 5 16:03:55 2014 (r267117) @@ -81,6 +81,7 @@ will fail if: .It Bq Er EINTR A signal interrupted this function. .El +.Pp Additionally, .Fn sem_trywait will fail if: Modified: user/dchagin/lemul/lib/libc/stdio/fmemopen.c ============================================================================== --- user/dchagin/lemul/lib/libc/stdio/fmemopen.c Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/lib/libc/stdio/fmemopen.c Thu Jun 5 16:03:55 2014 (r267117) @@ -57,6 +57,14 @@ fmemopen(void * __restrict buf, size_t s int flags, rc; /* + * POSIX says we shall return EINVAL if size is 0. + */ + if (size == 0) { + errno = EINVAL; + return (NULL); + } + + /* * Retrieve the flags as used by open(2) from the mode argument, and * validate them. */ @@ -119,14 +127,7 @@ fmemopen(void * __restrict buf, size_t s */ switch (mode[0]) { case 'a': - if (ck->bin) { - /* - * This isn't useful, since the buffer isn't allowed - * to grow. - */ - ck->off = ck->len = size; - } else - ck->off = ck->len = strnlen(ck->buf, ck->size); + ck->off = ck->len = strnlen(ck->buf, ck->size); break; case 'r': ck->len = size; Modified: user/dchagin/lemul/lib/libc/stdio/fopen.3 ============================================================================== --- user/dchagin/lemul/lib/libc/stdio/fopen.3 Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/lib/libc/stdio/fopen.3 Thu Jun 5 16:03:55 2014 (r267117) @@ -302,6 +302,15 @@ for any of the errors specified for the .Xr fclose 3 and .Xr fflush 3 . +.Pp +The +.Fn fmemopen +function +may also fail and set +.Va errno +if the +.Fa size +argument is 0. .Sh SEE ALSO .Xr open 2 , .Xr fclose 3 , Modified: user/dchagin/lemul/lib/libc/string/strcasecmp.3 ============================================================================== --- user/dchagin/lemul/lib/libc/string/strcasecmp.3 Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/lib/libc/string/strcasecmp.3 Thu Jun 5 16:03:55 2014 (r267117) @@ -30,7 +30,7 @@ .\" @(#)strcasecmp.3 8.1 (Berkeley) 6/9/93 .\" $FreeBSD$ .\" -.Dd June 9, 1993 +.Dd May 29, 2014 .Dt STRCASECMP 3 .Os .Sh NAME @@ -45,7 +45,7 @@ .Fn strcasecmp "const char *s1" "const char *s2" .Ft int .Fn strncasecmp "const char *s1" "const char *s2" "size_t len" -.In string.h +.In strings.h .In xlocale.h .Ft int .Fn strcasecmp_l "const char *s1" "const char *s2" "locale_t loc" Modified: user/dchagin/lemul/lib/libc/sys/mlock.2 ============================================================================== --- user/dchagin/lemul/lib/libc/sys/mlock.2 Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/lib/libc/sys/mlock.2 Thu Jun 5 16:03:55 2014 (r267117) @@ -94,7 +94,7 @@ limited in how much they can lock down. The amount of memory that a single process can .Fn mlock is limited by both the per-process -.Li RLIMIT_MEMLOCK +.Dv RLIMIT_MEMLOCK resource limit and the system-wide .Dq wired pages Modified: user/dchagin/lemul/lib/libcrypt/crypt.c ============================================================================== --- user/dchagin/lemul/lib/libcrypt/crypt.c Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/lib/libcrypt/crypt.c Thu Jun 5 16:03:55 2014 (r267117) @@ -104,12 +104,16 @@ char * crypt(const char *passwd, const char *salt) { const struct crypt_format *cf; +#ifdef HAS_DES + int len; +#endif for (cf = crypt_formats; cf->name != NULL; ++cf) if (cf->magic != NULL && strstr(salt, cf->magic) == salt) return (cf->func(passwd, salt)); #ifdef HAS_DES - if (strlen(salt) == 13 && strspn(salt, DES_SALT_ALPHABET) == 13) + len = strlen(salt); + if ((len == 13 || len == 2) && strspn(salt, DES_SALT_ALPHABET) == len) return (crypt_des(passwd, salt)); #endif return (crypt_format->func(passwd, salt)); Modified: user/dchagin/lemul/lib/libpmc/libpmc.c ============================================================================== --- user/dchagin/lemul/lib/libpmc/libpmc.c Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/lib/libpmc/libpmc.c Thu Jun 5 16:03:55 2014 (r267117) @@ -190,6 +190,11 @@ static const struct pmc_event_descr core __PMC_EV_ALIAS_COREI7() }; +static const struct pmc_event_descr nehalem_ex_event_table[] = +{ + __PMC_EV_ALIAS_COREI7() +}; + static const struct pmc_event_descr haswell_event_table[] = { __PMC_EV_ALIAS_HASWELL() @@ -220,6 +225,11 @@ static const struct pmc_event_descr west __PMC_EV_ALIAS_WESTMERE() }; +static const struct pmc_event_descr westmere_ex_event_table[] = +{ + __PMC_EV_ALIAS_WESTMERE() +}; + static const struct pmc_event_descr corei7uc_event_table[] = { __PMC_EV_ALIAS_COREI7UC() @@ -255,12 +265,14 @@ PMC_MDEP_TABLE(atom_silvermont, IAP, PMC PMC_MDEP_TABLE(core, IAP, PMC_CLASS_SOFT, PMC_CLASS_TSC); PMC_MDEP_TABLE(core2, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC); PMC_MDEP_TABLE(corei7, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP); +PMC_MDEP_TABLE(nehalem_ex, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC); PMC_MDEP_TABLE(haswell, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP); PMC_MDEP_TABLE(ivybridge, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC); PMC_MDEP_TABLE(ivybridge_xeon, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC); PMC_MDEP_TABLE(sandybridge, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP); PMC_MDEP_TABLE(sandybridge_xeon, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC); PMC_MDEP_TABLE(westmere, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP); +PMC_MDEP_TABLE(westmere_ex, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC); PMC_MDEP_TABLE(k7, K7, PMC_CLASS_SOFT, PMC_CLASS_TSC); PMC_MDEP_TABLE(k8, K8, PMC_CLASS_SOFT, PMC_CLASS_TSC); PMC_MDEP_TABLE(p4, P4, PMC_CLASS_SOFT, PMC_CLASS_TSC); @@ -298,12 +310,14 @@ PMC_CLASS_TABLE_DESC(atom_silvermont, IA PMC_CLASS_TABLE_DESC(core, IAP, core, iap); PMC_CLASS_TABLE_DESC(core2, IAP, core2, iap); PMC_CLASS_TABLE_DESC(corei7, IAP, corei7, iap); +PMC_CLASS_TABLE_DESC(nehalem_ex, IAP, nehalem_ex, iap); PMC_CLASS_TABLE_DESC(haswell, IAP, haswell, iap); PMC_CLASS_TABLE_DESC(ivybridge, IAP, ivybridge, iap); PMC_CLASS_TABLE_DESC(ivybridge_xeon, IAP, ivybridge_xeon, iap); PMC_CLASS_TABLE_DESC(sandybridge, IAP, sandybridge, iap); PMC_CLASS_TABLE_DESC(sandybridge_xeon, IAP, sandybridge_xeon, iap); PMC_CLASS_TABLE_DESC(westmere, IAP, westmere, iap); +PMC_CLASS_TABLE_DESC(westmere_ex, IAP, westmere_ex, iap); PMC_CLASS_TABLE_DESC(ucf, UCF, ucf, ucf); PMC_CLASS_TABLE_DESC(corei7uc, UCP, corei7uc, ucp); PMC_CLASS_TABLE_DESC(haswelluc, UCP, haswelluc, ucp); @@ -608,6 +622,8 @@ static struct pmc_event_alias core2_alia #define atom_silvermont_aliases_without_iaf core2_aliases_without_iaf #define corei7_aliases core2_aliases #define corei7_aliases_without_iaf core2_aliases_without_iaf +#define nehalem_ex_aliases core2_aliases +#define nehalem_ex_aliases_without_iaf core2_aliases_without_iaf #define haswell_aliases core2_aliases #define haswell_aliases_without_iaf core2_aliases_without_iaf #define ivybridge_aliases core2_aliases @@ -620,6 +636,8 @@ static struct pmc_event_alias core2_alia #define sandybridge_xeon_aliases_without_iaf core2_aliases_without_iaf #define westmere_aliases core2_aliases #define westmere_aliases_without_iaf core2_aliases_without_iaf +#define westmere_ex_aliases core2_aliases +#define westmere_ex_aliases_without_iaf core2_aliases_without_iaf #define IAF_KW_OS "os" #define IAF_KW_USR "usr" @@ -863,7 +881,9 @@ iap_allocate_pmc(enum pmc_event pe, char } else return (-1); } else if (cpu_info.pm_cputype == PMC_CPU_INTEL_COREI7 || - cpu_info.pm_cputype == PMC_CPU_INTEL_WESTMERE) { + cpu_info.pm_cputype == PMC_CPU_INTEL_WESTMERE || + cpu_info.pm_cputype == PMC_CPU_INTEL_NEHALEM_EX || + cpu_info.pm_cputype == PMC_CPU_INTEL_WESTMERE_EX) { if (KWPREFIXMATCH(p, IAP_KW_RSP "=")) { n = pmc_parse_mask(iap_rsp_mask_i7_wm, p, &rsp); } else @@ -2760,6 +2780,10 @@ pmc_event_names_of_class(enum pmc_class ev = corei7_event_table; count = PMC_EVENT_TABLE_SIZE(corei7); break; + case PMC_CPU_INTEL_NEHALEM_EX: + ev = nehalem_ex_event_table; + count = PMC_EVENT_TABLE_SIZE(nehalem_ex); + break; case PMC_CPU_INTEL_HASWELL: ev = haswell_event_table; count = PMC_EVENT_TABLE_SIZE(haswell); @@ -2784,6 +2808,10 @@ pmc_event_names_of_class(enum pmc_class ev = westmere_event_table; count = PMC_EVENT_TABLE_SIZE(westmere); break; + case PMC_CPU_INTEL_WESTMERE_EX: + ev = westmere_ex_event_table; + count = PMC_EVENT_TABLE_SIZE(westmere_ex); + break; } break; case PMC_CLASS_UCF: @@ -3079,6 +3107,9 @@ pmc_init(void) pmc_class_table[n++] = &corei7uc_class_table_descr; PMC_MDEP_INIT_INTEL_V2(corei7); break; + case PMC_CPU_INTEL_NEHALEM_EX: + PMC_MDEP_INIT_INTEL_V2(nehalem_ex); + break; case PMC_CPU_INTEL_HASWELL: pmc_class_table[n++] = &ucf_class_table_descr; pmc_class_table[n++] = &haswelluc_class_table_descr; @@ -3103,6 +3134,9 @@ pmc_init(void) pmc_class_table[n++] = &westmereuc_class_table_descr; PMC_MDEP_INIT_INTEL_V2(westmere); break; + case PMC_CPU_INTEL_WESTMERE_EX: + PMC_MDEP_INIT_INTEL_V2(westmere_ex); + break; case PMC_CPU_INTEL_PIV: PMC_MDEP_INIT(p4); pmc_class_table[n] = &p4_class_table_descr; @@ -3237,6 +3271,11 @@ _pmc_name_of_event(enum pmc_event pe, en ev = corei7_event_table; evfence = corei7_event_table + PMC_EVENT_TABLE_SIZE(corei7); break; + case PMC_CPU_INTEL_NEHALEM_EX: + ev = nehalem_ex_event_table; + evfence = nehalem_ex_event_table + + PMC_EVENT_TABLE_SIZE(nehalem_ex); + break; case PMC_CPU_INTEL_HASWELL: ev = haswell_event_table; evfence = haswell_event_table + PMC_EVENT_TABLE_SIZE(haswell); @@ -3261,6 +3300,11 @@ _pmc_name_of_event(enum pmc_event pe, en ev = westmere_event_table; evfence = westmere_event_table + PMC_EVENT_TABLE_SIZE(westmere); break; + case PMC_CPU_INTEL_WESTMERE_EX: + ev = westmere_ex_event_table; + evfence = westmere_ex_event_table + + PMC_EVENT_TABLE_SIZE(westmere_ex); + break; default: /* Unknown CPU type. */ break; } Modified: user/dchagin/lemul/lib/libstand/printf.c ============================================================================== --- user/dchagin/lemul/lib/libstand/printf.c Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/lib/libstand/printf.c Thu Jun 5 16:03:55 2014 (r267117) @@ -56,8 +56,17 @@ __FBSDID("$FreeBSD$"); #define MAXNBUF (sizeof(intmax_t) * CHAR_BIT + 1) +typedef void (kvprintf_fn_t)(int, void *); + static char *ksprintn (char *buf, uintmax_t num, int base, int *len, int upper); -static int kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap); +static int kvprintf(char const *fmt, kvprintf_fn_t *func, void *arg, int radix, va_list ap); + +static void +putchar_wrapper(int cc, void *arg) +{ + + putchar(cc); +} int printf(const char *fmt, ...) @@ -66,7 +75,7 @@ printf(const char *fmt, ...) int retval; va_start(ap, fmt); - retval = kvprintf(fmt, putchar, NULL, 10, ap); + retval = kvprintf(fmt, putchar_wrapper, NULL, 10, ap); va_end(ap); return retval; } @@ -75,7 +84,7 @@ void vprintf(const char *fmt, va_list ap) { - kvprintf(fmt, putchar, NULL, 10, ap); + kvprintf(fmt, putchar_wrapper, NULL, 10, ap); } int @@ -91,6 +100,46 @@ sprintf(char *buf, const char *cfmt, ... return retval; } +struct print_buf { + char *buf; + size_t size; +}; + +static void +snprint_func(int ch, void *arg) +{ + struct print_buf *pbuf = arg; + + if (pbuf->size < 2) { + /* + * Reserve last buffer position for the terminating + * character: + */ + return; + } + *(pbuf->buf)++ = ch; + pbuf->size--; +} + +int +snprintf(char *buf, size_t size, const char *cfmt, ...) +{ + int retval; + va_list ap; + struct print_buf arg; + + arg.buf = buf; + arg.size = size; + + va_start(ap, cfmt); + retval = kvprintf(cfmt, &snprint_func, &arg, 10, ap); + va_end(ap); + + if (arg.size >= 1) + *(arg.buf)++ = 0; + return retval; +} + void vsprintf(char *buf, const char *cfmt, va_list ap) { @@ -149,9 +198,9 @@ ksprintn(char *nbuf, uintmax_t num, int * ("%*D", len, ptr, " " -> XX XX XX XX ... */ static int -kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap) +kvprintf(char const *fmt, kvprintf_fn_t *func, void *arg, int radix, va_list ap) { -#define PCHAR(c) {int cc=(c); if (func) (*func)(cc); else *d++ = cc; retval++; } +#define PCHAR(c) {int cc=(c); if (func) (*func)(cc, arg); else *d++ = cc; retval++; } char nbuf[MAXNBUF]; char *d; const char *p, *percent, *q; Modified: user/dchagin/lemul/lib/libstand/stand.h ============================================================================== --- user/dchagin/lemul/lib/libstand/stand.h Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/lib/libstand/stand.h Thu Jun 5 16:03:55 2014 (r267117) @@ -238,6 +238,7 @@ extern void mallocstats(void); extern int printf(const char *fmt, ...) __printflike(1, 2); extern void vprintf(const char *fmt, __va_list); extern int sprintf(char *buf, const char *cfmt, ...) __printflike(2, 3); +extern int snprintf(char *buf, size_t size, const char *cfmt, ...) __printflike(3, 4); extern void vsprintf(char *buf, const char *cfmt, __va_list); extern void twiddle(void); Modified: user/dchagin/lemul/lib/libusb/libusb-1.0.pc ============================================================================== --- user/dchagin/lemul/lib/libusb/libusb-1.0.pc Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/lib/libusb/libusb-1.0.pc Thu Jun 5 16:03:55 2014 (r267117) @@ -6,6 +6,6 @@ includedir=${prefix}/include Name: libusb-1.0 Description: Library that abstracts ways to access USB devices (v1.0) -Version: 1.0.9 +Version: 1.0.13 Libs: -L${libdir} -lusb Cflags: -I${includedir} Modified: user/dchagin/lemul/lib/libvmmapi/vmmapi.c ============================================================================== --- user/dchagin/lemul/lib/libvmmapi/vmmapi.c Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/lib/libvmmapi/vmmapi.c Thu Jun 5 16:03:55 2014 (r267117) @@ -29,11 +29,12 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <sys/param.h> #include <sys/sysctl.h> #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/_iovec.h> +#include <sys/cpuset.h> #include <machine/specialreg.h> #include <machine/param.h> @@ -1043,3 +1044,44 @@ vm_copyout(struct vmctx *ctx, int vcpu, len -= n; } } + +static int +vm_get_cpus(struct vmctx *ctx, int which, cpuset_t *cpus) +{ + struct vm_cpuset vm_cpuset; + int error; + + bzero(&vm_cpuset, sizeof(struct vm_cpuset)); + vm_cpuset.which = which; + vm_cpuset.cpusetsize = sizeof(cpuset_t); + vm_cpuset.cpus = cpus; + + error = ioctl(ctx->fd, VM_GET_CPUS, &vm_cpuset); + return (error); +} + +int +vm_active_cpus(struct vmctx *ctx, cpuset_t *cpus) +{ + + return (vm_get_cpus(ctx, VM_ACTIVE_CPUS, cpus)); +} + +int +vm_suspended_cpus(struct vmctx *ctx, cpuset_t *cpus) +{ + + return (vm_get_cpus(ctx, VM_SUSPENDED_CPUS, cpus)); +} + +int +vm_activate_cpu(struct vmctx *ctx, int vcpu) +{ + struct vm_activate_cpu ac; + int error; + + bzero(&ac, sizeof(struct vm_activate_cpu)); + ac.vcpuid = vcpu; + error = ioctl(ctx->fd, VM_ACTIVATE_CPU, &ac); + return (error); +} Modified: user/dchagin/lemul/lib/libvmmapi/vmmapi.h ============================================================================== --- user/dchagin/lemul/lib/libvmmapi/vmmapi.h Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/lib/libvmmapi/vmmapi.h Thu Jun 5 16:03:55 2014 (r267117) @@ -29,6 +29,9 @@ #ifndef _VMMAPI_H_ #define _VMMAPI_H_ +#include <sys/param.h> +#include <sys/cpuset.h> + struct iovec; struct vmctx; enum x2apic_state; @@ -125,6 +128,10 @@ void vm_copyout(struct vmctx *ctx, int v /* Reset vcpu register state */ int vcpu_reset(struct vmctx *ctx, int vcpu); +int vm_active_cpus(struct vmctx *ctx, cpuset_t *cpus); +int vm_suspended_cpus(struct vmctx *ctx, cpuset_t *cpus); +int vm_activate_cpu(struct vmctx *ctx, int vcpu); + /* * FreeBSD specific APIs */ Modified: user/dchagin/lemul/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- user/dchagin/lemul/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 5 16:03:55 2014 (r267117) @@ -312,7 +312,7 @@ &man.ps.1; change in <literal>r265229</literal>.</para> <para revision="265995">The Blowfish &man.crypt.3; default format - has been changed tox + has been changed to <literal>$2b$</literal>.</para> <para revision="266209">The &man.pmcstat.8; utility has been Modified: user/dchagin/lemul/sbin/geom/class/label/glabel.8 ============================================================================== --- user/dchagin/lemul/sbin/geom/class/label/glabel.8 Thu Jun 5 15:39:57 2014 (r267116) +++ user/dchagin/lemul/sbin/geom/class/label/glabel.8 Thu Jun 5 16:03:55 2014 (r267117) @@ -130,8 +130,26 @@ GPT UUIDs (directory .Pa /dev/gptid/ ) . .El .Pp -Generic labels are created in the directory -.Pa /dev/label/ . +Generic disk ID strings are exported as labels in the format +.Pa /dev/diskid/GEOM_CLASS-ident +e.g. +.Pa /dev/diskid/DISK-6QG3Z026 . +.Pp +Generic labels created and managed solely by +.Xr glabel 8 +are created in the +.Pa /dev/label/ +directory. +.Pp +Note that for all label types, nested GEOM classes will cause additional +device nodes to be created, with context-specific data appended to their +names. E.g. for every node like +.Pa /dev/label/bigdisk +there will be additional entries for any partitions which the device +contains, like +.Pa /dev/label/bigdiskp1 +and +.Pa /dev/label/bigdiskp1a . .Pp The first argument to .Nm @@ -205,6 +223,19 @@ This can be set to a number between 0 an If set to 0 minimal debug information is printed, and if set to 2 the maximum amount of debug information is printed. .El +.Bl -tag -width indent +.It Va kern.geom.label.*.enable : No 1 +Most +.Nm LABEL +providers implement a +.Xr sysctl 8 +flag and a tunable variable named in the above format. This flag +controls if the label provider will be active, tasting devices +and creating label nodes in the +.Xr devfs 5 +tree. It is sometimes desirable to disable certain label types if +they conflict with other classes in complex GEOM topologies. +.Bl .Sh EXIT STATUS Exit status is 0 on success, and 1 if the command fails. .Sh EXAMPLES Modified: user/dchagin/lemul/sbin/ipfw/dummynet.c ============================================================================== --- user/dchagin/lemul/sbin/ipfw/dummynet.c Thu Jun 5 15:39:57 2014 (r267116) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406051603.s55G3usQ041729>