packages: c-ares/c-ares.spec, c-ares/c-ares-resolv.conf-reading-is-not-fata...

[glen]

Author: glen                         Date: Sun Feb  7 13:06:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- treat not readable resolv.conf (and other /etc files) as if it was empty, not give out fatal error on it
- so curl-libs -> python-pycurl -> python-urlgrabber could be built on our builders
  see http://lists.pld-linux.org/mailman/pipermail/pld-cvs-commit/Week-of-Mon-20100201/265667.html
- rel 2

---- Files affected:
packages/c-ares:
   c-ares.spec (1.9 -> 1.10) , c-ares-resolv.conf-reading-is-not-fatal.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/c-ares/c-ares.spec
diff -u packages/c-ares/c-ares.spec:1.9 packages/c-ares/c-ares.spec:1.10
--- packages/c-ares/c-ares.spec:1.9	Sun Feb  7 14:01:23 2010
+++ packages/c-ares/c-ares.spec	Sun Feb  7 14:06:50 2010
@@ -3,11 +3,12 @@
 Summary(pl.UTF-8):	Biblioteka do wykonywania asynchronicznych zapytań DNS
 Name:		c-ares
 Version:	1.6.0
-Release:	1
+Release:	2
 License:	MIT
 Group:		Libraries
 Source0:	http://daniel.haxx.se/projects/c-ares/%{name}-%{version}.tar.gz
 # Source0-md5:	4503b0db3dd79d3c1f58d87722dbab46
+Patch0:		%{name}-resolv.conf-reading-is-not-fatal.patch
 URL:		http://daniel.haxx.se/projects/c-ares/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -51,6 +52,7 @@
 
 %prep
 %setup -q
+%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
@@ -102,6 +104,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2010/02/07 13:06:50  glen
+- treat not readable resolv.conf (and other /etc files) as if it was empty, not give out fatal error on it
+- so curl-libs -> python-pycurl -> python-urlgrabber could be built on our builders
+  see http://lists.pld-linux.org/mailman/pipermail/pld-cvs-commit/Week-of-Mon-20100201/265667.html
+- rel 2
+
 Revision 1.9  2010/02/07 13:01:23  glen
 - build with our debugflags to get proper debuginfo package
 

================================================================
Index: packages/c-ares/c-ares-resolv.conf-reading-is-not-fatal.patch
diff -u /dev/null packages/c-ares/c-ares-resolv.conf-reading-is-not-fatal.patch:1.1
--- /dev/null	Sun Feb  7 14:06:56 2010
+++ packages/c-ares/c-ares-resolv.conf-reading-is-not-fatal.patch	Sun Feb  7 14:06:50 2010
@@ -0,0 +1,34 @@
+--- 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 @@
+       switch(error) {
+       case ENOENT:
+       case ESRCH:
++      case EACCES:
+         status = ARES_EOF;
+         break;
+       default:
+@@ -865,6 +866,7 @@
+         switch(error) {
+         case ENOENT:
+         case ESRCH:
++        case EACCES:
+           status = ARES_EOF;
+           break;
+         default:
+@@ -892,6 +894,7 @@
+         switch(error) {
+         case ENOENT:
+         case ESRCH:
++        case EACCES:
+           status = ARES_EOF;
+           break;
+         default:
+@@ -919,6 +922,7 @@
+         switch(error) {
+         case ENOENT:
+         case ESRCH:
++        case EACCES:
+           status = ARES_EOF;
+           break;
+         default:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/c-ares/c-ares.spec?r1=1.9&r2=1.10&f=u