commit: c1ffc4f5eda1ed9f88972863e6fb8a1f7b91f183 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Thu Dec 4 08:55:45 2025 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Thu Dec 4 09:04:32 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1ffc4f5
licenses: Change OPENLDAP to a template This covers both versions 2.7 and 2.8 which have only one trivial difference in wording. Closes: https://bugs.gentoo.org/881665 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> licenses/OPENLDAP | 14 ++++++++++---- metadata/license-mapping.conf | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/licenses/OPENLDAP b/licenses/OPENLDAP index 65a3a21abf2a..a917e12f8aac 100644 --- a/licenses/OPENLDAP +++ b/licenses/OPENLDAP @@ -1,12 +1,12 @@ The OpenLDAP Public License - Version 2.7, 7 September 2001 + Version [2.7, 7 September 2001] {2.8, 17 August 2003} Redistribution and use of this software and associated documentation ("Software"), with or without modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain copyright statements - and notices, +1. Redistributions [of] {in} source [code] {form} must retain copyright + statements and notices, 2. Redistributions in binary form must reproduce applicable copyright statements and notices, this list of conditions, and the following @@ -42,6 +42,12 @@ copyright holders. OpenLDAP is a registered trademark of the OpenLDAP Foundation. -Copyright 1999-2001 The OpenLDAP Foundation, Redwood City, +Copyright [1999-2001] {1999-2003} The OpenLDAP Foundation, Redwood City, California, USA. All Rights Reserved. Permission to copy and distribute verbatim copies of this document is granted. + +--- + +Gentoo license note: Versions 2.7 and 2.8 of this license slightly +differ. Square brackets [like this] hold text that occurs in 2.7; +curly braces {like this} hold text that occurs in 2.8. diff --git a/metadata/license-mapping.conf b/metadata/license-mapping.conf index b37da09f5553..0413fd5051b5 100644 --- a/metadata/license-mapping.conf +++ b/metadata/license-mapping.conf @@ -181,6 +181,7 @@ OFL-1.0-RFN = OFL-1.0 OFL-1.1 = OFL-1.1 OFL-1.1-RFN = OFL-1.1 OLDAP-2.7 = OPENLDAP +OLDAP-2.8 = OPENLDAP OpenSSL = openssl OPUBL-1.0 = OPL OSL-1.1 = OSL-1.1
