dnsmasq: bump to version 2.63
PATCH 1/2 dnsmasq: bump to version 2.63
--- package/dnsmasq/dnsmasq.mk | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
package/dnsmasq/dnsmasq.mk +3 -1
@@ -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
Signature · 1 line
1.7.8.6
PATCH 2/2 php: bump to version 5.3.16
--- package/php/php.mk | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
package/php/php.mk +3 -1
@@ -4,12 +4,14 @@ # ############################################################# -PHP_VERSION = 5.3.15 +PHP_VERSION = 5.3.16 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2 PHP_SITE = http://www.php.net/distributions PHP_INSTALL_STAGING = YES PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install +PHP_LICENSE = PHP +PHP_LICENSE_FILES = LICENSE PHP_CONF_OPT = --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-all \
Signature · 1 line
1.7.8.6
PATCH 2/2 php: bump to version 5.3.16
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 dnsmasq: bump to version 2.63
In reply to Gustavo ZacariasHi Gustavo,
Quoted 10 lines · Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>--- package/dnsmasq/dnsmasq.mk | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)package/dnsmasq/dnsmasq.mk +0
-0
package/dnsmasq/dnsmasq.mk line 12
Quoted 10 lines
package/dnsmasq/dnsmasq.mk +2
-1@@ -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
Quoted 4 lines
package/dnsmasq/dnsmasq.mk +1
-0+DNSMASQ_LICENSE_FILES = COPYING COPYING-v3 ifneq ($(BR2_INET_IPV6),y) DNSMASQ_COPTS += -DNO_IPV6
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -PATCH 1/2 dnsmasq: bump to version 2.63
Quoted 9 lines · Baruch Siach
Quoted 1 line
+DNSMASQ_LICENSE = GPLv2 GPLv3
Looks confusing. Is it "either v2 or v3"? If so, then I think
DNSMASQ_LICENSE= Dual GPLv2/GPLv3would 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.
PATCH 1/2 dnsmasq: bump to version 2.63
Hi Gustavo,
Quoted 6 lines · Gustavo Zacarias
Quoted 4 lines · Baruch Siach
Quoted 1 line
+DNSMASQ_LICENSE = GPLv2 GPLv3
Looks confusing. Is it "either v2 or v3"? If so, then I think
Quoted 8 lines
Quoted 3 lines
DNSMASQ_LICENSE= Dual GPLv2/GPLv3would 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
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -PATCH 1/2 dnsmasq: bump to version 2.63
In reply to Baruch SiachQuoted 3 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Baruch" == Baruch Siach <[email protected]> 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+
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 dnsmasq: bump to version 2.63
Hi Peter,
Quoted 9 lines · Peter Korsgaard
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Baruch" == Baruch Siach <[email protected]> writes:
+DNSMASQ_LICENSE = GPLv2 GPLv3
Baruch> Looks confusing. Is it "either v2 or v3"? If so, then I think
Baruch>
DNSMASQ_LICENSE= Dual GPLv2/GPLv3Or 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
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -