Update to 1.34.5

Resolves: RHEL-103761
This commit is contained in:
Alejandro López 2025-07-21 13:59:08 +02:00
parent 0fb5e1decd
commit c8ecd5ac21
4 changed files with 12 additions and 40 deletions

1
.gitignore vendored
View File

@ -19,3 +19,4 @@ c-ares-1.7.3.tar.gz
/c-ares-1.21.0.tar.gz
/c-ares-1.22.1.tar.gz
/c-ares-1.25.0.tar.gz
/c-ares-1.34.5.tar.gz

View File

@ -1,31 +0,0 @@
From a804c04ddc8245fc8adf0e92368709639125e183 Mon Sep 17 00:00:00 2001
From: Brad House <brad@brad-house.com>
Date: Thu, 22 Feb 2024 16:23:33 -0500
Subject: [PATCH] Merge pull request from GHSA-mg26-v6qh-x48q
---
src/lib/ares__read_line.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/lib/ares__read_line.c b/src/lib/ares__read_line.c
index d65ac1f..018f55e 100644
--- a/src/lib/ares__read_line.c
+++ b/src/lib/ares__read_line.c
@@ -59,6 +59,14 @@ ares_status_t ares__read_line(FILE *fp, char **buf, size_t *bufsize)
return (offset != 0) ? 0 : (ferror(fp)) ? ARES_EFILE : ARES_EOF;
}
len = offset + ares_strlen(*buf + offset);
+
+ /* Probably means there was an embedded NULL as the first character in
+ * the line, throw away line */
+ if (len == 0) {
+ offset = 0;
+ continue;
+ }
+
if ((*buf)[len - 1] == '\n') {
(*buf)[len - 1] = 0;
break;
--
2.42.0

View File

@ -2,12 +2,12 @@
Summary: A library that performs asynchronous DNS operations
Name: c-ares
Version: 1.25.0
Release: 6%{?dist}
Version: 1.34.5
Release: 1%{?dist}
License: MIT
URL: http://c-ares.org/
Source0: http://c-ares.org/download/%{name}-%{version}.tar.gz
Patch0: 0001-Merge-pull-request-from-GHSA-mg26-v6qh-x48q.patch
Source0: https://github.com/c-ares/c-ares/releases/download/v%{version}/c-ares-%{version}.tar.gz
#Patch0: 0001-Merge-pull-request-from-GHSA-mg26-v6qh-x48q.patch
BuildRequires: gcc
%if %{use_cmake}
BuildRequires: cmake
@ -34,8 +34,6 @@ compile applications or shared objects that use c-ares.
%prep
%autosetup -p1
f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f
%build
# autoreconf -if
# %%configure --enable-shared --disable-static \
@ -62,7 +60,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libcares.la
%files
%license LICENSE.md
%doc README.cares CHANGES NEWS
%doc README.md RELEASE-NOTES.md
%{_libdir}/*.so.*
%files devel
@ -71,7 +69,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libcares.la
%{_includedir}/ares_dns.h
%{_includedir}/ares_dns_record.h
%{_includedir}/ares_nameser.h
%{_includedir}/ares_rules.h
# %%{_includedir}/ares_rules.h
%{_includedir}/ares_version.h
%{_libdir}/*.so
%if %{use_cmake}
@ -81,6 +79,10 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libcares.la
%{_mandir}/man3/ares_*
%changelog
* Mon Jul 21 2025 Alejandro López <allopez@redhat.com> - 1.34.5-1
- Update to 1.34.5
Resolves: RHEL-103761
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.25.0-6
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018

View File

@ -1 +1 @@
SHA512 (c-ares-1.25.0.tar.gz) = f73ffc45c17f1e952ea5fae8a1d9e1508427f21c821ff470ff0b728cc4a1e21d1274f95d9192c22f704bc7e0f58a633608cfdc1704dfe8950902fdfc3dfa2e1c
SHA512 (c-ares-1.34.5.tar.gz) = 386709e9f405034cb16ba514f9792e89992be52b24a237e6c51f1032e4ca99a8c57b1c3038d6f0a205202a3bfb1246bb95ff0d5e6fc0ee2bba1cb17f6677f97f