[PATCH 1/2 v2] bind: Update to 9.9.5

[PATCH 1/2 v2] bind: Update to 9.9.5

[Saul Wold]

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

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../bind-9.8.1-CVE-2012-5166.patch                  |  0
 .../{bind-9.8.1 => bind}/bind-CVE-2011-4313.patch   |  0
 .../{bind-9.8.1 => bind}/bind-CVE-2012-1667.patch   |  0
 .../{bind-9.8.1 => bind}/bind-CVE-2012-3817.patch   |  0
 .../{bind-9.8.1 => bind}/bind-CVE-2013-2266.patch   |  0
 .../bind-Fix-CVE-2012-4244.patch                    |  0
 .../bind/{bind-9.8.1 => bind}/conf.patch            |  0
 .../bind/{bind-9.8.1 => bind}/cross-build-fix.patch |  0
 .../bind/bind/dont-test-on-host.patch               | 13 +++++++++++++
 .../make-etc-initd-bind-stop-work.patch             |  0
 .../mips1-not-support-opcode.diff                   |  0
 .../bind/{bind_9.8.1.bb => bind_9.9.5.bb}           | 21 +++++++++------------
 12 files changed, 22 insertions(+), 12 deletions(-)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-9.8.1-CVE-2012-5166.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-CVE-2011-4313.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-CVE-2012-1667.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-CVE-2012-3817.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-CVE-2013-2266.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-Fix-CVE-2012-4244.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/conf.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/cross-build-fix.patch (100%)
 create mode 100644 meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/make-etc-initd-bind-stop-work.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/mips1-not-support-opcode.diff (100%)
 rename meta/recipes-connectivity/bind/{bind_9.8.1.bb => bind_9.9.5.bb} (76%)

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
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-9.8.1-CVE-2012-5166.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2011-4313.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-1667.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-3817.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2013-2266.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-Fix-CVE-2012-4244.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/conf.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/cross-build-fix.patch
rename to 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 0000000..8920740
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
@@ -0,0 +1,13 @@
+Index: bind-9.9.5/bin/Makefile.in
+===================================================================
+--- bind-9.9.5.orig/bin/Makefile.in
++++ bind-9.9.5/bin/Makefile.in
+@@ -19,7 +19,7 @@ srcdir =	@srcdir@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig dnssec tools tests nsupdate \
++SUBDIRS =	named rndc dig dnssec tools nsupdate \
+ 		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
+ TARGETS =
+ 
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
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/make-etc-initd-bind-stop-work.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/mips1-not-support-opcode.diff
rename to 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
similarity index 76%
rename from meta/recipes-connectivity/bind/bind_9.8.1.bb
rename to meta/recipes-connectivity/bind/bind_9.9.5.bb
index d59f7e5..4d199d4 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/"
 SECTION = "console/network"
 
 LICENSE = "ISC & BSD"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0fbe2a3ab3c68ac3fea3cad13093877c"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=a3df5f651469919a0e6cb42f84fb6ff1"
 
 DEPENDS = "openssl libcap"
-PR = "r6"
 
 SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
            file://conf.patch \
            file://cross-build-fix.patch \
            file://make-etc-initd-bind-stop-work.patch \
-           file://bind-9.8.1-CVE-2012-5166.patch \
-           file://bind-CVE-2011-4313.patch \
-           file://bind-CVE-2012-1667.patch \
-           file://bind-CVE-2012-3817.patch \
-           file://bind-CVE-2013-2266.patch \
-           file://bind-Fix-CVE-2012-4244.patch \
            file://mips1-not-support-opcode.diff \
+           file://dont-test-on-host.patch \
 	   "
 
-SRC_URI[md5sum] = "cf31117c5d35af34d4c0702970ad9fb7"
-SRC_URI[sha256sum] = "02285dc429cb2a6687a1b2446e9ee22c1df27f2577225b05be5092395ee7c92c"
+SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e"
+SRC_URI[sha256sum] = "d4b64c1dde442145a316679acff2df4008aa117ae52dfa3a6bc69efecc7840d1"
 
 # --enable-exportlib is necessary for building dhcp
 ENABLE_IPV6 = "--enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}"
 EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \
                  --disable-devpoll --disable-epoll --with-gost=no \
-                 --with-gssapi=no \
+                 --with-gssapi=no --with-ecdsa=yes \
                  --sysconfdir=${sysconfdir}/bind \
                  --with-openssl=${STAGING_LIBDIR}/.. --with-libxml2=${STAGING_LIBDIR}/.. \
                  --enable-exportlib --with-export-includedir=${includedir} --with-export-libdir=${libdir} \
@@ -40,7 +34,9 @@ INITSCRIPT_PARAMS = "defaults"
 
 PARALLEL_MAKE = ""
 
-PACKAGES_prepend = "${PN}-utils "
+RDEPENDS_${PN} = "python-core"
+
+PACKAGES_preprend = " ${PN}-utils "
 FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/nslookup"
 FILES_${PN}-dev += "${bindir}/isc-config.h"
 
@@ -53,6 +49,7 @@ do_install_append() {
 	install -d "${D}${sysconfdir}/init.d"
 	install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/"
 	install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind"
+	sed -i -e '1s,#!.*python,#! /usr/bin/env python,' ${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
 }
 
 CONFFILES_${PN} = " \
-- 
1.8.3.1

[PATCH 2/2] btrfs: patch to allow for relative paths

[Saul Wold]

This seems to address the btrfs image failure

[YOCTO #5146]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../btrfs-tools/allow-relative-path.patch          | 58 ++++++++++++++++++++++
 .../btrfs-tools/btrfs-tools_git.bb                 |  4 +-
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch
new file mode 100644
index 0000000..9cd64a5
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch
@@ -0,0 +1,58 @@
+From: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
+
+The bug accurs when exec:
+	# mkfs.btrfs -r <a relative path> <device>
+	(note: the path should be 'valid' correspond to your `pwd`)
+error msg:
+	$ scandir for <a relative path> failed: No such file...
+
+Replace strdup() with realpath() to get the correct scan path.
+
+Upstream-Status: Backport (pending)
+
+Reported-by: Saul Wold <sgw@linux.intel.com>
+Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
+---
+ mkfs.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/mkfs.c b/mkfs.c
+index 2dc90c2..1bd3069 100644
+--- a/mkfs.c
++++ b/mkfs.c
+@@ -756,6 +756,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
+ 	ino_t parent_inum, cur_inum;
+ 	ino_t highest_inum = 0;
+ 	char *parent_dir_name;
++	char real_path[PATH_MAX];
+ 	struct btrfs_path path;
+ 	struct extent_buffer *leaf;
+ 	struct btrfs_key root_dir_key;
+@@ -764,7 +765,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
+ 	/* Add list for source directory */
+ 	dir_entry = malloc(sizeof(struct directory_name_entry));
+ 	dir_entry->dir_name = dir_name;
+-	dir_entry->path = strdup(dir_name);
++	dir_entry->path = realpath(dir_name, real_path);
+ 
+ 	parent_inum = highest_inum + BTRFS_FIRST_FREE_OBJECTID;
+ 	dir_entry->inum = parent_inum;
+@@ -876,7 +877,6 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
+ 		}
+ 
+ 		free_namelist(files, count);
+-		free(parent_dir_entry->path);
+ 		free(parent_dir_entry);
+ 
+ 		index_cnt = 2;
+@@ -887,7 +887,6 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
+ fail:
+ 	free_namelist(files, count);
+ fail_no_files:
+-	free(parent_dir_entry->path);
+ 	free(parent_dir_entry);
+ 	return -1;
+ }
+-- 
+1.8.1.4
+
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
index 7ecce60..8129cd5 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
@@ -14,7 +14,9 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl"
 
 SRCREV = "8cae1840afb3ea44dcc298f32983e577480dfee4"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git \
-           file://weak-defaults.patch"
+           file://weak-defaults.patch \
+           file://allow-relative-path.patch \
+          "
 
 S = "${WORKDIR}/git"
 
-- 
1.8.3.1