From 4ef81ce403885afbdc039187190f98e6f4561004275a05b6a8c3a9693f4e27a4 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Sat, 16 Jan 2021 18:20:28 +0000 Subject: [PATCH] Accepting request 863667 from home:dirkmueller:branches:devel:libraries:c_c++ - update to 1.17.1: Travis: add iOS target built with CMake (#378) Issue #377 suggested that CMake builds for iOS with c-ares were broken. This PR adds an automatic Travis build for iOS CMake. - fix build External projects were using non-public header ares_dns.h, make public again (#376) It appears some outside projects were relying on macros in ares_dns.h, even though it doesn't appear that header was ever meant to be public. That said, we don't want to break external integrators so we should distribute this header again. - note that so versioning has moved to configure.ac - note about 1.17.1 - fix sed gone wrong autotools cleanup (#372) * buildconf: remove custom logic with autoreconf - remove missing_header.patch (upstream) OBS-URL: https://build.opensuse.org/request/show/863667 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/c-ares?expand=0&rev=35 --- c-ares-1.17.0.tar.gz | 3 --- c-ares-1.17.0.tar.gz.asc | 11 ----------- c-ares-1.17.1.tar.gz | 3 +++ c-ares-1.17.1.tar.gz.asc | 11 +++++++++++ c-ares.changes | 19 +++++++++++++++++++ c-ares.spec | 5 ++--- missing_header.patch | 12 ------------ 7 files changed, 35 insertions(+), 29 deletions(-) delete mode 100644 c-ares-1.17.0.tar.gz delete mode 100644 c-ares-1.17.0.tar.gz.asc create mode 100644 c-ares-1.17.1.tar.gz create mode 100644 c-ares-1.17.1.tar.gz.asc delete mode 100644 missing_header.patch diff --git a/c-ares-1.17.0.tar.gz b/c-ares-1.17.0.tar.gz deleted file mode 100644 index 55f686b..0000000 --- a/c-ares-1.17.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cecd5dbe21306c7263f8649aa6e9a37aecb985995a3489f487d98df2b40757d -size 1396682 diff --git a/c-ares-1.17.0.tar.gz.asc b/c-ares-1.17.0.tar.gz.asc deleted file mode 100644 index 405cd37..0000000 --- a/c-ares-1.17.0.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEJ+3q8i86vOtQ25oSXMkI/bceEsIFAl+y9H8ACgkQXMkI/bce -EsKfbAgAhqNNHmxmcHf8i5BqHMDpJwlnBxeX2A0VFJU5iBm5v3MF1NI6LOKlzJb1 -4xfJ4XcqwZQTK7bmcyX28/Rl71uG+0AhKy9X20fAUdWfzOr2rfmdzv7KDm3FimlN -8k1iAvcwSoRg/YOmiZrkefKMx0TrE7MjFfds4FtL54Y+qFkYCvdRlHpCtzBkQLjd -8JCD8dTKd0zrLVcoSVaAgOvKp67e5aOkhLsxpQNm7IFldzzePK4Go77toPKGZ8Q4 -VQ97iFyvop5eN7+ItnR+8CC1/7d/1p1J5k62lygiYVK7M5uD+4ioj/mW4h9ykFha -b47/5W/AER3PRTgD3cLWcj0gb9AOAw== -=jz6s ------END PGP SIGNATURE----- diff --git a/c-ares-1.17.1.tar.gz b/c-ares-1.17.1.tar.gz new file mode 100644 index 0000000..a3de7d8 --- /dev/null +++ b/c-ares-1.17.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40 +size 1518701 diff --git a/c-ares-1.17.1.tar.gz.asc b/c-ares-1.17.1.tar.gz.asc new file mode 100644 index 0000000..527e1fb --- /dev/null +++ b/c-ares-1.17.1.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEJ+3q8i86vOtQ25oSXMkI/bceEsIFAl+2n+oACgkQXMkI/bce +EsIMuQf/aWfEbS3LtGc7BhK2o/YGkrF29sgort4oANMMrvbF9eKezYER2FOG+UW4 +4MGhAORCPNZF5arF/6ctEOSgWFuKIPD+tdirX+zX+io6yCIARGAqXQrjUA7TbwUu +9jb8ose5PXUfkh8zeU3xLjcWeq4GUKp4HRypP94EbkzzpHOfgJulJPd6QzSpn7Gd +uNNw9dRwhyM4N47QXdCLZyJzuOqcLX7SDbMbRNH7Li093ReqYhxOY9qzJITvfmfq +NMHvshlsdnK/Rw+v6TQS5PbHdx7y4bTQjYwgENxC+EIPLJ2lYRAaHFKlgFdgfX5x +UkNOhAMltsnTjfIz8RGDk12Wd0Vssw== +=iWz7 +-----END PGP SIGNATURE----- diff --git a/c-ares.changes b/c-ares.changes index 7e60a0f..3cfebcc 100644 --- a/c-ares.changes +++ b/c-ares.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sat Jan 16 15:05:28 UTC 2021 - Dirk Müller + +- update to 1.17.1: + Travis: add iOS target built with CMake (#378) + Issue #377 suggested that CMake builds for iOS with c-ares were broken. This PR adds an automatic Travis build for iOS CMake. + - fix build + External projects were using non-public header ares_dns.h, make public again (#376) + It appears some outside projects were relying on macros in ares_dns.h, even + though it doesn't appear that header was ever meant to be public. That said, + we don't want to break external integrators so we should distribute this header + again. + - note that so versioning has moved to configure.ac + - note about 1.17.1 + - fix sed gone wrong + autotools cleanup (#372) + * buildconf: remove custom logic with autoreconf +- remove missing_header.patch (upstream) + ------------------------------------------------------------------- Sat Nov 21 23:16:21 UTC 2020 - Marcus Rueckert diff --git a/c-ares.spec b/c-ares.spec index 283d4f9..66321a0 100644 --- a/c-ares.spec +++ b/c-ares.spec @@ -1,7 +1,7 @@ # # spec file for package c-ares # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,7 +41,7 @@ ExclusiveArch: do_not_build %endif Name: %{pname} -Version: 1.17.0 +Version: 1.17.1 Release: 0 Summary: Library for asynchronous name resolves License: MIT @@ -56,7 +56,6 @@ Source6: c-ares-config.cmake.in Source7: ares_dns.h Patch0: 0001-Use-RPM-compiler-options.patch Patch1: disable-live-tests.patch -Patch2: missing_header.patch BuildRequires: cmake BuildRequires: gcc-c++ %if %{with tests} diff --git a/missing_header.patch b/missing_header.patch deleted file mode 100644 index 0771aa8..0000000 --- a/missing_header.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: c-ares-1.17.0/include/CMakeLists.txt -=================================================================== ---- c-ares-1.17.0.orig/include/CMakeLists.txt -+++ c-ares-1.17.0/include/CMakeLists.txt -@@ -3,6 +3,6 @@ CONFIGURE_FILE (ares_build.h.cmake ${PRO - - # Headers installation target - IF (CARES_INSTALL) -- SET (CARES_HEADERS ares.h ares_version.h "${PROJECT_BINARY_DIR}/ares_build.h" ares_rules.h) -+ SET (CARES_HEADERS ares.h ares_version.h "${PROJECT_BINARY_DIR}/ares_build.h" ares_rules.h ares_dns.h) - INSTALL (FILES ${CARES_HEADERS} COMPONENT Devel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - ENDIF ()