Compare commits

..

12 Commits
rawhide ... el5

Author SHA1 Message Date
Tom Callaway 1998f4fec1 just get this old beast building 2016-09-29 13:30:24 -04:00
Tom Callaway 9c9c26e636 more merge 2016-09-29 13:23:30 -04:00
Tom Callaway d068bf35e1 merge 2016-09-29 13:22:36 -04:00
Jakub Hrozek 15dda1742f Do not mention 'static' libraries in description since they are disabled during build 2011-03-28 10:38:39 +02:00
Jakub Hrozek eaac8fbb97 Backport IPv6 NS patch and several small packaging fixes
- Backport the fix for usage of IPv6 nameserves from 1.7 branch
- Use default defattr
- Comment patches
- Convert the CHANGES file to UTF8
2010-08-08 21:32:21 +02:00
Fedora Release Engineering ae2587b950 dist-git conversion 2010-07-28 11:24:12 +00:00
Jakub Hrozek ad3a66e84d Fix domain search order, honor CFLAGS 2010-06-03 12:52:52 +00:00
Bill Nottingham 955138d9d4 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:27:01 +00:00
Tom Callaway 0ceed77c80 update to 1.6.0 2009-07-23 14:25:22 +00:00
Tom Callaway c0b7d1a049 Initialize branch EL-5 for c-ares 2007-07-02 15:22:09 +00:00
Tom Callaway c32edfd50b Bump to 1.4.0 2007-06-27 14:02:31 +00:00
Tom Callaway 602ffc16f7 Bump to 1.3.2 2007-01-17 20:42:00 +00:00
9 changed files with 1598 additions and 161 deletions

19
.gitignore vendored
View File

@ -1,16 +1,3 @@
c-ares-1.7.3.tar.gz
/c-ares-1.7.4.tar.gz
/c-ares-1.7.5.tar.gz
/c-ares-1.8.0.tar.gz
/c-ares-1.9.1.tar.gz
/c-ares-1.10.0.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.2.1.tar.gz
c-ares-1.3.0.tar.gz
c-ares-1.3.1.tar.gz

View File

@ -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 <bits/wordsize.h>
+#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,

View File

@ -0,0 +1,87 @@
diff -up c-ares-1.6.0/configure~ c-ares-1.6.0/configure
--- c-ares-1.6.0/configure~ 2008-12-10 00:31:08.000000000 +0200
+++ c-ares-1.6.0/configure 2009-07-25 20:26:11.000000000 +0300
@@ -14950,7 +14950,7 @@ echo "$as_me: WARNING: compiler options
ac_var_stripped=""
for word1 in $tmp_CFLAGS; do
ac_var_strip_word="no"
- for word2 in $flags_dbg_all; do
+ for word2 in ""; do
if test "$word1" = "$word2"; then
ac_var_strip_word="yes"
fi
@@ -14966,7 +14966,7 @@ echo "$as_me: WARNING: compiler options
ac_var_stripped=""
for word1 in $tmp_CPPFLAGS; do
ac_var_strip_word="no"
- for word2 in $flags_dbg_all; do
+ for word2 in ""; do
if test "$word1" = "$word2"; then
ac_var_strip_word="yes"
fi
@@ -14982,12 +14982,12 @@ echo "$as_me: WARNING: compiler options
if test "$want_debug" = "yes"; then
{ echo "$as_me:$LINENO: checking if compiler accepts debug enabling options" >&5
echo $ECHO_N "checking if compiler accepts debug enabling options... $ECHO_C" >&6; }
- tmp_options="$flags_dbg_yes"
+ tmp_options=""
fi
if test "$want_debug" = "no"; then
{ echo "$as_me:$LINENO: checking if compiler accepts debug disabling options" >&5
echo $ECHO_N "checking if compiler accepts debug disabling options... $ECHO_C" >&6; }
- tmp_options="$flags_dbg_off"
+ tmp_options=""
fi
#
CPPFLAGS="$tmp_CPPFLAGS"
@@ -15221,7 +15221,7 @@ echo $ECHO_N "checking if compiler optim
ac_var_match_word="no"
for word1 in $tmp_CFLAGS; do
- for word2 in $flags_opt_all; do
+ for word2 in ""; do
if test "$word1" = "$word2"; then
ac_var_match_word="yes"
fi
@@ -15239,7 +15239,7 @@ echo $ECHO_N "checking if compiler optim
ac_var_match_word="no"
for word1 in $tmp_CPPFLAGS; do
- for word2 in $flags_opt_all; do
+ for word2 in ""; do
if test "$word1" = "$word2"; then
ac_var_match_word="yes"
fi
@@ -15270,7 +15270,7 @@ echo "${ECHO_T}$honor_optimize_option" >
ac_var_stripped=""
for word1 in $tmp_CFLAGS; do
ac_var_strip_word="no"
- for word2 in $flags_opt_all; do
+ for word2 in ""; do
if test "$word1" = "$word2"; then
ac_var_strip_word="yes"
fi
@@ -15286,7 +15286,7 @@ echo "${ECHO_T}$honor_optimize_option" >
ac_var_stripped=""
for word1 in $tmp_CPPFLAGS; do
ac_var_strip_word="no"
- for word2 in $flags_opt_all; do
+ for word2 in ""; do
if test "$word1" = "$word2"; then
ac_var_strip_word="yes"
fi
@@ -15301,12 +15301,12 @@ echo "${ECHO_T}$honor_optimize_option" >
if test "$want_optimize" = "yes"; then
{ echo "$as_me:$LINENO: checking if compiler accepts optimizer enabling options" >&5
echo $ECHO_N "checking if compiler accepts optimizer enabling options... $ECHO_C" >&6; }
- tmp_options="$flags_opt_yes"
+ tmp_options=""
fi
if test "$want_optimize" = "no"; then
{ echo "$as_me:$LINENO: checking if compiler accepts optimizer disabling options" >&5
echo $ECHO_N "checking if compiler accepts optimizer disabling options... $ECHO_C" >&6; }
- tmp_options="$flags_opt_off"
+ tmp_options=""
fi
CPPFLAGS="$tmp_CPPFLAGS"
CFLAGS="$tmp_CFLAGS $tmp_options"

View File

@ -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()

View File

@ -1,24 +1,19 @@
%global use_cmake 1
Summary: A library that performs asynchronous DNS operations
Name: c-ares
Version: 1.17.2
Release: 3%{?dist}
Version: 1.12.0
Release: 1%{?dist}
License: MIT
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
BuildRequires: gcc
%if %{use_cmake}
BuildRequires: cmake
%else
Patch1: c-ares-1.10.0-multilib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
%endif
BuildRequires: make
%description
c-ares is a C library that performs DNS requests and name resolves
@ -27,133 +22,56 @@ 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
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} -DCMAKE_INSTALL_LIBDIR:PATH="%{_libdir}" -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
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%license LICENSE
%doc README.cares CHANGES NEWS
%defattr(-, root, root)
%doc README.cares CHANGES NEWS LICENSE
%{_libdir}/*.so.*
%files devel
%defattr(-, root, root, -)
%{_includedir}/ares.h
%{_includedir}/ares_build.h
%{_includedir}/ares_dns.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 Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Aug 16 2021 Tom Callaway <spot@fedoraproject.org> - 1.17.2-1
- update to 1.17.2
- fixes multiple security issues including CVE-2021-3672
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Nov 20 2020 Tom Callaway <spot@fedoraproject.org> - 1.17.1-1
- update to 1.17.1
* Tue Nov 17 2020 Tom Callaway <spot@fedoraproject.org> - 1.17.0-1
- update to 1.17.0
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 1.16.1-2
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Mon May 11 2020 Tom Callaway <spot@fedoraproject.org> - 1.16.1-1
- update to 1.16.1
* Fri Mar 13 2020 Tom Callaway <spot@fedoraproject.org> - 1.16.0-1
- update to 1.16.0
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Mar 12 2019 Tom Callaway <spot@fedoraproject.org> - 1.15.0-3
- use cmake to build so we get cmake helpers (bz1687844)
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Nov 13 2018 Jakub Hrozek <jhrozek@redhat.com> - 1.16.0-1
- Update to the latest upstream
* Mon Sep 3 2018 Jakub Hrozek <jhrozek@redhat.com> - 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 <releng@fedoraproject.org> - 1.13.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Tue Jun 20 2017 Jakub Hrozek <jhrozek@redhat.com> - 1.13.0-1
- update to 1.13.0
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Sep 29 2016 Tom Callaway <spot@fedoraproject.org> - 1.12.0-1
- update to 1.12.0
@ -262,6 +180,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libcares.la
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
>>>>>>> master
* Wed Jul 22 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 1.6.0-1
- update to 1.6.0

View File

@ -0,0 +1,48 @@
diff -up c-ares-1.6.0/ares_init.3.domain c-ares-1.6.0/ares_init.3
--- c-ares-1.6.0/ares_init.3.domain 2010-06-03 12:53:48.000000000 +0200
+++ c-ares-1.6.0/ares_init.3 2010-06-03 12:54:07.000000000 +0200
@@ -184,6 +184,27 @@ A configuration file could not be read.
.TP 14
.B ARES_ENOMEM
The process's available memory was exhausted.
+.SH NOTES
+When initializing from
+.B /etc/resolv.conf,
+.BR ares_init (3)
+reads the
+.I domain
+and
+.I search
+directives to allow lookups of short names relative to the domains
+specified. The
+.I domain
+and
+.I search
+directives override one another. If more that one instance of either
+.I domain
+or
+.I search
+directives is specified, the last occurence wins. For more information,
+please see the
+.BR resolv.conf (5)
+manual page.
.SH SEE ALSO
.BR ares_destroy(3),
.BR ares_dup(3)
diff -up c-ares-1.6.0/ares_init.c.domain c-ares-1.6.0/ares_init.c
--- c-ares-1.6.0/ares_init.c.domain 2010-06-03 12:53:42.000000000 +0200
+++ c-ares-1.6.0/ares_init.c 2010-06-03 12:54:29.000000000 +0200
@@ -815,11 +815,11 @@ DhcpNameServer
if (fp) {
while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS)
{
- if ((p = try_config(line, "domain")) && channel->ndomains == -1)
+ if ((p = try_config(line, "domain")))
status = config_domain(channel, p);
else if ((p = try_config(line, "lookup")) && !channel->lookups)
status = config_lookup(channel, p, "bind", "file");
- else if ((p = try_config(line, "search")) && channel->ndomains == -1)
+ else if ((p = try_config(line, "search")))
status = set_search(channel, p);
else if ((p = try_config(line, "nameserver")) && channel->nservers == -1)
status = config_nameserver(&servers, &nservers, p);

View File

@ -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@

View File

@ -1 +1 @@
SHA512 (c-ares-1.17.2.tar.gz) = f625e0ef8508af6475d3e83b51ab29be8a4878e2a87e7f518bea046b76a74bfde7043ca6ec2a9e714c898ab9e5d4a5a678c3347a9f9eb68980438f7ca8ae3fc8
2ca44be1715cd2c5666a165d35788424 c-ares-1.12.0.tar.gz

File diff suppressed because it is too large Load Diff