diff --git a/0001-Use-RPM-compiler-options.patch b/0000-Use-RPM-compiler-options.patch similarity index 100% rename from 0001-Use-RPM-compiler-options.patch rename to 0000-Use-RPM-compiler-options.patch diff --git a/backport-disable-live-tests.patch b/backport-disable-live-tests.patch new file mode 100644 index 0000000000000000000000000000000000000000..6314e0ec51fb7dd7c83ddb7c9c85cb6cd52508ce --- /dev/null +++ b/backport-disable-live-tests.patch @@ -0,0 +1,26 @@ +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.15.0.tar.gz b/c-ares-1.15.0.tar.gz deleted file mode 100644 index e39bf4ca90745cf5e3237fd5516e03703ccb0447..0000000000000000000000000000000000000000 Binary files a/c-ares-1.15.0.tar.gz and /dev/null differ diff --git a/c-ares-1.18.1.tar.gz b/c-ares-1.18.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..7523b17dd47f8be70b70d3db6b9367ede5f9fbdf Binary files /dev/null and b/c-ares-1.18.1.tar.gz differ diff --git a/c-ares.spec b/c-ares.spec index 182dcb7aa20bf0bfb91bc44abea2edd21cf3466c..88b76fba0dccee6fe4b7206370b00b14e1f3163e 100644 --- a/c-ares.spec +++ b/c-ares.spec @@ -1,15 +1,17 @@ Name: c-ares -Version: 1.15.0 -Release: 1 +Version: 1.18.1 +Release: 2 Summary: A C library for asynchronous DNS requests License: MIT URL: https://github.com/c-ares/c-ares -Source0: https://github.com/c-ares/c-ares/releases/tag/%{name}-%{version}.tar.gz +Source0: https://github.com/c-ares/c-ares/releases/download/cares-1_18_1/%{name}-%{version}.tar.gz BuildRequires: gcc autoconf automake libtool # Patch0 from Redhat is applied for stopping overriding AC_CONFIG_MACRO_DIR -Patch0: 0001-Use-RPM-compiler-options.patch +Patch0: 0000-Use-RPM-compiler-options.patch +Patch1: backport-disable-live-tests.patch + %description This is c-ares, an asynchronous resolver library. It is intended for applications which need to perform DNS queries without blocking, or need to perform multiple @@ -29,7 +31,7 @@ shared objects are contained in %{name}-devel package. %build autoreconf -if -%configure --enable-shared --disable-dependency-tracking +%configure --enable-shared --disable-static --disable-dependency-tracking make %{?_smp_mflags} %install @@ -37,15 +39,17 @@ make %{?_smp_mflags} %delete_la %ldconfig_scriptlets +%check +%make_build -C test +./test/arestest + %files %doc CHANGES LICENSE.md -%{_libdir}/libcares.so.2.3.0 -%{_libdir}/libcares.so.2 +%{_libdir}/*.so.* %files devel %{_libdir}/pkgconfig/*.pc %{_libdir}/libcares.so -%{_libdir}/libcares.a %{_includedir}/*.h %files help @@ -53,5 +57,38 @@ make %{?_smp_mflags} %{_mandir}/man3/* %changelog +* Wed Feb 9 2022 chengyechun - 1.18.1-2 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:enable test and disable live tests + +* Wed Jan 12 2022 gaihuiying - 1.18.1-1 +- Type:requirement +- Id:NA +- SUG:NA +- DESC:update c-ares to 1.18.1 + +* Thu Aug 12 2021 gaihuiying - 1.17.1-2 +- fix CVE-2021-3672 + +* Sat Jan 30 2021 xihaochen - 1.17.1-1 +- Type:requirements +- Id:NA +- SUG:NA +- DESC:update c-ares to 1.17.1 + +* Tue Sep 8 2020 lunankun - 1.16.1-2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix source0 url + +* Wed Jul 22 2020 gaihuiying - 1.16.1-1 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:update c-ares version to 1.16.1 + * Mon Sep 09 2019 openEuler Buildteam - 1.15.0-1 - Package Init diff --git a/c-ares.yaml b/c-ares.yaml new file mode 100644 index 0000000000000000000000000000000000000000..f4cbc5224519ef67a1620d3e5d88dcb48752909d --- /dev/null +++ b/c-ares.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: c-ares/c-ares +tag_prefix: cares- +seperator: _