svn commit: r267677 - stable/10/lib/libc/stdtime

[Pedro F. Giffuni]

Author: pfg
Date: Fri Jun 20 15:43:58 2014
New Revision: 267677
URL: http://svnweb.freebsd.org/changeset/base/267677

Log:
  MFC	r267544:
  
  Update license to strptime(3) implementation.
  
  Our strptime(3) implementation was the base for the illumos
  implementation and after contacting the author, Kevin Rudy
  stated the code is under a 2-Clause BSD License [1]
  
  After reviewing our local changes to the file in question,
  the FreeBSD Foundation has agreed that their contributions
  to this file are not required to carry clause 3 or 4 so
  the file can be relicensed as in Illumos [2].
  
  References:
  
  [1] https://www.illumos.org/issues/357
  [2] Illumos Revision:		13222:02526851ba75
  
  Approved:	core (jhb)
  Approved:	FreeBSD Foundation (emaste)

Modified:
  stable/10/lib/libc/stdtime/strptime.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/stdtime/strptime.c
==============================================================================
--- stable/10/lib/libc/stdtime/strptime.c	Fri Jun 20 15:40:13 2014	(r267676)
+++ stable/10/lib/libc/stdtime/strptime.c	Fri Jun 20 15:43:58 2014	(r267677)
@@ -1,25 +1,4 @@
-/*
- * Powerdog Industries kindly requests feedback from anyone modifying
- * this function:
- *
- * Date: Thu, 05 Jun 1997 23:17:17 -0400  
- * From: Kevin Ruddy <kevin.ruddy at powerdog.com>
- * To: James FitzGibbon <james at nexis.net>
- * Subject: Re: Use of your strptime(3) code (fwd)
- * 
- * The reason for the "no mod" clause was so that modifications would
- * come back and we could integrate them and reissue so that a wider 
- * audience could use it (thereby spreading the wealth).  This has   
- * made it possible to get strptime to work on many operating systems.
- * I'm not sure why that's "plain unacceptable" to the FreeBSD team.
- * 
- * Anyway, you can change it to "with or without modification" as
- * you see fit.  Enjoy.                                          
- * 
- * Kevin Ruddy
- * Powerdog Industries, Inc.
- */
-/*
+/*-
  * Copyright (c) 1994 Powerdog Industries.  All rights reserved.
  *
  * Copyright (c) 2011 The FreeBSD Foundation
@@ -36,12 +15,6 @@
  *    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 Powerdog Industries.
- * 4. The name of Powerdog Industries may not be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY POWERDOG INDUSTRIES ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -54,6 +27,10 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * official policies, either expressed or implied, of Powerdog Industries.
  */
 
 #include <sys/cdefs.h>