Re: initdb copyright notice - Mailing list pgsql-patches

I wrote:

> Rod Taylor wrote:
>
>> On Mon, 2003-11-17 at 14:11, Andrew Dunstan wrote:
>>
>>
>>> Neil Conway asked me if we need a copyright notice to cover the code I
>>> borrowed from FreeBSD in initdb.c. I wasn't sure, but in case we do
>>> here
>>> is a patch to include it.
>>>
>>
>>
>> Unless I'm mistaken, all of the FreeBSD code is under the 3 clause
>> license.
>>
>> However, the easiest way to find out is to look at the header of the
>> files that you borrowed code from.
>>
>> We don't want the 4 clause unless necessary.
>>
>
> I C&P'd this directly from the file in question:
>
> http://www.freebsd.org/cgi/cvsweb.cgi/src/bin/mkdir/mkdir.c?rev=1.27&content-type=text/x-cvsweb-markup
>
>
> Maybe the FreeBSD guys haven't updated all their notices correctly?
> This notice has been unchanged in this file since 1994.
>
http://www.freebsd.org/copyright/license.html shows they are indeed out
of date. Here's a patch with the advertising clause deleted from the notice.

cheers

andrew


Index: initdb.c
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/bin/initdb/initdb.c,v
retrieving revision 1.10
diff -c -w -r1.10 initdb.c
*** initdb.c    14 Nov 2003 18:32:34 -0000    1.10
--- initdb.c    17 Nov 2003 19:43:22 -0000
***************
*** 47,52 ****
--- 47,85 ----
   *-------------------------------------------------------------------------
   */

+ /*-------------------------------------------------------------------------
+  * The following copyright notice applies to the portions of the code
+  * borrowed from FreeBSD in the function mkdir_p():
+  *
+  * Copyright (c) 1983, 1992, 1993
+  *    The Regents of the University of California.  All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions
+  * are met:
+  * 1. Redistributions of source code must retain the above copyright
+  *    notice, this list of conditions and the following disclaimer.
+  * 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. 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND
+  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 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.
+  *-------------------------------------------------------------------------
+  */
+
  #include "postgres_fe.h"

  #include <dirent.h>