[dunfell 00/26] Patch review

[dunfell 00/26] Patch review

[akuster]

Next set of changes for Dunfell. Please review and have comments back by Tuesday.

This includes the three python3 changes need to match Core.

The following changes since commit cc155826b0b4f202a8fa4ac103b7c38368d32734:

  thunar: upgrade 1.8.14 -> 1.8.15 (2020-05-28 21:50:13 -0700)

are available in the Git repository at:

  git://git.openembedded.org/meta-openembedded-contrib stable/dunfell-nut
  http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/dunfell-nut

Andreas Müller (1):
  fluidsynth: upgrade 2.1.2 -> 2.1.3

Denys Dmytriyenko (2):
  python3-pycryptodome(x): moved to OE-Core, remove from meta-python
  python3-pyelftools: moved to OE-Core, remove from meta-python

Domarys Correa (1):
  python3-pyyaml: Update 5.3 -> 5.3.1

Hongxu Jia (1):
  multipath-tools: fix compiling parallel issue

Kai Kang (1):
  plymouth: disable systemd-integration for sysvinit

Khem Raj (1):
  dfu-util-native: Remove DEPLOY_DIR_TOOLS from sstate-outputdirs

Konrad Weihmann (6):
  passwdqc: remove double modify operation
  sound-theme-freedesktop: remove double depends
  python3-cmd2: remove double colorama in RDEPENDS
  python3-smbus2: remove duplicate RDEPENDS settings
  python3-twisted: remove double var modification
  proftpd: Fix typo for SRC_URI[md5sum]

Leon Anavi (1):
  python3-colorama: Upgrade 0.4.1 -> 0.4.3

Maciej Pijanowski (1):
  qpdf: fix typo in RDEPENDS

Martin Jansa (2):
  irssi: package libirc_proxy.a in PN-staticdev
  meta-python: depend on core version 12 or higher

Patrick Williams (1):
  net-snmp: refresh patches

Zang Ruochen (4):
  libgphoto2: upgrade 2.5.24 -> 2.5.25
  mosquitto: upgrade 1.6.9 -> 1.6.10
  snort: upgrade 2.9.15 -> 2.9.16
  wireshark: upgrade 3.2.2 -> 3.2.4

Zheng Ruoqin (4):
  nano: upgrade 4.9.2 -> 4.9.3
  gsoap: upgrade 2.8.100 -> 2.8.103
  logwatch: upgrade 7.5.1 -> 7.5.3
  libnet-dns-perl: upgrade 1.23 -> 1.24

 .../fluidsynth/fluidsynth.inc                 |  4 +-
 ...tables-helper-we-have-to-use-native-.patch | 32 +++++++++----
 ...mosquitto_1.6.9.bb => mosquitto_1.6.10.bb} |  4 +-
 ...deck-for-gettid-API-during-configure.patch | 48 -------------------
 .../{snort_2.9.15.bb => snort_2.9.16.bb}      |  5 +-
 .../recipes-daemons/proftpd/proftpd_1.3.6.bb  |  2 +-
 ...upport-for-building-applications-and.patch | 24 +++++-----
 .../0001-config_os_headers-Error-Fix.patch    | 10 ++--
 ...t-snmp-fix-compile-error-disable-des.patch | 14 +++---
 ...add-knob-whether-nlist.h-are-checked.patch | 15 +++---
 ...{wireshark_3.2.2.bb => wireshark_3.2.4.bb} |  4 +-
 .../recipes-connectivity/irssi/irssi_1.2.2.bb |  2 +
 .../recipes-core/plymouth/plymouth_0.9.4.bb   |  2 +-
 .../{logwatch_7.5.1.bb => logwatch_7.5.3.bb}  |  4 +-
 ...gphoto2_2.5.24.bb => libgphoto2_2.5.25.bb} |  4 +-
 .../sound-theme-freedesktop_0.8.bb            |  2 +-
 meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb  |  2 +-
 .../passwdqc/passwdqc_1.3.1.bb                |  2 +-
 .../dfu-util/dfu-util-native_0.9.bb           |  1 -
 .../{gsoap_2.8.100.bb => gsoap_2.8.103.bb}    |  4 +-
 ...add-explicit-dependency-on-libraries.patch | 40 ++++++++++++++++
 .../multipath-tools/multipath-tools_0.8.4.bb  |  1 +
 .../nano/{nano_4.9.2.bb => nano_4.9.3.bb}     |  4 +-
 ...s-perl_1.23.bb => libnet-dns-perl_1.24.bb} |  4 +-
 meta-python/conf/layer.conf                   |  2 +-
 .../python/python-pycryptodome.inc            | 29 -----------
 .../python/python3-cmd2_0.9.23.bb             |  1 -
 ...ama_0.4.1.bb => python3-colorama_0.4.3.bb} |  4 +-
 .../python/python3-pycryptodome_3.9.4.bb      |  2 -
 .../python/python3-pycryptodomex_3.9.4.bb     | 10 ----
 .../python/python3-pyelftools_0.25.bb         | 14 ------
 .../python/python3-pyyaml_5.3.1.bb            | 18 +++++++
 .../python/python3-pyyaml_5.3.bb              | 19 --------
 .../python/python3-smbus2_0.3.0.bb            |  2 -
 .../python/python3-twisted_19.10.0.bb         |  4 +-
 35 files changed, 144 insertions(+), 195 deletions(-)
 rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_1.6.9.bb => mosquitto_1.6.10.bb} (95%)
 delete mode 100644 meta-networking/recipes-connectivity/snort/snort/0001-chdeck-for-gettid-API-during-configure.patch
 rename meta-networking/recipes-connectivity/snort/{snort_2.9.15.bb => snort_2.9.16.bb} (95%)
 rename meta-networking/recipes-support/wireshark/{wireshark_3.2.2.bb => wireshark_3.2.4.bb} (95%)
 rename meta-oe/recipes-extended/logwatch/{logwatch_7.5.1.bb => logwatch_7.5.3.bb} (95%)
 rename meta-oe/recipes-graphics/gphoto2/{libgphoto2_2.5.24.bb => libgphoto2_2.5.25.bb} (91%)
 rename meta-oe/recipes-support/gsoap/{gsoap_2.8.100.bb => gsoap_2.8.103.bb} (89%)
 create mode 100644 meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch
 rename meta-oe/recipes-support/nano/{nano_4.9.2.bb => nano_4.9.3.bb} (80%)
 rename meta-perl/recipes-perl/libnet/{libnet-dns-perl_1.23.bb => libnet-dns-perl_1.24.bb} (92%)
 delete mode 100644 meta-python/recipes-devtools/python/python-pycryptodome.inc
 rename meta-python/recipes-devtools/python/{python3-colorama_0.4.1.bb => python3-colorama_0.4.3.bb} (61%)
 delete mode 100644 meta-python/recipes-devtools/python/python3-pycryptodome_3.9.4.bb
 delete mode 100644 meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb
 delete mode 100644 meta-python/recipes-devtools/python/python3-pyelftools_0.25.bb
 create mode 100644 meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb
 delete mode 100644 meta-python/recipes-devtools/python/python3-pyyaml_5.3.bb

-- 
2.17.1

[dunfell 01/26] plymouth: disable systemd-integration for sysvinit

[akuster]

From: Kai Kang <kai.kang@windriver.com>

It fails to build plymouth for sysvinit:

| ERROR: plymouth-0.9.4-r0 do_package: QA Issue: plymouth:
   Files/directories were installed but not shipped in any package:
|   /poweroff.target.wants
|   ...
|   /halt.target.wants/plymouth-halt.service
| Please set FILES such that these items are packaged. Alternatively if
   they are unneeded, avoid installing them or delete them within do_install.
| plymouth: 17 installed and not shipped files. [installed-vs-shipped]

Because systemd is not installed for sysvinit, the value of variable
'SYSTEMD_UNIT_DIR' is empty and causes the failures.

Disable systemd-integration if 'systemd' not in DISTRO_FEATURES.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 30b04053469415879a48ace9dec0f06aae92a1d8)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb b/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb
index 8b71c2bd6c..78c1cb4440 100644
--- a/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb
+++ b/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb
@@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "4a197a4f1a05785d7453dd829b231352fb2d09171bd86c5ffaafbb2dd6
 
 EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation \
     --with-logo=${LOGO} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd-integration --with-systemd-tty-ask-password-agent=${base_bindir}/systemd-tty-ask-password-agent', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd-integration --with-systemd-tty-ask-password-agent=${base_bindir}/systemd-tty-ask-password-agent', '--disable-systemd-integration', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge','--without-system-root-install','--with-system-root-install',d)} \
 "
 
-- 
2.17.1

[dunfell 02/26] irssi: package libirc_proxy.a in PN-staticdev

[akuster]

From: Martin Jansa <martin.jansa@gmail.com>

* fixes:
  ERROR: irssi-1.0.4-r0 do_package_qa: QA Issue:
  non -staticdev package contains static .a library: irssi path '/work/core2-64-oe-linux/irssi/1.0.4-r0/packages-split/irssi/usr/lib/irssi/modules/libirc_proxy.a' [staticdev]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 8a84a0f802747798c7f35abc4b9e158ee3f30729)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-connectivity/irssi/irssi_1.2.2.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-connectivity/irssi/irssi_1.2.2.bb b/meta-oe/recipes-connectivity/irssi/irssi_1.2.2.bb
index da5403e5c8..1c5a912f27 100644
--- a/meta-oe/recipes-connectivity/irssi/irssi_1.2.2.bb
+++ b/meta-oe/recipes-connectivity/irssi/irssi_1.2.2.bb
@@ -18,3 +18,5 @@ EXTRA_OECONF += "--with-textui \
                  --with-bot \
                  --with-perl=no \
                  --enable-true-color"
+
+FILES_${PN}-staticdev += "${libdir}/${BPN}/modules/*.a"
-- 
2.17.1

[dunfell 03/26] multipath-tools: fix compiling parallel issue

[akuster]

From: Hongxu Jia <hongxu.jia@windriver.com>

Add explicit dependency on libraries
[snip]
gcc/i686-overc-linux/10.1.0/ld: cannot find -lmpathpersist
collect2: error: ld returned 1 exit status
Makefile:36: recipe for target 'multipathd' failed
make[1]: *** [multipathd] Error 1
make[1]: Leaving directory 'git/multipathd'
Makefile:29: recipe for target 'multipathd' failed
make: *** [multipathd] Error 2
ln -sf libmpathpersist.so.0 libmpathpersist.so
[snip]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 78509dbb7966906c78a16bec24e6c31e307b78aa)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...add-explicit-dependency-on-libraries.patch | 40 +++++++++++++++++++
 .../multipath-tools/multipath-tools_0.8.4.bb  |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch

diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch b/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch
new file mode 100644
index 0000000000..2827bb8745
--- /dev/null
+++ b/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch
@@ -0,0 +1,40 @@
+From 04884263d1de8c427a7a15bd1cf6466ea65d3a0b Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Mon, 25 May 2020 23:22:55 -0700
+Subject: [PATCH] add explicit dependency on libraries
+
+[snip]
+gcc/i686-overc-linux/10.1.0/ld: cannot find -lmpathpersist
+collect2: error: ld returned 1 exit status
+Makefile:36: recipe for target 'multipathd' failed
+make[1]: *** [multipathd] Error 1
+make[1]: Leaving directory 'git/multipathd'
+Makefile:29: recipe for target 'multipathd' failed
+make: *** [multipathd] Error 2
+ln -sf libmpathpersist.so.0 libmpathpersist.so
+[snip]
+
+Upstream-Status: Pending
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index bea0a0b2..37a77129 100644
+--- a/Makefile
++++ b/Makefile
+@@ -29,7 +29,8 @@ $(BUILDDIRS):
+ 	$(MAKE) -C $@
+ 
+ multipath multipathd mpathpersist libmpathpersist : libmultipath
+-mpathpersist:  libmpathpersist
++mpathpersist multipathd:  libmpathpersist
++libdmmp libmultipath mpathpersist multipath multipathd: libmpathcmd
+ 
+ DEPS_ON_MULTIPATH := \
+ 	multipath \
+-- 
+2.21.0
+
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
index 2795a8d091..af34a4b392 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
@@ -44,6 +44,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \
            file://0030-Always-use-devmapper.patch \
            file://0031-Always-use-devmapper-for-kpartx.patch \
            file://0001-fix-bug-of-do_compile-and-do_install.patch \
+           file://0001-add-explicit-dependency-on-libraries.patch \
            "
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
-- 
2.17.1

[dunfell 04/26] nano: upgrade 4.9.2 -> 4.9.3

[akuster]

From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit a3f13f3d868a4266cfc1fa79cc6e3b5ecf97b2b3)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-support/nano/{nano_4.9.2.bb => nano_4.9.3.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/nano/{nano_4.9.2.bb => nano_4.9.3.bb} (80%)

diff --git a/meta-oe/recipes-support/nano/nano_4.9.2.bb b/meta-oe/recipes-support/nano/nano_4.9.3.bb
similarity index 80%
rename from meta-oe/recipes-support/nano/nano_4.9.2.bb
rename to meta-oe/recipes-support/nano/nano_4.9.3.bb
index 2b236ba1eb..645b07b4ce 100644
--- a/meta-oe/recipes-support/nano/nano_4.9.2.bb
+++ b/meta-oe/recipes-support/nano/nano_4.9.3.bb
@@ -12,8 +12,8 @@ RDEPENDS_${PN} = "ncurses-terminfo-base"
 PV_MAJOR = "${@d.getVar('PV').split('.')[0]}"
 
 SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz"
-SRC_URI[md5sum] = "10df0100ebf4aa7bb4806428c11751eb"
-SRC_URI[sha256sum] = "d8a25eea942ecee2d57b8e037eb4b28f030f818b78773b8fcb994ed5835d2ef6"
+SRC_URI[md5sum] = "52137a960ae8b3ca6d7dab6767fe6e5f"
+SRC_URI[sha256sum] = "6e3438f033a0ed07d3d74c30d0803cbda3d2366ba1601b7bbf9b16ac371f51b4"
 
 UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano"
 
-- 
2.17.1

[dunfell 05/26] gsoap: upgrade 2.8.100 -> 2.8.103

[akuster]

From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit fd389304acc29aa2b4c3f3ebca3c899f21e35e17)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../gsoap/{gsoap_2.8.100.bb => gsoap_2.8.103.bb}              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/gsoap/{gsoap_2.8.100.bb => gsoap_2.8.103.bb} (89%)

diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.100.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.103.bb
similarity index 89%
rename from meta-oe/recipes-support/gsoap/gsoap_2.8.100.bb
rename to meta-oe/recipes-support/gsoap/gsoap_2.8.103.bb
index 0b4eac8897..8543c6f484 100644
--- a/meta-oe/recipes-support/gsoap/gsoap_2.8.100.bb
+++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.103.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip \
            "
-SRC_URI[md5sum] = "f0fc5394286753eff657cf62b46d024b"
-SRC_URI[sha256sum] = "11b4f99d28392e3e1aeb29bfd006a4f1f40e7fdd7a3f3444ee69014d415f09f2"
+SRC_URI[md5sum] = "3207ece9fc8ceb787091de93838f5952"
+SRC_URI[sha256sum] = "afe2ba08d2fa56adc3c774b6741587203a72140a255346e9947b8d2ee6c7d4b6"
 
 inherit autotools
 
-- 
2.17.1

[dunfell 06/26] libgphoto2: upgrade 2.5.24 -> 2.5.25

[akuster]

From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit cf47180e012fe6738e2a00057961a23a2810a0a0)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../gphoto2/{libgphoto2_2.5.24.bb => libgphoto2_2.5.25.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-graphics/gphoto2/{libgphoto2_2.5.24.bb => libgphoto2_2.5.25.bb} (91%)

diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.24.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.25.bb
similarity index 91%
rename from meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.24.bb
rename to meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.25.bb
index 9d9b0c78c8..8daf737a5e 100644
--- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.24.bb
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.25.bb
@@ -14,8 +14,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2
            file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \
 "
 
-SRC_URI[libgphoto2.md5sum] = "063632d839b71698e99da0ccd19bc9f6"
-SRC_URI[libgphoto2.sha256sum] = "fd3c578769f0fa389c1e68120f224bd98477aa3d82d16b82746c1266c0d4fb31"
+SRC_URI[libgphoto2.md5sum] = "39999aa4bdd3bf849b5716153c659405"
+SRC_URI[libgphoto2.sha256sum] = "7c0e98f438c2b128186afe16ce7833a12fa36f87d01467e837b9d27e7a167f3a"
 
 inherit autotools pkgconfig gettext lib_package
 
-- 
2.17.1

[dunfell 07/26] qpdf: fix typo in RDEPENDS

[akuster]

From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit d7fdf615e571a317645e422ddb9363f491cdbd24)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb b/meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb
index 3883a8dcf0..600508097b 100644
--- a/meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb
+++ b/meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb
@@ -32,4 +32,4 @@ DEBIAN_NOAUTONAME_libqpdf = "1"
 PACKAGES =+ "libqpdf"
 FILES_libqpdf = "${libdir}/libqpdf.so.*"
 
-RDEPEND_${PN} = "libqpdf"
+RDEPENDS_${PN} = "libqpdf"
-- 
2.17.1

[dunfell 08/26] python3-pyyaml: Update 5.3 -> 5.3.1

[akuster]

From: Domarys Correa <domarys.correa@ossystems.com.br>

Signed-off-by: Domarys Correa <domarys.correa@ossystems.com.br>
Acked-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 6a7ef1fbb8342d31b76128b102e028844b6f3c98)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../python/python3-pyyaml_5.3.1.bb            | 18 ++++++++++++++++++
 .../python/python3-pyyaml_5.3.bb              | 19 -------------------
 2 files changed, 18 insertions(+), 19 deletions(-)
 create mode 100644 meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb
 delete mode 100644 meta-python/recipes-devtools/python/python3-pyyaml_5.3.bb

diff --git a/meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb b/meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb
new file mode 100644
index 0000000000..8cf9093041
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Python support for YAML"
+DEPENDS += "libyaml ${PYTHON_PN}-cython-native"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7bbd28caa69f81f5cd5f48647236663d"
+
+PYPI_PACKAGE = "PyYAML"
+
+inherit pypi setuptools3
+
+SRC_URI[sha256sum] = "b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d"
+
+RDEPENDS_${PN} += "\
+    ${PYTHON_PN}-datetime \
+    ${PYTHON_PN}-netclient \
+"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-pyyaml_5.3.bb b/meta-python/recipes-devtools/python/python3-pyyaml_5.3.bb
deleted file mode 100644
index 17868a25dd..0000000000
--- a/meta-python/recipes-devtools/python/python3-pyyaml_5.3.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Python support for YAML"
-HOMEPAGE = "http://www.pyyaml.org"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a76b4c69bfcf82313bbdc0393b04438a"
-DEPENDS = "libyaml ${PYTHON_PN}-cython-native ${PYTHON_PN}"
-
-PYPI_PACKAGE = "PyYAML"
-inherit pypi setuptools3
-
-SRC_URI[md5sum] = "adbb0d336b509d6472d3b095a0f1cf30"
-SRC_URI[sha256sum] = "e9f45bd5b92c7974e59bcd2dcc8631a6b6cc380a904725fce7bc08872e691615"
-
-RDEPENDS_${PN} += "\
-    ${PYTHON_PN}-datetime \
-    ${PYTHON_PN}-netclient \
-"
-
-BBCLASSEXTEND = "native nativesdk"
-- 
2.17.1

[dunfell 09/26] net-snmp: refresh patches

[akuster]

From: Patrick Williams <patrick@stwcx.xyz>

Refreshed patches for 5.8 due to the following:

    ERROR: net-snmp-5.8-r0 do_patch: Command Error: 'quilt --quiltrc .../net-snmp/5.8-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0  Output:
    Applying patch 0001-Add-pkg-config-support-for-building-applications-and.patch
    patching file configure
    ...
    Hunk #1 succeeded at 32248 with fuzz 2 (offset 1826 lines).
    Hunk #2 FAILED at 31447.
    1 out of 2 hunks FAILED -- rejects in file configure
    ...
    Patch 0001-Add-pkg-config-support-for-building-applications-and.patch does not apply (enforce with -f)

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 9c3b872f846e0a2491fe8bf16ae38db82609938c)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...upport-for-building-applications-and.patch | 24 +++++++++----------
 .../0001-config_os_headers-Error-Fix.patch    | 10 ++++----
 ...t-snmp-fix-compile-error-disable-des.patch | 14 +++++------
 ...add-knob-whether-nlist.h-are-checked.patch | 15 +++++++-----
 4 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-pkg-config-support-for-building-applications-and.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-pkg-config-support-for-building-applications-and.patch
index 6cb9588eb1..dd159b9cec 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-pkg-config-support-for-building-applications-and.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-pkg-config-support-for-building-applications-and.patch
@@ -1,4 +1,4 @@
-From aea8c2f0bf8004c8da8ca9acb04ab07798cd8068 Mon Sep 17 00:00:00 2001
+From 4bf83597379523032663c8e95b3786a217c9a849 Mon Sep 17 00:00:00 2001
 From: Hugh McMaster <hugh.mcmaster@outlook.com>
 Date: Wed, 3 Apr 2019 21:36:03 +1100
 Subject: [PATCH] Add pkg-config support for building applications and
@@ -10,10 +10,8 @@ The netsnmp-agent package should be used when building Net-SNMP subagents.
 Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
 [ bvanassche: edited makefile code and .pc files; added ./configure changes ]
 
-
 Upstream-Status: Backport
 https://sourceforge.net/p/net-snmp/patches/_discuss/thread/a0d66e91dd/f940/attachment/0001-Add-pkg-config-support-for-building-applications-and.patch
-
 ---
  Makefile.in         |  2 ++
  Makefile.rules      | 30 ++++++++++++++++++++++++++----
@@ -26,7 +24,7 @@ https://sourceforge.net/p/net-snmp/patches/_discuss/thread/a0d66e91dd/f940/attac
  create mode 100644 netsnmp.pc.in
 
 diff --git a/Makefile.in b/Makefile.in
-index 9dbdde1353b1..ec972636c279 100644
+index 9dbdde1353..ec972636c2 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -35,6 +35,7 @@ INSTALLBUILTHEADERS=include/net-snmp/net-snmp-config.h
@@ -46,7 +44,7 @@ index 9dbdde1353b1..ec972636c279 100644
  	rm -f include/net-snmp/agent/mib_module_config.h		\
  		include/net-snmp/agent/agent_module_config.h		\
 diff --git a/Makefile.rules b/Makefile.rules
-index 9e9e9009e5d2..e714f91e725e 100644
+index 9e9e9009e5..e714f91e72 100644
 --- a/Makefile.rules
 +++ b/Makefile.rules
 @@ -85,12 +85,14 @@ subdirs:
@@ -96,10 +94,10 @@ index 9e9e9009e5d2..e714f91e725e 100644
  # normal bin binaries
  #
 diff --git a/configure b/configure
-index 5ec44f5ce082..5103a4dc9d88 100755
+index cad6b74486..8909bffe05 100755
 --- a/configure
 +++ b/configure
-@@ -30422,6 +30422,8 @@ ac_config_files="$ac_config_files net-snmp-config:net-snmp-config.in"
+@@ -31717,6 +31717,8 @@ ac_config_files="$ac_config_files net-snmp-config:net-snmp-config.in"
  
  ac_config_files="$ac_config_files net-snmp-create-v3-user:net-snmp-create-v3-user.in"
  
@@ -108,7 +106,7 @@ index 5ec44f5ce082..5103a4dc9d88 100755
  ac_config_files="$ac_config_files dist/generation-scripts/gen-variables:dist/generation-scripts/gen-variables.in"
  
  ac_config_files="$ac_config_files local/snmpconf"
-@@ -31445,6 +31447,8 @@ do
+@@ -32740,6 +32742,8 @@ do
      "mibs/Makefile") CONFIG_FILES="$CONFIG_FILES mibs/Makefile:Makefile.top:mibs/Makefile.in:Makefile.rules" ;;
      "net-snmp-config") CONFIG_FILES="$CONFIG_FILES net-snmp-config:net-snmp-config.in" ;;
      "net-snmp-create-v3-user") CONFIG_FILES="$CONFIG_FILES net-snmp-create-v3-user:net-snmp-create-v3-user.in" ;;
@@ -118,10 +116,10 @@ index 5ec44f5ce082..5103a4dc9d88 100755
      "local/snmpconf") CONFIG_FILES="$CONFIG_FILES local/snmpconf" ;;
      "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 diff --git a/configure.ac b/configure.ac
-index 4c4dce09d488..d62a02da5d88 100644
+index 1622b7c051..898b50f368 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -136,6 +136,7 @@ AC_CONFIG_FILES([net-snmp-config:net-snmp-config.in],
+@@ -118,6 +118,7 @@ AC_CONFIG_FILES([net-snmp-config:net-snmp-config.in],
  		[chmod +x net-snmp-config])
  AC_CONFIG_FILES([net-snmp-create-v3-user:net-snmp-create-v3-user.in],
  		[chmod +x net-snmp-create-v3-user])
@@ -131,7 +129,7 @@ index 4c4dce09d488..d62a02da5d88 100644
  
 diff --git a/netsnmp-agent.pc.in b/netsnmp-agent.pc.in
 new file mode 100644
-index 000000000000..3a1c77bbf814
+index 0000000000..3a1c77bbf8
 --- /dev/null
 +++ b/netsnmp-agent.pc.in
 @@ -0,0 +1,12 @@
@@ -149,7 +147,7 @@ index 000000000000..3a1c77bbf814
 +Libs.private: @LDFLAGS@ @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@
 diff --git a/netsnmp.pc.in b/netsnmp.pc.in
 new file mode 100644
-index 000000000000..0a1f5785a4f4
+index 0000000000..0a1f5785a4
 --- /dev/null
 +++ b/netsnmp.pc.in
 @@ -0,0 +1,12 @@
@@ -166,5 +164,5 @@ index 000000000000..0a1f5785a4f4
 +Libs: -L${libdir} -lnetsnmp
 +Libs.private: @LDFLAGS@ @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@
 -- 
-2.21.0.196.g041f5ea1cf98
+2.26.2
 
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
index bfc55a08ac..5ad7470c90 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
@@ -1,4 +1,4 @@
-From 7ae2ce8dbf1c54d4e2db4a5f49397a239baadc49 Mon Sep 17 00:00:00 2001
+From 2ad4df6d503be72a8910c3087611adb33d77ffde Mon Sep 17 00:00:00 2001
 From: Li xin <lixin.fnst@cn.fujitsu.com>
 Date: Fri, 21 Aug 2015 18:23:13 +0900
 Subject: [PATCH] config_os_headers: Error Fix
@@ -13,16 +13,15 @@ conftest.c:168:17: fatal error: pkg.h: No such file or directory
 Upstream-Status: pending
 
 Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
-
 ---
  configure.d/config_os_headers | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers
-index af99746..83b2e31 100644
+index 2fdb5a35d6..0272f02c8e 100644
 --- a/configure.d/config_os_headers
 +++ b/configure.d/config_os_headers
-@@ -489,8 +489,8 @@ then
+@@ -487,8 +487,8 @@ then
      unset ac_cv_header_pkg_h
      netsnmp_save_CPPFLAGS="$CPPFLAGS"
      netsnmp_save_LDFLAGS="$LDFLAGS"
@@ -33,3 +32,6 @@ index af99746..83b2e31 100644
      AC_CHECK_HEADERS(pkg.h,
          NETSNMP_SEARCH_LIBS(pkg_init, pkg,
  	    AC_DEFINE(HAVE_LIBPKG, 1, [define if you have BSD pkg-ng])))
+-- 
+2.26.2
+
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch
index 7e686ce7fe..33a1e745fa 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch
@@ -1,4 +1,4 @@
-From e38c508ef401593b1d4fe42b62e42a49cfec82af Mon Sep 17 00:00:00 2001
+From 383e67e359b89abe0440597ce414297892ade511 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Tue, 26 Feb 2019 14:26:07 +0800
 Subject: [PATCH] net-snmp: fix compile error with --disable-des
@@ -12,12 +12,12 @@ Subject: [PATCH] net-snmp: fix compile error with --disable-des
 pad_size is defined only without --disable-des
 [snip]
 #ifndef NETSNMP_DISABLE_DES
-    int             pad, plast, pad_size = 0; 
+    int             pad, plast, pad_size = 0;
 
 but used when disable-des,
 [snip]
         QUITFUN(SNMPERR_GENERR, sc_encrypt_quit);
-    }    
+    }
     pad_size = pai->pad_size;
 
     memset(my_iv, 0, sizeof(my_iv));
@@ -37,10 +37,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/snmplib/scapi.c b/snmplib/scapi.c
-index 43caddf..c09deb0 100644
+index 8ad1d70d90..8c6882d9ab 100644
 --- a/snmplib/scapi.c
 +++ b/snmplib/scapi.c
-@@ -1253,7 +1253,6 @@ sc_encrypt(const oid * privtype, size_t privtypelen,
+@@ -1251,7 +1251,6 @@ sc_encrypt(const oid * privtype, size_t privtypelen,
  
          QUITFUN(SNMPERR_GENERR, sc_encrypt_quit);
      }
@@ -48,7 +48,7 @@ index 43caddf..c09deb0 100644
  
      memset(my_iv, 0, sizeof(my_iv));
  
-@@ -1263,6 +1262,8 @@ sc_encrypt(const oid * privtype, size_t privtypelen,
+@@ -1261,6 +1260,8 @@ sc_encrypt(const oid * privtype, size_t privtypelen,
          /*
           * now calculate the padding needed 
           */
@@ -58,5 +58,5 @@ index 43caddf..c09deb0 100644
          plast = (int) ptlen - (pad_size - pad);
          if (pad == pad_size)
 -- 
-2.7.4
+2.26.2
 
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
index 74b0c12e05..fb773e6388 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
@@ -1,4 +1,7 @@
-net-snmp: add knob whether nlist.h are checked
+From a1134a31d417cc05a1fdb094f613a00a7a5e7ac5 Mon Sep 17 00:00:00 2001
+From: Chong Lu <Chong.Lu@windriver.com>
+Date: Thu, 28 May 2020 09:46:34 -0500
+Subject: [PATCH] net-snmp: add knob whether nlist.h are checked
 
 Previously, it still was checked when there was no nlish.h in sysroots directory.
 Add knob to decide whether nlist.h are checked or not.
@@ -7,14 +10,14 @@ Upstream-status: Pending
 
 Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
 ---
- configure.d/config_os_headers |    2 ++
+ configure.d/config_os_headers | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers
-index d903f58..a05d30e 100644
+index 2fdb5a35d6..af997461d5 100644
 --- a/configure.d/config_os_headers
 +++ b/configure.d/config_os_headers
-@@ -31,6 +31,7 @@ AC_CHECK_HEADERS([getopt.h   pthread.h  regex.h      ] dnl
+@@ -32,6 +32,7 @@ AC_CHECK_HEADERS([getopt.h   pthread.h  regex.h      ] dnl
                   [sys/un.h           ])
  
  #  Library and Agent:
@@ -22,7 +25,7 @@ index d903f58..a05d30e 100644
  AC_CHECK_HEADERS([nlist.h],,,[
  AC_INCLUDES_DEFAULT
  [
-@@ -38,6 +39,7 @@ AC_INCLUDES_DEFAULT
+@@ -39,6 +40,7 @@ AC_INCLUDES_DEFAULT
  #define LIBBSD_DISABLE_DEPRECATED 1
  #endif
  ]])
@@ -31,5 +34,5 @@ index d903f58..a05d30e 100644
  #  Library:
  AC_CHECK_HEADERS([fcntl.h    io.h       kstat.h                 ] dnl
 -- 
-1.7.9.5
+2.26.2
 
-- 
2.17.1

[dunfell 10/26] dfu-util-native: Remove DEPLOY_DIR_TOOLS from sstate-outputdirs

[akuster]

From: Khem Raj <raj.khem@gmail.com>

In commit 1ef92d2423d6d6546e4f0585478540212b26f3a0 deploying the native
tool was changed to use DEPLOYDIR, so setting DEPLOY_DIR_TOOLS for sstate-outputdir
dependency should have been changed as well.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Robert P. J. Day <rpjday@crashcourse.ca>
Cc: Jacob Kroon <jacob.kroon@gmail.com>
(cherry picked from commit af3fc04cfb64d9f229be26f47b4dec892ff919dc)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
index feb16fa730..4305e3b408 100644
--- a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
+++ b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
@@ -16,7 +16,6 @@ do_deploy() {
 
 addtask deploy before do_package after do_install
 
-do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}"
 # cleandirs should possibly be in deploy.bbclass but we need it
 do_deploy[cleandirs] = "${DEPLOYDIR}"
 # clear stamp-extra-info since MACHINE_ARCH is normally put there by
-- 
2.17.1

[dunfell 11/26] mosquitto: upgrade 1.6.9 -> 1.6.10

[akuster]

From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit aa615a8e6093759fd580217be79dc037d9c0d79c)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../mosquitto/{mosquitto_1.6.9.bb => mosquitto_1.6.10.bb}     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_1.6.9.bb => mosquitto_1.6.10.bb} (95%)

diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.10.bb
similarity index 95%
rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb
rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.10.bb
index de43aae736..31b5f678df 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.10.bb
@@ -20,8 +20,8 @@ SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
            file://install-protocol.patch \
 "
 
-SRC_URI[md5sum] = "52f5078ec18aaf623b14dfb121fd534b"
-SRC_URI[sha256sum] = "412979b2db0a0020bd02fa64f0a0de9e7000b84462586e32b67f29bb1f6c1685"
+SRC_URI[md5sum] = "960f963b81b7f93982d7511cd28082e5"
+SRC_URI[sha256sum] = "92d1807717f0f6d57d1ac1207ffdb952e8377e916c7b0bb4718f745239774232"
 
 inherit systemd update-rc.d useradd cmake
 
-- 
2.17.1

[dunfell 12/26] snort: upgrade 2.9.15 -> 2.9.16

[akuster]

From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>

-0001-chdeck-for-gettid-API-during-configure.patch
Removed since this is included in 2.9.16

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit e44e7be3e9d140410d3c7d799a32cf867e494f9c)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...deck-for-gettid-API-during-configure.patch | 48 -------------------
 .../{snort_2.9.15.bb => snort_2.9.16.bb}      |  5 +-
 2 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 meta-networking/recipes-connectivity/snort/snort/0001-chdeck-for-gettid-API-during-configure.patch
 rename meta-networking/recipes-connectivity/snort/{snort_2.9.15.bb => snort_2.9.16.bb} (95%)

diff --git a/meta-networking/recipes-connectivity/snort/snort/0001-chdeck-for-gettid-API-during-configure.patch b/meta-networking/recipes-connectivity/snort/snort/0001-chdeck-for-gettid-API-during-configure.patch
deleted file mode 100644
index eff610de7c..0000000000
--- a/meta-networking/recipes-connectivity/snort/snort/0001-chdeck-for-gettid-API-during-configure.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c45ab69f9428e4d2fc1146301a4546bb2b42c9ae Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 27 Jul 2019 00:25:58 -0700
-Subject: [PATCH] chdeck for gettid API during configure
-
-glibc 2.30 added gettid syscall wrapper
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- configure.in | 2 +-
- src/util.h   | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 000bb91..d79e6d0 100644
---- a/configure.in
-+++ b/configure.in
-@@ -256,7 +256,7 @@ SN_CHECK_DECLS(printf fprintf syslog puts fputs fputc fopen  \
-            strcasecmp strncasecmp strerror perror socket sendto   \
-            vsnprintf snprintf strtoul)
- 
--AC_CHECK_FUNCS([sigaction strlcpy strlcat strerror vswprintf wprintf memrchr inet_ntop])
-+AC_CHECK_FUNCS([sigaction strlcpy strlcat strerror vswprintf wprintf memrchr inet_ntop gettid])
- 
- AC_CHECK_FUNC([snprintf],[have_snprintf="yes"],[have_snprintf="no"])
- AM_CONDITIONAL(BUILD_SNPRINTF, test "x$have_snprintf" != "xyes")
-diff --git a/src/util.h b/src/util.h
-index 6880906..c310b83 100644
---- a/src/util.h
-+++ b/src/util.h
-@@ -374,6 +374,7 @@ static inline int IsEmptyStr(const char *str)
-     return 0;
- }
- 
-+#if !HAVE_GETTID
- static inline pid_t gettid(void)
- {
- #if defined(LINUX) && defined(SYS_gettid)
-@@ -382,5 +383,6 @@ static inline pid_t gettid(void)
-     return getpid();
- #endif
- }
-+#endif
- 
- #endif /*__UTIL_H__*/
--- 
-2.22.0
-
diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.15.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.16.bb
similarity index 95%
rename from meta-networking/recipes-connectivity/snort/snort_2.9.15.bb
rename to meta-networking/recipes-connectivity/snort/snort_2.9.16.bb
index fbec1950d4..d8073d865b 100644
--- a/meta-networking/recipes-connectivity/snort/snort_2.9.15.bb
+++ b/meta-networking/recipes-connectivity/snort/snort_2.9.16.bb
@@ -13,11 +13,10 @@ SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \
     file://fix-host-contamination-when-enable-static-daq.patch \
     file://disable-run-test-program-while-cross-compiling.patch \
     file://configure.in-disable-tirpc-checking-for-fedora.patch \
-    file://0001-chdeck-for-gettid-API-during-configure.patch \
 "
 
-SRC_URI[md5sum] = "b56cadfa840f706ff67d4df0256c03eb"
-SRC_URI[sha256sum] = "bfb437746446ef72a03c501db13cd6da5edd2b41f55c80c437ba288be6da7dba"
+SRC_URI[md5sum] = "1cec58babaea3420014d61a93e6e1545"
+SRC_URI[sha256sum] = "9688d8edf1da09dec6574000fb3c0e62f99c56428587616e17c60103c0bcbad7"
 
 UPSTREAM_CHECK_URI = "https://www.snort.org/downloads"
 UPSTREAM_CHECK_REGEX = "snort-(?P<pver>\d+(\.\d+)+)\.tar"
-- 
2.17.1

[dunfell 13/26] wireshark: upgrade 3.2.2 -> 3.2.4

[akuster]

From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 8a4039c61296801dc7f9d6f1badd9310acadf2b8)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../wireshark/{wireshark_3.2.2.bb => wireshark_3.2.4.bb}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_3.2.2.bb => wireshark_3.2.4.bb} (95%)

diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb b/meta-networking/recipes-support/wireshark/wireshark_3.2.4.bb
similarity index 95%
rename from meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
rename to meta-networking/recipes-support/wireshark/wireshark_3.2.4.bb
index db545028f2..c3caaefde9 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_3.2.4.bb
@@ -12,8 +12,8 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz
 
 UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
 
-SRC_URI[md5sum] = "e468b78e1176e0212b13ef809f59dcbb"
-SRC_URI[sha256sum] = "5f5923ef4c3fee370ed0ca1bb324f37c246015eba4a7e74ab95d9208feeded79"
+SRC_URI[md5sum] = "4bbee1bdd5b88343733590fabfffddf3"
+SRC_URI[sha256sum] = "d17d461e849e2d0b033431c45f71d8ee8ec3c8faa232a6ad63069a47927db8aa"
 
 PE = "1"
 
-- 
2.17.1

[dunfell 14/26] logwatch: upgrade 7.5.1 -> 7.5.3

[akuster]

From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 778cdc8480a68d9eed1daa21b628802c1475a57d)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../logwatch/{logwatch_7.5.1.bb => logwatch_7.5.3.bb}         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-extended/logwatch/{logwatch_7.5.1.bb => logwatch_7.5.3.bb} (95%)

diff --git a/meta-oe/recipes-extended/logwatch/logwatch_7.5.1.bb b/meta-oe/recipes-extended/logwatch/logwatch_7.5.3.bb
similarity index 95%
rename from meta-oe/recipes-extended/logwatch/logwatch_7.5.1.bb
rename to meta-oe/recipes-extended/logwatch/logwatch_7.5.3.bb
index b6ab43ccf7..644e420711 100644
--- a/meta-oe/recipes-extended/logwatch/logwatch_7.5.1.bb
+++ b/meta-oe/recipes-extended/logwatch/logwatch_7.5.3.bb
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ad199c8aca74e70f296f731ad9a1521c"
 RDEPENDS_${PN} = "perl"
 
 SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BP}/${BP}.tar.gz"
-SRC_URI[md5sum] = "3d14fa6e0fb56f890d2b3fd9cbc3162f"
-SRC_URI[sha256sum] = "9d4a00625065f25058f8966e7fb11f9f72db25507b4dd9c05f57e14447c33295"
+SRC_URI[md5sum] = "8bcf3edc5a4687c8aad1b9c01e2be54b"
+SRC_URI[sha256sum] = "1b2b96879dec01cd02754fe00f8989b11ff16158c3dc7c4aff0faa4b1d34974b"
 
 do_install() {
     install -m 0755 -d ${D}${sysconfdir}/logwatch/scripts
-- 
2.17.1

[dunfell 15/26] libnet-dns-perl: upgrade 1.23 -> 1.24

[akuster]

From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 6b99fa685732b909fe3f3b82c803418315d4a6a6)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../{libnet-dns-perl_1.23.bb => libnet-dns-perl_1.24.bb}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-perl/recipes-perl/libnet/{libnet-dns-perl_1.23.bb => libnet-dns-perl_1.24.bb} (92%)

diff --git a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.23.bb b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.24.bb
similarity index 92%
rename from meta-perl/recipes-perl/libnet/libnet-dns-perl_1.23.bb
rename to meta-perl/recipes-perl/libnet/libnet-dns-perl_1.24.bb
index e10daf2efd..8994f692b4 100644
--- a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.23.bb
+++ b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.24.bb
@@ -9,8 +9,8 @@ DEPENDS += "perl"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "105517139b39650f78c21b2e461ac97e"
-SRC_URI[sha256sum] = "cf327f31063b96cd3421be43a1d6cb41eaa61d0595450032e57905b1bd6b2c3e"
+SRC_URI[md5sum] = "1bf07817bb272d412a737ecc2347d70b"
+SRC_URI[sha256sum] = "11a6c2ba6cb1c6640f01c9bbf2036bcbe3974232e9b939ab94985230c92cde63"
 
 UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P<pver>(\d+\.\d+))(?!_\d+).tar"
 
-- 
2.17.1

[dunfell 16/26] python3-colorama: Upgrade 0.4.1 -> 0.4.3

[akuster]

From: Leon Anavi <leon.anavi@konsulko.com>

Upgrade to release 0.4.3.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Acked-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 52e608478f695269ce707626378e6be74e1fa77f)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../{python3-colorama_0.4.1.bb => python3-colorama_0.4.3.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-colorama_0.4.1.bb => python3-colorama_0.4.3.bb} (61%)

diff --git a/meta-python/recipes-devtools/python/python3-colorama_0.4.1.bb b/meta-python/recipes-devtools/python/python3-colorama_0.4.3.bb
similarity index 61%
rename from meta-python/recipes-devtools/python/python3-colorama_0.4.1.bb
rename to meta-python/recipes-devtools/python/python3-colorama_0.4.3.bb
index 9cfca094e0..7a3f533f26 100644
--- a/meta-python/recipes-devtools/python/python3-colorama_0.4.1.bb
+++ b/meta-python/recipes-devtools/python/python3-colorama_0.4.3.bb
@@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4936429a56a652b84c5c01280dcaa26"
 
 inherit pypi setuptools3
 
-SRC_URI[md5sum] = "f927529cd1735f6f50ee2c61628e9c1f"
-SRC_URI[sha256sum] = "05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d"
+SRC_URI[md5sum] = "02daee502863d24112a8c05a5d69a612"
+SRC_URI[sha256sum] = "e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1"
 
-- 
2.17.1

[dunfell 17/26] fluidsynth: upgrade 2.1.2 -> 2.1.3

[akuster]

From: Andreas Müller <schnitzeltony@gmail.com>

>>From [1]:

* fix a cross-compilation failure from Win32 to WinARM (#630)
* fix issues while fluid_player is seeking (#634, #646)
* fix a NULL pointer dereference if synth.dynamic-sample-loading is enabled (#635)
* fix a NULL pointer dereference in delete_rvoice_mixer_threads() (#640)
* fix a NULL pointer dereference in the soundfont loader (#647, thanks to @jjceresa)
* fix dsound driver playing garbage when terminating fluidsynth (#642, thanks to @jjceresa)
* avoid memory leaks when using libinstpatch (#643)

[1] https://github.com/FluidSynth/fluidsynth/releases/tag/v2.1.3

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 074e115397aca40eaa3c531653a8db75578c718f)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../fluidsynth/fluidsynth.inc                 |  4 +--
 ...tables-helper-we-have-to-use-native-.patch | 32 +++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
index 73858b0203..fcc9df8c30 100644
--- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
+++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
@@ -5,8 +5,8 @@ LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594"
 
 SRC_URI = "git://github.com/FluidSynth/fluidsynth.git"
-SRCREV = "d9ad6a0725840388a48f45e38eda903a65ec1cf5"
+SRCREV = "19a20eb8526465fdf940b740b13462d71e190a1a"
 S = "${WORKDIR}/git"
-PV = "2.1.2"
+PV = "2.1.3"
 
 inherit cmake pkgconfig lib_package
diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch
index 44612275c1..cc73bdb1d9 100644
--- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch
+++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch
@@ -10,28 +10,40 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- src/CMakeLists.txt | 11 -----------
- 1 file changed, 11 deletions(-)
+ src/CMakeLists.txt | 23 +----------------------
+ 1 file changed, 1 insertion(+), 22 deletions(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a0ba53d1..1c626717 100644
+index 356bb734..58ff7635 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -359,14 +359,3 @@ else ( MACOSX_FRAMEWORK )
- )
+@@ -399,25 +399,4 @@ else ( MACOSX_FRAMEWORK )
     install ( FILES ${public_main_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR} )
  endif ( MACOSX_FRAMEWORK )
--
+ 
 -# ******* Auto Generated Lookup Tables ******
 -
 -include(ExternalProject)
+-
+-set (GENTAB_SDIR ${CMAKE_CURRENT_SOURCE_DIR}/gentables)
+-set (GENTAB_BDIR ${CMAKE_CURRENT_BINARY_DIR}/gentables)
+-
+-# Use external project to ensure that cmake uses the host compiler when building make_tables.exe
+-# To fix cross-compiling fluidsynth from Win32 to ARM (using vcpkg), we need to pass the current generator
+-# on to the external project, otherwise (for some unknown reason) the target compiler will be used rather
+-# than the host compiler.
 -ExternalProject_Add(gentables
 -    DOWNLOAD_COMMAND ""
--    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gentables
--    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/gentables
--    INSTALL_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gentables/make_tables.exe "${CMAKE_BINARY_DIR}/"
+-    SOURCE_DIR ${GENTAB_SDIR}
+-    BINARY_DIR ${GENTAB_BDIR}
+-    CONFIGURE_COMMAND
+-        "${CMAKE_COMMAND}" -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE} -G "${CMAKE_GENERATOR}" -B "${GENTAB_BDIR}" "${GENTAB_SDIR}"
+-    BUILD_COMMAND
+-        "${CMAKE_COMMAND}" --build "${GENTAB_BDIR}"
+-    INSTALL_COMMAND ${GENTAB_BDIR}/make_tables.exe "${CMAKE_BINARY_DIR}/"
 -)
 -add_dependencies(libfluidsynth-OBJ gentables)
++
 -- 
-2.14.5
+2.21.1
 
-- 
2.17.1

[dunfell 18/26] passwdqc: remove double modify operation

[akuster]

From: Konrad Weihmann <kweihmann@outlook.com>

It is either += or append but not both - picking
append to be the safe bet

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 68fa0a4ac2b320c1ce92b44ead54df5f4d043a06)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb b/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb
index 504ac1537e..dd302506d7 100644
--- a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb
+++ b/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb
@@ -35,7 +35,7 @@ SRC_URI[sha256sum] = "d1fedeaf759e8a0f32d28b5811ef11b5a5365154849190f4b7fab670a7
 
 # explicitly define LINUX_PAM in case DISTRO_FEATURES no pam
 # this package's pam_passwdqc.so needs pam
-CFLAGS_append += "-Wall -fPIC -DHAVE_SHADOW -DLINUX_PAM"
+CFLAGS_append = " -Wall -fPIC -DHAVE_SHADOW -DLINUX_PAM"
 
 # -e is no longer default setting in bitbake.conf
 EXTRA_OEMAKE = "-e"
-- 
2.17.1

[dunfell 19/26] sound-theme-freedesktop: remove double depends

[akuster]

From: Konrad Weihmann <kweihmann@outlook.com>

intltool-native was included more than once in DEPENDS.
Removing all but the first entry

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit ea7d2ea94451a5a0563459625dbd256a6338707e)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../sound-themes/sound-theme-freedesktop_0.8.bb                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb b/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
index 098b08d476..e4fb4ff026 100644
--- a/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
+++ b/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
@@ -9,7 +9,7 @@ DEPENDS = "glib-2.0 intltool-native"
 
 inherit autotools gettext
 
-DEPENDS += "glib-2.0-native intltool-native"
+DEPENDS += "glib-2.0-native"
 
 SRC_URI = "http://people.freedesktop.org/~mccann/dist/${BPN}-${PV}.tar.bz2"
 SRC_URI[md5sum] = "d7387912cfd275282d1ec94483cb2f62"
-- 
2.17.1

[dunfell 20/26] python3-cmd2: remove double colorama in RDEPENDS

[akuster]

From: Konrad Weihmann <kweihmann@outlook.com>

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit fbd0d77acbe358c5dc3fe131c969af4b2cb8afa5)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb b/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb
index a2bf0c45e2..803ca4a404 100644
--- a/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb
+++ b/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb
@@ -14,7 +14,6 @@ RDEPENDS_${PN} += "\
     ${PYTHON_PN}-attrs \
     ${PYTHON_PN}-colorama \
     ${PYTHON_PN}-pyperclip \
-    ${PYTHON_PN}-colorama \
     ${PYTHON_PN}-wcwidth \
 "
 
-- 
2.17.1

[dunfell 21/26] python3-smbus2: remove duplicate RDEPENDS settings

[akuster]

From: Konrad Weihmann <kweihmann@outlook.com>

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 7e5d8e32a383090a94b4fee19980b3e17bd7c902)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-python/recipes-devtools/python/python3-smbus2_0.3.0.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-python/recipes-devtools/python/python3-smbus2_0.3.0.bb b/meta-python/recipes-devtools/python/python3-smbus2_0.3.0.bb
index dee70a03f5..7a61927206 100644
--- a/meta-python/recipes-devtools/python/python3-smbus2_0.3.0.bb
+++ b/meta-python/recipes-devtools/python/python3-smbus2_0.3.0.bb
@@ -13,8 +13,6 @@ CLEANBROKEN = "1"
 
 PYPI_PACKAGE = "smbus2"
 
-RDEPENDS_${PN} = "${PYTHON_PN}-ctypes ${PYTHON_PN}-fcntl"
-
 RDEPENDS_${PN} += "\
         ${PYTHON_PN}-ctypes \
         ${PYTHON_PN}-fcntl \
-- 
2.17.1

[dunfell 22/26] python3-twisted: remove double var modification

[akuster]

From: Konrad Weihmann <kweihmann@outlook.com>

It is either append or +=, but not both.
Pick append to be the correct one

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 19867269bacd2676369b1f92c9103c8eb0b882db)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../recipes-devtools/python/python3-twisted_19.10.0.bb        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb b/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb
index dfb9d4a4cc..c12d1cc04e 100644
--- a/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb
+++ b/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb
@@ -1,7 +1,7 @@
 inherit pypi setuptools3
 require python-twisted.inc
 
-FILES_${PN}-core_append += " \
+FILES_${PN}-core_append = " \
   ${libdir}/${PYTHON_DIR}/site-packages/twisted/__pycache__ \
   ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__pycache__/*pyc \
   ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/__init__*.pyc \
@@ -29,7 +29,7 @@ FILES_${PN}-news_append = " \
   ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_news*.pyc \
 "
 
-FILES_${PN}-protocols_append += " \
+FILES_${PN}-protocols_append = " \
   ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/__pycache__/*pyc \
 "
 
-- 
2.17.1

[dunfell 23/26] proftpd: Fix typo for SRC_URI[md5sum]

[akuster]

From: Konrad Weihmann <kweihmann@outlook.com>

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 5caca0f7bdefd28b9ecc446aea4177e2e297aa20)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
index d5bbdd3745..1e4697a633 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
@@ -13,7 +13,7 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
            file://build_fixup.patch \
            file://proftpd.service \
            "
-iSRC_URI[md5sum] = "13270911c42aac842435f18205546a1b"
+SRC_URI[md5sum] = "13270911c42aac842435f18205546a1b"
 SRC_URI[sha256sum] = "91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf"
 
 inherit autotools-brokensep useradd update-rc.d systemd multilib_script
-- 
2.17.1

[dunfell 24/26] python3-pycryptodome(x): moved to OE-Core, remove from meta-python

[akuster]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit a8f3c00d8d113b46a49584682e10435157d516ca)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../python/python-pycryptodome.inc            | 29 -------------------
 .../python/python3-pycryptodome_3.9.4.bb      |  2 --
 .../python/python3-pycryptodomex_3.9.4.bb     | 10 -------
 3 files changed, 41 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-pycryptodome.inc
 delete mode 100644 meta-python/recipes-devtools/python/python3-pycryptodome_3.9.4.bb
 delete mode 100644 meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb

diff --git a/meta-python/recipes-devtools/python/python-pycryptodome.inc b/meta-python/recipes-devtools/python/python-pycryptodome.inc
deleted file mode 100644
index 63b4a4abb4..0000000000
--- a/meta-python/recipes-devtools/python/python-pycryptodome.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY = "Cryptographic library for Python"
-DESCRIPTION = "PyCryptodome is a self-contained Python package of low-level\
- cryptographic primitives."
-HOMEPAGE = "http://www.pycryptodome.org"
-LICENSE = "PD & BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=6dc0e2a13d2f25d6f123c434b761faba"
-
-SRC_URI[md5sum] = "f990716b49add7b14ea8b8a961fb3746"
-SRC_URI[sha256sum] = "a168e73879619b467072509a223282a02c8047d932a48b74fbd498f27224aa04"
-
-inherit pypi
-
-RDEPENDS_${PN} += " \
-    ${PYTHON_PN}-io \
-    ${PYTHON_PN}-math \
-"
-
-RDEPENDS_${PN}-tests += " \
-    ${PYTHON_PN}-unittest \
-"
-
-PACKAGES =+ "${PN}-tests"
-
-FILES_${PN}-tests = " \
-    ${PYTHON_SITEPACKAGES_DIR}/Crypto/SelfTest/ \
-    ${PYTHON_SITEPACKAGES_DIR}/Crypto/SelfTest/__pycache__/ \
-"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-pycryptodome_3.9.4.bb b/meta-python/recipes-devtools/python/python3-pycryptodome_3.9.4.bb
deleted file mode 100644
index 0c062dddf8..0000000000
--- a/meta-python/recipes-devtools/python/python3-pycryptodome_3.9.4.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require python-pycryptodome.inc
-inherit setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb b/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb
deleted file mode 100644
index e41c14b142..0000000000
--- a/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require python-pycryptodome.inc
-inherit setuptools3
-
-SRC_URI[md5sum] = "46ba513d95b6e323734074d960a7d57b"
-SRC_URI[sha256sum] = "22d970cee5c096b9123415e183ae03702b2cd4d3ba3f0ced25c4e1aba3967167"
-
-FILES_${PN}-tests = " \
-    ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \
-    ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/__pycache__/ \
-"
-- 
2.17.1

[dunfell 25/26] python3-pyelftools: moved to OE-Core, remove from meta-python

[akuster]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 7aee545a61c4f91d5e462d5b46b1b8f9a8bad1e3)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../python/python3-pyelftools_0.25.bb              | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-pyelftools_0.25.bb

diff --git a/meta-python/recipes-devtools/python/python3-pyelftools_0.25.bb b/meta-python/recipes-devtools/python/python3-pyelftools_0.25.bb
deleted file mode 100644
index 03d96db3c2..0000000000
--- a/meta-python/recipes-devtools/python/python3-pyelftools_0.25.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "pyelftools is a pure-Python library for parsing and analyzing ELF files and DWARF debugging information"
-HOMEPAGE = "https://github.com/eliben/pyelftools"
-SECTION = "devel/python"
-LICENSE = "PD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5ce2a2b07fca326bc7c146d10105ccfc"
-
-SRC_URI[md5sum] = "c5629b9a5d19c82107a946cce52eeec2"
-SRC_URI[sha256sum] = "89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24"
-
-PYPI_PACKAGE = "pyelftools"
-
-inherit pypi setuptools3
-
-BBCLASSEXTEND = "native"
-- 
2.17.1

[dunfell 26/26] meta-python: depend on core version 12 or higher

[akuster]

From: Martin Jansa <martin.jansa@gmail.com>

* python3-pyelftools and python3-pycryptodome(x) recipes were recently
  moved from meta-python to oe-core in:
  https://git.openembedded.org/meta-openembedded/commit/?id=7aee545a61c4f91d5e462d5b46b1b8f9a8bad1e3
  https://git.openembedded.org/meta-openembedded/commit/?id=a8f3c00d8d113b46a49584682e10435157d516ca
* core version was bumped now:
  https://git.openembedded.org/openembedded-core/commit/?id=2d503b27e7c88cee9a37c79c4605c77b11f230b6
* this dependency will make sure that people do upgrade oe-core when they do
  upgrade meta-python past these revisions, so the recipes won't suddenly
  disappear as a bonus they will get slightly newer version which are now
  in oe-core
  python3-pycryptodome(x) from 3.9.4 to 3.9.7:
  https://www.pycryptodome.org/en/latest/src/changelog.html#february-2020
  python2-pyelftools from 0.25 to 0.26:
  https://github.com/eliben/pyelftools/commit/8a40f295bc36f96efeb8633dc4a5314f6077d0bf#diff-e4eb329834da3d36278b1b7d943b3bc9

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-python/conf/layer.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-python/conf/layer.conf b/meta-python/conf/layer.conf
index 7cfeafe599..0dbc4296eb 100644
--- a/meta-python/conf/layer.conf
+++ b/meta-python/conf/layer.conf
@@ -12,7 +12,7 @@ BBFILE_PRIORITY_meta-python = "7"
 # cause compatibility issues with other layers
 LAYERVERSION_meta-python = "1"
 
-LAYERDEPENDS_meta-python = "core openembedded-layer"
+LAYERDEPENDS_meta-python = "core (>= 12) openembedded-layer"
 
 LAYERSERIES_COMPAT_meta-python = "thud warrior zeus dunfell"
 
-- 
2.17.1