meta-openembedded: subtree update:c986cbed93..e0daf6f8e0
Adrian Bunk (19):
lldpd: Upgrade 1.0.3 -> 1.0.4
usrsctp: Upgrade to a more recent git snapshot
cim-schema: Remove duplicate file
dovecot: Upgrade 2.2.36.3 -> 2.2.36.4
flashrom: Upgrade 1.0 -> 1.1
doxygen: Upgrade 1.8.15 -> 1.8.16
nodejs: Upgrade 10.16.3 -> 10.17.0
php: Upgrade 7.3.9 -> 7.3.11
libdivecomputer: Upgrade to 0.6.0
libnss-nisplus: Upgrade to the latest upstream git
pegtl: Upgrade 2.1.4 -> 2.8.1
openwsman: Upgrade 2.6.9 -> 2.6.11
cgdb: Upgrade 0.6.8 -> 0.7.1
packagegroup-meta-networking: Exclude nonbuilding recipes with musl
xf86-input-tslib: Upgrade 0.0.6 -> 0.0.7
libmicrohttpd: Upgrade 0.9.66 -> 0.9.67
poco: Upgrade 1.9.0 -> 1.9.4
libgphoto2: Remove obsolete HAL files
mdns: Mark as incompatible with musl
Andreas Müller (5):
unicode-ucd: initial add 12.1.0
unicode-ucd: Set correct SUMMARY and HOMEPAGE
colord: initial add 1.4.4
colord-gtk: initial add 0.2.0
ibus: initial add 1.5.21
André Draszik (3):
nodejs: allow use of system c-ares (and make default)
libuv: update to 1.33.1
nodejs: allow use of system libuv (and make default)
Carlos Rafael Giani (1):
opencv: Enable pkg-config .pc file generation
Khem Raj (5):
miniupnpd: Update to 2.1.20191006
miniupnpd: Build config.h before full build
poco: Fix build on risc-v
python-docutils: Upgrade to 0.15.2
iwd: Use python3 variant of docutils during build
Luca Boccassi (1):
dbus-broker: build with libaudit if selinux is enabled
Martin Siegumfeldt (1):
libiio: add python3 packageconfig
Paul Eggleton (1):
python3-pillow: update to 6.2.1
Slater, Joseph (2):
syslog-ng: add volatile directory init for systemd
syslog-ng: change conf files to version 3.19
Trevor Gamblin (4):
python-priority: add recipe
python-h2: add recipe
python-hyperframe: add recipe
python-hpack: add recipe
Yi Zhao (1):
freeradius: set CLEANBROKEN
Zang Ruochen (22):
poppler: upgrade 0.80.0 -> 0.82.0
gmime: upgrade 3.2.3 -> 3.2.4
autofs: upgrade 5.1.5 -> 5.1.6
python-simplejson: enable native and nativesdk
python-dnspython: upgrade 1.15.0 -> 1.16.0
python-engineio: upgrade 3.9.3 -> 3.10.0
python-evdev: upgrade 0.7.0 -> 1.2.0
python-future: upgrade 0.16.0 -> 0.18.2
python-intervals: upgrade 1.5.4 -> 1.10.0
python-isort: upgrade 4.3.4 -> 4.3.21
python-javaobj-py3: upgrade 0.2.4 -> 0.3.0
python-lazy-object-proxy: upgrade 1.3.1 -> 1.4.3
python-parse: upgrade 1.8.4 -> 1.12.1
python-pathlib2: upgrade 2.3.4 -> 2.3.5
python-periphery: upgrade 1.1.1 -> 2.0.0
python-pint: upgrade 0.8.1 -> 0.9
python-progress: upgrade 1.4 -> 1.5
python-prompt-toolkit: upgrade 2.0.4 -> 2.0.10
python-pybind11: upgrade 2.2.3 -> 2.4.3
python-pycryptodome: upgrade 3.4.11 -> 3.9.0
python-pyexpect: upgrade 1.0.17 -> 1.0.19
python-pyfirmata: upgrade 1.0.3 -> 1.1.0
Zheng Ruoqin (23):
pure-ftpd: upgrade 1.0.47 -> 1.0.49
grpc: upgrade 1.24.1 -> 1.24.3
corosync: upgrade 2.4.4 -> 2.4.5
dhcpcd: upgrade 8.0.2 -> 8.1.1
iscsi-initiator-utils: upgrade 2.0.877 -> 2.0.878
znc: upgrade 1.7.4 -> 1.7.5
babeld: upgrade 1.8.4 -> 1.9.1
htpdate: upgrade 1.2.1 -> 1.2.2
nbd: upgrade 3.19 -> 3.20
unbound: upgrade 1.9.2 -> 1.9.4
wireshark: upgrade 3.0.3 -> 3.0.6
mtr: upgrade 0.92 -> 0.93
libowfat: upgrade 0.31 -> 0.32
iozone3: upgrade 484 -> 487
libhugetlbfs: upgrade 2.21 -> 2.22
phoronix-test-suite: upgrade 8.8.1 -> 9.0.1
lmsensors: upgrade 3.5.0 -> 3.6.0
paho-mqtt-c: upgrade 1.3.0 -> 1.3.1
rtorrent: upgrade 0.9.7 -> 0.9.8
zabbix: upgrade 4.2.6 -> 4.2.7
iwd: upgrade 0.20 -> 0.23
libtorrent: upgrade 0.13.7 -> 0.13.8
ledmon: upgrade to 0.93
Change-Id: I66f0f395da9087e46899cf882e36d9cc50718c62
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch
index 16a611e..2606a36 100644
--- a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch
+++ b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch
@@ -8,30 +8,39 @@
Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
+Update for 1.0.49.
+Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
+
---
- configure.ac | 12 ------------
- 1 file changed, 12 deletions(-)
+ configure.ac | 15 ---------------
+ 1 file changed, 15 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 3a4209b..695ce68 100644
+index 079e6f0..9a1ec06 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -91,18 +91,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"])
+@@ -96,21 +96,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"])
AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"])
AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"])
--if test -d /usr/local/include; then
-- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--fi
--
--if test -d /usr/kerberos/include; then
-- CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
--fi
--
--if test -d /usr/local/lib; then
-- LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-if test "x$cross_compiling" != "xyes"; then
+- for path in \
+- /usr/kerberos \
+- /usr/local /opt /usr/local/opt \
+- /usr/openssl@1.1 /opt/openssl@1.1 /usr/local/opt/openssl@1.1 \
+- /usr/openssl /opt/openssl /usr/local/opt/openssl; do
+- if test -d $path/include; then
+- CPPFLAGS="$CPPFLAGS -I${path}/include"
+- fi
+- if test -d $path/lib; then
+- LDFLAGS="$LDFLAGS -L${path}/lib"
+- fi
+- done
-fi
-
CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
dnl Checks for header files
+--
+2.7.4
+
diff --git a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.49.bb
similarity index 74%
rename from meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb
rename to meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.49.bb
index e7c530b..5a8e9c1 100644
--- a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb
+++ b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.49.bb
@@ -3,7 +3,7 @@
HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd"
SECTION = "net"
LICENSE = "BSD-0-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0595b4261a04bc2d27f30b9c90796c1f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e25e28bc568d70eb26c3a91387c86ccb"
DEPENDS = "libcap virtual/crypt"
@@ -11,11 +11,10 @@
file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \
file://nostrip.patch \
"
-SRC_URI[md5sum] = "f000e519918682ee6b65090352177d4a"
-SRC_URI[sha256sum] = "4740c316f5df879a2d68464489fb9b8b90113fe7dce58e2cdd2054a4768f27ad"
+SRC_URI[md5sum] = "451879495ba61c1d7dcfca8dd231119f"
+SRC_URI[sha256sum] = "767bf458c70b24f80c0bb7a1bbc89823399e75a0a7da141d30051a2b8cc892a5"
inherit autotools
-EXTRA_OECONF = "--with-minimal"
PACKAGECONFIG[libsodium] ="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \
ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium"