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

2016-05-08 Thread Xin LI 
Author: delphij
Date: Sun May  8 18:09:30 2016
New Revision: 299236
URL: https://svnweb.freebsd.org/changeset/base/299236

Log:
  Revert r298920 until we have addressed all known regressions on head/ after
  settle.  file is now downgraded to 5.25.
  
  PR:   bin/209211
  Requested by: Tomoaki AOKI
  Relnotes: yes

Deleted:
  stable/10/contrib/file/magic/Magdir/bioinformatics
  stable/10/contrib/file/magic/Magdir/coff
  stable/10/contrib/file/magic/Magdir/der
  stable/10/contrib/file/magic/Magdir/finger
  stable/10/contrib/file/magic/Magdir/flif
  stable/10/contrib/file/magic/Magdir/microfocus
  stable/10/contrib/file/magic/Magdir/polyml
  stable/10/contrib/file/magic/Magdir/vacuum-cleaner
  stable/10/contrib/file/src/der.c
  stable/10/contrib/file/src/der.h
  stable/10/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/ChangeLogSun May  8 17:52:12 2016
(r299235)
+++ stable/10/contrib/file/ChangeLogSun May  8 18:09:30 2016
(r299236)
@@ -1,49 +1,3 @@
-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 
-
-   * Add bounds checks for DER code (discovered by Thomas Jarosch)
-   * Change indirect recursion limit to indirect use count and
- bump from 15 to 50 to prevent abuse.
-
-2016-03-13  20:39  Christos Zoulas 
-
-   * Add -00 which prints filename\0description\0
-
-2016-03-01  13:28  Christos Zoulas 
-
-   * Fix ID3 indirect parsing
-
-2016-01-19  10:18  Christos Zoulas 
-
-   * add DER parsing capability
-
-2015-11-13  10:35  Christos Zoulas 
-
-   * provide dprintf(3) for the OS's that don't have it.
-
-2015-11-11  16:25  Christos Zoulas 
-
-

svn commit: r299232 - stable/10/lib/libc/sys

2016-05-08 Thread Konstantin Belousov 
Author: kib
Date: Sun May  8 09:08:05 2016
New Revision: 299232
URL: https://svnweb.freebsd.org/changeset/base/299232

Log:
  MFC r298898:
  Explain NOTE_LINK reporting for the directories.

Modified:
  stable/10/lib/libc/sys/kqueue.2
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/sys/kqueue.2
==
--- stable/10/lib/libc/sys/kqueue.2 Sun May  8 09:06:52 2016
(r299231)
+++ stable/10/lib/libc/sys/kqueue.2 Sun May  8 09:08:05 2016
(r299232)
@@ -373,6 +373,10 @@ The file referenced by the descriptor wa
 The file referenced by the descriptor had its attributes changed.
 .It Dv NOTE_LINK
 The link count on the file changed.
+In particular, the
+.Dv NOTE_LINK
+event is reported if a subdirectory was created or deleted inside
+the directory referenced by the descriptor.
 .It Dv NOTE_RENAME
 The file referenced by the descriptor was renamed.
 .It Dv NOTE_REVOKE
___
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"

svn commit: r299231 - stable/10/sys/vm

2016-05-08 Thread Konstantin Belousov 
Author: kib
Date: Sun May  8 09:06:52 2016
New Revision: 299231
URL: https://svnweb.freebsd.org/changeset/base/299231

Log:
  MFC r298891:
  Avoid duplicated calls to pmap_page_get_memattr().
  Avoid logging inconsistency for the /dev/mem device.

Modified:
  stable/10/sys/vm/device_pager.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/vm/device_pager.c
==
--- stable/10/sys/vm/device_pager.c Sun May  8 09:02:51 2016
(r299230)
+++ stable/10/sys/vm/device_pager.c Sun May  8 09:06:52 2016
(r299231)
@@ -299,7 +299,7 @@ old_dev_pager_fault(vm_object_t object, 
struct cdevsw *csw;
struct file *fpop;
struct thread *td;
-   vm_memattr_t memattr;
+   vm_memattr_t memattr, memattr1;
int ref, ret;
 
pidx = OFF_TO_IDX(offset);
@@ -328,10 +328,18 @@ old_dev_pager_fault(vm_object_t object, 
 
/* If "paddr" is a real page, perform a sanity check on "memattr". */
if ((m_paddr = vm_phys_paddr_to_vm_page(paddr)) != NULL &&
-   pmap_page_get_memattr(m_paddr) != memattr) {
-   memattr = pmap_page_get_memattr(m_paddr);
-   printf(
-   "WARNING: A device driver has set \"memattr\" inconsistently.\n");
+   (memattr1 = pmap_page_get_memattr(m_paddr)) != memattr) {
+   /*
+* For the /dev/mem d_mmap routine to return the
+* correct memattr, pmap_page_get_memattr() needs to
+* be called, which we do there.
+*/
+   if ((csw->d_flags & D_MEM) == 0) {
+   printf("WARNING: Device driver %s has set "
+   "\"memattr\" inconsistently (drv %u pmap %u).\n",
+   csw->d_name, memattr, memattr1);
+   }
+   memattr = memattr1;
}
if (((*mres)->flags & PG_FICTITIOUS) != 0) {
/*
___
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"

svn commit: r299230 - in stable/10/sys: dev/firewire i386/bios sys

2016-05-08 Thread Konstantin Belousov 
Author: kib
Date: Sun May  8 09:02:51 2016
New Revision: 299230
URL: https://svnweb.freebsd.org/changeset/base/299230

Log:
  MFC r298890:
  Make it explicit that D_MEM cdevsw d_flag is to signify that the
  driver is (or behaves identically to) /dev/mem.  Remove the D_MEM flag
  from random drivers.

Modified:
  stable/10/sys/dev/firewire/fwdev.c
  stable/10/sys/i386/bios/smapi.c
  stable/10/sys/sys/conf.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/firewire/fwdev.c
==
--- stable/10/sys/dev/firewire/fwdev.c  Sun May  8 09:01:30 2016
(r299229)
+++ stable/10/sys/dev/firewire/fwdev.c  Sun May  8 09:02:51 2016
(r299230)
@@ -98,7 +98,6 @@ struct cdevsw firewire_cdevsw = {
.d_mmap =   fw_mmap,
.d_strategy =   fw_strategy,
.d_name =   "fw",
-   .d_flags =  D_MEM
 #else
 #define CDEV_MAJOR 127
fw_open, fw_close, fw_read, fw_write, fw_ioctl,

Modified: stable/10/sys/i386/bios/smapi.c
==
--- stable/10/sys/i386/bios/smapi.c Sun May  8 09:01:30 2016
(r299229)
+++ stable/10/sys/i386/bios/smapi.c Sun May  8 09:02:51 2016
(r299230)
@@ -80,7 +80,7 @@ static struct cdevsw smapi_cdevsw = {
.d_version =D_VERSION,
.d_ioctl =  smapi_ioctl,
.d_name =   "smapi",
-   .d_flags =  D_MEM | D_NEEDGIANT,
+   .d_flags =  D_NEEDGIANT,
 };
 
 static voidsmapi_identify(driver_t *, device_t);

Modified: stable/10/sys/sys/conf.h
==
--- stable/10/sys/sys/conf.hSun May  8 09:01:30 2016(r299229)
+++ stable/10/sys/sys/conf.hSun May  8 09:02:51 2016(r299230)
@@ -156,7 +156,7 @@ typedef int dumper_t(
 #defineD_TAPE  0x0001
 #defineD_DISK  0x0002
 #defineD_TTY   0x0004
-#defineD_MEM   0x0008
+#defineD_MEM   0x0008  /* /dev/(k)mem */
 
 #ifdef _KERNEL
 
___
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"