[PATCH 01/19] pkgconfig: Drop version from RPROVIDES

[PATCH 01/19] pkgconfig: Drop version from RPROVIDES

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/pkgconfig/pkgconfig.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index 62c886f..c4ada80 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -35,7 +35,7 @@ FILES_${PN} += "${datadir}/aclocal/pkg.m4"
 # When using the RPM generated automatic package dependencies, some packages
 # will end up requiring 'pkgconfig(pkg-config)'.  Allow this behavior by
 # specifying an appropriate provide.
-RPROVIDES_${PN} += "pkgconfig(pkg-config) (= ${PV})"
+RPROVIDES_${PN} += "pkgconfig(pkg-config)"
 
 # Install a pkg-config-native wrapper that will use the native sysroot instead
 # of the MACHINE sysroot, for using pkg-config when building native tools.
-- 
1.9.2

[PATCH 02/19] python-docutil: Upgrade 0.11 -> 0.12

[Richard Purdie]

License change is just a date change in the license file, looks
like English to German locale change to the date display.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../python/{python-docutils_0.11.bb => python-docutils_0.12.bb}     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/python/{python-docutils_0.11.bb => python-docutils_0.12.bb} (60%)

diff --git a/meta/recipes-devtools/python/python-docutils_0.11.bb b/meta/recipes-devtools/python/python-docutils_0.12.bb
similarity index 60%
rename from meta/recipes-devtools/python/python-docutils_0.11.bb
rename to meta/recipes-devtools/python/python-docutils_0.12.bb
index f5da973..8cda88d 100644
--- a/meta/recipes-devtools/python/python-docutils_0.11.bb
+++ b/meta/recipes-devtools/python/python-docutils_0.12.bb
@@ -2,13 +2,13 @@ SUMMARY = "Text processing system for documentation"
 HOMEPAGE = "http://docutils.sourceforge.net"
 SECTION = "devel/python"
 LICENSE = "PSF & BSD-2-Clause & GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=da0d261d1db78ab21ce86c79364a4098"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=a722fbdc20347db7b69223594dd54574"
 
 DEPENDS = "python"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/docutils/docutils-${PV}.tar.gz"
-SRC_URI[md5sum] = "20ac380a18b369824276864d98ec0ad6"
-SRC_URI[sha256sum] = "9af4166adf364447289c5c697bb83c52f1d6f57e77849abcccd6a4a18a5e7ec9"
+SRC_URI[md5sum] = "4622263b62c5c771c03502afa3157768"
+SRC_URI[sha256sum] = "c7db717810ab6965f66c8cf0398a98c9d8df982da39b4cd7f162911eb89596fa"
 
 S = "${WORKDIR}/docutils-${PV}"
 
-- 
1.9.2

[PATCH 03/19] python-scons: Upgrade 2.3.0 -> 2.3.2

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../{python-scons-native_2.3.0.bb => python-scons-native_2.3.2.bb}  | 0
 .../python/{python-scons_2.3.0.bb => python-scons_2.3.2.bb}         | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/python/{python-scons-native_2.3.0.bb => python-scons-native_2.3.2.bb} (100%)
 rename meta/recipes-devtools/python/{python-scons_2.3.0.bb => python-scons_2.3.2.bb} (52%)

diff --git a/meta/recipes-devtools/python/python-scons-native_2.3.0.bb b/meta/recipes-devtools/python/python-scons-native_2.3.2.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-scons-native_2.3.0.bb
rename to meta/recipes-devtools/python/python-scons-native_2.3.2.bb
diff --git a/meta/recipes-devtools/python/python-scons_2.3.0.bb b/meta/recipes-devtools/python/python-scons_2.3.2.bb
similarity index 52%
rename from meta/recipes-devtools/python/python-scons_2.3.0.bb
rename to meta/recipes-devtools/python/python-scons_2.3.2.bb
index eb2735d..fc5b302 100644
--- a/meta/recipes-devtools/python/python-scons_2.3.0.bb
+++ b/meta/recipes-devtools/python/python-scons_2.3.2.bb
@@ -1,13 +1,13 @@
 SUMMARY = "Software Construction tool (make/autotools replacement)"
 SECTION = "devel/python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=98e9a1e6029e715255c52032a1eba637"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f0ad8a74a10870caa5e08a3e45d719e2"
 SRCNAME = "scons"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "083ce5624d6adcbdaf2526623f456ca9"
-SRC_URI[sha256sum] = "9442069999cf4b2caa94a5886ab4c2c71de1718ed5e9176c18e2b6dbca463b4b"
+SRC_URI[md5sum] = "bbd428da35ec176575a2b0be1f8d7162"
+SRC_URI[sha256sum] = "f993320c5e9515e6567fcce73df0a7a8808414bf1223c69123d3dcf339a449d4"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-- 
1.9.2

[PATCH 04/19] gdb: Upgrade 7.7 -> 7.7.1

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/gdb/{gdb-7.7.inc => gdb-7.7.1.inc}              | 4 ++--
 .../gdb/{gdb-cross-canadian_7.7.bb => gdb-cross-canadian_7.7.1.bb}    | 0
 meta/recipes-devtools/gdb/{gdb-cross_7.7.bb => gdb-cross_7.7.1.bb}    | 0
 meta/recipes-devtools/gdb/{gdb_7.7.bb => gdb_7.7.1.bb}                | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/gdb/{gdb-7.7.inc => gdb-7.7.1.inc} (70%)
 rename meta/recipes-devtools/gdb/{gdb-cross-canadian_7.7.bb => gdb-cross-canadian_7.7.1.bb} (100%)
 rename meta/recipes-devtools/gdb/{gdb-cross_7.7.bb => gdb-cross_7.7.1.bb} (100%)
 rename meta/recipes-devtools/gdb/{gdb_7.7.bb => gdb_7.7.1.bb} (100%)

diff --git a/meta/recipes-devtools/gdb/gdb-7.7.inc b/meta/recipes-devtools/gdb/gdb-7.7.1.inc
similarity index 70%
rename from meta/recipes-devtools/gdb/gdb-7.7.inc
rename to meta/recipes-devtools/gdb/gdb-7.7.1.inc
index 62adcaa..aa16d5a 100644
--- a/meta/recipes-devtools/gdb/gdb-7.7.inc
+++ b/meta/recipes-devtools/gdb/gdb-7.7.1.inc
@@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 
 S = "${WORKDIR}/${BPN}-${PV}"
 
-SRC_URI[md5sum] = "40051ff95b39bd57b14b1809e2c16152"
-SRC_URI[sha256sum] = "8814d98c2733639cb602b6ecd8d69e02498017e02b5724c9451c285b0e9ee173"
+SRC_URI[md5sum] = "45b07b53d81832d32ccd4829465d4886"
+SRC_URI[sha256sum] = "eefadb9831e3695d1eaef34e98b8f1fb441df6fe5071317ea49c6bd6ba213eff"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.bb
rename to meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb
diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.7.bb b/meta/recipes-devtools/gdb/gdb-cross_7.7.1.bb
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb-cross_7.7.bb
rename to meta/recipes-devtools/gdb/gdb-cross_7.7.1.bb
diff --git a/meta/recipes-devtools/gdb/gdb_7.7.bb b/meta/recipes-devtools/gdb/gdb_7.7.1.bb
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb_7.7.bb
rename to meta/recipes-devtools/gdb/gdb_7.7.1.bb
-- 
1.9.2

[PATCH 05/19] mdadm: Upgrade 3.3 -> 3.3.1

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-extended/mdadm/{mdadm_3.3.bb => mdadm_3.3.1.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/mdadm/{mdadm_3.3.bb => mdadm_3.3.1.bb} (90%)

diff --git a/meta/recipes-extended/mdadm/mdadm_3.3.bb b/meta/recipes-extended/mdadm/mdadm_3.3.1.bb
similarity index 90%
rename from meta/recipes-extended/mdadm/mdadm_3.3.bb
rename to meta/recipes-extended/mdadm/mdadm_3.3.1.bb
index 40d68d6..59bc587 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.3.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.3.1.bb
@@ -8,13 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161"
 
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
            file://mdadm-3.2.2_fix_for_x32.patch \
            file://gcc-4.9.patch \
 	  "
 
-SRC_URI[md5sum] = "8ac04259cdd74b4566c3b6dea9414b57"
-SRC_URI[sha256sum] = "9c07e518bdf3392ebac8874eb686258e10ea3ae0ff7a8acb6d014718a9c3ed45"
+SRC_URI[md5sum] = "4227d48de62dfb217c92fa0c54171bbe"
+SRC_URI[sha256sum] = "d8c74112cfd77bdc1dbc1291fe8d9243c76d91bfa276fcb95f2a75ca7717ab02"
 
 CFLAGS += "-fno-strict-aliasing"
 
-- 
1.9.2

[PATCH 06/19] gccmakedep: Upgrade 1.0.2 -> 1.0.3

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../xorg-util/{gccmakedep_1.0.2.bb => gccmakedep_1.0.3.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-util/{gccmakedep_1.0.2.bb => gccmakedep_1.0.3.bb} (78%)

diff --git a/meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb b/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb
similarity index 78%
rename from meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb
rename to meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb
index 23cef63..ccf2f4b 100644
--- a/meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb
+++ b/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb
@@ -13,5 +13,5 @@ RDEPENDS_${PN} = "gcc"
 PR = "r3"
 PE = "1"
 
-SRC_URI[md5sum] = "fc49f45251c1336fe1dad5dba1c83fcd"
-SRC_URI[sha256sum] = "fdd3963294e80b27416f902a5c029c033d321f03310d3cafa3afb62b50ddce92"
+SRC_URI[md5sum] = "127ddb6131eb4a56fdf6644a63ade788"
+SRC_URI[sha256sum] = "f9e2e7a590e27f84b6708ab7a81e546399b949bf652fb9b95193e0e543e6a548"
\ No newline at end of file
-- 
1.9.2

[PATCH 07/19] powertop: Upgrade 2.5 -> 2.6.1

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-kernel/powertop/{powertop_2.5.bb => powertop_2.6.1.bb} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-kernel/powertop/{powertop_2.5.bb => powertop_2.6.1.bb} (85%)

diff --git a/meta/recipes-kernel/powertop/powertop_2.5.bb b/meta/recipes-kernel/powertop/powertop_2.6.1.bb
similarity index 85%
rename from meta/recipes-kernel/powertop/powertop_2.5.bb
rename to meta/recipes-kernel/powertop/powertop_2.6.1.bb
index 86a7f60..58216c2 100644
--- a/meta/recipes-kernel/powertop/powertop_2.5.bb
+++ b/meta/recipes-kernel/powertop/powertop_2.6.1.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
 
 SRC_URI = "http://01.org/powertop/sites/default/files/downloads/powertop-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "806bbcbd44fcea1f807c9582fc1f7d3e"
-SRC_URI[sha256sum] = "8b2c08a555d79e1c428863470c41cb023971d74ba4801d80a05e35adeec23c0b"
+SRC_URI[md5sum] = "4391e7b0af854ecf722cdf712f24b631"
+SRC_URI[sha256sum] = "034cde6d5bb433fe0d29251d5cde5d4c2948abf05fe29ef10966b659331b20e4"
 
 inherit autotools gettext pkgconfig
 
@@ -21,6 +21,7 @@ EXTRA_LDFLAGS_libc-uclibc = "-lintl"
 do_configure_prepend() {
     # configure.ac checks for delwin() in "ncursesw ncurses" so let's drop first one
     sed -i -e "s/ncursesw//g" ${S}/configure.ac
+    mkdir -p ${B}/src/tuning/
 }
 
 inherit update-alternatives
-- 
1.9.2

[PATCH 08/19] nasm: Update 2.11.02 -> 2.11.05

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/nasm/{nasm_2.11.02.bb => nasm_2.11.05.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/nasm/{nasm_2.11.02.bb => nasm_2.11.05.bb} (81%)

diff --git a/meta/recipes-devtools/nasm/nasm_2.11.02.bb b/meta/recipes-devtools/nasm/nasm_2.11.05.bb
similarity index 81%
rename from meta/recipes-devtools/nasm/nasm_2.11.02.bb
rename to meta/recipes-devtools/nasm/nasm_2.11.05.bb
index db84ec5..fbfd585 100644
--- a/meta/recipes-devtools/nasm/nasm_2.11.02.bb
+++ b/meta/recipes-devtools/nasm/nasm_2.11.05.bb
@@ -6,8 +6,8 @@ COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)'
 
 
 SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 "
-SRC_URI[md5sum] = "3bbc8ed83115b8caf7931f35ec3bc5e0"
-SRC_URI[sha256sum] = "ece26b5ef565f94d19a72756d05965e424d2e5ca55f88b949852da70dd62f0e0"
+SRC_URI[md5sum] = "f6b1db2858cad82bbb0c8c6f3e2b0fb2"
+SRC_URI[sha256sum] = "4a417bcf5cde5d203e228feea3f428a6ff4d700d558e4d79d50a30a695bdfae9"
 
 inherit autotools-brokensep
 
-- 
1.9.2

[PATCH 09/19] cross-canadian: Fix shlibs directory after recent shlibs changes

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/cross-canadian.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index 25e246d..e536118 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -119,8 +119,8 @@ TARGET_ARCH[vardepsexclude] = "TUNE_ARCH"
 
 # If MLPREFIX is set by multilib code, shlibs
 # points to the wrong place so force it
-SHLIBSDIRS = "${PKGDATA_DIR}/nativesdk-shlibs"
-SHLIBSWORKDIR = "${PKGDATA_DIR}/nativesdk-shlibs"
+SHLIBSDIRS = "${PKGDATA_DIR}/nativesdk-shlibs2"
+SHLIBSWORKDIR = "${PKGDATA_DIR}/nativesdk-shlibs2"
 
 cross_canadian_bindirlinks () {
 	for i in ${CANADIANEXTRAOS}
-- 
1.9.2

[PATCH 10/19] subversion: Upgrade 1.7.7 -> 1.8.9

[Richard Purdie]

Dropped neon patches as neon support was dropped.
Dropped CVE patches as applied in later version
Added patch to avoid OS-X check which doesn't cross compile
Add PACKAGECONFIG for gnome-keyring

Addition to license:

For the file subversion/libsvn_subr/utf_width.c
* Markus Kuhn -- 2007-05-26 (Unicode 5.0)
*
* Permission to use, copy, modify, and distribute this software
* for any purpose and without fee is hereby granted. The author
* disclaims all warranties with regard to this software.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../subversion-1.7.10/allow-updated-neon.patch     |  20 ----
 .../subversion-1.7.10/fix-install-depends.patch    |  48 --------
 .../neon.m4-fix-includes-and-cflags.patch          |  32 -----
 .../subversion-CVE-2013-4131.patch                 |  42 -------
 .../subversion-CVE-2013-4277.patch                 |  15 ---
 .../subversion-CVE-2013-4505.patch                 | 130 ---------------------
 .../subversion-1.8.9/disable_macos.patch           |  68 +++++++++++
 .../libtool2.patch                                 |   0
 .../{subversion_1.7.10.bb => subversion_1.8.9.bb}  |  15 +--
 9 files changed, 74 insertions(+), 296 deletions(-)
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4131.patch
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4277.patch
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4505.patch
 create mode 100644 meta/recipes-devtools/subversion/subversion-1.8.9/disable_macos.patch
 rename meta/recipes-devtools/subversion/{subversion-1.7.10 => subversion-1.8.9}/libtool2.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion_1.7.10.bb => subversion_1.8.9.bb} (67%)

diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch
deleted file mode 100644
index e8acb12..0000000
--- a/meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Allow neon 0.30 to be usable also
-
-Upstream-Status: Pending
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-Index: subversion-1.7.10/configure.ac
-===================================================================
---- subversion-1.7.10.orig/configure.ac
-+++ subversion-1.7.10/configure.ac
-@@ -118,7 +118,7 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config)
- 
- # Either a space-separated list of allowable Neon versions, or "any" to
- # mean allow anything.
--NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29"
-+NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29 0\.30"
- NEON_RECOMMENDED_VER="0.29.6"
- NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz"
- dnl You can skip the neon version check only if you know what you are doing 
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch
deleted file mode 100644
index fb79b8c..0000000
--- a/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-install-neon-lib should depend on libsvn_delta's installation
-
-install-neon-lib needs libsvn_delta-1.la which will be regenerated
-during libsvn_delta-1.la's installation, if libsvn_delta-1.la is
-in regenerating and at the same time install-neon-lib links it, the
-error willl happen.
-
-Let install-neon-lib run after libsvn_delta-1.la is installed will fix
-the problem.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- build-outputs.mk |    2 +-
- build.conf       |    2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
---- subversion-1.7.6.orig/build-outputs.mk
-+++ subversion-1.7.6/build-outputs.mk
-@@ -983,11 +983,11 @@ install-locale: subversion/po/de.mo subv
- 	$(MKDIR) $(DESTDIR)$(localedir)/zh_CN/LC_MESSAGES
- 	cd subversion/po ; $(INSTALL_LOCALE) zh_CN.mo $(DESTDIR)$(localedir)/zh_CN/LC_MESSAGES/$(PACKAGE_NAME).mo
- 	$(MKDIR) $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES
- 	cd subversion/po ; $(INSTALL_LOCALE) zh_TW.mo $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES/$(PACKAGE_NAME).mo
- 
--install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la 
-+install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la $(SVN_FS_LIB_INSTALL_DEPS)
- 	$(MKDIR) $(DESTDIR)$(neon_libdir)
- 	cd subversion/libsvn_ra_neon ; $(INSTALL_NEON_LIB) libsvn_ra_neon-1.la $(DESTDIR)$(neon_libdir)/libsvn_ra_neon-1.la
- 
- install-ramod-lib: subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_ra_svn/libsvn_ra_svn-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_ra_local/libsvn_ra_local-1.la 
- 	$(MKDIR) $(DESTDIR)$(ramod_libdir)
---- subversion-1.7.6.orig/build.conf
-+++ subversion-1.7.6/build.conf
-@@ -270,10 +270,12 @@ msvc-export = svn_ra.h private\svn_ra_pr
- [libsvn_ra_neon]
- type = ra-module
- path = subversion/libsvn_ra_neon
- install = neon-lib
- libs = libsvn_delta libsvn_subr aprutil apriconv apr neon
-+# conditionally add more dependencies
-+add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS)
- msvc-static = yes
- 
- # Accessing repositories via DAV through serf
- [libsvn_ra_serf]
- type = ra-module
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch
deleted file mode 100644
index 013d0c3..0000000
--- a/meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fix to get correct SVN_NEON_CONFIG and CFLAGS when sysroot path contains '-D' and '-I'
-characters.
-
-Upstream-Status: Pending
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-
-index f951039..a813145 100644
---- a/build/ac-macros/neon.m4
-+++ b/build/ac-macros/neon.m4
-@@ -105,8 +105,8 @@ AC_DEFUN(SVN_NEON_CONFIG,
-            test "$svn_allowed_neon" = "any"; then
-             svn_allowed_neon_on_system="yes"
-             if test "$NEON_PKG_CONFIG" = "yes"; then
--              SVN_NEON_INCLUDES=[`$PKG_CONFIG neon --cflags | $SED -e 's/-D[^ ]*//g'`]
--              CFLAGS=["$CFLAGS `$PKG_CONFIG neon --cflags | $SED -e 's/-I[^ ]*//g'`"]
-+              SVN_NEON_INCLUDES=["`$PKG_CONFIG neon --cflags | $SED -e 's/^-D[^ ]*//g' -e 's/ -D[^ ]*//g'`"]
-+              CFLAGS=["$CFLAGS `$PKG_CONFIG neon --cflags | $SED -e 's/^-I[^ ]*//g' -e 's/ -I[^ ]*//g'`"]
-               old_CFLAGS="$CFLAGS"
-               old_LIBS="$LIBS"
-               NEON_LIBS=`$PKG_CONFIG neon --libs`
-@@ -126,8 +126,8 @@ int main()
-               CFLAGS="$old_CFLAGS"
-               LIBS="$old_LIBS"
-             else
--              SVN_NEON_INCLUDES=[`$neon_config --cflags | $SED -e 's/-D[^ ]*//g'`]
--              CFLAGS=["$CFLAGS `$neon_config --cflags | $SED -e 's/-I[^ ]*//g'`"]
-+              SVN_NEON_INCLUDES=[`$neon_config --cflags | $SED -e 's/^-D[^ ]*//g' -e 's/ -D[^ ]*//g'`]
-+              CFLAGS=["$CFLAGS `$neon_config --cflags | $SED -e 's/^-I[^ ]*//g' -e 's/ -I[^ ]*//g'`"]
-               NEON_LIBS=`$neon_config --libs`
-             fi
-             svn_lib_neon="yes"
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4131.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4131.patch
deleted file mode 100644
index 88bd25e..0000000
--- a/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4131.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Upstream-Status: Backport
-
-Index: subversion/mod_dav_svn/repos.c
-===================================================================
---- a/subversion/mod_dav_svn/repos.c	(revision 1503527)
-+++ b/subversion/mod_dav_svn/repos.c	(revision 1503528)
-@@ -2408,21 +2408,12 @@
-                 svn_boolean_t is_urlpath,
-                 apr_pool_t *pool)
- {
--  apr_size_t len;
--  char *tmp = apr_pstrdup(pool, path);
--
--  len = strlen(tmp);
--
--  if (len > 0)
-+  if (*path != '\0') /* not an empty string */
-     {
--      /* Remove any trailing slash; else svn_path_dirname() asserts. */
--      if (tmp[len-1] == '/')
--        tmp[len-1] = '\0';
--
-       if (is_urlpath)
--        return svn_urlpath__dirname(tmp, pool);
-+        return svn_urlpath__dirname(path, pool);
-       else
--        return svn_fspath__dirname(tmp, pool);
-+        return svn_fspath__dirname(path, pool);
-     }
- 
-   return path;
-@@ -2458,7 +2449,9 @@
-       parent->versioned = 1;
-       parent->hooks = resource->hooks;
-       parent->pool = resource->pool;
--      parent->uri = get_parent_path(resource->uri, TRUE, resource->pool);
-+      parent->uri = get_parent_path(svn_urlpath__canonicalize(resource->uri,
-+                                                              resource->pool),
-+                                    TRUE, resource->pool);
-       parent->info = parentinfo;
- 
-       parentinfo->uri_path =
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4277.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4277.patch
deleted file mode 100644
index a5900d8..0000000
--- a/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4277.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport
-
---- a/subversion/svnserve/main.c
-+++ b/subversion/svnserve/main.c
-@@ -403,8 +403,9 @@ static svn_error_t *write_pid_file(const
-   const char *contents = apr_psprintf(pool, "%" APR_PID_T_FMT "\n",
-                                              getpid());
- 
-+  SVN_ERR(svn_io_remove_file2(filename, TRUE, pool));
-   SVN_ERR(svn_io_file_open(&file, filename,
--                           APR_WRITE | APR_CREATE | APR_TRUNCATE,
-+                           APR_WRITE | APR_CREATE | APR_EXCL,
-                            APR_OS_DEFAULT, pool));
-   SVN_ERR(svn_io_file_write_full(file, contents, strlen(contents), NULL,
-                                  pool));
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4505.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4505.patch
deleted file mode 100644
index a54d694..0000000
--- a/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4505.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-Upstream-Status: Backport
-
-Index: tools/server-side/mod_dontdothat/mod_dontdothat.c
-===================================================================
---- a/tools/server-side/mod_dontdothat/mod_dontdothat.c	(revision 1239695)
-+++ b/tools/server-side/mod_dontdothat/mod_dontdothat.c	(revision 1542078)
-@@ -30,12 +30,15 @@
- #include <util_filter.h>
- #include <ap_config.h>
- #include <apr_strings.h>
-+#include <apr_uri.h>
- 
- #include <expat.h>
- 
- #include "mod_dav_svn.h"
- #include "svn_string.h"
- #include "svn_config.h"
-+#include "svn_path.h"
-+#include "private/svn_fspath.h"
- 
- module AP_MODULE_DECLARE_DATA dontdothat_module;
- 
-@@ -161,26 +164,71 @@
-     }
- }
- 
-+/* duplicate of dav_svn__log_err() from mod_dav_svn/util.c */
-+static void
-+log_dav_err(request_rec *r,
-+            dav_error *err,
-+            int level)
-+{
-+    dav_error *errscan;
-+
-+    /* Log the errors */
-+    /* ### should have a directive to log the first or all */
-+    for (errscan = err; errscan != NULL; errscan = errscan->prev) {
-+        apr_status_t status;
-+
-+        if (errscan->desc == NULL)
-+            continue;
-+
-+#if AP_MODULE_MAGIC_AT_LEAST(20091119,0)
-+        status = errscan->aprerr;
-+#else
-+        status = errscan->save_errno;
-+#endif
-+
-+        ap_log_rerror(APLOG_MARK, level, status, r,
-+                      "%s  [%d, #%d]",
-+                      errscan->desc, errscan->status, errscan->error_id);
-+    }
-+}
-+
- static svn_boolean_t
- is_this_legal(dontdothat_filter_ctx *ctx, const char *uri)
- {
-   const char *relative_path;
-   const char *cleaned_uri;
-   const char *repos_name;
-+  const char *uri_path;
-   int trailing_slash;
-   dav_error *derr;
- 
--  /* Ok, so we need to skip past the scheme, host, etc. */
--  uri = ap_strstr_c(uri, "://");
--  if (uri)
--    uri = ap_strchr_c(uri + 3, '/');
-+  /* uri can be an absolute uri or just a path, we only want the path to match
-+   * against */
-+  if (uri && svn_path_is_url(uri))
-+    {
-+      apr_uri_t parsed_uri;
-+      apr_status_t rv = apr_uri_parse(ctx->r->pool, uri, &parsed_uri);
-+      if (APR_SUCCESS != rv)
-+        {
-+          /* Error parsing the URI, log and reject request. */
-+          ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, ctx->r,
-+                        "mod_dontdothat: blocked request after failing "
-+                        "to parse uri: '%s'", uri);
-+          return FALSE;
-+        }
-+      uri_path = parsed_uri.path;
-+    }
-+  else
-+    {
-+      uri_path = uri;
-+    }
- 
--  if (uri)
-+  if (uri_path)
-     {
-       const char *repos_path;
- 
-       derr = dav_svn_split_uri(ctx->r,
--                               uri,
-+                               uri_path,
-                                ctx->cfg->base_path,
-                                &cleaned_uri,
-                                &trailing_slash,
-@@ -194,7 +242,7 @@
-           if (! repos_path)
-             repos_path = "";
- 
--          repos_path = apr_psprintf(ctx->r->pool, "/%s", repos_path);
-+          repos_path = svn_fspath__canonicalize(repos_path, ctx->r->pool);
- 
-           /* First check the special cases that are always legal... */
-           for (idx = 0; idx < ctx->allow_recursive_ops->nelts; ++idx)
-@@ -228,7 +276,20 @@
-                 }
-             }
-         }
-+      else
-+        {
-+          log_dav_err(ctx->r, derr, APLOG_ERR);
-+          return FALSE;
-+        }
-+
-     }
-+  else
-+    {
-+      ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r,
-+                    "mod_dontdothat: empty uri passed to is_this_legal(), "
-+                    "module bug?");
-+      return FALSE;
-+    }
- 
-   return TRUE;
- }
diff --git a/meta/recipes-devtools/subversion/subversion-1.8.9/disable_macos.patch b/meta/recipes-devtools/subversion/subversion-1.8.9/disable_macos.patch
new file mode 100644
index 0000000..ec3be49
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion-1.8.9/disable_macos.patch
@@ -0,0 +1,68 @@
+These tests don't work in cross compiling, just disable them for now, we don't
+build subversion on OS-X at this time.
+
+RP 1014/7/16
+
+Upstream-Status: Pending [needs a rewrite to support a cache value]
+
+Index: subversion-1.8.9/build/ac-macros/macosx.m4
+===================================================================
+--- subversion-1.8.9.orig/build/ac-macros/macosx.m4	2012-11-26 03:04:27.000000000 +0000
++++ subversion-1.8.9/build/ac-macros/macosx.m4	2014-07-16 12:28:58.357300403 +0000
+@@ -24,21 +24,7 @@
+ AC_DEFUN(SVN_LIB_MACHO_ITERATE,
+ [
+   AC_MSG_CHECKING([for Mach-O dynamic module iteration functions])
+-  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+-    #include <mach-o/dyld.h>
+-    #include <mach-o/loader.h>
+-  ]],[[
+-    const struct mach_header *header = _dyld_get_image_header(0);
+-    const char *name = _dyld_get_image_name(0);
+-    if (name && header) return 0;
+-    return 1;
+-  ]])],[
+-    AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1],
+-              [Is Mach-O low-level _dyld API available?])
+-    AC_MSG_RESULT([yes])
+-  ],[
+     AC_MSG_RESULT([no])
+-  ])
+ ])
+ 
+ dnl SVN_LIB_MACOS_PLIST
+@@ -46,34 +32,7 @@
+ AC_DEFUN(SVN_LIB_MACOS_PLIST,
+ [
+   AC_MSG_CHECKING([for Mac OS property list utilities])
+-
+-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+-    #include <AvailabilityMacros.h>
+-    #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \
+-     || !defined(MAC_OS_X_VERSION_10_0) \
+-     || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_0)
+-    #error ProperyList API unavailable.
+-    #endif
+-  ]],[[]])],[
+-    dnl ### Hack.  We should only need to pass the -framework options when
+-    dnl linking libsvn_subr, since it is the only library that uses Keychain.
+-    dnl
+-    dnl Unfortunately, libtool 1.5.x doesn't track transitive dependencies for
+-    dnl OS X frameworks like it does for normal libraries, so we need to
+-    dnl explicitly pass the option to all the users of libsvn_subr to allow
+-    dnl static builds to link successfully.
+-    dnl
+-    dnl This does mean that all executables we link will be linked directly
+-    dnl to these frameworks - even when building shared libraries - but that
+-    dnl shouldn't cause any problems.
+-
+-    LIBS="$LIBS -framework CoreFoundation"
+-    AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1],
+-              [Is Mac OS property list API available?])
+-    AC_MSG_RESULT([yes])
+-  ],[
+     AC_MSG_RESULT([no])
+-  ])
+ ])
+ 
+ dnl SVN_LIB_MACOS_KEYCHAIN
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.8.9/libtool2.patch
similarity index 100%
rename from meta/recipes-devtools/subversion/subversion-1.7.10/libtool2.patch
rename to meta/recipes-devtools/subversion/subversion-1.8.9/libtool2.patch
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.10.bb b/meta/recipes-devtools/subversion/subversion_1.8.9.bb
similarity index 67%
rename from meta/recipes-devtools/subversion/subversion_1.7.10.bb
rename to meta/recipes-devtools/subversion/subversion_1.8.9.bb
index e745ce7..b1eee6a 100644
--- a/meta/recipes-devtools/subversion/subversion_1.7.10.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.8.9.bb
@@ -11,24 +11,21 @@ inherit gettext
 
 SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://libtool2.patch \
-           file://fix-install-depends.patch \
-           file://allow-updated-neon.patch \
-           file://neon.m4-fix-includes-and-cflags.patch \
-           file://subversion-CVE-2013-4505.patch \
-           file://subversion-CVE-2013-4131.patch \
-           file://subversion-CVE-2013-4277.patch \
+           file://disable_macos.patch \
 "
-SRC_URI[md5sum] = "4088a77e14232876c9b4ff1541e6e200"
-SRC_URI[sha256sum] = "c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7"
+SRC_URI[md5sum] = "bd495517a760ddd764ce449a891971db"
+SRC_URI[sha256sum] = "45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1c2f0119e478700b5428e26386cff923"
 
 PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl"
+PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring,--without-gnome-keyring,glib-2.0 gnome-keyring"
 
 EXTRA_OECONF = " \
                 --without-berkeley-db --without-apxs \
                 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
                 --with-apr-util=${STAGING_BINDIR_CROSS} \
+                --disable-keychain \
                 ac_cv_path_RUBY=none"
 
 inherit autotools
-- 
1.9.2

[PATCH 11/19] python-pycurl: Upgrade 7.19.3 -> 7.19.3.1

[Richard Purdie]

License text just moved within the README.rst (same checksum)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../python/python-pycurl/no-static-link.patch      | 24 +++++++++++-----------
 ...-pycurl_7.19.3.bb => python-pycurl_7.19.3.1.bb} |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)
 rename meta/recipes-devtools/python/{python-pycurl_7.19.3.bb => python-pycurl_7.19.3.1.bb} (78%)

diff --git a/meta/recipes-devtools/python/python-pycurl/no-static-link.patch b/meta/recipes-devtools/python/python-pycurl/no-static-link.patch
index 907380f..c5349ee 100644
--- a/meta/recipes-devtools/python/python-pycurl/no-static-link.patch
+++ b/meta/recipes-devtools/python/python-pycurl/no-static-link.patch
@@ -2,16 +2,16 @@ Upstream-Status: Pending
 
 Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
 
-Index: pycurl-7.19.3/setup.py
+Index: pycurl-7.19.3.1/setup.py
 ===================================================================
---- pycurl-7.19.3.orig/setup.py	2014-01-10 08:04:40.000000000 +0200
-+++ pycurl-7.19.3/setup.py	2014-02-04 15:09:08.411552887 +0200
-@@ -211,7 +211,7 @@
-     # If neither --libs nor --static-libs work, fail.
-     optbuf = ""
-     errtext = ''
--    for option in ["--libs", "--static-libs"]:
-+    for option in ["--libs"]:
-         p = subprocess.Popen((CURL_CONFIG, option),
-             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-         stdout, stderr = p.communicate()
+--- pycurl-7.19.3.1.orig/setup.py	2014-07-16 12:57:24.065346887 +0000
++++ pycurl-7.19.3.1/setup.py	2014-07-16 12:57:53.057347678 +0000
+@@ -147,7 +147,7 @@
+         optbuf = ''
+         sslhintbuf = ''
+         errtext = ''
+-        for option in ["--libs", "--static-libs"]:
++        for option in ["--libs"]:
+             p = subprocess.Popen((CURL_CONFIG, option),
+                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+             stdout, stderr = p.communicate()
diff --git a/meta/recipes-devtools/python/python-pycurl_7.19.3.bb b/meta/recipes-devtools/python/python-pycurl_7.19.3.1.bb
similarity index 78%
rename from meta/recipes-devtools/python/python-pycurl_7.19.3.bb
rename to meta/recipes-devtools/python/python-pycurl_7.19.3.1.bb
index aee6cdd..02d0ae9 100644
--- a/meta/recipes-devtools/python/python-pycurl_7.19.3.bb
+++ b/meta/recipes-devtools/python/python-pycurl_7.19.3.1.bb
@@ -2,7 +2,7 @@ SUMMARY = "Python bindings for libcurl"
 HOMEPAGE = "http://pycurl.sourceforge.net/"
 SECTION = "devel/python"
 LICENSE = "LGPLv2.1+ | MIT"
-LIC_FILES_CHKSUM = "file://README.rst;beginline=204;endline=219;md5=57e5ab0c0f964533fc59d93dec5695bb \
+LIC_FILES_CHKSUM = "file://README.rst;beginline=148;endline=163;md5=57e5ab0c0f964533fc59d93dec5695bb \
                     file://COPYING-LGPL;md5=3579a9fd0221d49a237aaa33492f988c \
                     file://COPYING-MIT;md5=e8200955c773b2a0fd6cea36ea5e87be"
 
@@ -15,8 +15,8 @@ SRC_URI = "\
   file://no-static-link.patch \
 "
 
-SRC_URI[archive.md5sum] = "b9091b7438d3de1552e28862d2971cd1"
-SRC_URI[archive.sha256sum] = "05e48835fe445ff327dcd373f49d9970e0b828a07cd4d08a23264507a742d616"
+SRC_URI[archive.md5sum] = "6df8fa7fe8b680d93248da1f8d4fcd12"
+SRC_URI[archive.sha256sum] = "c0d673fe99a9de07239eabe77c798f1b043f60c02afaec1430ceaf59d7501a4f"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
-- 
1.9.2

[PATCH 12/19] libconvert-asn1-perl: Upgrade 0.26 -> 0.27

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../{libconvert-asn1-perl_0.26.bb => libconvert-asn1-perl_0.27.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/perl/{libconvert-asn1-perl_0.26.bb => libconvert-asn1-perl_0.27.bb} (76%)

diff --git a/meta/recipes-extended/perl/libconvert-asn1-perl_0.26.bb b/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb
similarity index 76%
rename from meta/recipes-extended/perl/libconvert-asn1-perl_0.26.bb
rename to meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb
index 9c2c9d5..ebe0422 100644
--- a/meta/recipes-extended/perl/libconvert-asn1-perl_0.26.bb
+++ b/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://README.md;beginline=91;endline=97;md5=ceff7fd286eb6d8
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/Convert-ASN1-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "1c846c8c1125e6a075444abe65d99b63"
-SRC_URI[sha256sum] = "5db8b62fa0d036bd0cabc869ffe17941ad587d9a2af1ff030d554872adbc1ca1"
+SRC_URI[md5sum] = "68723e96be0b258a9e20480276e8a62c"
+SRC_URI[sha256sum] = "74a4a78ae0c5e973100ac0a8f203a110f76fb047b79dae4fc1fd7d6814d3d58a"
 
 S = "${WORKDIR}/Convert-ASN1-${PV}"
 
-- 
1.9.2

[PATCH 13/19] btrfs-tools: Upgrade 3.12 -> 3.14.2

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../btrfs-tools/allow-relative-path.patch          | 58 ----------------------
 .../btrfs-tools/btrfs-tools/nodocs.patch           | 22 ++++++++
 .../btrfs-tools/btrfs-tools/weak-defaults.patch    | 31 ------------
 .../btrfs-tools/btrfs-tools_git.bb                 |  9 ++--
 4 files changed, 25 insertions(+), 95 deletions(-)
 delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch
 create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch
 delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.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
deleted file mode 100644
index 695973e..0000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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/nodocs.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch
new file mode 100644
index 0000000..6df4e10
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch
@@ -0,0 +1,22 @@
+Doc generation requires xmlto and ascidoc which we don't have right now.
+Disable doc generation until such times as we have the right dependencies.
+
+RP 2014/7/16
+
+Upstream-Status: Inappropriate
+
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile	2014-07-16 13:21:43.289386655 +0000
++++ git/Makefile	2014-07-16 13:42:46.453421079 +0000
+@@ -57,8 +57,8 @@
+ btrfs_fragment_libs = -lgd -lpng -ljpeg -lfreetype
+ 
+ SUBDIRS =
+-BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS)) build-Documentation
+-INSTALLDIRS = $(patsubst %,install-%,$(SUBDIRS)) install-Documentation
++BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS))
++INSTALLDIRS = $(patsubst %,install-%,$(SUBDIRS))
+ CLEANDIRS = $(patsubst %,clean-%,$(SUBDIRS))
+ 
+ .PHONY: $(SUBDIRS)
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch
deleted file mode 100644
index 9ca9fca..0000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream-Status: Pending
-
-Allow mandir to be set from the environment, fixing the following packaging warnings:
-
-WARNING: For recipe btrfs-tools, the following files were installed but not shipped in any package:
-WARNING:   /usr/man/man8/btrfs-show.8.gz
-WARNING:   /usr/man/man8/btrfs-image.8.gz
-WARNING:   /usr/man/man8/btrfsctl.8.gz
-WARNING:   /usr/man/man8/btrfs.8.gz
-WARNING:   /usr/man/man8/btrfsck.8.gz
-WARNING:   /usr/man/man8/mkfs.btrfs.8.gz
-
-RP - 5/7/2011
-
-Index: git/man/Makefile
-===================================================================
---- git.orig/man/Makefile	2011-07-05 22:03:58.949919067 +0100
-+++ git/man/Makefile	2011-07-05 22:04:07.789919856 +0100
-@@ -2,9 +2,9 @@
- INSTALL= install
- 
- prefix ?= /usr/local
--bindir = $(prefix)/bin
--mandir = $(prefix)/man
--man8dir = $(mandir)/man8
-+bindir ?= $(prefix)/bin
-+mandir ?= $(prefix)/man
-+man8dir ?= $(mandir)/man8
- 
- MANPAGES = mkfs.btrfs.8.gz btrfsctl.8.gz btrfsck.8.gz btrfs-image.8.gz \
- 	   btrfs-show.8.gz btrfs.8.gz
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
index 8129cd5..0eed13b 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
@@ -12,15 +12,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
 SECTION = "base"
 DEPENDS = "util-linux attr e2fsprogs lzo acl"
 
-SRCREV = "8cae1840afb3ea44dcc298f32983e577480dfee4"
+SRCREV = "24cf4d8c3ee924b474f68514e0167cc2e602a48d"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git \
-           file://weak-defaults.patch \
-           file://allow-relative-path.patch \
-          "
-
+           file://nodocs.patch"
 S = "${WORKDIR}/git"
 
-PV = "3.12+git${SRCPV}"
+PV = "3.14.2+git${SRCPV}"
 
 
 do_install () {
-- 
1.9.2

[PATCH 14/19] neard: Fix typo in patch leading to parallel make race

[Richard Purdie]

The typo left room for a parallel make race for unit/test-snep-read.o,
fix it.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-connectivity/neard/neard/parallel-build.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/neard/neard/parallel-build.patch b/meta/recipes-connectivity/neard/neard/parallel-build.patch
index 1837ad0..5624749 100644
--- a/meta/recipes-connectivity/neard/neard/parallel-build.patch
+++ b/meta/recipes-connectivity/neard/neard/parallel-build.patch
@@ -30,7 +30,7 @@ index c51351f..8e58ac1 100644
 +$(se_seeld_OBJECTS) \
 +$(unit_test_ndef_parse_OBJECTS) \
 +$(unit_test_ndef_build_OBJECTS) \
-+$(unit_test_snep-read_OBJECTS) \
++$(unit_test_snep_read_OBJECTS) \
 +$(tools_snep_send_OBJECTS): $(local_headers)
  
  include/near/version.h: include/version.h
-- 
1.9.2

[PATCH 15/19] fontcache: Fix build dependency errors

[Richard Purdie]

This addresses warnings like:

WARNING: QA Issue: liberation-fonts rdepends on fontconfig-utils but its not a build dependency? [build-deps]

since the dependencies were being added at package time and were not
visible to bitbake.

Also take the opportunity to convert to use PACKAGEFUNCS rather than
the horrible populate_packages_append.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/fontcache.bbclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index afd3fd2..2bf1e4b 100644
--- a/meta/classes/fontcache.bbclass
+++ b/meta/classes/fontcache.bbclass
@@ -18,13 +18,16 @@ else
 fi
 }
 
-python populate_packages_append() {
+python () {
     font_pkgs = d.getVar('FONT_PACKAGES', True).split()
     deps = d.getVar("FONT_EXTRA_RDEPENDS", True)
 
     for pkg in font_pkgs:
         if deps: d.appendVar('RDEPENDS_' + pkg, ' '+deps)
+}
 
+python add_fontcache_postinsts() {
+    for pkg in d.getVar('FONT_PACKAGES', True).split():
         bb.note("adding fonts postinst and postrm scripts to %s" % pkg)
         postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True)
         if not postinst:
@@ -38,3 +41,5 @@ python populate_packages_append() {
         postrm += d.getVar('fontcache_common', True)
         d.setVar('pkg_postrm_%s' % pkg, postrm)
 }
+
+PACKAGEFUNCS += "add_fontcache_postinsts"
-- 
1.9.2

[PATCH 16/19] libpcap: Fix floating dbus dependency

[Richard Purdie]

Avoids WARNING: QA Issue: libpcap rdepends on dbus-lib but its not a build dependency? [build-deps]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-connectivity/libpcap/libpcap.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 1a3c0c1..92d6eff 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -27,6 +27,7 @@ EXTRA_OECONF = "--with-pcap=linux"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[libnl1] = "--with-libnl,--without-libnl,libnl1,libnl1"
+PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
 
 CPPFLAGS_prepend = "-I${S} "
 CFLAGS_prepend = "-I${S} "
-- 
1.9.2

[PATCH 17/19] gnutls: Fix floating libidn dependency

[Richard Purdie]

Avoids WARNING: QA Issue: gnutls-bin rdepends on libidn but its not a build dependency? [build-deps]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-support/gnutls/gnutls.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index 8820b0e..d89b764 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -25,6 +25,7 @@ EXTRA_OECONF="--disable-rpath \
               --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
               --with-libz-prefix=${STAGING_DIR_HOST}${prefix} \
               --disable-guile \
+              --disable-crywrap \
               --without-p11-kit \
               "
 
-- 
1.9.2

[PATCH 00/19] Various fixes and package upgrades

[Richard Purdie]

The following changes since commit f826b13e4ae2f2f2ffebdf22435452c1a72980d8:

  libpcap: Avoid libpcap build error when libnl1 is involved (2014-07-16 17:18:25 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core master-next
  http://cgit.openembedded.org/cgit.cgi/openembedded-core/log/?h=master-next

Richard Purdie (19):
  pkgconfig: Drop version from RPROVIDES
  python-docutil: Upgrade 0.11 -> 0.12
  python-scons: Upgrade 2.3.0 -> 2.3.2
  gdb: Upgrade 7.7 -> 7.7.1
  mdadm: Upgrade 3.3 -> 3.3.1
  gccmakedep: Upgrade 1.0.2 -> 1.0.3
  powertop: Upgrade 2.5 -> 2.6.1
  nasm: Update 2.11.02 -> 2.11.05
  cross-canadian: Fix shlibs directory after recent shlibs changes
  subversion: Upgrade 1.7.7 -> 1.8.9
  python-pycurl: Upgrade 7.19.3 -> 7.19.3.1
  libconvert-asn1-perl: Upgrade 0.26 -> 0.27
  btrfs-tools: Upgrade 3.12 -> 3.14.2
  neard: Fix typo in patch leading to parallel make race
  fontcache: Fix build dependency errors
  libpcap: Fix floating dbus dependency
  gnutls: Fix floating libidn dependency
  xserver-xorg: Fix build determinism problem
  python: Forcibly disable tk

 meta/classes/cross-canadian.bbclass                |   4 +-
 meta/classes/fontcache.bbclass                     |   7 +-
 meta/recipes-connectivity/libpcap/libpcap.inc      |   1 +
 .../neard/neard/parallel-build.patch               |   2 +-
 .../btrfs-tools/allow-relative-path.patch          |  58 ---------
 .../btrfs-tools/btrfs-tools/nodocs.patch           |  22 ++++
 .../btrfs-tools/btrfs-tools/weak-defaults.patch    |  31 -----
 .../btrfs-tools/btrfs-tools_git.bb                 |   9 +-
 .../gdb/{gdb-7.7.inc => gdb-7.7.1.inc}             |   4 +-
 ...canadian_7.7.bb => gdb-cross-canadian_7.7.1.bb} |   0
 .../gdb/{gdb-cross_7.7.bb => gdb-cross_7.7.1.bb}   |   0
 .../gdb/{gdb_7.7.bb => gdb_7.7.1.bb}               |   0
 .../nasm/{nasm_2.11.02.bb => nasm_2.11.05.bb}      |   4 +-
 meta/recipes-devtools/pkgconfig/pkgconfig.inc      |   2 +-
 ...on-docutils_0.11.bb => python-docutils_0.12.bb} |   6 +-
 .../python/python-pycurl/no-static-link.patch      |  24 ++--
 ...-pycurl_7.19.3.bb => python-pycurl_7.19.3.1.bb} |   6 +-
 ...ative_2.3.0.bb => python-scons-native_2.3.2.bb} |   0
 ...python-scons_2.3.0.bb => python-scons_2.3.2.bb} |   6 +-
 .../python/avoid_warning_about_tkinter.patch       |  15 ++-
 .../subversion-1.7.10/allow-updated-neon.patch     |  20 ----
 .../subversion-1.7.10/fix-install-depends.patch    |  48 --------
 .../neon.m4-fix-includes-and-cflags.patch          |  32 -----
 .../subversion-CVE-2013-4131.patch                 |  42 -------
 .../subversion-CVE-2013-4277.patch                 |  15 ---
 .../subversion-CVE-2013-4505.patch                 | 130 ---------------------
 .../subversion-1.8.9/disable_macos.patch           |  68 +++++++++++
 .../libtool2.patch                                 |   0
 .../{subversion_1.7.10.bb => subversion_1.8.9.bb}  |  15 +--
 .../mdadm/{mdadm_3.3.bb => mdadm_3.3.1.bb}         |   6 +-
 ...1-perl_0.26.bb => libconvert-asn1-perl_0.27.bb} |   4 +-
 .../{gccmakedep_1.0.2.bb => gccmakedep_1.0.3.bb}   |   4 +-
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |   1 +
 .../{powertop_2.5.bb => powertop_2.6.1.bb}         |   5 +-
 meta/recipes-support/gnutls/gnutls.inc             |   1 +
 35 files changed, 157 insertions(+), 435 deletions(-)
 delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch
 create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch
 delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch
 rename meta/recipes-devtools/gdb/{gdb-7.7.inc => gdb-7.7.1.inc} (70%)
 rename meta/recipes-devtools/gdb/{gdb-cross-canadian_7.7.bb => gdb-cross-canadian_7.7.1.bb} (100%)
 rename meta/recipes-devtools/gdb/{gdb-cross_7.7.bb => gdb-cross_7.7.1.bb} (100%)
 rename meta/recipes-devtools/gdb/{gdb_7.7.bb => gdb_7.7.1.bb} (100%)
 rename meta/recipes-devtools/nasm/{nasm_2.11.02.bb => nasm_2.11.05.bb} (81%)
 rename meta/recipes-devtools/python/{python-docutils_0.11.bb => python-docutils_0.12.bb} (60%)
 rename meta/recipes-devtools/python/{python-pycurl_7.19.3.bb => python-pycurl_7.19.3.1.bb} (78%)
 rename meta/recipes-devtools/python/{python-scons-native_2.3.0.bb => python-scons-native_2.3.2.bb} (100%)
 rename meta/recipes-devtools/python/{python-scons_2.3.0.bb => python-scons_2.3.2.bb} (52%)
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4131.patch
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4277.patch
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4505.patch
 create mode 100644 meta/recipes-devtools/subversion/subversion-1.8.9/disable_macos.patch
 rename meta/recipes-devtools/subversion/{subversion-1.7.10 => subversion-1.8.9}/libtool2.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion_1.7.10.bb => subversion_1.8.9.bb} (67%)
 rename meta/recipes-extended/mdadm/{mdadm_3.3.bb => mdadm_3.3.1.bb} (90%)
 rename meta/recipes-extended/perl/{libconvert-asn1-perl_0.26.bb => libconvert-asn1-perl_0.27.bb} (76%)
 rename meta/recipes-graphics/xorg-util/{gccmakedep_1.0.2.bb => gccmakedep_1.0.3.bb} (78%)
 rename meta/recipes-kernel/powertop/{powertop_2.5.bb => powertop_2.6.1.bb} (85%)

-- 
1.9.2

[PATCH 18/19] xserver-xorg: Fix build determinism problem

[Richard Purdie]

We're seeing the warning:

WARNING: QA Issue: xserver-xorg rdepends on nettle but its not a build dependency? [build-deps]

We list openssl in DEPENDS so we need to specify that as the sha1 provider
rather that nettle which is autodetected.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 628da58..dd60884 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -112,6 +112,7 @@ EXTRA_OECONF += "--with-fop=no \
                  --sysconfdir=/etc/X11 \
                  --localstatedir=/var \
                  --with-xkb-output=/var/lib/xkb \
+                 --with-sha1=libcrypto \
                  ac_cv_file__usr_share_sgml_X11_defs_ent=no \
 "
 
-- 
1.9.2

[PATCH 19/19] python: Forcibly disable tk

[Richard Purdie]

Avoids the determinism problem shown with the warnings:

WARNING: QA Issue: python-tkinter rdepends on libx11 but its not a build dependency? [build-deps]
WARNING: QA Issue: python-tkinter rdepends on tcl-lib but its not a build dependency? [build-deps

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../python/python/avoid_warning_about_tkinter.patch       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch
index 208c57c..bedc390 100644
--- a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch
+++ b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch
@@ -2,17 +2,22 @@ _tkinter module needs tk module along with tcl. tk is not yet integrated
 in yocto so we skip the check for this module.
 Avoid a warning by not adding this module to missing variable.
 
+Also simply disable the tk module since its not in DEPENDS.
+
 Upstream-Status: Inappropriate [distribution]
 
 Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
 
-Index: Python-2.7.2/setup.py
+Index: Python-2.7.3/setup.py
 ===================================================================
---- Python-2.7.2.orig/setup.py	2012-04-05 23:18:38.500136647 +0300
-+++ Python-2.7.2/setup.py	2012-04-05 23:19:35.888134969 +0300
-@@ -1634,8 +1634,10 @@
+--- Python-2.7.3.orig/setup.py	2014-07-07 13:45:15.056233820 +0000
++++ Python-2.7.3/setup.py	2014-07-16 16:06:37.145656284 +0000
+@@ -1639,10 +1639,12 @@
+         self.extensions.extend(exts)
+ 
          # Call the method for detecting whether _tkinter can be compiled
-         self.detect_tkinter(inc_dirs, lib_dirs)
+-        self.detect_tkinter(inc_dirs, lib_dirs)
++        #self.detect_tkinter(inc_dirs, lib_dirs)
  
 -        if '_tkinter' not in [e.name for e in self.extensions]:
 -            missing.append('_tkinter')
-- 
1.9.2

Re: [PATCH 18/19] xserver-xorg: Fix build determinism problem

[Burton, Ross]

On 16 July 2014 17:26, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> WARNING: QA Issue: xserver-xorg rdepends on nettle but its not a build dependency? [build-deps]
>
> We list openssl in DEPENDS so we need to specify that as the sha1 provider
> rather that nettle which is autodetected.

If xserver is seeing both openssl and nettle installed but picking
nettle, should we switch the build dependency from openssl to nettle?
The nettle library is half the size of openssl and has saner
licensing, so this seems like a win to me.

Ross

Re: [PATCH 18/19] xserver-xorg: Fix build determinism problem

[Richard Purdie]

On Wed, 2014-07-16 at 21:38 +0100, Burton, Ross wrote:
> On 16 July 2014 17:26, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > WARNING: QA Issue: xserver-xorg rdepends on nettle but its not a build dependency? [build-deps]
> >
> > We list openssl in DEPENDS so we need to specify that as the sha1 provider
> > rather that nettle which is autodetected.
> 
> If xserver is seeing both openssl and nettle installed but picking
> nettle, should we switch the build dependency from openssl to nettle?
> The nettle library is half the size of openssl and has saner
> licensing, so this seems like a win to me.

Happy to have a follow up patch. I just fixed it so it was at least
doing what we were supposedly configuring it to.

Cheers,

Richard

Re: [PATCH 03/19] python-scons: Upgrade 2.3.0 -> 2.3.2

[Burton, Ross]

On 16 July 2014 17:26, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=98e9a1e6029e715255c52032a1eba637"
> +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f0ad8a74a10870caa5e08a3e45d719e2"

Why did the checksum change?

Ross

Re: [PATCH 03/19] python-scons: Upgrade 2.3.0 -> 2.3.2

[Richard Purdie]

On Wed, 2014-07-16 at 23:30 +0100, Burton, Ross wrote:
> On 16 July 2014 17:26, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=98e9a1e6029e715255c52032a1eba637"
> > +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f0ad8a74a10870caa5e08a3e45d719e2"
> 
> Why did the checksum change?

Gah, I did check but forgot to put it in the log. It was the copyright
year.

Cheers,

Richard