diff --git a/.gitignore b/.gitignore index ad2206f..9643f5a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,24 +7,3 @@ c-ares-1.7.3.tar.gz /c-ares-1.11.0.tar.gz /c-ares-1.12.0.tar.gz /c-ares-1.13.0.tar.gz -/c-ares-1.14.0.tar.gz -/c-ares-1.15.0.tar.gz -/c-ares-1.16.0.tar.gz -/c-ares-1.16.1.tar.gz -/c-ares-1.17.0.tar.gz -/c-ares-1.17.1.tar.gz -/c-ares-1.17.2.tar.gz -/c-ares-1.19.0.tar.gz -/c-ares-1.19.1.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.28.0.tar.gz -/c-ares-1.28.1.tar.gz -/c-ares-1.30.0.tar.gz -/c-ares-1.31.0.tar.gz -/c-ares-1.33.0.tar.gz -/c-ares-1.34.2.tar.gz -/c-ares-1.34.4.tar.gz -/c-ares-1.34.5.tar.gz -/c-ares-1.34.6.tar.gz diff --git a/c-ares-1.10.0-multilib.patch b/c-ares-1.10.0-multilib.patch new file mode 100644 index 0000000..4daa9d2 --- /dev/null +++ b/c-ares-1.10.0-multilib.patch @@ -0,0 +1,30 @@ +diff -up c-ares-1.10.0/ares_build.h.in.multilib c-ares-1.10.0/ares_build.h.in +--- c-ares-1.10.0/ares_build.h.in.multilib 2013-05-13 11:40:22.697814087 +0200 ++++ c-ares-1.10.0/ares_build.h.in 2013-05-13 11:40:26.236813966 +0200 +@@ -96,7 +96,14 @@ + #endif + + /* The size of `long', as computed by sizeof. */ +-#undef CARES_SIZEOF_LONG ++#include ++#if __WORDSIZE == 32 ++#define CARES_SIZEOF_LONG 4 ++#elif __WORDSIZE == 64 ++#define CARES_SIZEOF_LONG 8 ++#else ++#error "Unknown word size" ++#endif + + /* Integral data type used for ares_socklen_t. */ + #undef CARES_TYPEOF_ARES_SOCKLEN_T +diff -up c-ares-1.10.0/configure.ac.multilib c-ares-1.10.0/configure.ac +--- c-ares-1.10.0/configure.ac.multilib 2013-05-13 11:41:00.480812797 +0200 ++++ c-ares-1.10.0/configure.ac 2013-05-13 11:41:17.210812226 +0200 +@@ -457,7 +457,6 @@ AC_CHECK_SIZEOF(size_t) + AC_CHECK_SIZEOF(long) + AC_CHECK_SIZEOF(int) + AC_CHECK_SIZEOF(short) +-CARES_CONFIGURE_LONG + AC_CHECK_SIZEOF(time_t) + + AC_CHECK_TYPE(long long, diff --git a/c-ares-config.cmake.in b/c-ares-config.cmake.in deleted file mode 100644 index 464837b..0000000 --- a/c-ares-config.cmake.in +++ /dev/null @@ -1,21 +0,0 @@ -@PACKAGE_INIT@ - -set_and_check(c-ares_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") - -include("${CMAKE_CURRENT_LIST_DIR}/c-ares-config-version.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/c-ares-targets.cmake") - -set(c-ares_LIBRARY c-ares::cares) - -if(@CARES_SHARED@) - add_library(c-ares::cares_shared INTERFACE IMPORTED) - set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") - set(c-ares_SHARED_LIBRARY c-ares::cares_shared) -elseif(@CARES_STATIC@) - add_library(c-ares::cares_static INTERFACE IMPORTED) - set_target_properties(c-ares::cares_static PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") -endif() - -if(@CARES_STATIC@) - set(c-ares_STATIC_LIBRARY c-ares::cares_static) -endif() diff --git a/c-ares.spec b/c-ares.spec index 44fb72e..e3d21a9 100644 --- a/c-ares.spec +++ b/c-ares.spec @@ -1,205 +1,73 @@ -%global use_cmake 1 - Summary: A library that performs asynchronous DNS operations Name: c-ares -Version: 1.34.6 -Release: 1%{?dist} +Version: 1.13.0 +Release: 5%{?dist} License: MIT -URL: http://c-ares.org/ -Source0: https://github.com/c-ares/c-ares/releases/download/v%{version}/c-ares-%{version}.tar.gz -BuildRequires: gcc -%if %{use_cmake} -BuildRequires: cmake -%else +Group: System Environment/Libraries +URL: http://c-ares.haxx.se/ +Source0: http://c-ares.haxx.se/download/%{name}-%{version}.tar.gz +# The license can be obtained at http://c-ares.haxx.se/license.html +Source1: LICENSE +Patch0: 0001-Use-RPM-compiler-options.patch +Patch1: c-ares-1.10.0-multilib.patch + + BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -%endif -BuildRequires: make %description -c-ares is a C library that performs DNS requests and name resolves -asynchronously. c-ares is a fork of the library named 'ares', written +c-ares is a C library that performs DNS requests and name resolves +asynchronously. c-ares is a fork of the library named 'ares', written by Greg Hudson at MIT. %package devel Summary: Development files for c-ares -Requires: %{name}%{?_isa} = %{version}-%{release} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel This package contains the header files and libraries needed to compile applications or shared objects that use c-ares. %prep -%autosetup -p1 +%setup -q +%patch0 -p1 -b .optflags +#%patch1 -p1 -b .multilib -# f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f +cp %{SOURCE1} . +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 \ -# --disable-dependency-tracking -%if %{use_cmake} -%{cmake} -DCARES_BUILD_TOOLS:BOOL=OFF -%cmake_build -%else autoreconf -if %configure --enable-shared --disable-static \ --disable-dependency-tracking %{__make} %{?_smp_mflags} -%endif %install -%if %{use_cmake} -%cmake_install -%else -%make_install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT/%{_libdir}/libcares.la -%endif -%ldconfig_scriptlets +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files -%license LICENSE.md -%doc README.md RELEASE-NOTES.md +%doc README.cares CHANGES NEWS LICENSE %{_libdir}/*.so.* %files devel %{_includedir}/ares.h %{_includedir}/ares_build.h %{_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} -%{_libdir}/cmake/c-ares/ -%endif %{_libdir}/pkgconfig/libcares.pc %{_mandir}/man3/ares_* %changelog -* Wed Dec 17 2025 Tom Callaway - 1.34.6-1 -- update to 1.34.6 -- fixes CVE-2025-62408 (among other fixes) - -* Wed Jul 23 2025 Fedora Release Engineering - 1.34.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Apr 8 2025 Tom Callaway - 1.34.5-1 -- update to 1.34.5 - -* Fri Feb 14 2025 Tom Callaway - 1.34.4-3 -- fix pkgconfig file (do not need to mess with cmake for libdir) - -* Thu Jan 16 2025 Fedora Release Engineering - 1.34.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Dec 14 2024 Tom Callaway - 1.34.4-1 -- update to 1.34.4 - -* Fri Oct 18 2024 Tom Callaway - 1.34.2-1 -- update to 1.34.2 - -* Wed Aug 7 2024 Tom Callaway - 1.33.0-1 -- update to 1.33.0 - -* Wed Jul 17 2024 Fedora Release Engineering - 1.31.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jul 1 2024 Tom Callaway - 1.31.0-1 -- update to 1.31.0 - -* Mon Jun 10 2024 Tom Callaway - 1.30.0-1 -- update to 1.30.0 - -* Sun Mar 31 2024 Tom Callaway - 1.28.1-1 -- update to 1.28.1 - -* Fri Mar 29 2024 Tom Callaway - 1.28.0-1 -- update to 1.28.0 - -* Tue Jan 23 2024 Fedora Release Engineering - 1.25.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.25.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jan 10 2024 Tom Callaway - 1.25.0-1 -- update to 1.25.0 - -* Tue Nov 21 2023 Tom Callaway - 1.22.1-1 -- update to 1.22.1 - -* Sun Nov 5 2023 Tom Callaway - 1.21.0-1 -- update to 1.21.0 - -* Wed May 24 2023 Tom Callaway - 1.19.1-1 -- update to 1.19.1 -- fixes CVE-2023-32067 - -* Fri Feb 17 2023 Tom Callaway - 1.19.0-1 -- update to 1.19.0 -- fixes CVE-2022-4904 - -* Wed Jan 18 2023 Fedora Release Engineering - 1.17.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.17.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 1.17.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Aug 16 2021 Tom Callaway - 1.17.2-1 -- update to 1.17.2 -- fixes multiple security issues including CVE-2021-3672 - -* Wed Jul 21 2021 Fedora Release Engineering - 1.17.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.17.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Nov 20 2020 Tom Callaway - 1.17.1-1 -- update to 1.17.1 - -* Tue Nov 17 2020 Tom Callaway - 1.17.0-1 -- update to 1.17.0 - -* Mon Jul 27 2020 Fedora Release Engineering - 1.16.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 13 2020 Tom Stellard - 1.16.1-2 -- Use make macros -- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro - -* Mon May 11 2020 Tom Callaway - 1.16.1-1 -- update to 1.16.1 - -* Fri Mar 13 2020 Tom Callaway - 1.16.0-1 -- update to 1.16.0 - -* Tue Jan 28 2020 Fedora Release Engineering - 1.15.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 1.15.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Mar 12 2019 Tom Callaway - 1.15.0-3 -- use cmake to build so we get cmake helpers (bz1687844) - -* Thu Jan 31 2019 Fedora Release Engineering - 1.15.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Nov 13 2018 Jakub Hrozek - 1.16.0-1 -- Update to the latest upstream - -* Mon Sep 3 2018 Jakub Hrozek - 1.14.0-1 -- Update to the latest upstream -- Resolves: rhbz#1624499 - RFE: New c-ares release 1.14.0 available - * Thu Jul 12 2018 Fedora Release Engineering - 1.13.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/libcares.pc.cmake b/libcares.pc.cmake deleted file mode 100644 index d5532d5..0000000 --- a/libcares.pc.cmake +++ /dev/null @@ -1,20 +0,0 @@ -#*************************************************************************** -# Project ___ __ _ _ __ ___ ___ -# / __|____ / _` | '__/ _ \/ __| -# | (_|_____| (_| | | | __/\__ \ -# \___| \__,_|_| \___||___/ -# -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=${prefix}/@CMAKE_INSTALL_BINDIR@ -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ - -Name: c-ares -URL: https://c-ares.haxx.se/ -Description: asynchronous DNS lookup library -Version: @CARES_VERSION@ -Requires: -Requires.private: -Cflags: -I${includedir} @CPPFLAG_CARES_STATICLIB@ -Libs: -L${libdir} -lcares -Libs.private: @CARES_PRIVATE_LIBS@ diff --git a/sources b/sources index 8681ea7..0fa3384 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (c-ares-1.34.6.tar.gz) = 826eecdb40942caf75da982b9ca57fbe7c3e7c23af43a908683c7c1523c46b06ebac68405c26db8bf4c8b0774ca415666866249a3bde663a71c278f4ec7b1827 +SHA512 (c-ares-1.13.0.tar.gz) = 4a7942e754673f5b8d55a7471e31b0f390e8324b14c12077580c956147fad4d165c7fe8a3190199b1add95c710ceeb1a7957706d4f0d6299d39c5dddc719bd9d