diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-08-02 23:28:38 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-08-02 23:28:38 +1000 |
commit | 06ef75bf0c2449ab4880f6ff40729497782e6e60 (patch) | |
tree | 0ef158bf3aeac04ad016acce2a0623d6548e9ad8 /LICENCE | |
parent | 019cefeaadc06a3664076cae10aedae4aed13911 (diff) |
- markus@cvs.openbsd.org 2003/07/29 18:24:00
[LICENCE progressmeter.c]
replace 4 clause BSD licensed progressmeter code with a replacement
from Nils Nordman and myself; ok deraadt@
(copied from OpenBSD an re-applied portable changes)
Diffstat (limited to 'LICENCE')
-rw-r--r-- | LICENCE | 44 |
1 files changed, 1 insertions, 43 deletions
@@ -166,48 +166,6 @@ OpenSSH contains no GPL code. | |||
166 | * SUCH DAMAGE. | 166 | * SUCH DAMAGE. |
167 | 167 | ||
168 | 6) | 168 | 6) |
169 | The progresssmeter code used by scp(1) and sftp(1) is copyright by | ||
170 | the NetBSD Foundation. | ||
171 | |||
172 | * Copyright (c) 1997-2003 The NetBSD Foundation, Inc. | ||
173 | * All rights reserved. | ||
174 | * | ||
175 | * This code is derived from software contributed to The NetBSD Foundation | ||
176 | * by Luke Mewburn. | ||
177 | * | ||
178 | * This code is derived from software contributed to The NetBSD Foundation | ||
179 | * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, | ||
180 | * NASA Ames Research Center. | ||
181 | * | ||
182 | * Redistribution and use in source and binary forms, with or without | ||
183 | * modification, are permitted provided that the following conditions | ||
184 | * are met: | ||
185 | * 1. Redistributions of source code must retain the above copyright | ||
186 | * notice, this list of conditions and the following disclaimer. | ||
187 | * 2. Redistributions in binary form must reproduce the above copyright | ||
188 | * notice, this list of conditions and the following disclaimer in the | ||
189 | * documentation and/or other materials provided with the distribution. | ||
190 | * 3. All advertising materials mentioning features or use of this software | ||
191 | * must display the following acknowledgement: | ||
192 | * This product includes software developed by the NetBSD | ||
193 | * Foundation, Inc. and its contributors. | ||
194 | * 4. Neither the name of The NetBSD Foundation nor the names of its | ||
195 | * contributors may be used to endorse or promote products derived | ||
196 | * from this software without specific prior written permission. | ||
197 | * | ||
198 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | ||
199 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | ||
200 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
201 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | ||
202 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
203 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
204 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
205 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
206 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
207 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
208 | * POSSIBILITY OF SUCH DAMAGE. | ||
209 | |||
210 | 7) | ||
211 | Remaining components of the software are provided under a standard | 169 | Remaining components of the software are provided under a standard |
212 | 2-term BSD licence with the following names as copyright holders: | 170 | 2-term BSD licence with the following names as copyright holders: |
213 | 171 | ||
@@ -370,4 +328,4 @@ OpenSSH contains no GPL code. | |||
370 | 328 | ||
371 | 329 | ||
372 | ------ | 330 | ------ |
373 | $OpenBSD: LICENCE,v 1.15 2003/06/12 12:22:47 djm Exp $ | 331 | $OpenBSD: LICENCE,v 1.16 2003/07/29 18:24:00 markus Exp $ |