summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <atkac@fedoraproject.org>2008-10-30 11:06:52 +0000
committerAdam Tkac <atkac@fedoraproject.org>2008-10-30 11:06:52 +0000
commitcc7f3e831ab340147129b53b2efc19eeb71885e1 (patch)
tree4737ec7b145157550dda0c2cfe6e05badcf799ad
parent1a7b0845f3371d52c007268dae57144a23ecaa20 (diff)
downloadbind-cc7f3e831ab340147129b53b2efc19eeb71885e1.tar.gz
bind-cc7f3e831ab340147129b53b2efc19eeb71885e1.tar.xz
bind-cc7f3e831ab340147129b53b2efc19eeb71885e1.zip
- ship dns/{s,}dlz.h and isc/radix.h in bind-develbind-9_5_1-0_8_1_b2_fc10
-rw-r--r--bind-95-sdlz-include.patch32
-rw-r--r--bind.spec7
2 files changed, 38 insertions, 1 deletions
diff --git a/bind-95-sdlz-include.patch b/bind-95-sdlz-include.patch
new file mode 100644
index 0000000..304b018
--- /dev/null
+++ b/bind-95-sdlz-include.patch
@@ -0,0 +1,32 @@
+diff -up bind-9.5.1b2/lib/dns/include/dns/Makefile.in.includes bind-9.5.1b2/lib/dns/include/dns/Makefile.in
+--- bind-9.5.1b2/lib/dns/include/dns/Makefile.in.includes 2007-09-12 03:09:08.000000000 +0200
++++ bind-9.5.1b2/lib/dns/include/dns/Makefile.in 2008-10-30 13:00:33.000000000 +0100
+@@ -23,14 +23,14 @@ top_srcdir = @top_srcdir@
+
+ HEADERS = acl.h adb.h byaddr.h cache.h callbacks.h \
+ cert.h compress.h \
+- db.h dbiterator.h dbtable.h diff.h dispatch.h \
++ db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
+ dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
+ keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
+ message.h name.h ncache.h \
+ nsec.h peer.h portlist.h rbt.h rcode.h \
+ rdata.h rdataclass.h rdatalist.h rdataset.h rdatasetiter.h \
+ rdataslab.h rdatatype.h request.h resolver.h result.h \
+- rootns.h sdb.h secalg.h secproto.h soa.h ssu.h \
++ rootns.h sdb.h secalg.h secproto.h sdlz.h soa.h ssu.h \
+ tcpmsg.h time.h tkey.h \
+ tsig.h ttl.h types.h validator.h version.h view.h xfrin.h \
+ zone.h zonekey.h zt.h
+diff -up bind-9.5.1b2/lib/isc/include/isc/Makefile.in.includes bind-9.5.1b2/lib/isc/include/isc/Makefile.in
+--- bind-9.5.1b2/lib/isc/include/isc/Makefile.in.includes 2008-10-30 12:59:46.000000000 +0100
++++ bind-9.5.1b2/lib/isc/include/isc/Makefile.in 2008-10-30 13:00:03.000000000 +0100
+@@ -35,7 +35,7 @@ HEADERS = app.h assertions.h base64.h bi
+ lfsr.h lib.h list.h log.h \
+ magic.h md5.h mem.h msgcat.h msgs.h \
+ mutexblock.h netaddr.h ondestroy.h os.h parseint.h \
+- print.h quota.h random.h ratelimiter.h \
++ print.h quota.h radix.h random.h ratelimiter.h \
+ refcount.h region.h resource.h \
+ result.h resultclass.h rwlock.h serial.h sha1.h sha2.h \
+ sockaddr.h socket.h stdio.h stdlib.h string.h \
diff --git a/bind.spec b/bind.spec
index 6f4c5d6..8197a98 100644
--- a/bind.spec
+++ b/bind.spec
@@ -19,7 +19,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: ISC
Version: 9.5.1
-Release: 0.8.%{PREVER}%{?dist}
+Release: 0.8.1.%{PREVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +56,7 @@ Patch16: bind-9.3.2-redhat_doc.patch
Patch71: bind-9.5-overflow.patch
Patch72: bind-9.5-dlz-64bit.patch
Patch87: bind-9.5-parallel-build.patch
+Patch95: bind-95-sdlz-include.patch
# SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -237,6 +238,7 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
%patch85 -p1 -b .libidn3
%patch87 -p1 -b .parallel
%patch94 -p1 -b .rh461409
+%patch95 -p1 -b .includes
# Sparc and s390 arches need to use -fPIE
%ifarch sparcv9 sparc64 s390 s390x
@@ -634,6 +636,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sbindir}/bind-chroot-admin
%changelog
+* Thu Oct 30 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.8.1.b2
+- ship dns/{s,}dlz.h and isc/radix.h in bind-devel
+
* Tue Oct 07 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.8.b2
- removed bind-9.4.0-dnssec-directory.patch, it is wrong