CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr 14 09:02:33 UTC 2024

Modified Files:
        pkgsrc/mk: license.mk
        pkgsrc/pkgtools/pkg_install/files/lib: license.c

Log Message:
*: allow eupl-v1.2 by default, OSI approved


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 pkgsrc/mk/license.mk
cvs rdiff -u -r1.61 -r1.62 pkgsrc/pkgtools/pkg_install/files/lib/license.c

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.117 pkgsrc/mk/license.mk:1.118
--- pkgsrc/mk/license.mk:1.117  Tue Apr 18 15:47:10 2023
+++ pkgsrc/mk/license.mk        Sun Apr 14 09:02:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: license.mk,v 1.117 2023/04/18 15:47:10 wiz Exp $
+# $NetBSD: license.mk,v 1.118 2024/04/14 09:02:33 wiz Exp $
 #
 # This file handles everything about the LICENSE variable. It is
 # included automatically by bsd.pkg.mk.
@@ -138,6 +138,7 @@ DEFAULT_ACCEPTABLE_LICENSES= \
        cpl-1.0 \
        epl-v1.0 \
        eupl-v1.1 \
+       eupl-v1.2 \
        gfsl \
        gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 \
        gnu-gpl-v1 \

Index: pkgsrc/pkgtools/pkg_install/files/lib/license.c
diff -u pkgsrc/pkgtools/pkg_install/files/lib/license.c:1.61 pkgsrc/pkgtools/pkg_install/files/lib/license.c:1.62
--- pkgsrc/pkgtools/pkg_install/files/lib/license.c:1.61        Tue Apr 18 15:47:37 2023
+++ pkgsrc/pkgtools/pkg_install/files/lib/license.c     Sun Apr 14 09:02:33 2024
@@ -1,4 +1,4 @@
-/*     $NetBSD: license.c,v 1.61 2023/04/18 15:47:37 wiz Exp $ */
+/*     $NetBSD: license.c,v 1.62 2024/04/14 09:02:33 wiz Exp $ */
 
 /*-
  * Copyright (c) 2009 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
@@ -63,6 +63,7 @@ const char *default_acceptable_licenses 
     "cpl-1.0 "
     "epl-v1.0 "
     "eupl-v1.1 "
+    "eupl-v1.2 "
     "gfsl "
     "gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 "
     "gnu-gpl-v1 "