socsvn commit: r268942 - in soc2014/op/freebsd-base: . bin/sh cddl cddl/contrib/opensolaris cddl/contrib/opensolaris/cmd/zfs contrib/apr contrib/apr/docs contrib/apr/encoding contrib/apr/file_io/un...
op at FreeBSD.org
op at FreeBSD.org
Mon Jun 2 01:21:43 UTC 2014
Author: op
Date: Mon Jun 2 01:21:38 2014
New Revision: 268942
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=268942
Log:
MFH: r267233 through r268941
Signed-off-by: Oliver Pinter <oliver.pntr at gmail.com>
Added:
soc2014/op/freebsd-base/.arclint
- copied unchanged from r268941, mirror/FreeBSD/head/.arclint
soc2014/op/freebsd-base/contrib/apr/CMakeLists.txt
- copied unchanged from r268941, mirror/FreeBSD/head/contrib/apr/CMakeLists.txt
soc2014/op/freebsd-base/contrib/apr/README.cmake
- copied unchanged from r268941, mirror/FreeBSD/head/contrib/apr/README.cmake
soc2014/op/freebsd-base/contrib/apr/encoding/
- copied from r268941, mirror/FreeBSD/head/contrib/apr/encoding/
soc2014/op/freebsd-base/contrib/apr/include/apr.hwc
- copied unchanged from r268941, mirror/FreeBSD/head/contrib/apr/include/apr.hwc
soc2014/op/freebsd-base/contrib/apr/include/apr_escape.h
- copied unchanged from r268941, mirror/FreeBSD/head/contrib/apr/include/apr_escape.h
soc2014/op/freebsd-base/contrib/apr/include/apr_skiplist.h
- copied unchanged from r268941, mirror/FreeBSD/head/contrib/apr/include/apr_skiplist.h
soc2014/op/freebsd-base/contrib/apr/include/private/
- copied from r268941, mirror/FreeBSD/head/contrib/apr/include/private/
soc2014/op/freebsd-base/contrib/apr/poll/unix/z_asio.c
- copied unchanged from r268941, mirror/FreeBSD/head/contrib/apr/poll/unix/z_asio.c
soc2014/op/freebsd-base/contrib/apr/tables/apr_skiplist.c
- copied unchanged from r268941, mirror/FreeBSD/head/contrib/apr/tables/apr_skiplist.c
soc2014/op/freebsd-base/contrib/apr/tools/
- copied from r268941, mirror/FreeBSD/head/contrib/apr/tools/
soc2014/op/freebsd-base/include/xlocale/_strings.h
- copied unchanged from r268941, mirror/FreeBSD/head/include/xlocale/_strings.h
soc2014/op/freebsd-base/share/vt/
- copied from r268941, mirror/FreeBSD/head/share/vt/
soc2014/op/freebsd-base/sys/arm/conf/ARNDALE-OCTA
- copied unchanged from r268941, mirror/FreeBSD/head/sys/arm/conf/ARNDALE-OCTA
soc2014/op/freebsd-base/sys/arm/conf/CHROMEBOOK-SNOW
- copied unchanged from r268941, mirror/FreeBSD/head/sys/arm/conf/CHROMEBOOK-SNOW
soc2014/op/freebsd-base/sys/arm/conf/CHROMEBOOK-SPRING
- copied unchanged from r268941, mirror/FreeBSD/head/sys/arm/conf/CHROMEBOOK-SPRING
soc2014/op/freebsd-base/sys/arm/conf/EXYNOS5.common
- copied unchanged from r268941, mirror/FreeBSD/head/sys/arm/conf/EXYNOS5.common
soc2014/op/freebsd-base/sys/arm/conf/EXYNOS5250
- copied unchanged from r268941, mirror/FreeBSD/head/sys/arm/conf/EXYNOS5250
soc2014/op/freebsd-base/sys/arm/conf/EXYNOS5420
- copied unchanged from r268941, mirror/FreeBSD/head/sys/arm/conf/EXYNOS5420
soc2014/op/freebsd-base/sys/arm/conf/RADXA-LITE
- copied unchanged from r268941, mirror/FreeBSD/head/sys/arm/conf/RADXA-LITE
soc2014/op/freebsd-base/sys/arm/conf/RK3188
- copied unchanged from r268941, mirror/FreeBSD/head/sys/arm/conf/RK3188
soc2014/op/freebsd-base/sys/arm/samsung/exynos/exynos_uart.c
- copied unchanged from r268941, mirror/FreeBSD/head/sys/arm/samsung/exynos/exynos_uart.c
soc2014/op/freebsd-base/sys/arm/samsung/exynos/exynos_uart.h
- copied unchanged from r268941, mirror/FreeBSD/head/sys/arm/samsung/exynos/exynos_uart.h
soc2014/op/freebsd-base/sys/arm/samsung/exynos/std.exynos5250
- copied unchanged from r268941, mirror/FreeBSD/head/sys/arm/samsung/exynos/std.exynos5250
soc2014/op/freebsd-base/sys/arm/samsung/exynos/std.exynos5420
- copied unchanged from r268941, mirror/FreeBSD/head/sys/arm/samsung/exynos/std.exynos5420
soc2014/op/freebsd-base/sys/boot/fdt/dts/arm/exynos5.dtsi
- copied unchanged from r268941, mirror/FreeBSD/head/sys/boot/fdt/dts/arm/exynos5.dtsi
soc2014/op/freebsd-base/sys/boot/fdt/dts/arm/exynos5250-chromebook-snow.dts
- copied unchanged from r268941, mirror/FreeBSD/head/sys/boot/fdt/dts/arm/exynos5250-chromebook-snow.dts
soc2014/op/freebsd-base/sys/boot/fdt/dts/arm/exynos5250-chromebook-spring.dts
- copied unchanged from r268941, mirror/FreeBSD/head/sys/boot/fdt/dts/arm/exynos5250-chromebook-spring.dts
soc2014/op/freebsd-base/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
- copied unchanged from r268941, mirror/FreeBSD/head/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
soc2014/op/freebsd-base/sys/boot/fdt/dts/arm/exynos5420.dtsi
- copied unchanged from r268941, mirror/FreeBSD/head/sys/boot/fdt/dts/arm/exynos5420.dtsi
soc2014/op/freebsd-base/sys/boot/fdt/dts/arm/rk3188-radxa-lite.dts
- copied unchanged from r268941, mirror/FreeBSD/head/sys/boot/fdt/dts/arm/rk3188-radxa-lite.dts
soc2014/op/freebsd-base/sys/boot/usb/storage/
- copied from r268941, mirror/FreeBSD/head/sys/boot/usb/storage/
soc2014/op/freebsd-base/sys/dev/cxgbe/t4_netmap.c
- copied unchanged from r268941, mirror/FreeBSD/head/sys/dev/cxgbe/t4_netmap.c
soc2014/op/freebsd-base/sys/dev/usb/controller/saf1761_otg_boot.c
- copied unchanged from r268941, mirror/FreeBSD/head/sys/dev/usb/controller/saf1761_otg_boot.c
soc2014/op/freebsd-base/sys/dev/virtio/virtio_config.h
- copied unchanged from r268941, mirror/FreeBSD/head/sys/dev/virtio/virtio_config.h
soc2014/op/freebsd-base/sys/dev/virtio/virtio_ids.h
- copied unchanged from r268941, mirror/FreeBSD/head/sys/dev/virtio/virtio_ids.h
soc2014/op/freebsd-base/sys/modules/usb/saf1761otg/
- copied from r268941, mirror/FreeBSD/head/sys/modules/usb/saf1761otg/
soc2014/op/freebsd-base/usr.bin/printf/tests/regress.missingpos1.out
- copied unchanged from r268941, mirror/FreeBSD/head/usr.bin/printf/tests/regress.missingpos1.out
soc2014/op/freebsd-base/usr.sbin/bsnmpd/modules/snmp_lm75/
- copied from r268941, mirror/FreeBSD/head/usr.sbin/bsnmpd/modules/snmp_lm75/
Deleted:
soc2014/op/freebsd-base/sys/arm/conf/EXYNOS5250.common
soc2014/op/freebsd-base/sys/arm/samsung/exynos/std.exynos5
soc2014/op/freebsd-base/sys/arm/samsung/exynos/uart.c
soc2014/op/freebsd-base/sys/arm/samsung/exynos/uart.h
soc2014/op/freebsd-base/sys/boot/fdt/dts/arm/exynos5250-chromebook.dts
soc2014/op/freebsd-base/sys/dev/vt/hw/xboxfb/
soc2014/op/freebsd-base/sys/modules/usb/saf1761/
Modified:
soc2014/op/freebsd-base/ (props changed)
soc2014/op/freebsd-base/bin/sh/arith_yacc.c
soc2014/op/freebsd-base/bin/sh/exec.c
soc2014/op/freebsd-base/cddl/ (props changed)
soc2014/op/freebsd-base/cddl/contrib/opensolaris/ (props changed)
soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zfs/ (props changed)
soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zfs/zfs.8
soc2014/op/freebsd-base/contrib/apr/ (props changed)
soc2014/op/freebsd-base/contrib/apr/CHANGES
soc2014/op/freebsd-base/contrib/apr/LICENSE
soc2014/op/freebsd-base/contrib/apr/Makefile.in
soc2014/op/freebsd-base/contrib/apr/Makefile.win
soc2014/op/freebsd-base/contrib/apr/NOTICE
soc2014/op/freebsd-base/contrib/apr/apr.dep
soc2014/op/freebsd-base/contrib/apr/apr.dsp
soc2014/op/freebsd-base/contrib/apr/apr.mak
soc2014/op/freebsd-base/contrib/apr/apr.spec
soc2014/op/freebsd-base/contrib/apr/build-outputs.mk
soc2014/op/freebsd-base/contrib/apr/build.conf
soc2014/op/freebsd-base/contrib/apr/configure
soc2014/op/freebsd-base/contrib/apr/configure.in
soc2014/op/freebsd-base/contrib/apr/docs/canonical_filenames.html
soc2014/op/freebsd-base/contrib/apr/file_io/unix/filedup.c
soc2014/op/freebsd-base/contrib/apr/file_io/unix/filestat.c
soc2014/op/freebsd-base/contrib/apr/file_io/unix/mktemp.c
soc2014/op/freebsd-base/contrib/apr/file_io/unix/open.c
soc2014/op/freebsd-base/contrib/apr/file_io/unix/pipe.c
soc2014/op/freebsd-base/contrib/apr/file_io/unix/readwrite.c
soc2014/op/freebsd-base/contrib/apr/include/apr.h.in
soc2014/op/freebsd-base/contrib/apr/include/apr_allocator.h
soc2014/op/freebsd-base/contrib/apr/include/apr_errno.h
soc2014/op/freebsd-base/contrib/apr/include/apr_file_info.h
soc2014/op/freebsd-base/contrib/apr/include/apr_file_io.h
soc2014/op/freebsd-base/contrib/apr/include/apr_fnmatch.h
soc2014/op/freebsd-base/contrib/apr/include/apr_hash.h
soc2014/op/freebsd-base/contrib/apr/include/apr_inherit.h
soc2014/op/freebsd-base/contrib/apr/include/apr_lib.h
soc2014/op/freebsd-base/contrib/apr/include/apr_mmap.h
soc2014/op/freebsd-base/contrib/apr/include/apr_network_io.h
soc2014/op/freebsd-base/contrib/apr/include/apr_poll.h
soc2014/op/freebsd-base/contrib/apr/include/apr_pools.h
soc2014/op/freebsd-base/contrib/apr/include/apr_shm.h
soc2014/op/freebsd-base/contrib/apr/include/apr_strings.h
soc2014/op/freebsd-base/contrib/apr/include/apr_tables.h
soc2014/op/freebsd-base/contrib/apr/include/apr_thread_mutex.h
soc2014/op/freebsd-base/contrib/apr/include/apr_thread_proc.h
soc2014/op/freebsd-base/contrib/apr/include/apr_time.h
soc2014/op/freebsd-base/contrib/apr/include/apr_user.h
soc2014/op/freebsd-base/contrib/apr/include/apr_version.h
soc2014/op/freebsd-base/contrib/apr/include/arch/unix/apr_arch_poll_private.h
soc2014/op/freebsd-base/contrib/apr/include/arch/unix/apr_arch_threadproc.h
soc2014/op/freebsd-base/contrib/apr/include/arch/unix/apr_private.h.in
soc2014/op/freebsd-base/contrib/apr/libapr.dep
soc2014/op/freebsd-base/contrib/apr/libapr.dsp
soc2014/op/freebsd-base/contrib/apr/libapr.mak
soc2014/op/freebsd-base/contrib/apr/locks/unix/proc_mutex.c
soc2014/op/freebsd-base/contrib/apr/network_io/unix/sendrecv.c
soc2014/op/freebsd-base/contrib/apr/network_io/unix/sockaddr.c
soc2014/op/freebsd-base/contrib/apr/network_io/unix/socket_util.c
soc2014/op/freebsd-base/contrib/apr/network_io/unix/sockets.c
soc2014/op/freebsd-base/contrib/apr/network_io/unix/sockopt.c
soc2014/op/freebsd-base/contrib/apr/passwd/apr_getpass.c
soc2014/op/freebsd-base/contrib/apr/poll/unix/pollcb.c
soc2014/op/freebsd-base/contrib/apr/poll/unix/pollset.c
soc2014/op/freebsd-base/contrib/apr/shmem/unix/shm.c
soc2014/op/freebsd-base/contrib/apr/strings/apr_cpystrn.c
soc2014/op/freebsd-base/contrib/apr/strings/apr_strings.c
soc2014/op/freebsd-base/contrib/apr/support/unix/waitio.c
soc2014/op/freebsd-base/contrib/apr/tables/apr_hash.c
soc2014/op/freebsd-base/contrib/apr/tables/apr_tables.c
soc2014/op/freebsd-base/contrib/bmake/ (props changed)
soc2014/op/freebsd-base/contrib/bmake/var.c
soc2014/op/freebsd-base/contrib/serf/ (props changed)
soc2014/op/freebsd-base/contrib/serf/CHANGES
soc2014/op/freebsd-base/contrib/serf/auth/auth.c
soc2014/op/freebsd-base/contrib/serf/auth/auth_spnego.c
soc2014/op/freebsd-base/contrib/serf/outgoing.c
soc2014/op/freebsd-base/contrib/serf/serf.h
soc2014/op/freebsd-base/contrib/serf/ssltunnel.c
soc2014/op/freebsd-base/contrib/subversion/ (props changed)
soc2014/op/freebsd-base/contrib/subversion/CHANGES
soc2014/op/freebsd-base/contrib/subversion/NOTICE
soc2014/op/freebsd-base/contrib/subversion/build-outputs.mk
soc2014/op/freebsd-base/contrib/subversion/configure
soc2014/op/freebsd-base/contrib/subversion/configure.ac
soc2014/op/freebsd-base/contrib/subversion/subversion/include/private/svn_cache.h
soc2014/op/freebsd-base/contrib/subversion/subversion/include/private/svn_dep_compat.h
soc2014/op/freebsd-base/contrib/subversion/subversion/include/svn_version.h
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_client/commit_util.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_client/export.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_client/merge.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_client/prop_commands.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_delta/svndiff.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_fs_fs/fs.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_fs_fs/fs.h
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_ra_serf/getlocks.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_ra_serf/inherited_props.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_ra_serf/locks.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_ra_serf/log.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_ra_serf/update.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_ra_svn/protocol
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_repos/dump.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_repos/fs-wrap.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_subr/cache-memcache.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_subr/config_file.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_subr/internal_statements.h
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_subr/io.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_subr/prompt.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_subr/sysinfo.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_subr/version.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_wc/status.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_wc/wc-checks.h
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_wc/wc-metadata.sql
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_wc/wc-queries.h
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_wc/wc-queries.sql
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_wc/wc_db.c
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_wc/wc_db.h
soc2014/op/freebsd-base/contrib/subversion/subversion/libsvn_wc/wc_db_wcroot.c
soc2014/op/freebsd-base/contrib/subversion/subversion/svn/conflict-callbacks.c
soc2014/op/freebsd-base/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c
soc2014/op/freebsd-base/contrib/subversion/subversion/svnrdump/util.c
soc2014/op/freebsd-base/contrib/subversion/subversion/svnserve/serve.c
soc2014/op/freebsd-base/contrib/unbound/ (props changed)
soc2014/op/freebsd-base/contrib/unbound/libunbound/libworker.h
soc2014/op/freebsd-base/contrib/unbound/libunbound/worker.h
soc2014/op/freebsd-base/etc/ (props changed)
soc2014/op/freebsd-base/etc/etc.amd64/ttys
soc2014/op/freebsd-base/etc/etc.i386/ttys
soc2014/op/freebsd-base/etc/mtree/BSD.usr.dist
soc2014/op/freebsd-base/etc/mtree/BSD.var.dist
soc2014/op/freebsd-base/etc/snmpd.config
soc2014/op/freebsd-base/include/ (props changed)
soc2014/op/freebsd-base/include/strings.h
soc2014/op/freebsd-base/include/xlocale/Makefile
soc2014/op/freebsd-base/include/xlocale/_string.h
soc2014/op/freebsd-base/lib/libc/ (props changed)
soc2014/op/freebsd-base/lib/libc/gen/sem_wait.3
soc2014/op/freebsd-base/lib/libc/string/strcasecmp.3
soc2014/op/freebsd-base/lib/libc/string/strspn.3
soc2014/op/freebsd-base/lib/libc/sys/mlock.2
soc2014/op/freebsd-base/lib/libcrypt/crypt.c
soc2014/op/freebsd-base/lib/libstand/printf.c
soc2014/op/freebsd-base/lib/libstand/stand.h
soc2014/op/freebsd-base/lib/libvmmapi/ (props changed)
soc2014/op/freebsd-base/lib/libvmmapi/vmmapi.c
soc2014/op/freebsd-base/lib/libvmmapi/vmmapi.h
soc2014/op/freebsd-base/release/doc/en_US.ISO8859-1/relnotes/article.xml
soc2014/op/freebsd-base/release/picobsd/floppy.tree/etc/ttys
soc2014/op/freebsd-base/release/picobsd/mfs_tree/etc/gettytab
soc2014/op/freebsd-base/sbin/ (props changed)
soc2014/op/freebsd-base/sbin/ifconfig/ifconfig.8
soc2014/op/freebsd-base/sbin/ipfw/ (props changed)
soc2014/op/freebsd-base/sbin/ipfw/dummynet.c
soc2014/op/freebsd-base/sbin/ipfw/ipfw.8
soc2014/op/freebsd-base/sbin/ipfw/ipfw2.h
soc2014/op/freebsd-base/share/ (props changed)
soc2014/op/freebsd-base/share/man/man4/ (props changed)
soc2014/op/freebsd-base/share/man/man4/attimer.4
soc2014/op/freebsd-base/share/man/man4/carp.4
soc2014/op/freebsd-base/share/man/man4/iicbus.4
soc2014/op/freebsd-base/share/man/man4/iwn.4
soc2014/op/freebsd-base/share/man/man5/passwd.5
soc2014/op/freebsd-base/share/man/man5/src.conf.5
soc2014/op/freebsd-base/share/misc/committers-src.dot
soc2014/op/freebsd-base/share/mk/bsd.opts.mk
soc2014/op/freebsd-base/share/mk/bsd.own.mk
soc2014/op/freebsd-base/sys/ (props changed)
soc2014/op/freebsd-base/sys/Makefile
soc2014/op/freebsd-base/sys/amd64/amd64/exception.S
soc2014/op/freebsd-base/sys/amd64/amd64/sys_machdep.c
soc2014/op/freebsd-base/sys/amd64/amd64/trap.c
soc2014/op/freebsd-base/sys/amd64/include/vmm.h (contents, props changed)
soc2014/op/freebsd-base/sys/amd64/include/vmm_dev.h (contents, props changed)
soc2014/op/freebsd-base/sys/amd64/include/vmm_instruction_emul.h (contents, props changed)
soc2014/op/freebsd-base/sys/amd64/linux32/linux32_sysvec.c
soc2014/op/freebsd-base/sys/amd64/vmm/ (props changed)
soc2014/op/freebsd-base/sys/amd64/vmm/intel/vmx.c
soc2014/op/freebsd-base/sys/amd64/vmm/io/vlapic.c
soc2014/op/freebsd-base/sys/amd64/vmm/vmm.c
soc2014/op/freebsd-base/sys/amd64/vmm/vmm_dev.c
soc2014/op/freebsd-base/sys/amd64/vmm/vmm_host.c
soc2014/op/freebsd-base/sys/amd64/vmm/vmm_instruction_emul.c
soc2014/op/freebsd-base/sys/amd64/vmm/vmm_ioport.c
soc2014/op/freebsd-base/sys/amd64/vmm/x86.c
soc2014/op/freebsd-base/sys/arm/arm/locore.S
soc2014/op/freebsd-base/sys/arm/broadcom/bcm2835/files.bcm2835
soc2014/op/freebsd-base/sys/arm/conf/ARNDALE
soc2014/op/freebsd-base/sys/arm/conf/CHROMEBOOK
soc2014/op/freebsd-base/sys/arm/conf/RADXA
soc2014/op/freebsd-base/sys/arm/rockchip/files.rk30xx
soc2014/op/freebsd-base/sys/arm/samsung/exynos/chrome_ec.c
soc2014/op/freebsd-base/sys/arm/samsung/exynos/chrome_kb.c
soc2014/op/freebsd-base/sys/arm/samsung/exynos/chrome_kb.h
soc2014/op/freebsd-base/sys/arm/samsung/exynos/exynos5_ehci.c
soc2014/op/freebsd-base/sys/arm/samsung/exynos/exynos5_i2c.c
soc2014/op/freebsd-base/sys/arm/samsung/exynos/exynos5_pad.c
soc2014/op/freebsd-base/sys/arm/samsung/exynos/files.exynos5
soc2014/op/freebsd-base/sys/arm/ti/am335x/am335x_pwm.c
soc2014/op/freebsd-base/sys/arm/ti/ti_gpio.c
soc2014/op/freebsd-base/sys/arm/xscale/i80321/ep80219_machdep.c
soc2014/op/freebsd-base/sys/arm/xscale/i80321/iq31244_machdep.c
soc2014/op/freebsd-base/sys/arm/xscale/i8134x/crb_machdep.c
soc2014/op/freebsd-base/sys/arm/xscale/ixp425/avila_machdep.c
soc2014/op/freebsd-base/sys/arm/xscale/pxa/pxa_machdep.c
soc2014/op/freebsd-base/sys/boot/ (props changed)
soc2014/op/freebsd-base/sys/boot/fdt/dts/arm/exynos5250-arndale.dts
soc2014/op/freebsd-base/sys/boot/fdt/dts/arm/exynos5250.dtsi
soc2014/op/freebsd-base/sys/boot/fdt/dts/mips/beripad-de4.dts
soc2014/op/freebsd-base/sys/boot/forth/brand.4th
soc2014/op/freebsd-base/sys/boot/mips/beri/loader/Makefile
soc2014/op/freebsd-base/sys/boot/mips/beri/loader/loader.ldscript
soc2014/op/freebsd-base/sys/boot/mips/beri/loader/main.c
soc2014/op/freebsd-base/sys/boot/usb/Makefile
soc2014/op/freebsd-base/sys/boot/usb/bsd_kernel.c
soc2014/op/freebsd-base/sys/boot/usb/bsd_kernel.h
soc2014/op/freebsd-base/sys/boot/usb/bsd_usbloader_test.c
soc2014/op/freebsd-base/sys/boot/usb/usb_busdma_loader.c
soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/ (props changed)
soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
soc2014/op/freebsd-base/sys/compat/linux/linux_futex.c
soc2014/op/freebsd-base/sys/conf/ (props changed)
soc2014/op/freebsd-base/sys/conf/files
soc2014/op/freebsd-base/sys/dev/cfe/cfe_console.c
soc2014/op/freebsd-base/sys/dev/cxgbe/adapter.h
soc2014/op/freebsd-base/sys/dev/cxgbe/common/common.h
soc2014/op/freebsd-base/sys/dev/cxgbe/common/t4_hw.c
soc2014/op/freebsd-base/sys/dev/cxgbe/t4_main.c
soc2014/op/freebsd-base/sys/dev/cxgbe/t4_sge.c
soc2014/op/freebsd-base/sys/dev/drm2/radeon/radeon_device.c
soc2014/op/freebsd-base/sys/dev/e1000/if_igb.c
soc2014/op/freebsd-base/sys/dev/firewire/sbp.c
soc2014/op/freebsd-base/sys/dev/gpio/gpioiic.c
soc2014/op/freebsd-base/sys/dev/iicbus/iic.c
soc2014/op/freebsd-base/sys/dev/iwn/if_iwn.c
soc2014/op/freebsd-base/sys/dev/iwn/if_iwn_devid.h
soc2014/op/freebsd-base/sys/dev/mfi/mfi.c
soc2014/op/freebsd-base/sys/dev/mfi/mfi_cam.c
soc2014/op/freebsd-base/sys/dev/mfi/mfi_disk.c
soc2014/op/freebsd-base/sys/dev/mfi/mfi_syspd.c
soc2014/op/freebsd-base/sys/dev/mfi/mfivar.h
soc2014/op/freebsd-base/sys/dev/sound/pci/emu10k1.c
soc2014/op/freebsd-base/sys/dev/uart/uart_bus_pci.c
soc2014/op/freebsd-base/sys/dev/uart/uart_dev_ns8250.c
soc2014/op/freebsd-base/sys/dev/usb/controller/dwc_otg.c
soc2014/op/freebsd-base/sys/dev/usb/controller/saf1761_otg.c
soc2014/op/freebsd-base/sys/dev/usb/controller/saf1761_otg.h
soc2014/op/freebsd-base/sys/dev/usb/controller/saf1761_otg_fdt.c
soc2014/op/freebsd-base/sys/dev/usb/controller/saf1761_otg_reg.h
soc2014/op/freebsd-base/sys/dev/usb/controller/usb_controller.c
soc2014/op/freebsd-base/sys/dev/usb/net/if_axge.c
soc2014/op/freebsd-base/sys/dev/usb/net/if_axgereg.h
soc2014/op/freebsd-base/sys/dev/usb/usb_freebsd.h
soc2014/op/freebsd-base/sys/dev/usb/usb_freebsd_loader.h
soc2014/op/freebsd-base/sys/dev/usb/usb_msctest.c
soc2014/op/freebsd-base/sys/dev/usb/usb_msctest.h
soc2014/op/freebsd-base/sys/dev/usb/usbdevs
soc2014/op/freebsd-base/sys/dev/usb/wlan/if_urtwn.c
soc2014/op/freebsd-base/sys/dev/virtio/pci/virtio_pci.c
soc2014/op/freebsd-base/sys/dev/virtio/virtio.c
soc2014/op/freebsd-base/sys/dev/virtio/virtio.h
soc2014/op/freebsd-base/sys/dev/virtio/virtqueue.c
soc2014/op/freebsd-base/sys/dev/vt/vt_buf.c
soc2014/op/freebsd-base/sys/dev/vt/vt_core.c
soc2014/op/freebsd-base/sys/geom/part/g_part_apm.c
soc2014/op/freebsd-base/sys/geom/part/g_part_gpt.c
soc2014/op/freebsd-base/sys/geom/part/g_part_pc98.c
soc2014/op/freebsd-base/sys/i386/conf/PAE
soc2014/op/freebsd-base/sys/i386/conf/XEN
soc2014/op/freebsd-base/sys/i386/i386/trap.c
soc2014/op/freebsd-base/sys/i386/linux/linux_sysvec.c
soc2014/op/freebsd-base/sys/kern/imgact_elf.c
soc2014/op/freebsd-base/sys/kern/kern_dtrace.c
soc2014/op/freebsd-base/sys/kern/subr_rman.c
soc2014/op/freebsd-base/sys/kern/subr_taskqueue.c
soc2014/op/freebsd-base/sys/kern/uipc_mbuf.c
soc2014/op/freebsd-base/sys/mips/conf/BERI_DE4_BASE
soc2014/op/freebsd-base/sys/mips/mips/trap.c
soc2014/op/freebsd-base/sys/modules/cxgbe/if_cxgbe/Makefile
soc2014/op/freebsd-base/sys/modules/geom/Makefile
soc2014/op/freebsd-base/sys/modules/usb/Makefile
soc2014/op/freebsd-base/sys/net/if.c
soc2014/op/freebsd-base/sys/net/if_var.h
soc2014/op/freebsd-base/sys/net/route.c
soc2014/op/freebsd-base/sys/net/rtsock.c
soc2014/op/freebsd-base/sys/netgraph/ng_pipe.c
soc2014/op/freebsd-base/sys/netinet/in.h
soc2014/op/freebsd-base/sys/netinet/in_pcb.c
soc2014/op/freebsd-base/sys/netinet/in_rss.c
soc2014/op/freebsd-base/sys/netinet/in_rss.h
soc2014/op/freebsd-base/sys/netinet/ip_dummynet.h
soc2014/op/freebsd-base/sys/netinet/ip_options.c
soc2014/op/freebsd-base/sys/netinet/ip_output.c
soc2014/op/freebsd-base/sys/netinet/tcp_timewait.c
soc2014/op/freebsd-base/sys/netinet6/ip6_forward.c
soc2014/op/freebsd-base/sys/netinet6/ip6_ipsec.c
soc2014/op/freebsd-base/sys/netinet6/ip6_ipsec.h
soc2014/op/freebsd-base/sys/netinet6/ip6_output.c
soc2014/op/freebsd-base/sys/netinet6/ip6_var.h
soc2014/op/freebsd-base/sys/netinet6/nd6.c
soc2014/op/freebsd-base/sys/netinet6/nd6_nbr.c
soc2014/op/freebsd-base/sys/netipsec/ipsec6.h
soc2014/op/freebsd-base/sys/netipsec/ipsec_input.c
soc2014/op/freebsd-base/sys/netipsec/ipsec_output.c
soc2014/op/freebsd-base/sys/netipsec/xform_ipip.c
soc2014/op/freebsd-base/sys/netpfil/ipfw/ip_dn_io.c
soc2014/op/freebsd-base/sys/netpfil/ipfw/ip_dummynet.c
soc2014/op/freebsd-base/sys/netpfil/pf/pf.c
soc2014/op/freebsd-base/sys/powerpc/aim/trap.c
soc2014/op/freebsd-base/sys/powerpc/powerpc/sigcode32.S
soc2014/op/freebsd-base/sys/powerpc/powerpc/sigcode64.S
soc2014/op/freebsd-base/sys/sys/dtrace_bsd.h
soc2014/op/freebsd-base/sys/sys/imgact_elf.h
soc2014/op/freebsd-base/sys/sys/param.h
soc2014/op/freebsd-base/sys/vm/vm_map.c
soc2014/op/freebsd-base/sys/x86/x86/busdma_bounce.c
soc2014/op/freebsd-base/tests/sys/netinet/fibs_test.sh
soc2014/op/freebsd-base/tests/sys/netinet/udp_dontroute.c
soc2014/op/freebsd-base/tools/build/options/WITHOUT_DOCCOMPRESS
soc2014/op/freebsd-base/tools/build/options/WITHOUT_GNU_GREP_COMPAT
soc2014/op/freebsd-base/tools/build/options/WITHOUT_MANCOMPRESS
soc2014/op/freebsd-base/tools/build/options/WITH_FMAKE
soc2014/op/freebsd-base/tools/tools/vt/mkkfont/mkkfont.c
soc2014/op/freebsd-base/usr.bin/calendar/ (props changed)
soc2014/op/freebsd-base/usr.bin/calendar/calendars/calendar.freebsd
soc2014/op/freebsd-base/usr.bin/printf/printf.c
soc2014/op/freebsd-base/usr.bin/printf/tests/Makefile
soc2014/op/freebsd-base/usr.bin/printf/tests/regress.m2.out
soc2014/op/freebsd-base/usr.bin/printf/tests/regress.sh
soc2014/op/freebsd-base/usr.bin/svn/lib/libapr/Makefile
soc2014/op/freebsd-base/usr.bin/svn/lib/libapr/apr.h
soc2014/op/freebsd-base/usr.bin/svn/lib/libapr/apr_private.h
soc2014/op/freebsd-base/usr.bin/svn/svn_private_config.h
soc2014/op/freebsd-base/usr.bin/top/machine.c
soc2014/op/freebsd-base/usr.sbin/bhyve/ (props changed)
soc2014/op/freebsd-base/usr.sbin/bhyve/bhyverun.c
soc2014/op/freebsd-base/usr.sbin/bhyve/inout.c
soc2014/op/freebsd-base/usr.sbin/bhyve/pci_lpc.c
soc2014/op/freebsd-base/usr.sbin/bhyve/pci_virtio_block.c
soc2014/op/freebsd-base/usr.sbin/bhyvectl/ (props changed)
soc2014/op/freebsd-base/usr.sbin/bhyvectl/bhyvectl.c
soc2014/op/freebsd-base/usr.sbin/bsnmpd/modules/Makefile
soc2014/op/freebsd-base/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3
soc2014/op/freebsd-base/usr.sbin/kbdcontrol/kbdcontrol.c
soc2014/op/freebsd-base/usr.sbin/kbdcontrol/path.h
soc2014/op/freebsd-base/usr.sbin/makefs/ffs/mkfs.c
soc2014/op/freebsd-base/usr.sbin/pmcstat/pmcstat.h
soc2014/op/freebsd-base/usr.sbin/unbound/local-setup/local-unbound-setup.sh
soc2014/op/freebsd-base/usr.sbin/usbdump/usbdump.c
soc2014/op/freebsd-base/usr.sbin/vidcontrol/path.h
soc2014/op/freebsd-base/usr.sbin/vidcontrol/vidcontrol.c
Copied: soc2014/op/freebsd-base/.arclint (from r268941, mirror/FreeBSD/head/.arclint)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ soc2014/op/freebsd-base/.arclint Mon Jun 2 01:21:38 2014 (r268942, copy of r268941, mirror/FreeBSD/head/.arclint)
@@ -0,0 +1,9 @@
+{
+ "linters": {
+ "python": {
+ "type": "pep8",
+ "exclude": "(contrib)",
+ "include": "(\\.py$)"
+ }
+ }
+}
Modified: soc2014/op/freebsd-base/bin/sh/arith_yacc.c
==============================================================================
--- soc2014/op/freebsd-base/bin/sh/arith_yacc.c Mon Jun 2 01:00:55 2014 (r268941)
+++ soc2014/op/freebsd-base/bin/sh/arith_yacc.c Mon Jun 2 01:21:38 2014 (r268942)
@@ -139,7 +139,7 @@
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: soc2014/op/freebsd-base/bin/sh/exec.c
==============================================================================
--- soc2014/op/freebsd-base/bin/sh/exec.c Mon Jun 2 01:00:55 2014 (r268941)
+++ soc2014/op/freebsd-base/bin/sh/exec.c Mon Jun 2 01:21:38 2014 (r268942)
@@ -362,15 +362,13 @@
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 @@
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 @@
#endif
TRACE(("searchexec \"%s\" returns \"%s\"\n", name, fullname));
INTOFF;
+ stunalloc(fullname);
cmdp = cmdlookup(name, 1);
if (cmdp->cmdtype == CMDFUNCTION)
cmdp = &loc_cmd;
Modified: soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Mon Jun 2 01:00:55 2014 (r268941)
+++ soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Mon Jun 2 01:21:38 2014 (r268942)
@@ -18,7 +18,7 @@
.\" information: Portions Copyright [yyyy] [name of copyright owner]
.\"
.\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved.
-.\" Copyright (c) 2013 by Delphix. All rights reserved.
+.\" Copyright (c) 2014 by Delphix. All rights reserved.
.\" Copyright (c) 2011, Pawel Jakub Dawidek <pjd at FreeBSD.org>
.\" Copyright (c) 2012, Glen Barber <gjb at FreeBSD.org>
.\" Copyright (c) 2012, Bryan Drewery <bdrewery at FreeBSD.org>
@@ -30,7 +30,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 23, 2014
+.Dd May 27, 2014
.Dt ZFS 8
.Os
.Sh NAME
@@ -1193,6 +1193,53 @@
.Pp
This property can also be referred to by its shortened column name,
.Sy recsize .
+.It Sy redundant_metadata Ns = Ns Cm all | most
+Controls what types of metadata are stored redundantly.
+ZFS stores an extra copy of metadata, so that if a single block is corrupted,
+the amount of user data lost is limited.
+This extra copy is in addition to any redundancy provided at the pool level
+.Pq e.g. by mirroring or RAID-Z ,
+and is in addition to an extra copy specified by the
+.Sy copies
+property
+.Pq up to a total of 3 copies .
+For example if the pool is mirrored,
+.Cm copies Ns = Ns Ar 2 ,
+and
+.Cm redundant_metadata Ns = Ns Ar most ,
+then ZFS
+stores 6 copies of most metadata, and 4 copies of data and some
+metadata.
+.Pp
+When set to
+.Cm all ,
+ZFS stores an extra copy of all metadata.
+If a
+single on-disk block is corrupt, at worst a single block of user data
+.Po which is
+.Cm recordsize
+bytes long
+can be lost.
+.Pc
+.Pp
+When set to
+.Cm most ,
+ZFS stores an extra copy of most types of
+metadata.
+This can improve performance of random writes, because less
+metadata must be written.
+In practice, at worst about 100 blocks
+.Po of
+.Cm recordsize
+bytes each
+.Pc
+of user data can be lost if a single
+on-disk block is corrupt.
+The exact behavior of which metadata blocks
+are stored redundantly may change in future releases.
+.Pp
+The default value is
+.Cm all .
.It Sy refquota Ns = Ns Ar size | Cm none
Limits the amount of space a dataset can consume. This property enforces a hard
limit on the amount of space used. This hard limit does not include space used
Modified: soc2014/op/freebsd-base/contrib/apr/CHANGES
==============================================================================
--- soc2014/op/freebsd-base/contrib/apr/CHANGES Mon Jun 2 01:00:55 2014 (r268941)
+++ soc2014/op/freebsd-base/contrib/apr/CHANGES Mon Jun 2 01:21:38 2014 (r268942)
@@ -1,235 +1,124 @@
-*- coding: utf-8 -*-
-Changes for APR 1.4.8
+Changes for APR 1.5.1
- *) Fix compiltation with FreeBSD on ARM. [Olli Hauer <ohauer gmx.de>]
+ *) apr_os_proc_mutex_get() on Unix: Avoid segfault for cross-
+ process pthread mutexes. [Yann Ylavic <ylavic.dev gmail.com>]
- *) Fix 1.4.7 regression in apr_mcast_hops() and apr_mcast_loopback()
- for AF_INET (IPv4) sockets on most Unix platforms. [Joe Orton]
+ *) When using shmget-based shared memory, the ID used for ftok is
+ now an APR hash of the filename instead of the constant '1'.
+ We do this to help avoid collisions. PR 53996 [Jim Jagielski]
- *) Fix the return value of apr_threadattr_detach_get() on some
- platforms like OS X and Solaris. [Rainer Jung, <dusanv gmail com>]
+ *) apr_socket_atreadeof(): Fix breakage on OS X. [Jim Jagielski]
-Changes for APR 1.4.7
+ *) Fix POSIX shared memory (shm_open) use for named shared memory.
+ Includes adding '--enable-posix-shm' to force POSIX shm if
+ available, and OS X compatibility. PR 55928.
+ [Jozef Hatala <jh-asf skrt org>, Jim Jagielski]
- *) Fix apr_sockaddr_info_get() not returning an error in some cases.
- PR 54779. [Jan Kaluža <jkaluza redhat com>]
+ *) Fix race condition when calling apr_dir_make_recursive from
+ multiple threads on Windows.
+ [Bert Huijben]
- *) Fix amd64 assembler version of apr_atomic_xchgptr(). PR 51851. [Mattias
- Engdegård <mattiase acm org>]
+ *) Fix apr_escape.c compilation errors on EBCDIC platforms.
+ [Eric Covener]
- *) Fix PPC atomics to work with gcc 4.0. PR 54840. [Mattias Engdegård
- <mattiase acm org>]
+ *) FreeBSD 10: Correct a regression in 1.5.0 which affected non-
+ blocking sockets in some applications, including httpd. [Jeff
+ Trawick]
- *) configure: Fix detection of O_NONBLOCK inheritance on busy
- systems. [Rainer Jung]
+ *) Windows cmake build: Fix incorrect installation of some .pdb
+ files. Fix incorrect use of some logic intended for Windows 9x,
+ including legacy filesystem interfaces and dynamic loading of
+ some Windows APIs. [Jeff Trawick]
- *) Remove unused code, fix strict C compliance bug in SHA-256
- implementation. [Jan Kaluza <jkaluza redhat.com>]
-
- *) Fix apr_ipsubnet_test() false positives when comparing IPv4
- subnet representation against an IPv6 address. PR 54047. [Joe Orton]
-
- *) apr_socket_accept_filter: Return success when trying to again set
- the filter to the same value as before, avoiding an unhelpful
- APR_EINVAL. PR 37863. [Jeff Trawick]
-
- *) configure: Fix Linux 3.x detection. PR 54001. [Gilles Espinasse
- <g esp free fr>]
-
- *) apr_time_exp_*() on Windows: Fix error in the tm_yday field of
- apr_time_exp_t for times within leap years. PR 53175.
+ *) apr_skiplist: Add compatibility with C++ applications.
[Jeff Trawick]
- *) Improve platform detection by updating config.guess and config.sub.
- [Rainer Jung]
-
- *) Add support for OSX Mountain Lion (10.8) [Jim Jagielski]
-
- *) Add various gcc function attributes. [Stefan Fritsch]
-
- *) Fix some problems in apr_sockaddr_info_get() when trying to resolve
- the loopback addresses of a protocol family that is not otherwise
- configured on the system. PR 52709. [Nirgal Vourgère
- <jmv_deb nirgal com>, Stefan Fritsch]
-
- *) Fix file not being unlocked if truncate call on a file fails.
- [Mladen Turk]
-
- *) apr_mcast_hops: Fix EINVAL for IPv6 sockets caused by using byte
- instead integer for setsockopt. [Mladen Turk]
-
- *) Windows: Fix compile-time checks for 64-bit builds, resolving a
- crash in httpd's mod_rewrite. PR 49155. [<anindyabaruah gmail.com>]
-
-Changes for APR 1.4.6
-
- *) Flush write buffer before truncate call on a file.
- [Mladen Turk]
-
- *) Randomise hashes by providing a seed.
- Assigned CVE-2012-0840, oCERT-2011-003, but not known to be exploitable.
- [Bojan Smojver, Branko Čibej, Ruediger Pluem et al.]
-
- *) apr_random: Prevent segfault if pool used to initialize apr_random is
- destroyed before forking. [Stefan Fritsch]
-
- *) testrand: Improve child randomness test case. [Rainer Jung]
-
- *) apr_proc_fork, apr_random_after_fork: disambiguate what happens to the
- proc structure passed in, and ensure that the pid is set correctly in
- a newly created child; note that merely mixing a PID into the random
- seed of a new child doesn't markedly increase entropy. [Sander Temme]
-
- *) apr_file_open: Avoid fcntl() calls if support for O_CLOEXEC works.
- PR 48557. [Mike Frysinger <vapier gentoo org>]
-
- *) apr_dir_make_recursive: Fix race condition that could lead to EEXIST
- being returned. PR 51254. [William Lee <william lee rainstor com>,
- Wim Lewis <wiml omnigroup com>]
-
- *) configure: Fix APR_RESTORE_THE_ENVIRONMENT if the original variable was
- a single space. PR 50334. [Nathan Phillip Brink <binki gentoo org>]
-
- *) apr_proc_create: Don't close any of the new stdin/stdout/stderr in the
- child if it already has the correct FD. PR 51995.
- [Dan Ports <drkp csail mit edu>]
-
- *) Fix flag character '#' in combination with format character 'x' in
- apr snprintf implementations. [Rainer Jung]
-
- *) Improve platform detection by updating config.guess and config.sub.
- [Rainer Jung]
-
- *) Add libtool2 files to extraclean make target. [Rainer Jung]
+ *) Correct a regression in 1.5.0 which affected out-of-tree
+ builds on Unix. [Rainer Jung]
- *) Don't overwrite our config.guess and config.sub
- when running buildconf. [Rainer Jung]
+ *) Improve platform detection for bundled expat by updating
+ config.guess and config.sub. [Rainer Jung]
- *) Silence autoconf 2.68 warnings. [Rainer Jung]
+Changes for APR 1.5.0
-Changes for APR 1.4.5
-
- *) Security: CVE-2011-1928
- apr_fnmatch(): Fix high CPU loop. [William Rowe]
-
- *) Fix top_builddir in installed apr_rules.mk. [Bojan Smojver]
-
-Changes for APR 1.4.4
-
- *) Windows: Fix command-line builds. [William Rowe]
-
-Changes for APR 1.4.3
-
- *) Security: CVE-2011-0419
- Reimplement apr_fnmatch() from scratch using a non-recursive
- algorithm; now has improved compliance with the fnmatch() spec.
- [William Rowe]
-
- *) Fix environment-related crash using some non-standard builds on
- Windows 7/Server 2008. [Steve Hay <SteveHay planit.com>]
-
- *) poll, pollset, pollcb on Windows: Handle calls with no file/socket
- descriptors. PR 49882. [Stefan Ruppert <sr myarm.com>, Jeff Trawick]
-
- *) Fix APR_IPV6_V6ONLY issues on Windows related to run-time behavior
- on Windows older than Vista and SDK/MinGW levels without IPV6_V6ONLY.
- PR 45321. [Sob <sob hisoftware.cz>]
-
- *) Fix address handling when accepting an AF_INET socket from a socket
- bound as AF_INET6. PR 49678. [Joe Orton]
+ *) Fix Linux kernel version check to recognize more versions,
+ including versions 3.10 and later. PR 55690. [Joe Orton,
+ Arfrever Frehtes Taifersar Arahesis <arfrever.fta gmail.com>]
+
+ *) Add apr_sockaddr_is_wildcard() to check if a socket address
+ refers to the wildcard address for the protocol family (e.g.,
+ 0.0.0.0/INADDR_ANY for IPv4). [Jeff Trawick]
+
+ *) apr_file_dup2() on Windows: Fix debug RTL assertion when
+ attempting to _commit(stdout) or _commit(stderr). [Mike Rumph
+ <mike.rumph oracle.com>]
+
+ *) apr_socket_connect() on Windows: Handle WSAEISCONN. PR 48736.
+ [<inoue ariel-networks.com>, Jeff Trawick]
+
+ *) z/OS: threadsafe apr_pollset_poll support for sockets [Greg Ames]
+
+ *) Windows: Don't obtain a mutex for buffered file I/O unless the
+ file was opened with the APR_FOPEN_XTHREAD flag. [Ivan Zhakov
+ <ivan visualsvn.com>]
+
+ *) Windows: Create named shared memory segments under the "Local"
+ namespace if the caller is unprivileged, fixing an inability of
+ unprivileged callers to use apr_shm_create() with named shared
+ memory segments under recent Windows. As before, shared memory
+ segments are created under the "Global" namespace for privileged
+ callers. Add apr_shm_create_ex() and apr_shm_attach_ex(), which
+ provide the ability to override the normal namespace selection.
+ [Jeff Trawick]
- *) Fix error return values from apr_sockaddr_info_get() on Windows for
- IPv6 builds. [Ivan Zhakov <ivan visualsvn.com>]
+ *) Update compile settings for MINT OS. PR 47181. [Alan Hourihane
+ <alanh fairlite.co.uk>]
- *) Add new experimental configure option --enable-allocator-uses-mmap to
- use mmap instead of malloc in apr_allocator_alloc(). This greatly reduces
- memory fragmentation with malloc implementations (e.g. glibc) that
- don't handle allocationss of a page-size-multiples in an efficient way.
- It also makes apr_allocator_max_free_set() actually have some effect
- on such platforms. [Stefan Fritsch]
+ *) Files and pipes on Windows: Don't create an unused pollset when
+ files and pipes are opened. [Mladen Turk]
- *) configure: Support 64 and 32 bit universal builds for Darwin/
- OS X 10.6+. [Jim Jagielski]
+ *) apr_socket_timeout_set() on Windows: If the socket was in a non-
+ blocking state before, disable that setting so that timeouts work.
+ [Jeff Trawick]
- *) apr_sockaddr_info_get() on AIX: Fix a problem which could set
- the port field in the native socket address to 1 when 0 was
- specified. PR 46964. [Jeff Trawick]
+ *) File info APIs: Fix calculation of atime and mtime on AIX. PR 51146.
+ [Ruediger Pluem]
- *) configure: Make definition of apr_ino_t independent of
- _FILE_OFFSET_BITS even on platforms where ino_t is 'unsigned int'.
- [Stefan Fritsch]
+ *) Add the apr_escape interface. [Graham Leggett]
- *) apr_ring: Workaround for aliasing problem that causes gcc 4.5 to
- miscompile some brigade related code. PR 50190. [Stefan Fritsch]
+ *) Cygwin build fixes. PRs 51016 and 55586. [Carlo Bramini
+ <carlo.bramix libero.it>]
- *) apr_file_flush_locked(): Handle short writes. [Stefan Fritsch]
+ *) Add apr_skiplist family. [Jim Jagielski]
- *) apr_pollset_create_ex(): Trap errors from pollset providers.
- PR 49094. [Sami Tolvanen <sami.tolvanen mywot.com>]
+ *) Add experimental cmake-based build system for Windows. Refer to
+ README.cmake for more information. [Jeff Trawick, Tom Donovan]
- *) apr_pollset_create*(): Fix memory lifetime problem with the wakeup
- pipe when the pollset was created with APR_POLLSET_NOCOPY.
- [Neil Conway <nrc cs.berkeley.edu>]
+ *) Add the apr_table_getm() call, which transparently handles the
+ merging of keys with multiple values. [Graham Leggett]
- *) Fix detection of some Linux variants when configure is built with
- recent GNU tools. [Eric Covener]
+ *) Add apr_hash_this_key(), apr_hash_this_key_len(), and
+ apr_hash_this_val() for easier access to those attributes from
+ a hash iterator. [Hyrum K. Wright <hyrum_wright mail.utexas.edu>]
- *) Avoid a redundant fcntl() call in apr_file_open() where O_CLOEXEC
- is supported. PR 46297. [Joe Orton]
+ *) MinGW/MSYS: Support shared builds of APR, other general improvements
+ to support of this toolchain. PR 46175. [Carlo Bramini
+ <carlo.bramix libero.it>]
*) Improve platform detection by updating config.guess and config.sub.
[Rainer Jung]
-Changes for APR 1.4.2
-
- *) Undo a crash-bug introduced in 1.4.1 affecting some applications of
- the apr hash and table structures, reported to affect Subversion
- by Bert Huijben <bert qqmail.nl>. [Graham Leggett]
-
-Changes for APR 1.4.1
-
- *) Win32: Properly handle the ERROR_DIRECTORY system error code.
- [Brane Čibej]
-
-Changes for APR 1.4.0
-
- *) Windows: Default build configurations assume NT or higher at run-time.
-
- *) Add apr_global_mutex_lockfile() for retrieving the file, if any,
- associated with the mutex. Add apr_global_mutex_name() for retrieving
- the name of the lock mechanism used by the underlying proc mutex.
- [Jeff Trawick]
-
- *) Add apr_socket_atreadeof to determine whether the receive part of the
- socket has been closed by the peer.
- [Ruediger Pluem, Mladen Turk, Joe Orton]
-
- *) Make apr_pollset and apr_pollcb implementations using providers.
- Added apr_pollset_create_ex and apr_pollcb_create_ex that allows
- choosing non-default providers.
- [Mladen Turk]
-
- *) Win32: Use WSAPoll as default pollset method if supported and found
- inside winsock dll. [Mladen Turk]
-
- *) apr_temp_dir_get() now checks the TMPDIR environment variable first,
- instead of third. [Jim Jagielski]
-
- *) Add apr_file_sync() and apr_file_datasync() calls. [Bojan Smojver]
-
- *) apr_pollset_wakeup() on Windows: Fix core caused by closing the
- file_socket_pipe with standard file_close.
- [Arsen Chaloyan, Mladen Turk]
-
- *) Introduce apr_hash_do() for iterating over a hash table. [Mladen Turk]
+ *) apr_socket_opt_set: Add support for APR_SO_BROADCAST. PR 46389.
+ [Armin Müller <mueller itestra com>]
- *) Make sure WIN32 behaves the same as posix for file-backed shared memory
- by removing the file on cleanup/remove. [Mladen Turk]
+ *) Enable platform specific support for the opening of a file or
+ pipe in non-blocking mode through the APR_FOPEN_NONBLOCK flag.
+ [Graham Leggett]
- *) Introduce apr_pollset_wakeup() for interrupting the blocking
- apr_pollset_poll() call. [Mladen Turk]
+Changes for APR 1.4.x and later:
- *) Add apr_file_link() function. PR 44841. [Mark Heily <mark heily.com>]
+ *) http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?view=markup
Changes for APR 1.3.x and later:
Copied: soc2014/op/freebsd-base/contrib/apr/CMakeLists.txt (from r268941, mirror/FreeBSD/head/contrib/apr/CMakeLists.txt)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ soc2014/op/freebsd-base/contrib/apr/CMakeLists.txt Mon Jun 2 01:21:38 2014 (r268942, copy of r268941, mirror/FreeBSD/head/contrib/apr/CMakeLists.txt)
@@ -0,0 +1,434 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Read README.cmake before using this.
+
+PROJECT(APR C)
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+OPTION(APR_INSTALL_PRIVATE_H "Install selected private .h files (for httpd)" OFF)
+OPTION(APR_HAVE_IPV6 "IPv6 support" ON)
+OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON)
+OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF)
+OPTION(TEST_STATIC_LIBS "Test programs use APR static libraries instead of shared libraries?" OFF)
+SET(MIN_WINDOWS_VER "Vista"
+ CACHE STRING "Minimum Windows version")
+
+# create 1-or-0 representation of feature tests for apr.h
+
+SET(apr_have_ipv6_10 0)
+
+IF(APR_HAVE_IPV6)
+ SET(apr_have_ipv6_10 1)
+ENDIF()
+
+IF("${MIN_WINDOWS_VER}" STREQUAL "")
+ SET(win32_winnt_str "0x0600")
+ELSEIF(${MIN_WINDOWS_VER} STREQUAL "Vista")
+ SET(win32_winnt_str "0x0600")
+ELSEIF(${MIN_WINDOWS_VER} STREQUAL "Windows7")
+ SET(win32_winnt_str "0x0601")
+ELSE()
+ SET(win32_winnt_str ${MIN_WINDOWS_VER})
+ENDIF()
+
+CONFIGURE_FILE(include/apr.hwc
+ ${PROJECT_BINARY_DIR}/apr.h)
+
+ADD_EXECUTABLE(gen_test_char tools/gen_test_char.c)
+GET_TARGET_PROPERTY(GEN_TEST_CHAR_EXE gen_test_char LOCATION)
+ADD_CUSTOM_COMMAND(
+ COMMENT "Generating character tables, apr_escape_test_char.h, for current locale"
+ DEPENDS gen_test_char
+ COMMAND ${GEN_TEST_CHAR_EXE} > ${PROJECT_BINARY_DIR}/apr_escape_test_char.h
+ OUTPUT ${PROJECT_BINARY_DIR}/apr_escape_test_char.h
+)
+ADD_CUSTOM_TARGET(
+ test_char_header ALL
+ DEPENDS ${PROJECT_BINARY_DIR}/apr_escape_test_char.h
+)
+
+# Generated .h files are stored in PROJECT_BINARY_DIR, not the
+# source tree.
+#
+# BROKEN: not searching PROJECT_BINARY_DIR first, so you have to
+# manually delete apr.h in PROJECT_SOURCE_DIR/include if
+# you've generated apr.h before using a different build
+
+SET(APR_INCLUDE_DIRECTORIES
+ ${PROJECT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/include
+ ${CMAKE_CURRENT_SOURCE_DIR}/include/arch/win32
+ ${CMAKE_CURRENT_SOURCE_DIR}/include/arch/unix
+ ${CMAKE_CURRENT_SOURCE_DIR}/include/private
+)
+
+SET(APR_SYSTEM_LIBS
+ ws2_32
+ mswsock
+ rpcrt4
+)
+
+INCLUDE_DIRECTORIES(${APR_INCLUDE_DIRECTORIES})
+
+SET(APR_PUBLIC_HEADERS_STATIC
+ include/apr_allocator.h
+ include/apr_atomic.h
+ include/apr_dso.h
+ include/apr_env.h
+ include/apr_errno.h
+ include/apr_escape.h
+ include/apr_file_info.h
+ include/apr_file_io.h
+ include/apr_fnmatch.h
+ include/apr_general.h
+ include/apr_getopt.h
+ include/apr_global_mutex.h
+ include/apr_hash.h
+ include/apr_inherit.h
+ include/apr_lib.h
+ include/apr_mmap.h
+ include/apr_network_io.h
+ include/apr_poll.h
+ include/apr_pools.h
+ include/apr_portable.h
+ include/apr_proc_mutex.h
+ include/apr_random.h
+ include/apr_ring.h
+ include/apr_shm.h
+ include/apr_signal.h
+ include/apr_skiplist.h
+ include/apr_strings.h
+ include/apr_support.h
+ include/apr_tables.h
+ include/apr_thread_cond.h
+ include/apr_thread_mutex.h
+ include/apr_thread_proc.h
+ include/apr_thread_rwlock.h
+ include/apr_time.h
+ include/apr_user.h
+ include/apr_version.h
+ include/apr_want.h
+)
+SET(APR_PUBLIC_HEADERS_GENERATED
+ ${PROJECT_BINARY_DIR}/apr.h
+)
+
+SET(APR_SOURCES
+ atomic/win32/apr_atomic.c
+ dso/win32/dso.c
+ encoding/apr_escape.c
+ file_io/unix/copy.c
+ file_io/unix/fileacc.c
+ file_io/unix/filepath_util.c
+ file_io/unix/fullrw.c
+ file_io/unix/mktemp.c
+ file_io/unix/tempdir.c
+ file_io/win32/buffer.c
+ file_io/win32/dir.c
+ file_io/win32/filedup.c
+ file_io/win32/filepath.c
+ file_io/win32/filestat.c
+ file_io/win32/filesys.c
+ file_io/win32/flock.c
+ file_io/win32/open.c
+ file_io/win32/pipe.c
+ file_io/win32/readwrite.c
+ file_io/win32/seek.c
+ locks/win32/proc_mutex.c
+ locks/win32/thread_cond.c
+ locks/win32/thread_mutex.c
+ locks/win32/thread_rwlock.c
+ memory/unix/apr_pools.c
+ misc/unix/errorcodes.c
+ misc/unix/getopt.c
+ misc/unix/otherchild.c
+ misc/unix/version.c
+ misc/win32/charset.c
+ misc/win32/env.c
+ misc/win32/internal.c
+ misc/win32/misc.c
+ misc/win32/rand.c
+ misc/win32/start.c
+ misc/win32/utf8.c
+ mmap/unix/common.c
+ mmap/win32/mmap.c
+ network_io/unix/inet_ntop.c
+ network_io/unix/inet_pton.c
+ network_io/unix/multicast.c
+ network_io/unix/sockaddr.c
+ network_io/unix/socket_util.c
+ network_io/win32/sendrecv.c
+ network_io/win32/sockets.c
+ network_io/win32/sockopt.c
+ passwd/apr_getpass.c
+ poll/unix/poll.c
+ poll/unix/pollcb.c
+ poll/unix/pollset.c
+ poll/unix/select.c
+ random/unix/apr_random.c
+ random/unix/sha2.c
+ random/unix/sha2_glue.c
+ shmem/win32/shm.c
+ strings/apr_cpystrn.c
+ strings/apr_fnmatch.c
+ strings/apr_snprintf.c
+ strings/apr_strings.c
+ strings/apr_strnatcmp.c
+ strings/apr_strtok.c
+ tables/apr_hash.c
+ tables/apr_skiplist.c
+ tables/apr_tables.c
+ threadproc/win32/proc.c
+ threadproc/win32/signals.c
+ threadproc/win32/thread.c
+ threadproc/win32/threadpriv.c
+ time/win32/time.c
+ time/win32/timestr.c
+ user/win32/groupinfo.c
+ user/win32/userinfo.c
+)
+
+SET(APR_TEST_SOURCES
+ test/abts.c
+ test/testargs.c
+ test/testatomic.c
+ test/testcond.c
+ test/testdir.c
+ test/testdso.c
+ test/testdup.c
+ test/testenv.c
+ test/testescape.c
+ test/testfile.c
+ test/testfilecopy.c
+ test/testfileinfo.c
+ test/testflock.c
+ test/testfmt.c
+ test/testfnmatch.c
+ test/testglobalmutex.c
+ test/testhash.c
+ test/testipsub.c
+ test/testlfs.c
+ test/testlock.c
+ test/testmmap.c
+ test/testnames.c
+ test/testoc.c
+ test/testpath.c
+ test/testpipe.c
+ test/testpoll.c
+ test/testpools.c
+ test/testproc.c
+ test/testprocmutex.c
+ test/testrand.c
+ test/testshm.c
+ test/testsleep.c
+ test/testsock.c
+ test/testsockets.c
+ test/testsockopt.c
+ test/teststr.c
+ test/teststrnatcmp.c
+ test/testtable.c
+ test/testtemp.c
+ test/testthread.c
+ test/testtime.c
+ test/testud.c
+ test/testuser.c
+ test/testutil.c
+ test/testvsn.c
+)
+
+SET(install_targets)
+SET(install_bin_pdb)
+SET(install_lib_pdb)
+
+# libapr-1 is shared, apr-1 is static
+ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc)
+SET(install_targets ${install_targets} libapr-1)
+SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libapr-1.pdb)
+TARGET_LINK_LIBRARIES(libapr-1 ${APR_SYSTEM_LIBS})
+SET_TARGET_PROPERTIES(libapr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_EXPORT;WINNT")
+ADD_DEPENDENCIES(libapr-1 test_char_header)
+
+ADD_LIBRARY(apr-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
+SET(install_targets ${install_targets} apr-1)
+SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/apr-1.pdb)
+TARGET_LINK_LIBRARIES(apr-1 ${APR_SYSTEM_LIBS})
+SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;WINNT")
+ADD_DEPENDENCIES(apr-1 test_char_header)
+
+# libaprapp-1 and aprapp-1 are static
+ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})
+SET(install_targets ${install_targets} libaprapp-1)
+SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/libaprapp-1.pdb)
+SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT")
+
+ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})
+SET(install_targets ${install_targets} aprapp-1)
+SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/aprapp-1.pdb)
+SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT")
+
+IF(APR_BUILD_TESTAPR)
+ ENABLE_TESTING()
+ # Create a "check" target that displays test program output to the console.
+ ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND} --verbose)
+
+ # copy data files to build directory so that we can run programs from there
+ EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory
+ ${PROJECT_BINARY_DIR}/data)
+ EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${PROJECT_SOURCE_DIR}/test/data/file_datafile.txt
+ ${PROJECT_BINARY_DIR}/data/file_datafile.txt)
+ EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${PROJECT_SOURCE_DIR}/test/data/mmap_datafile.txt
+ ${PROJECT_BINARY_DIR}/data/mmap_datafile.txt)
+
+ IF(TEST_STATIC_LIBS)
+ SET(whichapr apr-1)
+ SET(whichaprapp aprapp-1)
+ SET(apiflag -DAPR_DECLARE_STATIC)
+ ELSE()
+ SET(whichapr libapr-1)
+ SET(whichaprapp libaprapp-1)
+ SET(apiflag)
+ ENDIF()
+
+ ADD_EXECUTABLE(testapp test/testapp.c)
+ TARGET_LINK_LIBRARIES(testapp ${whichapr} ${whichaprapp} ${APR_SYSTEM_LIBS})
+ SET_TARGET_PROPERTIES(testapp PROPERTIES LINK_FLAGS /entry:wmainCRTStartup)
+ IF(apiflag)
+ SET_TARGET_PROPERTIES(testapp PROPERTIES COMPILE_FLAGS ${apiflag})
+ ENDIF()
+ ADD_TEST(NAME testapp COMMAND testapp)
+
+ ADD_EXECUTABLE(testall ${APR_TEST_SOURCES})
+ TARGET_LINK_LIBRARIES(testall ${whichapr} ${APR_SYSTEM_LIBS})
+ IF(apiflag)
+ SET_TARGET_PROPERTIES(testall PROPERTIES COMPILE_FLAGS ${apiflag})
+ ENDIF()
+ ADD_TEST(NAME testall COMMAND testall)
+
+ ADD_LIBRARY(mod_test MODULE test/mod_test.c)
+ TARGET_LINK_LIBRARIES(mod_test ${whichapr} ${APR_SYSTEM_LIBS})
+ SET_PROPERTY(TARGET mod_test APPEND PROPERTY LINK_FLAGS /export:print_hello)
+ # nasty work-around for difficulties adding more than one additional flag
+ # (they get joined in a bad way behind the scenes)
+ GET_PROPERTY(link_flags TARGET mod_test PROPERTY LINK_FLAGS)
+ SET(link_flags "${link_flags} /export:count_reps")
+ SET_TARGET_PROPERTIES(mod_test PROPERTIES LINK_FLAGS ${link_flags})
+ IF(apiflag)
+ SET_TARGET_PROPERTIES(mod_test PROPERTIES COMPILE_FLAGS ${apiflag})
+ ENDIF()
+
+ # Build all the single-source executable files with no special build
+ # requirements.
+ SET(single_source_programs
+ test/echod.c
+ test/sendfile.c
+ test/sockperf.c
+ test/testlockperf.c
+ test/testmutexscope.c
+ test/globalmutexchild.c
+ test/occhild.c
+ test/proc_child.c
+ test/readchild.c
+ test/sockchild.c
+ test/testshmproducer.c
+ test/testshmconsumer.c
+ test/tryread.c
+ test/internal/testucs.c
+ )
+
+ FOREACH(sourcefile ${single_source_programs})
+ STRING(REGEX REPLACE ".*/([^\\]+)\\.c" "\\1" proggie ${sourcefile})
+ ADD_EXECUTABLE(${proggie} ${sourcefile})
+ TARGET_LINK_LIBRARIES(${proggie} ${whichapr} ${APR_SYSTEM_LIBS})
+ IF(apiflag)
+ SET_TARGET_PROPERTIES(${proggie} PROPERTIES COMPILE_FLAGS ${apiflag})
+ ENDIF()
+ ENDFOREACH()
+
+ # Add tests for programs that run by themselves with no arguments.
+ SET(simple_tests
+ testmutexscope
+ testucs
+ )
+
+ FOREACH(simple ${simple_tests})
+ ADD_TEST(NAME ${simple} COMMAND ${simple})
+ ENDFOREACH()
+
+ # testlockperf takes forever on Windows with default counter limit
+ ADD_TEST(NAME testlockperf COMMAND testlockperf -c 50000)
+
+ # sendfile runs multiple times with different parameters.
+ FOREACH(sendfile_mode blocking nonblocking timeout)
+ ADD_TEST(NAME sendfile-${sendfile_mode} COMMAND sendfile client ${sendfile_mode} startserver)
+ ENDFOREACH()
+
+ # No test is added for echod+sockperf. Those will have to be run manually.
+
+ENDIF (APR_BUILD_TESTAPR)
+
+# Installation
+
+INSTALL(TARGETS ${install_targets}
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ )
+
+IF(INSTALL_PDB)
+ INSTALL(FILES ${install_bin_pdb}
+ DESTINATION bin
+ CONFIGURATIONS RelWithDebInfo Debug)
+
+ INSTALL(FILES ${install_lib_pdb}
+ DESTINATION lib
+ CONFIGURATIONS RelWithDebInfo Debug)
+ENDIF()
+
+INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)
+IF(APR_INSTALL_PRIVATE_H)
+ # Kludges for unexpected dependencies of httpd 2.x, not installed by default
+ SET(APR_PRIVATE_H_FOR_HTTPD
+ include/arch/win32/apr_arch_file_io.h
+ include/arch/win32/apr_arch_misc.h
+ include/arch/win32/apr_arch_utf8.h
+ include/arch/win32/apr_private.h
+ )
+ INSTALL(FILES ${APR_PRIVATE_H_FOR_HTTPD} DESTINATION include/arch/win32)
+ INSTALL(FILES include/arch/apr_private_common.h DESTINATION include/arch)
+ENDIF()
+
+STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype)
+MESSAGE(STATUS "")
+MESSAGE(STATUS "")
+MESSAGE(STATUS "APR configuration summary:")
+MESSAGE(STATUS "")
+
+MESSAGE(STATUS " Build type ...................... : ${CMAKE_BUILD_TYPE}")
+MESSAGE(STATUS " Install .pdb (if available)...... : ${INSTALL_PDB}")
+MESSAGE(STATUS " Install prefix .................. : ${CMAKE_INSTALL_PREFIX}")
+MESSAGE(STATUS " C compiler ...................... : ${CMAKE_C_COMPILER}")
+MESSAGE(STATUS " IPv6 ............................ : ${APR_HAVE_IPV6}")
+MESSAGE(STATUS " Minimum Windows version ......... : ${MIN_WINDOWS_VER}")
+MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}")
+IF(TEST_STATIC_LIBS)
+MESSAGE(STATUS " (testing static libraries)")
+ELSE()
+MESSAGE(STATUS " (testing dynamic libraries)")
+ENDIF()
+MESSAGE(STATUS " Install private .h for httpd .... : ${APR_INSTALL_PRIVATE_H}")
Modified: soc2014/op/freebsd-base/contrib/apr/LICENSE
==============================================================================
--- soc2014/op/freebsd-base/contrib/apr/LICENSE Mon Jun 2 01:00:55 2014 (r268941)
+++ soc2014/op/freebsd-base/contrib/apr/LICENSE Mon Jun 2 01:21:38 2014 (r268942)
@@ -206,8 +206,8 @@
The Apache Portable Runtime includes a number of subcomponents with
separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
+code for these subcomponents is subject to the terms and conditions
+of the following licenses.
From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c,
file_io/unix/mktemp.c, strings/apr_strings.c:
Modified: soc2014/op/freebsd-base/contrib/apr/Makefile.in
==============================================================================
--- soc2014/op/freebsd-base/contrib/apr/Makefile.in Mon Jun 2 01:00:55 2014 (r268941)
+++ soc2014/op/freebsd-base/contrib/apr/Makefile.in Mon Jun 2 01:21:38 2014 (r268942)
@@ -18,7 +18,7 @@
INCDIR=./include
OSDIR=$(top_srcdir)/include/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include
+INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include -I$(top_srcdir)/include/private -I$(top_blddir)/include/private
#
# Macros for target determination
@@ -36,7 +36,7 @@
# Rules for building specific targets, starting with 'all' for
# building the entire package.
#
-TARGETS = $(TARGET_LIB) apr.exp apr-config.out build/apr_rules.out
+TARGETS = $(TARGET_LIB) include/private/apr_escape_test_char.h apr.exp apr-config.out build/apr_rules.out
LT_VERSION = @LT_VERSION@
@@ -45,7 +45,9 @@
@INCLUDE_OUTPUTS@
CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
- build/apr_rules.out
+ build/apr_rules.out tools/gen_test_char at EXEEXT@ \
+ tools/gen_test_char.o tools/gen_test_char.lo \
+ include/private/apr_escape_test_char.h
DISTCLEAN_TARGETS = config.cache config.log config.status \
include/apr.h include/arch/unix/apr_private.h \
libtool $(APR_CONFIG) build/apr_rules.mk apr.pc \
@@ -99,6 +101,8 @@
$(TARGET_LIB): $(OBJECTS)
$(LINK) @lib_target@ $(ALL_LIBS)
+encoding/apr_escape.lo: include/private/apr_escape_test_char.h
+
exports.c: $(HEADERS)
$(APR_MKEXPORT) $(HEADERS) > $@
@@ -125,5 +129,20 @@
etags:
etags `find . -name '*.[ch]'`
+make_tools_dir:
+ $(APR_MKDIR) tools
+
+OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+tools/gen_test_char.lo: make_tools_dir
+tools/gen_test_char at EXEEXT@: $(OBJECTS_gen_test_char)
+ $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
+
+include/private/apr_escape_test_char.h: tools/gen_test_char at EXEEXT@
+ $(APR_MKDIR) include/private
+ tools/gen_test_char at EXEEXT@ > $@
+
+LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
+ @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
+
# DO NOT REMOVE
docs: $(INCDIR)/*.h
Modified: soc2014/op/freebsd-base/contrib/apr/Makefile.win
==============================================================================
--- soc2014/op/freebsd-base/contrib/apr/Makefile.win Mon Jun 2 01:00:55 2014 (r268941)
+++ soc2014/op/freebsd-base/contrib/apr/Makefile.win Mon Jun 2 01:21:38 2014 (r268942)
@@ -7,7 +7,7 @@
# install - compile everything
# clean - mop up everything
#
-# You can override the build mechansim, choose only one;
+# You can override the build mechanism, choose only one;
#
# USEMAK=1 - compile from exported make files
# USEDSW=1 - compile from .dsw / .dsp VC6 projects
Modified: soc2014/op/freebsd-base/contrib/apr/NOTICE
==============================================================================
--- soc2014/op/freebsd-base/contrib/apr/NOTICE Mon Jun 2 01:00:55 2014 (r268941)
+++ soc2014/op/freebsd-base/contrib/apr/NOTICE Mon Jun 2 01:21:38 2014 (r268942)
@@ -1,7 +1,7 @@
Apache Portable Runtime
-Copyright (c) 2011 The Apache Software Foundation.
+Copyright (c) 2000-2014 The Apache Software Foundation.
-This product includes software developed by
+This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-soc-all
mailing list