[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Revert previous for now.
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Feb 10 21:35:01 2019 +0000
Revert previous for now.
mk/license.mk | 17 +++++++++++------
pkgtools/pkg_install/files/lib/license.c | 3 +--
2 files changed, 12 insertions(+), 8 deletions(-)
diffs (63 lines):
diff -r 37383669c7b9 -r 530ac5c14358 mk/license.mk
--- a/mk/license.mk Sun Feb 10 19:49:58 2019 +0000
+++ b/mk/license.mk Sun Feb 10 21:35:01 2019 +0000
@@ -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
@@ -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
# 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 @@
- gnu-agpl-v3 \
gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 \
gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 \
diff -r 37383669c7b9 -r 530ac5c14358 pkgtools/pkg_install/files/lib/license.c
--- a/pkgtools/pkg_install/files/lib/license.c Sun Feb 10 19:49:58 2019 +0000
+++ b/pkgtools/pkg_install/files/lib/license.c Sun Feb 10 21:35:01 2019 +0000
@@ -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 @@
- "gnu-agpl-v3 "
"gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 "
"gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 "
Main Index |
Thread Index |