CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Feb 10 21:35:01 UTC 2019

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

Log Message:
Revert previous for now.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/mk/license.mk
cvs rdiff -u -r1.53 -r1.54 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.96 pkgsrc/mk/license.mk:1.97
--- pkgsrc/mk/license.mk:1.96   Wed Feb  6 14:38:02 2019
+++ pkgsrc/mk/license.mk        Sun Feb 10 21:35:01 2019
@@ -1,11 +1,11 @@
-# $NetBSD: license.mk,v 1.96 2019/02/06 14:38:02 wiz Exp $
+# $NetBSD: license.mk,v 1.97 2019/02/10 21:35:01 wiz Exp $
 #
 # This file handles everything about the LICENSE variable. It is
 # included automatically by bsd.pkg.mk.
 #
 # XXX There should be one place to set the default list and for users
 # to set the ACCEPTABLE_LICENSES list, used by both source builds and
-# binary installs.
+# binary installs#
 #
 # XXX: Some of this content arguably belongs in the pkgsrc guide
 # instead.
@@ -79,11 +79,17 @@
 #      acceptability must be inferred from inclusion in main.
 #
 #      The board of The NetBSD Foundation is the final arbiter of
-#      which licenses may be in DEFAULT_ACCEPTABLE_LICENSES.
+#      which licenses may be in DEFAULT_ACCEPTABLE_LICENSES.  As an
+#      exception to the above policy on treating Free, Open Source,
+#      and DFSG licenses as acceptable, the board has decided that
+#      licenses that trigger obligations from use (rather than
+#      redistribution), such as the Affero GPL, should not be in
+#      DEFAULT_ACCEPTABLE_LICENSES.
 #
 #      Licenses not formally approved as Free or Open Source may be
-#      added if they have terms that would obviously be approved
-#      by FSF or OSI if the effort were made.  Such license
+#      added if they have terms that would 1) obviously be approved
+#      by FSF or OSI if the effort were made and 2) obviously not
+#      trigger the above issue with AGPL-type licenses.  Such license
 #      names will be in an additional section and have a comment near
 #      them in the assignment to DEFAULT_ACCEPTABLE_LICENSES.
 #
@@ -122,7 +128,6 @@ DEFAULT_ACCEPTABLE_LICENSES= \
        epl-v1.0 \
        eupl-v1.1 \
        gfsl \
-       gnu-agpl-v3 \
        gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 \
        gnu-gpl-v1 \
        gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 \

Index: pkgsrc/pkgtools/pkg_install/files/lib/license.c
diff -u pkgsrc/pkgtools/pkg_install/files/lib/license.c:1.53 pkgsrc/pkgtools/pkg_install/files/lib/license.c:1.54
--- pkgsrc/pkgtools/pkg_install/files/lib/license.c:1.53        Wed Feb  6 14:38:02 2019
+++ pkgsrc/pkgtools/pkg_install/files/lib/license.c     Sun Feb 10 21:35:01 2019
@@ -1,4 +1,4 @@
-/*     $NetBSD: license.c,v 1.53 2019/02/06 14:38:02 wiz Exp $ */
+/*     $NetBSD: license.c,v 1.54 2019/02/10 21:35:01 wiz Exp $ */
 
 /*-
  * Copyright (c) 2009 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
@@ -60,7 +60,6 @@ const char *default_acceptable_licenses 
     "epl-v1.0 "
     "eupl-v1.1 "
     "gfsl "
-    "gnu-agpl-v3 "
     "gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 "
     "gnu-gpl-v1 "
     "gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 "