- 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)

1 files changed, 1 insertions, 43 deletions

diff --git a/LICENCE b/LICENCE
index 38edcecfe..fac74c6ef 100644
--- a/LICENCE
+++ b/LICENCE
@@ -166,48 +166,6 @@ OpenSSH contains no GPL code.
      * SUCH DAMAGE.
 
 6)
-    The progresssmeter code used by scp(1) and sftp(1) is copyright by
-    the NetBSD Foundation.
-
-     * Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
-     * All rights reserved.
-     *
-     * This code is derived from software contributed to The NetBSD Foundation
-     * by Luke Mewburn.
-     *
-     * This code is derived from software contributed to The NetBSD Foundation
-     * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
-     * NASA Ames Research Center.
-     *
-     * 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. All advertising materials mentioning features or use of this software
-     *    must display the following acknowledgement:
-     *	This product includes software developed by the NetBSD
-     *	Foundation, Inc. and its contributors.
-     * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
-
-7)
     Remaining components of the software are provided under a standard
     2-term BSD licence with the following names as copyright holders:
 
@@ -370,4 +328,4 @@ OpenSSH contains no GPL code.
 
 
 ------
-$OpenBSD: LICENCE,v 1.15 2003/06/12 12:22:47 djm Exp $
+$OpenBSD: LICENCE,v 1.16 2003/07/29 18:24:00 markus Exp $