summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/bind
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-03-04 13:56:06 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-11 20:28:57 -0700
commit5ab5b77999d06ce7b8e4c789cf4eccf5c3ffc7a1 (patch)
tree269a424906715d34f8d06b8ddab7cc30d0e1546b /meta/recipes-connectivity/bind
parentf7557a1793b45b7bdbcc06e875021d9a8b43ec79 (diff)
downloadpoky-5ab5b77999d06ce7b8e4c789cf4eccf5c3ffc7a1.tar.gz
bind: Update to 9.9.5
Remove CVE patches that are in bind Updated COPYRIGHT includes date changes the NetBSD Copyright Modifies the Base BSD License to 3-Clause (removes advertising clause)w Add patch to disable running tests on host Add python-core to RDEPENDS for dnssec-checkds and dnssec-coverage and fix path to python (From OE-Core rev: 041576d6d63ad807ca405dcea9eeecf1c9ccd7fe) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bind')
-rw-r--r--meta/recipes-connectivity/bind/bind/bind-9.8.1-CVE-2012-5166.patch (renamed from meta/recipes-connectivity/bind/bind-9.8.1/bind-9.8.1-CVE-2012-5166.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind/bind-CVE-2011-4313.patch (renamed from meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2011-4313.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind/bind-CVE-2012-1667.patch (renamed from meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-1667.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind/bind-CVE-2012-3817.patch (renamed from meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-3817.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind/bind-CVE-2013-2266.patch (renamed from meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2013-2266.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind/bind-Fix-CVE-2012-4244.patch (renamed from meta/recipes-connectivity/bind/bind-9.8.1/bind-Fix-CVE-2012-4244.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind/conf.patch (renamed from meta/recipes-connectivity/bind/bind-9.8.1/conf.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind/cross-build-fix.patch (renamed from meta/recipes-connectivity/bind/bind-9.8.1/cross-build-fix.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind/dont-test-on-host.patch13
-rw-r--r--meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch (renamed from meta/recipes-connectivity/bind/bind-9.8.1/make-etc-initd-bind-stop-work.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind/mips1-not-support-opcode.diff (renamed from meta/recipes-connectivity/bind/bind-9.8.1/mips1-not-support-opcode.diff)0
-rw-r--r--meta/recipes-connectivity/bind/bind_9.9.5.bb (renamed from meta/recipes-connectivity/bind/bind_9.8.1.bb)21
12 files changed, 22 insertions, 12 deletions
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-9.8.1-CVE-2012-5166.patch b/meta/recipes-connectivity/bind/bind/bind-9.8.1-CVE-2012-5166.patch
index 0abb475adc..0abb475adc 100644
--- a/meta/recipes-connectivity/bind/bind-9.8.1/bind-9.8.1-CVE-2012-5166.patch
+++ b/meta/recipes-connectivity/bind/bind/bind-9.8.1-CVE-2012-5166.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2011-4313.patch b/meta/recipes-connectivity/bind/bind/bind-CVE-2011-4313.patch
index 19d8df1c2d..19d8df1c2d 100644
--- a/meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2011-4313.patch
+++ b/meta/recipes-connectivity/bind/bind/bind-CVE-2011-4313.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-1667.patch b/meta/recipes-connectivity/bind/bind/bind-CVE-2012-1667.patch
index c441eab65d..c441eab65d 100644
--- a/meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-1667.patch
+++ b/meta/recipes-connectivity/bind/bind/bind-CVE-2012-1667.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-3817.patch b/meta/recipes-connectivity/bind/bind/bind-CVE-2012-3817.patch
index 1e159bd2f8..1e159bd2f8 100644
--- a/meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-3817.patch
+++ b/meta/recipes-connectivity/bind/bind/bind-CVE-2012-3817.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2013-2266.patch b/meta/recipes-connectivity/bind/bind/bind-CVE-2013-2266.patch
index 7ec6deb714..7ec6deb714 100644
--- a/meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2013-2266.patch
+++ b/meta/recipes-connectivity/bind/bind/bind-CVE-2013-2266.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-Fix-CVE-2012-4244.patch b/meta/recipes-connectivity/bind/bind/bind-Fix-CVE-2012-4244.patch
index 5dd6f69e45..5dd6f69e45 100644
--- a/meta/recipes-connectivity/bind/bind-9.8.1/bind-Fix-CVE-2012-4244.patch
+++ b/meta/recipes-connectivity/bind/bind/bind-Fix-CVE-2012-4244.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/conf.patch b/meta/recipes-connectivity/bind/bind/conf.patch
index 2785c6a22f..2785c6a22f 100644
--- a/meta/recipes-connectivity/bind/bind-9.8.1/conf.patch
+++ b/meta/recipes-connectivity/bind/bind/conf.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/cross-build-fix.patch b/meta/recipes-connectivity/bind/bind/cross-build-fix.patch
index 4c37b6b00c..4c37b6b00c 100644
--- a/meta/recipes-connectivity/bind/bind-9.8.1/cross-build-fix.patch
+++ b/meta/recipes-connectivity/bind/bind/cross-build-fix.patch
diff --git a/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch b/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
new file mode 100644
index 0000000000..89207404b5
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
@@ -0,0 +1,13 @@
1Index: bind-9.9.5/bin/Makefile.in
2===================================================================
3--- bind-9.9.5.orig/bin/Makefile.in
4+++ bind-9.9.5/bin/Makefile.in
5@@ -19,7 +19,7 @@ srcdir = @srcdir@
6 VPATH = @srcdir@
7 top_srcdir = @top_srcdir@
8
9-SUBDIRS = named rndc dig dnssec tools tests nsupdate \
10+SUBDIRS = named rndc dig dnssec tools nsupdate \
11 check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
12 TARGETS =
13
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch
index 146f3e35db..146f3e35db 100644
--- a/meta/recipes-connectivity/bind/bind-9.8.1/make-etc-initd-bind-stop-work.patch
+++ b/meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/mips1-not-support-opcode.diff b/meta/recipes-connectivity/bind/bind/mips1-not-support-opcode.diff
index 2930796b6a..2930796b6a 100644
--- a/meta/recipes-connectivity/bind/bind-9.8.1/mips1-not-support-opcode.diff
+++ b/meta/recipes-connectivity/bind/bind/mips1-not-support-opcode.diff
diff --git a/meta/recipes-connectivity/bind/bind_9.8.1.bb b/meta/recipes-connectivity/bind/bind_9.9.5.bb
index d59f7e5202..4d199d4c1a 100644
--- a/meta/recipes-connectivity/bind/bind_9.8.1.bb
+++ b/meta/recipes-connectivity/bind/bind_9.9.5.bb
@@ -3,32 +3,26 @@ HOMEPAGE = "http://www.isc.org/sw/bind/"
3SECTION = "console/network" 3SECTION = "console/network"
4 4
5LICENSE = "ISC & BSD" 5LICENSE = "ISC & BSD"
6LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0fbe2a3ab3c68ac3fea3cad13093877c" 6LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=a3df5f651469919a0e6cb42f84fb6ff1"
7 7
8DEPENDS = "openssl libcap" 8DEPENDS = "openssl libcap"
9PR = "r6"
10 9
11SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ 10SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
12 file://conf.patch \ 11 file://conf.patch \
13 file://cross-build-fix.patch \ 12 file://cross-build-fix.patch \
14 file://make-etc-initd-bind-stop-work.patch \ 13 file://make-etc-initd-bind-stop-work.patch \
15 file://bind-9.8.1-CVE-2012-5166.patch \
16 file://bind-CVE-2011-4313.patch \
17 file://bind-CVE-2012-1667.patch \
18 file://bind-CVE-2012-3817.patch \
19 file://bind-CVE-2013-2266.patch \
20 file://bind-Fix-CVE-2012-4244.patch \
21 file://mips1-not-support-opcode.diff \ 14 file://mips1-not-support-opcode.diff \
15 file://dont-test-on-host.patch \
22 " 16 "
23 17
24SRC_URI[md5sum] = "cf31117c5d35af34d4c0702970ad9fb7" 18SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e"
25SRC_URI[sha256sum] = "02285dc429cb2a6687a1b2446e9ee22c1df27f2577225b05be5092395ee7c92c" 19SRC_URI[sha256sum] = "d4b64c1dde442145a316679acff2df4008aa117ae52dfa3a6bc69efecc7840d1"
26 20
27# --enable-exportlib is necessary for building dhcp 21# --enable-exportlib is necessary for building dhcp
28ENABLE_IPV6 = "--enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}" 22ENABLE_IPV6 = "--enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}"
29EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \ 23EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \
30 --disable-devpoll --disable-epoll --with-gost=no \ 24 --disable-devpoll --disable-epoll --with-gost=no \
31 --with-gssapi=no \ 25 --with-gssapi=no --with-ecdsa=yes \
32 --sysconfdir=${sysconfdir}/bind \ 26 --sysconfdir=${sysconfdir}/bind \
33 --with-openssl=${STAGING_LIBDIR}/.. --with-libxml2=${STAGING_LIBDIR}/.. \ 27 --with-openssl=${STAGING_LIBDIR}/.. --with-libxml2=${STAGING_LIBDIR}/.. \
34 --enable-exportlib --with-export-includedir=${includedir} --with-export-libdir=${libdir} \ 28 --enable-exportlib --with-export-includedir=${includedir} --with-export-libdir=${libdir} \
@@ -40,7 +34,9 @@ INITSCRIPT_PARAMS = "defaults"
40 34
41PARALLEL_MAKE = "" 35PARALLEL_MAKE = ""
42 36
43PACKAGES_prepend = "${PN}-utils " 37RDEPENDS_${PN} = "python-core"
38
39PACKAGES_preprend = " ${PN}-utils "
44FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/nslookup" 40FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/nslookup"
45FILES_${PN}-dev += "${bindir}/isc-config.h" 41FILES_${PN}-dev += "${bindir}/isc-config.h"
46 42
@@ -53,6 +49,7 @@ do_install_append() {
53 install -d "${D}${sysconfdir}/init.d" 49 install -d "${D}${sysconfdir}/init.d"
54 install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/" 50 install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/"
55 install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind" 51 install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind"
52 sed -i -e '1s,#!.*python,#! /usr/bin/env python,' ${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
56} 53}
57 54
58CONFFILES_${PN} = " \ 55CONFFILES_${PN} = " \