svn commit: r283201 - in head: include lib/libc/gen

[Baptiste Daroussin]

Author: bapt
Date: Thu May 21 08:38:25 2015
New Revision: 283201
URL: https://svnweb.freebsd.org/changeset/base/283201

Log:
  Remove clause 3 and 4 from the license
  
  Obtained from:	NetBSD

Modified:
  head/include/stringlist.h
  head/lib/libc/gen/stringlist.c

Modified: head/include/stringlist.h
==============================================================================
--- head/include/stringlist.h	Thu May 21 08:32:52 2015	(r283200)
+++ head/include/stringlist.h	Thu May 21 08:38:25 2015	(r283201)
@@ -12,11 +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 Christos Zoulas.
- * 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

Modified: head/lib/libc/gen/stringlist.c
==============================================================================
--- head/lib/libc/gen/stringlist.c	Thu May 21 08:32:52 2015	(r283200)
+++ head/lib/libc/gen/stringlist.c	Thu May 21 08:38:25 2015	(r283201)
@@ -10,8 +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.
- * 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