Make /etc/named.{root,iscdlv}.key world-readable and fix DLZ related compilation issues
Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
parent
2bd2458b3c
commit
4c513b0e09
12
bind.spec
12
bind.spec
|
@ -22,7 +22,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
|
||||||
Name: bind
|
Name: bind
|
||||||
License: ISC
|
License: ISC
|
||||||
Version: 9.8.1
|
Version: 9.8.1
|
||||||
Release: 0.2.%{PREVER}%{?dist}
|
Release: 0.3.%{PREVER}%{?dist}
|
||||||
Epoch: 32
|
Epoch: 32
|
||||||
Url: http://www.isc.org/products/BIND/
|
Url: http://www.isc.org/products/BIND/
|
||||||
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
@ -66,6 +66,7 @@ Patch118:bind97-rh699951.patch
|
||||||
Patch119:bind97-rh693982.patch
|
Patch119:bind97-rh693982.patch
|
||||||
Patch120:bind97-rh700097.patch
|
Patch120:bind97-rh700097.patch
|
||||||
Patch121:bind97-rh714049.patch
|
Patch121:bind97-rh714049.patch
|
||||||
|
Patch122:bind98-dlz_buildfix.patch
|
||||||
|
|
||||||
# SDB patches
|
# SDB patches
|
||||||
Patch11: bind-9.3.2b2-sdbsrc.patch
|
Patch11: bind-9.3.2b2-sdbsrc.patch
|
||||||
|
@ -306,6 +307,7 @@ mkdir m4
|
||||||
%patch119 -p1 -b .rh693982
|
%patch119 -p1 -b .rh693982
|
||||||
%patch120 -p1 -b .rh700097
|
%patch120 -p1 -b .rh700097
|
||||||
%patch121 -p1 -b .rh714049
|
%patch121 -p1 -b .rh714049
|
||||||
|
%patch122 -p1 -b .dlz_buildfix
|
||||||
|
|
||||||
# Sparc and s390 arches need to use -fPIE
|
# Sparc and s390 arches need to use -fPIE
|
||||||
%ifarch sparcv9 sparc64 s390 s390x
|
%ifarch sparcv9 sparc64 s390 s390x
|
||||||
|
@ -614,8 +616,8 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_libdir}/bind
|
%{_libdir}/bind
|
||||||
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/named
|
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/named
|
||||||
%config(noreplace) %attr(-,root,named) %{_sysconfdir}/named.iscdlv.key
|
%config(noreplace) %attr(0644,root,named) %{_sysconfdir}/named.iscdlv.key
|
||||||
%config(noreplace) %attr(-,root,named) %{_sysconfdir}/named.root.key
|
%config(noreplace) %attr(0644,root,named) %{_sysconfdir}/named.root.key
|
||||||
%{_sysconfdir}/tmpfiles.d/named.conf
|
%{_sysconfdir}/tmpfiles.d/named.conf
|
||||||
%{_sysconfdir}/rc.d/init.d/named
|
%{_sysconfdir}/rc.d/init.d/named
|
||||||
%{_sysconfdir}/NetworkManager/dispatcher.d/13-named
|
%{_sysconfdir}/NetworkManager/dispatcher.d/13-named
|
||||||
|
@ -774,6 +776,10 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 31 2011 Adam Tkac <atkac redhat com> 32:9.8.1-0.3.rc1
|
||||||
|
- fix DLZ related compilation issues
|
||||||
|
- make /etc/named.{root,iscdlv}.key world-readable
|
||||||
|
|
||||||
* Wed Aug 31 2011 Adam Tkac <atkac redhat com> 32:9.8.1-0.2.rc1
|
* Wed Aug 31 2011 Adam Tkac <atkac redhat com> 32:9.8.1-0.2.rc1
|
||||||
- fix rare race condition in request.c
|
- fix rare race condition in request.c
|
||||||
- print "the working directory is not writable" as debug message
|
- print "the working directory is not writable" as debug message
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
diff -up bind-9.8.1rc1/bin/tests/system/dlzexternal/Makefile.in.dlz_buildfix bind-9.8.1rc1/bin/tests/system/dlzexternal/Makefile.in
|
||||||
|
diff -up bind-9.8.1rc1/bin/tests/system/Makefile.in.dlz_buildfix bind-9.8.1rc1/bin/tests/system/Makefile.in
|
||||||
|
--- bind-9.8.1rc1/bin/tests/system/Makefile.in.dlz_buildfix 2011-08-31 17:04:34.466423526 +0200
|
||||||
|
+++ bind-9.8.1rc1/bin/tests/system/Makefile.in 2011-08-31 17:04:38.512423247 +0200
|
||||||
|
@@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@
|
||||||
|
|
||||||
|
@BIND9_MAKE_INCLUDES@
|
||||||
|
|
||||||
|
-SUBDIRS = dlzexternal filter-aaaa lwresd rpz tkey tsiggss
|
||||||
|
+SUBDIRS = filter-aaaa lwresd rpz tkey tsiggss
|
||||||
|
TARGETS =
|
||||||
|
|
||||||
|
@BIND9_MAKE_RULES@
|
||||||
|
diff -up bind-9.8.1rc1/contrib/dlz/drivers/sdlz_helper.c.dlz_buildfix bind-9.8.1rc1/contrib/dlz/drivers/sdlz_helper.c
|
||||||
|
--- bind-9.8.1rc1/contrib/dlz/drivers/sdlz_helper.c.dlz_buildfix 2010-05-14 08:29:37.000000000 +0200
|
||||||
|
+++ bind-9.8.1rc1/contrib/dlz/drivers/sdlz_helper.c 2011-08-31 16:53:47.736468453 +0200
|
||||||
|
@@ -50,7 +50,7 @@
|
||||||
|
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
-#ifdef DLZ
|
||||||
|
+#ifdef CONTRIB_DLZ
|
||||||
|
|
||||||
|
#include <config.h>
|
||||||
|
|
Loading…
Reference in New Issue