summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Bogusz2016-02-28 09:40:03 (GMT)
committerJakub Bogusz2016-02-28 09:40:03 (GMT)
commitcb743bc9e3ddc4b83cf73688fa81a120b0c35dbb (patch)
treee7714e7c8b4ba0be1322b18ccb11488ffc52c7e0
parentab6ad797b5f70acb2eedaaaa660fe9b54c2f825f (diff)
downloadc-ares-cb743bc9e3ddc4b83cf73688fa81a120b0c35dbb.zip
c-ares-cb743bc9e3ddc4b83cf73688fa81a120b0c35dbb.tar.gz
- updated to 1.11.0auto/th/c-ares-1.11.0-1
- updated resolv.conf-reading-is-not-fatal patch
-rw-r--r--c-ares-resolv.conf-reading-is-not-fatal.patch18
-rw-r--r--c-ares.spec13
2 files changed, 16 insertions, 15 deletions
diff --git a/c-ares-resolv.conf-reading-is-not-fatal.patch b/c-ares-resolv.conf-reading-is-not-fatal.patch
index 392ae45..10af031 100644
--- a/c-ares-resolv.conf-reading-is-not-fatal.patch
+++ b/c-ares-resolv.conf-reading-is-not-fatal.patch
@@ -1,6 +1,6 @@
---- c-ares-1.6.0/ares_init.c~ 2010-02-07 14:22:41.480067790 +0200
-+++ c-ares-1.6.0/ares_init.c 2010-02-07 14:22:42.962764879 +0200
-@@ -839,6 +839,7 @@
+--- c-ares-1.11.0/ares_init.c.orig 2016-02-11 12:23:52.000000000 +0100
++++ c-ares-1.11.0/ares_init.c 2016-02-28 10:01:24.592903895 +0100
+@@ -1292,6 +1292,7 @@
switch(error) {
case ENOENT:
case ESRCH:
@@ -8,27 +8,27 @@
status = ARES_EOF;
break;
default:
-@@ -865,6 +866,7 @@
+@@ -1319,6 +1320,7 @@
switch(error) {
case ENOENT:
case ESRCH:
+ case EACCES:
- status = ARES_EOF;
break;
default:
-@@ -892,6 +894,7 @@
+ DEBUGF(fprintf(stderr, "fopen() failed with error: %d %s\n",
+@@ -1350,6 +1352,7 @@
switch(error) {
case ENOENT:
case ESRCH:
+ case EACCES:
- status = ARES_EOF;
break;
default:
-@@ -919,6 +922,7 @@
+ DEBUGF(fprintf(stderr, "fopen() failed with error: %d %s\n",
+@@ -1381,6 +1384,7 @@
switch(error) {
case ENOENT:
case ESRCH:
+ case EACCES:
- status = ARES_EOF;
break;
default:
+ DEBUGF(fprintf(stderr, "fopen() failed with error: %d %s\n",
diff --git a/c-ares.spec b/c-ares.spec
index f254154..aa2d4de 100644
--- a/c-ares.spec
+++ b/c-ares.spec
@@ -1,12 +1,12 @@
Summary: A library that performs asynchronous DNS operations
Summary(pl.UTF-8): Biblioteka do wykonywania asynchronicznych zapytaƄ DNS
Name: c-ares
-Version: 1.10.0
-Release: 2
+Version: 1.11.0
+Release: 1
License: MIT
Group: Libraries
Source0: http://c-ares.haxx.se/download/%{name}-%{version}.tar.gz
-# Source0-md5: 1196067641411a75d3cbebe074fd36d8
+# Source0-md5: d5c6d522cfc54bb6f215a0b7912d46be
Patch0: %{name}-resolv.conf-reading-is-not-fatal.patch
URL: http://c-ares.haxx.se/
BuildRequires: autoconf >= 2.57
@@ -54,8 +54,8 @@ Statyczna biblioteka c-ares.
%patch0 -p1
# we want our own debug flags, if any
-sed -i -e 's/flags_dbg_off=".*"/flags_dbg_off="%{rpmcflags}"/' m4/cares-compilers.m4
-sed -i -e 's/flags_opt_yes=".*"/flags_opt_yes="%{rpmcflags}"/' m4/cares-compilers.m4
+%{__sed} -i -e 's/flags_dbg_off=".*"/flags_dbg_off="%{rpmcflags}"/' m4/cares-compilers.m4
+%{__sed} -i -e 's/flags_opt_yes=".*"/flags_opt_yes="%{rpmcflags}"/' m4/cares-compilers.m4
%build
%{__libtoolize}
@@ -64,6 +64,7 @@ sed -i -e 's/flags_opt_yes=".*"/flags_opt_yes="%{rpmcflags}"/' m4/cares-compiler
%{__autoconf}
%{__automake}
%configure \
+ --disable-silent-rules \
--enable-optimize="%{rpmcflags}" \
--enable-shared
@@ -82,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README README.cares CHANGES NEWS
+%doc CHANGES NEWS README.cares README.md
%attr(755,root,root) %{_libdir}/libcares.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libcares.so.2