dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-c-ares-1.6.0.tar.gz

.gitignore

@@ -0,0 +1 @@
+c-ares-1.7.0.tar.gz

0001-ares_init-Last-not-first-instance-of-domain-or-searc.patch

@@ -0,0 +1,67 @@
+From 125b1a8619eb27556e093fd9c9adf451e896f012 Mon Sep 17 00:00:00 2001
+From: Jakub Hrozek <jhrozek@redhat.com>
+Date: Mon, 31 May 2010 16:32:54 +0200
+Subject: [PATCH] ares_init: Last, not first instance of domain or search should win
+
+diff --git a/ares_init.3 b/ares_init.3
+index 00ff36d..fb25306 100644
+--- a/ares_init.3
++++ b/ares_init.3
+@@ -109,7 +109,7 @@ or the domain derived from the kernel hostname variable.
+ .B ARES_OPT_LOOKUPS
+ .B char *\fIlookups\fP;
+ .br
+-The lookups to perform for host queries.  
++The lookups to perform for host queries.
+ .I lookups
+ should be set to a string of the characters "b" or "f", where "b"
+ indicates a DNS lookup and "f" indicates a lookup in the hosts file.
+@@ -189,6 +189,27 @@ The process's available memory was exhausted.
+ .TP 14
+ .B ARES_ENOTINITIALIZED
+ c-ares library initialization not yet performed.
++.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 --git a/ares_init.c b/ares_init.c
+index 1f561aa..9d1e447 100644
+--- a/ares_init.c
++++ b/ares_init.c
+@@ -839,11 +839,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);
+-- 
+1.6.6.1
+

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: c-ares
-# $Id$
-NAME := c-ares
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

c-ares-1.7.0-optflags.patch

@@ -1,7 +1,7 @@
-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 
+diff -up c-ares-1.7.0/configure.optflags c-ares-1.7.0/configure
+--- c-ares-1.7.0/configure.optflags	2009-11-30 16:10:42.000000000 -0500
++++ c-ares-1.7.0/configure	2009-12-01 11:36:41.154374899 -0500
+@@ -13988,7 +13988,7 @@ $as_echo "$as_me: WARNING: compiler opti
      ac_var_stripped=""
    for word1 in $tmp_CFLAGS; do
      ac_var_strip_word="no"
@@ -10,7 +10,7 @@ diff -up c-ares-1.6.0/configure~ c-ares-1.6.0/configure
        if test "$word1" = "$word2"; then
          ac_var_strip_word="yes"
        fi
-@@ -14966,7 +14966,7 @@ echo "$as_me: WARNING: compiler options 
+@@ -14004,7 +14004,7 @@ $as_echo "$as_me: WARNING: compiler opti
      ac_var_stripped=""
    for word1 in $tmp_CPPFLAGS; do
      ac_var_strip_word="no"
@@ -19,22 +19,22 @@ diff -up c-ares-1.6.0/configure~ c-ares-1.6.0/configure
        if test "$word1" = "$word2"; then
          ac_var_strip_word="yes"
        fi
-@@ -14982,12 +14982,12 @@ echo "$as_me: WARNING: compiler options 
+@@ -14020,12 +14020,12 @@ $as_echo "$as_me: WARNING: compiler opti
      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; }
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts debug enabling options" >&5
+ $as_echo_n "checking if compiler accepts debug enabling options... " >&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; }
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts debug disabling options" >&5
+ $as_echo_n "checking if compiler accepts debug disabling options... " >&6; }
 -      tmp_options="$flags_dbg_off"
 +      tmp_options=""
      fi
      #
      CPPFLAGS="$tmp_CPPFLAGS"
-@@ -15221,7 +15221,7 @@ echo $ECHO_N "checking if compiler optim
+@@ -14181,7 +14181,7 @@ $as_echo_n "checking if compiler optimiz
  
    ac_var_match_word="no"
    for word1 in $tmp_CFLAGS; do
@@ -43,7 +43,7 @@ diff -up c-ares-1.6.0/configure~ c-ares-1.6.0/configure
        if test "$word1" = "$word2"; then
          ac_var_match_word="yes"
        fi
-@@ -15239,7 +15239,7 @@ echo $ECHO_N "checking if compiler optim
+@@ -14199,7 +14199,7 @@ $as_echo_n "checking if compiler optimiz
  
    ac_var_match_word="no"
    for word1 in $tmp_CPPFLAGS; do
@@ -52,7 +52,7 @@ diff -up c-ares-1.6.0/configure~ c-ares-1.6.0/configure
        if test "$word1" = "$word2"; then
          ac_var_match_word="yes"
        fi
-@@ -15270,7 +15270,7 @@ echo "${ECHO_T}$honor_optimize_option" >
+@@ -14230,7 +14230,7 @@ $as_echo "$honor_optimize_option" >&6; }
      ac_var_stripped=""
    for word1 in $tmp_CFLAGS; do
      ac_var_strip_word="no"
@@ -61,7 +61,7 @@ diff -up c-ares-1.6.0/configure~ c-ares-1.6.0/configure
        if test "$word1" = "$word2"; then
          ac_var_strip_word="yes"
        fi
-@@ -15286,7 +15286,7 @@ echo "${ECHO_T}$honor_optimize_option" >
+@@ -14246,7 +14246,7 @@ $as_echo "$honor_optimize_option" >&6; }
      ac_var_stripped=""
    for word1 in $tmp_CPPFLAGS; do
      ac_var_strip_word="no"
@@ -70,16 +70,16 @@ diff -up c-ares-1.6.0/configure~ c-ares-1.6.0/configure
        if test "$word1" = "$word2"; then
          ac_var_strip_word="yes"
        fi
-@@ -15301,12 +15301,12 @@ echo "${ECHO_T}$honor_optimize_option" >
+@@ -14261,12 +14261,12 @@ $as_echo "$honor_optimize_option" >&6; }
        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; }
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
+ $as_echo_n "checking if compiler accepts optimizer enabling options... " >&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; }
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer disabling options" >&5
+ $as_echo_n "checking if compiler accepts optimizer disabling options... " >&6; }
 -        tmp_options="$flags_opt_off"
 +        tmp_options=""
        fi

c-ares-multilib.patch

@@ -0,0 +1,41 @@
+diff -up ./ares_build.h.in.multilib ./ares_build.h.in
+--- ./ares_build.h.in.multilib	2010-03-23 13:41:44.000000000 +0100
++++ ./ares_build.h.in	2010-06-15 10:38:15.804618311 +0200
+@@ -96,9 +96,6 @@
+ #  include <sys/socket.h>
+ #endif
+ 
+-/* The size of `long', as computed by sizeof. */
+-#undef CARES_SIZEOF_LONG
+-
+ /* Integral data type used for ares_socklen_t. */
+ #undef CARES_TYPEOF_ARES_SOCKLEN_T
+ 
+diff -up ./ares_rules.h.multilib ./ares_rules.h
+--- ./ares_rules.h.multilib	2010-06-15 10:39:22.895368907 +0200
++++ ./ares_rules.h	2010-06-15 10:40:19.271619152 +0200
+@@ -69,10 +69,12 @@
+  * Verify that some macros are actually defined.
+  */
+ 
++#if 0
+ #ifndef CARES_SIZEOF_LONG
+ #  error "CARES_SIZEOF_LONG definition is missing!"
+    Error Compilation_aborted_CARES_SIZEOF_LONG_is_missing
+ #endif
++#endif
+ 
+ #ifndef CARES_TYPEOF_ARES_SOCKLEN_T
+ #  error "CARES_TYPEOF_ARES_SOCKLEN_T definition is missing!"
+@@ -97,9 +99,11 @@
+  * is the same as the one reported by sizeof() at compile time.
+  */
+ 
++#if 0
+ typedef char
+   __cares_rule_01__
+     [CareschkszEQ(long, CARES_SIZEOF_LONG)];
++#endif
+ 
+ /*
+  * Verify that the size previously defined and expected for

c-ares.spec

@@ -1,13 +1,17 @@
 Summary: A library that performs asynchronous DNS operations
 Name: c-ares
-Version: 1.6.0
-Release: 3%{?dist}
+Version: 1.7.0
+Release: 5%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://c-ares.haxx.se/
 Source0: http://c-ares.haxx.se/c-ares-%{version}.tar.gz
 Source1: LICENSE
-Patch0: %{name}-1.6.0-optflags.patch
+Patch0: %{name}-1.7.0-optflags.patch
+Patch1: 0001-Allow-the-use-of-IPv6-nameservers.patch
+Patch2: 0001-ares_init-Last-not-first-instance-of-domain-or-searc.patch
+# Fixes: #602880
+Patch3: %{name}-multilib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -28,6 +32,9 @@ compile applications or shared objects that use c-ares.
 %prep
 %setup -q
 %patch0 -p1 -b .optflags
+%patch1 -p1 -b .ipv6
+%patch2 -p1 -b .search
+%patch3 -p1 -b .multilib
 cp %{SOURCE1} .
 f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f
 
@@ -55,13 +62,31 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-, root, root, 0755)
 %{_includedir}/ares.h
+%{_includedir}/ares_build.h
 %{_includedir}/ares_dns.h
+%{_includedir}/ares_rules.h
 %{_includedir}/ares_version.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libcares.pc
 %{_mandir}/man3/ares_*
 
 %changelog
+* Tue Jun 15 2010 Jakub Hrozek <jhrozek@redhat.com> - 1.7.0-5
+- Fix multilib -devel conflict (#602880)
+
+* Sun Mar  7 2010 Jakub Hrozek <jhrozek@redhat.com> - 1.7.0-4
+- Use last instance of search/domain, not the first one (#597286)
+
+* Sun Mar  7 2010 Jakub Hrozek <jhrozek@redhat.com> - 1.7.0-3
+- Change IPv6 nameserver patch according to upstream changes
+  (upstream revisions 1199,1201,1202)
+
+* Wed Mar  3 2010 Jakub Hrozek <jhrozek@redhat.com> - 1.7.0-2
+- Add a patch to allow usage of IPv6 nameservers
+
+* Tue Dec  1 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 1.7.0-1
+- update to 1.7.0
+
 * Sat Jul 25 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-3
 - Patch to make upstream build system honor our CFLAGS and friends.
 - Don't bother building throwaway static libs.

sources

@@ -1 +1 @@
-4503b0db3dd79d3c1f58d87722dbab46  c-ares-1.6.0.tar.gz
+15ab7852306b554b0b1145f41005a3bb  c-ares-1.7.0.tar.gz