rpms/bind/devel bind-9.5.0-errno-init.patch, NONE, 1.1 bind.spec, 1.190, 1.191 sources, 1.36, 1.37 libbind-9.3.1rc1-fix_h_errno.patch, 1.1, NONE
Adam Tkac (atkac)
fedora-extras-commits at redhat.com
Mon Jul 2 15:32:05 UTC 2007
- Previous message: rpms/python-genshi/FC-6 .cvsignore, 1.2, 1.3 python-genshi.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message: fedora-accounts export-bugzilla.py, 1.6, 1.7 bz-make-components.py, 1.13, 1.14
- 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-serv27021
Modified Files:
bind.spec sources
Added Files:
bind-9.5.0-errno-init.patch
Removed Files:
libbind-9.3.1rc1-fix_h_errno.patch
Log Message:
- minor changes in default configuration ('pedantic' changes only)
- fix wrong errno assigment in __res_vinit function (#245857)
- removed wrong patch to #150288
bind-9.5.0-errno-init.patch:
--- NEW FILE bind-9.5.0-errno-init.patch ---
diff -up bind-9.5.0a5/lib/bind/resolv/res_init.c.errno bind-9.5.0a5/lib/bind/resolv/res_init.c
--- bind-9.5.0a5/lib/bind/resolv/res_init.c.errno 2007-07-02 14:55:54.000000000 +0200
+++ bind-9.5.0a5/lib/bind/resolv/res_init.c 2007-07-02 14:57:03.000000000 +0200
@@ -168,7 +168,7 @@ __res_vinit(res_state statp, int preinit
union res_sockaddr_union u[2];
int maxns = MAXNS;
- h_errno = 0;
+ RES_SET_H_ERRNO(statp, 0);
if (statp->_u._ext.ext != NULL)
res_ndestroy(statp);
@@ -231,7 +231,7 @@ __res_vinit(res_state statp, int preinit
* to check our return code wont be able to make
* queries anyhow.
*/
- h_errno = statp->res_h_errno = NETDB_INTERNAL;
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
maxns = 0;
}
#ifdef RESOLVSORT
@@ -498,7 +498,7 @@ __res_vinit(res_state statp, int preinit
if ((cp = getenv("RES_OPTIONS")) != NULL)
res_setoptions(statp, cp, "env");
statp->options |= RES_INIT;
- return (h_errno);
+ return (statp->res_h_errno);
}
static void
Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- bind.spec 19 Jun 2007 13:12:47 -0000 1.190
+++ bind.spec 2 Jul 2007 15:31:28 -0000 1.191
@@ -16,7 +16,7 @@
Name: bind
License: BSD-like
Version: 9.5.0a5
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 31
Url: http://www.isc.org/products/BIND/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,12 +50,12 @@
Patch6: bind-9.2.2-nsl.patch
Patch10: bind-9.3.2b1-PIE.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
Patch32: bind-9.3.2-prctl_set_dumpable.patch
Patch52: bind-9.3.3-edns.patch
Patch63: bind-9.4.0-dnssec-directory.patch
Patch69: bind-9.5.0-generate-xml.patch
+Patch70: bind-9.5.0-errno-init.patch
# SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -228,7 +228,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}
@@ -264,6 +263,7 @@
%patch64 -p0 -b .autotools
popd
%patch65 -p1 -b .idn
+%patch70 -p1 -b .errno-init
:;
@@ -397,7 +397,7 @@
touch ${RPM_BUILD_ROOT}/etc/named.conf
# configuration files:
tar -C ${RPM_BUILD_ROOT} -xf %{SOURCE28}
-for f in /etc/named.conf /var/named/{named.ca,named.localhost,named.loopback,named.loopback.ipv6,named.empty}; do
+for f in /etc/named.conf /var/named/{named.ca,named.localhost,named.loopback,named.empty}; do
touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/$f;
done
install -m 644 %{SOURCE5} ./rfc1912.txt
@@ -409,7 +409,7 @@
mkdir -p sample/etc sample/var/named/{data,slaves}
cp -fp %{SOURCE25} sample/etc/named.conf
cp -fp ${RPM_BUILD_ROOT}/etc/named.rfc1912.zones sample/etc/named.rfc1912.zones
-cp -fp ${RPM_BUILD_ROOT}/var/named/{named.ca,named.localhost,named.loopback,named.loopback.ipv6,named.empty} sample/var/named
+cp -fp ${RPM_BUILD_ROOT}/var/named/{named.ca,named.localhost,named.loopback,named.empty} sample/var/named
for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.internal.zone.db my.external.zone.db; do
echo '@ in soa localhost. root 1 3H 15M 1W 1D
ns localhost.' > sample/var/named/$f;
@@ -563,8 +563,6 @@
%ghost %config %{chroot_prefix}/var/named/named.localhost
%config %verify(not link) /var/named/named.loopback
%ghost %config %{chroot_prefix}/var/named/named.loopback
-%config %verify(not link) /var/named/named.loopback.ipv6
-%ghost %config %{chroot_prefix}/var/named/named.loopback.ipv6
%config %verify(not link) /var/named/named.empty
%ghost %config %{chroot_prefix}/var/named/named.empty
%defattr(0644,root,root,0755)
@@ -704,6 +702,11 @@
%endif
%changelog
+* Thu Jul 02 2007 Adam Tkac <atkac redhat com> 31:9.5.0a5-2.fc8
+- minor changes in default configuration
+- fix h_errno assigment during resolver initialization (unbounded recursion, #245857)
+- removed wrong patch to #150288
+
* Tue Jun 19 2007 Adam Tkac <atkac redhat com> 31:9.5.0a5-1.fc8
- updated to latest upstream
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources 19 Jun 2007 10:57:53 -0000 1.36
+++ sources 2 Jul 2007 15:31:28 -0000 1.37
@@ -1,4 +1,4 @@
beb3f6e7e8e1f804d1fb79dd11319e1e bind-9.5.0a5.tar.gz
dd2b4f4b795a0a989b0a01f93db3a57b bind-chroot.tar.bz2
-c6e0f999e5d387aa2564f1d02ccba6db config.tar
+bdea8168751a29e61525f11e8195ad48 config.tar
13fef79f99fcefebb51d84b08805de51 libbind-man.tar.gz
--- libbind-9.3.1rc1-fix_h_errno.patch DELETED ---
- Previous message: rpms/python-genshi/FC-6 .cvsignore, 1.2, 1.3 python-genshi.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message: fedora-accounts export-bugzilla.py, 1.6, 1.7 bz-make-components.py, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list