diff options
| author | jvdias <jvdias@fedoraproject.org> | 2005-03-10 03:20:29 +0000 |
|---|---|---|
| committer | jvdias <jvdias@fedoraproject.org> | 2005-03-10 03:20:29 +0000 |
| commit | bbcf3c1d1968ccd46c007a3c62b52100b201f46b (patch) | |
| tree | e4f485748c67c8a339df7110268c3aa49e1a5d11 | |
| parent | 8f913ad56cdcc29de8db0049becede06f8880fec (diff) | |
| download | bind-bbcf3c1d1968ccd46c007a3c62b52100b201f46b.tar.gz bind-bbcf3c1d1968ccd46c007a3c62b52100b201f46b.tar.xz bind-bbcf3c1d1968ccd46c007a3c62b52100b201f46b.zip | |
fix bug 150288 - libbind not accessing or setting h_errno correctly
| -rw-r--r-- | bind.spec | 14 | ||||
| -rw-r--r-- | libbind-9.3.1rc1-fix_h_errno.patch | 26 |
2 files changed, 38 insertions, 2 deletions
@@ -8,7 +8,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serve Name: bind License: BSD-like Version: 9.3.1rc1 -Release: 4_FC4 +Release: 5 Epoch: 22 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -24,6 +24,7 @@ Source5: rfc1912.txt Source6: bind-chroot.tar.gz Source7: bind-9.3.1rc1-sdb_tools-Makefile.in Source8: dnszone.schema +Source9: libbind-man.tar.gz # http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt Patch: bind-9.2.0rc3-varrun.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 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 Requires(pre,preun): shadow-utils Requires(post,preun): chkconfig Requires(post): textutils, fileutils, sed, grep @@ -175,6 +177,7 @@ cp -fp contrib/sdb/pgsql/zonetodb.c bin/sdb_tools %endif %if %{LIBBIND} %patch13 -p1 -b .fix_libbind_includedir +%patch14 -p1 -b .fix_h_errno %endif %build @@ -247,6 +250,7 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/named mkdir -p $RPM_BUILD_ROOT/etc/openldap/schema install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/openldap/schema/dnszone.schema %endif +gunzip < %{SOURCE9} | (cd $RPM_BUILD_ROOT/usr/share; tar -xpf -) %if %{test} if [ "`whoami`" = 'root' ]; then set -e @@ -425,7 +429,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_includedir}/isccc %{_includedir}/isccfg %{_includedir}/lwres -%{_mandir}/man3/* +%{_mandir}/man3/lwres* %{_bindir}/isc-config.sh %doc doc/draft doc/rfc @@ -435,6 +439,9 @@ rm -rf ${RPM_BUILD_ROOT} %defattr(-,root,root) %{_libdir}/libbind.* %{_includedir}/bind +%{_mandir}/man3/libbind-* +%{_mandir}/man7/libbind-* +%{_mandir}/man5/libbind-* %post libbind-devel -p /sbin/ldconfig @@ -618,6 +625,9 @@ if [ "$1" -gt 0 ]; then fi; %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 - Rebuild with gcc4 / glibc-2.3.4-14. diff --git a/libbind-9.3.1rc1-fix_h_errno.patch b/libbind-9.3.1rc1-fix_h_errno.patch new file mode 100644 index 0000000..aa52d86 --- /dev/null +++ b/libbind-9.3.1rc1-fix_h_errno.patch @@ -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); + } + |