fix bug 150288 - libbind not accessing or setting h_errno correctly
This commit is contained in:
		
							parent
							
								
									8f913ad56c
								
							
						
					
					
						commit
						bbcf3c1d19
					
				
							
								
								
									
										14
									
								
								bind.spec
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								bind.spec
									
									
									
									
									
								
							@ -8,7 +8,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serve
 | 
				
			|||||||
Name: bind
 | 
					Name: bind
 | 
				
			||||||
License: BSD-like
 | 
					License: BSD-like
 | 
				
			||||||
Version: 9.3.1rc1
 | 
					Version: 9.3.1rc1
 | 
				
			||||||
Release: 4_FC4
 | 
					Release: 5
 | 
				
			||||||
Epoch:   22
 | 
					Epoch:   22
 | 
				
			||||||
Url: http://www.isc.org/products/BIND/
 | 
					Url: http://www.isc.org/products/BIND/
 | 
				
			||||||
Buildroot: %{_tmppath}/%{name}-root
 | 
					Buildroot: %{_tmppath}/%{name}-root
 | 
				
			||||||
@ -24,6 +24,7 @@ Source5: rfc1912.txt
 | 
				
			|||||||
Source6: bind-chroot.tar.gz
 | 
					Source6: bind-chroot.tar.gz
 | 
				
			||||||
Source7: bind-9.3.1rc1-sdb_tools-Makefile.in
 | 
					Source7: bind-9.3.1rc1-sdb_tools-Makefile.in
 | 
				
			||||||
Source8: dnszone.schema
 | 
					Source8: dnszone.schema
 | 
				
			||||||
 | 
					Source9: libbind-man.tar.gz
 | 
				
			||||||
# http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt
 | 
					# http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt
 | 
				
			||||||
Patch: bind-9.2.0rc3-varrun.patch
 | 
					Patch: bind-9.2.0rc3-varrun.patch
 | 
				
			||||||
Patch1: bind-9.2.1-key.patch
 | 
					Patch1: bind-9.2.1-key.patch
 | 
				
			||||||
@ -39,6 +40,7 @@ Patch10: bind-9.3.1rc1-no-libtool-for-PIEs.patch
 | 
				
			|||||||
Patch11: bind-9.3.1rc1-sdbsrc.patch
 | 
					Patch11: bind-9.3.1rc1-sdbsrc.patch
 | 
				
			||||||
Patch12: bind-9.3.1rc1-sdb.patch
 | 
					Patch12: bind-9.3.1rc1-sdb.patch
 | 
				
			||||||
Patch13: bind-9.3.1rc1-fix_libbind_includedir.patch
 | 
					Patch13: bind-9.3.1rc1-fix_libbind_includedir.patch
 | 
				
			||||||
 | 
					Patch14: libbind-9.3.1rc1-fix_h_errno.patch
 | 
				
			||||||
Requires(pre,preun): shadow-utils
 | 
					Requires(pre,preun): shadow-utils
 | 
				
			||||||
Requires(post,preun): chkconfig
 | 
					Requires(post,preun): chkconfig
 | 
				
			||||||
Requires(post): textutils, fileutils, sed, grep
 | 
					Requires(post): textutils, fileutils, sed, grep
 | 
				
			||||||
@ -175,6 +177,7 @@ cp -fp contrib/sdb/pgsql/zonetodb.c bin/sdb_tools
 | 
				
			|||||||
%endif
 | 
					%endif
 | 
				
			||||||
%if %{LIBBIND}
 | 
					%if %{LIBBIND}
 | 
				
			||||||
%patch13 -p1 -b .fix_libbind_includedir
 | 
					%patch13 -p1 -b .fix_libbind_includedir
 | 
				
			||||||
 | 
					%patch14 -p1 -b .fix_h_errno
 | 
				
			||||||
%endif
 | 
					%endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
%build
 | 
					%build
 | 
				
			||||||
@ -247,6 +250,7 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/named
 | 
				
			|||||||
mkdir -p $RPM_BUILD_ROOT/etc/openldap/schema
 | 
					mkdir -p $RPM_BUILD_ROOT/etc/openldap/schema
 | 
				
			||||||
install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/openldap/schema/dnszone.schema
 | 
					install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/openldap/schema/dnszone.schema
 | 
				
			||||||
%endif
 | 
					%endif
 | 
				
			||||||
 | 
					gunzip < %{SOURCE9} | (cd $RPM_BUILD_ROOT/usr/share; tar -xpf -) 
 | 
				
			||||||
%if %{test}
 | 
					%if %{test}
 | 
				
			||||||
if [ "`whoami`" = 'root' ]; then
 | 
					if [ "`whoami`" = 'root' ]; then
 | 
				
			||||||
   set -e
 | 
					   set -e
 | 
				
			||||||
@ -425,7 +429,7 @@ rm -rf ${RPM_BUILD_ROOT}
 | 
				
			|||||||
%{_includedir}/isccc
 | 
					%{_includedir}/isccc
 | 
				
			||||||
%{_includedir}/isccfg
 | 
					%{_includedir}/isccfg
 | 
				
			||||||
%{_includedir}/lwres
 | 
					%{_includedir}/lwres
 | 
				
			||||||
%{_mandir}/man3/*
 | 
					%{_mandir}/man3/lwres*
 | 
				
			||||||
%{_bindir}/isc-config.sh
 | 
					%{_bindir}/isc-config.sh
 | 
				
			||||||
%doc doc/draft doc/rfc 
 | 
					%doc doc/draft doc/rfc 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -435,6 +439,9 @@ rm -rf ${RPM_BUILD_ROOT}
 | 
				
			|||||||
%defattr(-,root,root)
 | 
					%defattr(-,root,root)
 | 
				
			||||||
%{_libdir}/libbind.*
 | 
					%{_libdir}/libbind.*
 | 
				
			||||||
%{_includedir}/bind
 | 
					%{_includedir}/bind
 | 
				
			||||||
 | 
					%{_mandir}/man3/libbind-*
 | 
				
			||||||
 | 
					%{_mandir}/man7/libbind-*
 | 
				
			||||||
 | 
					%{_mandir}/man5/libbind-*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
%post libbind-devel -p /sbin/ldconfig
 | 
					%post libbind-devel -p /sbin/ldconfig
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -618,6 +625,9 @@ if [ "$1" -gt 0 ]; then
 | 
				
			|||||||
fi;
 | 
					fi;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
%changelog
 | 
					%changelog
 | 
				
			||||||
 | 
					* Wed Mar  9 2005 Jason Vas Dias <jvdias@redhat.com> - 22.9.2.1rc1-5
 | 
				
			||||||
 | 
					- fix bug 150288: h_errno not being accessed / set correctly in libbind 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
* Mon Mar  7 2005 Jason Vas Dias <jvdias@redhat.com> - 22:9.3.1rc1-4
 | 
					* Mon Mar  7 2005 Jason Vas Dias <jvdias@redhat.com> - 22:9.3.1rc1-4
 | 
				
			||||||
- Rebuild with gcc4 / glibc-2.3.4-14.
 | 
					- Rebuild with gcc4 / glibc-2.3.4-14.
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										26
									
								
								libbind-9.3.1rc1-fix_h_errno.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								libbind-9.3.1rc1-fix_h_errno.patch
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,26 @@
 | 
				
			|||||||
 | 
					--- bind-9.3.1rc1/lib/bind/irs/irs_data.c.fix_h_errno	2004-11-29 20:15:43.000000000 -0500
 | 
				
			||||||
 | 
					+++ bind-9.3.1rc1/lib/bind/irs/irs_data.c	2005-03-09 21:05:52.000000000 -0500
 | 
				
			||||||
 | 
					@@ -222,12 +222,7 @@
 | 
				
			||||||
 | 
					 void
 | 
				
			||||||
 | 
					 __h_errno_set(struct __res_state *res, int err) {
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					-
 | 
				
			||||||
 | 
					-#if (__GLIBC__ > 2 || __GLIBC__ == 2 &&  __GLIBC_MINOR__ >= 3)
 | 
				
			||||||
 | 
					-	res->res_h_errno = err;
 | 
				
			||||||
 | 
					-#else
 | 
				
			||||||
 | 
					 	h_errno = res->res_h_errno = err;
 | 
				
			||||||
 | 
					-#endif
 | 
				
			||||||
 | 
					 }
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 #endif /*__BIND_NOSTATIC*/
 | 
				
			||||||
 | 
					--- bind-9.3.1rc1/lib/bind/resolv/res_query.c.fix_h_errno	2004-03-16 07:34:19.000000000 -0500
 | 
				
			||||||
 | 
					+++ bind-9.3.1rc1/lib/bind/resolv/res_query.c	2005-03-09 21:53:34.000000000 -0500
 | 
				
			||||||
 | 
					@@ -192,6 +192,8 @@
 | 
				
			||||||
 | 
					 		}
 | 
				
			||||||
 | 
					 		return (-1);
 | 
				
			||||||
 | 
					 	}
 | 
				
			||||||
 | 
					+	if( n > 0 )
 | 
				
			||||||
 | 
					+		RES_SET_H_ERRNO(statp,0);
 | 
				
			||||||
 | 
					 	return (n);
 | 
				
			||||||
 | 
					 }
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user