svn commit: r207566 - stable/8/sbin/fsck_msdosfs

Mon May 3 12:39:29 UTC 2010

Author: kib
Date: Mon May  3 12:39:27 2010
New Revision: 207566
URL: http://svn.freebsd.org/changeset/base/207566

Log:
  MFC r203871:
  License changes from NetBSD.
  Move to 2 clause license, approved by Wolfgang Solfrank.

Modified:
  stable/8/sbin/fsck_msdosfs/boot.c
  stable/8/sbin/fsck_msdosfs/check.c
  stable/8/sbin/fsck_msdosfs/dir.c
  stable/8/sbin/fsck_msdosfs/dosfs.h
  stable/8/sbin/fsck_msdosfs/ext.h
  stable/8/sbin/fsck_msdosfs/fat.c
  stable/8/sbin/fsck_msdosfs/fsck_msdosfs.8
  stable/8/sbin/fsck_msdosfs/main.c
Directory Properties:
  stable/8/sbin/fsck_msdosfs/   (props changed)

Modified: stable/8/sbin/fsck_msdosfs/boot.c
==============================================================================

--- stable/8/sbin/fsck_msdosfs/boot.c	Mon May  3 12:37:33 2010	(r207565)
+++ stable/8/sbin/fsck_msdosfs/boot.c	Mon May  3 12:39:27 2010	(r207566)
@@ -10,13 +10,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 Martin Husemann
- *	and Wolfgang Solfrank.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Modified: stable/8/sbin/fsck_msdosfs/check.c
==============================================================================
--- stable/8/sbin/fsck_msdosfs/check.c	Mon May  3 12:37:33 2010	(r207565)
+++ stable/8/sbin/fsck_msdosfs/check.c	Mon May  3 12:39:27 2010	(r207566)
@@ -10,13 +10,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 Martin Husemann
- *	and Wolfgang Solfrank.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Modified: stable/8/sbin/fsck_msdosfs/dir.c
==============================================================================
--- stable/8/sbin/fsck_msdosfs/dir.c	Mon May  3 12:37:33 2010	(r207565)
+++ stable/8/sbin/fsck_msdosfs/dir.c	Mon May  3 12:39:27 2010	(r207566)
@@ -12,13 +12,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 Martin Husemann
- *	and Wolfgang Solfrank.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Modified: stable/8/sbin/fsck_msdosfs/dosfs.h
==============================================================================
--- stable/8/sbin/fsck_msdosfs/dosfs.h	Mon May  3 12:37:33 2010	(r207565)
+++ stable/8/sbin/fsck_msdosfs/dosfs.h	Mon May  3 12:39:27 2010	(r207566)
@@ -12,13 +12,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 Martin Husemann
- *	and Wolfgang Solfrank.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Modified: stable/8/sbin/fsck_msdosfs/ext.h
==============================================================================
--- stable/8/sbin/fsck_msdosfs/ext.h	Mon May  3 12:37:33 2010	(r207565)
+++ stable/8/sbin/fsck_msdosfs/ext.h	Mon May  3 12:39:27 2010	(r207566)
@@ -10,13 +10,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 Martin Husemann
- *	and Wolfgang Solfrank.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Modified: stable/8/sbin/fsck_msdosfs/fat.c
==============================================================================
--- stable/8/sbin/fsck_msdosfs/fat.c	Mon May  3 12:37:33 2010	(r207565)
+++ stable/8/sbin/fsck_msdosfs/fat.c	Mon May  3 12:39:27 2010	(r207566)
@@ -10,13 +10,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 Martin Husemann
- *	and Wolfgang Solfrank.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Modified: stable/8/sbin/fsck_msdosfs/fsck_msdosfs.8
==============================================================================
--- stable/8/sbin/fsck_msdosfs/fsck_msdosfs.8	Mon May  3 12:37:33 2010	(r207565)
+++ stable/8/sbin/fsck_msdosfs/fsck_msdosfs.8	Mon May  3 12:39:27 2010	(r207566)
@@ -11,13 +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 Martin Husemann
-.\"	and Wolfgang Solfrank.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Modified: stable/8/sbin/fsck_msdosfs/main.c
==============================================================================
--- stable/8/sbin/fsck_msdosfs/main.c	Mon May  3 12:37:33 2010	(r207565)
+++ stable/8/sbin/fsck_msdosfs/main.c	Mon May  3 12:39:27 2010	(r207566)
@@ -10,13 +10,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 Martin Husemann
- *	and Wolfgang Solfrank.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
