[miredo] * Wed Aug 04 2010 "Jens Kuehnel <fedora-package at jens.kuehnel.org>" - 1.1.7-5 - Fixed BZ#606106 - mir

[jens]

commit e636f64058bc242f8284972fe13c290d6ae95e7b
Author: Jens Kuehnel <fedora-package at jens.kuehnel.org>
Date:   Wed Aug 4 22:02:12 2010 +0200

    * Wed Aug 04 2010 "Jens Kuehnel <fedora-package at jens.kuehnel.org>" - 1.1.7-5
    - Fixed BZ#606106 - miredo-client fails to notice resolv.conf changes

 miredo.spec                            |    7 ++++++-
 reread-resolv-before-resolv-ipv4.patch |   16 ++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/miredo.spec b/miredo.spec
index e6319bd..20f571b 100644
--- a/miredo.spec
+++ b/miredo.spec
@@ -8,7 +8,7 @@
 
 Name:           miredo
 Version:        1.1.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Tunneling of IPv6 over UDP through NATs
 
 Group:          Applications/Internet
@@ -18,6 +18,7 @@ Source0:        http://www.remlab.net/files/miredo/miredo-%{version}.tar.bz2
 Source1:        miredo-client.init
 Source2:        miredo-server.init
 Patch0:         miredo-config-not-exec
+Patch1:         reread-resolv-before-resolv-ipv4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    libcap-devel 
@@ -91,6 +92,7 @@ part of miredo. Most people only need the client part.
 %prep
 %setup -q
 %patch0 -p1 
+%patch1 -p1
 
 %build
 %configure \
@@ -205,6 +207,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 04 2010 "Jens Kuehnel <fedora-package at jens.kuehnel.org>" - 1.1.7-5
+- Fixed BZ#606106 - miredo-client fails to notice resolv.conf changes
+
 * Thu Jul 30 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-4
 - Fix Obsoletes for smooth upgrade
 
diff --git a/reread-resolv-before-resolv-ipv4.patch b/reread-resolv-before-resolv-ipv4.patch
new file mode 100644
index 0000000..4d7d9e1
--- /dev/null
+++ b/reread-resolv-before-resolv-ipv4.patch
@@ -0,0 +1,16 @@
+@@ -, +, @@ 
+ libteredo/maintain.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+--- a/libteredo/maintain.c	
++++ a/libteredo/maintain.c	
+@@ -262,6 +262,9 @@ void maintenance_thread (teredo_maintenance *m)
+ 		/* Resolve server IPv4 addresses */
+ 		while (server_ip == 0)
+ 		{
++			/* Reread resolv.conf, it could have changed */
++			res_init();
++
+ 			/* FIXME: mutex kept while resolving - very bad */
+ 			int val = getipv4byname (m->server, &server_ip);
+ 			gettime (&deadline);
+