From 2fbee01e17c0297af32f6c4df67debad35b8d5b5 Mon Sep 17 00:00:00 2001 From: David Adam Date: Thu, 25 May 2023 21:06:48 +0800 Subject: [PATCH] Licensing: update the OpenBSD license details The strlcpy/wcslcpy function is long gone. --- debian/copyright | 7 ++----- doc_src/license.rst | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/debian/copyright b/debian/copyright index e15b08863..21f375dd5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -68,11 +68,8 @@ license. Copyright © 1997-2015 University of Cambridge. ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Fish also contains small amounts of code under the OpenBSD license, namely a -version of the function strlcpy, modified for use with wide character strings. -This code is copyrighted by Todd C. Miller (1998). It also contains code from -tmux, copyrighted by Nicholas Marriott (2007), and -made available under an identical license. +Fish contains code from tmux, copyrighted by Nicholas Marriott + (2007), and made available under the OpenBSD license. Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/doc_src/license.rst b/doc_src/license.rst index 80f863529..72f7d08fa 100644 --- a/doc_src/license.rst +++ b/doc_src/license.rst @@ -219,9 +219,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---- -**License for wcslcpy and code derived from tmux** +**License for code derived from tmux** -``fish`` also contains small amounts of code under the OpenBSD license, namely a version of the function strlcpy, modified for use with wide character strings. This code is copyrighted by Todd C. Miller (1998). It also contains code from [tmux](http://tmux.sourceforge.net), copyrighted by Nicholas Marriott (2007), and made available under an identical license. +``fish`` contains code from [tmux](http://tmux.sourceforge.net), copyrighted by Nicholas Marriott (2007), and made available under the OpenBSD license. The OpenBSD license is included below.