Patchwork [1/2] dnsmasq: bump to version 2.63

login
register
mail settings
Submitter Gustavo Zacarias
Date Sept. 4, 2012, 2:07 p.m.
Message ID <1346767658-7968-1-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/181572/
State Superseded
Headers show

Comments

Gustavo Zacarias - Sept. 4, 2012, 2:07 p.m.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/dnsmasq/dnsmasq.mk |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
Baruch Siach - Sept. 4, 2012, 6 p.m.
Hi Gustavo,

On Tue, Sep 04, 2012 at 11:07:37AM -0300, Gustavo Zacarias wrote:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/dnsmasq/dnsmasq.mk |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
> index 1f714bf..fc7333f 100644
> --- a/package/dnsmasq/dnsmasq.mk
> +++ b/package/dnsmasq/dnsmasq.mk
> @@ -4,11 +4,13 @@
>  #
>  #############################################################
>  
> -DNSMASQ_VERSION = 2.62
> +DNSMASQ_VERSION = 2.63
>  DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
>  DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)"
>  DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
>  DNSMASQ_MAKE_OPT += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
> +DNSMASQ_LICENSE = GPLv2 GPLv3

Looks confusing. Is it "either v2 or v3"? If so, then I think

DNSMASQ_LICENSE = Dual GPLv2/GPLv3

would be better.

baruch

> +DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
>  
>  ifneq ($(BR2_INET_IPV6),y)
>  	DNSMASQ_COPTS += -DNO_IPV6
Gustavo Zacarias - Sept. 4, 2012, 6:05 p.m.
On 09/04/12 15:00, Baruch Siach wrote:

>> +DNSMASQ_LICENSE = GPLv2 GPLv3
> 
> Looks confusing. Is it "either v2 or v3"? If so, then I think
> 
> DNSMASQ_LICENSE = Dual GPLv2/GPLv3
> 
> would be better.
> 
> baruch

Hi.
They specify (in not so clear terms) that you can choose one of them,
see CHANGELOG.archive line 2393.
I'm pretty short of sleep these days, "Dual" would be choose either or
both apply?
Regards.
Peter Korsgaard - Sept. 4, 2012, 8:01 p.m.
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

 >> +DNSMASQ_LICENSE = GPLv2 GPLv3

 Baruch> Looks confusing. Is it "either v2 or v3"? If so, then I think

 Baruch> DNSMASQ_LICENSE = Dual GPLv2/GPLv3

Or even GPLv2+
Baruch Siach - Sept. 5, 2012, 4 a.m.
Hi Peter,

On Tue, Sep 04, 2012 at 10:01:33PM +0200, Peter Korsgaard wrote:
> >>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> 
>  >> +DNSMASQ_LICENSE = GPLv2 GPLv3
> 
>  Baruch> Looks confusing. Is it "either v2 or v3"? If so, then I think
> 
>  Baruch> DNSMASQ_LICENSE = Dual GPLv2/GPLv3
> 
> Or even GPLv2+

The license text of Makefile, for example, is

#  This program is free software; you can redistribute it and/or modify
#  it under the terms of the GNU General Public License as published by
#  the Free Software Foundation; version 2 dated June, 1991, or
#  (at your option) version 3 dated 29 June, 2007.

Note that there is no "or later" in the license description. I guess this 
means "GPL v2 or v3 only".

baruch
Baruch Siach - Sept. 5, 2012, 4:03 a.m.
Hi Gustavo,

On Tue, Sep 04, 2012 at 03:05:01PM -0300, Gustavo Zacarias wrote:
> On 09/04/12 15:00, Baruch Siach wrote:
> 
> >> +DNSMASQ_LICENSE = GPLv2 GPLv3
> > 
> > Looks confusing. Is it "either v2 or v3"? If so, then I think
> > 
> > DNSMASQ_LICENSE = Dual GPLv2/GPLv3
> > 
> > would be better.
>
> They specify (in not so clear terms) that you can choose one of them,
> see CHANGELOG.archive line 2393.
> I'm pretty short of sleep these days, "Dual" would be choose either or
> both apply?

Well, IANAL, but as far as I know "Dual" means "choose either".

baruch

Patch

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 1f714bf..fc7333f 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -4,11 +4,13 @@ 
 #
 #############################################################
 
-DNSMASQ_VERSION = 2.62
+DNSMASQ_VERSION = 2.63
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)"
 DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
 DNSMASQ_MAKE_OPT += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
+DNSMASQ_LICENSE = GPLv2 GPLv3
+DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
 
 ifneq ($(BR2_INET_IPV6),y)
 	DNSMASQ_COPTS += -DNO_IPV6