diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | LICENCE | 128 |
2 files changed, 130 insertions, 1 deletions
@@ -1,4 +1,5 @@ | |||
1 | 20030611 | 1 | 20030611 |
2 | - (djm) Mention portable copyright holders in LICENSE | ||
2 | - (djm) Sync LICENSE against OpenBSD | 3 | - (djm) Sync LICENSE against OpenBSD |
3 | - (djm) OpenBSD CVS Sync | 4 | - (djm) OpenBSD CVS Sync |
4 | - jmc@cvs.openbsd.org 2003/06/10 09:12:11 | 5 | - jmc@cvs.openbsd.org 2003/06/10 09:12:11 |
@@ -507,4 +508,4 @@ | |||
507 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 508 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
508 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 509 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
509 | 510 | ||
510 | $Id: ChangeLog,v 1.2798 2003/06/11 12:08:36 djm Exp $ | 511 | $Id: ChangeLog,v 1.2799 2003/06/11 12:50:56 djm Exp $ |
@@ -220,6 +220,30 @@ OpenSSH contains no GPL code. | |||
220 | Kevin Steves | 220 | Kevin Steves |
221 | Daniel Kouril | 221 | Daniel Kouril |
222 | Per Allansson | 222 | Per Allansson |
223 | Wesley Griffin | ||
224 | Per Allansson | ||
225 | Nils Nordman | ||
226 | |||
227 | Portable OpenSSH additionally includes code from the following copyright | ||
228 | holders, also under the 2-term BSD license: | ||
229 | |||
230 | Ben Lindstrom | ||
231 | Tim Rice | ||
232 | Andre Lucas | ||
233 | Chris Adams | ||
234 | Corinna Vinschen | ||
235 | Cray Inc. | ||
236 | Denis Parker | ||
237 | Gert Doering | ||
238 | Jakob Schlyter | ||
239 | Jason Downs | ||
240 | Juha Yrjölä | ||
241 | Michael Stone | ||
242 | Networks Associates Technology, Inc. | ||
243 | Solar Designer | ||
244 | Todd C. Miller | ||
245 | Wayne Schroeder | ||
246 | William Jones | ||
223 | 247 | ||
224 | * Redistribution and use in source and binary forms, with or without | 248 | * Redistribution and use in source and binary forms, with or without |
225 | * modification, are permitted provided that the following conditions | 249 | * modification, are permitted provided that the following conditions |
@@ -241,5 +265,109 @@ OpenSSH contains no GPL code. | |||
241 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 265 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
242 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 266 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
243 | 267 | ||
268 | 8) Portable OpenSSH contains the following additional licenses: | ||
269 | |||
270 | a) md5crypt.c, md5crypt.h | ||
271 | |||
272 | * "THE BEER-WARE LICENSE" (Revision 42): | ||
273 | * <phk@login.dknet.dk> wrote this file. As long as you retain this | ||
274 | * notice you can do whatever you want with this stuff. If we meet | ||
275 | * some day, and you think this stuff is worth it, you can buy me a | ||
276 | * beer in return. Poul-Henning Kamp | ||
277 | |||
278 | b) snprintf replacement | ||
279 | |||
280 | * Copyright Patrick Powell 1995 | ||
281 | * This code is based on code written by Patrick Powell | ||
282 | * (papowell@astart.com) It may be used for any purpose as long as this | ||
283 | * notice remains intact on all source code distributions | ||
284 | |||
285 | c) Compatibility code (openbsd-compat) | ||
286 | |||
287 | Apart from the previously mentioned licenses, various pieces of code | ||
288 | in the openbsd-compat/ subdirectory are licensed as follows: | ||
289 | |||
290 | Some code is licensed under a 3-term BSD license, to the following | ||
291 | copyright holders: | ||
292 | |||
293 | Todd C. Miller | ||
294 | Theo de Raadt | ||
295 | Damien Miller | ||
296 | Eric P. Allman | ||
297 | The Regents of the University of California | ||
298 | |||
299 | * Redistribution and use in source and binary forms, with or without | ||
300 | * modification, are permitted provided that the following conditions | ||
301 | * are met: | ||
302 | * 1. Redistributions of source code must retain the above copyright | ||
303 | * notice, this list of conditions and the following disclaimer. | ||
304 | * 2. Redistributions in binary form must reproduce the above copyright | ||
305 | * notice, this list of conditions and the following disclaimer in the | ||
306 | * documentation and/or other materials provided with the distribution. | ||
307 | * 3. Neither the name of the University nor the names of its contributors | ||
308 | * may be used to endorse or promote products derived from this software | ||
309 | * without specific prior written permission. | ||
310 | * | ||
311 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND | ||
312 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
313 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
314 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | ||
315 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
316 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
317 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
318 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
319 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
320 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
321 | * SUCH DAMAGE. | ||
322 | |||
323 | Some code is licensed under an ISC-style license, to the following | ||
324 | copyright holders: | ||
325 | |||
326 | Internet Software Consortium. | ||
327 | Todd C. Miller | ||
328 | |||
329 | * Permission to use, copy, modify, and distribute this software for any | ||
330 | * purpose with or without fee is hereby granted, provided that the above | ||
331 | * copyright notice and this permission notice appear in all copies. | ||
332 | * | ||
333 | * THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL | ||
334 | * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES | ||
335 | * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE | ||
336 | * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
337 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION | ||
338 | * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN | ||
339 | * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
340 | |||
341 | Some code is licensed under a MIT-style license to the following | ||
342 | copyright holders: | ||
343 | |||
344 | Free Software Foundation, Inc. | ||
345 | |||
346 | * Permission is hereby granted, free of charge, to any person obtaining a * | ||
347 | * copy of this software and associated documentation files (the * | ||
348 | * "Software"), to deal in the Software without restriction, including * | ||
349 | * without limitation the rights to use, copy, modify, merge, publish, * | ||
350 | * distribute, distribute with modifications, sublicense, and/or sell * | ||
351 | * copies of the Software, and to permit persons to whom the Software is * | ||
352 | * furnished to do so, subject to the following conditions: * | ||
353 | * * | ||
354 | * The above copyright notice and this permission notice shall be included * | ||
355 | * in all copies or substantial portions of the Software. * | ||
356 | * * | ||
357 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * | ||
358 | * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * | ||
359 | * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * | ||
360 | * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * | ||
361 | * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * | ||
362 | * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * | ||
363 | * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * | ||
364 | * * | ||
365 | * Except as contained in this notice, the name(s) of the above copyright * | ||
366 | * holders shall not be used in advertising or otherwise to promote the * | ||
367 | * sale, use or other dealings in this Software without prior written * | ||
368 | * authorization. * | ||
369 | ****************************************************************************/ | ||
370 | |||
371 | |||
244 | ------ | 372 | ------ |
245 | $OpenBSD: LICENCE,v 1.14 2003/06/11 11:23:07 djm Exp $ | 373 | $OpenBSD: LICENCE,v 1.14 2003/06/11 11:23:07 djm Exp $ |