rpms/bind/devel bind-9.5-_res_errno.patch, NONE, 1.1 bind.spec, 1.214, 1.215 bind-9.5-2119_revert.patch, 1.1, NONE bind-9.5-fix_h_errno.patch, 1.1, NONE
Adam Tkac (atkac)
fedora-extras-commits at redhat.com
Thu Sep 6 11:36:45 UTC 2007
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch, NONE, 1.1 openoffice.org.spec, 1.1299, 1.1300
- Next message (by thread): rpms/ocaml/devel ocaml-find-provides.sh, 1.1, 1.2 ocaml-find-requires.sh, 1.2, 1.3 ocaml.spec, 1.33, 1.34
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: atkac
Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv533
Modified Files:
bind.spec
Added Files:
bind-9.5-_res_errno.patch
Removed Files:
bind-9.5-2119_revert.patch bind-9.5-fix_h_errno.patch
Log Message:
- bind-9.5-2119_revert.patch and bind-9.5-fix_h_errno.patch are
obsoleted by upstream bind-9.5-_res_errno.patch
bind-9.5-_res_errno.patch:
--- NEW FILE bind-9.5-_res_errno.patch ---
Written-by: Mark Andrews <Mark_Andrews isc org> (upstream)
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/devel/bind.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- bind.spec 6 Sep 2007 08:10:34 -0000 1.214
+++ bind.spec 6 Sep 2007 11:36:13 -0000 1.215
@@ -21,7 +21,7 @@
Name: bind
License: ISC
Version: 9.5.0
-Release: 11.9.%{RELEASEVER}%{?dist}
+Release: 12.%{RELEASEVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,9 +65,8 @@
Patch71: bind-9.5-overflow.patch
Patch72: bind-9.5-dlz-64bit.patch
Patch75: bind-9.5-update.patch
-Patch76: bind-9.5-2119_revert.patch
-Patch77: bind-9.5-fix_h_errno.patch
Patch78: bind-9.5-pool_badfree.patch
+Patch79: bind-9.5-_res_errno.patch
# SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -249,9 +248,8 @@
%endif
%patch73 -p1 -b .libidn
%patch75 -p1 -b .update
-%patch76 -p1 -b .2119
-%patch77 -p1 -b .errno
%patch78 -p1 -b .badfree
+%patch79 -p1 -b .errno
:;
@@ -648,6 +646,10 @@
%{_sbindir}/bind-chroot-admin
%changelog
+* Thu Sep 06 2007 Adam Tkac <atkac redhat com> 32:9.5.0-12.a6
+- bind-9.5-2119_revert.patch and bind-9.5-fix_h_errno.patch are
+ obsoleted by upstream bind-9.5-_res_errno.patch
+
* Wed Sep 05 2007 Adam Tkac <atkac redhat com> 32:9.5.0-11.9.a6
- fixed wrong resolver's dispatch pool cleanup (#275011, patch from
tmraz redhat com)
--- bind-9.5-2119_revert.patch DELETED ---
--- bind-9.5-fix_h_errno.patch DELETED ---
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch, NONE, 1.1 openoffice.org.spec, 1.1299, 1.1300
- Next message (by thread): rpms/ocaml/devel ocaml-find-provides.sh, 1.1, 1.2 ocaml-find-requires.sh, 1.2, 1.3 ocaml.spec, 1.33, 1.34
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list