rpms/bind/F-7 bind-9.4-_res_errno.patch, NONE, 1.1 bind.spec, 1.191, 1.192 bind-9.4-2119_revert.patch, 1.1, NONE libbind-9.3.1rc1-fix_h_errno.patch, 1.1, NONE

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7135

Modified Files:
	bind.spec 
Added Files:
	bind-9.4-_res_errno.patch 
Removed Files:
	bind-9.4-2119_revert.patch libbind-9.3.1rc1-fix_h_errno.patch 
Log Message:
- patches bind-9.4-2119_revert.patch and
  libbind-9.3.1rc1-fix_h_errno.patch are obsoleted by
  bind-9.4-_res_errno.patch


bind-9.4-_res_errno.patch:

--- NEW FILE bind-9.4-_res_errno.patch ---
Written-by: Mark Andrews <Mark_Andrews isc org>
Reviewed-by: Adam Tkac <atkac redhat com>

diff -up bind-9.5.0a6/lib/bind/resolv/res_data.c._res_errno bind-9.5.0a6/lib/bind/resolv/res_data.c
--- bind-9.5.0a6/lib/bind/resolv/res_data.c._res_errno	2007-09-06 09:26:29.000000000 +0200
+++ bind-9.5.0a6/lib/bind/resolv/res_data.c	2007-09-06 09:28:14.000000000 +0200
@@ -40,7 +40,6 @@ static const char rcsid[] = "$Id: res_da
 #include <unistd.h>
 
 #include "port_after.h"
-#undef _res
 
 const char *_res_opcodes[] = {
 	"QUERY",
@@ -70,6 +69,7 @@ const char *_res_sectioncodes[] = {
 };
 #endif
 
+#undef _res
 #ifndef __BIND_NOSTATIC
 struct __res_state _res
 # if defined(__BIND_RES_TEXT)
@@ -77,6 +77,10 @@ struct __res_state _res
 # endif
         ;
 
+#if defined(DO_PTHREADS) || defined(__linux)
+#define _res (*__res_state())
+#endif
+
 /* Proto. */
 
 int  res_ourserver_p(const res_state, const struct sockaddr_in *);


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-7/bind.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- bind.spec	3 Sep 2007 07:54:59 -0000	1.191
+++ bind.spec	6 Sep 2007 12:04:26 -0000	1.192
@@ -20,7 +20,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.4.2
-Release: 	0.2.%{RELEASEVER}%{?dist}
+Release: 	0.3.%{RELEASEVER}%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,7 +56,6 @@
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
 Patch12: 	bind-9.3.1rc1-sdb.patch
 Patch13: 	bind-9.3.1rc1-fix_libbind_includedir.patch
-Patch14: 	libbind-9.3.1rc1-fix_h_errno.patch
 Patch16: 	bind-9.3.2-redhat_doc.patch
 Patch17: 	bind-9.3.2b1-fix_sdb_ldap.patch
 Patch22: 	bind-9.3.1-sdb_dbus.patch
@@ -73,7 +72,7 @@
 Patch68:	bind-9.4.1-ldap-api.patch
 Patch70:	bind-9.4-update.patch
 Patch71:	bind-9.4-dbus.patch
-Patch72:	bind-9.4-2119_revert.patch
+Patch73:	bind-9.4-_res_errno.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): grep, chkconfig >= 1.3.26
@@ -259,7 +258,6 @@
 %endif
 %if %{LIBBIND}
 %patch13 -p1 -b .fix_libbind_includedir
-%patch14 -p1 -b .fix_h_errno
 %endif
 %patch16 -p1 -b .redhat_doc
 %if %{WITH_DBUS}
@@ -299,7 +297,7 @@
 %endif
 %patch66 -p1 -b .freeze
 %patch70 -p1 -b .update
-%patch72 -p1 -b .2119_revert
+%patch73 -p1 -b .errno
 :;
 
 
@@ -785,6 +783,11 @@
 
 
 %changelog
+* Thu Sep 06 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.3.b1
+- patches bind-9.4-2119_revert.patch and
+  libbind-9.3.1rc1-fix_h_errno.patch are obsoleted by
+  bind-9.4-_res_errno.patch
+
 * Fri Aug 31 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.2.b1
 - temporary revert ISC 2119 change which conflicts with our
   "libbind-errno" patch (#254501)


--- bind-9.4-2119_revert.patch DELETED ---


--- libbind-9.3.1rc1-fix_h_errno.patch DELETED ---