| Message ID | 20161011125423.38125-1-Vincent.Riera@imgtec.com |
|---|---|
| State | Accepted |
| Commit | e662416d844040806a49a97c608aa674dcdd6580 |
| Headers | show |
>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes: > - With the release of BIND 9.11.0, ISC is changing the open source > license for BIND from the ISC license to the Mozilla Public License > (MPL 2.0). See release notes: > http://ftp.isc.org/isc/bind9/9.11.0/RELEASE-NOTES-bind-9.11.0.html > - Explicitly enable/disable zlib support, otherwise the configure script > will fail like this: > checking for zlib library... yes > checking for library containing deflate... no > configure: error: found zlib include but not library. Committed, thanks.
Hello, On Sat, 15 Oct 2016 11:46:52 +0200, Peter Korsgaard wrote: > > - With the release of BIND 9.11.0, ISC is changing the open source > > license for BIND from the ISC license to the Mozilla Public License > > (MPL 2.0). See release notes: > > http://ftp.isc.org/isc/bind9/9.11.0/RELEASE-NOTES-bind-9.11.0.html > > > - Explicitly enable/disable zlib support, otherwise the configure script > > will fail like this: > > > checking for zlib library... yes > > checking for library containing deflate... no > > configure: error: found zlib include but not library. > > Committed, thanks. Sorry I forgot to say it on the mailing list, but the license change is a bit weird. Indeed, there is still a COPYRIGHT file which contains the old license text. And this file is the one still referenced by the LICENSE_FILES variable. Then, there is a new file, called LICENSE, which really contains the MPL 2.0 license text. So: 1/ The LICENSE_FILES variable is now wrong. 2/ Upstream is very confusing with those two license files, and we should probably report that to them. It currently makes it very unclear if everything is under MPL2.0 or not. Best regards, Thomas
Hello, Regards, Vincent. On 15/10/16 12:05, Thomas Petazzoni wrote: > Hello, > > On Sat, 15 Oct 2016 11:46:52 +0200, Peter Korsgaard wrote: > >> > - With the release of BIND 9.11.0, ISC is changing the open source >> > license for BIND from the ISC license to the Mozilla Public License >> > (MPL 2.0). See release notes: >> > http://ftp.isc.org/isc/bind9/9.11.0/RELEASE-NOTES-bind-9.11.0.html >> >> > - Explicitly enable/disable zlib support, otherwise the configure script >> > will fail like this: >> >> > checking for zlib library... yes >> > checking for library containing deflate... no >> > configure: error: found zlib include but not library. >> >> Committed, thanks. > > Sorry I forgot to say it on the mailing list, but the license change is > a bit weird. Indeed, there is still a COPYRIGHT file which contains the > old license text. And this file is the one still referenced by the > LICENSE_FILES variable. that COPYRIGHT file doesn't contain the old license text. It has been updated since 9.10.4-P3 (previous version), and now it contains a text that specifies the license is MPL 2.0: -------------- $ ~/bind-9.11.0 $ head -n5 COPYRIGHT Copyright (C) 1996-2016 Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. -------------- Isn't that enough? Regards, Vincent > > Then, there is a new file, called LICENSE, which really contains the > MPL 2.0 license text. > > So: > > 1/ The LICENSE_FILES variable is now wrong. > > 2/ Upstream is very confusing with those two license files, and we > should probably report that to them. It currently makes it very > unclear if everything is under MPL2.0 or not. > > Best regards, > > Thomas >
Hello, On Sat, 15 Oct 2016 12:28:53 +0200, Vicente Olivert Riera wrote: > that COPYRIGHT file doesn't contain the old license text. It has been > updated since 9.10.4-P3 (previous version), and now it contains a text > that specifies the license is MPL 2.0: > > -------------- > $ ~/bind-9.11.0 $ head -n5 COPYRIGHT > > Copyright (C) 1996-2016 Internet Systems Consortium, Inc. ("ISC") > > This Source Code Form is subject to the terms of the Mozilla Public > License, v. 2.0. If a copy of the MPL was not distributed with this > file, You can obtain one at http://mozilla.org/MPL/2.0/. > -------------- > > Isn't that enough? Ah, right, I got confused by the string "ISC", which is also the name of a license, but here is the name of the organization. *However*, if you read this file, you see that parts of bind are not under MPL 2.0, but instead under some other BSD-like licenses, the OpenSSL license, etc. Shouldn't we take these into account as well ? Thomas
Hi Thomas, On 15/10/16 12:40, Thomas Petazzoni wrote: > Hello, > > On Sat, 15 Oct 2016 12:28:53 +0200, Vicente Olivert Riera wrote: > >> that COPYRIGHT file doesn't contain the old license text. It has been >> updated since 9.10.4-P3 (previous version), and now it contains a text >> that specifies the license is MPL 2.0: >> >> -------------- >> $ ~/bind-9.11.0 $ head -n5 COPYRIGHT >> >> Copyright (C) 1996-2016 Internet Systems Consortium, Inc. ("ISC") >> >> This Source Code Form is subject to the terms of the Mozilla Public >> License, v. 2.0. If a copy of the MPL was not distributed with this >> file, You can obtain one at http://mozilla.org/MPL/2.0/. >> -------------- >> >> Isn't that enough? > > Ah, right, I got confused by the string "ISC", which is also the name > of a license, but here is the name of the organization. > > *However*, if you read this file, you see that parts of bind are not > under MPL 2.0, but instead under some other BSD-like licenses, the > OpenSSL license, etc. Shouldn't we take these into account as well ? True, I'll send a patch to amend that. Thanks, Vincent > > Thomas >
diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 8acfda5..bc46604 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,2 +1,2 @@ -# Verified from ftp://ftp.isc.org/isc/bind9/9.10.4-P3/bind-9.10.4-P3.tar.gz.sha256.asc -sha256 a075e5ce89fddccb0e64d1777d59161387dd5151cf4e7d1a93875a487812baef bind-9.10.4-P3.tar.gz +# Verified from ftp://ftp.isc.org/isc/bind9/9.11.0/bind-9.11.0.tar.gz.sha256.asc +sha256 6f0b403036e0281b272a0fbdd0dc3417f3050b625cb059c5409432611418058b bind-9.11.0.tar.gz diff --git a/package/bind/bind.mk b/package/bind/bind.mk index e6bf204..cda9fed 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,13 +4,13 @@ # ################################################################################ -BIND_VERSION = 9.10.4-P3 +BIND_VERSION = 9.11.0 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) BIND_INSTALL_STAGING = YES BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh -BIND_LICENSE = ISC +BIND_LICENSE = MPLv2.0 BIND_LICENSE_FILES = COPYRIGHT BIND_TARGET_SERVER_SBIN = arpaname ddns-confgen dnssec-checkds dnssec-coverage BIND_TARGET_SERVER_SBIN += dnssec-importkey dnssec-keygen dnssec-revoke @@ -32,6 +32,13 @@ BIND_CONF_OPTS = \ --enable-rrl \ --enable-filter-aaaa +ifeq ($(BR2_PACKAGE_ZLIB),y) +BIND_CONF_OPTS += --with-zlib +BIND_DEPENDENCIES += zlib +else +BIND_CONF_OPTS += --without-zlib +endif + ifeq ($(BR2_PACKAGE_LIBCAP),y) BIND_CONF_OPTS += --enable-linux-caps BIND_DEPENDENCIES += libcap
- With the release of BIND 9.11.0, ISC is changing the open source license for BIND from the ISC license to the Mozilla Public License (MPL 2.0). See release notes: http://ftp.isc.org/isc/bind9/9.11.0/RELEASE-NOTES-bind-9.11.0.html - Explicitly enable/disable zlib support, otherwise the configure script will fail like this: checking for zlib library... yes checking for library containing deflate... no configure: error: found zlib include but not library. Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-)