CVS commit: pkgsrc

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Thu Aug 15 02:43:58 UTC 2024

Modified Files:
        pkgsrc/mk: license.mk
        pkgsrc/pkgtools/pkg_install/files/lib: license.c version.h
Added Files:
        pkgsrc/licenses: upl-1.0

Log Message:
licenses/upl-1.0: Add Universal Permissive License (UPL) Version 1.0.

FSF-approved: https://www.gnu.org/licenses/license-list.html#UPL

   This is a lax, permissive non-copyleft free software license,
   compatible with the GNU GPL.  The license does provide the ability
   to license patents along with the software work, however, we still
   recommend the Apache 2.0 license for avoiding patent treachery when
   choosing to put your work under a lax license.

OSI-approved: https://opensource.org/license/upl

Text taken from: https://oss.oracle.com/licenses/upl/

Verified by wdiff(1) (wdiff-1.2.2nb1 from textproc/wdiff) to be
identical, other than in the quotation marks, to:

https://directory.fsf.org/wiki/License:UPL-1.0
https://opensource.org/license/upl

No objection on tech-pkg:

https://mail-index.netbsd.org/tech-pkg/2024/08/10/msg029762.html


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/licenses/upl-1.0
cvs rdiff -u -r1.120 -r1.121 pkgsrc/mk/license.mk
cvs rdiff -u -r1.64 -r1.65 pkgsrc/pkgtools/pkg_install/files/lib/license.c
cvs rdiff -u -r1.192 -r1.193 pkgsrc/pkgtools/pkg_install/files/lib/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/license.mk
diff -u pkgsrc/mk/license.mk:1.120 pkgsrc/mk/license.mk:1.121
--- pkgsrc/mk/license.mk:1.120  Fri Jun  7 12:26:10 2024
+++ pkgsrc/mk/license.mk        Thu Aug 15 02:43:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: license.mk,v 1.120 2024/06/07 12:26:10 micha Exp $
+# $NetBSD: license.mk,v 1.121 2024/08/15 02:43:58 riastradh Exp $
 #
 # This file handles everything about the LICENSE variable. It is
 # included automatically by bsd.pkg.mk.
@@ -177,6 +177,7 @@ DEFAULT_ACCEPTABLE_LICENSES= \
        unicode \
        unicode-v3 \
        unlicense \
+       upl-1.0 \
        vera-ttf-license \
        w3c \
        x11 \

Index: pkgsrc/pkgtools/pkg_install/files/lib/license.c
diff -u pkgsrc/pkgtools/pkg_install/files/lib/license.c:1.64 pkgsrc/pkgtools/pkg_install/files/lib/license.c:1.65
--- pkgsrc/pkgtools/pkg_install/files/lib/license.c:1.64        Fri Jun  7 12:26:10 2024
+++ pkgsrc/pkgtools/pkg_install/files/lib/license.c     Thu Aug 15 02:43:58 2024
@@ -1,4 +1,4 @@
-/*     $NetBSD: license.c,v 1.64 2024/06/07 12:26:10 micha Exp $       */
+/*     $NetBSD: license.c,v 1.65 2024/08/15 02:43:58 riastradh Exp $   */
 
 /*-
  * Copyright (c) 2009 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
@@ -102,6 +102,7 @@ const char *default_acceptable_licenses 
     "unicode "
     "unicode-v3 "
     "unlicense "
+    "upl-1.0 "
     "vera-ttf-license "
     "w3c "
     "x11 "

Index: pkgsrc/pkgtools/pkg_install/files/lib/version.h
diff -u pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.192 pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.193
--- pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.192       Thu Mar  7 12:27:28 2024
+++ pkgsrc/pkgtools/pkg_install/files/lib/version.h     Thu Aug 15 02:43:58 2024
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.192 2024/03/07 12:27:28 jperkin Exp $    */
+/*     $NetBSD: version.h,v 1.193 2024/08/15 02:43:58 riastradh Exp $  */
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -27,6 +27,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION 20240307
+#define PKGTOOLS_VERSION 20240810
 
 #endif /* _INST_LIB_VERSION_H_ */

Added files:

Index: pkgsrc/licenses/upl-1.0
diff -u /dev/null pkgsrc/licenses/upl-1.0:1.1
--- /dev/null   Thu Aug 15 02:43:58 2024
+++ pkgsrc/licenses/upl-1.0     Thu Aug 15 02:43:58 2024
@@ -0,0 +1,35 @@
+Copyright (c) [year] [copyright holders]
+
+The Universal Permissive License (UPL), Version 1.0
+
+Subject to the condition set forth below, permission is hereby granted to any
+person obtaining a copy of this software, associated documentation and/or data
+(collectively the "Software"), free of charge and under any and all copyright
+rights in the Software, and any and all patent rights owned or freely
+licensable by each licensor hereunder covering either (i) the unmodified
+Software as contributed to or provided by such licensor, or (ii) the Larger
+Works (as defined below), to deal in both
+
+(a) the Software, and
+(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+one is included with the Software (each a "Larger Work" to which the Software
+is contributed by such licensors),
+
+without restriction, including without limitation the rights to copy, create
+derivative works of, display, perform, and distribute the Software and make,
+use, sell, offer for sale, import, export, have made, and have sold the
+Software and the Larger Work(s), and to sublicense the foregoing rights on
+either these or other terms.
+
+This license is subject to the following condition:
+The above copyright notice and either this complete permission notice or at
+a minimum a reference to the UPL must be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.