rpms/bind
5
0
Fork 1
Code Issues Pull Requests Releases Activity

Remove unneeded bind99-v6only.patch

Browse Source 
Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2012-03-26 15:12:45 +02:00
parent e845d82d1a
commit bcb8c5a5f6
2 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bind.spec
View File

@ -22,7 +22,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: ISC
Version: 9.9.0
Release: 1%{?dist}
Release: 2%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -72,7 +72,6 @@ Patch121:bind97-rh714049.patch
Patch123:bind98-rh735103.patch
Patch124:nslookup-norec.patch
Patch125:bind99-buildfix.patch
Patch126:bind99-v6only.patch
Patch127:bind99-forward.patch
Patch128:bind99-coverity.patch
@ -302,7 +301,6 @@ pushd bin/dig
%patch124 -p0 -b .nslookup-norec
popd
%patch125 -p1 -b .buildfix
%patch126 -p1 -b .v6only
%patch127 -p1 -b .forward
# Sparc and s390 arches need to use -fPIE
@ -775,6 +773,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
* Mon Mar 26 2012 Adam Tkac <atkac redhat com> 32:9.9.0-2
- remove unneeded bind99-v6only.patch
* Mon Mar 05 2012 Adam Tkac <atkac redhat com> 32:9.9.0-1
- update to 9.9.0
- load dynamic DBs later (and update dyndb patch)

29
bind99-v6only.patch
View File

@ -1,29 +0,0 @@
diff -up bind-9.9.0b1/lib/isc/unix/socket.c.v6only bind-9.9.0b1/lib/isc/unix/socket.c
--- bind-9.9.0b1/lib/isc/unix/socket.c.v6only 2011-11-10 14:35:26.457842491 +0100
+++ bind-9.9.0b1/lib/isc/unix/socket.c 2011-11-10 14:38:55.928827943 +0100
@@ -5726,7 +5726,24 @@ isc__socket_ipv6only(isc_socket_t *sock0
#ifdef IPV6_V6ONLY
if (sock->pf == AF_INET6) {
- if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_V6ONLY,
+ int current;
+ socklen_t len = sizeof(int);
+ if (getsockopt(sock->fd, IPPROTO_IPV6, IPV6_V6ONLY,
+ (void *)&current, &len) < 0 ) {
+ char strbuf[ISC_STRERRORSIZE];
+ isc__strerror(errno, strbuf, sizeof(strbuf));
+ UNEXPECTED_ERROR(__FILE__, __LINE__,
+ "getsockopt(%d, IPV6_V6ONLY) "
+ "%s: %s", sock->fd,
+ isc_msgcat_get(isc_msgcat,
+ ISC_MSGSET_GENERAL,
+ ISC_MSG_FAILED,
+ "failed"),
+ strbuf);
+ }
+
+ if (current != onoff &&
+ setsockopt(sock->fd, IPPROTO_IPV6, IPV6_V6ONLY,
(void *)&onoff, sizeof(int)) < 0) {
char strbuf[ISC_STRERRORSIZE];
isc__strerror(errno, strbuf, sizeof(strbuf));