aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/makefs
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2017-03-02 04:11:18 +0000
committerEd Maste <emaste@FreeBSD.org>2017-03-02 04:11:18 +0000
commit8c71aecd10ab59254e94bbc86c9202271df91d49 (patch)
tree4cfecf99be7e61c2f30f1eae01d16ec8978dcbc8 /usr.sbin/makefs
parent50c088a0063373e6b8461b8c267542ffcb291b64 (diff)
downloadsrc-8c71aecd10ab59254e94bbc86c9202271df91d49.tar.gz
src-8c71aecd10ab59254e94bbc86c9202271df91d49.zip
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
Notes
Notes: svn path=/head/; revision=314537
Diffstat (limited to 'usr.sbin/makefs')
-rw-r--r--usr.sbin/makefs/ffs/ffs_bswap.c5
-rw-r--r--usr.sbin/makefs/ffs/ufs_bswap.h5
2 files changed, 0 insertions, 10 deletions
diff --git a/usr.sbin/makefs/ffs/ffs_bswap.c b/usr.sbin/makefs/ffs/ffs_bswap.c
index d2f9fb16e5ba..8cf8c50e5167 100644
--- a/usr.sbin/makefs/ffs/ffs_bswap.c
+++ b/usr.sbin/makefs/ffs/ffs_bswap.c
@@ -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
diff --git a/usr.sbin/makefs/ffs/ufs_bswap.h b/usr.sbin/makefs/ffs/ufs_bswap.h
index 64b07b51053d..27667b5f6f58 100644
--- a/usr.sbin/makefs/ffs/ufs_bswap.h
+++ b/usr.sbin/makefs/ffs/ufs_bswap.h
@@ -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