svn commit: r314537 - head/usr.sbin/makefs/ffs

[Ed Maste]

Author: emaste
Date: Thu Mar  2 04:11:18 2017
New Revision: 314537
URL: https://svnweb.freebsd.org/changeset/base/314537

Log:
  makefs: remove clause 3 & 4 from Manuel Bouyer license
  
  ffs_bswap.c 1.34
  ufs_bswap.h 1.34
  
  Obtained from:	NetBSD
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/usr.sbin/makefs/ffs/ffs_bswap.c
  head/usr.sbin/makefs/ffs/ufs_bswap.h

Modified: head/usr.sbin/makefs/ffs/ffs_bswap.c
==============================================================================
--- head/usr.sbin/makefs/ffs/ffs_bswap.c	Thu Mar  2 04:08:14 2017	(r314536)
+++ head/usr.sbin/makefs/ffs/ffs_bswap.c	Thu Mar  2 04:11:18 2017	(r314537)
@@ -11,11 +11,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Manuel Bouyer.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Modified: head/usr.sbin/makefs/ffs/ufs_bswap.h
==============================================================================
--- head/usr.sbin/makefs/ffs/ufs_bswap.h	Thu Mar  2 04:08:14 2017	(r314536)
+++ head/usr.sbin/makefs/ffs/ufs_bswap.h	Thu Mar  2 04:11:18 2017	(r314537)
@@ -11,11 +11,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Manuel Bouyer.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES