From bf628b479002da7b14b74f8a3778fd25f677b253 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 29 Jul 2016 17:47:01 -0400 Subject: [PATCH] LibHTTPd: Remove license, it's just the BSD 2-Clause. Also fix reference to now-removed MkDepend license and replace it with MIT. --- data/system/data/licenses/LibHTTPd | 25 ------------------------- src/apps/aboutsystem/AboutSystem.cpp | 4 ++-- 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 data/system/data/licenses/LibHTTPd diff --git a/data/system/data/licenses/LibHTTPd b/data/system/data/licenses/LibHTTPd deleted file mode 100644 index ee6d68091d..0000000000 --- a/data/system/data/licenses/LibHTTPd +++ /dev/null @@ -1,25 +0,0 @@ -/* -** Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer . -** All rights reserved. -** -** 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. -** -** THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. -*/ diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp index d8607dbaa9..4aea876130 100644 --- a/src/apps/aboutsystem/AboutSystem.cpp +++ b/src/apps/aboutsystem/AboutSystem.cpp @@ -1326,14 +1326,14 @@ AboutView::_CreateCreditsView() _AddPackageCredit(PackageCredit("MkDepend") .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1995-2001 Lars Düning. " "All rights reserved.")) - .SetLicense("MkDepend") + .SetLicense("MIT") .SetURL("http://bearnip.com/lars/be")); // libhttpd copyright (used as Poorman backend) _AddPackageCredit(PackageCredit("libhttpd") .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1995, 1998-2001 " "Jef Poskanzer. All rights reserved.")) - .SetLicense("LibHTTPd") + .SetLicense(kBSDTwoClause) .SetURL("http://www.acme.com/software/thttpd/")); #ifdef __INTEL__