[Buildroot] [PATCH 1/3] package/c-ares: security bump to version 1.17.2

[Buildroot] [PATCH 1/3] package/c-ares: security bump to version 1.17.2

[Fabrice Fontaine]

- NodeJS passes NULL for addr and 0 for addrlen to
  ares_parse_ptr_reply() on systems where malloc(0) returns NULL. This
  would cause a crash.
- If ares_getaddrinfo() was terminated by an ares_destroy(), it would
  cause a crash
- Crash in sortaddrinfo() if the list size equals 0 due to an unexpected
  DNS response
- Expand number of escaped characters in DNS replies as per RFC1035 5.1
  to prevent spoofing follow-up
- Perform validation on hostnames to prevent possible XSS due to
  applications not performing valiation themselves

https://c-ares.haxx.se/changelog.html#1_17_2

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/c-ares/c-ares.hash | 2 +-
 package/c-ares/c-ares.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash
index 235b7dbc66..28657645df 100644
--- a/package/c-ares/c-ares.hash
+++ b/package/c-ares/c-ares.hash
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256  d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40  c-ares-1.17.1.tar.gz
+sha256  4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d  c-ares-1.17.2.tar.gz
 
 # Hash for license file
 sha256  db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c  LICENSE.md
diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk
index 8f200237cf..3a7c6e0298 100644
--- a/package/c-ares/c-ares.mk
+++ b/package/c-ares/c-ares.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-C_ARES_VERSION = 1.17.1
+C_ARES_VERSION = 1.17.2
 C_ARES_SITE = http://c-ares.haxx.se/download
 C_ARES_INSTALL_STAGING = YES
 C_ARES_CONF_OPTS = --with-random=/dev/urandom
-- 
2.32.0

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/3] package/c-ares: fix build with latest nodejs

[Fabrice Fontaine]

Fix the following build failure with nodejs raised since bump to version
12.22.5 in commit 7038b029d8c8774eca6d7888d6642d7e84ff5165:

../src/cares_wrap.cc:42:11: fatal error: ares_nameser.h: No such file or directory
   42 | # include <ares_nameser.h>
      |           ^~~~~~~~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/a0f867d5e765fc1aa052de5e53ed350b3b20743f

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...ares_nameser-h-as-a-public-interface.patch | 170 ++++++++++++++++++
 package/c-ares/c-ares.mk                      |   2 +
 2 files changed, 172 insertions(+)
 create mode 100644 package/c-ares/0001-Provide-ares_nameser-h-as-a-public-interface.patch

diff --git a/package/c-ares/0001-Provide-ares_nameser-h-as-a-public-interface.patch b/package/c-ares/0001-Provide-ares_nameser-h-as-a-public-interface.patch
new file mode 100644
index 0000000000..c3ae3daa8d
--- /dev/null
+++ b/package/c-ares/0001-Provide-ares_nameser-h-as-a-public-interface.patch
@@ -0,0 +1,170 @@
+From 7712fcd17847998cf1ee3071284ec50c5b3c1978 Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars@archlinux.org>
+Date: Wed, 18 Aug 2021 01:32:44 +0800
+Subject: [PATCH] Provide ares_nameser.h as a public interface (#417)
+
+NodeJS needs ares_nameser.h as a pubic header.
+
+Fixes: #415
+Fix By: Felix Yan (@felixonmars)
+
+[Retrieved from:
+https://github.com/c-ares/c-ares/commit/7712fcd17847998cf1ee3071284ec50c5b3c1978]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ CMakeLists.txt                      |  6 ++++++
+ configure.ac                        | 14 ++++++++++++++
+ include/CMakeLists.txt              |  2 +-
+ include/Makefile.am                 |  2 +-
+ include/ares_build.h.cmake          |  2 ++
+ include/ares_build.h.in             |  3 +++
+ {src/lib => include}/ares_nameser.h | 10 ++++++----
+ src/lib/Makefile.inc                |  1 -
+ 8 files changed, 33 insertions(+), 7 deletions(-)
+ rename {src/lib => include}/ares_nameser.h (98%)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3f42d145..28f8e01a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -557,6 +557,12 @@ ENDIF()
+ IF (HAVE_WINDOWS_H)
+ 	SET (CARES_HAVE_WINDOWS_H 1)
+ ENDIF()
++IF (HAVE_ARPA_NAMESER_H)
++	SET (CARES_HAVE_ARPA_NAMESER_H 1)
++ENDIF()
++IF (HAVE_ARPA_NAMESER_COMPAT_H)
++	SET (CARES_HAVE_ARPA_NAMESER_COMPAT_H 1)
++ENDIF()
+ 
+ # Record toplevel CMakeLists.txt path
+ set(CARES_TOPLEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+diff --git a/configure.ac b/configure.ac
+index c21b8ff3..1ba8a8ec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -547,6 +547,20 @@ dnl *Sigh* these are needed in order for net/if.h to get properly detected.
+ ]
+ )
+ 
++dnl Test and set CARES_HAVE_ARPA_NAMESER_H / CARES_HAVE_ARPA_NAMESER_COMPAT_H
++AC_CHECK_DECL([HAVE_ARPA_NAMESER_H],
++[
++CARES_DEFINE_UNQUOTED([CARES_HAVE_ARPA_NAMESER_H])
++],
++[]
++)
++AC_CHECK_DECL([HAVE_ARPA_NAMESER_COMPAT_H],
++[
++CARES_DEFINE_UNQUOTED([CARES_HAVE_ARPA_NAMESER_COMPAT_H])
++],
++[]
++)
++
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_TYPE_SIZE_T
+diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
+index 439e7bb2..3321956d 100644
+--- a/include/CMakeLists.txt
++++ b/include/CMakeLists.txt
+@@ -3,6 +3,6 @@ CONFIGURE_FILE (ares_build.h.cmake ${PROJECT_BINARY_DIR}/ares_build.h)
+ 
+ # Headers installation target
+ IF (CARES_INSTALL)
+-	SET (CARES_HEADERS ares.h ares_version.h "${PROJECT_BINARY_DIR}/ares_build.h" ares_rules.h ares_dns.h)
++	SET (CARES_HEADERS ares.h ares_version.h "${PROJECT_BINARY_DIR}/ares_build.h" ares_rules.h ares_dns.h ares_nameser.h)
+ 	INSTALL (FILES ${CARES_HEADERS} COMPONENT Devel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ ENDIF ()
+diff --git a/include/Makefile.am b/include/Makefile.am
+index 125a686a..d208bece 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -2,6 +2,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc 1.9.6
+ ACLOCAL_AMFLAGS = -I m4 --install
+ 
+ # what headers to install on 'make install':
+-include_HEADERS = ares.h ares_version.h ares_build.h ares_rules.h ares_dns.h
++include_HEADERS = ares.h ares_version.h ares_build.h ares_rules.h ares_dns.h ares_nameser.h
+ 
+ EXTRA_DIST = ares_build.h.cmake ares_build.h.in ares_build.h.dist CMakeLists.txt
+diff --git a/include/ares_build.h.cmake b/include/ares_build.h.cmake
+index ac32d47f..e847f17e 100644
+--- a/include/ares_build.h.cmake
++++ b/include/ares_build.h.cmake
+@@ -13,6 +13,8 @@
+ #cmakedefine CARES_HAVE_WS2TCPIP_H
+ #cmakedefine CARES_HAVE_WINSOCK2_H
+ #cmakedefine CARES_HAVE_WINDOWS_H
++#cmakedefine CARES_HAVE_ARPA_NAMESER_H
++#cmakedefine CARES_HAVE_ARPA_NAMESER_COMPAT_H
+ 
+ #ifdef CARES_HAVE_SYS_TYPES_H
+ #  include <sys/types.h>
+diff --git a/include/ares_build.h.in b/include/ares_build.h.in
+index 24e3a989..20fd28a0 100644
+--- a/include/ares_build.h.in
++++ b/include/ares_build.h.in
+@@ -55,6 +55,9 @@
+    Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined
+ #endif
+ 
++#undef CARES_HAVE_ARPA_NAMESER_H
++#undef CARES_HAVE_ARPA_NAMESER_COMPAT_H
++
+ /* ================================================================ */
+ /*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
+ /* ================================================================ */
+diff --git a/src/lib/ares_nameser.h b/include/ares_nameser.h
+similarity index 98%
+rename from src/lib/ares_nameser.h
+rename to include/ares_nameser.h
+index 65aebcc1..18a9e5ac 100644
+--- a/src/lib/ares_nameser.h
++++ b/include/ares_nameser.h
+@@ -2,10 +2,12 @@
+ #ifndef ARES_NAMESER_H
+ #define ARES_NAMESER_H
+ 
+-#ifdef HAVE_ARPA_NAMESER_H
++#include "ares_build.h"
++
++#ifdef CARES_HAVE_ARPA_NAMESER_H
+ #  include <arpa/nameser.h>
+ #endif
+-#ifdef HAVE_ARPA_NAMESER_COMPAT_H
++#ifdef CARES_HAVE_ARPA_NAMESER_COMPAT_H
+ #  include <arpa/nameser_compat.h>
+ #endif
+ 
+@@ -68,7 +70,7 @@
+  * provide them
+  * ============================================================================
+  */
+-#ifndef HAVE_ARPA_NAMESER_H
++#ifndef CARES_HAVE_ARPA_NAMESER_H
+ 
+ typedef enum __ns_class {
+     ns_c_invalid = 0,       /* Cookie. */
+@@ -173,7 +175,7 @@ typedef enum __ns_rcode {
+     ns_r_badtime = 18
+ } ns_rcode;
+ 
+-#endif /* HAVE_ARPA_NAMESER_H */
++#endif /* CARES_HAVE_ARPA_NAMESER_H */
+ 
+ 
+ /* ============================================================================
+diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
+index 7426c3de..47bc8cdd 100644
+--- a/src/lib/Makefile.inc
++++ b/src/lib/Makefile.inc
+@@ -73,7 +73,6 @@ HHEADERS = ares_android.h                        \
+   ares_strsplit.h			\
+   ares_writev.h				\
+   bitncmp.h				\
+-  ares_nameser.h			\
+   ares_setup.h				\
+   setup_once.h
+ 
diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk
index 3a7c6e0298..761aa73280 100644
--- a/package/c-ares/c-ares.mk
+++ b/package/c-ares/c-ares.mk
@@ -10,6 +10,8 @@ C_ARES_INSTALL_STAGING = YES
 C_ARES_CONF_OPTS = --with-random=/dev/urandom
 C_ARES_LICENSE = MIT
 C_ARES_LICENSE_FILES = LICENSE.md
+# We're patching configure.ac
+C_ARES_AUTORECONF = YES
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-- 
2.32.0

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [PATCH 3/3] package/c-ares: add C_ARES_CPE_ID_VENDOR

[Fabrice Fontaine]

cpe:2.3:a:c-ares_project:c-ares is a valid CPE identifier for this
package:

  https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Ac-ares_project%3Ac-ares

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/c-ares/c-ares.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk
index 761aa73280..71bfa110a1 100644
--- a/package/c-ares/c-ares.mk
+++ b/package/c-ares/c-ares.mk
@@ -10,6 +10,7 @@ C_ARES_INSTALL_STAGING = YES
 C_ARES_CONF_OPTS = --with-random=/dev/urandom
 C_ARES_LICENSE = MIT
 C_ARES_LICENSE_FILES = LICENSE.md
+C_ARES_CPE_ID_VENDOR = c-ares_project
 # We're patching configure.ac
 C_ARES_AUTORECONF = YES
 
-- 
2.32.0

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/3] package/c-ares: security bump to version 1.17.2

[Yann E. MORIN]

Fabrice, All,

On 2021-08-28 17:06 +0200, Fabrice Fontaine spake thusly:
> - NodeJS passes NULL for addr and 0 for addrlen to
>   ares_parse_ptr_reply() on systems where malloc(0) returns NULL. This
>   would cause a crash.
> - If ares_getaddrinfo() was terminated by an ares_destroy(), it would
>   cause a crash
> - Crash in sortaddrinfo() if the list size equals 0 due to an unexpected
>   DNS response
> - Expand number of escaped characters in DNS replies as per RFC1035 5.1
>   to prevent spoofing follow-up
> - Perform validation on hostnames to prevent possible XSS due to
>   applications not performing valiation themselves
> 
> https://c-ares.haxx.se/changelog.html#1_17_2
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/c-ares/c-ares.hash | 2 +-
>  package/c-ares/c-ares.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash
> index 235b7dbc66..28657645df 100644
> --- a/package/c-ares/c-ares.hash
> +++ b/package/c-ares/c-ares.hash
> @@ -1,5 +1,5 @@
>  # Locally calculated after checking pgp signature
> -sha256  d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40  c-ares-1.17.1.tar.gz
> +sha256  4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d  c-ares-1.17.2.tar.gz
>  
>  # Hash for license file
>  sha256  db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c  LICENSE.md
> diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk
> index 8f200237cf..3a7c6e0298 100644
> --- a/package/c-ares/c-ares.mk
> +++ b/package/c-ares/c-ares.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -C_ARES_VERSION = 1.17.1
> +C_ARES_VERSION = 1.17.2
>  C_ARES_SITE = http://c-ares.haxx.se/download
>  C_ARES_INSTALL_STAGING = YES
>  C_ARES_CONF_OPTS = --with-random=/dev/urandom
> -- 
> 2.32.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/3] package/c-ares: fix build with latest nodejs

[Yann E. MORIN]

Fabrice, All,

On 2021-08-28 17:06 +0200, Fabrice Fontaine spake thusly:
> Fix the following build failure with nodejs raised since bump to version
> 12.22.5 in commit 7038b029d8c8774eca6d7888d6642d7e84ff5165:
> 
> ../src/cares_wrap.cc:42:11: fatal error: ares_nameser.h: No such file or directory
>    42 | # include <ares_nameser.h>
>       |           ^~~~~~~~~~~~~~~~
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/a0f867d5e765fc1aa052de5e53ed350b3b20743f
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  ...ares_nameser-h-as-a-public-interface.patch | 170 ++++++++++++++++++
>  package/c-ares/c-ares.mk                      |   2 +
>  2 files changed, 172 insertions(+)
>  create mode 100644 package/c-ares/0001-Provide-ares_nameser-h-as-a-public-interface.patch
> 
> diff --git a/package/c-ares/0001-Provide-ares_nameser-h-as-a-public-interface.patch b/package/c-ares/0001-Provide-ares_nameser-h-as-a-public-interface.patch
> new file mode 100644
> index 0000000000..c3ae3daa8d
> --- /dev/null
> +++ b/package/c-ares/0001-Provide-ares_nameser-h-as-a-public-interface.patch
> @@ -0,0 +1,170 @@
> +From 7712fcd17847998cf1ee3071284ec50c5b3c1978 Mon Sep 17 00:00:00 2001
> +From: Felix Yan <felixonmars@archlinux.org>
> +Date: Wed, 18 Aug 2021 01:32:44 +0800
> +Subject: [PATCH] Provide ares_nameser.h as a public interface (#417)
> +
> +NodeJS needs ares_nameser.h as a pubic header.
> +
> +Fixes: #415
> +Fix By: Felix Yan (@felixonmars)
> +
> +[Retrieved from:
> +https://github.com/c-ares/c-ares/commit/7712fcd17847998cf1ee3071284ec50c5b3c1978]
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +---
> + CMakeLists.txt                      |  6 ++++++
> + configure.ac                        | 14 ++++++++++++++
> + include/CMakeLists.txt              |  2 +-
> + include/Makefile.am                 |  2 +-
> + include/ares_build.h.cmake          |  2 ++
> + include/ares_build.h.in             |  3 +++
> + {src/lib => include}/ares_nameser.h | 10 ++++++----
> + src/lib/Makefile.inc                |  1 -
> + 8 files changed, 33 insertions(+), 7 deletions(-)
> + rename {src/lib => include}/ares_nameser.h (98%)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index 3f42d145..28f8e01a 100644
> +--- a/CMakeLists.txt
> ++++ b/CMakeLists.txt
> +@@ -557,6 +557,12 @@ ENDIF()
> + IF (HAVE_WINDOWS_H)
> + 	SET (CARES_HAVE_WINDOWS_H 1)
> + ENDIF()
> ++IF (HAVE_ARPA_NAMESER_H)
> ++	SET (CARES_HAVE_ARPA_NAMESER_H 1)
> ++ENDIF()
> ++IF (HAVE_ARPA_NAMESER_COMPAT_H)
> ++	SET (CARES_HAVE_ARPA_NAMESER_COMPAT_H 1)
> ++ENDIF()
> + 
> + # Record toplevel CMakeLists.txt path
> + set(CARES_TOPLEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
> +diff --git a/configure.ac b/configure.ac
> +index c21b8ff3..1ba8a8ec 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -547,6 +547,20 @@ dnl *Sigh* these are needed in order for net/if.h to get properly detected.
> + ]
> + )
> + 
> ++dnl Test and set CARES_HAVE_ARPA_NAMESER_H / CARES_HAVE_ARPA_NAMESER_COMPAT_H
> ++AC_CHECK_DECL([HAVE_ARPA_NAMESER_H],
> ++[
> ++CARES_DEFINE_UNQUOTED([CARES_HAVE_ARPA_NAMESER_H])
> ++],
> ++[]
> ++)
> ++AC_CHECK_DECL([HAVE_ARPA_NAMESER_COMPAT_H],
> ++[
> ++CARES_DEFINE_UNQUOTED([CARES_HAVE_ARPA_NAMESER_COMPAT_H])
> ++],
> ++[]
> ++)
> ++
> + dnl Checks for typedefs, structures, and compiler characteristics.
> + AC_C_CONST
> + AC_TYPE_SIZE_T
> +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
> +index 439e7bb2..3321956d 100644
> +--- a/include/CMakeLists.txt
> ++++ b/include/CMakeLists.txt
> +@@ -3,6 +3,6 @@ CONFIGURE_FILE (ares_build.h.cmake ${PROJECT_BINARY_DIR}/ares_build.h)
> + 
> + # Headers installation target
> + IF (CARES_INSTALL)
> +-	SET (CARES_HEADERS ares.h ares_version.h "${PROJECT_BINARY_DIR}/ares_build.h" ares_rules.h ares_dns.h)
> ++	SET (CARES_HEADERS ares.h ares_version.h "${PROJECT_BINARY_DIR}/ares_build.h" ares_rules.h ares_dns.h ares_nameser.h)
> + 	INSTALL (FILES ${CARES_HEADERS} COMPONENT Devel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
> + ENDIF ()
> +diff --git a/include/Makefile.am b/include/Makefile.am
> +index 125a686a..d208bece 100644
> +--- a/include/Makefile.am
> ++++ b/include/Makefile.am
> +@@ -2,6 +2,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc 1.9.6
> + ACLOCAL_AMFLAGS = -I m4 --install
> + 
> + # what headers to install on 'make install':
> +-include_HEADERS = ares.h ares_version.h ares_build.h ares_rules.h ares_dns.h
> ++include_HEADERS = ares.h ares_version.h ares_build.h ares_rules.h ares_dns.h ares_nameser.h
> + 
> + EXTRA_DIST = ares_build.h.cmake ares_build.h.in ares_build.h.dist CMakeLists.txt
> +diff --git a/include/ares_build.h.cmake b/include/ares_build.h.cmake
> +index ac32d47f..e847f17e 100644
> +--- a/include/ares_build.h.cmake
> ++++ b/include/ares_build.h.cmake
> +@@ -13,6 +13,8 @@
> + #cmakedefine CARES_HAVE_WS2TCPIP_H
> + #cmakedefine CARES_HAVE_WINSOCK2_H
> + #cmakedefine CARES_HAVE_WINDOWS_H
> ++#cmakedefine CARES_HAVE_ARPA_NAMESER_H
> ++#cmakedefine CARES_HAVE_ARPA_NAMESER_COMPAT_H
> + 
> + #ifdef CARES_HAVE_SYS_TYPES_H
> + #  include <sys/types.h>
> +diff --git a/include/ares_build.h.in b/include/ares_build.h.in
> +index 24e3a989..20fd28a0 100644
> +--- a/include/ares_build.h.in
> ++++ b/include/ares_build.h.in
> +@@ -55,6 +55,9 @@
> +    Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined
> + #endif
> + 
> ++#undef CARES_HAVE_ARPA_NAMESER_H
> ++#undef CARES_HAVE_ARPA_NAMESER_COMPAT_H
> ++
> + /* ================================================================ */
> + /*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
> + /* ================================================================ */
> +diff --git a/src/lib/ares_nameser.h b/include/ares_nameser.h
> +similarity index 98%
> +rename from src/lib/ares_nameser.h
> +rename to include/ares_nameser.h
> +index 65aebcc1..18a9e5ac 100644
> +--- a/src/lib/ares_nameser.h
> ++++ b/include/ares_nameser.h
> +@@ -2,10 +2,12 @@
> + #ifndef ARES_NAMESER_H
> + #define ARES_NAMESER_H
> + 
> +-#ifdef HAVE_ARPA_NAMESER_H
> ++#include "ares_build.h"
> ++
> ++#ifdef CARES_HAVE_ARPA_NAMESER_H
> + #  include <arpa/nameser.h>
> + #endif
> +-#ifdef HAVE_ARPA_NAMESER_COMPAT_H
> ++#ifdef CARES_HAVE_ARPA_NAMESER_COMPAT_H
> + #  include <arpa/nameser_compat.h>
> + #endif
> + 
> +@@ -68,7 +70,7 @@
> +  * provide them
> +  * ============================================================================
> +  */
> +-#ifndef HAVE_ARPA_NAMESER_H
> ++#ifndef CARES_HAVE_ARPA_NAMESER_H
> + 
> + typedef enum __ns_class {
> +     ns_c_invalid = 0,       /* Cookie. */
> +@@ -173,7 +175,7 @@ typedef enum __ns_rcode {
> +     ns_r_badtime = 18
> + } ns_rcode;
> + 
> +-#endif /* HAVE_ARPA_NAMESER_H */
> ++#endif /* CARES_HAVE_ARPA_NAMESER_H */
> + 
> + 
> + /* ============================================================================
> +diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
> +index 7426c3de..47bc8cdd 100644
> +--- a/src/lib/Makefile.inc
> ++++ b/src/lib/Makefile.inc
> +@@ -73,7 +73,6 @@ HHEADERS = ares_android.h                        \
> +   ares_strsplit.h			\
> +   ares_writev.h				\
> +   bitncmp.h				\
> +-  ares_nameser.h			\
> +   ares_setup.h				\
> +   setup_once.h
> + 
> diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk
> index 3a7c6e0298..761aa73280 100644
> --- a/package/c-ares/c-ares.mk
> +++ b/package/c-ares/c-ares.mk
> @@ -10,6 +10,8 @@ C_ARES_INSTALL_STAGING = YES
>  C_ARES_CONF_OPTS = --with-random=/dev/urandom
>  C_ARES_LICENSE = MIT
>  C_ARES_LICENSE_FILES = LICENSE.md
> +# We're patching configure.ac
> +C_ARES_AUTORECONF = YES
>  
>  $(eval $(autotools-package))
>  $(eval $(host-autotools-package))
> -- 
> 2.32.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 3/3] package/c-ares: add C_ARES_CPE_ID_VENDOR

[Yann E. MORIN]

Fabrice, All,

On 2021-08-28 17:06 +0200, Fabrice Fontaine spake thusly:
> cpe:2.3:a:c-ares_project:c-ares is a valid CPE identifier for this
> package:
> 
>   https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Ac-ares_project%3Ac-ares
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/c-ares/c-ares.mk | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk
> index 761aa73280..71bfa110a1 100644
> --- a/package/c-ares/c-ares.mk
> +++ b/package/c-ares/c-ares.mk
> @@ -10,6 +10,7 @@ C_ARES_INSTALL_STAGING = YES
>  C_ARES_CONF_OPTS = --with-random=/dev/urandom
>  C_ARES_LICENSE = MIT
>  C_ARES_LICENSE_FILES = LICENSE.md
> +C_ARES_CPE_ID_VENDOR = c-ares_project
>  # We're patching configure.ac
>  C_ARES_AUTORECONF = YES
>  
> -- 
> 2.32.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/3] package/c-ares: security bump to version 1.17.2

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > - NodeJS passes NULL for addr and 0 for addrlen to
 >   ares_parse_ptr_reply() on systems where malloc(0) returns NULL. This
 >   would cause a crash.
 > - If ares_getaddrinfo() was terminated by an ares_destroy(), it would
 >   cause a crash
 > - Crash in sortaddrinfo() if the list size equals 0 due to an unexpected
 >   DNS response
 > - Expand number of escaped characters in DNS replies as per RFC1035 5.1
 >   to prevent spoofing follow-up
 > - Perform validation on hostnames to prevent possible XSS due to
 >   applications not performing valiation themselves

 > https://c-ares.haxx.se/changelog.html#1_17_2

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2021.02.x and 2021.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/3] package/c-ares: fix build with latest nodejs

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Fix the following build failure with nodejs raised since bump to version
 > 12.22.5 in commit 7038b029d8c8774eca6d7888d6642d7e84ff5165:

 > ../src/cares_wrap.cc:42:11: fatal error: ares_nameser.h: No such file or directory
 >    42 | # include <ares_nameser.h>
 >       |           ^~~~~~~~~~~~~~~~

 > Fixes:
 >  - http://autobuild.buildroot.org/results/a0f867d5e765fc1aa052de5e53ed350b3b20743f

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2021.02.x and 2021.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 3/3] package/c-ares: add C_ARES_CPE_ID_VENDOR

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > cpe:2.3:a:c-ares_project:c-ares is a valid CPE identifier for this
 > package:

 >   https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Ac-ares_project%3Ac-ares

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2021.02.x and 2021.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot