emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync. BSD license change with FreeBSD upstream

Browse Source 
From upstream FreeBSD Subversion r165903:

  "Per Regents of the University of Calfornia letter,
   remove advertising clause."

This patch also includes the renumbering of the clauses, making
this codebase truly 3-clause BSD licensed.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson 2019-10-13 11:35:42 +02:00
parent ac718fe969
commit 290c11d0d9
2 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/syslog.c
View File

@ -1,20 +1,30 @@
/* /*
* Copyright (c) 1983, 1988 Regents of the University of California. * Copyright (c) 1983, 1988, 1993
* All rights reserved. * The Regents of the University of California. All rights reserved.
* *
* Redistribution and use in source and binary forms are permitted provided * Redistribution and use in source and binary forms, with or without
* that: (1) source distributions retain this entire copyright notice and * modification, are permitted provided that the following conditions
* comment, and (2) distributions including binaries display the following * are met:
* acknowledgement: ``This product includes software developed by the * 1. Redistributions of source code must retain the above copyright
* University of California, Berkeley and its contributors'' in the * notice, this list of conditions and the following disclaimer.
* documentation or other materials provided with the distribution and in * 2. Redistributions in binary form must reproduce the above copyright
* all advertising materials mentioning features or use of this software. * notice, this list of conditions and the following disclaimer in the
* Neither the name of the University nor the names of its contributors may * documentation and/or other materials provided with the distribution.
* be used to endorse or promote products derived from this software without * 3. Neither the name of the University nor the names of its contributors
* specific prior written permission. * may be used to endorse or promote products derived from this software
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED * without specific prior written permission.
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF *
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * 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.
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)

38
src/syslogd.c
View File

@ -1,18 +1,30 @@
/* /*
* Copyright (c) 1983, 1988 Regents of the University of California. * Copyright (c) 1983, 1988, 1993
* All rights reserved. * The Regents of the University of California. All rights reserved.
* *
* Redistribution and use in source and binary forms are permitted * Redistribution and use in source and binary forms, with or without
* provided that the above copyright notice and this paragraph are * modification, are permitted provided that the following conditions
* duplicated in all such forms and that any documentation, * are met:
* advertising materials, and other materials related to such * 1. Redistributions of source code must retain the above copyright
* distribution and use acknowledge that the software was developed * notice, this list of conditions and the following disclaimer.
* by the University of California, Berkeley. The name of the * 2. Redistributions in binary form must reproduce the above copyright
* University may not be used to endorse or promote products derived * notice, this list of conditions and the following disclaimer in the
* from this software without specific prior written permission. * documentation and/or other materials provided with the distribution.
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR * 3. Neither the name of the University nor the names of its contributors
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * may be used to endorse or promote products derived from this software
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * 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.
*/ */
#if !defined(lint) && !defined(NO_SCCS) #if !defined(lint) && !defined(NO_SCCS)