svn commit: r284193 - in releng/10.1: . contrib/file contrib/file/doc contrib/file/magic contrib/file/magic/Magdir contrib/file/src lib/libmagic sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/conf

[Guido Falsi]

On 06/10/15 00:13, Xin LI wrote:
> Author: delphij
> Date: Tue Jun  9 22:13:25 2015
> New Revision: 284193
> URL: https://svnweb.freebsd.org/changeset/base/284193
> 
> Log:
>   Update base system file(1) to 5.22 to address multiple denial of
>   service issues. [EN-15:06]
>   
>   Improve reliability of ZFS when TRIM/UNMAP and/or L2ARC is used.
>   [EN-15:07]
>   
>   Approved by:	so
> 
> Added:
>   releng/10.1/contrib/file/magic/Magdir/kerberos
>   releng/10.1/contrib/file/magic/Magdir/meteorological
>   releng/10.1/contrib/file/magic/Magdir/qt
> Deleted:
>   releng/10.1/contrib/file/magic/Magdir/rinex
> Modified:
>   releng/10.1/UPDATING
>   releng/10.1/contrib/file/ChangeLog
>   releng/10.1/contrib/file/README
>   releng/10.1/contrib/file/TODO
>   releng/10.1/contrib/file/config.h.in
>   releng/10.1/contrib/file/configure
>   releng/10.1/contrib/file/configure.ac
>   releng/10.1/contrib/file/doc/file.man
>   releng/10.1/contrib/file/doc/libmagic.man
>   releng/10.1/contrib/file/doc/magic.man
>   releng/10.1/contrib/file/magic/Magdir/android
>   releng/10.1/contrib/file/magic/Magdir/animation
>   releng/10.1/contrib/file/magic/Magdir/archive
>   releng/10.1/contrib/file/magic/Magdir/blender
>   releng/10.1/contrib/file/magic/Magdir/cafebabe
>   releng/10.1/contrib/file/magic/Magdir/commands
>   releng/10.1/contrib/file/magic/Magdir/compress
>   releng/10.1/contrib/file/magic/Magdir/database
>   releng/10.1/contrib/file/magic/Magdir/elf
>   releng/10.1/contrib/file/magic/Magdir/filesystems
>   releng/10.1/contrib/file/magic/Magdir/images
>   releng/10.1/contrib/file/magic/Magdir/jpeg
>   releng/10.1/contrib/file/magic/Magdir/linux
>   releng/10.1/contrib/file/magic/Magdir/macintosh
>   releng/10.1/contrib/file/magic/Magdir/msooxml
>   releng/10.1/contrib/file/magic/Magdir/netbsd
>   releng/10.1/contrib/file/magic/Magdir/pascal
>   releng/10.1/contrib/file/magic/Magdir/pgp
>   releng/10.1/contrib/file/magic/Magdir/python
>   releng/10.1/contrib/file/magic/Magdir/riff
>   releng/10.1/contrib/file/magic/Magdir/sequent
>   releng/10.1/contrib/file/magic/Magdir/sereal
>   releng/10.1/contrib/file/magic/Magdir/ssh
>   releng/10.1/contrib/file/magic/Magdir/vms
>   releng/10.1/contrib/file/magic/Magdir/vorbis
>   releng/10.1/contrib/file/magic/Magdir/windows
>   releng/10.1/contrib/file/magic/Makefile.am
>   releng/10.1/contrib/file/magic/Makefile.in
>   releng/10.1/contrib/file/src/Makefile.in
>   releng/10.1/contrib/file/src/apprentice.c
>   releng/10.1/contrib/file/src/ascmagic.c
>   releng/10.1/contrib/file/src/cdf.c
>   releng/10.1/contrib/file/src/cdf.h
>   releng/10.1/contrib/file/src/compress.c
>   releng/10.1/contrib/file/src/elfclass.h
>   releng/10.1/contrib/file/src/encoding.c
>   releng/10.1/contrib/file/src/file.c
>   releng/10.1/contrib/file/src/file.h
>   releng/10.1/contrib/file/src/file_opts.h
>   releng/10.1/contrib/file/src/fsmagic.c
>   releng/10.1/contrib/file/src/funcs.c
>   releng/10.1/contrib/file/src/getline.c
>   releng/10.1/contrib/file/src/magic.c
>   releng/10.1/contrib/file/src/magic.h
>   releng/10.1/contrib/file/src/magic.h.in
>   releng/10.1/contrib/file/src/pread.c
>   releng/10.1/contrib/file/src/readcdf.c
>   releng/10.1/contrib/file/src/readelf.c
>   releng/10.1/contrib/file/src/softmagic.c
>   releng/10.1/contrib/file/src/vasprintf.c
>   releng/10.1/lib/libmagic/config.h
>   releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
>   releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
>   releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
>   releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
>   releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
>   releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
>   releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
>   releng/10.1/sys/conf/newvers.sh
> 
> Modified: releng/10.1/UPDATING
> ==============================================================================
> --- releng/10.1/UPDATING	Tue Jun  9 21:39:38 2015	(r284192)
> +++ releng/10.1/UPDATING	Tue Jun  9 22:13:25 2015	(r284193)
> @@ -16,6 +16,15 @@ from older versions of FreeBSD, try WITH
>  stable/10, and then rebuild without this option. The bootstrap process from
>  older version of current is a bit fragile.
>  
> +20150609:	p29	FreeBSD-EN-15:06.file
> +			FreeBSD-EN-15:07.zfs
> +
> +	Updated base system file(1) to 5.22 to address multiple denial
> +	of service issues. [EN-15:06]
> +
> +	Improved reliability of ZFS when TRIM/UNMAP and/or L2ARC is used.
> +	[EN-15:07]
> +
>  20150513:	p10	FreeBSD-EN-15:04.freebsd-update
>  			FreeBSD-EN-15:05.ufs
>  

Noticed this just now, updating some src tree, the p29 number looks
wrong, I think it should have been p11...

Not a big deal, but I thought I'd report this if it can be fixed.

-- 
Guido Falsi <madpilot at FreeBSD.org>