diff --git a/0000-Use-RPM-compiler-options.patch b/0000-Use-RPM-compiler-options.patch deleted file mode 100644 index 721b71373b7f8b1ff0a427858d9d4ea84bb7d261..0000000000000000000000000000000000000000 --- a/0000-Use-RPM-compiler-options.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7dada62a77e061c752123e672e844386ff3b01ea Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Wed, 10 Apr 2013 12:32:44 -0400 -Subject: [PATCH] Use RPM compiler options - ---- - m4/cares-compilers.m4 | 19 ++++++------------- - 1 file changed, 6 insertions(+), 13 deletions(-) - -diff --git a/m4/cares-compilers.m4 b/m4/cares-compilers.m4 -index 7ee8e0dbe741c1a64149a0d20b826f507b3ec620..d7708230fb5628ae80fbf1052da0d2c78ebbc160 100644 ---- a/m4/cares-compilers.m4 -+++ b/m4/cares-compilers.m4 -@@ -143,19 +143,12 @@ AC_DEFUN([CARES_CHECK_COMPILER_GNU_C], [ - gccvhi=`echo $gccver | cut -d . -f1` - gccvlo=`echo $gccver | cut -d . -f2` - compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` -- flags_dbg_all="-g -g0 -g1 -g2 -g3" -- flags_dbg_all="$flags_dbg_all -ggdb" -- flags_dbg_all="$flags_dbg_all -gstabs" -- flags_dbg_all="$flags_dbg_all -gstabs+" -- flags_dbg_all="$flags_dbg_all -gcoff" -- flags_dbg_all="$flags_dbg_all -gxcoff" -- flags_dbg_all="$flags_dbg_all -gdwarf-2" -- flags_dbg_all="$flags_dbg_all -gvms" -- flags_dbg_yes="-g" -- flags_dbg_off="-g0" -- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" -- flags_opt_yes="-O2" -- flags_opt_off="-O0" -+ flags_dbg_all="" -+ flags_dbg_yes="" -+ flags_dbg_off="" -+ flags_opt_all="" -+ flags_opt_yes="" -+ flags_opt_off="" - CURL_CHECK_DEF([_WIN32], [], [silent]) - else - AC_MSG_RESULT([no]) --- -1.8.1.4 diff --git a/backport-CVE-2024-25629.patch b/backport-CVE-2024-25629.patch deleted file mode 100644 index 0be930bf0c1e6785298d609f5db6ca3b4feb0aa8..0000000000000000000000000000000000000000 --- a/backport-CVE-2024-25629.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a804c04ddc8245fc8adf0e92368709639125e183 Mon Sep 17 00:00:00 2001 -From: Brad House -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 d65ac1fcf..018f55e8b 100644 ---- a/src/lib/ares__read_line.c -+++ b/src/lib/ares__read_line.c -@@ -49,6 +49,14 @@ int ares__read_line(FILE *fp, char **buf, size_t *bufsize) - if (!fgets(*buf + offset, bytestoread, fp)) - return (offset != 0) ? 0 : (ferror(fp)) ? ARES_EFILE : ARES_EOF; - len = offset + 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; --- -2.20.1 diff --git a/backport-disable-live-tests.patch b/backport-disable-live-tests.patch deleted file mode 100644 index 6314e0ec51fb7dd7c83ddb7c9c85cb6cd52508ce..0000000000000000000000000000000000000000 --- a/backport-disable-live-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Conflict:NA -Reference:https://build.opensuse.org/package/view_file/openSUSE:Factory/c-ares/disable-live-tests.patch?expand=1 -From 5b3d9a337dbf0cf990ebc5639c950e092de86539 Mon Sep 17 00:00:00 2001 -From: chengyechun -Date: Tue, 8 Feb 2022 19:57:57 +0800 -Subject: [PATCH] disable live test - ---- - test/Makefile.inc | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/test/Makefile.inc b/test/Makefile.inc -index 820afdb..c625a68 100644 ---- a/test/Makefile.inc -+++ b/test/Makefile.inc -@@ -16,7 +16,6 @@ TESTSOURCES = ares-test-main.cc \ - ares-test-parse-txt.cc \ - ares-test-parse-uri.cc \ - ares-test-misc.cc \ -- ares-test-live.cc \ - ares-test-mock.cc \ - ares-test-mock-ai.cc \ - ares-test-internal.cc \ --- -1.8.3.1 - diff --git a/c-ares-1.19.1.tar.gz b/c-ares-1.19.1.tar.gz deleted file mode 100644 index 4237a53f7a5dc1cfb4d04a6b6374f8674c32e271..0000000000000000000000000000000000000000 Binary files a/c-ares-1.19.1.tar.gz and /dev/null differ diff --git a/c-ares-1.28.1.tar.gz b/c-ares-1.28.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..bd07b703716bb9fb1819e536e88c4051af289292 Binary files /dev/null and b/c-ares-1.28.1.tar.gz differ diff --git a/c-ares.spec b/c-ares.spec index 6a5d389b2db9984bf8313736d425020e06c8ec36..228051a703d1e9ed5ffa0776077e7dc1849e25db 100644 --- a/c-ares.spec +++ b/c-ares.spec @@ -1,6 +1,6 @@ Name: c-ares -Version: 1.19.1 -Release: 3 +Version: 1.28.1 +Release: 1 Summary: A C library for asynchronous DNS requests License: MIT @@ -8,10 +8,7 @@ URL: https://c-ares.org/ Source0: https://c-ares.org/download/%{name}-%{version}.tar.gz BuildRequires: gcc autoconf automake libtool g++ -# Patch0 from Redhat is applied for stopping overriding AC_CONFIG_MACRO_DIR -Patch0: 0000-Use-RPM-compiler-options.patch -Patch1: backport-disable-live-tests.patch -Patch2: backport-CVE-2024-25629.patch +BuildRequires: gmock-devel %description This is c-ares, an asynchronous resolver library. It is intended for applications @@ -44,10 +41,6 @@ make %{?_smp_mflags} %ldconfig_scriptlets %check -cd test -./configure -cd ../ -%make_build -C test ./test/arestest %files @@ -64,6 +57,12 @@ cd ../ %{_mandir}/man3/* %changelog +* Tue Apr 09 2024 liweigang - 1.28.1-1 +- Type: requirement +- ID: NA +- SUG: NA +- DESC: update c-ares to 1.28.1 + * Mon Apr 1 2024 liyunfei - 1.19.1-3 - Type:bugfix - ID:NA