Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit c5174f5

Browse filesBrowse files
nodejs-github-botmarco-ippolito
nodejs-github-bot
authored and
marco-ippolito
committed
deps: update c-ares to v1.31.0
PR-URL: #53554 Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent 8537a2a commit c5174f5
Copy full SHA for c5174f5

File tree

Expand file treeCollapse file tree

98 files changed

+1157
-1120
lines changed
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

98 files changed

+1157
-1120
lines changed
Open diff view settings
Collapse file

‎deps/cares/CHANGES‎

Copy file name to clipboardExpand all lines: deps/cares/CHANGES
-7Lines changed: 0 additions & 7 deletions
This file was deleted.
Collapse file

‎deps/cares/CMakeLists.txt‎

Copy file name to clipboardExpand all lines: deps/cares/CMakeLists.txt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ INCLUDE (CheckCSourceCompiles)
1212
INCLUDE (CheckStructHasMember)
1313
INCLUDE (CheckLibraryExists)
1414

15-
PROJECT (c-ares LANGUAGES C VERSION "1.30.0" )
15+
PROJECT (c-ares LANGUAGES C VERSION "1.31.0" )
1616

1717
# Set this version before release
1818
SET (CARES_VERSION "${PROJECT_VERSION}")
@@ -30,7 +30,7 @@ INCLUDE (GNUInstallDirs) # include this *AFTER* PROJECT(), otherwise paths are w
3030
# For example, a version of 4:0:2 would generate output such as:
3131
# libname.so -> libname.so.2
3232
# libname.so.2 -> libname.so.2.2.0
33-
SET (CARES_LIB_VERSIONINFO "17:0:15")
33+
SET (CARES_LIB_VERSIONINFO "18:0:16")
3434

3535

3636
OPTION (CARES_STATIC "Build as a static library" OFF)
Collapse file

‎deps/cares/INSTALL.md‎

Copy file name to clipboardExpand all lines: deps/cares/INSTALL.md
-2Lines changed: 0 additions & 2 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
** This file is adapted from libcurl and not yet fully rewritten for c-ares! **
2-
31
```
42
___ __ _ _ __ ___ ___
53
/ __| ___ / _` | '__/ _ \/ __|
Collapse file

‎deps/cares/Makefile.Watcom‎

Copy file name to clipboardExpand all lines: deps/cares/Makefile.Watcom
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ RD = rmdir /q /s 2>NUL
4242
CP = copy
4343

4444
CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm -aa &
45-
-wcd=201 -bt=nt -d+ -dWIN32 -dCARES_BUILDING_LIBRARY &
45+
-wcd=201 -bt=nt -d+ -dCARES_BUILDING_LIBRARY &
4646
-dNTDDI_VERSION=0x06020000 -I. -I.\include -I.\src\lib $(SYS_INCL)
4747

4848
LFLAGS = option quiet, map, caseexact, eliminate
Collapse file

‎deps/cares/Makefile.am‎

Copy file name to clipboardExpand all lines: deps/cares/Makefile.am
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ MSVCFILES = msvc_ver.inc buildconf.bat
2626

2727
# adig and ahost are just sample programs and thus not mentioned with the
2828
# regular sources and headers
29-
EXTRA_DIST = AUTHORS CHANGES README.cares $(man_MANS) RELEASE-NOTES.md \
30-
c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf get_ver.awk \
31-
maketgz TODO README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
29+
EXTRA_DIST = AUTHORS $(man_MANS) RELEASE-NOTES.md \
30+
c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf \
31+
README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
3232
CMakeLists.txt Makefile.dj Makefile.m32 Makefile.netware Makefile.msvc \
33-
Makefile.Watcom AUTHORS CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md TODO \
33+
Makefile.Watcom CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md \
3434
cmake/EnableWarnings.cmake
3535

3636
CLEANFILES = $(PDFPAGES) $(HTMLPAGES)
Collapse file

‎deps/cares/Makefile.in‎

Copy file name to clipboardExpand all lines: deps/cares/Makefile.in
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libcares.pc.in \
230230
$(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
231231
$(top_srcdir)/config/config.sub \
232232
$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
233-
$(top_srcdir)/config/missing AUTHORS INSTALL.md NEWS README.md \
234-
TODO config/compile config/config.guess config/config.sub \
233+
$(top_srcdir)/config/missing AUTHORS INSTALL.md README.md \
234+
config/compile config/config.guess config/config.sub \
235235
config/install-sh config/ltmain.sh config/missing
236236
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
237237
distdir = $(PACKAGE)-$(VERSION)
@@ -439,11 +439,11 @@ MSVCFILES = msvc_ver.inc buildconf.bat
439439

440440
# adig and ahost are just sample programs and thus not mentioned with the
441441
# regular sources and headers
442-
EXTRA_DIST = AUTHORS CHANGES README.cares $(man_MANS) RELEASE-NOTES.md \
443-
c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf get_ver.awk \
444-
maketgz TODO README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
442+
EXTRA_DIST = AUTHORS $(man_MANS) RELEASE-NOTES.md \
443+
c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf \
444+
README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
445445
CMakeLists.txt Makefile.dj Makefile.m32 Makefile.netware Makefile.msvc \
446-
Makefile.Watcom AUTHORS CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md TODO \
446+
Makefile.Watcom CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md \
447447
cmake/EnableWarnings.cmake
448448

449449
CLEANFILES = $(PDFPAGES) $(HTMLPAGES)
Collapse file

‎deps/cares/Makefile.msvc‎

Copy file name to clipboardExpand all lines: deps/cares/Makefile.msvc
+9-4Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ RTLIBD = /MTd
7171
# otherwise Winsock tcp/ip stack will be used as default.
7272
# --------------------------------------------------------
7373

74+
!IFNDEF USE_WATT32
7475
USE_WATT32 = 0
76+
!ENDIF
7577

7678
# --------------------------------------------------------
7779
# Detect compiler version.
@@ -176,11 +178,14 @@ PROG3_OBJDIR = $(PROG3_OUTDIR)\obj
176178
# -------------------------------------
177179

178180
!IF "$(USE_WATT32)" == "1"
179-
CFLAGS = /UWIN32 /DWATT32 /I$(WATT_ROOT)\inc
180-
EX_LIBS_REL = $(WATT_ROOT)\lib\wattcpvc_imp.lib
181-
EX_LIBS_DBG = $(WATT_ROOT)\lib\wattcpvc_imp_d.lib
181+
CFLAGS = /D_WIN32_WINNT=0x0602 /DWATT32 /I$(WATT_ROOT)\inc
182+
! IFNDEF PLATFORM
183+
PLATFORM = x86
184+
! ENDIF
185+
EX_LIBS_REL = $(WATT_ROOT)\lib\$(PLATFORM)\wattcpvc_imp.lib advapi32.lib
186+
EX_LIBS_DBG = $(WATT_ROOT)\lib\$(PLATFORM)\wattcpvc_imp_d.lib advapi32.lib
182187
!ELSE
183-
CFLAGS = /DWIN32 /D_WIN32_WINNT=0x0602
188+
CFLAGS = /D_WIN32_WINNT=0x0602
184189
EX_LIBS_REL = ws2_32.lib advapi32.lib kernel32.lib iphlpapi.lib
185190
EX_LIBS_DBG = ws2_32.lib advapi32.lib kernel32.lib iphlpapi.lib
186191
!ENDIF
Collapse file

‎deps/cares/NEWS‎

Copy file name to clipboardExpand all lines: deps/cares/NEWS
-21Lines changed: 0 additions & 21 deletions
This file was deleted.
Collapse file

‎deps/cares/README.cares‎

Copy file name to clipboardExpand all lines: deps/cares/README.cares
-15Lines changed: 0 additions & 15 deletions
This file was deleted.
Collapse file

‎deps/cares/README.md‎

Copy file name to clipboardExpand all lines: deps/cares/README.md
+2-2Lines changed: 2 additions & 2 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Build Status](https://api.cirrus-ci.com/github/c-ares/c-ares.svg?branch=main)](https://cirrus-ci.com/github/c-ares/c-ares)
44
[![Windows Build Status](https://ci.appveyor.com/api/projects/status/aevgc5914tm72pvs/branch/main?svg=true)](https://ci.appveyor.com/project/c-ares/c-ares/branch/main)
5-
[![Coverage Status](https://coveralls.io/repos/github/c-ares/c-ares/badge.svg)](https://coveralls.io/github/c-ares/c-ares)
5+
[![Coverage Status](https://coveralls.io/repos/github/c-ares/c-ares/badge.svg?branch=main)](https://coveralls.io/github/c-ares/c-ares?branch=main)
66
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/291/badge)](https://bestpractices.coreinfrastructure.org/projects/291)
77
[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/c-ares.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:c-ares)
88
[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=c-ares_c-ares&metric=bugs)](https://sonarcloud.io/summary/new_code?id=c-ares_c-ares)
@@ -39,7 +39,7 @@ best practices in regards to C coding standards.
3939

4040
The full source code and revision history is available in our
4141
[GitHub repository](https://github.com/c-ares/c-ares). Our signed releases
42-
are available in the ['c-ares' release archives](https://c-ares.org/download/).
42+
are available in the [release archives](https://c-ares.org/download/).
4343

4444

4545
See the [INSTALL.md](INSTALL.md) file for build information.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.