[30/41] itstool: upgrade 2.0.5 -> 2.0.6

Submitted by Andreas Müller on May 23, 2019, 6:48 a.m. | Patch ID: 161571

Details

Message ID 20190523064859.24336-31-schnitzeltony@gmail.com
State New
Headers show

Commit Message

Andreas Müller May 23, 2019, 6:48 a.m.
* move to github sources: at the time of writing download server had
  certificate issues
* add patch to fix possible segfault

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...on-fault-bug-introduced-with-version.patch | 33 +++++++++++++++++++
 .../{itstool_2.0.5.bb => itstool_2.0.6.bb}    |  9 +++--
 2 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-support/itstool/itstool/0001-Fix-a-segmentation-fault-bug-introduced-with-version.patch
 rename meta-oe/recipes-support/itstool/{itstool_2.0.5.bb => itstool_2.0.6.bb} (70%)

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-support/itstool/itstool/0001-Fix-a-segmentation-fault-bug-introduced-with-version.patch b/meta-oe/recipes-support/itstool/itstool/0001-Fix-a-segmentation-fault-bug-introduced-with-version.patch
new file mode 100644
index 000000000..9783faee6
--- /dev/null
+++ b/meta-oe/recipes-support/itstool/itstool/0001-Fix-a-segmentation-fault-bug-introduced-with-version.patch
@@ -0,0 +1,33 @@ 
+From 6dbc1d78e83144c425df1f4ec9e293dba64afcb1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Tue, 14 May 2019 11:21:03 +0200
+Subject: [PATCH] Fix a segmentation fault bug introduced with version 2.0.4.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Submitted [1]
+
+[1] https://github.com/itstool/itstool/pull/18
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ itstool.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/itstool.in b/itstool.in
+index e64cd34..d79fb7f 100755
+--- a/itstool.in
++++ b/itstool.in
+@@ -1053,7 +1053,7 @@ class Document (object):
+         else:
+             ctxt.replaceEntities(1)
+         ctxt.parseDocument()
+-        trnode = ctxt.doc().getRootElement()
++        trnode = ctxt.doc().getRootElement().copyNode(1)
+         try:
+             self._check_errors()
+         except libxml2.parserError:
+-- 
+2.20.1
+
diff --git a/meta-oe/recipes-support/itstool/itstool_2.0.5.bb b/meta-oe/recipes-support/itstool/itstool_2.0.6.bb
similarity index 70%
rename from meta-oe/recipes-support/itstool/itstool_2.0.5.bb
rename to meta-oe/recipes-support/itstool/itstool_2.0.6.bb
index 166e95b3a..2caa64604 100644
--- a/meta-oe/recipes-support/itstool/itstool_2.0.5.bb
+++ b/meta-oe/recipes-support/itstool/itstool_2.0.6.bb
@@ -7,9 +7,12 @@  inherit autotools python3native
 
 DEPENDS = "python3-lxml-native"
 
-SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "655c6f78fc64faee45adcc45ccc5a57e"
-SRC_URI[sha256sum] = "100506f8df62cca6225ec3e631a8237e9c04650c77495af4919ac6a100d4b308"
+SRC_URI = " \
+    git://github.com/itstool/itstool.git \
+    file://0001-Fix-a-segmentation-fault-bug-introduced-with-version.patch \
+"
+SRCREV = "60f3a955ca047b1d62a1d952beec74afaff7cbbf"
+S = "${WORKDIR}/git"
 
 do_install_append() {
     # fix shebang of main script