Skip to contentSkip to conversation

c-ares: use LICENSE.md

PATCH New Fabrice Fontaine 3 participants 4 messages Dec 1, 2018 – Dec 3, 2018

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH 1/2 c-ares: use LICENSE.md

c-ares has a LICENSE.md file since version 1.12 and
https://github.com/c-ares/c-ares/commit/4e861351d9deaef7b78aee50ce9229325f4fc59a

So use it instead of one of the source file and add its hash

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/c-ares/c-ares.hash | 3 +++
 package/c-ares/c-ares.mk   | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)
package/c-ares/c-ares.hash +3 -0
index 832c4dfcfb..0c665574d8 100644
@@ -1,2 +1,5 @@
 # Locally calculated after checking pgp signature
 sha256 45d3c1fd29263ceec2afc8ff9cd06d5f8f889636eb4e80ce3cc7f0eaf7aadc6e c-ares-1.14.0.tar.gz
+
+# Hash for license file
+sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md
package/c-ares/c-ares.mk +1 -2
index 67254244a1..16536137a8 100644
@@ -11,7 +11,6 @@ C_ARES_CONF_OPTS = --with-random=/dev/urandom
 # Rebuild configure to avoid XC_CHECK_USER_CFLAGS
 C_ARES_AUTORECONF = YES
 C_ARES_LICENSE = MIT
-# No standalone, use some source file
-C_ARES_LICENSE_FILES = ares_mkquery.c
+C_ARES_LICENSE_FILES = LICENSE.md
 
 $(eval $(autotools-package))
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 c-ares: bump to version 1.15.0

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/c-ares/c-ares.hash | 2 +-
 package/c-ares/c-ares.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/c-ares/c-ares.hash +1 -1
index 0c665574d8..a3599aaa11 100644
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256 45d3c1fd29263ceec2afc8ff9cd06d5f8f889636eb4e80ce3cc7f0eaf7aadc6e c-ares-1.14.0.tar.gz
+sha256 6cdb97871f2930530c97deb7cf5c8fa4be5a0b02c7cea6e7c7667672a39d6852 c-ares-1.15.0.tar.gz
 
 # Hash for license file
 sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md
package/c-ares/c-ares.mk +1 -1
index 16536137a8..67cd659cb5 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-C_ARES_VERSION = 1.14.0
+C_ARES_VERSION = 1.15.0
 C_ARES_SITE = http://c-ares.haxx.se/download
 C_ARES_INSTALL_STAGING = YES
 C_ARES_CONF_OPTS = --with-random=/dev/urandom
Signature · 1 line
2.17.1
#2 lore raw

PATCH 1/2 c-ares: use LICENSE.md

In reply to Fabrice Fontaine

Hello,

Quoted 10 lines · Fabrice Fontaine

c-ares has a LICENSE.md file since version 1.12 and
https://github.com/c-ares/c-ares/commit/4e861351d9deaef7b78aee50ce9229325f4fc59a

So use it instead of one of the source file and add its hash

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/c-ares/c-ares.hash | 3 +++
 package/c-ares/c-ares.mk   | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

I'm not sure why you submitted this patch for next. This kind of fix/improvement is definitely welcome in master, so I applied it to the master branch. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/2 c-ares: use LICENSE.md

In reply to Fabrice Fontaine
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

c-ares has a LICENSE.md file since version 1.12 and
https://github.com/c-ares/c-ares/commit/4e861351d9deaef7b78aee50ce9229325f4fc59a

So use it instead of one of the source file and add its hash

Signed-off-by Fabrice Fontaine <[email protected]>

Committed to 2018.02.x and 2018.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard