svn commit: r298920 - in stable/10: contrib/file contrib/file/doc contrib/file/magic contrib/file/magic/Magdir contrib/file/python contrib/file/src lib/libmagic

[Xin LI]

Author: delphij
Date: Mon May  2 05:46:47 2016
New Revision: 298920
URL: https://svnweb.freebsd.org/changeset/base/298920

Log:
  MFC r298192: MFV r298178:
  
  Update file to 5.26.
  
  Relnotes: yes

Added:
  stable/10/contrib/file/magic/Magdir/bioinformatics
 - copied unchanged from r298192, 
head/contrib/file/magic/Magdir/bioinformatics
  stable/10/contrib/file/magic/Magdir/coff
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/coff
  stable/10/contrib/file/magic/Magdir/der
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/der
  stable/10/contrib/file/magic/Magdir/finger
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/finger
  stable/10/contrib/file/magic/Magdir/flif
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/flif
  stable/10/contrib/file/magic/Magdir/microfocus
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/microfocus
  stable/10/contrib/file/magic/Magdir/polyml
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/polyml
  stable/10/contrib/file/magic/Magdir/vacuum-cleaner
 - copied unchanged from r298192, 
head/contrib/file/magic/Magdir/vacuum-cleaner
  stable/10/contrib/file/src/der.c
 - copied unchanged from r298192, head/contrib/file/src/der.c
  stable/10/contrib/file/src/der.h
 - copied unchanged from r298192, head/contrib/file/src/der.h
  stable/10/contrib/file/src/dprintf.c
 - copied unchanged from r298192, head/contrib/file/src/dprintf.c
Modified:
  stable/10/contrib/file/ChangeLog
  stable/10/contrib/file/README
  stable/10/contrib/file/config.h.in
  stable/10/contrib/file/configure
  stable/10/contrib/file/configure.ac
  stable/10/contrib/file/doc/file.man
  stable/10/contrib/file/doc/libmagic.man
  stable/10/contrib/file/magic/Magdir/android
  stable/10/contrib/file/magic/Magdir/animation
  stable/10/contrib/file/magic/Magdir/apple
  stable/10/contrib/file/magic/Magdir/archive
  stable/10/contrib/file/magic/Magdir/audio
  stable/10/contrib/file/magic/Magdir/c-lang
  stable/10/contrib/file/magic/Magdir/cafebabe
  stable/10/contrib/file/magic/Magdir/commands
  stable/10/contrib/file/magic/Magdir/compress
  stable/10/contrib/file/magic/Magdir/console
  stable/10/contrib/file/magic/Magdir/database
  stable/10/contrib/file/magic/Magdir/filesystems
  stable/10/contrib/file/magic/Magdir/fonts
  stable/10/contrib/file/magic/Magdir/fortran
  stable/10/contrib/file/magic/Magdir/hitachi-sh
  stable/10/contrib/file/magic/Magdir/images
  stable/10/contrib/file/magic/Magdir/intel
  stable/10/contrib/file/magic/Magdir/java
  stable/10/contrib/file/magic/Magdir/lisp
  stable/10/contrib/file/magic/Magdir/mach
  stable/10/contrib/file/magic/Magdir/macintosh
  stable/10/contrib/file/magic/Magdir/misctools
  stable/10/contrib/file/magic/Magdir/modem
  stable/10/contrib/file/magic/Magdir/msdos
  stable/10/contrib/file/magic/Magdir/msvc
  stable/10/contrib/file/magic/Magdir/msx
  stable/10/contrib/file/magic/Magdir/netbsd
  stable/10/contrib/file/magic/Magdir/psdbms
  stable/10/contrib/file/magic/Magdir/python
  stable/10/contrib/file/magic/Magdir/sendmail
  stable/10/contrib/file/magic/Magdir/sgml
  stable/10/contrib/file/magic/Magdir/sinclair
  stable/10/contrib/file/magic/Magdir/sql
  stable/10/contrib/file/magic/Magdir/terminfo
  stable/10/contrib/file/magic/Magdir/windows
  stable/10/contrib/file/magic/Magdir/wordprocessors
  stable/10/contrib/file/magic/Makefile.am
  stable/10/contrib/file/magic/Makefile.in
  stable/10/contrib/file/python/README
  stable/10/contrib/file/python/magic.py
  stable/10/contrib/file/python/setup.py
  stable/10/contrib/file/src/Makefile.am
  stable/10/contrib/file/src/Makefile.in
  stable/10/contrib/file/src/apprentice.c
  stable/10/contrib/file/src/ascmagic.c
  stable/10/contrib/file/src/compress.c
  stable/10/contrib/file/src/file.c
  stable/10/contrib/file/src/file.h
  stable/10/contrib/file/src/file_opts.h
  stable/10/contrib/file/src/fmtcheck.c
  stable/10/contrib/file/src/funcs.c
  stable/10/contrib/file/src/magic.c
  stable/10/contrib/file/src/magic.h
  stable/10/contrib/file/src/print.c
  stable/10/contrib/file/src/readcdf.c
  stable/10/contrib/file/src/readelf.c
  stable/10/contrib/file/src/readelf.h
  stable/10/contrib/file/src/softmagic.c
  stable/10/lib/libmagic/Makefile
  stable/10/lib/libmagic/config.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/file/ChangeLog
==
--- stable/10/contrib/file/ChangeLogMon May  2 05:43:46 2016
(r298919)
+++ stable/10/contrib/file/ChangeLogMon May  2 05:46:47 2016
(r298920)
@@ -1,3 +1,49 @@
+2016-04-16  18:34  Christos Zoulas 
+   
+   * release 5.25
+
+2016-03-31  13:50  Christos Zoulas 
+
+   * make the number of bytes read from files configurable.
+
+2016-03-21  13:40  Christos Zoulas 

svn commit: r298889 - stable/10/usr.sbin/jail

[Jamie Gritton]

Author: jamie
Date: Sun May  1 16:49:32 2016
New Revision: 298889
URL: https://svnweb.freebsd.org/changeset/base/298889

Log:
  MFC r29: typo
  
  Submitted by: Jimmy Olgeni

Modified:
  stable/10/usr.sbin/jail/jail.8
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/jail/jail.8
==
--- stable/10/usr.sbin/jail/jail.8  Sun May  1 16:48:03 2016
(r29)
+++ stable/10/usr.sbin/jail/jail.8  Sun May  1 16:49:32 2016
(r298889)
@@ -653,7 +653,7 @@ its keys.
 If set to
 .Dq disable ,
 the jail cannot perform any sysvmsg-related system calls.
-.It Va sysvsem, sysvmsg
+.It Va sysvsem, sysvshm
 Allow access to SYSV IPC semaphore and shared memory primitives, in the
 same manner as
 .Va sysvmsg.
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"