From ee20716e13fc1d5e874ba997cb282884e247edf1 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Tue, 13 Nov 2018 08:25:42 +0100 Subject: [PATCH] Update to the latest upstream --- .gitignore | 1 + c-ares-1.10.0-multilib.patch | 30 ------------------------------ c-ares.spec | 9 +++++---- sources | 2 +- 4 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 c-ares-1.10.0-multilib.patch diff --git a/.gitignore b/.gitignore index 13aacda..02c4e6b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ c-ares-1.7.3.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 diff --git a/c-ares-1.10.0-multilib.patch b/c-ares-1.10.0-multilib.patch deleted file mode 100644 index 4daa9d2..0000000 --- a/c-ares-1.10.0-multilib.patch +++ /dev/null @@ -1,30 +0,0 @@ -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.spec b/c-ares.spec index 0b6664b..63cb504 100644 --- a/c-ares.spec +++ b/c-ares.spec @@ -1,7 +1,7 @@ Summary: A library that performs asynchronous DNS operations Name: c-ares -Version: 1.14.0 -Release: 5%{?dist} +Version: 1.15.0 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://c-ares.haxx.se/ @@ -9,7 +9,6 @@ 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 @@ -34,7 +33,6 @@ compile applications or shared objects that use c-ares. %prep %setup -q %patch0 -p1 -b .optflags -#%patch1 -p1 -b .multilib cp %{SOURCE1} . f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f @@ -68,6 +66,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libcares.la %{_mandir}/man3/ares_* %changelog +* 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 diff --git a/sources b/sources index cf9becc..d00f0b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (c-ares-1.14.0.tar.gz) = 30cd3f8c4eea15f994b2ceb44d84e506858f69f624e651e39bb4db523fea9ad5e8906b75abf07131ae364be19172274ed4053059669091f21ce4463cdbb857bf +SHA512 (c-ares-1.15.0.tar.gz) = a1de6c5e7e1a6a13c926aae690e83d5caa51e7313d63da1cf2af6bc757c41d585aad5466bc3ba7b7f7793cb1748fa589f40972b196728851c8b059cfc8c3be50