aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2018-09-07 13:08:31 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-09-07 13:13:17 +0200
commit721e4cbb529d247c9c1ebef68275e70a3086ae0b (patch)
tree2967ef4e10e2592661f664df4515d67dbc80cfe5
parent89920e9735cb561dccf1e1f81d35788fd10a655b (diff)
parentcec266ee1f708f11cc679cb4f81613fa4186003c (diff)
downloadbuildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.tar.gz
buildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--.gitlab-ci.yml.in3
-rw-r--r--Config.in.legacy53
-rw-r--r--DEVELOPERS38
-rw-r--r--Makefile21
-rw-r--r--boot/uboot/Config.in8
-rw-r--r--boot/uboot/uboot.mk4
-rw-r--r--configs/arm_juno_defconfig2
-rw-r--r--configs/zynq_microzed_defconfig2
-rw-r--r--configs/zynq_zc706_defconfig2
-rw-r--r--configs/zynq_zed_defconfig2
-rw-r--r--docs/manual/using-buildroot-toolchain.txt26
-rw-r--r--fs/Config.in1
-rw-r--r--fs/btrfs/Config.in50
-rw-r--r--fs/btrfs/btrfs.mk36
-rw-r--r--linux/Config.in4
-rw-r--r--package/Config.in28
-rw-r--r--package/Config.in.host3
-rw-r--r--package/Makefile.in18
-rw-r--r--package/acpid/Config.in1
-rw-r--r--package/acpid/acpid.hash4
-rw-r--r--package/acpid/acpid.mk2
-rw-r--r--package/alljoyn/Config.in1
-rw-r--r--package/alljoyn/alljoyn.mk6
-rw-r--r--package/asterisk/0007-res_srtp-Add-support-for-libsrtp2-with-AES-GCM.patch171
-rw-r--r--package/atop/0001-Include-sysmacros.h-to-compile-with-newer-gcc.patch52
-rw-r--r--package/blktrace/Config.in2
-rw-r--r--package/boost/boost.hash4
-rw-r--r--package/boost/boost.mk2
-rw-r--r--package/botan/0001-remove-mips64-explicit-mabi.patch10
-rw-r--r--package/botan/Config.in6
-rw-r--r--package/botan/botan.hash6
-rw-r--r--package/botan/botan.mk49
-rw-r--r--package/btrfs-progs/Config.in1
-rw-r--r--package/btrfs-progs/Config.in.host6
-rw-r--r--package/btrfs-progs/btrfs-progs.hash2
-rw-r--r--package/btrfs-progs/btrfs-progs.mk22
-rw-r--r--package/c-periphery/c-periphery.hash3
-rw-r--r--package/c-periphery/c-periphery.mk2
-rw-r--r--package/ccache/0001-Convert-argument-to-sysroot-option-to-relative-path.patch43
-rw-r--r--package/ccache/ccache.hash7
-rw-r--r--package/ccache/ccache.mk8
-rw-r--r--package/checksec/0001-checksec-Fixed-issue-with-relative-path.patch43
-rw-r--r--package/checksec/Config.in.host17
-rw-r--r--package/checksec/checksec.hash3
-rw-r--r--package/checksec/checksec.mk16
-rw-r--r--package/coreutils/coreutils.hash2
-rw-r--r--package/coreutils/coreutils.mk2
-rw-r--r--package/cryptsetup/Config.in1
-rw-r--r--package/cryptsetup/cryptsetup.hash2
-rw-r--r--package/cryptsetup/cryptsetup.mk6
-rw-r--r--package/dt-utils/0001-common-Rename-strlcpy-to-DT_strlcpy.patch58
-rw-r--r--package/dt-utils/0002-common-Include-sys-types.h-header.patch38
-rw-r--r--package/dt-utils/dt-utils.hash3
-rw-r--r--package/dt-utils/dt-utils.mk2
-rw-r--r--package/duktape/Config.in16
-rw-r--r--package/duktape/duktape.hash3
-rw-r--r--package/duktape/duktape.mk27
-rw-r--r--package/e2fsprogs/e2fsprogs.mk3
-rw-r--r--package/expat/expat.hash8
-rw-r--r--package/expat/expat.mk5
-rw-r--r--package/flatcc/0001-Remove-strncpy-gcc-8-warning-add-flatbuffers_type_ha.patch138
-rw-r--r--package/flatcc/flatcc.hash3
-rw-r--r--package/flatcc/flatcc.mk2
-rw-r--r--package/fmt/fmt.hash3
-rw-r--r--package/fmt/fmt.mk2
-rw-r--r--package/freescale-imx/Config.in5
-rw-r--r--package/freescale-imx/imx-codec/imx-codec.hash4
-rw-r--r--package/freescale-imx/imx-codec/imx-codec.mk2
-rw-r--r--package/freescale-imx/imx-parser/imx-parser.hash4
-rw-r--r--package/freescale-imx/imx-parser/imx-parser.mk2
-rw-r--r--package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch44
-rw-r--r--package/freescale-imx/imx-vpu-hantro/Config.in20
-rw-r--r--package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash3
-rw-r--r--package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk42
-rw-r--r--package/freescale-imx/imx-vpu/Config.in13
-rw-r--r--package/freescale-imx/imx-vpu/imx-vpu.hash4
-rw-r--r--package/freescale-imx/imx-vpu/imx-vpu.mk2
-rw-r--r--package/freescale-imx/imx-vpuwrap/Config.in11
-rw-r--r--package/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash4
-rw-r--r--package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk11
-rw-r--r--package/fwup/fwup.hash3
-rw-r--r--package/fwup/fwup.mk2
-rw-r--r--package/gadgetfs-test/Config.in1
-rw-r--r--package/gcc/4.9.4/0003-libsanitizer-Use-pre-computed-size.patch71
-rw-r--r--package/gcc/5.5.0/0002-libsanitizer-Use-pre-computed-size.patch72
-rw-r--r--package/gcc/6.4.0/0003-libsanitizer-Use-pre-computed-size.patch72
-rw-r--r--package/gcc/7.3.0/0003-xtensa-fix-PR-target-65416.patch (renamed from package/gcc/7.3.0/0002-xtensa-fix-PR-target-65416.patch)0
-rw-r--r--package/gcc/7.3.0/0004-libsanitizer-Use-pre-computed-size.patch72
-rw-r--r--package/git-crypt/Config.in11
-rw-r--r--package/git-crypt/git-crypt.hash7
-rw-r--r--package/git-crypt/git-crypt.mk5
-rw-r--r--package/glibc/glibc.hash2
-rw-r--r--package/glibc/glibc.mk2
-rw-r--r--package/glibmm/glibmm.hash7
-rw-r--r--package/glibmm/glibmm.mk4
-rw-r--r--package/glorytun/glorytun.hash2
-rw-r--r--package/glorytun/glorytun.mk2
-rw-r--r--package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk8
-rw-r--r--package/gzip/gzip.hash6
-rw-r--r--package/gzip/gzip.mk2
-rw-r--r--package/harfbuzz/harfbuzz.hash5
-rw-r--r--package/harfbuzz/harfbuzz.mk2
-rw-r--r--package/htop/0002-MakeHeader-open-files-using-binary-mode.patch50
-rw-r--r--package/htop/htop.hash2
-rw-r--r--package/htop/htop.mk2
-rw-r--r--package/i2c-tools/i2c-tools.mk6
-rw-r--r--package/iperf3/iperf3.hash6
-rw-r--r--package/iperf3/iperf3.mk13
-rw-r--r--package/ipmiutil/ipmiutil.hash8
-rw-r--r--package/ipmiutil/ipmiutil.mk4
-rw-r--r--package/iproute2/0001-rdma-sync-some-IP-headers-with-glibc.patch39
-rw-r--r--package/iproute2/iproute2.hash2
-rw-r--r--package/iproute2/iproute2.mk2
-rw-r--r--package/jpeg-turbo/0001-fix-install-of-binaries-with-a-static-only-library.patch42
-rw-r--r--package/jpeg-turbo/jpeg-turbo.hash12
-rw-r--r--package/jpeg-turbo/jpeg-turbo.mk18
-rw-r--r--package/kmod/0002-shared-util.c-assert_cc-can-only-be-used-inside-func.patch56
-rw-r--r--package/kmod/kmod.hash2
-rw-r--r--package/kmod/kmod.mk2
-rw-r--r--package/kodi/0004-Fix-ffmpeg-build-for-mips.patch43
-rw-r--r--package/kodi/0005-Fix-crosscompiling-issues.patch81
-rw-r--r--package/kodi/Config.in7
-rw-r--r--package/kodi/kodi.hash2
-rw-r--r--package/kodi/kodi.mk16
-rw-r--r--package/libaio/0001-arches.patch249
-rw-r--r--package/libaio/0001-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch (renamed from package/libaio/0002-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch)4
-rw-r--r--package/libaio/0002-Makefile-add-missing-DESTDIR-variable-use.patch (renamed from package/libaio/0003-destdir.patch)22
-rw-r--r--package/libaio/Config.in10
-rw-r--r--package/libaio/libaio.hash4
-rw-r--r--package/libaio/libaio.mk14
-rw-r--r--package/libcpprestsdk/0002-fix-template-whitespace-syntax.patch75
-rw-r--r--package/libcpprestsdk/libcpprestsdk.hash2
-rw-r--r--package/libcpprestsdk/libcpprestsdk.mk2
-rw-r--r--package/libepoxy/libepoxy.hash4
-rw-r--r--package/libepoxy/libepoxy.mk2
-rw-r--r--package/libidn2/libidn2.hash4
-rw-r--r--package/libidn2/libidn2.mk2
-rw-r--r--package/libiio/Config.in6
-rw-r--r--package/libostree/libostree.hash2
-rw-r--r--package/libostree/libostree.mk2
-rw-r--r--package/librtlsdr/0002-fix-builds-with-newer-compilers-C-standards.patch68
-rw-r--r--package/librtlsdr/librtlsdr.hash2
-rw-r--r--package/librtlsdr/librtlsdr.mk2
-rw-r--r--package/libsoup/0001-Revert-tld-parser-use-Python-3.patch27
-rw-r--r--package/libsoup/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch35
-rw-r--r--package/libsoup/libsoup.hash4
-rw-r--r--package/libsoup/libsoup.mk4
-rw-r--r--package/libsrtp/0001-Rename-SHA1-functions-to-avoid-conflicts-with-downst.patch396
-rw-r--r--package/libsrtp/libsrtp.hash3
-rw-r--r--package/libsrtp/libsrtp.mk6
-rw-r--r--package/libssh/libssh.hash8
-rw-r--r--package/libssh/libssh.mk7
-rw-r--r--package/libtorrent/0001-cross_compile.patch14
-rw-r--r--package/libtorrent/libtorrent.hash3
-rw-r--r--package/libtorrent/libtorrent.mk15
-rw-r--r--package/libunistring/libunistring.hash4
-rw-r--r--package/libunistring/libunistring.mk2
-rw-r--r--package/libuv/libuv.hash2
-rw-r--r--package/libuv/libuv.mk2
-rw-r--r--package/libva-intel-driver/0001-check-ssp.patch65
-rw-r--r--package/libva-intel-driver/Config.in2
-rw-r--r--package/libva-intel-driver/libva-intel-driver.hash6
-rw-r--r--package/libva-intel-driver/libva-intel-driver.mk6
-rw-r--r--package/libva-utils/0001-check-ssp.patch145
-rw-r--r--package/libva-utils/Config.in2
-rw-r--r--package/libva-utils/libva-utils.hash6
-rw-r--r--package/libva-utils/libva-utils.mk6
-rw-r--r--package/libva/0001-check-ssp.patch64
-rw-r--r--package/libva/Config.in2
-rw-r--r--package/libva/libva.hash6
-rw-r--r--package/libva/libva.mk6
-rw-r--r--package/libxkbcommon/libxkbcommon.hash7
-rw-r--r--package/libxkbcommon/libxkbcommon.mk2
-rw-r--r--package/libyaml/libyaml.hash4
-rw-r--r--package/libyaml/libyaml.mk2
-rw-r--r--package/linux-headers/Config.in.host37
-rw-r--r--package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch66
-rw-r--r--package/live555/live555.hash4
-rw-r--r--package/live555/live555.mk2
-rw-r--r--package/log4cplus/log4cplus.hash2
-rw-r--r--package/log4cplus/log4cplus.mk2
-rw-r--r--package/luarocks/0001-allow-libluajit-detection.patch4
-rw-r--r--package/luarocks/luarocks.hash2
-rw-r--r--package/luarocks/luarocks.mk6
-rw-r--r--package/luvi/luvi.hash3
-rw-r--r--package/luvi/luvi.mk7
-rw-r--r--package/lvm2/0001-configure-Introduce-enable-symvers-option.patch55
-rw-r--r--package/lvm2/Config.in1
-rw-r--r--package/lvm2/lvm2.hash4
-rw-r--r--package/lvm2/lvm2.mk8
-rw-r--r--package/lynx/0001-src-chrtrans-don-t-build-host-tools-with-target-LDFL.patch41
-rw-r--r--package/lynx/lynx.hash2
-rw-r--r--package/lynx/lynx.mk2
-rw-r--r--package/lzo/lzo.mk2
-rw-r--r--package/mariadb/mariadb.hash12
-rw-r--r--package/mariadb/mariadb.mk14
-rw-r--r--package/mesa3d-headers/mesa3d-headers.mk2
-rw-r--r--package/mesa3d/mesa3d.hash10
-rw-r--r--package/mesa3d/mesa3d.mk2
-rw-r--r--package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch32
-rw-r--r--package/meson/meson.hash6
-rw-r--r--package/meson/meson.mk2
-rw-r--r--package/micropython/micropython.hash2
-rw-r--r--package/micropython/micropython.mk2
-rw-r--r--package/minicom/0001-musl-libc-compile-fix.patch28
-rw-r--r--package/minicom/0001-sysdep1-check-if-RS485-is-support-before-setting-its.patch36
-rw-r--r--package/minicom/0002-change-maxnamlen-to-posixs-name-max.patch51
-rw-r--r--package/minicom/Config.in2
-rw-r--r--package/minicom/minicom.hash2
-rw-r--r--package/minicom/minicom.mk17
-rw-r--r--package/mono/mono.hash2
-rw-r--r--package/mono/mono.mk2
-rw-r--r--package/monolite/monolite.hash2
-rw-r--r--package/monolite/monolite.mk2
-rw-r--r--package/mosquitto/0001-Fix-subs-memory-issue.patch151
-rw-r--r--package/mosquitto/0001-_GNU_SOURCE-needed-for-EAI_INPROGRESS.patch46
-rw-r--r--package/mosquitto/0002-websockets-_GNU_SOURCE-needed-for-S_IF-DIR-REG.patch34
-rw-r--r--package/mosquitto/mosquitto.hash2
-rw-r--r--package/mosquitto/mosquitto.mk2
-rw-r--r--package/mysql/Config.in2
-rw-r--r--package/netsnmp/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch300
-rw-r--r--package/netsnmp/netsnmp.hash9
-rw-r--r--package/netsnmp/netsnmp.mk5
-rw-r--r--package/nodejs/nodejs.mk9
-rw-r--r--package/openresolv/Config.in8
-rw-r--r--package/openresolv/openresolv.hash3
-rw-r--r--package/openresolv/openresolv.mk25
-rw-r--r--package/perl-appconfig/Config.in7
-rw-r--r--package/perl-appconfig/perl-appconfig.hash6
-rw-r--r--package/perl-appconfig/perl-appconfig.mk13
-rw-r--r--package/perl-astro-suntime/Config.in6
-rw-r--r--package/perl-astro-suntime/perl-astro-suntime.hash6
-rw-r--r--package/perl-astro-suntime/perl-astro-suntime.mk14
-rw-r--r--package/perl-class-std-fast/Config.in7
-rw-r--r--package/perl-class-std-fast/perl-class-std-fast.hash6
-rw-r--r--package/perl-class-std-fast/perl-class-std-fast.mk14
-rw-r--r--package/perl-class-std/Config.in6
-rw-r--r--package/perl-class-std/perl-class-std.hash6
-rw-r--r--package/perl-class-std/perl-class-std.mk14
-rw-r--r--package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.hash6
-rw-r--r--package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.mk13
-rw-r--r--package/perl-crypt-openssl-random/perl-crypt-openssl-random.hash7
-rw-r--r--package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk10
-rw-r--r--package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.hash7
-rw-r--r--package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk12
-rw-r--r--package/perl-data-optlist/Config.in12
-rw-r--r--package/perl-data-optlist/perl-data-optlist.hash6
-rw-r--r--package/perl-data-optlist/perl-data-optlist.mk14
-rw-r--r--package/perl-data-uuid/Config.in10
-rw-r--r--package/perl-data-uuid/perl-data-uuid.hash6
-rw-r--r--package/perl-data-uuid/perl-data-uuid.mk18
-rw-r--r--package/perl-date-manip/Config.in6
-rw-r--r--package/perl-date-manip/perl-date-manip.hash6
-rw-r--r--package/perl-date-manip/perl-date-manip.mk13
-rw-r--r--package/perl-dbi/Config.in10
-rw-r--r--package/perl-dbi/perl-dbi.hash6
-rw-r--r--package/perl-dbi/perl-dbi.mk13
-rw-r--r--package/perl-device-serialport/Config.in10
-rw-r--r--package/perl-device-serialport/perl-device-serialport.hash6
-rw-r--r--package/perl-device-serialport/perl-device-serialport.mk13
-rw-r--r--package/perl-file-slurp/Config.in7
-rw-r--r--package/perl-file-slurp/perl-file-slurp.hash6
-rw-r--r--package/perl-file-slurp/perl-file-slurp.mk13
-rw-r--r--package/perl-io-interface/Config.in10
-rw-r--r--package/perl-io-interface/perl-io-interface.hash6
-rw-r--r--package/perl-io-interface/perl-io-interface.mk14
-rw-r--r--package/perl-io-socket-multicast/Config.in11
-rw-r--r--package/perl-io-socket-multicast/perl-io-socket-multicast.hash6
-rw-r--r--package/perl-io-socket-multicast/perl-io-socket-multicast.mk14
-rw-r--r--package/perl-json-maybexs/Config.in6
-rw-r--r--package/perl-json-maybexs/perl-json-maybexs.hash6
-rw-r--r--package/perl-json-maybexs/perl-json-maybexs.mk13
-rw-r--r--package/perl-mime-tools/Config.in7
-rw-r--r--package/perl-mime-tools/perl-mime-tools.hash6
-rw-r--r--package/perl-mime-tools/perl-mime-tools.mk14
-rw-r--r--package/perl-module-implementation/Config.in9
-rw-r--r--package/perl-module-implementation/perl-module-implementation.hash6
-rw-r--r--package/perl-module-implementation/perl-module-implementation.mk14
-rw-r--r--package/perl-module-runtime/Config.in6
-rw-r--r--package/perl-module-runtime/perl-module-runtime.hash6
-rw-r--r--package/perl-module-runtime/perl-module-runtime.mk14
-rw-r--r--package/perl-number-bytes-human/Config.in6
-rw-r--r--package/perl-number-bytes-human/perl-number-bytes-human.hash6
-rw-r--r--package/perl-number-bytes-human/perl-number-bytes-human.mk13
-rw-r--r--package/perl-params-util/Config.in10
-rw-r--r--package/perl-params-util/perl-params-util.hash6
-rw-r--r--package/perl-params-util/perl-params-util.mk13
-rw-r--r--package/perl-sub-install/Config.in6
-rw-r--r--package/perl-sub-install/perl-sub-install.hash6
-rw-r--r--package/perl-sub-install/perl-sub-install.mk13
-rw-r--r--package/perl-sys-meminfo/Config.in10
-rw-r--r--package/perl-sys-meminfo/perl-sys-meminfo.hash6
-rw-r--r--package/perl-sys-meminfo/perl-sys-meminfo.mk13
-rw-r--r--package/perl-sys-mmap/Config.in10
-rw-r--r--package/perl-sys-mmap/perl-sys-mmap.hash7
-rw-r--r--package/perl-sys-mmap/perl-sys-mmap.mk13
-rw-r--r--package/pound/pound.hash3
-rw-r--r--package/pound/pound.mk2
-rw-r--r--package/proftpd/Config.in6
-rw-r--r--package/proftpd/proftpd.mk12
-rw-r--r--package/python-can/python-can.hash7
-rw-r--r--package/python-can/python-can.mk4
-rw-r--r--package/python-falcon/Config.in9
-rw-r--r--package/python-falcon/python-falcon.hash5
-rw-r--r--package/python-falcon/python-falcon.mk18
-rw-r--r--package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch6
-rw-r--r--package/python-lxml/Config.in3
-rw-r--r--package/python-lxml/python-lxml.hash2
-rw-r--r--package/python-lxml/python-lxml.mk2
-rw-r--r--package/python-mimeparse/Config.in7
-rw-r--r--package/python-mimeparse/python-mimeparse.hash5
-rw-r--r--package/python-mimeparse/python-mimeparse.mk13
-rw-r--r--package/python-pillow/python-pillow.hash6
-rw-r--r--package/python-pillow/python-pillow.mk4
-rw-r--r--package/python-pip/Config.in6
-rw-r--r--package/python-pip/python-pip.hash5
-rw-r--r--package/python-pip/python-pip.mk14
-rw-r--r--package/python-pyyaml/python-pyyaml.hash6
-rw-r--r--package/python-pyyaml/python-pyyaml.mk4
-rw-r--r--package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch11
-rw-r--r--package/python-pyzmq/0002-replace-compile_and_run-with-compile_and_forget.patch76
-rw-r--r--package/python-pyzmq/python-pyzmq.hash4
-rw-r--r--package/python-pyzmq/python-pyzmq.mk4
-rw-r--r--package/python-semver/Config.in6
-rw-r--r--package/python-semver/python-semver.hash3
-rw-r--r--package/python-semver/python-semver.mk14
-rw-r--r--package/python-setuptools/python-setuptools.hash2
-rw-r--r--package/python-setuptools/python-setuptools.mk2
-rw-r--r--package/python-websockets/python-websockets.hash4
-rw-r--r--package/python-websockets/python-websockets.mk4
-rw-r--r--package/python3/0001-Make-the-build-of-pyc-files-conditional.patch6
-rw-r--r--package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch2
-rw-r--r--package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch16
-rw-r--r--package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch2
-rw-r--r--package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch2
-rw-r--r--package/python3/0006-Don-t-add-multiarch-paths.patch2
-rw-r--r--package/python3/0007-Abort-on-failed-module-build.patch2
-rw-r--r--package/python3/0008-Serial-ioctl-workaround.patch2
-rw-r--r--package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch37
-rw-r--r--package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch2
-rw-r--r--package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch6
-rw-r--r--package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch21
-rw-r--r--package/python3/0014-Add-an-option-to-disable-pydoc.patch14
-rw-r--r--package/python3/0015-Add-an-option-to-disable-lib2to3.patch16
-rw-r--r--package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch10
-rw-r--r--package/python3/0017-Add-an-option-to-disable-the-tk-module.patch8
-rw-r--r--package/python3/0018-Add-an-option-to-disable-the-curses-module.patch6
-rw-r--r--package/python3/0019-Add-an-option-to-disable-expat.patch10
-rw-r--r--package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch2
-rw-r--r--package/python3/0021-Add-an-option-to-disable-NIS.patch2
-rw-r--r--package/python3/0022-Add-an-option-to-disable-unicodedata.patch2
-rw-r--r--package/python3/0023-Add-an-option-to-disable-IDLE.patch10
-rw-r--r--package/python3/0024-Add-an-option-to-disable-decimal.patch8
-rw-r--r--package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch2
-rw-r--r--package/python3/0026-Add-an-option-to-disable-openssl-support.patch2
-rw-r--r--package/python3/0027-Add-an-option-to-disable-the-readline-module.patch2
-rw-r--r--package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch2
-rw-r--r--package/python3/0029-python-config.sh-don-t-reassign-prefix.patch22
-rw-r--r--package/python3/0030-Fix-cross-compiling-the-uuid-module.patch38
-rw-r--r--package/python3/0031-Add-an-option-to-disable-uuid-module.patch33
-rw-r--r--package/python3/0032-fix-building-on-older-distributions.patch38
-rw-r--r--package/python3/Config.in10
-rw-r--r--package/python3/python3.hash7
-rw-r--r--package/python3/python3.mk19
-rw-r--r--package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch8
-rw-r--r--package/qemu/0002-memfd-fix-configure-test.patch58
-rw-r--r--package/qemu/Config.in25
-rw-r--r--package/qemu/qemu.hash2
-rw-r--r--package/qemu/qemu.mk19
-rw-r--r--package/qt5/qt5base/5.11.1/0003-Fix-qmake-build-with-glibc-2.28.patch74
-rw-r--r--package/qt5/qt5wayland/0001-fix-compilation-without-QtQuick.patch69
-rw-r--r--package/qt5/qt5wayland/Config.in3
-rw-r--r--package/qt5/qt5wayland/qt5wayland.mk6
-rw-r--r--package/rust-bin/rust-bin.hash60
-rw-r--r--package/rust-bin/rust-bin.mk2
-rw-r--r--package/rust/rust.hash4
-rw-r--r--package/rust/rust.mk3
-rw-r--r--package/sam-ba/sam-ba.hash7
-rw-r--r--package/sam-ba/sam-ba.mk6
-rw-r--r--package/samba4/0001-libreplace-disable-libbsd-support.patch12
-rw-r--r--package/samba4/0004-Disable-build-of-manpages-and-documentation.patch19
-rw-r--r--package/samba4/samba4.hash4
-rw-r--r--package/samba4/samba4.mk2
-rw-r--r--package/shellinabox/0002-launcher.c-include-sys-ttydefaults.h.patch27
-rw-r--r--package/shellinabox/shellinabox.hash6
-rw-r--r--package/shellinabox/shellinabox.mk4
-rw-r--r--package/spi-tools/spi-tools.hash3
-rw-r--r--package/spi-tools/spi-tools.mk2
-rw-r--r--package/squid/0001-assume-get-certificate-ok.patch18
-rw-r--r--package/squid/0003-ESI-make-sure-endofName-never-exceeds-tagEnd-130.patch35
-rw-r--r--package/squid/0004-Fix-indirect-IP-logging-for-transactions-without-a-c.patch31
-rw-r--r--package/squid/Config.in1
-rw-r--r--package/squid/squid.hash9
-rw-r--r--package/squid/squid.mk8
-rw-r--r--package/sunxi-mali-mainline-driver/Config.in2
-rw-r--r--package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash2
-rw-r--r--package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk7
-rw-r--r--package/sunxi-mali-mainline/Config.in8
-rw-r--r--package/sunxi-mali-mainline/sunxi-mali-mainline.hash3
-rw-r--r--package/sunxi-mali-mainline/sunxi-mali-mainline.mk27
-rw-r--r--package/swig/Config.in.host8
-rw-r--r--package/sylpheed/sylpheed.hash4
-rw-r--r--package/sylpheed/sylpheed.mk4
-rw-r--r--package/synergy/0001-allow-building-of-synergy-without-tests.patch86
-rw-r--r--package/synergy/0002-do-not-change-output-path-when-building-in-debug.patch33
-rw-r--r--package/synergy/Config.in2
-rw-r--r--package/synergy/synergy.hash3
-rw-r--r--package/synergy/synergy.mk4
-rw-r--r--package/sysdig/Config.in10
-rw-r--r--package/sysdig/sysdig.hash5
-rw-r--r--package/sysdig/sysdig.mk4
-rw-r--r--package/systemd/0003-build-sys-Detect-whether-struct-statx-is-defined-in-.patch111
-rw-r--r--package/systemd/0004-meson-unify-linux-stat.h-check-with-other-checks-and.patch77
-rw-r--r--package/systemd/Config.in2
-rw-r--r--package/tini/Config.in17
-rw-r--r--package/tini/tini.hash3
-rw-r--r--package/tini/tini.mk35
-rw-r--r--package/trousers/0001-Check-if-the-compiler-understands-pie-and-relro-options.patch (renamed from package/trousers/0002-Check-if-the-compiler-understands-pie-and-relro-options.patch)17
-rw-r--r--package/trousers/0001-Remove-inline-for-read_data-and-write_data.patch94
-rw-r--r--package/trousers/0002-Check-that-getpwent_r-is-available-before-using-it.patch (renamed from package/trousers/0004-Check-that-getpwent_r-is-available-before-using-it.patch)8
-rw-r--r--package/trousers/0003-tsp_tcsi_param-include-limits.h-to-fix-musl-build.patch29
-rw-r--r--package/trousers/trousers.hash9
-rw-r--r--package/trousers/trousers.mk2
-rw-r--r--package/tslib/tslib.hash4
-rw-r--r--package/tslib/tslib.mk2
-rw-r--r--package/ustream-ssl/ustream-ssl.hash3
-rw-r--r--package/ustream-ssl/ustream-ssl.mk2
-rw-r--r--package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch22
-rw-r--r--package/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch46
-rw-r--r--package/vlc/0002-lua-Define-LUA_COMPAT_APIINTCASTS-for-Lua-5.3.0-comp.patch41
-rw-r--r--package/vlc/0003-automake-add-subdir-objects-option.patch8
-rw-r--r--package/vlc/0004-Drop-error-implicit-function-declaration-compile-fla.patch32
-rw-r--r--package/vlc/0004-qt-fix-build-against-Qt-5.11.patch33
-rw-r--r--package/vlc/0005-Don-t-hardcode-the-name-of-the-vorbis-and-ogg-librar.patch8
-rw-r--r--package/vlc/0006-Don-t-assume-X11-is-available-when-Qt5-is-used.patch28
-rw-r--r--package/vlc/0006-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch44
-rw-r--r--package/vlc/0007-Don-t-assume-strerror_l-is-available.patch20
-rw-r--r--package/vlc/0008-fix-fallback-code-and-add-required-realtime-library-.patch40
-rw-r--r--package/vlc/0008-posix-remove-ancient-run-time-fallback-to-real-time-.patch187
-rw-r--r--package/vlc/0009-Changes-for-ffmpeg-3.0.patch309
-rw-r--r--package/vlc/0009-x264-drop-148-build-support-and-fix-10bit-support.patch (renamed from package/vlc/0013-x264-drop-148-build-support-and-fix-10bit-support.patch)38
-rw-r--r--package/vlc/0010-Add-support-for-freerdp2.patch150
-rw-r--r--package/vlc/0010-Fix-build-when-using-C99-and-C-11.patch30
-rw-r--r--package/vlc/0011-compat-fix-static_assert.patch36
-rw-r--r--package/vlc/0011-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch50
-rw-r--r--package/vlc/0012-Fix-build-with-libupnp-above-1.6.23.patch64
-rw-r--r--package/vlc/Config.in9
-rw-r--r--package/vlc/vlc.hash13
-rw-r--r--package/vlc/vlc.mk250
-rw-r--r--package/vtun/0003-fixup-configure.in.patch92
-rw-r--r--package/vtun/0003-openssl11.patch294
-rw-r--r--package/vtun/vtun.hash6
-rw-r--r--package/vtun/vtun.mk2
-rw-r--r--package/wf111/wf111.hash4
-rw-r--r--package/wf111/wf111.mk9
-rw-r--r--package/x264/x264.hash2
-rw-r--r--package/x264/x264.mk2
-rw-r--r--package/xen/Config.in2
-rw-r--r--package/xxhash/xxhash.hash4
-rw-r--r--package/xxhash/xxhash.mk2
-rwxr-xr-xsupport/download/dl-wrapper47
-rw-r--r--support/misc/Vagrantfile2
-rw-r--r--support/testing/infra/builder.py5
-rwxr-xr-xutils/scancpan16
-rwxr-xr-xutils/scanpypi2
466 files changed, 4959 insertions, 3901 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d4301076f..d4807c5c85 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,8 +43,7 @@ check-flake8:
check-package:
script:
- - find . -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \)
- -exec ./utils/check-package {} +
+ - make check-package
.defconfig: &defconfig
# Running the defconfigs for every push is too much, so limit to
diff --git a/.gitlab-ci.yml.in b/.gitlab-ci.yml.in
index fb2650c5ce..38e24c8d01 100644
--- a/.gitlab-ci.yml.in
+++ b/.gitlab-ci.yml.in
@@ -43,8 +43,7 @@ check-flake8:
check-package:
script:
- - find . -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \)
- -exec ./utils/check-package {} +
+ - make check-package
.defconfig: &defconfig
# Running the defconfigs for every push is too much, so limit to
diff --git a/Config.in.legacy b/Config.in.legacy
index 29d5b6adcc..aae8d28e13 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -143,6 +143,59 @@ comment "----------------------------------------------------"
endif
###############################################################################
+comment "Legacy options removed in 2018.11"
+
+config BR2_KERNEL_HEADERS_4_10
+ bool "kernel headers version 4.10.x are no longer supported"
+ select BR2_KERNEL_HEADERS_4_9
+ select BR2_LEGACY
+ help
+ Version 4.10.x of the Linux kernel headers are no longer
+ maintained upstream and are now removed. As an alternative,
+ version 4.14.x of the headers have been automatically
+ selected in your configuration.
+
+config BR2_KERNEL_HEADERS_4_11
+ bool "kernel headers version 4.11.x are no longer supported"
+ select BR2_KERNEL_HEADERS_4_9
+ select BR2_LEGACY
+ help
+ Version 4.11.x of the Linux kernel headers are no longer
+ maintained upstream and are now removed. As an alternative,
+ version 4.14.x of the headers have been automatically
+ selected in your configuration.
+
+config BR2_KERNEL_HEADERS_4_12
+ bool "kernel headers version 4.12.x are no longer supported"
+ select BR2_KERNEL_HEADERS_4_19
+ select BR2_LEGACY
+ help
+ Version 4.12.x of the Linux kernel headers are no longer
+ maintained upstream and are now removed. As an alternative,
+ version 4.14.x of the headers have been automatically
+ selected in your configuration.
+
+config BR2_KERNEL_HEADERS_4_13
+ bool "kernel headers version 4.13.x are no longer supported"
+ select BR2_KERNEL_HEADERS_4_19
+ select BR2_LEGACY
+ help
+ Version 4.13.x of the Linux kernel headers are no longer
+ maintained upstream and are now removed. As an alternative,
+ version 4.14.x of the headers have been automatically
+ selected in your configuration.
+
+config BR2_KERNEL_HEADERS_4_15
+ bool "kernel headers version 4.15.x are no longer supported"
+ select BR2_KERNEL_HEADERS_4_14
+ select BR2_LEGACY
+ help
+ Version 4.15.x of the Linux kernel headers are no longer
+ maintained upstream and are now removed. As an alternative,
+ version 4.14.x of the headers have been automatically
+ selected in your configuration.
+
+###############################################################################
comment "Legacy options removed in 2018.08"
config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
diff --git a/DEVELOPERS b/DEVELOPERS
index 2a5c8dc786..3ba03df153 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -53,6 +53,7 @@ F: package/nginx-naxsi/
F: package/policycoreutils/
F: package/python-flask-sqlalchemy/
F: package/python-mutagen/
+F: package/python-pip/
F: package/python-psycopg2/
F: package/python-sqlalchemy/
F: package/python-visitor/
@@ -330,6 +331,7 @@ F: package/libyuv/
F: package/mesa3d/
F: package/minidlna/
F: package/mjpg-streamer/
+F: package/perl-crypt-openssl-guess/
F: package/perl-crypt-openssl-random/
F: package/perl-crypt-openssl-rsa/
F: package/perl-digest-sha1/
@@ -470,6 +472,7 @@ F: package/docker-proxy/
F: package/mosh/
F: package/rtl8821au/
F: package/runc/
+F: package/tini/
N: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
F: package/drbd-utils/
@@ -479,6 +482,29 @@ F: package/python-rtslib-fb/
F: package/python-urwid/
F: package/targetcli-fb/
+N: Christopher McCrory <chrismcc@gmail.com>
+F: package/perl-appconfig/
+F: package/perl-astro-suntime/
+F: package/perl-class-std/
+F: package/perl-class-std-fast/
+F: package/perl-data-optlist/
+F: package/perl-data-uuid/
+F: package/perl-date-manip/
+F: package/perl-dbi/
+F: package/perl-device-serialport/
+F: package/perl-file-slurp/
+F: package/perl-io-interface/
+F: package/perl-io-socket-multicast/
+F: package/perl-json-maybexs/
+F: package/perl-mime-tools/
+F: package/perl-module-implementation/
+F: package/perl-module-runtime/
+F: package/perl-number-bytes-human/
+F: package/perl-params-util/
+F: package/perl-sub-install/
+F: package/perl-sys-meminfo/
+F: package/perl-sys-mmap/
+
N: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
F: package/audit/
F: package/checkpolicy/
@@ -693,6 +719,7 @@ F: package/alljoyn-tcl/
F: package/alljoyn-tcl-base/
F: package/boinc/
F: package/cairo/
+F: package/duktape/
F: package/expat/
F: package/flatbuffers/
F: package/gtksourceview/
@@ -853,6 +880,10 @@ F: package/libsrtp/
F: package/libwebsock/
F: package/sofia-sip/
+N: Grzegorz Blach <grzegorz@blach.pl>
+F: package/python-falcon/
+F: package/python-mimeparse/
+
N: Guillaume Gardet <guillaume.gardet@oliseo.fr>
F: package/c-icap/
F: package/c-icap-modules/
@@ -1290,6 +1321,7 @@ F: package/aufs-util/
F: package/bc/
F: package/bridge-utils/
F: package/checkpolicy/
+F: package/checksec/
F: package/cgroupfs-mount/
F: package/crda/
F: package/devmem2/
@@ -1331,6 +1363,7 @@ F: package/mtd/
F: package/mtools/
F: package/nginx-upload/
F: package/omniorb/
+F: package/openresolv/
F: package/paxtest/
F: package/picocom/
F: package/policycoreutils/
@@ -1348,6 +1381,7 @@ F: package/rsyslog/
F: package/setools/
F: package/smcroute/
F: package/tclap/
+F: package/tini/
F: package/uboot-tools/
F: package/unionfs/
F: package/valijson/
@@ -1508,6 +1542,9 @@ F: package/openjpeg/
N: Olivier Singla <olivier.singla@gmail.com>
F: package/shellinabox/
+N: Paresh Chaudhary <paresh.chaudhary@rockwellcollins.com>
+F: package/checksec/
+
N: Parnell Springmeyer <parnell@digitalmentat.com>
F: package/scrypt/
@@ -1563,6 +1600,7 @@ F: package/python-ipaddr/
F: package/python-pam/
F: package/python-psutil/
F: package/python-request-id/
+F: package/python-semver/
F: package/python-texttable/
F: package/python-validators/
F: package/python-webob/
diff --git a/Makefile b/Makefile
index 1c1467d482..2c6af12989 100644
--- a/Makefile
+++ b/Makefile
@@ -130,7 +130,7 @@ export BR2_VERSION_FULL := $(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlo
noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \
defconfig %_defconfig allyesconfig allnoconfig alldefconfig silentoldconfig release \
randpackageconfig allyespackageconfig allnopackageconfig \
- print-version olddefconfig distclean manual manual-%
+ print-version olddefconfig distclean manual manual-% check-package
# Some global targets do not trigger a build, but are used to collect
# metadata, or do various checks. When such targets are triggered,
@@ -573,8 +573,8 @@ prepare: $(BUILD_DIR)/buildroot-config/auto.conf
.PHONY: world
world: target-post-image
-.PHONY: sdk
-sdk: world
+.PHONY: prepare-sdk
+prepare-sdk: world
@$(call MESSAGE,"Rendering the SDK relocatable")
$(TOPDIR)/support/scripts/fix-rpath host
$(TOPDIR)/support/scripts/fix-rpath staging
@@ -582,6 +582,17 @@ sdk: world
mkdir -p $(HOST_DIR)/share/buildroot
echo $(HOST_DIR) > $(HOST_DIR)/share/buildroot/sdk-location
+BR2_SDK_PREFIX ?= $(GNU_TARGET_NAME)_sdk-buildroot
+.PHONY: sdk
+sdk: prepare-sdk $(BR2_TAR_HOST_DEPENDENCY)
+ @$(call MESSAGE,"Generating SDK tarball")
+ $(if $(BR2_SDK_PREFIX),,$(error BR2_SDK_PREFIX can not be empty))
+ $(Q)mkdir -p $(BINARIES_DIR)
+ $(TAR) czf "$(BINARIES_DIR)/$(BR2_SDK_PREFIX).tar.gz" \
+ --owner=0 --group=0 --numeric-owner \
+ --transform='s#^\.#$(BR2_SDK_PREFIX)#' \
+ -C $(HOST_DIR) "."
+
# Populating the staging with the base directories is handled by the skeleton package
$(STAGING_DIR):
@mkdir -p $(STAGING_DIR)
@@ -1125,6 +1136,10 @@ release:
print-version:
@echo $(BR2_VERSION_FULL)
+check-package:
+ find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \) \
+ -exec ./utils/check-package {} +
+
.PHONY: .gitlab-ci.yml
.gitlab-ci.yml: .gitlab-ci.yml.in
cp $< $@
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 8e369cec04..9e40c11fa1 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -159,6 +159,14 @@ config BR2_TARGET_UBOOT_NEEDS_OPENSSL
typically the case when the board configuration has
CONFIG_FIT_SIGNATURE enabled.
+config BR2_TARGET_UBOOT_NEEDS_LZOP
+ bool "U-Boot needs lzop"
+ help
+ Select this option if your U-Boot board configuration
+ requires lzop to be available on the host. This is typically
+ the case when the board configuration has CONFIG_SPL_LZO
+ enabled.
+
config BR2_TARGET_UBOOT_NEEDS_ATF_BL31
bool "U-Boot needs ATF BL31"
depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index a19cb72458..f77822c34f 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -152,6 +152,10 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y)
UBOOT_DEPENDENCIES += host-openssl
endif
+ifeq ($(BR2_TARGET_UBOOT_NEEDS_LZOP),y)
+UBOOT_DEPENDENCIES += host-lzop
+endif
+
# prior to u-boot 2013.10 the license info was in COPYING. Copy it so
# legal-info finds it
define UBOOT_COPY_OLD_LICENSE_FILE
diff --git a/configs/arm_juno_defconfig b/configs/arm_juno_defconfig
index 98f257387d..5832986779 100644
--- a/configs/arm_juno_defconfig
+++ b/configs/arm_juno_defconfig
@@ -12,7 +12,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/juno arm/juno-r1 arm/juno-r2"
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.3"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.4"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="juno"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index c89b4e6d9d..1bb11fee7e 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -20,7 +20,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2017.3"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2018.2"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_microzed"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index 758069b30f..e8019177d2 100644
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -20,7 +20,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2017.3"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2018.2"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_zc706"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index 676366bc5c..a215695b54 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -20,7 +20,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2017.3"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2018.2"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_zed"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
diff --git a/docs/manual/using-buildroot-toolchain.txt b/docs/manual/using-buildroot-toolchain.txt
index 3246dc2411..0c0c35fced 100644
--- a/docs/manual/using-buildroot-toolchain.txt
+++ b/docs/manual/using-buildroot-toolchain.txt
@@ -12,15 +12,23 @@ The toolchain generated by Buildroot is located by default in
+output/host/bin/+ to your PATH environment variable and then to
use +ARCH-linux-gcc+, +ARCH-linux-objdump+, +ARCH-linux-ld+, etc.
-It is possible to relocate the toolchain, this allows to distribute
-the toolchain to other developers to build applications for your
-target. To achieve this:
+Alternatively, Buildroot can also export the toolchain and the development
+files of all selected packages, as an SDK, by running the command
++make sdk+. This generates a tarball of the content of the host directory
++output/host/+, named +<TARGET-TUPLE>_sdk-buildroot.tar.gz+ (which can be
+overriden by setting the environment variable +BR2_SDK_PREFIX+) and
+located in the output directory +output/images/+.
-* run +make sdk+, which prepares the toolchain to be relocatable;
-* tarball the contents of the +output/host+ directory;
-* distribute the resulting tarball.
+This tarball can then be distributed to application developers, when
+they want to develop their applications that are not (yet) packaged as
+a Buildroot package.
-Once the toolchain is installed to the new location, the user must run
-the +relocate-sdk.sh+ script to make sure all paths are updated with
-the new location.
+Upon extracting the SDK tarball, the user must run the script
++relocate-sdk.sh+ (located at the top directory of the SDK), to make
+sure all paths are updated with the new location.
+Alternatively, if you just want to prepare the SDK without generating
+the tarball (e.g. because you will just be moving the +host+ directory,
+or will be generating the tarball on your own), Buildroot also allows
+you to just prepare the SDK with +make prepare-sdk+ without actually
+generating a tarball.
diff --git a/fs/Config.in b/fs/Config.in
index c25b01c3de..24f22fd7e3 100644
--- a/fs/Config.in
+++ b/fs/Config.in
@@ -1,6 +1,7 @@
menu "Filesystem images"
source "fs/axfs/Config.in"
+source "fs/btrfs/Config.in"
source "fs/cloop/Config.in"
source "fs/cpio/Config.in"
source "fs/cramfs/Config.in"
diff --git a/fs/btrfs/Config.in b/fs/btrfs/Config.in
new file mode 100644
index 0000000000..85be68e7e9
--- /dev/null
+++ b/fs/btrfs/Config.in
@@ -0,0 +1,50 @@
+config BR2_TARGET_ROOTFS_BTRFS
+ bool "btrfs root filesystem"
+ select BR2_PACKAGE_HOST_BTRFS_PROGS
+ help
+ Build a btrfs root filesystem. If you enable this option, you
+ probably want to enable the btrfs-progs package too.
+
+if BR2_TARGET_ROOTFS_BTRFS
+
+config BR2_TARGET_ROOTFS_BTRFS_LABEL
+ string "filesystem label"
+
+config BR2_TARGET_ROOTFS_BTRFS_SIZE
+ string "filesystem size"
+ default "100m"
+ help
+ The size of the filesystem image in bytes.
+ Suffix with k, m, g or t for power-of-two kilo-, mega-, giga-
+ or terabytes.
+
+config BR2_TARGET_ROOTFS_BTRFS_SIZE_SECTOR
+ string "sector size"
+ default "4096"
+ help
+ This value should be set to the page size in bytes. The
+ default value of 4096 is the the most common page size for
+ most systems. If the sectorsize differs from the page size,
+ the created filesystem may not be mountable by the kernel.
+ Therefore it is recommended to leave this value at
+ 4096. Unless you know that your kernel uses a different page
+ size. Suffix with k for power-of-two kilobytes.
+
+config BR2_TARGET_ROOTFS_BTRFS_SIZE_NODE
+ string "btree node size"
+ default "16384"
+ help
+ The tree block size in which btrfs stores metadata in bytes.
+ This must be a multiple of the sectorsize, but not larger
+ than 64KiB (65536).
+ Suffix with k for power-of-two kilobytes.
+
+config BR2_TARGET_ROOTFS_BTRFS_FEATURES
+ string "Filesystem Features"
+ help
+ A comma separated string of features that can be enabled
+ during creation time.
+ For a list of available options, use:
+ `.../host/bin/mkfs.btrfs -O list-all`
+
+endif # BR2_TARGET_ROOTFS_BTRFS
diff --git a/fs/btrfs/btrfs.mk b/fs/btrfs/btrfs.mk
new file mode 100644
index 0000000000..388516389b
--- /dev/null
+++ b/fs/btrfs/btrfs.mk
@@ -0,0 +1,36 @@
+################################################################################
+#
+# Build the btrfs root filesystem image
+#
+################################################################################
+
+BTRFS_SIZE = $(call qstrip,$(BR2_TARGET_ROOTFS_BTRFS_SIZE))
+ifeq ($(BR2_TARGET_ROOTFS_BTRFS)-$(BTRFS_SIZE),y-)
+$(error BR2_TARGET_ROOTFS_BTRFS_SIZE cannot be empty)
+endif
+
+BTRFS_SIZE_NODE = $(call qstrip,$(BR2_TARGET_ROOTFS_BTRFS_SIZE_NODE))
+BTRFS_SIZE_SECTOR = $(call qstrip,$(BR2_TARGET_ROOTFS_BTRFS_SIZE_SECTOR))
+BTRFS_FEATURES = $(call qstrip,$(BR2_TARGET_ROOTFS_BTRFS_FEATURES))
+# qstrip results in stripping consecutive spaces into a single one. So the
+# variable is not qstrip-ed to preserve the integrity of the string value.
+BTRFS_LABEL := $(subst ",,$(BR2_TARGET_ROOTFS_BTRFS_LABEL))
+# ")
+
+BTRFS_OPTS = \
+ -f \
+ -r '$(TARGET_DIR)' \
+ -L '$(BTRFS_LABEL)' \
+ --byte-count '$(BTRFS_SIZE)' \
+ $(if $(BTRFS_SIZE_NODE),--nodesize '$(BTRFS_SIZE_NODE)') \
+ $(if $(BTRFS_SIZE_SECTOR),--sectorsize '$(BTRFS_SIZE_SECTOR)') \
+ $(if $(BTRFS_FEATURES),--features '$(BTRFS_FEATURES)')
+
+ROOTFS_BTRFS_DEPENDENCIES = host-btrfs-progs
+
+define ROOTFS_BTRFS_CMD
+ $(RM) -f $@
+ $(HOST_DIR)/bin/mkfs.btrfs $(BTRFS_OPTS) $@
+endef
+
+$(eval $(rootfs))
diff --git a/linux/Config.in b/linux/Config.in
index 69042af168..0c05e8bdcd 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -30,7 +30,7 @@ choice
prompt "Kernel version"
config BR2_LINUX_KERNEL_LATEST_VERSION
- bool "Latest version (4.17)"
+ bool "Latest version (4.18)"
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
bool "Latest CIP SLTS version (v4.4.138-cip25)"
@@ -120,7 +120,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
- default "4.17.19" if BR2_LINUX_KERNEL_LATEST_VERSION
+ default "4.18.5" if BR2_LINUX_KERNEL_LATEST_VERSION
default "v4.4.138-cip25" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
if BR2_LINUX_KERNEL_CUSTOM_VERSION
diff --git a/package/Config.in b/package/Config.in
index f5a17492c7..0323045e57 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -665,18 +665,28 @@ endif
source "package/perl/Config.in"
if BR2_PACKAGE_PERL
menu "Perl libraries/modules"
+ source "package/perl-appconfig/Config.in"
+ source "package/perl-astro-suntime/Config.in"
+ source "package/perl-class-std/Config.in"
+ source "package/perl-class-std-fast/Config.in"
source "package/perl-convert-asn1/Config.in"
source "package/perl-crypt-blowfish/Config.in"
source "package/perl-crypt-cbc/Config.in"
source "package/perl-crypt-openssl-random/Config.in"
source "package/perl-crypt-openssl-rsa/Config.in"
+ source "package/perl-data-optlist/Config.in"
+ source "package/perl-data-uuid/Config.in"
+ source "package/perl-date-manip/Config.in"
source "package/perl-datetime-tiny/Config.in"
+ source "package/perl-dbi/Config.in"
+ source "package/perl-device-serialport/Config.in"
source "package/perl-digest-hmac/Config.in"
source "package/perl-digest-md5/Config.in"
source "package/perl-digest-sha1/Config.in"
source "package/perl-encode-detect/Config.in"
source "package/perl-encode-locale/Config.in"
source "package/perl-file-listing/Config.in"
+ source "package/perl-file-slurp/Config.in"
source "package/perl-file-util/Config.in"
source "package/perl-gd/Config.in"
source "package/perl-gdgraph/Config.in"
@@ -689,7 +699,10 @@ menu "Perl libraries/modules"
source "package/perl-http-message/Config.in"
source "package/perl-http-negotiate/Config.in"
source "package/perl-io-html/Config.in"
+ source "package/perl-io-interface/Config.in"
+ source "package/perl-io-socket-multicast/Config.in"
source "package/perl-io-socket-ssl/Config.in"
+ source "package/perl-json-maybexs/Config.in"
source "package/perl-json-tiny/Config.in"
source "package/perl-libwww-perl/Config.in"
source "package/perl-lwp-mediatypes/Config.in"
@@ -697,6 +710,9 @@ menu "Perl libraries/modules"
source "package/perl-mailtools/Config.in"
source "package/perl-mime-base64-urlsafe/Config.in"
source "package/perl-mime-base64/Config.in"
+ source "package/perl-mime-tools/Config.in"
+ source "package/perl-module-implementation/Config.in"
+ source "package/perl-module-runtime/Config.in"
source "package/perl-mojolicious-plugin-authentication/Config.in"
source "package/perl-mojolicious/Config.in"
source "package/perl-net-dns/Config.in"
@@ -707,7 +723,12 @@ menu "Perl libraries/modules"
source "package/perl-net-ssleay/Config.in"
source "package/perl-net-telnet/Config.in"
source "package/perl-netaddr-ip/Config.in"
+ source "package/perl-number-bytes-human/Config.in"
+ source "package/perl-params-util/Config.in"
source "package/perl-path-tiny/Config.in"
+ source "package/perl-sub-install/Config.in"
+ source "package/perl-sys-meminfo/Config.in"
+ source "package/perl-sys-mmap/Config.in"
source "package/perl-time-hires/Config.in"
source "package/perl-timedate/Config.in"
source "package/perl-try-tiny/Config.in"
@@ -799,6 +820,7 @@ menu "External python modules"
source "package/python-engineio/Config.in"
source "package/python-enum/Config.in"
source "package/python-enum34/Config.in"
+ source "package/python-falcon/Config.in"
source "package/python-flask/Config.in"
source "package/python-flask-cors/Config.in"
source "package/python-flask-babel/Config.in"
@@ -850,6 +872,7 @@ menu "External python modules"
source "package/python-markupsafe/Config.in"
source "package/python-mbstrdecoder/Config.in"
source "package/python-meld3/Config.in"
+ source "package/python-mimeparse/Config.in"
source "package/python-mistune/Config.in"
source "package/python-more-itertools/Config.in"
source "package/python-msgpack/Config.in"
@@ -874,6 +897,7 @@ menu "External python modules"
source "package/python-pexpect/Config.in"
source "package/python-pickleshare/Config.in"
source "package/python-pillow/Config.in"
+ source "package/python-pip/Config.in"
source "package/python-portend/Config.in"
source "package/python-posix-ipc/Config.in"
source "package/python-priority/Config.in"
@@ -940,6 +964,7 @@ menu "External python modules"
source "package/python-sdnotify/Config.in"
source "package/python-secretstorage/Config.in"
source "package/python-see/Config.in"
+ source "package/python-semver/Config.in"
source "package/python-serial/Config.in"
source "package/python-service-identity/Config.in"
source "package/python-setproctitle/Config.in"
@@ -1293,6 +1318,7 @@ menu "External AngularJS plugins"
endmenu
endif
source "package/bootstrap/Config.in"
+ source "package/duktape/Config.in"
source "package/explorercanvas/Config.in"
source "package/flot/Config.in"
source "package/jquery/Config.in"
@@ -1843,6 +1869,7 @@ endif
source "package/open-plc-utils/Config.in"
source "package/openntpd/Config.in"
source "package/openobex/Config.in"
+ source "package/openresolv/Config.in"
source "package/openssh/Config.in"
source "package/openswan/Config.in"
source "package/openvpn/Config.in"
@@ -1996,6 +2023,7 @@ comment "Utilities"
source "package/sudo/Config.in"
source "package/terminology/Config.in"
source "package/time/Config.in"
+ source "package/tini/Config.in"
source "package/tmux/Config.in"
source "package/which/Config.in"
source "package/xmlstarlet/Config.in"
diff --git a/package/Config.in.host b/package/Config.in.host
index 7838ffc219..3a3578ceeb 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -2,9 +2,11 @@ menu "Host utilities"
source "package/aespipe/Config.in.host"
source "package/android-tools/Config.in.host"
+ source "package/btrfs-progs/Config.in.host"
source "package/cargo/Config.in.host"
source "package/cbootimage/Config.in.host"
source "package/checkpolicy/Config.in.host"
+ source "package/checksec/Config.in.host"
source "package/cmake/Config.in.host"
source "package/cramfs/Config.in.host"
source "package/cryptsetup/Config.in.host"
@@ -55,6 +57,7 @@ menu "Host utilities"
source "package/sam-ba/Config.in.host"
source "package/squashfs/Config.in.host"
source "package/sunxi-tools/Config.in.host"
+ source "package/swig/Config.in.host"
source "package/tegrarcm/Config.in.host"
source "package/ti-cgt-pru/Config.in.host"
source "package/uboot-tools/Config.in.host"
diff --git a/package/Makefile.in b/package/Makefile.in
index 91b3e8f936..abfdb819cf 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -147,29 +147,29 @@ TARGET_CFLAGS_RELRO_FULL = -Wl,-z,now $(TARGET_CFLAGS_RELRO)
TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS))
ifeq ($(BR2_SSP_REGULAR),y)
-TARGET_CPPFLAGS += -fstack-protector
+TARGET_HARDENED += -fstack-protector
else ifeq ($(BR2_SSP_STRONG),y)
-TARGET_CPPFLAGS += -fstack-protector-strong
+TARGET_HARDENED += -fstack-protector-strong
else ifeq ($(BR2_SSP_ALL),y)
-TARGET_CPPFLAGS += -fstack-protector-all
+TARGET_HARDENED += -fstack-protector-all
endif
ifeq ($(BR2_RELRO_PARTIAL),y)
-TARGET_CPPFLAGS += $(TARGET_CFLAGS_RELRO)
+TARGET_HARDENED += $(TARGET_CFLAGS_RELRO)
TARGET_LDFLAGS += $(TARGET_CFLAGS_RELRO)
else ifeq ($(BR2_RELRO_FULL),y)
-TARGET_CPPFLAGS += -fPIE $(TARGET_CFLAGS_RELRO_FULL)
-TARGET_LDFLAGS += -pie
+TARGET_HARDENED += -fPIE $(TARGET_CFLAGS_RELRO_FULL)
+TARGET_LDFLAGS += -pie $(TARGET_CFLAGS_RELRO_FULL)
endif
ifeq ($(BR2_FORTIFY_SOURCE_1),y)
-TARGET_CPPFLAGS += -D_FORTIFY_SOURCE=1
+TARGET_HARDENED += -D_FORTIFY_SOURCE=1
else ifeq ($(BR2_FORTIFY_SOURCE_2),y)
-TARGET_CPPFLAGS += -D_FORTIFY_SOURCE=2
+TARGET_HARDENED += -D_FORTIFY_SOURCE=2
endif
TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
+TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_HARDENED)
TARGET_CXXFLAGS = $(TARGET_CFLAGS)
TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
diff --git a/package/acpid/Config.in b/package/acpid/Config.in
index 2bd83ea8b9..b74e9d2262 100644
--- a/package/acpid/Config.in
+++ b/package/acpid/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_ACPID
bool "acpid"
- depends on BR2_x86_64 || BR2_i386
help
Advanced Configuration and Power Interface event daemon.
diff --git a/package/acpid/acpid.hash b/package/acpid/acpid.hash
index 9cf91d9333..0286219621 100644
--- a/package/acpid/acpid.hash
+++ b/package/acpid/acpid.hash
@@ -1,3 +1,3 @@
# From https://sourceforge.net/projects/acpid2/files/
-md5 0432407b5ff75ae8e08afb43052fde2b acpid-2.0.28.tar.xz
-sha1 a5cb34d53eb6965293c436db23dc81550273975b acpid-2.0.28.tar.xz
+md5 1528040b5d34f8c24ebabd97befbf913 acpid-2.0.30.tar.xz
+sha1 680bbb3fa9cdabb78fb19c6d24bb57224fbbbaed acpid-2.0.30.tar.xz
diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk
index 2141a1a9e0..33e87cf50a 100644
--- a/package/acpid/acpid.mk
+++ b/package/acpid/acpid.mk
@@ -4,7 +4,7 @@
#
################################################################################
-ACPID_VERSION = 2.0.28
+ACPID_VERSION = 2.0.30
ACPID_SOURCE = acpid-$(ACPID_VERSION).tar.xz
ACPID_SITE = http://downloads.sourceforge.net/project/acpid2
ACPID_LICENSE = GPL-2.0+
diff --git a/package/alljoyn/Config.in b/package/alljoyn/Config.in
index 6eb417daf8..781d91bbe9 100644
--- a/package/alljoyn/Config.in
+++ b/package/alljoyn/Config.in
@@ -7,7 +7,6 @@ config BR2_PACKAGE_ALLJOYN
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_WCHAR
select BR2_PACKAGE_LIBCAP
- select BR2_PACKAGE_OPENSSL
help
The AllJoyn framework defines a common way for devices and
apps to communicate with one another regardless of brands,
diff --git a/package/alljoyn/alljoyn.mk b/package/alljoyn/alljoyn.mk
index 69d5dedc41..1281674e38 100644
--- a/package/alljoyn/alljoyn.mk
+++ b/package/alljoyn/alljoyn.mk
@@ -11,11 +11,9 @@ ALLJOYN_SITE = https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_REV)
# See https://allseenalliance.org/alliance/ip-policy
ALLJOYN_LICENSE = ISC
-ALLJOYN_DEPENDENCIES = host-scons libcap openssl
+ALLJOYN_DEPENDENCIES = host-scons libcap
ALLJOYN_INSTALL_STAGING = YES
-ALLJOYN_CRYPTO = openssl
-
# AllJoyn can be compiled in debug or release mode. By default, AllJoyn is built
# in debug mode.
ALLJOYN_VARIANT = release
@@ -39,7 +37,7 @@ ALLJOYN_SCONS_OPTS = \
CPU=$(ALLJOYN_CPU) \
VARIANT=$(ALLJOYN_VARIANT) \
BR=off \
- CRYPTO=$(ALLJOYN_CRYPTO) \
+ CRYPTO=builtin \
BINDINGS=$(ALLJOYN_BINDINGS) \
TARGET_CFLAGS="$(TARGET_CFLAGS)" \
TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
diff --git a/package/asterisk/0007-res_srtp-Add-support-for-libsrtp2-with-AES-GCM.patch b/package/asterisk/0007-res_srtp-Add-support-for-libsrtp2-with-AES-GCM.patch
new file mode 100644
index 0000000000..65ebe06582
--- /dev/null
+++ b/package/asterisk/0007-res_srtp-Add-support-for-libsrtp2-with-AES-GCM.patch
@@ -0,0 +1,171 @@
+From 95b45d1c46b35232ee0b9bdb3135b080c164c7c6 Mon Sep 17 00:00:00 2001
+From: Alexander Traud <pabstraud@compuserve.com>
+Date: Wed, 18 Oct 2017 10:30:25 +0200
+Subject: [PATCH] res_srtp: Add support for libsrtp2 with AES-GCM.
+
+Beside allowing AES-GCM again, this adds AES-192 again.
+
+ASTERISK-27356
+
+Change-Id: Ia97a435faf26300335d9552fa676b5d17e5f7233
+[yann.morin.1998@free.fr: backport from upstream]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+ configure | 104 +++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 1 +
+ res/srtp/srtp_compat.h | 12 ++++++
+ 3 files changed, 117 insertions(+)
+
+diff --git a/configure b/configure
+index 59bc3b10b1..588fbfd0be 100755
+--- a/configure
++++ b/configure
+@@ -33793,6 +33793,110 @@ fi
+
+
+
++if test "x${PBX_SRTP_192}" != "x1" -a "${USE_SRTP_192}" != "no"; then
++ pbxlibdir=""
++ # if --with-SRTP_192=DIR has been specified, use it.
++ if test "x${SRTP_192_DIR}" != "x"; then
++ if test -d ${SRTP_192_DIR}/lib; then
++ pbxlibdir="-L${SRTP_192_DIR}/lib"
++ else
++ pbxlibdir="-L${SRTP_192_DIR}"
++ fi
++ fi
++ pbxfuncname="srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80"
++ if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
++ AST_SRTP_192_FOUND=yes
++ else
++ ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
++ CFLAGS="${CFLAGS} "
++ as_ac_Lib=`$as_echo "ac_cv_lib_srtp2_${pbxfuncname}" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp2" >&5
++$as_echo_n "checking for ${pbxfuncname} in -lsrtp2... " >&6; }
++if eval \${$as_ac_Lib+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsrtp2 ${pbxlibdir} $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char ${pbxfuncname} ();
++int
++main ()
++{
++return ${pbxfuncname} ();
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ eval "$as_ac_Lib=yes"
++else
++ eval "$as_ac_Lib=no"
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++eval ac_res=\$$as_ac_Lib
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
++ AST_SRTP_192_FOUND=yes
++else
++ AST_SRTP_192_FOUND=no
++fi
++
++ CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
++ fi
++
++ # now check for the header.
++ if test "${AST_SRTP_192_FOUND}" = "yes"; then
++ SRTP_192_LIB="${pbxlibdir} -lsrtp2 "
++ # if --with-SRTP_192=DIR has been specified, use it.
++ if test "x${SRTP_192_DIR}" != "x"; then
++ SRTP_192_INCLUDE="-I${SRTP_192_DIR}/include"
++ fi
++ SRTP_192_INCLUDE="${SRTP_192_INCLUDE} "
++ if test "x" = "x" ; then # no header, assume found
++ SRTP_192_HEADER_FOUND="1"
++ else # check for the header
++ ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
++ CPPFLAGS="${CPPFLAGS} ${SRTP_192_INCLUDE}"
++ ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default"
++if test "x$ac_cv_header_" = xyes; then :
++ SRTP_192_HEADER_FOUND=1
++else
++ SRTP_192_HEADER_FOUND=0
++fi
++
++
++ CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
++ fi
++ if test "x${SRTP_192_HEADER_FOUND}" = "x0" ; then
++ SRTP_192_LIB=""
++ SRTP_192_INCLUDE=""
++ else
++ if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
++ SRTP_192_LIB=""
++ fi
++ PBX_SRTP_192=1
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_SRTP_192 1
++_ACEOF
++
++ fi
++ fi
++fi
++
++
++
+ if test "x${PBX_SRTP_GCM}" != "x1" -a "${USE_SRTP_GCM}" != "no"; then
+ pbxlibdir=""
+ # if --with-SRTP_GCM=DIR has been specified, use it.
+diff --git a/configure.ac b/configure.ac
+index 9f95786e11..c729b94aba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2520,6 +2520,7 @@ AST_EXT_LIB_CHECK_SHARED([SRTP], [srtp2], [srtp_init], [srtp2/srtp.h], [], [], [
+ if test "x$PBX_SRTP" = x1;
+ then
+ AST_EXT_LIB_CHECK([SRTP_256], [srtp2], [srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80])
++ AST_EXT_LIB_CHECK([SRTP_192], [srtp2], [srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80])
+ AST_EXT_LIB_CHECK([SRTP_GCM], [srtp2], [srtp_crypto_policy_set_aes_gcm_128_8_auth])
+ AST_EXT_LIB_CHECK([SRTP_SHUTDOWN], [srtp2], [srtp_shutdown], [srtp2/srtp.h])
+
+diff --git a/res/srtp/srtp_compat.h b/res/srtp/srtp_compat.h
+index 56ffca1cc2..dbd8ddee0f 100644
+--- a/res/srtp/srtp_compat.h
++++ b/res/srtp/srtp_compat.h
+@@ -16,6 +16,18 @@
+ #define crypto_policy_set_aes_gcm_128_8_auth srtp_crypto_policy_set_aes_gcm_128_8_auth
+ #define crypto_policy_set_aes_gcm_256_8_auth srtp_crypto_policy_set_aes_gcm_256_8_auth
+
++#if defined(SRTP_AES_GCM_128_KEY_LEN_WSALT)
++#define AES_128_GCM_KEYSIZE_WSALT SRTP_AES_GCM_128_KEY_LEN_WSALT
++#else
++#define AES_128_GCM_KEYSIZE_WSALT SRTP_AES_128_GCM_KEYSIZE_WSALT
++#endif
++
++#if defined(SRTP_AES_GCM_256_KEY_LEN_WSALT)
++#define AES_256_GCM_KEYSIZE_WSALT SRTP_AES_GCM_256_KEY_LEN_WSALT
++#else
++#define AES_256_GCM_KEYSIZE_WSALT SRTP_AES_256_GCM_KEYSIZE_WSALT
++#endif
++
+ #define err_status_t srtp_err_status_t
+ #define err_status_ok srtp_err_status_ok
+ #define err_status_fail srtp_err_status_fail
+--
+2.14.1
+
diff --git a/package/atop/0001-Include-sysmacros.h-to-compile-with-newer-gcc.patch b/package/atop/0001-Include-sysmacros.h-to-compile-with-newer-gcc.patch
new file mode 100644
index 0000000000..a80be7b736
--- /dev/null
+++ b/package/atop/0001-Include-sysmacros.h-to-compile-with-newer-gcc.patch
@@ -0,0 +1,52 @@
+From 414127c03669b4eedc85778a7bff80cf601311d8 Mon Sep 17 00:00:00 2001
+From: SjonHortensius <SjonHortensius@users.noreply.github.com>
+Date: Fri, 24 Aug 2018 18:26:58 +0200
+Subject: [PATCH] Include sysmacros.h to compile with newer gcc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Older gcc throws a warning
+```
+photosyst.c: In function 'lvmmapname':
+photosyst.c:1465:13: warning: In the GNU C Library, "major" is defined
+ by <sys/sysmacros.h>. For historical compatibility, it is
+ currently defined by <sys/types.h> as well, but we plan to
+ remove this soon. To use "major", include <sys/sysmacros.h>
+ directly. If you did not intend to use a system-defined macro
+ "major", you should undefine it after including <sys/types.h>.
+ dmp->major = major(statbuf.st_rdev);
+```
+
+Newer gcc throws an error:
+
+```
+photosyst.c: In function ‘lvmmapname’:
+photosyst.c:1482:19: error: called object ‘major’ is not a function or function pointer
+ dmp->major = major(statbuf.st_rdev);
+ ^~~~~
+photosyst.c:1437:25: note: declared here
+ lvmmapname(unsigned int major, unsigned int minor,
+ ~~~~~~~~~~~~~^~~~~
+```
+
+Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
+---
+ photosyst.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/photosyst.c b/photosyst.c
+index 19cbbe1..50841a1 100644
+--- a/photosyst.c
++++ b/photosyst.c
+@@ -152,6 +152,7 @@
+ static const char rcsid[] = "$Id: photosyst.c,v 1.38 2010/11/19 07:40:40 gerlof Exp $";
+
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+--
+2.17.1
+
diff --git a/package/blktrace/Config.in b/package/blktrace/Config.in
index dedfa03f03..d40c968243 100644
--- a/package/blktrace/Config.in
+++ b/package/blktrace/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_BLKTRACE
bool "blktrace"
- depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep()
depends on BR2_USE_MMU # system()
select BR2_PACKAGE_LIBAIO
@@ -13,5 +12,4 @@ config BR2_PACKAGE_BLKTRACE
comment "blktrace needs a toolchain w/ NPTL"
depends on BR2_USE_MMU
- depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
diff --git a/package/boost/boost.hash b/package/boost/boost.hash
index fb1eb4291f..f3322aed98 100644
--- a/package/boost/boost.hash
+++ b/package/boost/boost.hash
@@ -1,5 +1,5 @@
-# From http://www.boost.org/users/history/version_1_67_0.html
-sha256 2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba boost_1_67_0.tar.bz2
+# From http://www.boost.org/users/history/version_1_68_0.html
+sha256 7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7 boost_1_68_0.tar.bz2
# Locally computed
sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index b2605a70b7..0adad89297 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -4,7 +4,7 @@
#
################################################################################
-BOOST_VERSION = 1.67.0
+BOOST_VERSION = 1.68.0
BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2
BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
BOOST_INSTALL_STAGING = YES
diff --git a/package/botan/0001-remove-mips64-explicit-mabi.patch b/package/botan/0001-remove-mips64-explicit-mabi.patch
index 3fddd54e9a..9c9317755a 100644
--- a/package/botan/0001-remove-mips64-explicit-mabi.patch
+++ b/package/botan/0001-remove-mips64-explicit-mabi.patch
@@ -3,15 +3,17 @@ Remove explicit mips64 -mabi parameter
This breaks when building for n32 ABI on mips64.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+[Bernd: rebased for botan-2.7.0]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
diff -Nuar Botan-1.10.8-orig/src/build-data/cc/gcc.txt Botan-1.10.8/src/build-data/cc/gcc.txt
--- Botan-1.10.8-orig/src/build-data/cc/gcc.txt 2014-04-10 17:11:44.000000000 +0300
+++ Botan-1.10.8/src/build-data/cc/gcc.txt 2014-10-23 09:20:34.506722323 +0300
-@@ -92,7 +92,6 @@
- # The 'linking' bit means "use this for both compiling *and* linking"
- <mach_abi_linking>
- x86_64 -> "-m64"
+@@ -83,7 +83,6 @@
+
+ openmp -> "-fopenmp"
+
-mips64 -> "-mabi=64"
s390 -> "-m31"
s390x -> "-m64"
diff --git a/package/botan/Config.in b/package/botan/Config.in
index 733dc8965a..6fe818bc6d 100644
--- a/package/botan/Config.in
+++ b/package/botan/Config.in
@@ -8,6 +8,7 @@ config BR2_PACKAGE_BOTAN_ARCH_SUPPORTS
config BR2_PACKAGE_BOTAN
bool "botan"
depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS
help
@@ -15,6 +16,7 @@ config BR2_PACKAGE_BOTAN
http://botan.randombit.net
-comment "botan needs a toolchain w/ C++, threads"
- depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
+comment "botan needs a toolchain w/ C++, threads, gcc >= 4.8"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \
+ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS
diff --git a/package/botan/botan.hash b/package/botan/botan.hash
index 3d46a13584..eeb94145b9 100644
--- a/package/botan/botan.hash
+++ b/package/botan/botan.hash
@@ -1,2 +1,4 @@
-# Locally calculated after checking pgp signature
-sha256 6c5472401d06527e87adcb53dd270f3c9b1fb688703b04dd7a7cfb86289efe52 Botan-1.10.16.tgz
+# From https://botan.randombit.net/releases/sha256sums.txt
+sha256 e42df91556317588c6ca0e41bf796f9bd5ec5c70e0668e6c97c608c697c24a90 Botan-2.7.0.tgz
+# Locally computed
+sha256 40cfd35a9e34d18463806f57553c968fdbaf254a2e2a636d1d8e32ff6b698495 license.txt
diff --git a/package/botan/botan.mk b/package/botan/botan.mk
index e42bb61cbe..39a2c4c72b 100644
--- a/package/botan/botan.mk
+++ b/package/botan/botan.mk
@@ -4,11 +4,11 @@
#
################################################################################
-BOTAN_VERSION = 1.10.16
+BOTAN_VERSION = 2.7.0
BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tgz
BOTAN_SITE = http://botan.randombit.net/releases
BOTAN_LICENSE = BSD-2-Clause
-BOTAN_LICENSE_FILES = doc/license.txt
+BOTAN_LICENSE_FILES = license.txt
BOTAN_INSTALL_STAGING = YES
@@ -19,8 +19,30 @@ BOTAN_CONF_OPTS = \
--cc-bin="$(TARGET_CXX)" \
--prefix=/usr
-ifeq ($(BR2_STATIC_LIBS),y)
-BOTAN_CONF_OPTS += --disable-shared --no-autoload
+ifeq ($(BR2_SHARED_LIBS),y)
+BOTAN_CONF_OPTS += \
+ --disable-static-library \
+ --enable-shared-library
+else ifeq ($(BR2_STATIC_LIBS),y)
+BOTAN_CONF_OPTS += \
+ --disable-shared-library \
+ --enable-static-library \
+ --no-autoload
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+BOTAN_CONF_OPTS += \
+ --enable-shared-library \
+ --enable-static-library
+endif
+
+ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y)
+BOTAN_CONF_OPTS += --with-stack-protector
+else
+BOTAN_CONF_OPTS += --without-stack-protector
+endif
+
+ifeq ($(BR2_PACKAGE_BOOST),y)
+BOTAN_DEPENDENCIES += boost
+BOTAN_CONF_OPTS += --with-boost
endif
ifeq ($(BR2_PACKAGE_BZIP2),y)
@@ -28,24 +50,27 @@ BOTAN_DEPENDENCIES += bzip2
BOTAN_CONF_OPTS += --with-bzip2
endif
-ifeq ($(BR2_PACKAGE_GMP),y)
-BOTAN_DEPENDENCIES += gmp
-BOTAN_CONF_OPTS += --with-gnump
-endif
-
ifeq ($(BR2_PACKAGE_OPENSSL),y)
BOTAN_DEPENDENCIES += openssl
BOTAN_CONF_OPTS += --with-openssl
endif
+ifeq ($(BR2_PACKAGE_SQLITE),y)
+BOTAN_DEPENDENCIES += sqlite
+BOTAN_CONF_OPTS += --with-sqlite
+endif
+
+ifeq ($(BR2_PACKAGE_XZ),y)
+BOTAN_DEPENDENCIES += xz
+BOTAN_CONF_OPTS += --with-lzma
+endif
+
ifeq ($(BR2_PACKAGE_ZLIB),y)
BOTAN_DEPENDENCIES += zlib
BOTAN_CONF_OPTS += --with-zlib
endif
-ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
-BOTAN_CONF_OPTS += --enable-altivec
-else
+ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),)
BOTAN_CONF_OPTS += --disable-altivec
endif
diff --git a/package/btrfs-progs/Config.in b/package/btrfs-progs/Config.in
index ad86bab580..35dfc39193 100644
--- a/package/btrfs-progs/Config.in
+++ b/package/btrfs-progs/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_BTRFS_PROGS
bool "btrfs-progs"
depends on BR2_USE_MMU # util-linux
depends on BR2_TOOLCHAIN_HAS_THREADS
- select BR2_PACKAGE_E2FSPROGS
select BR2_PACKAGE_LZO
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
diff --git a/package/btrfs-progs/Config.in.host b/package/btrfs-progs/Config.in.host
new file mode 100644
index 0000000000..cdcd2e4ec4
--- /dev/null
+++ b/package/btrfs-progs/Config.in.host
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HOST_BTRFS_PROGS
+ bool "host btrfs-progs"
+ help
+ Btrfs filesystem utilities
+
+ https://btrfs.wiki.kernel.org/index.php/Main_Page
diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash
index 71793d1c68..07d55ec332 100644
--- a/package/btrfs-progs/btrfs-progs.hash
+++ b/package/btrfs-progs/btrfs-progs.hash
@@ -1,5 +1,5 @@
# From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc
-sha256 013403fb67b17975b21408fa9eb7523b0ecf94f84f8a4397cf972e8e254d2246 btrfs-progs-v4.16.1.tar.xz
+sha256 bf0b34f1538c0b6e88f959937b0419678cadbf2ba7044336dcbfb2bcdc28cd74 btrfs-progs-v4.17.1.tar.xz
# Locally computed
sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING
sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 libbtrfsutil/COPYING
diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk
index b4cc839352..585dcf364c 100644
--- a/package/btrfs-progs/btrfs-progs.mk
+++ b/package/btrfs-progs/btrfs-progs.mk
@@ -4,10 +4,10 @@
#
################################################################################
-BTRFS_PROGS_VERSION = 4.16.1
+BTRFS_PROGS_VERSION = 4.17.1
BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs
BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz
-BTRFS_PROGS_DEPENDENCIES = host-pkgconf e2fsprogs lzo util-linux zlib
+BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib
BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-zstd --disable-python
BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-3.0+ (libbtrfsutil)
BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING \
@@ -21,4 +21,22 @@ BTRFS_PROGS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-static
BTRFS_PROGS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-static
endif
+# convert also supports conversion from reiserfs, which needs some
+# reiserfs libraries, but we have no package for them in Buildroot, so
+# we keep things simple and only handle ext2.
+ifeq ($(BR2_PACKAGE_E2FSPROGS),y)
+BTRFS_PROGS_CONF_OPTS += --enable-convert --with-convert=ext2
+BTRFS_PROGS_DEPENDENCIES += e2fsprogs
+else
+BTRFS_PROGS_CONF_OPTS += --disable-convert
+endif
+
+HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib
+HOST_BTRFS_PROGS_CONF_OPTS = \
+ --disable-backtrace \
+ --disable-zstd \
+ --disable-python \
+ --disable-convert
+
$(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/package/c-periphery/c-periphery.hash b/package/c-periphery/c-periphery.hash
index 524925ff97..745e44a71c 100644
--- a/package/c-periphery/c-periphery.hash
+++ b/package/c-periphery/c-periphery.hash
@@ -1,2 +1,3 @@
# Locally calculated
-sha256 c6cfaae7496ff6500b747106571de6b4ca7d80a383297e592ffcfa3413b66321 c-periphery-v1.1.1.tar.gz
+sha256 50665a4f298b30e4cc8f7dbd38362fd860cc3746803d00325cb04806674e3166 c-periphery-v1.1.3.tar.gz
+sha256 6b5669a90260126f0600aae98cb10fb5e219269dc9cbd0137f63927b96d5c31d LICENSE
diff --git a/package/c-periphery/c-periphery.mk b/package/c-periphery/c-periphery.mk
index 359c860e89..df26105541 100644
--- a/package/c-periphery/c-periphery.mk
+++ b/package/c-periphery/c-periphery.mk
@@ -4,7 +4,7 @@
#
################################################################################
-C_PERIPHERY_VERSION = v1.1.1
+C_PERIPHERY_VERSION = v1.1.3
C_PERIPHERY_SITE = $(call github,vsergeev,c-periphery,$(C_PERIPHERY_VERSION))
C_PERIPHERY_INSTALL_STAGING = YES
# only a static library
diff --git a/package/ccache/0001-Convert-argument-to-sysroot-option-to-relative-path.patch b/package/ccache/0001-Convert-argument-to-sysroot-option-to-relative-path.patch
deleted file mode 100644
index 33db7d480f..0000000000
--- a/package/ccache/0001-Convert-argument-to-sysroot-option-to-relative-path.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From fe42d6f7b739e8d42811bf46bcccfafa728847a2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mathias=20De=20Mar=C3=A9?= <mathias.de_mare@nokia.com>
-Date: Mon, 19 Sep 2016 10:38:13 +0200
-Subject: [PATCH] Convert argument to '--sysroot' option to relative path
-
-Previously, only the argument to '--sysroot=' was converted.
-This changeset adds support for '--sysroot'.
-
-Signed-off-by: Brandon Maier <brandon.maier@rockwellcollins.com>
-Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
----
- ccache.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/ccache.c b/ccache.c
-index 8ffadcc..76139b9 100644
---- a/ccache.c
-+++ b/ccache.c
-@@ -2407,6 +2407,21 @@ cc_process_args(struct args *args, struct args **preprocessor_args,
- free(option);
- continue;
- }
-+ // Alternate form of specifying sysroot without =
-+ if (str_eq(argv[i], "--sysroot")) {
-+ if (i == argc-1) {
-+ cc_log("Missing argument to %s", argv[i]);
-+ stats_update(STATS_ARGS);
-+ result = false;
-+ goto out;
-+ }
-+ args_add(stripped_args, argv[i]);
-+ char *relpath = make_relative_path(x_strdup(argv[i+1]));
-+ args_add(stripped_args, relpath);
-+ i++;
-+ free(relpath);
-+ continue;
-+ }
- if (str_startswith(argv[i], "-Wp,")) {
- if (str_eq(argv[i], "-Wp,-P")
- || strstr(argv[i], ",-P,")
---
-2.8.3
-
diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash
index c22394b13b..5ed5037ed0 100644
--- a/package/ccache/ccache.hash
+++ b/package/ccache/ccache.hash
@@ -1,3 +1,4 @@
-# Verified key https://samba.org/ftp/ccache/ccache-3.3.4.tar.xz.asc - sha256 computed locally
-sha256 24f15bf389e38c41548c9c259532187774ec0cb9686c3497bbb75504c8dc404f ccache-3.3.4.tar.xz
-sha256 190576a6e938760ec8113523e6fd380141117303e90766cc4802e770422b30c6 ccache-3.3.5.tar.xz
+# sha256 computed locally
+sha256 18a8b14367d63d3d37fb6c33cba60e1b7fcd7a63d608df97c9771ae0d234fee2 ccache-3.4.2.tar.xz
+sha256 ec6b1a326ff93b2cc21df88a697ae470ff6927a55b8929e7e491b315e1563361 GPL-3.0.txt
+sha256 853e071acb730ca933860a0acf4e44e5dc4bffed6b09503bbcf878e343addcc5 LICENSE.adoc
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index 9a11d46d30..851939ebda 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -4,11 +4,11 @@
#
################################################################################
-CCACHE_VERSION = 3.3.5
+CCACHE_VERSION = 3.4.2
CCACHE_SITE = https://www.samba.org/ftp/ccache
CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
CCACHE_LICENSE = GPL-3.0+, others
-CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt
+CCACHE_LICENSE_FILES = LICENSE.adoc GPL-3.0.txt
# Force ccache to use its internal zlib. The problem is that without
# this, ccache would link against the zlib of the build system, but we
@@ -38,8 +38,8 @@ HOST_CCACHE_CONF_ENV = \
HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,\%s/%,$(BR_CACHE_DIR))
define HOST_CCACHE_PATCH_CONFIGURATION
- sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/ccache.c
- sed -i 's,"%s/.ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/conf.c
+ sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/ccache.c
+ sed -i 's,"%s/.ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/conf.c
endef
HOST_CCACHE_POST_PATCH_HOOKS += HOST_CCACHE_PATCH_CONFIGURATION
diff --git a/package/checksec/0001-checksec-Fixed-issue-with-relative-path.patch b/package/checksec/0001-checksec-Fixed-issue-with-relative-path.patch
new file mode 100644
index 0000000000..3ed75a3c34
--- /dev/null
+++ b/package/checksec/0001-checksec-Fixed-issue-with-relative-path.patch
@@ -0,0 +1,43 @@
+From b48a2dfae26fa3b4af8e65fb5953b3caf62c137b Mon Sep 17 00:00:00 2001
+From: Paresh Chaudhary <paresh.chaudhary@rockwellcollins.com>
+Date: Mon, 21 May 2018 14:34:23 -0500
+Subject: [PATCH] checksec: Fixed issue with relative path
+
+Before this patch, the checksec script was not able to find existing
+directories when the user passed a relative path with --dir/-d,
+the script aborted with a "No such file or directory". The same error
+was reported when the script was executed through a relative path.
+
+https://github.com/slimm609/checksec.sh/issues/54
+
+Signed-off-by: Paresh Chaudhary <paresh.chaudhary@rockwellcollins.com>
+Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
+---
+ checksec | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/checksec b/checksec
+index 24b521f..baf8d63 100755
+--- a/checksec
++++ b/checksec
+@@ -1193,7 +1193,7 @@ do
+ echo_message "RELRO STACK CANARY NX PIE RPATH RUNPATH FORTIFY Checked Total Filename\n" '' "<dir name='$tempdir'>\n" "{ \"dir\": { \"name\":\"$tempdir\" },"
+ fdircount=0
+ fdirtotal=0
+- for N in $(find $tempdir -type f); do
++ for N in $(find . -type f); do
+ if [[ "$N" != "[A-Za-z1-0]*" ]]; then
+ out=$(file "$N")
+ if [[ $out =~ ELF ]] ; then
+@@ -1201,7 +1201,7 @@ do
+ fi
+ fi
+ done
+- for N in $(find $tempdir -type f); do
++ for N in $(find . -type f); do
+ if [[ "$N" != "[A-Za-z1-0]*" ]]; then
+ # read permissions?
+ if [[ ! -r "$N" ]]; then
+--
+1.9.1
+
diff --git a/package/checksec/Config.in.host b/package/checksec/Config.in.host
new file mode 100644
index 0000000000..e4e8903b48
--- /dev/null
+++ b/package/checksec/Config.in.host
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_HOST_CHECKSEC
+ bool "host checksec"
+ help
+ This tool provides a shell script to check the
+ properties of executables
+ (PIE,RELRO,Stack Canaries,Fortify Source).
+ It also has a kernel test mode that can run on target
+ for testing of PaX, ASLR, heap and config hardening.
+
+ NOTE: when using this tool as a host tool, the tool
+ can offline check a target folder of elf files for
+ hardening features enabled in those elf files. There
+ are other features of this tool, like the kernel test
+ feature that are not functional offline, but require the
+ user to execute in a chroot or on target.
+
+ https://github.com/slimm609/checksec.sh.git
diff --git a/package/checksec/checksec.hash b/package/checksec/checksec.hash
new file mode 100644
index 0000000000..e3d1ffd5d1
--- /dev/null
+++ b/package/checksec/checksec.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 510b0b0528f15d0bf13fa1ae7140d2b9fc9261323c98ff76c011bef475a69c14 checksec-cdefe53eb72e6e8f23308417d2fc6b68cba9dbac.tar.gz
+sha256 c5e2a8e188040fc34eb9362084778a2e25f8d1f888e47a2be09efa7cecd9c70d LICENSE.txt
diff --git a/package/checksec/checksec.mk b/package/checksec/checksec.mk
new file mode 100644
index 0000000000..bfe54c262e
--- /dev/null
+++ b/package/checksec/checksec.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# checksec
+#
+################################################################################
+
+CHECKSEC_VERSION = cdefe53eb72e6e8f23308417d2fc6b68cba9dbac
+CHECKSEC_SITE = $(call github,slimm609,checksec.sh,$(CHECKSEC_VERSION))
+CHECKSEC_LICENSE = BSD-3-Clause
+CHECKSEC_LICENSE_FILES = LICENSE.txt
+
+define HOST_CHECKSEC_INSTALL_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/checksec $(HOST_DIR)/bin/checksec
+endef
+
+$(eval $(host-generic-package))
diff --git a/package/coreutils/coreutils.hash b/package/coreutils/coreutils.hash
index 472cab55f5..d55e25a86f 100644
--- a/package/coreutils/coreutils.hash
+++ b/package/coreutils/coreutils.hash
@@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
-sha256 8891d349ee87b9ff7870f52b6d9312a9db672d2439d289bc57084771ca21656b coreutils-8.27.tar.xz
+sha256 e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057 coreutils-8.30.tar.xz
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 7e7251ff73..3e8efbf047 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -4,7 +4,7 @@
#
################################################################################
-COREUTILS_VERSION = 8.27
+COREUTILS_VERSION = 8.30
COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils
COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz
COREUTILS_LICENSE = GPL-3.0+
diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in
index 7322a4baf6..14b897a8a8 100644
--- a/package/cryptsetup/Config.in
+++ b/package/cryptsetup/Config.in
@@ -8,6 +8,7 @@ config BR2_PACKAGE_CRYPTSETUP
select BR2_PACKAGE_LVM2
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+ select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
select BR2_PACKAGE_JSON_C
help
This tool helps manipulate dm-crypt and luks partitions for
diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash
index 1573d53080..38e8ff9a8a 100644
--- a/package/cryptsetup/cryptsetup.hash
+++ b/package/cryptsetup/cryptsetup.hash
@@ -1,4 +1,4 @@
# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/sha256sums.asc
-sha256 4d6cca04c1f5ff4a68d045d190efb2623087eda0274ded92f92a4b6911e501d4 cryptsetup-2.0.3.tar.xz
+sha256 9d3a3c7033293e0c97f0ad0501fd5b4d4913ae497cbf70cca06633ccc54b5734 cryptsetup-2.0.4.tar.xz
sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING
sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL
diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
index d81aa7b341..dd1ef2e9e0 100644
--- a/package/cryptsetup/cryptsetup.mk
+++ b/package/cryptsetup/cryptsetup.mk
@@ -5,7 +5,7 @@
################################################################################
CRYPTSETUP_VERSION_MAJOR = 2.0
-CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3
+CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).4
CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz
CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR)
CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf json-c \
@@ -14,6 +14,7 @@ CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library)
CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL
CRYPTSETUP_INSTALL_STAGING = YES
CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)"
+CRYPTSETUP_CONF_OPTS += --enable-blkid
# cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL
# or kernel crypto modules instead
@@ -37,7 +38,8 @@ HOST_CRYPTSETUP_DEPENDENCIES = \
host-openssl
HOST_CRYPTSETUP_CONF_OPTS = --with-crypto_backend=openssl \
- --disable-kernel_crypto
+ --disable-kernel_crypto \
+ --enable-blkid
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/dt-utils/0001-common-Rename-strlcpy-to-DT_strlcpy.patch b/package/dt-utils/0001-common-Rename-strlcpy-to-DT_strlcpy.patch
deleted file mode 100644
index 79c43d6a5d..0000000000
--- a/package/dt-utils/0001-common-Rename-strlcpy-to-DT_strlcpy.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 3d229cc0f8dc81335c53b1f7471ef82ef2f6e570 Mon Sep 17 00:00:00 2001
-From: Marcin Niestroj <m.niestroj@grinn-global.com>
-Date: Fri, 23 Jun 2017 11:11:04 +0200
-Subject: [PATCH] common: Rename strlcpy to DT_strlcpy
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-strlcpy function is defined in uClibc library, causing "static
-declaration of ‘strlcpy’ follows non-static declaration" build
-errors.
-
-Rename internal strlcpy function to DT_strlcpy to avoid conflicts.
-
-Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
----
- src/dt/common.h | 4 ++--
- src/libdt.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/dt/common.h b/src/dt/common.h
-index f6bad44..992e28f 100644
---- a/src/dt/common.h
-+++ b/src/dt/common.h
-@@ -168,7 +168,7 @@ static inline char *barebox_asprintf(const char *fmt, ...)
- #define basprintf(fmt, arg...) barebox_asprintf(fmt, ##arg)
-
- /**
-- * strlcpy - Copy a %NUL terminated string into a sized buffer
-+ * DT_strlcpy - Copy a %NUL terminated string into a sized buffer
- * @dest: Where to copy the string to
- * @src: Where to copy the string from
- * @size: size of destination buffer
-@@ -178,7 +178,7 @@ static inline char *barebox_asprintf(const char *fmt, ...)
- * of course, the buffer size is zero). It does not pad
- * out the result like strncpy() does.
- */
--static inline size_t strlcpy(char *dest, const char *src, size_t size)
-+static inline size_t DT_strlcpy(char *dest, const char *src, size_t size)
- {
- size_t ret = strlen(src);
-
-diff --git a/src/libdt.c b/src/libdt.c
-index 4db5160..3adeed2 100644
---- a/src/libdt.c
-+++ b/src/libdt.c
-@@ -1503,7 +1503,7 @@ int of_modalias_node(struct device_node *node, char *modalias, int len)
- if (!compatible || strlen(compatible) > cplen)
- return -ENODEV;
- p = strchr(compatible, ',');
-- strlcpy(modalias, p ? p + 1 : compatible, len);
-+ DT_strlcpy(modalias, p ? p + 1 : compatible, len);
- return 0;
- }
-
---
-2.13.1
-
diff --git a/package/dt-utils/0002-common-Include-sys-types.h-header.patch b/package/dt-utils/0002-common-Include-sys-types.h-header.patch
deleted file mode 100644
index a49d46867b..0000000000
--- a/package/dt-utils/0002-common-Include-sys-types.h-header.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b8bc4e83bf447b6330ece54e94a1684d12ecdd0b Mon Sep 17 00:00:00 2001
-From: Marcin Niestroj <m.niestroj@grinn-global.com>
-Date: Fri, 23 Jun 2017 12:00:30 +0200
-Subject: [PATCH] common: Include sys/types.h header
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Build with musl library fails with following error:
-
-In file included from src/crypto/sha1.c:21:0:
-./src/digest.h:95:10: error: unknown type name ‘ulong’
- ulong start, ulong size);
-...
-
-Fix that by including sys/types.h header in common.h, so ulong type
-is defined with musl library.
-
-Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
----
- src/dt/common.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/dt/common.h b/src/dt/common.h
-index 992e28f..1425c53 100644
---- a/src/dt/common.h
-+++ b/src/dt/common.h
-@@ -13,6 +13,7 @@
-
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-+#include <sys/types.h>
-
- #include <mtd/mtd-abi.h>
-
---
-2.13.1
-
diff --git a/package/dt-utils/dt-utils.hash b/package/dt-utils/dt-utils.hash
new file mode 100644
index 0000000000..0d63b12353
--- /dev/null
+++ b/package/dt-utils/dt-utils.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 a3aae73da39fd46775de390b7babafb63767082da10870c01b6595c4c9762af6 dt-utils-v2018.05.0.tar.gz
+sha256 a45932c79317d15116eadbf1c9c6fc59117ec3c4621db3a876066defa723963b COPYING
diff --git a/package/dt-utils/dt-utils.mk b/package/dt-utils/dt-utils.mk
index 5b1375051e..3dbadc7b9e 100644
--- a/package/dt-utils/dt-utils.mk
+++ b/package/dt-utils/dt-utils.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DT_UTILS_VERSION = v2017.03.0
+DT_UTILS_VERSION = v2018.05.0
DT_UTILS_SITE = https://git.pengutronix.de/git/tools/dt-utils
DT_UTILS_SITE_METHOD = git
DT_UTILS_LICENSE = GPL-2.0
diff --git a/package/duktape/Config.in b/package/duktape/Config.in
new file mode 100644
index 0000000000..5dad5c3e7c
--- /dev/null
+++ b/package/duktape/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_DUKTAPE
+ bool "duktape"
+ depends on !BR2_STATIC_LIBS
+ help
+ Duktape is an embeddable Javascript engine, with a focus on
+ portability and compact footprint.
+
+ Duktape is easy to integrate into a C/C++ project: add
+ duktape.c, duktape.h, and duk_config.h to your build, and use
+ the Duktape API to call Ecmascript functions from C code and
+ vice versa.
+
+ http://www.duktape.org
+
+comment "duktape needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/package/duktape/duktape.hash b/package/duktape/duktape.hash
new file mode 100644
index 0000000000..0a819b4739
--- /dev/null
+++ b/package/duktape/duktape.hash
@@ -0,0 +1,3 @@
+# Locally computed:
+sha256 0df1c0a9d40bfae31733e5c44f0eabaeae59e0a2ebf7693ff68bbabd49aae331 duktape-v2.3.0.tar.gz
+sha256 5358498534dac625c89a69c10becf3dcc40f9af58e6b69ee358ebdf6934f49c6 LICENSE.txt
diff --git a/package/duktape/duktape.mk b/package/duktape/duktape.mk
new file mode 100644
index 0000000000..97b51f94b1
--- /dev/null
+++ b/package/duktape/duktape.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# duktape
+#
+################################################################################
+
+DUKTAPE_VERSION = v2.3.0
+DUKTAPE_SITE = $(call github,svaarala,duktape-releases,$(DUKTAPE_VERSION))
+DUKTAPE_LICENSE = MIT
+DUKTAPE_LICENSE_FILES = LICENSE.txt
+DUKTAPE_INSTALL_STAGING = YES
+
+define DUKTAPE_BUILD_CMDS
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f Makefile.sharedlibrary
+endef
+
+define DUKTAPE_INSTALL_STAGING_CMDS
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f Makefile.sharedlibrary \
+ INSTALL_PREFIX=$(STAGING_DIR)/usr install
+endef
+
+define DUKTAPE_INSTALL_TARGET_CMDS
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f Makefile.sharedlibrary \
+ INSTALL_PREFIX=$(TARGET_DIR)/usr install
+endef
+
+$(eval $(generic-package))
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index efc10d0e99..fecef118ac 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -26,8 +26,9 @@ HOST_E2FSPROGS_CONF_OPTS = \
--disable-fuse2fs \
--disable-libblkid \
--disable-libuuid \
+ --disable-testio-debug \
--enable-symlink-install \
- --disable-testio-debug
+ --enable-elf-shlibs
# Set the binary directories to "/bin" and "/sbin", as busybox does,
# so that we do not end up with two versions of e2fs tools.
diff --git a/package/expat/expat.hash b/package/expat/expat.hash
index 945e102342..6c55972f69 100644
--- a/package/expat/expat.hash
+++ b/package/expat/expat.hash
@@ -1,7 +1,7 @@
-# From https://sourceforge.net/projects/expat/files/expat/2.2.5/
-md5 789e297f547980fc9ecc036f9a070d49 expat-2.2.5.tar.bz2
-sha1 490659abd7d6c6d4cb4e60c945a15fbf081564f6 expat-2.2.5.tar.bz2
+# From https://sourceforge.net/projects/expat/files/expat/2.2.6/
+md5 ca047ae951b40020ac831c28859161b2 expat-2.2.6.tar.bz2
+sha1 c8947fc3119a797b55485f2f7bdaaeb49cc9df01 expat-2.2.6.tar.bz2
# Locally calculated
-sha256 d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6 expat-2.2.5.tar.bz2
+sha256 17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2 expat-2.2.6.tar.bz2
sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 COPYING
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index 69c457da3d..548ec826a0 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -4,7 +4,7 @@
#
################################################################################
-EXPAT_VERSION = 2.2.5
+EXPAT_VERSION = 2.2.6
EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2
EXPAT_INSTALL_STAGING = YES
@@ -13,5 +13,8 @@ HOST_EXPAT_DEPENDENCIES = host-pkgconf
EXPAT_LICENSE = MIT
EXPAT_LICENSE_FILES = COPYING
+EXPAT_CONF_OPTS = --without-docbook
+HOST_EXPAT_CONF_OPTS = --without-docbook
+
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/flatcc/0001-Remove-strncpy-gcc-8-warning-add-flatbuffers_type_ha.patch b/package/flatcc/0001-Remove-strncpy-gcc-8-warning-add-flatbuffers_type_ha.patch
deleted file mode 100644
index 28c0208891..0000000000
--- a/package/flatcc/0001-Remove-strncpy-gcc-8-warning-add-flatbuffers_type_ha.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From c0df0b6fca4fa6bca114bba4df74f1b4e53124c0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mikkel=20Fahn=C3=B8e=20J=C3=B8rgensen?= <mikkel@dvide.com>
-Date: Sat, 9 Jun 2018 11:10:24 +0200
-Subject: [PATCH] Remove strncpy gcc-8 warning, add
- flatbuffers_type_hash_from_string
-
-[baruch: drop CHANGELOG hunk]
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: commit c0df0b6fca4
-
- include/flatcc/flatcc_identifier.h | 21 +++++++++++++++++++
- .../reflection/flatbuffers_common_reader.h | 4 +---
- src/compiler/codegen_c_reader.c | 4 +---
- src/runtime/json_printer.c | 7 +++++--
- src/runtime/verifier.c | 5 ++---
- 6 files changed, 32 insertions(+), 11 deletions(-)
-
-diff --git a/include/flatcc/flatcc_identifier.h b/include/flatcc/flatcc_identifier.h
-index cd918cb42b48..31af3074f4db 100644
---- a/include/flatcc/flatcc_identifier.h
-+++ b/include/flatcc/flatcc_identifier.h
-@@ -77,6 +77,27 @@ static inline flatbuffers_thash_t flatbuffers_type_hash_from_identifier(const fl
- (uint32_t)p[0] + (((uint32_t)p[1]) << 8) + (((uint32_t)p[2]) << 16) + (((uint32_t)p[3]) << 24) : 0;
- }
-
-+/*
-+ * Convert a null terminated string identifier like "MONS" or "X" into a
-+ * native type hash identifier, usually for comparison. This will not
-+ * work with type hash strings because they can contain null bytes.
-+ */
-+static inline flatbuffers_thash_t flatbuffers_type_hash_from_string(const char *identifier)
-+{
-+ flatbuffers_thash_t h = 0;
-+ const uint8_t *p = (const uint8_t *)identifier;
-+
-+ if (!p[0]) return h;
-+ h += p[0];
-+ if (!p[1]) return h;
-+ h += p[1] << 8;
-+ if (!p[2]) return h;
-+ h += p[2] << 16;
-+ /* No need to test for termination here. */
-+ h += p[3] << 24;
-+ return h;
-+}
-+
- /*
- * Computes the little endian wire format of the type hash. It can be
- * used as a file identifer argument to various flatcc buffer calls.
-diff --git a/include/flatcc/reflection/flatbuffers_common_reader.h b/include/flatcc/reflection/flatbuffers_common_reader.h
-index dee44ad653f1..9604052685f6 100644
---- a/include/flatcc/reflection/flatbuffers_common_reader.h
-+++ b/include/flatcc/reflection/flatbuffers_common_reader.h
-@@ -464,9 +464,7 @@ static inline T N ## _ ## NK (N ## _struct_t t__tmp) { return t__tmp ? &(t__tmp-
- /* If fid is null, the function returns true without testing as buffer is not expected to have any id. */
- static inline int flatbuffers_has_identifier(const void *buffer, const char *fid)
- { flatbuffers_thash_t id, id2 = 0; if (fid == 0) { return 1; };
-- strncpy((char *)&id2, fid, sizeof(id2));
-- /* Identifier strings are always considered little endian. */
-- id2 = __flatbuffers_thash_cast_from_le(id2);
-+ id2 = flatbuffers_type_hash_from_string(fid);
- id = __flatbuffers_thash_read_from_pe(((flatbuffers_uoffset_t *)buffer) + 1);
- return id2 == 0 || id == id2; }
- static inline int flatbuffers_has_type_hash(const void *buffer, flatbuffers_thash_t thash)
-diff --git a/src/compiler/codegen_c_reader.c b/src/compiler/codegen_c_reader.c
-index e3df74754344..559731050a15 100644
---- a/src/compiler/codegen_c_reader.c
-+++ b/src/compiler/codegen_c_reader.c
-@@ -748,9 +748,7 @@ static void gen_helpers(fb_output_t *out)
- "/* If fid is null, the function returns true without testing as buffer is not expected to have any id. */\n"
- "static inline int %shas_identifier(const void *buffer, const char *fid)\n"
- "{ %sthash_t id, id2 = 0; if (fid == 0) { return 1; };\n"
-- " strncpy((char *)&id2, fid, sizeof(id2));\n"
-- " /* Identifier strings are always considered little endian. */\n"
-- " id2 = __%sthash_cast_from_le(id2);\n"
-+ " id2 = %stype_hash_from_string(fid);\n"
- " id = __%sthash_read_from_pe(((%suoffset_t *)buffer) + 1);\n"
- " return id2 == 0 || id == id2; }\n"
- "static inline int %shas_type_hash(const void *buffer, %sthash_t thash)\n"
-diff --git a/src/runtime/json_printer.c b/src/runtime/json_printer.c
-index 8fe248331f43..bc86d21f8f9d 100644
---- a/src/runtime/json_printer.c
-+++ b/src/runtime/json_printer.c
-@@ -20,6 +20,7 @@
-
- #include "flatcc/flatcc_flatbuffers.h"
- #include "flatcc/flatcc_json_printer.h"
-+#include "flatcc/flatcc_identifier.h"
-
- #include "flatcc/portable/pprintint.h"
- #include "flatcc/portable/pprintfp.h"
-@@ -1008,6 +1009,9 @@ void flatcc_json_printer_struct_field(flatcc_json_printer_t *ctx,
- /*
- * Make sure the buffer identifier is valid before assuming the rest of
- * the buffer is sane.
-+ * NOTE: this won't work with type hashes because these can contain
-+ * nulls in the fid string. In this case use null as fid to disable
-+ * check.
- */
- static int accept_header(flatcc_json_printer_t * ctx,
- const void *buf, size_t bufsiz, const char *fid)
-@@ -1020,8 +1024,7 @@ static int accept_header(flatcc_json_printer_t * ctx,
- return 0;
- }
- if (fid != 0) {
-- strncpy((char *)&id2, fid, FLATBUFFERS_IDENTIFIER_SIZE);
-- id2 = __flatbuffers_thash_cast_from_le(id2);
-+ id2 = flatbuffers_type_hash_from_string(fid);
- id = __flatbuffers_thash_read_from_pe((uint8_t *)buf + offset_size);
- if (!(id2 == 0 || id == id2)) {
- RAISE_ERROR(bad_input);
-diff --git a/src/runtime/verifier.c b/src/runtime/verifier.c
-index 68dbc1b6fb0b..3b7c68cca4d7 100644
---- a/src/runtime/verifier.c
-+++ b/src/runtime/verifier.c
-@@ -10,6 +10,7 @@
- #include "flatcc/flatcc_rtconfig.h"
- #include "flatcc/flatcc_flatbuffers.h"
- #include "flatcc/flatcc_verifier.h"
-+#include "flatcc/flatcc_identifier.h"
-
- /* Customization for testing. */
- #if FLATCC_DEBUG_VERIFY
-@@ -110,9 +111,7 @@ static inline uoffset_t read_uoffset(const void *p, uoffset_t base)
-
- static inline thash_t read_thash_identifier(const char *identifier)
- {
-- flatbuffers_thash_t id = 0;
-- strncpy((char *)&id, identifier, sizeof(id));
-- return __flatbuffers_thash_cast_from_le(id);
-+ return flatbuffers_type_hash_from_string(identifier);
- }
-
- static inline thash_t read_thash(const void *p, uoffset_t base)
---
-2.17.1
-
diff --git a/package/flatcc/flatcc.hash b/package/flatcc/flatcc.hash
index 357d8b707d..b517250472 100644
--- a/package/flatcc/flatcc.hash
+++ b/package/flatcc/flatcc.hash
@@ -1,2 +1,3 @@
# Locally calculated
-sha256 8c4560ca32e3c555716d9363bed469e2c60e0f443ec32bc08e7abfe681e25ca9 flatcc-v0.5.1.tar.gz
+sha256 02dac93d3daf8d0a290aa8711a9b8a53f047436ec5331adb1972389061ec6615 flatcc-v0.5.2.tar.gz
+sha256 c8f0d9c1f92c658d87ebd854ee7447a3d3912d2c3a5c78c117787be5d5da8af3 LICENSE
diff --git a/package/flatcc/flatcc.mk b/package/flatcc/flatcc.mk
index 55356445a2..9f961a37b1 100644
--- a/package/flatcc/flatcc.mk
+++ b/package/flatcc/flatcc.mk
@@ -4,7 +4,7 @@
#
################################################################################
-FLATCC_VERSION = v0.5.1
+FLATCC_VERSION = v0.5.2
FLATCC_SITE = $(call github,dvidelabs,flatcc,$(FLATCC_VERSION))
FLATCC_LICENSE = Apache-2.0
FLATCC_LICENSE_FILES = LICENSE
diff --git a/package/fmt/fmt.hash b/package/fmt/fmt.hash
index 47087a4175..78665d2fa7 100644
--- a/package/fmt/fmt.hash
+++ b/package/fmt/fmt.hash
@@ -1,2 +1,3 @@
# Locally calculated
-sha256 35300a0d356529447a79ed5ccf419239d8b34f916e5d4625f046fd37afa3650a fmt-4.0.0.tar.gz
+sha256 73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44 fmt-5.1.0.tar.gz
+sha256 560d39617dfb4b4e4088597291a070ed6c3a8d67668114ed475c673430c3e49a LICENSE.rst
diff --git a/package/fmt/fmt.mk b/package/fmt/fmt.mk
index c47b03e834..39fd7e22d9 100644
--- a/package/fmt/fmt.mk
+++ b/package/fmt/fmt.mk
@@ -4,7 +4,7 @@
#
################################################################################
-FMT_VERSION = 4.0.0
+FMT_VERSION = 5.1.0
FMT_SITE = $(call github,fmtlib,fmt,$(FMT_VERSION))
FMT_LICENSE = BSD-2-Clause
FMT_LICENSE_FILES = LICENSE.rst
diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
index 30e71b825f..95c0aab08c 100644
--- a/package/freescale-imx/Config.in
+++ b/package/freescale-imx/Config.in
@@ -65,6 +65,10 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 || \
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
+config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO
+ bool
+ default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M
+
config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU
bool
default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q || \
@@ -80,6 +84,7 @@ source "package/freescale-imx/imx-m4fwloader/Config.in"
source "package/freescale-imx/imx-parser/Config.in"
source "package/freescale-imx/imx-uuc/Config.in"
source "package/freescale-imx/imx-vpu/Config.in"
+source "package/freescale-imx/imx-vpu-hantro/Config.in"
source "package/freescale-imx/imx-vpuwrap/Config.in"
source "package/freescale-imx/firmware-imx/Config.in"
if (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53)
diff --git a/package/freescale-imx/imx-codec/imx-codec.hash b/package/freescale-imx/imx-codec/imx-codec.hash
index 53d8f71c39..8dab5a5c4c 100644
--- a/package/freescale-imx/imx-codec/imx-codec.hash
+++ b/package/freescale-imx/imx-codec/imx-codec.hash
@@ -1,2 +1,4 @@
# locally computed
-sha256 20d3f9b4187fcd9e7007c94558a00bab1191513eee74b6f0d8c7b43f874e06ed imx-codec-4.2.1.bin
+sha256 6bb54f91c3ca18567e14d95d3858022dc9be00dc86e9edfdb544d1240a3b2b04 imx-codec-4.3.5.bin
+sha256 78696664f7afe7f2b081c99af60082d6403fab935b1b10056ed41aec123ff7fa COPYING
+sha256 fc93f26e4197b9240c327ce26ae6e02123f022423d4704c7b0448a37372cf2a2 EULA
diff --git a/package/freescale-imx/imx-codec/imx-codec.mk b/package/freescale-imx/imx-codec/imx-codec.mk
index 784c1fa4a9..1ec701d2f1 100644
--- a/package/freescale-imx/imx-codec/imx-codec.mk
+++ b/package/freescale-imx/imx-codec/imx-codec.mk
@@ -4,7 +4,7 @@
#
################################################################################
-IMX_CODEC_VERSION = 4.2.1
+IMX_CODEC_VERSION = 4.3.5
IMX_CODEC_SITE = $(FREESCALE_IMX_SITE)
IMX_CODEC_SOURCE = imx-codec-$(IMX_CODEC_VERSION).bin
IMX_CODEC_INSTALL_STAGING = YES
diff --git a/package/freescale-imx/imx-parser/imx-parser.hash b/package/freescale-imx/imx-parser/imx-parser.hash
index 3266f48110..017d2c2f91 100644
--- a/package/freescale-imx/imx-parser/imx-parser.hash
+++ b/package/freescale-imx/imx-parser/imx-parser.hash
@@ -1,2 +1,4 @@
# locally computed
-sha256 36d3ae7285f3a83a87abf680b8a52b3c07df869d2443de844fb5f0ff528ca862 imx-parser-4.2.1.bin
+sha256 9cd8c49a0bb1050afcfbcc7a677a348443fda4ecacb621cc6e38897619e27c67 imx-parser-4.3.5.bin
+sha256 78696664f7afe7f2b081c99af60082d6403fab935b1b10056ed41aec123ff7fa COPYING
+sha256 fc93f26e4197b9240c327ce26ae6e02123f022423d4704c7b0448a37372cf2a2 EULA
diff --git a/package/freescale-imx/imx-parser/imx-parser.mk b/package/freescale-imx/imx-parser/imx-parser.mk
index 11536e5024..fc4376f04b 100644
--- a/package/freescale-imx/imx-parser/imx-parser.mk
+++ b/package/freescale-imx/imx-parser/imx-parser.mk
@@ -4,7 +4,7 @@
#
################################################################################
-IMX_PARSER_VERSION = 4.2.1
+IMX_PARSER_VERSION = 4.3.5
IMX_PARSER_SITE = $(FREESCALE_IMX_SITE)
IMX_PARSER_SOURCE = imx-parser-$(IMX_PARSER_VERSION).bin
IMX_PARSER_INSTALL_STAGING = YES
diff --git a/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch b/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
new file mode 100644
index 0000000000..951ead9824
--- /dev/null
+++ b/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
@@ -0,0 +1,44 @@
+From 872c82e7cbb9a0a0e761e8ac70fc28e19a55b4c3 Mon Sep 17 00:00:00 2001
+From: Gary Bisson <gary.bisson@boundarydevices.com>
+Date: Thu, 12 Jul 2018 11:38:28 +0200
+Subject: [PATCH] Fix ion.h header inclusion to be standard
+
+NXP "solution" was to manually copy the header to include/linux.
+Let's point the Makefile to the proper (mainline) location instead:
+https://elixir.bootlin.com/linux/v4.17/source/drivers/staging/android/uapi/ion.h
+
+Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
+---
+ Makefile | 2 ++
+ decoder_sw/software/linux/dwl/dwl_linux.c | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index b74e23a..a5ce22b 100755
+--- a/Makefile
++++ b/Makefile
+@@ -11,6 +11,8 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/so
+ INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/memalloc
+ #INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/ldriver
+ INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
++# ION header location
++INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
+
+ CFLAGS += -DDEC_MODULE_PATH=\"/dev/mxc_hantro\" -DUSE_FAKE_RFC_TABLE -DFIFO_DATATYPE=void* -DNDEBUG -DDOWN_SCALER \
+ -DUSE_EXTERNAL_BUFFER -DUSE_FAST_EC -DUSE_VP9_EC -DGET_FREE_BUFFER_NON_BLOCK \
+diff --git a/decoder_sw/software/linux/dwl/dwl_linux.c b/decoder_sw/software/linux/dwl/dwl_linux.c
+index 8183660..ed37d86 100644
+--- a/decoder_sw/software/linux/dwl/dwl_linux.c
++++ b/decoder_sw/software/linux/dwl/dwl_linux.c
+@@ -41,7 +41,7 @@
+ #include "dwl.h"
+ #include <linux/hantrodec.h>
+ #ifdef USE_ION
+-#include <linux/ion.h>
++#include <ion.h>
+ #ifdef ANDROID
+ #include <linux/mxc_ion.h>
+ #endif
+--
+2.18.0
+
diff --git a/package/freescale-imx/imx-vpu-hantro/Config.in b/package/freescale-imx/imx-vpu-hantro/Config.in
new file mode 100644
index 0000000000..25ce50ffd7
--- /dev/null
+++ b/package/freescale-imx/imx-vpu-hantro/Config.in
@@ -0,0 +1,20 @@
+comment "imx-vpu-hantro needs an i.MX-specific Linux kernel to be built"
+ depends on !BR2_LINUX_KERNEL
+
+comment "imx-vpu-hantro needs an i.MX platform with Hantro VPU"
+ depends on BR2_LINUX_KERNEL
+ depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO
+
+config BR2_PACKAGE_IMX_VPU_HANTRO
+ bool "imx-vpu-hantro"
+ depends on BR2_LINUX_KERNEL
+ depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO
+ help
+ Library of userspace helpers specific for the NXP i.MX SoC
+ integrating a Hantro Video Processing Unit (VPU) such as the
+ i.MX8MQ/i.MX8MM.
+ It requires a kernel that includes the i.MX specific headers
+ to be built.
+
+ This library is provided by NXP as-is and doesn't have an
+ upstream.
diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
new file mode 100644
index 0000000000..4fa48fb806
--- /dev/null
+++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
@@ -0,0 +1,3 @@
+sha256 cbc648e41f005aad209f74c9e5dd346138dca12efeb7b27e471de7474c4da302 imx-vpu-hantro-1.6.0.bin
+sha256 0f34f6175247762e2e1c38319aadf657a53f00ce124e569dfc61b30451549e7a COPYING
+sha256 faf01d10e484879247963eb97d96622a980232e22a35e487dfe53b13708b686a EULA
diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
new file mode 100644
index 0000000000..a82899e64b
--- /dev/null
+++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
@@ -0,0 +1,42 @@
+################################################################################
+#
+# imx-vpu-hantro
+#
+################################################################################
+
+IMX_VPU_HANTRO_VERSION = 1.6.0
+IMX_VPU_HANTRO_SITE = $(FREESCALE_IMX_SITE)
+IMX_VPU_HANTRO_SOURCE = imx-vpu-hantro-$(IMX_VPU_HANTRO_VERSION).bin
+IMX_VPU_HANTRO_DEPENDENCIES = linux
+IMX_VPU_HANTRO_INSTALL_STAGING = YES
+
+IMX_VPU_HANTRO_MAKE_ENV = \
+ $(TARGET_MAKE_ENV) \
+ $(TARGET_CONFIGURE_OPTS) \
+ CROSS_COMPILE="$(TARGET_CROSS)" \
+ SDKTARGETSYSROOT=$(STAGING_DIR) \
+ LINUX_KERNEL_ROOT=$(LINUX_DIR)
+
+IMX_VPU_HANTRO_LICENSE = NXP Semiconductor Software License Agreement
+IMX_VPU_HANTRO_LICENSE_FILES = EULA COPYING
+IMX_VPU_HANTRO_REDISTRIBUTE = NO
+
+define IMX_VPU_HANTRO_EXTRACT_CMDS
+ $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPU_HANTRO_DL_DIR)/$(IMX_VPU_HANTRO_SOURCE))
+endef
+
+define IMX_VPU_HANTRO_BUILD_CMDS
+ $(IMX_VPU_HANTRO_MAKE_ENV) $(MAKE1) -C $(@D)
+endef
+
+define IMX_VPU_HANTRO_INSTALL_STAGING_CMDS
+ $(IMX_VPU_HANTRO_MAKE_ENV) $(MAKE1) -C $(@D) \
+ DEST_DIR=$(STAGING_DIR) libdir=/usr/lib install
+endef
+
+define IMX_VPU_HANTRO_INSTALL_TARGET_CMDS
+ $(IMX_VPU_HANTRO_MAKE_ENV) $(MAKE1) -C $(@D) \
+ DEST_DIR=$(TARGET_DIR) libdir=/usr/lib install
+endef
+
+$(eval $(generic-package))
diff --git a/package/freescale-imx/imx-vpu/Config.in b/package/freescale-imx/imx-vpu/Config.in
index 779717f5ed..dd3507eb96 100644
--- a/package/freescale-imx/imx-vpu/Config.in
+++ b/package/freescale-imx/imx-vpu/Config.in
@@ -1,17 +1,14 @@
comment "imx-vpu needs an i.MX platform with VPU support"
- depends on BR2_arm
depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
config BR2_PACKAGE_IMX_VPU
bool "imx-vpu"
- depends on BR2_arm # Only relevant for i.MX
depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
select BR2_PACKAGE_FIRMWARE_IMX
help
- Library of userspace helpers specific for the Freescale i.MX
- platform. It wraps the kernel interfaces for the i.MX platform
- Video Processing Unit (VPU) driver. It requires a kernel that
- includes the i.MX specific headers to be built.
+ Library of userspace helpers specific for the NXP i.MX SoC
+ integrating a Chips&Media CODA Video Processing Unit (VPU)
+ such as the i.MX27/i.MX5x/i.MX6x.
- This library is provided by Freescale as-is and doesn't have
- an upstream.
+ This library is provided by NXP as-is and doesn't have an
+ upstream.
diff --git a/package/freescale-imx/imx-vpu/imx-vpu.hash b/package/freescale-imx/imx-vpu/imx-vpu.hash
index 0ac0f3d0c2..5fa93d8055 100644
--- a/package/freescale-imx/imx-vpu/imx-vpu.hash
+++ b/package/freescale-imx/imx-vpu/imx-vpu.hash
@@ -1,2 +1,4 @@
# Locally computed
-sha256 ee265e88d17c7369bd9cb917e7cce035b8c7ee2ba4491645fdab9f382f54beb0 imx-vpu-5.4.37.bin
+sha256 34bed0ddf6c797f444bddfa5d5495adc751ff268b6431d8beb48129c89c9e47f imx-vpu-5.4.38.bin
+sha256 78696664f7afe7f2b081c99af60082d6403fab935b1b10056ed41aec123ff7fa COPYING
+sha256 fc93f26e4197b9240c327ce26ae6e02123f022423d4704c7b0448a37372cf2a2 EULA
diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk
index 2bcfe53eba..e30237508e 100644
--- a/package/freescale-imx/imx-vpu/imx-vpu.mk
+++ b/package/freescale-imx/imx-vpu/imx-vpu.mk
@@ -4,7 +4,7 @@
#
################################################################################
-IMX_VPU_VERSION = 5.4.37
+IMX_VPU_VERSION = 5.4.38
IMX_VPU_SITE = $(FREESCALE_IMX_SITE)
IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin
diff --git a/package/freescale-imx/imx-vpuwrap/Config.in b/package/freescale-imx/imx-vpuwrap/Config.in
index bdfa147867..8a9bf0e32d 100644
--- a/package/freescale-imx/imx-vpuwrap/Config.in
+++ b/package/freescale-imx/imx-vpuwrap/Config.in
@@ -1,17 +1,16 @@
comment "imx-vpuwrap needs an imx-specific Linux kernel to be built"
- depends on BR2_arm
depends on !BR2_LINUX_KERNEL
comment "imx-vpuwrap needs an i.MX platform with VPU support"
- depends on BR2_arm
- depends on BR2_LINUX_KERNEL && !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
+ depends on BR2_LINUX_KERNEL
+ depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU && !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO
config BR2_PACKAGE_IMX_VPUWRAP
bool "imx-vpuwrap"
depends on BR2_LINUX_KERNEL
- depends on BR2_arm # Only relevant for i.MX
- depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
- select BR2_PACKAGE_IMX_VPU
+ depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU || BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO
+ select BR2_PACKAGE_IMX_VPU if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
+ select BR2_PACKAGE_IMX_VPU_HANTRO if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO
help
Wrapper library for the vpu library, giving it a different
API.
diff --git a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash
index 2999984d2c..7a640374d7 100644
--- a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash
+++ b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash
@@ -1,2 +1,4 @@
# locally computed
-sha256 282e7f8766ce385d8752bd29f04ddeff709ece0846be97547cf982183bbe241e imx-vpuwrap-1.0.68.bin
+sha256 5c08b4b7c771404c998779f0e27a75564b57958d463e2df152c910d76cca9e44 imx-vpuwrap-4.3.5.bin
+sha256 78696664f7afe7f2b081c99af60082d6403fab935b1b10056ed41aec123ff7fa COPYING
+sha256 fc93f26e4197b9240c327ce26ae6e02123f022423d4704c7b0448a37372cf2a2 EULA
diff --git a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk
index edba87279f..fdad3a5f2b 100644
--- a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk
+++ b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk
@@ -4,12 +4,19 @@
#
################################################################################
-IMX_VPUWRAP_VERSION = 1.0.68
+IMX_VPUWRAP_VERSION = 4.3.5
IMX_VPUWRAP_SITE = $(FREESCALE_IMX_SITE)
IMX_VPUWRAP_SOURCE = imx-vpuwrap-$(IMX_VPUWRAP_VERSION).bin
-IMX_VPUWRAP_DEPENDENCIES = imx-vpu
IMX_VPUWRAP_INSTALL_STAGING = YES
+ifeq ($(BR2_PACKAGE_IMX_VPU),y)
+IMX_VPUWRAP_DEPENDENCIES = imx-vpu
+endif
+
+ifeq ($(BR2_PACKAGE_IMX_VPU_HANTRO),y)
+IMX_VPUWRAP_DEPENDENCIES = imx-vpu-hantro
+endif
+
IMX_VPUWRAP_LICENSE = NXP Semiconductor Software License Agreement
IMX_VPUWRAP_LICENSE_FILES = EULA COPYING
IMX_VPUWRAP_REDISTRIBUTE = NO
diff --git a/package/fwup/fwup.hash b/package/fwup/fwup.hash
index 32398bf4d0..73bff448de 100644
--- a/package/fwup/fwup.hash
+++ b/package/fwup/fwup.hash
@@ -1,2 +1,3 @@
# Locally calculated
-sha256 852e255bd65f9db473a06184abb3e94e3b6b86be7bf66169e8df8146d5966ae1 fwup-v0.15.4.tar.gz
+sha256 20302dc96cef88438034e15551e178bb0652c28d99aa7ca5260100cb3bebbc2a fwup-v1.2.5.tar.gz
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
diff --git a/package/fwup/fwup.mk b/package/fwup/fwup.mk
index c6a18c291c..be0b1d13b8 100644
--- a/package/fwup/fwup.mk
+++ b/package/fwup/fwup.mk
@@ -4,7 +4,7 @@
#
################################################################################
-FWUP_VERSION = v0.15.4
+FWUP_VERSION = v1.2.5
FWUP_SITE = $(call github,fhunleth,fwup,$(FWUP_VERSION))
FWUP_LICENSE = Apache-2.0
FWUP_LICENSE_FILES = LICENSE
diff --git a/package/gadgetfs-test/Config.in b/package/gadgetfs-test/Config.in
index 9a603066e7..ca14c91b41 100644
--- a/package/gadgetfs-test/Config.in
+++ b/package/gadgetfs-test/Config.in
@@ -8,7 +8,6 @@ if BR2_PACKAGE_GADGETFS_TEST
config BR2_PACKAGE_GADGETFS_TEST_USE_AIO
bool "use asynchronous i/o"
- depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
select BR2_PACKAGE_LIBAIO
help
Select this to have gadgetfs-test do asynchronous I/O using
diff --git a/package/gcc/4.9.4/0003-libsanitizer-Use-pre-computed-size.patch b/package/gcc/4.9.4/0003-libsanitizer-Use-pre-computed-size.patch
new file mode 100644
index 0000000000..5b4c05a719
--- /dev/null
+++ b/package/gcc/4.9.4/0003-libsanitizer-Use-pre-computed-size.patch
@@ -0,0 +1,71 @@
+From 61f38c64c01a15560026115a157b7021ec67bd3b Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Thu, 24 May 2018 20:21:54 +0000
+Subject: [PATCH] libsanitizer: Use pre-computed size of struct ustat for Linux
+
+Cherry-pick compiler-rt revision 333213:
+
+<sys/ustat.h> has been removed from glibc 2.28 by:
+
+commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7
+Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Sun Mar 18 11:28:59 2018 +0800
+
+ Deprecate ustat syscall interface
+
+This patch uses pre-computed size of struct ustat for Linux.
+
+ PR sanitizer/85835
+ * sanitizer_common/sanitizer_platform_limits_posix.cc: Don't
+ include <sys/ustat.h> for Linux.
+ (SIZEOF_STRUCT_USTAT): New.
+ (struct_ustat_sz): Use SIZEOF_STRUCT_USTAT for Linux.
+
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@260688 138bc75d-0d04-0410-961f-82ee72b054a4
+
+Backported from upstream commit
+https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=61f38c64c01a15560026115a157b7021ec67bd3b
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ libsanitizer/ChangeLog | 8 ++++++++
+ .../sanitizer_common/sanitizer_platform_limits_posix.cc | 15 +++++++++++++--
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 31a5e69..8017afd 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -81,7 +89,6 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -163,7 +170,19 @@
+ unsigned struct_old_utsname_sz = sizeof(struct old_utsname);
+ unsigned struct_oldold_utsname_sz = sizeof(struct oldold_utsname);
+ unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
+- unsigned struct_ustat_sz = sizeof(struct ustat);
++ // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
++ // has been removed from glibc 2.28.
++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
++ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
++ || defined(__x86_64__)
++#define SIZEOF_STRUCT_USTAT 32
++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
++ || defined(__powerpc__) || defined(__s390__)
++#define SIZEOF_STRUCT_USTAT 20
++#else
++#error Unknown size of struct ustat
++#endif
++ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
+ #endif // SANITIZER_LINUX
+
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+--
+2.9.3
diff --git a/package/gcc/5.5.0/0002-libsanitizer-Use-pre-computed-size.patch b/package/gcc/5.5.0/0002-libsanitizer-Use-pre-computed-size.patch
new file mode 100644
index 0000000000..6e73331eae
--- /dev/null
+++ b/package/gcc/5.5.0/0002-libsanitizer-Use-pre-computed-size.patch
@@ -0,0 +1,72 @@
+From 61f38c64c01a15560026115a157b7021ec67bd3b Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Thu, 24 May 2018 20:21:54 +0000
+Subject: [PATCH] libsanitizer: Use pre-computed size of struct ustat for Linux
+
+Cherry-pick compiler-rt revision 333213:
+
+<sys/ustat.h> has been removed from glibc 2.28 by:
+
+commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7
+Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Sun Mar 18 11:28:59 2018 +0800
+
+ Deprecate ustat syscall interface
+
+This patch uses pre-computed size of struct ustat for Linux.
+
+ PR sanitizer/85835
+ * sanitizer_common/sanitizer_platform_limits_posix.cc: Don't
+ include <sys/ustat.h> for Linux.
+ (SIZEOF_STRUCT_USTAT): New.
+ (struct_ustat_sz): Use SIZEOF_STRUCT_USTAT for Linux.
+
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@260688 138bc75d-0d04-0410-961f-82ee72b054a4
+
+Downloaded from upstream commit
+https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=61f38c64c01a15560026115a157b7021ec67bd3b
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ libsanitizer/ChangeLog | 8 ++++++++
+ .../sanitizer_common/sanitizer_platform_limits_posix.cc | 15 +++++++++++++--
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 31a5e69..8017afd 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -154,7 +154,6 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -247,7 +246,19 @@ namespace __sanitizer {
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+- unsigned struct_ustat_sz = sizeof(struct ustat);
++ // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
++ // has been removed from glibc 2.28.
++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
++ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
++ || defined(__x86_64__)
++#define SIZEOF_STRUCT_USTAT 32
++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
++ || defined(__powerpc__) || defined(__s390__)
++#define SIZEOF_STRUCT_USTAT 20
++#else
++#error Unknown size of struct ustat
++#endif
++ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
+ unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+ unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+--
+2.9.3
+
diff --git a/package/gcc/6.4.0/0003-libsanitizer-Use-pre-computed-size.patch b/package/gcc/6.4.0/0003-libsanitizer-Use-pre-computed-size.patch
new file mode 100644
index 0000000000..6e73331eae
--- /dev/null
+++ b/package/gcc/6.4.0/0003-libsanitizer-Use-pre-computed-size.patch
@@ -0,0 +1,72 @@
+From 61f38c64c01a15560026115a157b7021ec67bd3b Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Thu, 24 May 2018 20:21:54 +0000
+Subject: [PATCH] libsanitizer: Use pre-computed size of struct ustat for Linux
+
+Cherry-pick compiler-rt revision 333213:
+
+<sys/ustat.h> has been removed from glibc 2.28 by:
+
+commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7
+Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Sun Mar 18 11:28:59 2018 +0800
+
+ Deprecate ustat syscall interface
+
+This patch uses pre-computed size of struct ustat for Linux.
+
+ PR sanitizer/85835
+ * sanitizer_common/sanitizer_platform_limits_posix.cc: Don't
+ include <sys/ustat.h> for Linux.
+ (SIZEOF_STRUCT_USTAT): New.
+ (struct_ustat_sz): Use SIZEOF_STRUCT_USTAT for Linux.
+
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@260688 138bc75d-0d04-0410-961f-82ee72b054a4
+
+Downloaded from upstream commit
+https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=61f38c64c01a15560026115a157b7021ec67bd3b
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ libsanitizer/ChangeLog | 8 ++++++++
+ .../sanitizer_common/sanitizer_platform_limits_posix.cc | 15 +++++++++++++--
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 31a5e69..8017afd 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -154,7 +154,6 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -247,7 +246,19 @@ namespace __sanitizer {
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+- unsigned struct_ustat_sz = sizeof(struct ustat);
++ // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
++ // has been removed from glibc 2.28.
++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
++ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
++ || defined(__x86_64__)
++#define SIZEOF_STRUCT_USTAT 32
++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
++ || defined(__powerpc__) || defined(__s390__)
++#define SIZEOF_STRUCT_USTAT 20
++#else
++#error Unknown size of struct ustat
++#endif
++ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
+ unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+ unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+--
+2.9.3
+
diff --git a/package/gcc/7.3.0/0002-xtensa-fix-PR-target-65416.patch b/package/gcc/7.3.0/0003-xtensa-fix-PR-target-65416.patch
index 7ead575439..7ead575439 100644
--- a/package/gcc/7.3.0/0002-xtensa-fix-PR-target-65416.patch
+++ b/package/gcc/7.3.0/0003-xtensa-fix-PR-target-65416.patch
diff --git a/package/gcc/7.3.0/0004-libsanitizer-Use-pre-computed-size.patch b/package/gcc/7.3.0/0004-libsanitizer-Use-pre-computed-size.patch
new file mode 100644
index 0000000000..6e73331eae
--- /dev/null
+++ b/package/gcc/7.3.0/0004-libsanitizer-Use-pre-computed-size.patch
@@ -0,0 +1,72 @@
+From 61f38c64c01a15560026115a157b7021ec67bd3b Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Thu, 24 May 2018 20:21:54 +0000
+Subject: [PATCH] libsanitizer: Use pre-computed size of struct ustat for Linux
+
+Cherry-pick compiler-rt revision 333213:
+
+<sys/ustat.h> has been removed from glibc 2.28 by:
+
+commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7
+Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Sun Mar 18 11:28:59 2018 +0800
+
+ Deprecate ustat syscall interface
+
+This patch uses pre-computed size of struct ustat for Linux.
+
+ PR sanitizer/85835
+ * sanitizer_common/sanitizer_platform_limits_posix.cc: Don't
+ include <sys/ustat.h> for Linux.
+ (SIZEOF_STRUCT_USTAT): New.
+ (struct_ustat_sz): Use SIZEOF_STRUCT_USTAT for Linux.
+
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@260688 138bc75d-0d04-0410-961f-82ee72b054a4
+
+Downloaded from upstream commit
+https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=61f38c64c01a15560026115a157b7021ec67bd3b
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ libsanitizer/ChangeLog | 8 ++++++++
+ .../sanitizer_common/sanitizer_platform_limits_posix.cc | 15 +++++++++++++--
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 31a5e69..8017afd 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -154,7 +154,6 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -247,7 +246,19 @@ namespace __sanitizer {
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+- unsigned struct_ustat_sz = sizeof(struct ustat);
++ // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
++ // has been removed from glibc 2.28.
++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
++ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
++ || defined(__x86_64__)
++#define SIZEOF_STRUCT_USTAT 32
++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
++ || defined(__powerpc__) || defined(__s390__)
++#define SIZEOF_STRUCT_USTAT 20
++#else
++#error Unknown size of struct ustat
++#endif
++ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
+ unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+ unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+--
+2.9.3
+
diff --git a/package/git-crypt/Config.in b/package/git-crypt/Config.in
index 362fe9a600..9a270b8f9d 100644
--- a/package/git-crypt/Config.in
+++ b/package/git-crypt/Config.in
@@ -1,6 +1,8 @@
config BR2_PACKAGE_GIT_CRYPT
bool "git-crypt"
depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11
+ depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
depends on BR2_USE_MMU # git
select BR2_PACKAGE_GIT # runtime
select BR2_PACKAGE_OPENSSL
@@ -10,6 +12,11 @@ config BR2_PACKAGE_GIT_CRYPT
https://www.agwa.name/projects/git-crypt/
-comment "git-crypt needs a toolchain w/ C++"
- depends on !BR2_INSTALL_LIBSTDCPP
+comment "git-crypt needs a toolchain w/ C++, gcc >= 4.9"
+ depends on !BR2_INSTALL_LIBSTDCPP \
+ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
depends on BR2_USE_MMU
+
+comment "git-crypt needs a toolchain not affected by GCC bug 64735"
+ depends on BR2_USE_MMU
+ depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
diff --git a/package/git-crypt/git-crypt.hash b/package/git-crypt/git-crypt.hash
index 8589f03f71..973432d7d0 100644
--- a/package/git-crypt/git-crypt.hash
+++ b/package/git-crypt/git-crypt.hash
@@ -1,2 +1,5 @@
-# Hash from: https://lists.cloudmutt.com/pipermail/git-crypt-announce/2015-May/000003.html
-sha256 0a8f92c0a0a125bf768d0c054d947ca4e4b8d6556454b0e7e87fb907ee17cf06 git-crypt-0.5.0.tar.gz
+# Locally calculated after checking pgp signature
+sha256 6d30fcd99442d50f4b3c8d554067ff1d980cdf9f3120ee774131172dba98fd6f git-crypt-0.6.0.tar.gz
+# Locally calculated
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
+sha256 506657e7a381165550e6c33e35b3b03bbef3e1feb68ba5529e264bd75ed2dc64 parse_options.hpp
diff --git a/package/git-crypt/git-crypt.mk b/package/git-crypt/git-crypt.mk
index 6cae456fd3..37e3d885a9 100644
--- a/package/git-crypt/git-crypt.mk
+++ b/package/git-crypt/git-crypt.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GIT_CRYPT_VERSION = 0.5.0
+GIT_CRYPT_VERSION = 0.6.0
GIT_CRYPT_SITE = https://www.agwa.name/projects/git-crypt/downloads
GIT_CRYPT_DEPENDENCIES = host-pkgconf openssl
GIT_CRYPT_LICENSE = GPL-3.0+, MIT
@@ -14,7 +14,8 @@ GIT_CRYPT_LIBS = `$(PKG_CONFIG_HOST_BINARY) --libs openssl`
define GIT_CRYPT_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
- LDFLAGS="$(TARGET_LDFLAGS) $(GIT_CRYPT_LIBS)" PREFIX=/usr
+ LDFLAGS="$(TARGET_LDFLAGS) $(GIT_CRYPT_LIBS)" \
+ CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" PREFIX=/usr
endef
define GIT_CRYPT_INSTALL_TARGET_CMDS
diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash
index 81dd5ad5ed..85afd6fd6b 100644
--- a/package/glibc/glibc.hash
+++ b/package/glibc/glibc.hash
@@ -1,5 +1,5 @@
# Locally calculated (fetched from Github)
-sha256 33189b3f10c88730a1f686fac794bc01f31765f12ffd75bc5e8a0f2a690d217a glibc-glibc-2.27-57-g6c99e37f6fb640a50a3113b2dbee5d5389843c1e.tar.gz
+sha256 877c7b4741501d1762af8ef1a2518bdf2d722947d2e8d48b203e2d83cc600bca glibc-glibc-2.28.tar.gz
# Locally calculated (fetched from Github)
sha256 e08ab67b2db2d0f0e8f3311d23c54fb8f6d4c1ef6fa0b4047fd5da400e3ce9de glibc-arc-2018.03-release.tar.gz
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index d34b42b831..399cf395ce 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -10,7 +10,7 @@ GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VE
else
# Generate version string using:
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master
-GLIBC_VERSION = glibc-2.27-57-g6c99e37f6fb640a50a3113b2dbee5d5389843c1e
+GLIBC_VERSION = glibc-2.28
# Upstream doesn't officially provide an https download link.
# There is one (https://sourceware.org/git/glibc.git) but it's not reliable,
# sometimes the connection times out. So use an unofficial github mirror.
diff --git a/package/glibmm/glibmm.hash b/package/glibmm/glibmm.hash
index 570192e2f8..6131f9dcaf 100644
--- a/package/glibmm/glibmm.hash
+++ b/package/glibmm/glibmm.hash
@@ -1,2 +1,5 @@
-# From http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.54/glibmm-2.54.1.sha256sum
-sha256 7cc28c732b04d70ed34f0c923543129083cfb90580ea4a2b4be5b38802bf6a4a glibmm-2.54.1.tar.xz
+# From http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.56/glibmm-2.56.0.sha256sum
+sha256 6e74fcba0d245451c58fc8a196e9d103789bc510e1eee1a9b1e816c5209e79a9 glibmm-2.56.0.tar.xz
+# License files, locally calculated
+sha256 3ea7fa7c5d9a3a113e950eca9cfb85107f096270d8e4dd99daa9d8abdebc60e7 COPYING
+sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools
diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk
index 7fa13f21a2..71f1dfd36f 100644
--- a/package/glibmm/glibmm.mk
+++ b/package/glibmm/glibmm.mk
@@ -4,8 +4,8 @@
#
################################################################################
-GLIBMM_VERSION_MAJOR = 2.54
-GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).1
+GLIBMM_VERSION_MAJOR = 2.56
+GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).0
GLIBMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
GLIBMM_LICENSE_FILES = COPYING COPYING.tools
GLIBMM_SOURCE = glibmm-$(GLIBMM_VERSION).tar.xz
diff --git a/package/glorytun/glorytun.hash b/package/glorytun/glorytun.hash
index 891af2079e..59a5f09c0e 100644
--- a/package/glorytun/glorytun.hash
+++ b/package/glorytun/glorytun.hash
@@ -1,2 +1,2 @@
-sha256 76849b1568119cf0834749db56d4882966863d31351c21c1b22f373f0c97a498 glorytun-0.0.93-mud.tar.gz
+sha256 5e23afad4592d6af27ffd2cb3c826cf0ea1b5166a05ef1ae5c77fb4e465bb735 glorytun-0.0.99-mud.tar.gz
sha256 bd418f8ef7d62f2c89e3aa1e5dc41c7d7a6212eb1cdb4d39a26a5bd333e1b4a3 LICENSE
diff --git a/package/glorytun/glorytun.mk b/package/glorytun/glorytun.mk
index 233e1feaa9..f6d87c2605 100644
--- a/package/glorytun/glorytun.mk
+++ b/package/glorytun/glorytun.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GLORYTUN_VERSION = 0.0.93-mud
+GLORYTUN_VERSION = 0.0.99-mud
GLORYTUN_SITE = https://github.com/angt/glorytun/releases/download/v$(GLORYTUN_VERSION)
GLORYTUN_DEPENDENCIES = libsodium host-pkgconf
GLORYTUN_LICENSE = BSD-2-clause
diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
index c1ed039bc7..21a7668c65 100644
--- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
+++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
@@ -25,13 +25,19 @@ GST1_PLUGINS_GOOD_CONF_OPTS = \
# Options which require currently unpackaged libraries
GST1_PLUGINS_GOOD_CONF_OPTS += \
- --disable-jack \
--disable-libdv \
--disable-dv1394 \
--disable-shout2
GST1_PLUGINS_GOOD_DEPENDENCIES = gstreamer1 gst1-plugins-base
+ifeq ($(BR2_PACKAGE_JACK2),y)
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-jack
+GST1_PLUGINS_GOOD_DEPENDENCIES += jack2
+else
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-jack
+endif
+
ifeq ($(BR2_PACKAGE_LIBV4L),y)
GST1_PLUGINS_GOOD_CONF_OPTS += --with-libv4l2
GST1_PLUGINS_GOOD_DEPENDENCIES += libv4l
diff --git a/package/gzip/gzip.hash b/package/gzip/gzip.hash
index 466f846e12..632176c2b6 100644
--- a/package/gzip/gzip.hash
+++ b/package/gzip/gzip.hash
@@ -1,2 +1,6 @@
# Locally calculated after checking pgp signature
-sha256 ff1767ec444f71e5daf8972f6f8bf68cfcca1d2f76c248eb18e8741fc91dbbd3 gzip-1.8.tar.xz
+# https://ftp.gnu.org/gnu/gzip/gzip-1.9.tar.xz.sig
+# using key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE
+sha256 ae506144fc198bd8f81f1f4ad19ce63d5a2d65e42333255977cf1dcf1479089a gzip-1.9.tar.xz
+# Locally calculated
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk
index d69215a850..d48cb1aa15 100644
--- a/package/gzip/gzip.mk
+++ b/package/gzip/gzip.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GZIP_VERSION = 1.8
+GZIP_VERSION = 1.9
GZIP_SOURCE = gzip-$(GZIP_VERSION).tar.xz
GZIP_SITE = $(BR2_GNU_MIRROR)/gzip
# Some other tools expect it to be in /bin
diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash
index 5f786dcb87..a10b4cfd5d 100644
--- a/package/harfbuzz/harfbuzz.hash
+++ b/package/harfbuzz/harfbuzz.hash
@@ -1,5 +1,6 @@
-# From https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.7.1.tar.bz2.sha256
-sha256 9645a6e83313b690602017f18d4eb2adf81f2e54c6fc4471e19331304965154e harfbuzz-1.7.1.tar.bz2
+# From https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.8.8.tar.bz2.sha256
+sha256 a8e5c86e4d99e1cc9865ec1b8e9b05b98e413c2a885cd11f8e9bb9502dd3e3a9 harfbuzz-1.8.8.tar.bz2
# Locally computed
sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 COPYING
+sha256 ec20cbe051200fc846caf4dc253cf660e874a2d9e4f3a682e08354b567fae409 src/hb-ucdn/COPYING
diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk
index 5708745fd2..52374c9c9e 100644
--- a/package/harfbuzz/harfbuzz.mk
+++ b/package/harfbuzz/harfbuzz.mk
@@ -4,7 +4,7 @@
#
################################################################################
-HARFBUZZ_VERSION = 1.7.1
+HARFBUZZ_VERSION = 1.8.8
HARFBUZZ_SITE = https://www.freedesktop.org/software/harfbuzz/release
HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2
HARFBUZZ_LICENSE = MIT, ISC (ucdn library)
diff --git a/package/htop/0002-MakeHeader-open-files-using-binary-mode.patch b/package/htop/0002-MakeHeader-open-files-using-binary-mode.patch
deleted file mode 100644
index bcc3e6564c..0000000000
--- a/package/htop/0002-MakeHeader-open-files-using-binary-mode.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 1a83a3e6ae0841a0dc4c7eb08a1a71930e99666c Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Sun, 18 Mar 2018 21:57:54 +0100
-Subject: [PATCH] MakeHeader: open files using binary mode
-
-By default, open(sys.argv[1]) use Unicode mode.
-The readlines() will try to convert with the default codec
-(which depends on the i18n settings, so 'ascii' under
-LC_ALL=C)
-
-Open files using binary mode so no conversion will be done
-by readlines(). But then, normal strings can't be used in
-the rest of the code; either all strings have to be prefixed
-with b'' or (simpler) the read line has to be converted to
-a unicode string by calling decode() on it.
-
-http://lists.busybox.net/pipermail/buildroot/2018-February/214373.html
-
-Fixes:
-http://autobuild.buildroot.net/results/9ce/9ce2ef5ef694253b9759016c9702c5c6be7849a1
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- scripts/MakeHeader.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py
-index 4841bda..dd0798c 100755
---- a/scripts/MakeHeader.py
-+++ b/scripts/MakeHeader.py
-@@ -16,7 +16,7 @@ SKIPONE=4
- state = ANY
- static = 0
-
--file = open(sys.argv[1])
-+file = open(sys.argv[1], 'rb')
- name = sys.argv[1][:-2]
-
- out = StringIO()
-@@ -31,6 +31,7 @@ out.write( "#define HEADER_" + os.path.basename(name) + "\n")
- is_blank = False
- for line in file.readlines():
- line = line[:-1]
-+ line = line.decode('utf-8')
- if state == ANY:
- if line == '/*{':
- state = COPY
---
-2.14.3
-
diff --git a/package/htop/htop.hash b/package/htop/htop.hash
index 5419d767a3..e764644a0b 100644
--- a/package/htop/htop.hash
+++ b/package/htop/htop.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 3260be990d26e25b6b49fc9d96dbc935ad46e61083c0b7f6df413e513bf80748 htop-2.1.0.tar.gz
+sha256 d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57 htop-2.2.0.tar.gz
sha256 70466e76443cb5b68144d9fcedca9584e7bfdb6c50859daa5a0290ea27c58aad COPYING
diff --git a/package/htop/htop.mk b/package/htop/htop.mk
index 71889557ca..dc84e32708 100644
--- a/package/htop/htop.mk
+++ b/package/htop/htop.mk
@@ -4,7 +4,7 @@
#
################################################################################
-HTOP_VERSION = 2.1.0
+HTOP_VERSION = 2.2.0
HTOP_SITE = http://hisham.hm/htop/releases/$(HTOP_VERSION)
HTOP_DEPENDENCIES = ncurses
# Prevent htop build system from searching the host paths
diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk
index ec06c73325..11d0cf9808 100644
--- a/package/i2c-tools/i2c-tools.mk
+++ b/package/i2c-tools/i2c-tools.mk
@@ -10,6 +10,7 @@ I2C_TOOLS_SITE = https://www.kernel.org/pub/software/utils/i2c-tools
I2C_TOOLS_LICENSE = GPL-2.0+, GPL-2.0 (py-smbus), LGPL-2.1+ (libi2c)
I2C_TOOLS_LICENSE_FILES = COPYING COPYING.LGPL README
I2C_TOOLS_MAKE_OPTS = EXTRA=eeprog
+I2C_TOOLS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_PYTHON),y)
I2C_TOOLS_DEPENDENCIES += python
@@ -62,4 +63,9 @@ define I2C_TOOLS_INSTALL_TARGET_CMDS
$(I2C_TOOLS_INSTALL_PYSMBUS)
endef
+define I2C_TOOLS_INSTALL_STAGING_CMDS
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) $(I2C_TOOLS_MAKE_OPTS) \
+ DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) install
+endef
+
$(eval $(generic-package))
diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash
index 3e34f98eb6..06dae42149 100644
--- a/package/iperf3/iperf3.hash
+++ b/package/iperf3/iperf3.hash
@@ -1,2 +1,4 @@
-# From http://software.es.net/iperf/news.html
-sha256 a4ef73406fe92250602b8da2ae89ec53211f805df97a1d1d629db5a14043734f iperf-3.1.7.tar.gz
+# From https://downloads.es.net/pub/iperf/iperf-3.6.tar.gz.sha256
+sha256 de5d51e46dc460cc590fb4d44f95e7cad54b74fea1eba7d6ebd6f8887d75946e iperf-3.6.tar.gz
+# Locally computed
+sha256 52c42914d7d79fe5e95d0d1b821556d9f06bf756ac910fe085a46d238a33e594 LICENSE
diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk
index cc4e72427b..8ac4b078c4 100644
--- a/package/iperf3/iperf3.mk
+++ b/package/iperf3/iperf3.mk
@@ -4,12 +4,21 @@
#
################################################################################
-IPERF3_VERSION = 3.1.7
-IPERF3_SITE = http://downloads.es.net/pub/iperf
+IPERF3_VERSION = 3.6
+IPERF3_SITE = https://downloads.es.net/pub/iperf
IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz
IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT
IPERF3_LICENSE_FILES = LICENSE
IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+# We intentionally don't pass --with-openssl, otherwise pkg-config is
+# not used, and indirect libraries are not picked up when static
+# linking.
+IPERF3_DEPENDENCIES += host-pkgconf openssl
+else
+IPERF3_CONF_OPTS += --without-openssl
+endif
+
$(eval $(autotools-package))
diff --git a/package/ipmiutil/ipmiutil.hash b/package/ipmiutil/ipmiutil.hash
index f9d086b67a..e09511f96f 100644
--- a/package/ipmiutil/ipmiutil.hash
+++ b/package/ipmiutil/ipmiutil.hash
@@ -1,4 +1,6 @@
-# From http://sourceforge.net/projects/ipmiutil/files/?source=navbar
-sha1 f423a77a374b6a37a16496844f1e6e363e7d63fe ipmiutil-2.9.9.tar.gz
+# From https://sourceforge.net/projects/ipmiutil/files/
+md5 ee90387f8a14dea3f867167865c7c968 ipmiutil-3.1.2.tar.gz
+sha1 9453db110bffab3111d6ff4047243a34084e5878 ipmiutil-3.1.2.tar.gz
# Locally computed
-sha256 beace08386a002c6a4bbbf894bda9899ea34fae4c2181c89f29fb1fa136925f6 ipmiutil-2.9.9.tar.gz
+sha256 768053b3e3adfe1bf656e2848b2805ede87e429c10d282929a7c4ceeebc24703 ipmiutil-3.1.2.tar.gz
+sha256 7e0ec8238aa1431e95a4950032a4483fe33fec3fac348eaade5856cdc5ae3e39 COPYING
diff --git a/package/ipmiutil/ipmiutil.mk b/package/ipmiutil/ipmiutil.mk
index a5a6b49314..5d8c45665d 100644
--- a/package/ipmiutil/ipmiutil.mk
+++ b/package/ipmiutil/ipmiutil.mk
@@ -4,8 +4,8 @@
#
################################################################################
-IPMIUTIL_VERSION = 2.9.9
-IPMIUTIL_SITE = http://sourceforge.net/projects/ipmiutil/files
+IPMIUTIL_VERSION = 3.1.2
+IPMIUTIL_SITE = https://sourceforge.net/projects/ipmiutil/files
IPMIUTIL_LICENSE = BSD-3-Clause
IPMIUTIL_LICENSE_FILES = COPYING
# We're patching configure.ac
diff --git a/package/iproute2/0001-rdma-sync-some-IP-headers-with-glibc.patch b/package/iproute2/0001-rdma-sync-some-IP-headers-with-glibc.patch
deleted file mode 100644
index f78a5d6b43..0000000000
--- a/package/iproute2/0001-rdma-sync-some-IP-headers-with-glibc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 5887ff0922a06d978d3271df9f01fcb04fadc75f Mon Sep 17 00:00:00 2001
-From: Hoang Le <hoang.h.le@dektech.com.au>
-Date: Wed, 13 Jun 2018 11:09:56 +0700
-Subject: rdma: sync some IP headers with glibc
-
-In the commit 9a362cc71a45, new userspace header:
- (i.e rdma/rdma_user_cm.h -> linux/in6.h)
-is included before the kernel space header:
- (i.e utils.h -> resolv.h -> netinet/in.h).
-
-This leads to unsynchronous some IP headers and compiler got failure
-with error: redefinition of some structs IP.
-
-In this commit, just reorder this including to make them in-sync.
-
-Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au>
-Acked-by: Leon Romanovsky <leonro@mellanox.com>
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=5887ff0922a06d978d3271df9f01fcb04fadc75f]
----
- rdma/rdma.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/rdma/rdma.h b/rdma/rdma.h
-index fcaf9e6..d4b7ba1 100644
---- a/rdma/rdma.h
-+++ b/rdma/rdma.h
-@@ -15,6 +15,7 @@
- #include <string.h>
- #include <errno.h>
- #include <getopt.h>
-+#include <netinet/in.h>
- #include <libmnl/libmnl.h>
- #include <rdma/rdma_netlink.h>
- #include <rdma/rdma_user_cm.h>
---
-cgit v1.1
-
diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash
index 48867f0a99..672ea66d88 100644
--- a/package/iproute2/iproute2.hash
+++ b/package/iproute2/iproute2.hash
@@ -1,3 +1,3 @@
# From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc
-sha256 6fa991b092315887775b9e47dc6a89af7ae09dd3ad4ccff754d055c566b4be6e iproute2-4.17.0.tar.xz
+sha256 a9e6c70c95f513871c5e1f4e452c04fcb3c4d8a05be651bd794cd994a52daa45 iproute2-4.18.0.tar.xz
sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 48413401cd..b2bb33b8dc 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,7 +4,7 @@
#
################################################################################
-IPROUTE2_VERSION = 4.17.0
+IPROUTE2_VERSION = 4.18.0
IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz
IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \
diff --git a/package/jpeg-turbo/0001-fix-install-of-binaries-with-a-static-only-library.patch b/package/jpeg-turbo/0001-fix-install-of-binaries-with-a-static-only-library.patch
new file mode 100644
index 0000000000..87f9c48382
--- /dev/null
+++ b/package/jpeg-turbo/0001-fix-install-of-binaries-with-a-static-only-library.patch
@@ -0,0 +1,42 @@
+From f8c7732e24502c06739944f9a721c9d84a50319d Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 26 Aug 2018 19:11:55 +0200
+Subject: [PATCH] fix install of binaries with a static only library
+
+Define CMAKE_INSTALL_RPATH only if ENABLE_SHARED is set otherwise the
+following error is raised:
+
+CMake Error at cmake_install.cmake:73 (file):
+ file RPATH_CHANGE could not write new RPATH:
+
+ /usr/lib
+
+ to the file:
+
+ /home/fabrice/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/bin/rdjpgcom
+
+ No valid ELF RPATH or RUNPATH entry exists in the file;
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/libjpeg-turbo/libjpeg-turbo/pull/273]
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1719522..862ab11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -109,7 +109,9 @@ endif()
+
+ include(cmakescripts/GNUInstallDirs.cmake)
+
++if(ENABLE_SHARED)
+ set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
++endif()
+
+ macro(report_directory var)
+ if(CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_FULL_${var})
+--
+2.14.1
+
diff --git a/package/jpeg-turbo/jpeg-turbo.hash b/package/jpeg-turbo/jpeg-turbo.hash
index df1c053005..f0fc5396ef 100644
--- a/package/jpeg-turbo/jpeg-turbo.hash
+++ b/package/jpeg-turbo/jpeg-turbo.hash
@@ -1,7 +1,7 @@
-# From https://sourceforge.net/projects/libjpeg-turbo/files/1.5.3/
-sha1 87ebf4cab2bb27fcb8e7ccb18ec4eb680e1f2c2d libjpeg-turbo-1.5.3.tar.gz
-md5 7c82f0f6a3130ec06b8a4d0b321cbca3 libjpeg-turbo-1.5.3.tar.gz
+# From https://sourceforge.net/projects/libjpeg-turbo/files/2.0.0/
+sha1 fe49aea935617748c21ecbe46c986d6c1b98f39b libjpeg-turbo-2.0.0.tar.gz
+md5 b12a3fcf1d078db38410f27718a91b83 libjpeg-turbo-2.0.0.tar.gz
# Locally computed
-sha256 b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523 libjpeg-turbo-1.5.3.tar.gz
-sha256 5c08657eda60b7946a913ee22ac73603335a468a6aa95204506a1586a8d677ee LICENSE.md
-sha256 53a3e3c299e08856964f4c5986e242c3695837b73c64625092f70c774e8af5d2 README.ijg
+sha256 778876105d0d316203c928fd2a0374c8c01f755d0a00b12a1c8934aeccff8868 libjpeg-turbo-2.0.0.tar.gz
+sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e LICENSE.md
+sha256 82fece2bff2669c476495f0fe70096b154e8bc5b40916a64e99836d9a01c3110 README.ijg
diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk
index 2b5d876928..1807cc294e 100644
--- a/package/jpeg-turbo/jpeg-turbo.mk
+++ b/package/jpeg-turbo/jpeg-turbo.mk
@@ -4,7 +4,7 @@
#
################################################################################
-JPEG_TURBO_VERSION = 1.5.3
+JPEG_TURBO_VERSION = 2.0.0
JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz
JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION)
JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD)
@@ -13,14 +13,22 @@ JPEG_TURBO_INSTALL_STAGING = YES
JPEG_TURBO_PROVIDES = jpeg
JPEG_TURBO_DEPENDENCIES = host-pkgconf
-JPEG_TURBO_CONF_OPTS = --with-jpeg8
+JPEG_TURBO_CONF_OPTS = -DWITH_JPEG8=ON
+
+ifeq ($(BR2_STATIC_LIBS),y)
+JPEG_TURBO_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=OFF
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+JPEG_TURBO_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=ON
+else ifeq ($(BR2_SHARED_LIBS),y)
+JPEG_TURBO_CONF_OPTS += -DENABLE_STATIC=OFF -DENABLE_SHARED=ON
+endif
ifeq ($(BR2_PACKAGE_JPEG_SIMD_SUPPORT),y)
-JPEG_TURBO_CONF_OPTS += --with-simd
+JPEG_TURBO_CONF_OPTS += -DWITH_SIMD=ON
# x86 simd support needs nasm
JPEG_TURBO_DEPENDENCIES += $(if $(BR2_X86_CPU_HAS_MMX),host-nasm)
else
-JPEG_TURBO_CONF_OPTS += --without-simd
+JPEG_TURBO_CONF_OPTS += -DWITH_SIMD=OFF
endif
define JPEG_TURBO_REMOVE_USELESS_TOOLS
@@ -29,4 +37,4 @@ endef
JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_USELESS_TOOLS
-$(eval $(autotools-package))
+$(eval $(cmake-package))
diff --git a/package/kmod/0002-shared-util.c-assert_cc-can-only-be-used-inside-func.patch b/package/kmod/0002-shared-util.c-assert_cc-can-only-be-used-inside-func.patch
deleted file mode 100644
index 09fe252420..0000000000
--- a/package/kmod/0002-shared-util.c-assert_cc-can-only-be-used-inside-func.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 7cd698eb31059012305d8bb7516577c8cd383e32 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 3 Jun 2017 16:52:37 +0200
-Subject: [PATCH] shared/util.c: assert_cc() can only be used inside functions
-
-shared/macro.h has two versions of assert_cc, one that uses gcc
-_Static_assert(), which requires recent enough gcc versions, and one
-that uses a fake array to trigger a build error. The latter can only
-work inside functions, so assert_cc() should only be used inside
-functions.
-
-Fixes the following build failure when building kmod with old gcc
-versions such as gcc 4.3.x:
-
-shared/util.c:52: error: expected identifier or '(' before 'do'
-shared/util.c:52: error: expected identifier or '(' before 'while'
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- shared/util.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/shared/util.c b/shared/util.c
-index 9de080a..fd2028d 100644
---- a/shared/util.c
-+++ b/shared/util.c
-@@ -49,8 +49,6 @@ static const struct kmod_ext {
- { }
- };
-
--assert_cc(EAGAIN == EWOULDBLOCK);
--
- /* string handling functions and memory allocations */
- /* ************************************************************************ */
-
-@@ -201,6 +199,8 @@ ssize_t read_str_safe(int fd, char *buf, size_t buflen)
- size_t todo = buflen - 1;
- size_t done = 0;
-
-+ assert_cc(EAGAIN == EWOULDBLOCK);
-+
- do {
- ssize_t r = read(fd, buf + done, todo);
-
-@@ -226,6 +226,8 @@ ssize_t write_str_safe(int fd, const char *buf, size_t buflen)
- size_t todo = buflen;
- size_t done = 0;
-
-+ assert_cc(EAGAIN == EWOULDBLOCK);
-+
- do {
- ssize_t r = write(fd, buf + done, todo);
-
---
-2.7.4
-
diff --git a/package/kmod/kmod.hash b/package/kmod/kmod.hash
index be350c423a..0e8f034e06 100644
--- a/package/kmod/kmod.hash
+++ b/package/kmod/kmod.hash
@@ -1,2 +1,2 @@
# From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc
-sha256 610b8d1df172acc39a4fdf1eaa47a57b04873c82f32152e7a62e29b6ff9cb397 kmod-24.tar.xz
+sha256 7165e6496656159dcb909a91ed708a0fe273a4b128b4b1dc997ccb5189eef1cd kmod-25.tar.xz
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 7c796ab19f..c165ea3020 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -4,7 +4,7 @@
#
################################################################################
-KMOD_VERSION = 24
+KMOD_VERSION = 25
KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
KMOD_INSTALL_STAGING = YES
diff --git a/package/kodi/0004-Fix-ffmpeg-build-for-mips.patch b/package/kodi/0004-Fix-ffmpeg-build-for-mips.patch
new file mode 100644
index 0000000000..709a2d39da
--- /dev/null
+++ b/package/kodi/0004-Fix-ffmpeg-build-for-mips.patch
@@ -0,0 +1,43 @@
+From e3882a7d6c2e47731c0435d0faa3594041d58a2c Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sun, 12 Aug 2018 15:12:29 +0200
+Subject: [PATCH] Fix ffmpeg build for mips
+
+Backported from upstream master branch:
+https://github.com/xbmc/xbmc/commit/71e09dd1ac66059e31e6240352da7091d820ef83
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ tools/depends/target/ffmpeg/CMakeLists.txt | 2 +-
+ tools/depends/target/ffmpeg/Makefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt
+index 0a9e9d38ea..fda6b0cac4 100644
+--- a/tools/depends/target/ffmpeg/CMakeLists.txt
++++ b/tools/depends/target/ffmpeg/CMakeLists.txt
+@@ -63,7 +63,7 @@ endif()
+ if(CPU MATCHES arm OR CORE_SYSTEM_NAME STREQUAL rbpi)
+ list(APPEND ffmpeg_conf --enable-pic --disable-armv5te --disable-armv6t2)
+ elseif(CPU MATCHES mips)
+- list(APPEND ffmpeg_conf --disable-mips32r2 --disable-mipsdspr1 --disable-mipsdspr2)
++ list(APPEND ffmpeg_conf --disable-mips32r2 --disable-mipsdsp --disable-mipsdspr2)
+ endif()
+
+ find_package(GnuTls)
+diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile
+index ea1113d293..098f6c0c14 100644
+--- a/tools/depends/target/ffmpeg/Makefile
++++ b/tools/depends/target/ffmpeg/Makefile
+@@ -58,7 +58,7 @@ ifeq ($(findstring arm, $(CPU)), arm)
+ ffmpg_config += --enable-pic --disable-armv5te --disable-armv6t2
+ endif
+ ifeq ($(findstring mips, $(CPU)), mips)
+- ffmpg_config += --disable-mips32r2 --disable-mipsdspr1 --disable-mipsdspr2
++ ffmpg_config += --disable-mips32r2 --disable-mipsdsp --disable-mipsdspr2
+ endif
+ ifeq ($(Configuration), Release)
+ ffmpg_config += --disable-debug
+--
+2.18.0
+
diff --git a/package/kodi/0005-Fix-crosscompiling-issues.patch b/package/kodi/0005-Fix-crosscompiling-issues.patch
new file mode 100644
index 0000000000..63f71cabe1
--- /dev/null
+++ b/package/kodi/0005-Fix-crosscompiling-issues.patch
@@ -0,0 +1,81 @@
+From d2c343a20bb61098d0450b15ea2d1dacd28d954a Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sun, 12 Aug 2018 15:13:24 +0200
+Subject: [PATCH] Fix crosscompiling issues
+
+The codepath for KODI_DEPENDSBUILD needs to be used in order to provide
+the correct crosscompiling options to ffmpeg. The CMake option
+KODI_DEPENDSBUILD itself can not be enabled because it disables the
+internal build of libdvd*.
+
+To link kodi.bin with the statically built ffmpeg libraries kodi uses
+a wrapper script which calls pkgconfig. Our pkgconfig is patched to
+alter paths which breaks the link command in this case, to fix this
+PKG_CONFIG_SYSROOT_DIR was added.
+
+Also remove configure option --cpu from ffmpeg_conf to fix build
+errors.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ project/cmake/modules/FindFFMPEG.cmake | 16 +++++++---------
+ tools/depends/target/ffmpeg/CMakeLists.txt | 2 +-
+ 2 files changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/project/cmake/modules/FindFFMPEG.cmake b/project/cmake/modules/FindFFMPEG.cmake
+index 28cc80710e..1ac8793149 100644
+--- a/project/cmake/modules/FindFFMPEG.cmake
++++ b/project/cmake/modules/FindFFMPEG.cmake
+@@ -233,16 +233,14 @@ if(NOT FFMPEG_FOUND)
+ message(STATUS "FFMPEG_URL: ${FFMPEG_URL}")
+ endif()
+
+- if(KODI_DEPENDSBUILD)
+ set(CROSS_ARGS -DDEPENDS_PATH=${DEPENDS_PATH}
+ -DPKG_CONFIG_EXECUTABLE=${PKG_CONFIG_EXECUTABLE}
+ -DCROSSCOMPILING=${CMAKE_CROSSCOMPILING}
+ -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+- -DOS=${OS}
++ -DOS=linux
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+ -DCMAKE_AR=${CMAKE_AR})
+- endif()
+
+ externalproject_add(ffmpeg
+ URL ${FFMPEG_URL}
+@@ -270,12 +268,12 @@ if(NOT FFMPEG_FOUND)
+ "#!/bin/bash
+ if [[ $@ == *${APP_NAME_LC}.bin* || $@ == *${APP_NAME_LC}.so* || $@ == *${APP_NAME_LC}-test* ]]
+ then
+- avformat=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavcodec`
+- avcodec=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavformat`
+- avfilter=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavfilter`
+- avutil=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavutil`
+- swscale=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswscale`
+- swresample=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswresample`
++ avformat=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavcodec`
++ avcodec=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavformat`
++ avfilter=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavfilter`
++ avutil=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavutil`
++ swscale=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswscale`
++ swresample=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswresample`
+ gnutls=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors gnutls`
+ $@ $avcodec $avformat $avcodec $avfilter $swscale $swresample -lpostproc $gnutls
+ else
+diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt
+index fda6b0cac4..af3afa6b60 100644
+--- a/tools/depends/target/ffmpeg/CMakeLists.txt
++++ b/tools/depends/target/ffmpeg/CMakeLists.txt
+@@ -9,7 +9,7 @@ set(ffmpeg_conf "")
+ if(CROSSCOMPILING)
+ set(pkgconf "PKG_CONFIG_LIBDIR=${DEPENDS_PATH}/lib/pkgconfig")
+ list(APPEND ffmpeg_conf --pkg-config=${PKG_CONFIG_EXECUTABLE} --pkg-config-flags=--static)
+- list(APPEND ffmpeg_conf --enable-cross-compile --cpu=${CPU} --arch=${CPU} --target-os=${OS})
++ list(APPEND ffmpeg_conf --enable-cross-compile --arch=${CPU} --target-os=${OS})
+ list(APPEND ffmpeg_conf --cc=${CMAKE_C_COMPILER} --cxx=${CMAKE_CXX_COMPILER} --ar=${CMAKE_AR})
+ message(STATUS "CROSS: ${ffmpeg_conf}")
+ endif()
+--
+2.18.0
+
diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index 5f9c95a7a0..e84f5c4014 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -40,19 +40,16 @@ menuconfig BR2_PACKAGE_KODI
depends on !BR2_TOOLCHAIN_USES_MUSL
depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL_EGL
depends on BR2_USE_WCHAR
- depends on !BR2_STATIC_LIBS # python and others
+ depends on !BR2_STATIC_LIBS # gnutls, python and others
depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS
depends on BR2_PACKAGE_PYTHON
depends on !BR2_PACKAGE_PYTHON_PYC_ONLY
select BR2_NEEDS_HOST_JAVA
select BR2_PACKAGE_BZIP2
select BR2_PACKAGE_EXPAT
- select BR2_PACKAGE_FFMPEG
- select BR2_PACKAGE_FFMPEG_GPL
- select BR2_PACKAGE_FFMPEG_POSTPROC # postproc depends on GPL
- select BR2_PACKAGE_FFMPEG_SWSCALE
select BR2_PACKAGE_FONTCONFIG
select BR2_PACKAGE_FREETYPE
+ select BR2_PACKAGE_GNUTLS
select BR2_PACKAGE_LIBASS
select BR2_PACKAGE_LIBCDIO
select BR2_PACKAGE_LIBCROSSGUID
diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash
index 23a11ca494..8018c67a3a 100644
--- a/package/kodi/kodi.hash
+++ b/package/kodi/kodi.hash
@@ -1,5 +1,7 @@
# Locally computed
sha256 c8312fe92e5bab1cdac1da93d60baed88fa1574146c50c44e3c86d01671c2b1d kodi-17.6-Krypton.tar.gz
+# Locally computed - ffmpeg
+sha256 7df8bce40765b39de5766ca9d08b5b9ac1f498c65c805c989461b907cee6b7c0 3.1.11-Krypton-17.5.tar.gz
# Locally computed - libdvdcss
sha256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 2f12236.tar.gz
# Locally computed - libdvdnav
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index f3fa0b55b0..8e8d53d6b0 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -15,9 +15,9 @@ KODI_INSTALL_STAGING = YES
KODI_DEPENDENCIES = \
bzip2 \
expat \
- ffmpeg \
fontconfig \
freetype \
+ gnutls \
host-gawk \
host-gperf \
host-kodi-jsonschemabuilder \
@@ -47,11 +47,15 @@ KODI_DEPENDENCIES = \
KODI_SUBDIR = project/cmake
+# taken from tools/depends/target/ffmpeg/FFMPEG-VERSION
+KODI_FFMPEG_VERSION = 3.1.11-Krypton-17.5
+KODI_EXTRA_DOWNLOADS += \
+ https://github.com/xbmc/FFmpeg/archive/$(KODI_FFMPEG_VERSION).tar.gz
+
KODI_LIBDVDCSS_VERSION = 2f12236
KODI_LIBDVDNAV_VERSION = 981488f
KODI_LIBDVDREAD_VERSION = 17d99db
-
-KODI_EXTRA_DOWNLOADS = \
+KODI_EXTRA_DOWNLOADS += \
https://github.com/xbmc/libdvdcss/archive/$(KODI_LIBDVDCSS_VERSION).tar.gz \
https://github.com/xbmc/libdvdnav/archive/$(KODI_LIBDVDNAV_VERSION).tar.gz \
https://github.com/xbmc/libdvdread/archive/$(KODI_LIBDVDREAD_VERSION).tar.gz
@@ -62,12 +66,12 @@ KODI_CONF_OPTS += \
-DENABLE_CCACHE=OFF \
-DENABLE_DVDCSS=ON \
-DENABLE_INTERNAL_CROSSGUID=OFF \
- -DENABLE_INTERNAL_FFMPEG=OFF \
+ -DENABLE_INTERNAL_FFMPEG=ON \
+ -DFFMPEG_URL=$(KODI_DL_DIR)/$(KODI_FFMPEG_VERSION).tar.gz \
-DKODI_DEPENDSBUILD=OFF \
-DENABLE_OPENSSL=ON \
-DNATIVEPREFIX=$(HOST_DIR) \
- -DDEPENDS_PATH=$(@D) \
- -DWITH_FFMPEG=$(STAGING_DIR)/usr \
+ -DDEPENDS_PATH=$(STAGING_DIR)/usr \
-DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \
-DLIBDVDCSS_URL=$(KODI_DL_DIR)/$(KODI_LIBDVDCSS_VERSION).tar.gz \
-DLIBDVDNAV_URL=$(KODI_DL_DIR)/$(KODI_LIBDVDNAV_VERSION).tar.gz \
diff --git a/package/libaio/0001-arches.patch b/package/libaio/0001-arches.patch
deleted file mode 100644
index 4b77f57768..0000000000
--- a/package/libaio/0001-arches.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-Patch borrowed from OpenEmbedded, available at
-/meta/recipes-extended/libaio/libaio/00_arches.patch in their source
-tree. This patch has been modified to only add the MIPS definitions.
-
-The patch adds MIPS specific definitions (syscall number and macros).
-
-Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
-
-Index: libaio-0.3.110/src/syscall.h
-===================================================================
---- libaio-0.3.110.orig/src/syscall.h
-+++ libaio-0.3.110/src/syscall.h
-@@ -28,6 +28,8 @@
- #include "syscall-sparc.h"
- #elif defined(__aarch64__)
- #include "syscall-arm64.h"
-+#elif defined(__mips__)
-+#include "syscall-mips.h"
- #else
- #warning "using generic syscall method"
- #include "syscall-generic.h"
-Index: libaio-0.3.110/src/syscall-mips.h
-===================================================================
---- /dev/null
-+++ libaio-0.3.110/src/syscall-mips.h
-@@ -0,0 +1,223 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License. See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 1995, 96, 97, 98, 99, 2000 by Ralf Baechle
-+ * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
-+ *
-+ * Changed system calls macros _syscall5 - _syscall7 to push args 5 to 7 onto
-+ * the stack. Robin Farine for ACN S.A, Copyright (C) 1996 by ACN S.A
-+ */
-+
-+#ifndef _MIPS_SIM_ABI32
-+#define _MIPS_SIM_ABI32 1
-+#define _MIPS_SIM_NABI32 2
-+#define _MIPS_SIM_ABI64 3
-+#endif
-+
-+#if _MIPS_SIM == _MIPS_SIM_ABI32
-+
-+/*
-+ * Linux o32 style syscalls are in the range from 4000 to 4999.
-+ */
-+#define __NR_Linux 4000
-+#define __NR_io_setup (__NR_Linux + 241)
-+#define __NR_io_destroy (__NR_Linux + 242)
-+#define __NR_io_getevents (__NR_Linux + 243)
-+#define __NR_io_submit (__NR_Linux + 244)
-+#define __NR_io_cancel (__NR_Linux + 245)
-+
-+#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
-+
-+#if _MIPS_SIM == _MIPS_SIM_ABI64
-+
-+/*
-+ * Linux 64-bit syscalls are in the range from 5000 to 5999.
-+ */
-+#define __NR_Linux 5000
-+#define __NR_io_setup (__NR_Linux + 200)
-+#define __NR_io_destroy (__NR_Linux + 201)
-+#define __NR_io_getevents (__NR_Linux + 202)
-+#define __NR_io_submit (__NR_Linux + 203)
-+#define __NR_io_cancel (__NR_Linux + 204)
-+#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
-+
-+#if _MIPS_SIM == _MIPS_SIM_NABI32
-+
-+/*
-+ * Linux N32 syscalls are in the range from 6000 to 6999.
-+ */
-+#define __NR_Linux 6000
-+#define __NR_io_setup (__NR_Linux + 200)
-+#define __NR_io_destroy (__NR_Linux + 201)
-+#define __NR_io_getevents (__NR_Linux + 202)
-+#define __NR_io_submit (__NR_Linux + 203)
-+#define __NR_io_cancel (__NR_Linux + 204)
-+#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
-+
-+#define io_syscall1(type,fname,sname,atype,a) \
-+type fname(atype a) \
-+{ \
-+ register unsigned long __a0 asm("$4") = (unsigned long) a; \
-+ register unsigned long __a3 asm("$7"); \
-+ unsigned long __v0; \
-+ \
-+ __asm__ volatile ( \
-+ ".set\tnoreorder\n\t" \
-+ "li\t$2, %3\t\t\t# " #fname "\n\t" \
-+ "syscall\n\t" \
-+ "move\t%0, $2\n\t" \
-+ ".set\treorder" \
-+ : "=&r" (__v0), "=r" (__a3) \
-+ : "r" (__a0), "i" (__NR_##sname) \
-+ : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-+ "memory"); \
-+ \
-+ if (__a3 == 0) \
-+ return (type) __v0; \
-+ return (type) -1; \
-+}
-+
-+#define io_syscall2(type,fname,sname,atype,a,btype,b) \
-+type fname(atype a, btype b) \
-+{ \
-+ register unsigned long __a0 asm("$4") = (unsigned long) a; \
-+ register unsigned long __a1 asm("$5") = (unsigned long) b; \
-+ register unsigned long __a3 asm("$7"); \
-+ unsigned long __v0; \
-+ \
-+ __asm__ volatile ( \
-+ ".set\tnoreorder\n\t" \
-+ "li\t$2, %4\t\t\t# " #fname "\n\t" \
-+ "syscall\n\t" \
-+ "move\t%0, $2\n\t" \
-+ ".set\treorder" \
-+ : "=&r" (__v0), "=r" (__a3) \
-+ : "r" (__a0), "r" (__a1), "i" (__NR_##sname) \
-+ : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-+ "memory"); \
-+ \
-+ if (__a3 == 0) \
-+ return (type) __v0; \
-+ return (type) -1; \
-+}
-+
-+#define io_syscall3(type,fname,sname,atype,a,btype,b,ctype,c) \
-+type fname(atype a, btype b, ctype c) \
-+{ \
-+ register unsigned long __a0 asm("$4") = (unsigned long) a; \
-+ register unsigned long __a1 asm("$5") = (unsigned long) b; \
-+ register unsigned long __a2 asm("$6") = (unsigned long) c; \
-+ register unsigned long __a3 asm("$7"); \
-+ unsigned long __v0; \
-+ \
-+ __asm__ volatile ( \
-+ ".set\tnoreorder\n\t" \
-+ "li\t$2, %5\t\t\t# " #fname "\n\t" \
-+ "syscall\n\t" \
-+ "move\t%0, $2\n\t" \
-+ ".set\treorder" \
-+ : "=&r" (__v0), "=r" (__a3) \
-+ : "r" (__a0), "r" (__a1), "r" (__a2), "i" (__NR_##sname) \
-+ : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-+ "memory"); \
-+ \
-+ if (__a3 == 0) \
-+ return (type) __v0; \
-+ return (type) -1; \
-+}
-+
-+#define io_syscall4(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d) \
-+type fname(atype a, btype b, ctype c, dtype d) \
-+{ \
-+ register unsigned long __a0 asm("$4") = (unsigned long) a; \
-+ register unsigned long __a1 asm("$5") = (unsigned long) b; \
-+ register unsigned long __a2 asm("$6") = (unsigned long) c; \
-+ register unsigned long __a3 asm("$7") = (unsigned long) d; \
-+ unsigned long __v0; \
-+ \
-+ __asm__ volatile ( \
-+ ".set\tnoreorder\n\t" \
-+ "li\t$2, %5\t\t\t# " #fname "\n\t" \
-+ "syscall\n\t" \
-+ "move\t%0, $2\n\t" \
-+ ".set\treorder" \
-+ : "=&r" (__v0), "+r" (__a3) \
-+ : "r" (__a0), "r" (__a1), "r" (__a2), "i" (__NR_##sname) \
-+ : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-+ "memory"); \
-+ \
-+ if (__a3 == 0) \
-+ return (type) __v0; \
-+ return (type) -1; \
-+}
-+
-+#if (_MIPS_SIM == _MIPS_SIM_ABI32)
-+
-+/*
-+ * Using those means your brain needs more than an oil change ;-)
-+ */
-+
-+#define io_syscall5(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d,etype,e) \
-+type fname(atype a, btype b, ctype c, dtype d, etype e) \
-+{ \
-+ register unsigned long __a0 asm("$4") = (unsigned long) a; \
-+ register unsigned long __a1 asm("$5") = (unsigned long) b; \
-+ register unsigned long __a2 asm("$6") = (unsigned long) c; \
-+ register unsigned long __a3 asm("$7") = (unsigned long) d; \
-+ unsigned long __v0; \
-+ \
-+ __asm__ volatile ( \
-+ ".set\tnoreorder\n\t" \
-+ "lw\t$2, %6\n\t" \
-+ "subu\t$29, 32\n\t" \
-+ "sw\t$2, 16($29)\n\t" \
-+ "li\t$2, %5\t\t\t# " #fname "\n\t" \
-+ "syscall\n\t" \
-+ "move\t%0, $2\n\t" \
-+ "addiu\t$29, 32\n\t" \
-+ ".set\treorder" \
-+ : "=&r" (__v0), "+r" (__a3) \
-+ : "r" (__a0), "r" (__a1), "r" (__a2), "i" (__NR_##sname), \
-+ "m" ((unsigned long)e) \
-+ : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-+ "memory"); \
-+ \
-+ if (__a3 == 0) \
-+ return (type) __v0; \
-+ return (type) -1; \
-+}
-+
-+#endif /* (_MIPS_SIM == _MIPS_SIM_ABI32) */
-+
-+#if (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64)
-+
-+#define io_syscall5(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d,etype,e) \
-+type fname (atype a,btype b,ctype c,dtype d,etype e) \
-+{ \
-+ register unsigned long __a0 asm("$4") = (unsigned long) a; \
-+ register unsigned long __a1 asm("$5") = (unsigned long) b; \
-+ register unsigned long __a2 asm("$6") = (unsigned long) c; \
-+ register unsigned long __a3 asm("$7") = (unsigned long) d; \
-+ register unsigned long __a4 asm("$8") = (unsigned long) e; \
-+ unsigned long __v0; \
-+ \
-+ __asm__ volatile ( \
-+ ".set\tnoreorder\n\t" \
-+ "li\t$2, %6\t\t\t# " #fname "\n\t" \
-+ "syscall\n\t" \
-+ "move\t%0, $2\n\t" \
-+ ".set\treorder" \
-+ : "=&r" (__v0), "+r" (__a3) \
-+ : "r" (__a0), "r" (__a1), "r" (__a2), "r" (__a4), "i" (__NR_##sname) \
-+ : "$2", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-+ "memory"); \
-+ \
-+ if (__a3 == 0) \
-+ return (type) __v0; \
-+ return (type) -1; \
-+}
-+
-+#endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */
-+
diff --git a/package/libaio/0002-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch b/package/libaio/0001-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch
index 50703c3f53..9c876bdc5c 100644
--- a/package/libaio/0002-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch
+++ b/package/libaio/0001-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch
@@ -1,4 +1,4 @@
-From 14dee5707716629b1bc8d06b93cdfe9ea1a3b813 Mon Sep 17 00:00:00 2001
+From 4dc04ef55710f7f5c1e55ebb5cba8e22a126404e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 29 Aug 2016 22:14:26 +0200
Subject: [PATCH] src/Makefile: add ENABLE_SHARED boolean to allow static-only
@@ -52,5 +52,5 @@ index eadb336..cfab240 100644
$(libaio_objs): libaio.h
--
-2.7.4
+2.14.4
diff --git a/package/libaio/0003-destdir.patch b/package/libaio/0002-Makefile-add-missing-DESTDIR-variable-use.patch
index 583a2afa86..49b9892ea4 100644
--- a/package/libaio/0003-destdir.patch
+++ b/package/libaio/0002-Makefile-add-missing-DESTDIR-variable-use.patch
@@ -1,19 +1,24 @@
+From 517d9fbe63fbd7e72445dce1cb3f3d8457d838cb Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Date: Tue, 14 Aug 2018 23:17:25 +0200
+Subject: [PATCH] Makefile: add missing DESTDIR variable use
+
Patch borrowed from OpenEmbedded, available at
recipes/libaio/libaio-0.3.106/destdir.patch in their source tree.
It just adds support for the traditional DESTDIR variable to install
the library in a different sysroot than the normal /.
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
- Makefile | 2 +-
+ Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: libaio-0.3.109/Makefile
-===================================================================
---- libaio-0.3.109.orig/Makefile
-+++ libaio-0.3.109/Makefile
-@@ -23,7 +23,7 @@
+diff --git a/Makefile b/Makefile
+index e9dbdb0..c1fb831 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,7 @@ all:
@$(MAKE) -C src
install:
@@ -22,3 +27,6 @@ Index: libaio-0.3.109/Makefile
check:
@$(MAKE) -C harness check
+--
+2.14.4
+
diff --git a/package/libaio/Config.in b/package/libaio/Config.in
index ea21a36f55..eed843f44b 100644
--- a/package/libaio/Config.in
+++ b/package/libaio/Config.in
@@ -1,12 +1,6 @@
-config BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
- bool
- default y if BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \
- BR2_m68k || BR2_mips || BR2_mipsel || BR2_powerpc || \
- BR2_powerpc64 || BR2_powerpc64le || BR2_sparc || \
- BR2_x86_64
-
config BR2_PACKAGE_LIBAIO
bool "libaio"
- depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
help
Library for doing asynchronous I/O
+
+ https://pagure.io/libaio/
diff --git a/package/libaio/libaio.hash b/package/libaio/libaio.hash
index 5917e2f783..17dd1ff706 100644
--- a/package/libaio/libaio.hash
+++ b/package/libaio/libaio.hash
@@ -1,5 +1,5 @@
-# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/liba/libaio/libaio_0.3.110-1.dsc
-sha256 e019028e631725729376250e32b473012f7cb68e1f7275bfc1bbcdd0f8745f7e libaio_0.3.110.orig.tar.gz
+# From https://releases.pagure.org/libaio/CHECKSUMS
+sha256 62cf871ad8fd09eb3418f00aca7a7d449299b8e1de31c65f28bf6a2ef1fa502a libaio-0.3.111.tar.gz
# Hash for license file:
sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING
diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk
index 03029d84d8..adb4d1c4b1 100644
--- a/package/libaio/libaio.mk
+++ b/package/libaio/libaio.mk
@@ -4,9 +4,8 @@
#
################################################################################
-LIBAIO_VERSION = 0.3.110
-LIBAIO_SOURCE = libaio_$(LIBAIO_VERSION).orig.tar.gz
-LIBAIO_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/liba/libaio
+LIBAIO_VERSION = 0.3.111
+LIBAIO_SITE = https://releases.pagure.org/libaio
LIBAIO_INSTALL_STAGING = YES
LIBAIO_LICENSE = LGPL-2.1+
LIBAIO_LICENSE_FILES = COPYING
@@ -35,4 +34,13 @@ define LIBAIO_INSTALL_TARGET_CMDS
$(LIBAIO_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
endef
+define HOST_LIBAIO_BUILD_CMDS
+ $(HOST_CONFIGURE_OPTS) $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_LIBAIO_INSTALL_CMDS
+ $(HOST_CONFIGURE_OPTS) $(HOST_MAKE_ENV) $(MAKE) -C $(@D) prefix=$(HOST_DIR) install
+endef
+
$(eval $(generic-package))
+$(eval $(host-generic-package))
diff --git a/package/libcpprestsdk/0002-fix-template-whitespace-syntax.patch b/package/libcpprestsdk/0002-fix-template-whitespace-syntax.patch
deleted file mode 100644
index 81f7ea19ec..0000000000
--- a/package/libcpprestsdk/0002-fix-template-whitespace-syntax.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 546e89a29a82cc4f7de6c99be5a07221aa7443df Mon Sep 17 00:00:00 2001
-From: Adam Duskett <aduskett@gmail.com>
-Date: Fri, 9 Mar 2018 08:09:52 -0500
-Subject: [PATCH] fix template whitespace syntax
-
-Some files don't have a space inbetween the '<' and '::' charachters, which
-will cause build failures on older toolchains. Adding a space inbetween these
-two characters fixes the issue.
-
-upstream-status: pending
-https://github.com/Microsoft/cpprestsdk/pull/715
-
-Signed-off-by: Adam Duskett <aduskett@gmail.com>
----
- Release/include/cpprest/details/web_utilities.h | 2 +-
- Release/include/cpprest/http_client.h | 2 +-
- Release/include/cpprest/json.h | 2 +-
- Release/include/cpprest/ws_client.h | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Release/include/cpprest/details/web_utilities.h b/Release/include/cpprest/details/web_utilities.h
-index ba641654..9855c315 100644
---- a/Release/include/cpprest/details/web_utilities.h
-+++ b/Release/include/cpprest/details/web_utilities.h
-@@ -33,7 +33,7 @@ class zero_memory_deleter
- public:
- _ASYNCRTIMP void operator()(::utility::string_t *data) const;
- };
--typedef std::unique_ptr<::utility::string_t, zero_memory_deleter> plaintext_string;
-+typedef std::unique_ptr< ::utility::string_t, zero_memory_deleter> plaintext_string;
-
- #if defined(_WIN32) && !defined(CPPREST_TARGET_XP)
- #if defined(__cplusplus_winrt)
-diff --git a/Release/include/cpprest/http_client.h b/Release/include/cpprest/http_client.h
-index a936a23e..f5ad8fac 100644
---- a/Release/include/cpprest/http_client.h
-+++ b/Release/include/cpprest/http_client.h
-@@ -757,7 +757,7 @@ public:
-
- private:
-
-- std::shared_ptr<::web::http::client::http_pipeline> m_pipeline;
-+ std::shared_ptr< ::web::http::client::http_pipeline> m_pipeline;
- };
-
- namespace details {
-diff --git a/Release/include/cpprest/json.h b/Release/include/cpprest/json.h
-index 07c54502..dfdeead4 100644
---- a/Release/include/cpprest/json.h
-+++ b/Release/include/cpprest/json.h
-@@ -301,7 +301,7 @@ public:
- /// <param name="fields">Field names associated with JSON values</param>
- /// <param name="keep_order">Whether to preserve the original order of the fields</param>
- /// <returns>A non-empty JSON object value</returns>
-- static _ASYNCRTIMP json::value __cdecl object(std::vector<std::pair<::utility::string_t, value>> fields, bool keep_order = false);
-+ static _ASYNCRTIMP json::value __cdecl object(std::vector<std::pair< ::utility::string_t, value>> fields, bool keep_order = false);
-
- /// <summary>
- /// Creates an empty JSON array
-diff --git a/Release/include/cpprest/ws_client.h b/Release/include/cpprest/ws_client.h
-index 9a324cde..98f933e1 100644
---- a/Release/include/cpprest/ws_client.h
-+++ b/Release/include/cpprest/ws_client.h
-@@ -184,7 +184,7 @@ public:
- /// <returns>Vector of all the subprotocols </returns>
- /// <remarks>If you want all the subprotocols in a comma separated string
- /// they can be directly looked up in the headers using 'Sec-WebSocket-Protocol'.</remarks>
-- _ASYNCRTIMP std::vector<::utility::string_t> subprotocols() const;
-+ _ASYNCRTIMP std::vector< ::utility::string_t> subprotocols() const;
-
- /// <summary>
- /// Gets the server certificate validation property.
---
-2.14.3
-
diff --git a/package/libcpprestsdk/libcpprestsdk.hash b/package/libcpprestsdk/libcpprestsdk.hash
index 20a9395329..b8c5d5430e 100644
--- a/package/libcpprestsdk/libcpprestsdk.hash
+++ b/package/libcpprestsdk/libcpprestsdk.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 fb0b611007732d8de9528bc37bd67468e7ef371672f89c88f225f73cdc4ffcf1 libcpprestsdk-v2.10.2.tar.gz
+sha256 cf4d57bdcc1ce53f1d228156620dd87af95cbff109d85c81e8be01d0bb58fd25 libcpprestsdk-v2.10.5.tar.gz
sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97 license.txt
diff --git a/package/libcpprestsdk/libcpprestsdk.mk b/package/libcpprestsdk/libcpprestsdk.mk
index 20700ae2b2..14526e7de4 100644
--- a/package/libcpprestsdk/libcpprestsdk.mk
+++ b/package/libcpprestsdk/libcpprestsdk.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBCPPRESTSDK_VERSION = v2.10.2
+LIBCPPRESTSDK_VERSION = v2.10.5
LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,$(LIBCPPRESTSDK_VERSION))
LIBCPPRESTSDK_LICENSE = MIT
LIBCPPRESTSDK_LICENSE_FILES = license.txt
diff --git a/package/libepoxy/libepoxy.hash b/package/libepoxy/libepoxy.hash
index 654d1675fd..dd1b13487b 100644
--- a/package/libepoxy/libepoxy.hash
+++ b/package/libepoxy/libepoxy.hash
@@ -1,5 +1,5 @@
-# From ftp://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.0.sha256sum
-sha256 4c94995398a6ebf691600dda2e9685a0cac261414175c2adf4645cdfab42a5d5 libepoxy-1.5.0.tar.xz
+# From http://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.2.sha256sum
+sha256 a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8 libepoxy-1.5.2.tar.xz
# Hashes for license files:
sha256 8d5144666f9c4df9bbd69b8900086d5979259152a1060421cdcc0fb9061a1c12 COPYING
diff --git a/package/libepoxy/libepoxy.mk b/package/libepoxy/libepoxy.mk
index b9498b17b4..b1731a22c5 100644
--- a/package/libepoxy/libepoxy.mk
+++ b/package/libepoxy/libepoxy.mk
@@ -5,7 +5,7 @@
################################################################################
LIBEPOXY_VERSION_MAJOR = 1.5
-LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).0
+LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).2
LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR)
LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz
LIBEPOXY_INSTALL_STAGING = YES
diff --git a/package/libidn2/libidn2.hash b/package/libidn2/libidn2.hash
index 980f78f50d..4afb634e86 100644
--- a/package/libidn2/libidn2.hash
+++ b/package/libidn2/libidn2.hash
@@ -1,5 +1,5 @@
-# From Calculated locally after checking signature
-sha256 644b6b03b285fb0ace02d241d59483d98bc462729d8bb3608d5cad5532f3d2f0 libidn2-2.0.4.tar.gz
+# Calculated locally after checking signature
+sha256 53f69170886f1fa6fa5b332439c7a77a7d22626a82ef17e2c1224858bb4ca2b8 libidn2-2.0.5.tar.gz
# Hash for license files:
sha256 4fa501e804195b4136c9cec4bc510365b8cbaf4bc075d6401a77ae0213370457 COPYING
diff --git a/package/libidn2/libidn2.mk b/package/libidn2/libidn2.mk
index d47913b2eb..8e01fba1c4 100644
--- a/package/libidn2/libidn2.mk
+++ b/package/libidn2/libidn2.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBIDN2_VERSION = 2.0.4
+LIBIDN2_VERSION = 2.0.5
LIBIDN2_SITE = $(BR2_GNU_MIRROR)/libidn
LIBIDN2_LICENSE := GPL-2.0+ or LGPL-3.0+ (library)
LIBIDN2_LICENSE_FILES = COPYING COPYINGv2 COPYING.LESSERv3 COPYING.unicode
diff --git a/package/libiio/Config.in b/package/libiio/Config.in
index b58ac7fdb3..dcc7c79d1a 100644
--- a/package/libiio/Config.in
+++ b/package/libiio/Config.in
@@ -60,16 +60,14 @@ config BR2_PACKAGE_LIBIIO_IIOD
config BR2_PACKAGE_LIBIIO_IIOD_USBD
bool "USB support in the IIO Daemon (FunctionFS)"
depends on BR2_PACKAGE_LIBIIO_IIOD
- depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # usb_functionfs_descs_head_v2
select BR2_PACKAGE_LIBAIO
help
Add support for USB through FunctionFS with IIOD.
-comment "USB support in the IIO Daemon requires libaio, headers >= 3.18"
+comment "USB support in the IIO Daemon requires headers >= 3.18"
depends on BR2_PACKAGE_LIBIIO_IIOD
- depends on !BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS || \
- !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
+ depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
comment "IIO Daemon needs a toolchain w/ threads"
depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash
index 2d501ccf93..d41016ed7a 100644
--- a/package/libostree/libostree.hash
+++ b/package/libostree/libostree.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 483e359fd934f3fb1abde2cd8ff9c5bccb97e2a37d52ed8bedfa9ab1290883d9 libostree-2018.7.tar.xz
+sha256 beef6debb0065bf1dc7538cd036c5f0348ac102ca4ad6d8651feff146130a844 libostree-2018.8.tar.xz
sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING
diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk
index 349e6a0881..66c5e5b5b0 100644
--- a/package/libostree/libostree.mk
+++ b/package/libostree/libostree.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBOSTREE_VERSION = 2018.7
+LIBOSTREE_VERSION = 2018.8
LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz
LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION)
diff --git a/package/librtlsdr/0002-fix-builds-with-newer-compilers-C-standards.patch b/package/librtlsdr/0002-fix-builds-with-newer-compilers-C-standards.patch
deleted file mode 100644
index b663d08b9f..0000000000
--- a/package/librtlsdr/0002-fix-builds-with-newer-compilers-C-standards.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From ea6a86d8e792430faa3a8161ee99f2bc392875d1 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Fri, 3 Feb 2017 15:44:18 -1000
-Subject: [PATCH] fix builds with newer compilers & C standards
-
-The meaning of "inline" has changed when "static" is not used.
-Since none of these functions are used outside of their respective
-files, mark them as static to avoid build errors where funcs are
-not inlined (based on compiler flags too).
-
-Upstream status: pull request #38
-
-Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
----
- src/rtl_adsb.c | 8 ++++----
- src/rtl_power.c | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/rtl_adsb.c b/src/rtl_adsb.c
-index e611e78..a3bfa7f 100644
---- a/src/rtl_adsb.c
-+++ b/src/rtl_adsb.c
-@@ -182,7 +182,7 @@ int magnitute(uint8_t *buf, int len)
- return len/2;
- }
-
--inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
-+static inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
- /* takes 4 consecutive real samples, return 0 or 1, BADSAMPLE on error */
- {
- int bit, bit_p;
-@@ -223,17 +223,17 @@ inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d
- return BADSAMPLE;
- }
-
--inline uint16_t min16(uint16_t a, uint16_t b)
-+static inline uint16_t min16(uint16_t a, uint16_t b)
- {
- return a<b ? a : b;
- }
-
--inline uint16_t max16(uint16_t a, uint16_t b)
-+static inline uint16_t max16(uint16_t a, uint16_t b)
- {
- return a>b ? a : b;
- }
-
--inline int preamble(uint16_t *buf, int i)
-+static inline int preamble(uint16_t *buf, int i)
- /* returns 0/1 for preamble at index i */
- {
- int i2;
-diff --git a/src/rtl_power.c b/src/rtl_power.c
-index aa7a138..a7a43bb 100644
---- a/src/rtl_power.c
-+++ b/src/rtl_power.c
-@@ -249,7 +249,7 @@ void sine_table(int size)
- }
- }
-
--inline int16_t FIX_MPY(int16_t a, int16_t b)
-+static inline int16_t FIX_MPY(int16_t a, int16_t b)
- /* fixed point multiply and scale */
- {
- int c = ((int)a * (int)b) >> 14;
---
-2.13.0
-
diff --git a/package/librtlsdr/librtlsdr.hash b/package/librtlsdr/librtlsdr.hash
index 9184196d9a..e7b0e84f4a 100644
--- a/package/librtlsdr/librtlsdr.hash
+++ b/package/librtlsdr/librtlsdr.hash
@@ -1,4 +1,4 @@
# Locally calculated
-sha256 6fd0d298c1a18fc8005b0c2f6199b08bc15e3fb4f4312f551eea2ae269c940c5 librtlsdr-v0.5.4.tar.gz
+sha256 80a5155f3505bca8f1b808f8414d7dcd7c459b662a1cde84d3a2629a6e72ae55 librtlsdr-0.6.0.tar.gz
# License file, locally calculated
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk
index dd1feacc03..500ccc5d17 100644
--- a/package/librtlsdr/librtlsdr.mk
+++ b/package/librtlsdr/librtlsdr.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBRTLSDR_VERSION = v0.5.4
+LIBRTLSDR_VERSION = 0.6.0
LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION))
LIBRTLSDR_LICENSE = GPL-2.0+
LIBRTLSDR_LICENSE_FILES = COPYING
diff --git a/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch b/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch
new file mode 100644
index 0000000000..c27ee986c6
--- /dev/null
+++ b/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch
@@ -0,0 +1,27 @@
+From 015926c80fa3e9704f05cbc1ad17f0a877f8de09 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Date: Sat, 1 Sep 2018 15:39:04 +0200
+Subject: [PATCH] Revert "tld-parser: use Python 3"
+
+This reverts commit 4b924e573da307436169d5ef7e04c0ab85b36ef9. The
+script runs just fine with Python 2.x, there is no reason to enforce
+using Python 3.x.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ libsoup/tld-parser.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/tld-parser.py b/libsoup/tld-parser.py
+index a743471a..5d9d2ba5 100755
+--- a/libsoup/tld-parser.py
++++ b/libsoup/tld-parser.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python3
++#!/usr/bin/env python
+
+ # Generate tld rules
+ # Copyright (C) 2012 Red Hat, Inc.
+--
+2.14.4
+
diff --git a/package/libsoup/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch b/package/libsoup/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch
deleted file mode 100644
index 46c7cb4fd8..0000000000
--- a/package/libsoup/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3f5635028bbad44287511fcd3c99f2a2fddf01cd Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@igalia.com>
-Date: Sun, 24 Jun 2018 19:46:19 -0500
-Subject: [PATCH] cookie-jar: bail if hostname is an empty string
-
-There are several other ways to fix the problem with this function, but
-skipping over all of the code is probably the simplest.
-
-Fixes #3
-
-
-(cherry picked from commit db2b0d5809d5f8226d47312b40992cadbcde439f)
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: commit db2b0d5809d
-
- libsoup/soup-cookie-jar.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libsoup/soup-cookie-jar.c b/libsoup/soup-cookie-jar.c
-index d12bc85a8e60..365da6abf9f4 100644
---- a/libsoup/soup-cookie-jar.c
-+++ b/libsoup/soup-cookie-jar.c
-@@ -306,7 +306,7 @@ get_cookies (SoupCookieJar *jar, SoupURI *uri, gboolean for_http, gboolean copy_
-
- priv = SOUP_COOKIE_JAR_GET_PRIVATE (jar);
-
-- if (!uri->host)
-+ if (!uri->host || !uri->host[0])
- return NULL;
-
- /* The logic here is a little weird, but the plan is that if
---
-2.18.0
-
diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash
index 6e1ff428af..666bbc278b 100644
--- a/package/libsoup/libsoup.hash
+++ b/package/libsoup/libsoup.hash
@@ -1,4 +1,4 @@
-# From http://ftp.gnome.org/pub/gnome/sources/libsoup/2.56/libsoup-2.56.1.sha256sum
-sha256 c32a46d77b4da433b51d8fd09a57a44b198e03bdc93e5219afcc687c7948eac3 libsoup-2.56.1.tar.xz
+# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.62/libsoup-2.62.3.sha256sum
+sha256 d312ade547495c2093ff8bda61f9b9727a98cfdae339f3263277dd39c0451172 libsoup-2.62.3.tar.xz
# Locally calculated
sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index a3ce686aa7..95bd682010 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -4,8 +4,8 @@
#
################################################################################
-LIBSOUP_VERSION_MAJOR = 2.56
-LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).1
+LIBSOUP_VERSION_MAJOR = 2.62
+LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).3
LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz
LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR)
LIBSOUP_LICENSE = LGPL-2.0+
diff --git a/package/libsrtp/0001-Rename-SHA1-functions-to-avoid-conflicts-with-downst.patch b/package/libsrtp/0001-Rename-SHA1-functions-to-avoid-conflicts-with-downst.patch
deleted file mode 100644
index 60a123eccd..0000000000
--- a/package/libsrtp/0001-Rename-SHA1-functions-to-avoid-conflicts-with-downst.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-From f76eb65d008d0c8e06698e4a63a776e91b80155b Mon Sep 17 00:00:00 2001
-From: jfigus <foleyj@cisco.com>
-Date: Tue, 4 Nov 2014 14:54:02 -0500
-Subject: [PATCH] Rename SHA1 functions to avoid conflicts with downstream
- packages.
-
-Backported from upstream commit c270245a94ae9a007202754eb8f7ce9e48f97007
-and tweaked to apply on top of v1.5.4.
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
----
- crypto/hash/hmac.c | 20 ++++++++++----------
- crypto/hash/hmac_ossl.c | 18 +++++++++---------
- crypto/hash/sha1.c | 32 ++++++++++++++++----------------
- crypto/include/hmac.h | 4 ++--
- crypto/include/sha1.h | 34 +++++++++++++++++-----------------
- crypto/test/sha1_driver.c | 8 ++++----
- 6 files changed, 58 insertions(+), 58 deletions(-)
-
-diff --git a/crypto/hash/hmac.c b/crypto/hash/hmac.c
-index ddb75ea..4bed61e 100644
---- a/crypto/hash/hmac.c
-+++ b/crypto/hash/hmac.c
-@@ -141,11 +141,11 @@ hmac_init(hmac_ctx_t *state, const uint8_t *key, int key_len) {
- debug_print(mod_hmac, "ipad: %s", octet_string_hex_string(ipad, 64));
-
- /* initialize sha1 context */
-- sha1_init(&state->init_ctx);
-+ srtp_sha1_init(&state->init_ctx);
-
- /* hash ipad ^ key */
-- sha1_update(&state->init_ctx, ipad, 64);
-- memcpy(&state->ctx, &state->init_ctx, sizeof(sha1_ctx_t));
-+ srtp_sha1_update(&state->init_ctx, ipad, 64);
-+ memcpy(&state->ctx, &state->init_ctx, sizeof(srtp_sha1_ctx_t));
-
- return err_status_ok;
- }
-@@ -153,7 +153,7 @@ hmac_init(hmac_ctx_t *state, const uint8_t *key, int key_len) {
- err_status_t
- hmac_start(hmac_ctx_t *state) {
-
-- memcpy(&state->ctx, &state->init_ctx, sizeof(sha1_ctx_t));
-+ memcpy(&state->ctx, &state->init_ctx, sizeof(srtp_sha1_ctx_t));
-
- return err_status_ok;
- }
-@@ -165,7 +165,7 @@ hmac_update(hmac_ctx_t *state, const uint8_t *message, int msg_octets) {
- octet_string_hex_string(message, msg_octets));
-
- /* hash message into sha1 context */
-- sha1_update(&state->ctx, message, msg_octets);
-+ srtp_sha1_update(&state->ctx, message, msg_octets);
-
- return err_status_ok;
- }
-@@ -183,7 +183,7 @@ hmac_compute(hmac_ctx_t *state, const void *message,
-
- /* hash message, copy output into H */
- hmac_update(state, (const uint8_t*)message, msg_octets);
-- sha1_final(&state->ctx, H);
-+ srtp_sha1_final(&state->ctx, H);
-
- /*
- * note that we don't need to debug_print() the input, since the
-@@ -193,16 +193,16 @@ hmac_compute(hmac_ctx_t *state, const void *message,
- octet_string_hex_string((uint8_t *)H, 20));
-
- /* re-initialize hash context */
-- sha1_init(&state->ctx);
-+ srtp_sha1_init(&state->ctx);
-
- /* hash opad ^ key */
-- sha1_update(&state->ctx, (uint8_t *)state->opad, 64);
-+ srtp_sha1_update(&state->ctx, (uint8_t *)state->opad, 64);
-
- /* hash the result of the inner hash */
-- sha1_update(&state->ctx, (uint8_t *)H, 20);
-+ srtp_sha1_update(&state->ctx, (uint8_t *)H, 20);
-
- /* the result is returned in the array hash_value[] */
-- sha1_final(&state->ctx, hash_value);
-+ srtp_sha1_final(&state->ctx, hash_value);
-
- /* copy hash_value to *result */
- for (i=0; i < tag_len; i++)
-diff --git a/crypto/hash/hmac_ossl.c b/crypto/hash/hmac_ossl.c
-index f62ce57..2ec8350 100644
---- a/crypto/hash/hmac_ossl.c
-+++ b/crypto/hash/hmac_ossl.c
-@@ -163,11 +163,11 @@ hmac_init (hmac_ctx_t *state, const uint8_t *key, int key_len)
- debug_print(mod_hmac, "ipad: %s", octet_string_hex_string(ipad, sizeof(ipad)));
-
- /* initialize sha1 context */
-- sha1_init(&state->init_ctx);
-+ srtp_sha1_init(&state->init_ctx);
- state->init_ctx_initialized = 1;
-
- /* hash ipad ^ key */
-- sha1_update(&state->init_ctx, ipad, sizeof(ipad));
-+ srtp_sha1_update(&state->init_ctx, ipad, sizeof(ipad));
- return (hmac_start(state));
- }
-
-@@ -192,7 +192,7 @@ hmac_update (hmac_ctx_t *state, const uint8_t *message, int msg_octets)
- octet_string_hex_string(message, msg_octets));
-
- /* hash message into sha1 context */
-- sha1_update(&state->ctx, message, msg_octets);
-+ srtp_sha1_update(&state->ctx, message, msg_octets);
-
- return err_status_ok;
- }
-@@ -211,8 +211,8 @@ hmac_compute (hmac_ctx_t *state, const void *message,
- }
-
- /* hash message, copy output into H */
-- sha1_update(&state->ctx, message, msg_octets);
-- sha1_final(&state->ctx, H);
-+ srtp_sha1_update(&state->ctx, message, msg_octets);
-+ srtp_sha1_final(&state->ctx, H);
-
- /*
- * note that we don't need to debug_print() the input, since the
-@@ -222,16 +222,16 @@ hmac_compute (hmac_ctx_t *state, const void *message,
- octet_string_hex_string((uint8_t*)H, sizeof(H)));
-
- /* re-initialize hash context */
-- sha1_init(&state->ctx);
-+ srtp_sha1_init(&state->ctx);
-
- /* hash opad ^ key */
-- sha1_update(&state->ctx, (uint8_t*)state->opad, sizeof(state->opad));
-+ srtp_sha1_update(&state->ctx, (uint8_t*)state->opad, sizeof(state->opad));
-
- /* hash the result of the inner hash */
-- sha1_update(&state->ctx, (uint8_t*)H, sizeof(H));
-+ srtp_sha1_update(&state->ctx, (uint8_t*)H, sizeof(H));
-
- /* the result is returned in the array hash_value[] */
-- sha1_final(&state->ctx, hash_value);
-+ srtp_sha1_final(&state->ctx, hash_value);
-
- /* copy hash_value to *result */
- for (i = 0; i < tag_len; i++) {
-diff --git a/crypto/hash/sha1.c b/crypto/hash/sha1.c
-index c200437..29c2e62 100644
---- a/crypto/hash/sha1.c
-+++ b/crypto/hash/sha1.c
-@@ -77,17 +77,17 @@ uint32_t SHA_K2 = 0x8F1BBCDC; /* Kt for 40 <= t <= 59 */
- uint32_t SHA_K3 = 0xCA62C1D6; /* Kt for 60 <= t <= 79 */
-
- void
--sha1(const uint8_t *msg, int octets_in_msg, uint32_t hash_value[5]) {
-- sha1_ctx_t ctx;
-+srtp_sha1(const uint8_t *msg, int octets_in_msg, uint32_t hash_value[5]) {
-+ srtp_sha1_ctx_t ctx;
-
-- sha1_init(&ctx);
-- sha1_update(&ctx, msg, octets_in_msg);
-- sha1_final(&ctx, hash_value);
-+ srtp_sha1_init(&ctx);
-+ srtp_sha1_update(&ctx, msg, octets_in_msg);
-+ srtp_sha1_final(&ctx, hash_value);
-
- }
-
- /*
-- * sha1_core(M, H) computes the core compression function, where M is
-+ * srtp_sha1_core(M, H) computes the core compression function, where M is
- * the next part of the message (in network byte order) and H is the
- * intermediate state { H0, H1, ...} (in host byte order)
- *
-@@ -99,7 +99,7 @@ sha1(const uint8_t *msg, int octets_in_msg, uint32_t hash_value[5]) {
- */
-
- void
--sha1_core(const uint32_t M[16], uint32_t hash_value[5]) {
-+srtp_sha1_core(const uint32_t M[16], uint32_t hash_value[5]) {
- uint32_t H0;
- uint32_t H1;
- uint32_t H2;
-@@ -186,7 +186,7 @@ sha1_core(const uint32_t M[16], uint32_t hash_value[5]) {
- }
-
- void
--sha1_init(sha1_ctx_t *ctx) {
-+srtp_sha1_init(srtp_sha1_ctx_t *ctx) {
-
- /* initialize state vector */
- ctx->H[0] = 0x67452301;
-@@ -204,7 +204,7 @@ sha1_init(sha1_ctx_t *ctx) {
- }
-
- void
--sha1_update(sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) {
-+srtp_sha1_update(srtp_sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) {
- int i;
- uint8_t *buf = (uint8_t *)ctx->M;
-
-@@ -227,13 +227,13 @@ sha1_update(sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) {
-
- /* process a whole block */
-
-- debug_print(mod_sha1, "(update) running sha1_core()", NULL);
-+ debug_print(mod_sha1, "(update) running srtp_sha1_core()", NULL);
-
-- sha1_core(ctx->M, ctx->H);
-+ srtp_sha1_core(ctx->M, ctx->H);
-
- } else {
-
-- debug_print(mod_sha1, "(update) not running sha1_core()", NULL);
-+ debug_print(mod_sha1, "(update) not running srtp_sha1_core()", NULL);
-
- for (i=ctx->octets_in_buffer;
- i < (ctx->octets_in_buffer + octets_in_msg); i++)
-@@ -247,12 +247,12 @@ sha1_update(sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) {
- }
-
- /*
-- * sha1_final(ctx, output) computes the result for ctx and copies it
-+ * srtp_sha1_final(ctx, output) computes the result for ctx and copies it
- * into the twenty octets located at *output
- */
-
- void
--sha1_final(sha1_ctx_t *ctx, uint32_t *output) {
-+srtp_sha1_final(srtp_sha1_ctx_t *ctx, uint32_t *output) {
- uint32_t A, B, C, D, E, TEMP;
- uint32_t W[80];
- int i, t;
-@@ -339,11 +339,11 @@ sha1_final(sha1_ctx_t *ctx, uint32_t *output) {
-
- }
-
-- debug_print(mod_sha1, "(final) running sha1_core()", NULL);
-+ debug_print(mod_sha1, "(final) running srtp_sha1_core()", NULL);
-
- if (ctx->octets_in_buffer >= 56) {
-
-- debug_print(mod_sha1, "(final) running sha1_core() again", NULL);
-+ debug_print(mod_sha1, "(final) running srtp_sha1_core() again", NULL);
-
- /* we need to do one final run of the compression algo */
-
-diff --git a/crypto/include/hmac.h b/crypto/include/hmac.h
-index 875f45c..9fc664e 100644
---- a/crypto/include/hmac.h
-+++ b/crypto/include/hmac.h
-@@ -51,8 +51,8 @@
-
- typedef struct {
- uint8_t opad[64];
-- sha1_ctx_t ctx;
-- sha1_ctx_t init_ctx;
-+ srtp_sha1_ctx_t ctx;
-+ srtp_sha1_ctx_t init_ctx;
- #ifdef OPENSSL
- int ctx_initialized;
- int init_ctx_initialized;
-diff --git a/crypto/include/sha1.h b/crypto/include/sha1.h
-index f1744ce..e177af6 100644
---- a/crypto/include/sha1.h
-+++ b/crypto/include/sha1.h
-@@ -56,15 +56,15 @@
- #include <openssl/evp.h>
- #include <stdint.h>
-
--typedef EVP_MD_CTX sha1_ctx_t;
-+typedef EVP_MD_CTX srtp_sha1_ctx_t;
-
- /*
-- * sha1_init(&ctx) initializes the SHA1 context ctx
-+ * srtp_sha1_init(&ctx) initializes the SHA1 context ctx
- *
-- * sha1_update(&ctx, msg, len) hashes the len octets starting at msg
-+ * srtp_sha1_update(&ctx, msg, len) hashes the len octets starting at msg
- * into the SHA1 context
- *
-- * sha1_final(&ctx, output) performs the final processing of the SHA1
-+ * srtp_sha1_final(&ctx, output) performs the final processing of the SHA1
- * context and writes the result to the 20 octets at output
- *
- * Return values are ignored on the EVP functions since all three
-@@ -72,18 +72,18 @@ typedef EVP_MD_CTX sha1_ctx_t;
- *
- */
-
--static inline void sha1_init (sha1_ctx_t *ctx)
-+static inline void srtp_sha1_init (srtp_sha1_ctx_t *ctx)
- {
- EVP_MD_CTX_init(ctx);
- EVP_DigestInit(ctx, EVP_sha1());
- }
-
--static inline void sha1_update (sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg)
-+static inline void srtp_sha1_update (srtp_sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg)
- {
- EVP_DigestUpdate(ctx, M, octets_in_msg);
- }
-
--static inline void sha1_final (sha1_ctx_t *ctx, uint32_t *output)
-+static inline void srtp_sha1_final (srtp_sha1_ctx_t *ctx, uint32_t *output)
- {
- unsigned int len = 0;
-
-@@ -97,7 +97,7 @@ typedef struct {
- uint32_t M[16]; /* message buffer */
- int octets_in_buffer; /* octets of message in buffer */
- uint32_t num_bits_in_msg; /* total number of bits in message */
--} sha1_ctx_t;
-+} srtp_sha1_ctx_t;
-
- /*
- * sha1(&ctx, msg, len, output) hashes the len octets starting at msg
-@@ -110,33 +110,33 @@ void
- sha1(const uint8_t *message, int octets_in_msg, uint32_t output[5]);
-
- /*
-- * sha1_init(&ctx) initializes the SHA1 context ctx
-+ * srtp_sha1_init(&ctx) initializes the SHA1 context ctx
- *
-- * sha1_update(&ctx, msg, len) hashes the len octets starting at msg
-+ * srtp_sha1_update(&ctx, msg, len) hashes the len octets starting at msg
- * into the SHA1 context
- *
-- * sha1_final(&ctx, output) performs the final processing of the SHA1
-+ * srtp_sha1_final(&ctx, output) performs the final processing of the SHA1
- * context and writes the result to the 20 octets at output
- *
- */
-
- void
--sha1_init(sha1_ctx_t *ctx);
-+srtp_sha1_init(srtp_sha1_ctx_t *ctx);
-
- void
--sha1_update(sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg);
-+srtp_sha1_update(srtp_sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg);
-
- void
--sha1_final(sha1_ctx_t *ctx, uint32_t output[5]);
-+srtp_sha1_final(srtp_sha1_ctx_t *ctx, uint32_t output[5]);
-
- /*
-- * The sha1_core function is INTERNAL to SHA-1, but it is declared
-+ * The srtp_sha1_core function is INTERNAL to SHA-1, but it is declared
- * here because it is also used by the cipher SEAL 3.0 in its key
- * setup algorithm.
- */
-
- /*
-- * sha1_core(M, H) computes the core sha1 compression function, where M is
-+ * srtp_sha1_core(M, H) computes the core sha1 compression function, where M is
- * the next part of the message and H is the intermediate state {H0,
- * H1, ...}
- *
-@@ -145,7 +145,7 @@ sha1_final(sha1_ctx_t *ctx, uint32_t output[5]);
- */
-
- void
--sha1_core(const uint32_t M[16], uint32_t hash_value[5]);
-+srtp_sha1_core(const uint32_t M[16], uint32_t hash_value[5]);
-
- #endif /* else OPENSSL */
-
-diff --git a/crypto/test/sha1_driver.c b/crypto/test/sha1_driver.c
-index 6adfad1..2e19479 100644
---- a/crypto/test/sha1_driver.c
-+++ b/crypto/test/sha1_driver.c
-@@ -102,7 +102,7 @@ hash_test_case_add(hash_test_case_t **list_ptr,
-
- err_status_t
- sha1_test_case_validate(const hash_test_case_t *test_case) {
-- sha1_ctx_t ctx;
-+ srtp_sha1_ctx_t ctx;
- uint32_t hash_value[5];
-
- if (test_case == NULL)
-@@ -113,9 +113,9 @@ sha1_test_case_validate(const hash_test_case_t *test_case) {
- if (test_case->data_len > MAX_HASH_DATA_LEN)
- return err_status_bad_param;
-
-- sha1_init(&ctx);
-- sha1_update(&ctx, test_case->data, test_case->data_len);
-- sha1_final(&ctx, hash_value);
-+ srtp_sha1_init(&ctx);
-+ srtp_sha1_update(&ctx, test_case->data, test_case->data_len);
-+ srtp_sha1_final(&ctx, hash_value);
- if (0 == memcmp(test_case->hash, hash_value, 20)) {
- #if VERBOSE
- printf("PASSED: reference value: %s\n",
---
-2.7.3
-
diff --git a/package/libsrtp/libsrtp.hash b/package/libsrtp/libsrtp.hash
index cb060d27b9..1a88673c81 100644
--- a/package/libsrtp/libsrtp.hash
+++ b/package/libsrtp/libsrtp.hash
@@ -1,2 +1,3 @@
# Locally calculated
-sha256 56a7b521c25134f48faff26b0b1e3d4378a14986a2d3d7bc6fefb48987304ff0 libsrtp-v1.5.4.tar.gz
+sha256 44fd7497bce78767e96b54a11bca520adb2ad32effd515f04bce602b60a1a50b libsrtp-v2.2.0.tar.gz
+sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae LICENSE
diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk
index 9e72856c43..8af463928b 100644
--- a/package/libsrtp/libsrtp.mk
+++ b/package/libsrtp/libsrtp.mk
@@ -4,18 +4,18 @@
#
################################################################################
-LIBSRTP_VERSION = v1.5.4
+LIBSRTP_VERSION = v2.2.0
LIBSRTP_SITE = $(call github,cisco,libsrtp,$(LIBSRTP_VERSION))
LIBSRTP_INSTALL_STAGING = YES
LIBSRTP_LICENSE = BSD-3-Clause
LIBSRTP_LICENSE_FILES = LICENSE
ifeq ($(BR2_STATIC_LIBS),y)
-LIBSRTP_MAKE_OPTS = libsrtp.a
+LIBSRTP_MAKE_OPTS = libsrtp2.a
else ifeq ($(BR2_SHARED_LIBS),y)
LIBSRTP_MAKE_OPTS = shared_library
else
-LIBSRTP_MAKE_OPTS = libsrtp.a shared_library
+LIBSRTP_MAKE_OPTS = libsrtp2.a shared_library
endif
# While libsrtp is not using pkg-config itself, it checks if
diff --git a/package/libssh/libssh.hash b/package/libssh/libssh.hash
index 009a335e3b..7220c337cf 100644
--- a/package/libssh/libssh.hash
+++ b/package/libssh/libssh.hash
@@ -1,5 +1,3 @@
-# from https://red.libssh.org/projects/libssh/files/
-md5 d3fc864208bf607ad87cdee836894feb libssh-0.7.5.tar.xz
-# Locally calculated after checking signature on uncompressed libssh-0.7.5.tar
-# https://red.libssh.org/attachments/download/217/libssh-0.7.5.tar.asc
-sha256 54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095 libssh-0.7.5.tar.xz
+# Locally calculated after checking pgp signature
+sha256 d17f1267b4a5e46c0fbe66d39a3e702b8cefe788928f2eb6e339a18bb00b1924 libssh-0.8.1.tar.xz
+sha256 468cf08f784ef6fd3b3705b60dd8111e2b70fbb8f6549cd503665a6bbb3bc625 COPYING
diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk
index 902865d73b..635d72ad98 100644
--- a/package/libssh/libssh.mk
+++ b/package/libssh/libssh.mk
@@ -4,8 +4,8 @@
#
################################################################################
-LIBSSH_VERSION_MAJOR = 0.7
-LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).5
+LIBSSH_VERSION_MAJOR = 0.8
+LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).1
LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR)
LIBSSH_LICENSE = LGPL-2.1
@@ -17,6 +17,9 @@ LIBSSH_CONF_OPTS = \
-DWITH_SERVER=OFF \
-DWITH_EXAMPLES=OFF
+# cmake older than 3.10 require this to avoid try_run() in FindThreads
+LIBSSH_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
+
ifeq ($(BR2_PACKAGE_ZLIB),y)
LIBSSH_CONF_OPTS += -DWITH_ZLIB=ON
LIBSSH_DEPENDENCIES += zlib
diff --git a/package/libtorrent/0001-cross_compile.patch b/package/libtorrent/0001-cross_compile.patch
index abb243820c..9febfa7f3c 100644
--- a/package/libtorrent/0001-cross_compile.patch
+++ b/package/libtorrent/0001-cross_compile.patch
@@ -4,27 +4,17 @@ Date: Mon, 5 Oct 2015 00:40:25 +0100
Subject: [PATCH] Fix cross compilation, based on OpenWRT patch.
[Vincent: tweak the patch for version 0.13.6]
+[Bernd: tweak the patch for version 0.13.7]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
configure.ac | 1 -
scripts/checks.m4 | 2 +-
scripts/common.m4 | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index ba994ee..7696466 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO)
-
- AM_INIT_AUTOMAKE
- AC_CONFIG_HEADERS(config.h)
--AM_PATH_CPPUNIT(1.9.6)
-
- AC_PROG_CXX
-
diff --git a/scripts/checks.m4 b/scripts/checks.m4
index 598f39b..0e5abe0 100644
--- a/scripts/checks.m4
diff --git a/package/libtorrent/libtorrent.hash b/package/libtorrent/libtorrent.hash
index 73753e94ce..8e0bc1caa4 100644
--- a/package/libtorrent/libtorrent.hash
+++ b/package/libtorrent/libtorrent.hash
@@ -1,2 +1,3 @@
# Locally calculated
-sha256 2838a08c96edfd936aff8fbf99ecbb930c2bfca3337dd1482eb5fccdb80d5a04 libtorrent-0.13.6.tar.gz
+sha256 c738f60f4d7b6879cd2745fb4310bf24c9287219c1fd619706a9d5499ca7ecc1 libtorrent-0.13.7.tar.gz
+sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
diff --git a/package/libtorrent/libtorrent.mk b/package/libtorrent/libtorrent.mk
index fbd332e379..de964b45ae 100644
--- a/package/libtorrent/libtorrent.mk
+++ b/package/libtorrent/libtorrent.mk
@@ -4,17 +4,22 @@
#
################################################################################
-LIBTORRENT_VERSION = 0.13.6
+LIBTORRENT_VERSION = 0.13.7
LIBTORRENT_SITE = http://rtorrent.net/downloads
-LIBTORRENT_DEPENDENCIES = host-pkgconf zlib \
- $(if $(BR2_PACKAGE_OPENSSL),openssl)
+LIBTORRENT_DEPENDENCIES = host-pkgconf zlib
LIBTORRENT_CONF_OPTS = --enable-aligned \
--disable-instrumentation \
- --with-zlib=$(STAGING_DIR)/usr \
- $(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl)
+ --with-zlib=$(STAGING_DIR)/usr
LIBTORRENT_INSTALL_STAGING = YES
LIBTORRENT_AUTORECONF = YES
LIBTORRENT_LICENSE = GPL-2.0
LIBTORRENT_LICENSE_FILES = COPYING
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBTORRENT_CONF_OPTS += --enable-openssl
+LIBTORRENT_DEPENDENCIES += openssl
+else
+LIBTORRENT_CONF_OPTS += --disable-openssl
+endif
+
$(eval $(autotools-package))
diff --git a/package/libunistring/libunistring.hash b/package/libunistring/libunistring.hash
index 8a5da7782d..2e4595b17d 100644
--- a/package/libunistring/libunistring.hash
+++ b/package/libunistring/libunistring.hash
@@ -1,6 +1,6 @@
# Locally calculated after checking pgp signature
-# https://ftp.gnu.org/gnu/libunistring/libunistring-0.9.9.tar.xz.sig
-sha256 a4d993ecfce16cf503ff7579f5da64619cee66226fb3b998dafb706190d9a833 libunistring-0.9.9.tar.xz
+# https://ftp.gnu.org/gnu/libunistring/libunistring-0.9.10.tar.xz.sig
+sha256 eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7 libunistring-0.9.10.tar.xz
# Locally calculated
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB
diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk
index 929b52ebd5..fa51447170 100644
--- a/package/libunistring/libunistring.mk
+++ b/package/libunistring/libunistring.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBUNISTRING_VERSION = 0.9.9
+LIBUNISTRING_VERSION = 0.9.10
LIBUNISTRING_SITE = $(BR2_GNU_MIRROR)/libunistring
LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz
LIBUNISTRING_INSTALL_STAGING = YES
diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash
index c9f6565ef3..e687450d53 100644
--- a/package/libuv/libuv.hash
+++ b/package/libuv/libuv.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 c72f0401e1298f948daf310abafce38373a926fb9438464d1bf7fe90784544e0 libuv-v1.22.0.tar.gz
+sha256 8c8eff0bec85306aae508392b395e8bb0e1e34daad2a4e3bec308ced0c92bfaa libuv-v1.23.0.tar.gz
sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE
diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk
index 85e8dccb63..90818ad789 100644
--- a/package/libuv/libuv.mk
+++ b/package/libuv/libuv.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBUV_VERSION = v1.22.0
+LIBUV_VERSION = v1.23.0
LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION))
LIBUV_DEPENDENCIES = host-pkgconf
LIBUV_INSTALL_STAGING = YES
diff --git a/package/libva-intel-driver/0001-check-ssp.patch b/package/libva-intel-driver/0001-check-ssp.patch
new file mode 100644
index 0000000000..c801ed3148
--- /dev/null
+++ b/package/libva-intel-driver/0001-check-ssp.patch
@@ -0,0 +1,65 @@
+From bf08643583520b763150af9ed20166b7fe272fd5 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sun, 29 Jul 2018 20:55:23 +0200
+Subject: [PATCH] Check for -fstack-protector
+
+Not all toolchains provide support for -fstack-protector. This patch
+provides a configure check to avoid build errors like
+
+/home/buildroot/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/6.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp_nonshared
+/home/buildroot/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/6.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp
+
+Patch sent upstream as PR 408.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ configure.ac | 17 +++++++++++++++++
+ src/Makefile.am | 5 ++++-
+ 2 files changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c76060c7..5471aee7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,6 +86,23 @@ AC_SEARCH_LIBS([dlopen], [dl], [], [
+ AC_MSG_ERROR([unable to find the dlopen() function])
+ ])
+
++
++# Check for -fstack-protector
++ssp_cc=yes
++if test "X$CC-cc" != "X"; then
++ AC_MSG_CHECKING([whether ${CC-cc} accepts -fstack-protector])
++ ssp_old_cflags="$CFLAGS"
++ CFLAGS="$CFLAGS -fstack-protector"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[alloca(100);]])], [], [ssp_cc=no])
++ AC_MSG_RESULT([$ssp_cc])
++ if test "X$ssp_cc" = "Xno"; then
++ CFLAGS="$ssp_old_cflags"
++ else
++ AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
++ fi
++fi
++AM_CONDITIONAL(USE_SSP, test "$ssp_cc" = "yes")
++
+ dnl Check for recent enough DRM
+ LIBDRM_VERSION=libdrm_version
+ PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION libdrm_intel])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c26293dd..5c52658a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -35,9 +35,12 @@ AM_CPPFLAGS = \
+ driver_cflags = \
+ -Wall \
+ -fvisibility=hidden \
+- -fstack-protector \
+ $(NULL)
+
++if USE_SSP
++driver_cflags += -fstack-protector
++endif
++
+ driver_ldflags = \
+ -avoid-version \
+ -no-undefined \
diff --git a/package/libva-intel-driver/Config.in b/package/libva-intel-driver/Config.in
index 120f152c96..53c5b366c3 100644
--- a/package/libva-intel-driver/Config.in
+++ b/package/libva-intel-driver/Config.in
@@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBVA_INTEL_DRIVER
help
VA-API back-end driver for Intel graphics chips
- https://01.org/linuxmedia/vaapi
+ https://01.org/vaapi
comment "libva intel driver needs a toolchain w/ threads, dynamic library"
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/package/libva-intel-driver/libva-intel-driver.hash b/package/libva-intel-driver/libva-intel-driver.hash
index dbe5d67fb4..0509ff8d60 100644
--- a/package/libva-intel-driver/libva-intel-driver.hash
+++ b/package/libva-intel-driver/libva-intel-driver.hash
@@ -1,5 +1,5 @@
-# From https://github.com/01org/intel-vaapi-driver/releases
-sha1 a40c6bd89b71b547986bf9f9fa2533bb50cf269e intel-vaapi-driver-2.1.0.tar.bz2
+# From https://github.com/intel/intel-vaapi-driver/releases
+sha1 0934f97ddcaf4e633f59d049226723239b645b33 intel-vaapi-driver-2.2.0.tar.bz2
# Locally computed
-sha256 ecfaf2ccc4b9af7340e002d2ef807d1e33051d4992f1983f5f4d60e516f86bdf intel-vaapi-driver-2.1.0.tar.bz2
+sha256 e8a5f54694eb76aad42653b591030b8a53b1513144c09a80defb3d8d8c875c18 intel-vaapi-driver-2.2.0.tar.bz2
sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING
diff --git a/package/libva-intel-driver/libva-intel-driver.mk b/package/libva-intel-driver/libva-intel-driver.mk
index dd1903024f..48564ca488 100644
--- a/package/libva-intel-driver/libva-intel-driver.mk
+++ b/package/libva-intel-driver/libva-intel-driver.mk
@@ -4,12 +4,14 @@
#
################################################################################
-LIBVA_INTEL_DRIVER_VERSION = 2.1.0
+LIBVA_INTEL_DRIVER_VERSION = 2.2.0
LIBVA_INTEL_DRIVER_SOURCE = intel-vaapi-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2
LIBVA_INTEL_DRIVER_SITE = \
- https://github.com/01org/intel-vaapi-driver/releases/download/$(LIBVA_INTEL_DRIVER_VERSION)
+ https://github.com/intel/intel-vaapi-driver/releases/download/$(LIBVA_INTEL_DRIVER_VERSION)
LIBVA_INTEL_DRIVER_LICENSE = MIT
LIBVA_INTEL_DRIVER_LICENSE_FILES = COPYING
+# 0001-check-ssp.patch
+LIBVA_INTEL_DRIVER_AUTORECONF = YES
LIBVA_INTEL_DRIVER_DEPENDENCIES = host-pkgconf libdrm libva
ifeq ($(BR2_PACKAGE_XORG7),y)
diff --git a/package/libva-utils/0001-check-ssp.patch b/package/libva-utils/0001-check-ssp.patch
new file mode 100644
index 0000000000..11c1ded795
--- /dev/null
+++ b/package/libva-utils/0001-check-ssp.patch
@@ -0,0 +1,145 @@
+From bdcf4d90f618f497311c348f984e005924cb3def Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sun, 29 Jul 2018 20:58:06 +0200
+Subject: [PATCH] Check for -fstack-protector
+
+Not all toolchains provide support for -fstack-protector. This patch
+provides a configure check to avoid build errors like
+
+/home/buildroot/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/6.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp_nonshared
+/home/buildroot/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/6.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp
+
+Patch sent upstream as PR 125.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ configure.ac | 16 ++++++++++++++++
+ decode/Makefile.am | 5 ++++-
+ encode/Makefile.am | 5 ++++-
+ putsurface/Makefile.am | 5 ++++-
+ vainfo/Makefile.am | 5 ++++-
+ videoprocess/Makefile.am | 5 ++++-
+ 6 files changed, 36 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index be2e00d..cfa508a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -129,6 +129,22 @@ if test "$ac_cv_have_gnuc_visibility_attribute" = "yes"; then
+ [Defined to 1 if GCC visibility attribute is supported])
+ fi
+
++# Check for -fstack-protector
++ssp_cc=yes
++if test "X$CC-cc" != "X"; then
++ AC_MSG_CHECKING([whether ${CC-cc} accepts -fstack-protector])
++ ssp_old_cflags="$CFLAGS"
++ CFLAGS="$CFLAGS -fstack-protector"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[alloca(100);]])], [], [ssp_cc=no])
++ AC_MSG_RESULT([$ssp_cc])
++ if test "X$ssp_cc" = "Xno"; then
++ CFLAGS="$ssp_old_cflags"
++ else
++ AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
++ fi
++fi
++AM_CONDITIONAL(USE_SSP, test "$ssp_cc" = "yes")
++
+ # Check for DRM (mandatory)
+ LIBDRM_VERSION=libdrm_version
+ PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION])
+diff --git a/decode/Makefile.am b/decode/Makefile.am
+index febc50d..8ea9252 100644
+--- a/decode/Makefile.am
++++ b/decode/Makefile.am
+@@ -24,11 +24,14 @@ bin_PROGRAMS = mpeg2vldemo loadjpeg
+
+ AM_CPPFLAGS = \
+ -Wall \
+- -fstack-protector \
+ $(LIBVA_CFLAGS) \
+ -I$(top_srcdir)/common \
+ $(NULL)
+
++if USE_SSP
++AM_CPPFLAGS += -fstack-protector
++endif
++
+ TEST_LIBS = \
+ $(LIBVA_LIBS) \
+ $(top_builddir)/common/libva-display.la \
+diff --git a/encode/Makefile.am b/encode/Makefile.am
+index 8298b39..c107007 100644
+--- a/encode/Makefile.am
++++ b/encode/Makefile.am
+@@ -25,10 +25,13 @@ noinst_PROGRAMS = svctenc
+
+ AM_CPPFLAGS = \
+ -Wall \
+- -fstack-protector \
+ $(LIBVA_CFLAGS) \
+ $(NULL)
+
++if USE_SSP
++AM_CPPFLAGS += -fstack-protector
++endif
++
+ h264encode_SOURCES = h264encode.c
+ h264encode_CFLAGS = -I$(top_srcdir)/common -g
+ h264encode_LDADD = \
+diff --git a/putsurface/Makefile.am b/putsurface/Makefile.am
+index e7b62a1..10ae63e 100644
+--- a/putsurface/Makefile.am
++++ b/putsurface/Makefile.am
+@@ -26,9 +26,12 @@ TEST_CFLAGS = \
+ $(LIBVA_CFLAGS) \
+ -I$(top_srcdir)/common \
+ -Wall \
+- -fstack-protector \
+ $(NULL)
+
++if USE_SSP
++TEST_CFLAGS += -fstack-protector
++endif
++
+ TEST_LIBS = \
+ $(LIBVA_LIBS) \
+ $(top_builddir)/common/libva-display.la \
+diff --git a/vainfo/Makefile.am b/vainfo/Makefile.am
+index aff201f..e59f466 100644
+--- a/vainfo/Makefile.am
++++ b/vainfo/Makefile.am
+@@ -27,9 +27,12 @@ vainfo_cflags = \
+ $(LIBVA_CFLAGS) \
+ -DLIBVA_VERSION_S="\"$(LIBVA_VERSION)\"" \
+ -Wall \
+- -fstack-protector \
+ $(NULL)
+
++if USE_SSP
++vainfo_cflags += -fstack-protector
++endif
++
+ vainfo_libs = \
+ $(LIBVA_LIBS) \
+ $(top_builddir)/common/libva-display.la \
+diff --git a/videoprocess/Makefile.am b/videoprocess/Makefile.am
+index eb79bc3..448da7d 100644
+--- a/videoprocess/Makefile.am
++++ b/videoprocess/Makefile.am
+@@ -24,11 +24,14 @@ bin_PROGRAMS = vavpp
+
+ AM_CPPFLAGS = \
+ -Wall \
+- -fstack-protector \
+ $(LIBVA_CFLAGS) \
+ -I$(top_srcdir)/common \
+ $(NULL)
+
++if USE_SSP
++AM_CPPFLAGS += -fstack-protector
++endif
++
+ TEST_LIBS = \
+ $(LIBVA_LIBS) \
+ $(top_builddir)/common/libva-display.la \
diff --git a/package/libva-utils/Config.in b/package/libva-utils/Config.in
index ad299234c3..597419f7de 100644
--- a/package/libva-utils/Config.in
+++ b/package/libva-utils/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_LIBVA_UTILS
Libva-utils is a collection of tests for VA-API (Video
Acceleration API)
- https://01.org/linuxmedia/vaapi
+ https://01.org/vaapi
comment "libva-utils needs a toolchain w/ C++, threads, dynamic library"
depends on !BR2_INSTALL_LIBSTDCPP || \
diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash
index 46674a3675..e86cb6e09c 100644
--- a/package/libva-utils/libva-utils.hash
+++ b/package/libva-utils/libva-utils.hash
@@ -1,5 +1,5 @@
-# From https://github.com/01org/libva-utils/releases
-sha1 9902eb944c3ace00be4fe95627708f156fc5ace7 libva-utils-2.1.0.tar.bz2
+# From https://github.com/intel/libva-utils/releases
+sha1 ef15d40d6bec847c74f21ee3431b7e7b06fec3b4 libva-utils-2.2.0.tar.bz2
# Locally computed
-sha256 f6a7790c3dcc56537372c90a83036a3136194a8b397e84e97bf9cc9254fa2c51 libva-utils-2.1.0.tar.bz2
+sha256 ed7a6ed1fab657df4e83ea11f90310efcf31c27828f32d65351a28ca3c404dc0 libva-utils-2.2.0.tar.bz2
sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING
diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk
index 85ee3083fd..348d419745 100644
--- a/package/libva-utils/libva-utils.mk
+++ b/package/libva-utils/libva-utils.mk
@@ -4,11 +4,13 @@
#
################################################################################
-LIBVA_UTILS_VERSION = 2.1.0
+LIBVA_UTILS_VERSION = 2.2.0
LIBVA_UTILS_SOURCE = libva-utils-$(LIBVA_UTILS_VERSION).tar.bz2
-LIBVA_UTILS_SITE = https://github.com/01org/libva-utils/releases/download/$(LIBVA_UTILS_VERSION)
+LIBVA_UTILS_SITE = https://github.com/intel/libva-utils/releases/download/$(LIBVA_UTILS_VERSION)
LIBVA_UTILS_LICENSE = MIT
LIBVA_UTILS_LICENSE_FILES = COPYING
+# 0001-check-ssp.patch
+LIBVA_UTILS_AUTORECONF = YES
LIBVA_UTILS_DEPENDENCIES = host-pkgconf libva
$(eval $(autotools-package))
diff --git a/package/libva/0001-check-ssp.patch b/package/libva/0001-check-ssp.patch
new file mode 100644
index 0000000000..ce4c42f89b
--- /dev/null
+++ b/package/libva/0001-check-ssp.patch
@@ -0,0 +1,64 @@
+From c60ac5bc4f95c8d1ce3d44aa1dfad8636dbe3bee Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sun, 29 Jul 2018 00:16:25 +0200
+Subject: [PATCH] Check for -fstack-protector
+
+Not all toolchains provide support for -fstack-protector. This patch
+provides a configure check to avoid build errors like
+
+/home/buildroot/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/6.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp_nonshared
+/home/buildroot/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/6.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp
+
+Patch sent upstream as PR 226.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ configure.ac | 16 ++++++++++++++++
+ va/Makefile.am | 5 ++++-
+ 2 files changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b0b88361..da1908cf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -209,6 +209,22 @@ if test "$ac_cv_have_gnuc_visibility_attribute" = "yes"; then
+ [Defined to 1 if GCC visibility attribute is supported])
+ fi
+
++# Check for -fstack-protector
++ssp_cc=yes
++if test "X$CC-cc" != "X"; then
++ AC_MSG_CHECKING([whether ${CC-cc} accepts -fstack-protector])
++ ssp_old_cflags="$CFLAGS"
++ CFLAGS="$CFLAGS -fstack-protector"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[alloca(100);]])], [], [ssp_cc=no])
++ AC_MSG_RESULT([$ssp_cc])
++ if test "X$ssp_cc" = "Xno"; then
++ CFLAGS="$ssp_old_cflags"
++ else
++ AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
++ fi
++fi
++AM_CONDITIONAL(USE_SSP, test "$ssp_cc" = "yes")
++
+ # Check for DRM (mandatory)
+ LIBDRM_VERSION=libdrm_version
+ PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION])
+diff --git a/va/Makefile.am b/va/Makefile.am
+index 5b6d49ab..0e94d0ff 100644
+--- a/va/Makefile.am
++++ b/va/Makefile.am
+@@ -77,9 +77,12 @@ libva_ldflags = \
+
+ libva_cflags = \
+ -Wall \
+- -fstack-protector \
+ $(NULL)
+
++if USE_SSP
++libva_cflags += -fstack-protector
++endif
++
+ lib_LTLIBRARIES = libva.la
+ libvaincludedir = ${includedir}/va
+ libvainclude_HEADERS = $(libva_source_h)
diff --git a/package/libva/Config.in b/package/libva/Config.in
index 08eb16b487..e4e351f98a 100644
--- a/package/libva/Config.in
+++ b/package/libva/Config.in
@@ -13,7 +13,7 @@ config BR2_PACKAGE_LIBVA
prevailing coding standards today (MPEG-2, MPEG-4 ASP/H.263,
MPEG-4 AVC/H.264, and VC-1/VMW3).
- https://01.org/linuxmedia/vaapi
+ https://01.org/vaapi
comment "libva needs a toolchain w/ threads, dynamic library"
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/package/libva/libva.hash b/package/libva/libva.hash
index ed707095f0..72347a4f2d 100644
--- a/package/libva/libva.hash
+++ b/package/libva/libva.hash
@@ -1,5 +1,5 @@
-# From https://github.com/01org/libva/releases
-sha1 9ecde2b6c9deda16e895a0b00b8aef3a765acb4c libva-2.1.0.tar.bz2
+# From https://github.com/intel/libva/releases
+sha1 5b19d2fbf532f14e24c3bedb4074238a1d7f1686 libva-2.2.0.tar.bz2
# Locally computed
-sha256 f3fa953a11d3210c3a4ee79031abdbe0863d5ce13d9b3f93f315f1eec60a4b0f libva-2.1.0.tar.bz2
+sha256 6f6ca04c785544d30d315ef130a6aeb9435b75f934d7fbe0e4e9ba6084ce4ef2 libva-2.2.0.tar.bz2
sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING
diff --git a/package/libva/libva.mk b/package/libva/libva.mk
index 79956a9d8e..7c129f4d97 100644
--- a/package/libva/libva.mk
+++ b/package/libva/libva.mk
@@ -4,12 +4,14 @@
#
################################################################################
-LIBVA_VERSION = 2.1.0
+LIBVA_VERSION = 2.2.0
LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2
-LIBVA_SITE = https://github.com/01org/libva/releases/download/$(LIBVA_VERSION)
+LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION)
LIBVA_LICENSE = MIT
LIBVA_LICENSE_FILES = COPYING
LIBVA_INSTALL_STAGING = YES
+# 0001-check-ssp.patch
+LIBVA_AUTORECONF = YES
LIBVA_DEPENDENCIES = host-pkgconf libdrm
# libdrm is a hard-dependency
diff --git a/package/libxkbcommon/libxkbcommon.hash b/package/libxkbcommon/libxkbcommon.hash
index 525f9ffd20..67ae4b5921 100644
--- a/package/libxkbcommon/libxkbcommon.hash
+++ b/package/libxkbcommon/libxkbcommon.hash
@@ -1,2 +1,5 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2017-January/032725.html
-sha256 ba59305d2e19e47c27ea065c2e0df96ebac6a3c6e97e28ae5620073b6084e68b libxkbcommon-0.7.1.tar.xz
+# From https://lists.freedesktop.org/archives/wayland-devel/2018-August/039243.html
+sha256 7ab8c4b3403d89d01898066b72cb6069bddeb5af94905a65368f671a026ed58c libxkbcommon-0.8.2.tar.xz
+
+# License file:
+sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE
diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk
index 601181446d..2045d96380 100644
--- a/package/libxkbcommon/libxkbcommon.mk
+++ b/package/libxkbcommon/libxkbcommon.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBXKBCOMMON_VERSION = 0.7.1
+LIBXKBCOMMON_VERSION = 0.8.2
LIBXKBCOMMON_SITE = http://xkbcommon.org/download
LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz
LIBXKBCOMMON_LICENSE = MIT/X11
diff --git a/package/libyaml/libyaml.hash b/package/libyaml/libyaml.hash
index d4a0c335c3..afc014dfb2 100644
--- a/package/libyaml/libyaml.hash
+++ b/package/libyaml/libyaml.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 8088e457264a98ba451a90b8661fcb4f9d6f478f7265d48322a196cec2480729 yaml-0.1.7.tar.gz
-sha256 d0d8b09800a45cd982e9568fc7669d9c1a4c330e275a821bbe24d54366d16fe9 LICENSE
+sha256 78281145641a080fb32d6e7a87b9c0664d611dcb4d542e90baf731f51cbb59cd yaml-0.2.1.tar.gz
+sha256 bfcb6a7dfbfd30e0ccc8bb34ab712bd1568586ad8c5b078ccae443b04e79749e LICENSE
diff --git a/package/libyaml/libyaml.mk b/package/libyaml/libyaml.mk
index bc8d6951bd..26e318736c 100644
--- a/package/libyaml/libyaml.mk
+++ b/package/libyaml/libyaml.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBYAML_VERSION = 0.1.7
+LIBYAML_VERSION = 0.2.1
LIBYAML_SOURCE = yaml-$(LIBYAML_VERSION).tar.gz
LIBYAML_SITE = http://pyyaml.org/download/libyaml
LIBYAML_INSTALL_STAGING = YES
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 132cf6aecc..c2c0443af2 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS
choice
prompt "Kernel Headers"
default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
- default BR2_KERNEL_HEADERS_4_17
+ default BR2_KERNEL_HEADERS_4_18
help
Select the kernel version to get headers from.
@@ -43,30 +43,10 @@ config BR2_KERNEL_HEADERS_4_9
bool "Linux 4.9.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
-config BR2_KERNEL_HEADERS_4_10
- bool "Linux 4.10.x kernel headers"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
-
-config BR2_KERNEL_HEADERS_4_11
- bool "Linux 4.11.x kernel headers"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
-
-config BR2_KERNEL_HEADERS_4_12
- bool "Linux 4.12.x kernel headers"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
-
-config BR2_KERNEL_HEADERS_4_13
- bool "Linux 4.13.x kernel headers"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13
-
config BR2_KERNEL_HEADERS_4_14
bool "Linux 4.14.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
-config BR2_KERNEL_HEADERS_4_15
- bool "Linux 4.15.x kernel headers"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
-
config BR2_KERNEL_HEADERS_4_16
bool "Linux 4.16.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
@@ -75,6 +55,10 @@ config BR2_KERNEL_HEADERS_4_17
bool "Linux 4.17.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
+config BR2_KERNEL_HEADERS_4_18
+ bool "Linux 4.18.x kernel headers"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18
+
config BR2_KERNEL_HEADERS_VERSION
bool "Manually specified Linux version"
help
@@ -105,6 +89,10 @@ choice
This is used to hide/show some packages that have strict
requirements on the version of kernel headers.
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18
+ bool "4.18.x"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18
+
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17
bool "4.17.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
@@ -268,12 +256,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "4.1.52" if BR2_KERNEL_HEADERS_4_1
default "4.4.154" if BR2_KERNEL_HEADERS_4_4
default "4.9.125" if BR2_KERNEL_HEADERS_4_9
- default "4.10.17" if BR2_KERNEL_HEADERS_4_10
- default "4.11.12" if BR2_KERNEL_HEADERS_4_11
- default "4.12.14" if BR2_KERNEL_HEADERS_4_12
- default "4.13.16" if BR2_KERNEL_HEADERS_4_13
default "4.14.68" if BR2_KERNEL_HEADERS_4_14
- default "4.15.18" if BR2_KERNEL_HEADERS_4_15
default "4.16.18" if BR2_KERNEL_HEADERS_4_16
- default "4.17.19" if BR2_KERNEL_HEADERS_4_17
+ default "4.18.5" if BR2_KERNEL_HEADERS_4_18
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch b/package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch
new file mode 100644
index 0000000000..a2ae1c183a
--- /dev/null
+++ b/package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch
@@ -0,0 +1,66 @@
+From: Benjamin Drung <bdrung@debian.org>
+Date: Sat, 16 Sep 2017 11:22:03 +0200
+Subject: Add a pkg-config file for the shared libraries
+
+This patch was downloaded from Debian
+https://sources.debian.org/src/liblivemedia/2018.08.05-1/debian/patches/0002-Add-a-pkg-config-file-for-the-shared-libraries.patch/
+
+The local/ part of PREXIX and LIBDIR was removed to fit into buildroot.
+
+A similar version of this patch is part of the vlc source repo:
+http://git.videolan.org/?p=vlc.git;a=blob;f=contrib/src/live555/add-pkgconfig-file.patch;hb=HEAD
+
+Upstream status: Rejected
+http://lists.live555.com/pipermail/live-devel/2013-January/016374.html
+http://lists.live555.com/pipermail/live-devel/2013-January/016375.html
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ Makefile.head | 3 +++
+ Makefile.tail | 7 ++++++-
+ live555.pc.in | 9 +++++++++
+ 3 files changed, 18 insertions(+), 1 deletion(-)
+ create mode 100644 live555.pc.in
+
+diff --git a/Makefile.head b/Makefile.head
+index 458c54c..1571037 100644
+--- a/Makefile.head
++++ b/Makefile.head
+@@ -1 +1,4 @@
++PREFIX = /usr
++LIBDIR = /usr/lib
++VERSION = $(shell grep LIVEMEDIA_LIBRARY_VERSION_STRING liveMedia/include/liveMedia_version.hh | sed 's/.*"\([^"]*\)".*/\1/')
+ ##### Change the following for your environment:
+diff --git a/Makefile.tail b/Makefile.tail
+index fc594ea..a20a527 100644
+--- a/Makefile.tail
++++ b/Makefile.tail
+@@ -22,7 +22,12 @@ all:
+ @echo
+ @echo "For more information about this source code (including your obligations under the LGPL), please see our FAQ at http://live555.com/liveMedia/faq.html"
+
+-install:
++install_shared_libraries:
++ install -d $(DESTDIR)$(LIBDIR)/pkgconfig
++ sed "s#@PREFIX@#$(PREFIX)#;s#@LIBDIR@#$(LIBDIR)#;s#@VERSION@#$(VERSION)#" live555.pc.in > $(DESTDIR)$(LIBDIR)/pkgconfig/live555.pc
++ chmod 644 $(DESTDIR)$(LIBDIR)/pkgconfig/live555.pc
++
++install: $(INSTALL2)
+ cd $(LIVEMEDIA_DIR) ; $(MAKE) install
+ cd $(GROUPSOCK_DIR) ; $(MAKE) install
+ cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) install
+diff --git a/live555.pc.in b/live555.pc.in
+new file mode 100644
+index 0000000..3736944
+--- /dev/null
++++ b/live555.pc.in
+@@ -0,0 +1,9 @@
++prefix=@PREFIX@
++libdir=@LIBDIR@
++includedir=${prefix}/include
++
++Name: live555
++Description: multimedia RTSP streaming library
++Version: @VERSION@
++Cflags: -I${includedir}/liveMedia -I${includedir}/groupsock -I${includedir}/BasicUsageEnvironment -I${includedir}/UsageEnvironment
++Libs: -L${libdir} -lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment
diff --git a/package/live555/live555.hash b/package/live555/live555.hash
index 66a7b7d74c..d74d674c7a 100644
--- a/package/live555/live555.hash
+++ b/package/live555/live555.hash
@@ -1,5 +1,5 @@
# From http://live555.com/liveMedia/public/live555-latest-md5.txt
-md5 a5acd14c4fa7b50f7270304d3b4a70ae live.2017.10.28.tar.gz
+md5 93c65b0f55f37835c727bbf65c1b61b4 live.2018.08.05.tar.gz
# Locally generated
-sha256 d8eaec9ded34321aa655d3c9007217dd447218c54cb48c97827e58ecd5edb338 live.2017.10.28.tar.gz
+sha256 c309fb6d499557250b4db8371243715b9ee2cdaa7ccacaf254bcc62e97566ae4 live.2018.08.05.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
diff --git a/package/live555/live555.mk b/package/live555/live555.mk
index 0507ee9b1b..a5479d6d7c 100644
--- a/package/live555/live555.mk
+++ b/package/live555/live555.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIVE555_VERSION = 2017.10.28
+LIVE555_VERSION = 2018.08.05
LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz
LIVE555_SITE = http://www.live555.com/liveMedia/public
LIVE555_LICENSE = LGPL-2.1+
diff --git a/package/log4cplus/log4cplus.hash b/package/log4cplus/log4cplus.hash
index 2f1d24a855..9bea814d6f 100644
--- a/package/log4cplus/log4cplus.hash
+++ b/package/log4cplus/log4cplus.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 8c85e769c3dbec382ed4db91f15e5bc24ba979f810262723781f2fc596339bf4 log4cplus-2.0.0.tar.xz
+sha256 8ff4055be749f17f3648694bd5778bfd86d33158cceaa616a50c0299d6035b41 log4cplus-2.0.2.tar.xz
sha256 91d7e42ff80e74c4c94e5ad353375fa0358cd0abbf43f5fe957097cdbd4e2c4d LICENSE
diff --git a/package/log4cplus/log4cplus.mk b/package/log4cplus/log4cplus.mk
index 890d2ee8f5..22efde2fd6 100644
--- a/package/log4cplus/log4cplus.mk
+++ b/package/log4cplus/log4cplus.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LOG4CPLUS_VERSION = 2.0.0
+LOG4CPLUS_VERSION = 2.0.2
LOG4CPLUS_SOURCE = log4cplus-$(LOG4CPLUS_VERSION).tar.xz
LOG4CPLUS_SITE = http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/$(LOG4CPLUS_VERSION)
LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool)
diff --git a/package/luarocks/0001-allow-libluajit-detection.patch b/package/luarocks/0001-allow-libluajit-detection.patch
index c5e52f4281..05d025bba2 100644
--- a/package/luarocks/0001-allow-libluajit-detection.patch
+++ b/package/luarocks/0001-allow-libluajit-detection.patch
@@ -6,6 +6,8 @@ Subject: [PATCH] allow libluajit detection
This detection was done only if luarocks is runned by luajit.
But on Buildroot, luarocks is always runned by lua.
+See https://github.com/luarocks/luarocks/pull/883
+
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
src/luarocks/deps.lua | 4 +---
@@ -15,7 +17,7 @@ diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 8403f12..c1c0220 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
-@@ -511,10 +511,8 @@ function deps.check_lua(vars)
+@@ -513,10 +513,8 @@ function deps.check_lua(vars)
"lua-" .. cfg.lua_version,
"lua-" .. shortv,
"lua",
diff --git a/package/luarocks/luarocks.hash b/package/luarocks/luarocks.hash
index 87ef6827c6..4aa791cb4d 100644
--- a/package/luarocks/luarocks.hash
+++ b/package/luarocks/luarocks.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 a43fffb997100f11cccb529a3db5456ce8dab18171a5cb3645f948147b6f64a1 luarocks-3.0.0.tar.gz
+sha256 b989c4b60d6c9edcd65169e5e42fcffbd39cdbebe6b138fa5aea45102f8d9ec0 luarocks-3.0.1.tar.gz
diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk
index cd4be266cf..25e3ad3e22 100644
--- a/package/luarocks/luarocks.mk
+++ b/package/luarocks/luarocks.mk
@@ -4,15 +4,15 @@
#
################################################################################
-LUAROCKS_VERSION = 3.0.0
+LUAROCKS_VERSION = 3.0.1
LUAROCKS_SITE = http://luarocks.org/releases
LUAROCKS_LICENSE = MIT
LUAROCKS_LICENSE_FILES = COPYING
HOST_LUAROCKS_DEPENDENCIES = host-luainterpreter
-LUAROCKS_CONFIG_DIR = $(HOST_DIR)/etc/luarocks
-LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-$(LUAINTERPRETER_ABIVER).lua
+LUAROCKS_CONFIG_DIR = $(HOST_DIR)/etc
+LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/luarocks/config-$(LUAINTERPRETER_ABIVER).lua
LUAROCKS_CFLAGS = $(TARGET_CFLAGS) -fPIC
ifeq ($(BR2_PACKAGE_LUA_5_3),y)
LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2
diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash
index e2239b6171..d5716e0036 100644
--- a/package/luvi/luvi.hash
+++ b/package/luvi/luvi.hash
@@ -1,2 +1,3 @@
# Locally calculated
-sha256 ce9a1fb762e61267618ddea9ea129170fd543bb918c382b71cb35985d0024c42 luvi-src-v2.7.6.tar.gz
+sha256 a18e138c7032ef8406fef6e2135a61fad713861742512f2073adc0b4ab6d8f8b luvi-v2.8.0.tar.gz
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt
diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk
index a2bc218e77..8b3b7659b0 100644
--- a/package/luvi/luvi.mk
+++ b/package/luvi/luvi.mk
@@ -4,9 +4,10 @@
#
################################################################################
-LUVI_VERSION = v2.7.6
-LUVI_SOURCE = luvi-src-$(LUVI_VERSION).tar.gz
-LUVI_SITE = https://github.com/luvit/luvi/releases/download/$(LUVI_VERSION)
+LUVI_VERSION = v2.8.0
+LUVI_SITE = https://github.com/luvit/luvi.git
+LUVI_SITE_METHOD = git
+LUVI_GIT_SUBMODULES = YES
LUVI_LICENSE = Apache-2.0
LUVI_LICENSE_FILES = LICENSE.txt
LUVI_DEPENDENCIES = libuv luajit luv host-luajit
diff --git a/package/lvm2/0001-configure-Introduce-enable-symvers-option.patch b/package/lvm2/0001-configure-Introduce-enable-symvers-option.patch
index 8ca39c2cab..7ef153313c 100644
--- a/package/lvm2/0001-configure-Introduce-enable-symvers-option.patch
+++ b/package/lvm2/0001-configure-Introduce-enable-symvers-option.patch
@@ -1,4 +1,4 @@
-From f563334a76e31442f7b8693d2d350e6981c51c46 Mon Sep 17 00:00:00 2001
+From 94d71c49eb1682a73465eb162b0a059561168bb2 Mon Sep 17 00:00:00 2001
From: Marcin Niestroj <m.niestroj@grinn-global.com>
Date: Fri, 20 Jul 2018 14:26:44 +0200
Subject: [PATCH] configure: Introduce --enable-symvers option
@@ -27,7 +27,7 @@ library.
Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
---
configure | 32 ++++++++++++++++++++++++++++++--
- configure.in | 28 +++++++++++++++++++++++++---
+ configure.ac | 28 +++++++++++++++++++++++++---
include/configure.h.in | 3 +++
lib/misc/lib.h | 10 +++++-----
libdm/datastruct/bitset.c | 5 +----
@@ -37,10 +37,10 @@ Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
8 files changed, 67 insertions(+), 17 deletions(-)
diff --git a/configure b/configure
-index e1ae0e884..c5d11c1b6 100755
+index 7d945dfa8..94cd6b1ea 100755
--- a/configure
+++ b/configure
-@@ -985,6 +985,7 @@ enable_fsadm
+@@ -975,6 +975,7 @@ enable_fsadm
enable_blkdeactivate
enable_dmeventd
enable_selinux
@@ -48,7 +48,7 @@ index e1ae0e884..c5d11c1b6 100755
enable_nls
with_localedir
with_confdir
-@@ -1729,6 +1730,9 @@ Optional Features:
+@@ -1725,6 +1726,9 @@ Optional Features:
--disable-blkdeactivate disable blkdeactivate
--enable-dmeventd enable the device-mapper event daemon
--disable-selinux disable selinux support
@@ -58,15 +58,15 @@ index e1ae0e884..c5d11c1b6 100755
--enable-nls enable Native Language Support
Optional Packages:
-@@ -3169,7 +3173,6 @@ if test -z "$CFLAGS"; then :
+@@ -3156,7 +3160,6 @@ if test -z "$CFLAGS"; then :
fi
case "$host_os" in
linux*)
- CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
+ # equivalent to -rdynamic
ELDFLAGS="-Wl,--export-dynamic"
# FIXME Generate list and use --dynamic-list=.dlopen.sym
- CLDWHOLEARCHIVE="-Wl,-whole-archive"
-@@ -3190,7 +3193,6 @@ case "$host_os" in
+@@ -3178,7 +3181,6 @@ case "$host_os" in
;;
darwin*)
CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
@@ -74,7 +74,7 @@ index e1ae0e884..c5d11c1b6 100755
ELDFLAGS=
CLDWHOLEARCHIVE="-all_load"
CLDNOWHOLEARCHIVE=
-@@ -14609,6 +14611,32 @@ done
+@@ -14401,6 +14403,32 @@ done
LIBS=$lvm_saved_libs
fi
@@ -107,15 +107,16 @@ index e1ae0e884..c5d11c1b6 100755
################################################################################
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable internationalisation" >&5
$as_echo_n "checking whether to enable internationalisation... " >&6; }
-diff --git a/configure.in b/configure.in
-index 2e5e015c8..09c390850 100644
---- a/configure.in
-+++ b/configure.in
-@@ -30,12 +30,10 @@ AC_CANONICAL_TARGET([])
+diff --git a/configure.ac b/configure.ac
+index e427708cd..2e8712f92 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,13 +30,11 @@ AC_CANONICAL_TARGET([])
AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"])
case "$host_os" in
linux*)
- CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
+ # equivalent to -rdynamic
ELDFLAGS="-Wl,--export-dynamic"
# FIXME Generate list and use --dynamic-list=.dlopen.sym
CLDWHOLEARCHIVE="-Wl,-whole-archive"
@@ -124,7 +125,7 @@ index 2e5e015c8..09c390850 100644
LIB_SUFFIX=so
DEVMAPPER=yes
BUILD_LVMETAD=no
-@@ -51,7 +49,6 @@ case "$host_os" in
+@@ -52,7 +50,6 @@ case "$host_os" in
;;
darwin*)
CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
@@ -132,7 +133,7 @@ index 2e5e015c8..09c390850 100644
ELDFLAGS=
CLDWHOLEARCHIVE="-all_load"
CLDNOWHOLEARCHIVE=
-@@ -1742,6 +1739,31 @@ package as well (which may be called readline-devel or something similar).])
+@@ -1656,6 +1653,31 @@ package as well (which may be called readline-devel or something similar).])
LIBS=$lvm_saved_libs
fi
@@ -165,10 +166,10 @@ index 2e5e015c8..09c390850 100644
dnl -- Internationalisation stuff
AC_MSG_CHECKING(whether to enable internationalisation)
diff --git a/include/configure.h.in b/include/configure.h.in
-index 51726506c..3fc181b1e 100644
+index 15fd150ed..7a07a10ef 100644
--- a/include/configure.h.in
+++ b/include/configure.h.in
-@@ -151,6 +151,9 @@
+@@ -147,6 +147,9 @@
/* Path to fsadm binary. */
#undef FSADM_PATH
@@ -179,10 +180,10 @@ index 51726506c..3fc181b1e 100644
#undef HAVE_ALARM
diff --git a/lib/misc/lib.h b/lib/misc/lib.h
-index 8ed06f81d..9b3ce8a03 100644
+index d7fa5c721..7cf98f932 100644
--- a/lib/misc/lib.h
+++ b/lib/misc/lib.h
-@@ -42,16 +42,16 @@
+@@ -41,16 +41,16 @@
* macro DM_EXPORT_SYMBOL to export the function and bind it to the
* specified version string.
*
@@ -203,7 +204,7 @@ index 8ed06f81d..9b3ce8a03 100644
* // Backward compatible dm_foo() version 1.02.104
* int dm_foo_v1_02_104(void);
* int dm_foo_v1_02_104(void)
-@@ -68,7 +68,7 @@
+@@ -67,7 +67,7 @@
* versions of library symbols prior to the introduction of symbol
* versioning: it must never be used for new symbols.
*/
@@ -234,10 +235,10 @@ index b0826e1eb..2ec3f8f84 100644
-
#endif
diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
-index c47e08467..b98afb15d 100644
+index 769b69c1b..28e2eadee 100644
--- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c
-@@ -2137,7 +2137,7 @@ void dm_lib_exit(void)
+@@ -2145,7 +2145,7 @@ void dm_lib_exit(void)
_version_checked = 0;
}
@@ -247,10 +248,10 @@ index c47e08467..b98afb15d 100644
* Maintain binary backward compatibility.
* Version script mechanism works with 'gcc' compatible compilers only.
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
-index cf4fd62e7..474871da5 100644
+index ab0545659..00651c0b2 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
-@@ -4110,7 +4110,7 @@ void dm_tree_node_set_callback(struct dm_tree_node *dnode,
+@@ -3797,7 +3797,7 @@ void dm_tree_node_set_callback(struct dm_tree_node *dnode,
dnode->callback_data = data;
}
@@ -260,10 +261,10 @@ index cf4fd62e7..474871da5 100644
* Backward compatible implementations.
*
diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
-index bc498675f..d424928c7 100644
+index 94ad380e0..76efbbe35 100644
--- a/libdm/libdm-stats.c
+++ b/libdm/libdm-stats.c
-@@ -5064,7 +5064,7 @@ int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path,
+@@ -5065,7 +5065,7 @@ int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path,
* current dm_stats_create_region() version.
*/
diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in
index 0dd6d53b4a..de5b972e99 100644
--- a/package/lvm2/Config.in
+++ b/package/lvm2/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LVM2
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # needs fork()
depends on !BR2_STATIC_LIBS # It fails to build statically
+ select BR2_PACKAGE_LIBAIO
help
This is LVM2, the rewrite of The Linux Logical Volume Manager.
LVM supports enterprise level volume management of disk and
diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash
index b0dfcfcef3..697a413995 100644
--- a/package/lvm2/lvm2.hash
+++ b/package/lvm2/lvm2.hash
@@ -1,5 +1,5 @@
-# From ftp://sources.redhat.com/pub/lvm2/releases/sha512.sum
-sha512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e LVM2.2.02.173.tgz
+# From ftp://sources.redhat.com/pub/lvm2/sha512.sum
+sha512 6e0a10ab48be4f0c751447c6ab88b8f9fa1dcd1d703de77966e8507b173df70b1987fa0be252c31dfce9e0ee70e5f439db58c8f534e24144a70f254c091554ee LVM2.2.02.180.tgz
# Locally computed sha256 checksums
sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING
sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index ccdc2c38e6..152381d65d 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -4,9 +4,9 @@
#
################################################################################
-LVM2_VERSION = 2.02.173
+LVM2_VERSION = 2.02.180
LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz
-LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases
+LVM2_SITE = ftp://sources.redhat.com/pub/lvm2
LVM2_INSTALL_STAGING = YES
LVM2_LICENSE = GPL-2.0, LGPL-2.1
LVM2_LICENSE_FILES = COPYING COPYING.LIB
@@ -22,7 +22,7 @@ LVM2_CONF_OPTS += \
--disable-nls \
--disable-symvers
-LVM2_DEPENDENCIES += host-pkgconf
+LVM2_DEPENDENCIES += host-pkgconf libaio
# LVM2 uses autoconf, but not automake, and the build system does not
# take into account the toolchain passed at configure time.
@@ -59,7 +59,7 @@ ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
LVM2_CONF_ENV += ac_cv_flag_HAVE_PIE=no
endif
-HOST_LVM2_DEPENDENCIES = host-pkgconf
+HOST_LVM2_DEPENDENCIES = host-pkgconf host-libaio
HOST_LVM2_CONF_OPTS = \
--enable-write_install \
--enable-pkgconfig \
diff --git a/package/lynx/0001-src-chrtrans-don-t-build-host-tools-with-target-LDFL.patch b/package/lynx/0001-src-chrtrans-don-t-build-host-tools-with-target-LDFL.patch
deleted file mode 100644
index cc057cee13..0000000000
--- a/package/lynx/0001-src-chrtrans-don-t-build-host-tools-with-target-LDFL.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From bb47abe9e7996147f6b7b325f5c9b2143abf8f13 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Date: Mon, 7 May 2018 22:00:52 +0200
-Subject: [PATCH] src/chrtrans: don't build host tools with target LDFLAGS
-
-In a cross-compilation context, the LDFLAGS variable contains linker
-flags used when building things for the target. However, the makeuctb
-tool is built for the host machine, and therefore should not use the
-same LDFLAGS as the target, which is why BUILD_LDFLAGS exist.
-
-Using LDFLAGS when building a tool for the host can cause problems
-when some flags in LDFLAGS are not supported by the host machine. For
-example, if you're linking statically lynx for the target, but the
-build machine does not support static linking:
-
-gcc -I../.. -I../../src -I../../src/chrtrans -I../../WWW/Library/Implementation -I../../ -static -o makeuctb makeuctb.o
-/usr/bin/ld: cannot find -lc
-collect2: error: ld returned 1 exit status
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Upstream-status: submitted on the mailing list
----
- src/chrtrans/makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in
-index aab358f..6e0ef03 100644
---- a/src/chrtrans/makefile.in
-+++ b/src/chrtrans/makefile.in
-@@ -123,7 +123,7 @@ OBJS = makeuctb$o
- C_SRC = $(OBJS:$o=.c)
-
- $(MAKEUCTB) : $(OBJS)
-- $(BUILD_CC) $(CC_OPTS) $(LDFLAGS) $(BUILD_LDFLAGS) -o $@ $(OBJS) $(INTLLIB) $(BUILD_LIBS)
-+ $(BUILD_CC) $(CC_OPTS) $(BUILD_LDFLAGS) -o $@ $(OBJS) $(INTLLIB) $(BUILD_LIBS)
-
- makeuctb$o : $(srcdir)/UCkd.h $(srcdir)/makeuctb.c
-
---
-2.14.3
-
diff --git a/package/lynx/lynx.hash b/package/lynx/lynx.hash
index c39475aa23..76d7614a7c 100644
--- a/package/lynx/lynx.hash
+++ b/package/lynx/lynx.hash
@@ -1,3 +1,3 @@
# Locally calculated:
-sha256 04318a100b052d079d0018fa371aa28cfb41ab68db3a959f3b75c2170eea1bc8 lynx2.8.9dev.16.tar.bz2
+sha256 387f193d7792f9cfada14c60b0e5c0bff18f227d9257a39483e14fa1aaf79595 lynx2.8.9rel.1.tar.bz2
sha256 8406a30ff3134ec23cf752d1ceda92ddaabbe41b4f2dc07ea3cfa139de12d6d6 COPYING
diff --git a/package/lynx/lynx.mk b/package/lynx/lynx.mk
index a95326a14a..735d5b317f 100644
--- a/package/lynx/lynx.mk
+++ b/package/lynx/lynx.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LYNX_VERSION = 2.8.9dev.16
+LYNX_VERSION = 2.8.9rel.1
LYNX_SOURCE = lynx$(LYNX_VERSION).tar.bz2
LYNX_SITE = ftp://ftp.invisible-island.net/lynx/tarballs
LYNX_LICENSE = GPL-2.0
diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk
index 27ca459acf..0ead92725a 100644
--- a/package/lzo/lzo.mk
+++ b/package/lzo/lzo.mk
@@ -23,5 +23,7 @@ else
LZO_CONF_OPTS += -DENABLE_STATIC=OFF
endif
+HOST_LZO_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=OFF
+
$(eval $(cmake-package))
$(eval $(host-cmake-package))
diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash
index e4736465e0..d44b4f35ab 100644
--- a/package/mariadb/mariadb.hash
+++ b/package/mariadb/mariadb.hash
@@ -1,9 +1,9 @@
-# From https://downloads.mariadb.org/mariadb/10.1.35/
-md5 935f401314ff08a4177beb70fed6055c mariadb-10.1.35.tar.gz
-sha1 d322f0da17f4de475832dd534657eba5a936f77b mariadb-10.1.35.tar.gz
-sha256 9e91d985ed4f662126e3e5791fe91ec8a2f44ec811113c2b6fbc72fa14553c4d mariadb-10.1.35.tar.gz
-sha512 88e6049f3bbc3aa047e108f91a2c4f335758e80f25bfa2974b5f8c2e13f5758824d7835dece021b515c531e5641b9998e4de92256ad4b47b7f694da99bd471aa mariadb-10.1.35.tar.gz
+# From https://downloads.mariadb.org/mariadb/10.2.17/
+md5 97dac7c5c288dbbbdd97768972daeb2e mariadb-10.2.17.tar.gz
+sha1 38f2ba16297e14baa2f641d2273bbb92f56d0b94 mariadb-10.2.17.tar.gz
+sha256 e7b3078f8de874a4d451242a8a3eed49bf6f916dcd52fc3efa55886f5f35be27 mariadb-10.2.17.tar.gz
+sha512 9714f786abde43b418d8b5accbbd485de213b90db18c879625ce30777526d28fdafd3bdb43922ab6872b300cfa06895b5b3fad5eb0c0e804ad66a1fd1793a141 mariadb-10.2.17.tar.gz
# Hash for license files
-sha256 69ce89a0cadbe35a858398c258be93c388715e84fc0ca04e5a1fd1aa9770dd3a README
+sha256 dec3c92fdc58070facec08db681aa6b9cb05fd21e463358161c1df92e1c0653f README.md
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk
index 23822187c3..075582288a 100644
--- a/package/mariadb/mariadb.mk
+++ b/package/mariadb/mariadb.mk
@@ -4,12 +4,12 @@
#
################################################################################
-MARIADB_VERSION = 10.1.35
+MARIADB_VERSION = 10.2.17
MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source
MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library)
# Tarball no longer contains LGPL license text
# https://jira.mariadb.org/browse/MDEV-12297
-MARIADB_LICENSE_FILES = README COPYING
+MARIADB_LICENSE_FILES = README.md COPYING
MARIADB_INSTALL_STAGING = YES
MARIADB_PROVIDES = mysql
@@ -41,6 +41,14 @@ MARIADB_CONF_OPTS += -DSTACK_DIRECTION=-1
# when it comes to cross-compilation we shall disable it and also disable TokuDB.
MARIADB_CONF_OPTS += -DWITH_JEMALLOC=no -DWITHOUT_TOKUDB=1
+# RocksDB fails to build in some configurations with the following build error:
+# ./output/build/mariadb-10.2.17/storage/rocksdb/rocksdb/utilities/backupable/backupable_db.cc:327:38:
+# error: field 'result' has incomplete type 'std::promise<rocksdb::BackupEngineImpl::CopyOrCreateResult>'
+# std::promise<CopyOrCreateResult> result;
+#
+# To work around the issue, we disable RocksDB
+MARIADB_CONF_OPTS += -DWITHOUT_ROCKSDB=1
+
# Make it explicit that we are cross-compiling
MARIADB_CONF_OPTS += -DCMAKE_CROSSCOMPILING=1
@@ -67,7 +75,7 @@ MARIADB_CONF_OPTS += \
-DMYSQL_DATADIR=/var/lib/mysql \
-DMYSQL_UNIX_ADDR=$(MYSQL_SOCKET)
-HOST_MARIADB_CONF_OPTS += -DWITH_SSL=bundled
+HOST_MARIADB_CONF_OPTS += -DWITH_SSL=OFF
# Some helpers must be compiled for host in order to crosscompile mariadb for
# the target. They are then included by import_executables.cmake which is
diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk
index fc88f0ed60..ae0fb017f3 100644
--- a/package/mesa3d-headers/mesa3d-headers.mk
+++ b/package/mesa3d-headers/mesa3d-headers.mk
@@ -12,7 +12,7 @@ endif
# Not possible to directly refer to mesa3d variables, because of
# first/second expansion trickery...
-MESA3D_HEADERS_VERSION = 18.1.5
+MESA3D_HEADERS_VERSION = 18.1.6
MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive
MESA3D_HEADERS_DL_SUBDIR = mesa3d
diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash
index ff336f7d41..4f8eb851d2 100644
--- a/package/mesa3d/mesa3d.hash
+++ b/package/mesa3d/mesa3d.hash
@@ -1,8 +1,8 @@
-# From https://lists.freedesktop.org/archives/mesa-announce/2018-July/000445.html
-md5 622bd23ca8daa83a62938bd33600a580 mesa-18.1.5.tar.xz
-sha1 1ca7d5f5d12c95f8da137be34223229b9f0594fe mesa-18.1.5.tar.xz
-sha256 69dbe6f1a6660386f5beb85d4fcf003ee23023ed7b9a603de84e9a37e8d98dea mesa-18.1.5.tar.xz
-sha512 f0bcb903bbf2ff7fc0b4a8fe100ea26ee91c0029b64adaf5fc4877ed7681f325c54b1be8eb0b140bff620da79f30a96375c2e1085e504ebfaf50e57f6da93013 mesa-18.1.5.tar.xz
+# From https://lists.freedesktop.org/archives/mesa-announce/2018-August/000451.html
+md5 f798814c0b93ca3c1cf395bb936db3e0 mesa-18.1.6.tar.xz
+sha1 8d4daf725f20404f980b981c9693b58756ba6c48 mesa-18.1.6.tar.xz
+sha256 bb7ce759069801804fcfb8152da3457f76cd7b4e0096e4870ff5adcb5c894289 mesa-18.1.6.tar.xz
+sha512 2966210800215f5ced2720691063a8519b51ebeab9fb1e99bde4b1bd7ccc719d6395a1c29f25c88efe62d1592cf14ceafc163aca349490b1f8cee81070d46fcc mesa-18.1.6.tar.xz
# License
sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c docs/license.html
sha256 3a0cf6c7835f98f86d5579b2cc517f84254da7411f764fb0095a383fb0759771 docs/patents.txt
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index e1e21321b0..700b01730c 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -5,7 +5,7 @@
################################################################################
# When updating the version, please also update mesa3d-headers
-MESA3D_VERSION = 18.1.5
+MESA3D_VERSION = 18.1.6
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
MESA3D_SITE = https://mesa.freedesktop.org/archive
MESA3D_LICENSE = MIT, SGI, Khronos
diff --git a/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch b/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
deleted file mode 100644
index 03c1944258..0000000000
--- a/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 53e4920038d5562b7b672fec8b9469fc02eef4ad Mon Sep 17 00:00:00 2001
-From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-Date: Thu, 10 May 2018 21:57:49 +0200
-Subject: [PATCH] Only fix RPATH if install_rpath is not empty
-
-Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
----
- mesonbuild/scripts/meson_install.py | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py
-index 013f2a00..f7ff1dcc 100644
---- a/mesonbuild/scripts/meson_install.py
-+++ b/mesonbuild/scripts/meson_install.py
-@@ -368,7 +368,13 @@ def install_targets(d):
- printed_symlink_error = True
- if os.path.isfile(outname):
- try:
-- depfixer.fix_rpath(outname, install_rpath, False)
-+ # Buildroot check-host-rpath script expects RPATH
-+ # But if install_rpath is empty, it will stripped.
-+ # So, preserve it in this case
-+ if install_rpath:
-+ depfixer.fix_rpath(outname, install_rpath, False)
-+ else:
-+ print("Skipping RPATH fixing")
- except SystemExit as e:
- if isinstance(e.code, int) and e.code == 0:
- pass
---
-2.14.3
-
diff --git a/package/meson/meson.hash b/package/meson/meson.hash
index bd9e4114ff..4a4923bd12 100644
--- a/package/meson/meson.hash
+++ b/package/meson/meson.hash
@@ -1,4 +1,4 @@
# Locally calculated after checking pgp signature
-# https://github.com/mesonbuild/meson/releases/download/0.46.1/meson-0.46.1.tar.gz.asc
-sha256 19497a03e7e5b303d8d11f98789a79aba59b5ad4a81bd00f4d099be0212cee78 meson-0.46.1.tar.gz
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING
+# https://github.com/mesonbuild/meson/releases/download/0.47.1/meson-0.47.1.tar.gz.asc
+sha256 d673de79f7bab064190a5ea06140eaa8415efb386d0121ba549f6d66c555ada6 meson-0.47.1.tar.gz
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING
diff --git a/package/meson/meson.mk b/package/meson/meson.mk
index 28c9e6f202..d110e594f5 100644
--- a/package/meson/meson.mk
+++ b/package/meson/meson.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MESON_VERSION = 0.46.1
+MESON_VERSION = 0.47.1
MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)
MESON_LICENSE = Apache-2.0
MESON_LICENSE_FILES = COPYING
diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash
index d42d7ee148..88068a60f3 100644
--- a/package/micropython/micropython.hash
+++ b/package/micropython/micropython.hash
@@ -1,2 +1,2 @@
#locally computed
-sha256 ce6b5c4548e85d84075635ff3e94d5cd3356b5fcc7593a7b49dd513612b6ed01 micropython-v1.9.3.tar.gz
+sha256 9a66205d0ba3dff6dcc98119f104cd59c15855c6c030a190ca02354be52836c1 micropython-v1.9.4.tar.gz
diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk
index 2c6bddd81d..cff8b17b14 100644
--- a/package/micropython/micropython.mk
+++ b/package/micropython/micropython.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MICROPYTHON_VERSION = v1.9.3
+MICROPYTHON_VERSION = v1.9.4
MICROPYTHON_SITE = $(call github,micropython,micropython,$(MICROPYTHON_VERSION))
MICROPYTHON_LICENSE = MIT
MICROPYTHON_LICENSE_FILES = LICENSE
diff --git a/package/minicom/0001-musl-libc-compile-fix.patch b/package/minicom/0001-musl-libc-compile-fix.patch
deleted file mode 100644
index 94c0da06a5..0000000000
--- a/package/minicom/0001-musl-libc-compile-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# HG changeset patch
-# User Adam Lackorzynski <adam@os.inf.tu-dresden.de>
-# Date 1432407431 -7200
-# Sat May 23 20:57:11 2015 +0200
-# Node ID 8bf81e6a8e60e37c2dec9577a1be6357b8d56165
-# Parent 8c784c80c17aa7a346d982db23bca5df67302cda
-musl-libc compile fix
-
-By Felix Janda <felix.janda@posteo.de>:
-VC_MUSIC is enabled by default on linux and in dial.c the
-necessary header are only included for glibc. (The wrong conditional
-include has likely been introduced by the 2003-03-30 GNU/Hurd patch.)
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-[Taken from upstream Mercurial commit 8bf81e6a8e60]
-
-diff -r 8c784c80c17a -r 8bf81e6a8e60 src/dial.c
---- a/src/dial.c Sat May 23 20:56:29 2015 +0200
-+++ b/src/dial.c Sat May 23 20:57:11 2015 +0200
-@@ -39,7 +39,7 @@
- #include "intl.h"
-
- #ifdef VC_MUSIC
--# if defined(__GLIBC__)
-+# if defined(__linux__) || defined(__GLIBC__)
- # include <sys/ioctl.h>
- # include <sys/kd.h>
- # include <sys/time.h>
diff --git a/package/minicom/0001-sysdep1-check-if-RS485-is-support-before-setting-its.patch b/package/minicom/0001-sysdep1-check-if-RS485-is-support-before-setting-its.patch
new file mode 100644
index 0000000000..39f68350c8
--- /dev/null
+++ b/package/minicom/0001-sysdep1-check-if-RS485-is-support-before-setting-its.patch
@@ -0,0 +1,36 @@
+From 238bbe98558bcd5ed9ab73ef03db82b57ab056ab Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <giulio.benetti@micronovasrl.com>
+Date: Fri, 31 Aug 2018 15:18:22 +0200
+Subject: [PATCH] sysdep1: check if RS485 is support before setting its
+ parameters
+
+Not every kernel supports RS485, so better check it before setting its
+parameters.
+
+Test if RS485 is supported by checking if these 3 macros are defined:
+- SER_RS485_ENABLED
+- TIOCGRS485
+- TIOCSRS485
+If they're not defined m_set485parms becomes a dummy function.
+
+Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
+---
+ src/sysdep1.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sysdep1.c b/src/sysdep1.c
+index 798b006..b03b442 100644
+--- a/src/sysdep1.c
++++ b/src/sysdep1.c
+@@ -599,7 +599,7 @@ void m_set485parms(int fd, int en, int rts_on_snd, int rts_aft_snd,
+ int rx_dur_tx, int term_bus, char *del_rts_bef_snd,
+ char *del_rts_aft_snd)
+ {
+-#ifdef SER_RS485_ENABLED
++#if defined (SER_RS485_ENABLED) && defined (TIOCGRS485) && defined (TIOCSRS485)
+ struct serial_rs485 rs485conf;
+
+ if (ioctl(fd, TIOCGRS485, &rs485conf))
+--
+2.17.1
+
diff --git a/package/minicom/0002-change-maxnamlen-to-posixs-name-max.patch b/package/minicom/0002-change-maxnamlen-to-posixs-name-max.patch
deleted file mode 100644
index 83e1530600..0000000000
--- a/package/minicom/0002-change-maxnamlen-to-posixs-name-max.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-# HG changeset patch
-# User Adam Lackorzynski <adam@os.inf.tu-dresden.de>
-# Date 1432407475 -7200
-# Sat May 23 20:57:55 2015 +0200
-# Node ID 93e5dd955c8bd944fd64bb04fd117c963c3758bc
-# Parent 8bf81e6a8e60e37c2dec9577a1be6357b8d56165
-Change MAXNAMLEN to POSIX's NAME_MAX
-
-By Felix Janda <felix.janda@posteo.de>:
-MAXNAMLEN is usually defined in <sys/param.h> but it is
-better to use the equivalent POSIX NAME_MAX.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-[Taken from upstream Mercurial commit 93e5dd955c8b]
-
-diff -r 8bf81e6a8e60 -r 93e5dd955c8b src/getsdir.c
---- a/src/getsdir.c Sat May 23 20:57:11 2015 +0200
-+++ b/src/getsdir.c Sat May 23 20:57:55 2015 +0200
-@@ -145,7 +145,7 @@
- *
- * The data will be in the form:
- * typedef struct dirEntry {
-- * char fname[MAXNAMLEN + 1];
-+ * char fname[NAME_MAX + 1];
- * time_t time;
- * mode_t mode;
- * } GETSDIR_ENTRY;
-@@ -232,7 +232,7 @@
- }
-
- /* copy the filename */
-- strncpy((*datptr)[cnt].fname, dp->d_name, MAXNAMLEN);
-+ strncpy((*datptr)[cnt].fname, dp->d_name, NAME_MAX);
-
- /* get information about the directory entry */
- snprintf(fpath, sizeof(fpath), "%s/%s", dirpath, dp->d_name);
-diff -r 8bf81e6a8e60 -r 93e5dd955c8b src/getsdir.h
---- a/src/getsdir.h Sat May 23 20:57:11 2015 +0200
-+++ b/src/getsdir.h Sat May 23 20:57:55 2015 +0200
-@@ -23,9 +23,10 @@
- */
-
- #include <dirent.h>
-+#include <limits.h>
-
- typedef struct dirEntry { /* structure of data item */
-- char fname[MAXNAMLEN + 1]; /* filename + terminating null */
-+ char fname[NAME_MAX + 1]; /* filename + terminating null */
- time_t time; /* last modification date */
- mode_t mode; /* file mode (dir? etc.) */
- ushort cflags; /* caller field for convenience */
diff --git a/package/minicom/Config.in b/package/minicom/Config.in
index c41c188570..efc4f1b709 100644
--- a/package/minicom/Config.in
+++ b/package/minicom/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_MINICOM
ANSI and VT102 terminals. It has a dialing directory and auto
zmodem download.
- http://alioth.debian.org/projects/minicom/
+ https://salsa.debian.org/minicom-team/minicom
comment "minicom needs a toolchain w/ wchar"
depends on BR2_USE_MMU
diff --git a/package/minicom/minicom.hash b/package/minicom/minicom.hash
index f49e430c67..c566f4be52 100644
--- a/package/minicom/minicom.hash
+++ b/package/minicom/minicom.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1 minicom-2.7.1.tar.gz
+sha256 3bd58b594ac66545649c13ab2b728a4df0f78612eb030680d4152f7627d1f177 minicom-19ab49422f3431102c31fea01549121385113f80.tar.gz
sha256 cf80a758014eefbf068afffe3d462fc34ff4f528527524d8e100329c42094e15 COPYING
diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk
index cb06482379..000597f8a9 100644
--- a/package/minicom/minicom.mk
+++ b/package/minicom/minicom.mk
@@ -4,10 +4,12 @@
#
################################################################################
-MINICOM_VERSION = 2.7.1
-MINICOM_SITE = https://alioth.debian.org/frs/download.php/file/4215
+MINICOM_VERSION = 19ab49422f3431102c31fea01549121385113f80
+MINICOM_SITE = https://salsa.debian.org/minicom-team/minicom.git
+MINICOM_SITE_METHOD = git
MINICOM_LICENSE = GPL-2.0+
MINICOM_LICENSE_FILES = COPYING
+MINICOM_AUTORECONF = YES
# pkg-config is only used to check for liblockdev, which we don't have
# in BR, so instead of adding host-pkgconf as a dependency, simply make
@@ -15,6 +17,15 @@ MINICOM_LICENSE_FILES = COPYING
# people have liblockdev1-dev installed
MINICOM_CONF_ENV = PKG_CONFIG=/bin/false
-MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv)
+MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv) \
+ $(TARGET_NLS_DEPENDENCIES)
+# add host-gettext for AM_ICONV macro
+MINICOM_DEPENDENCIES += host-gettext
+
+# Autoreconf requires an existing m4 directory
+define MINICOM_MKDIR_M4
+ mkdir -p $(@D)/m4
+endef
+MINICOM_POST_PATCH_HOOKS += MINICOM_MKDIR_M4
$(eval $(autotools-package))
diff --git a/package/mono/mono.hash b/package/mono/mono.hash
index 2cde7b6b21..db7ce52c97 100644
--- a/package/mono/mono.hash
+++ b/package/mono/mono.hash
@@ -1,5 +1,5 @@
# sha256 locally computed
-sha256 f0636baa0c1399805526142e799cb697ddccf736e506cf1a30a870eaa2830a89 mono-5.12.0.226.tar.bz2
+sha256 d4f5fa2e8188d66fbc8054f4145711e45c1faa6d070e63600efab93d1d189498 mono-5.14.0.177.tar.bz2
sha256 3b40a54878b5ac2767a764bd082f8772ab27c03b9da9c7328c4c4935725556f7 LICENSE
sha256 fc488f3ec9f36856bea8cce5cdde1449176341ef93a3962b691970f8981799f4 mcs/COPYING
sha256 2c3c3ef532828bcd42bb3127349625a25291ff5ae7e6f8d42e0fe9b5be836a99 external/Newtonsoft.Json/Tools/7-zip/copying.txt
diff --git a/package/mono/mono.mk b/package/mono/mono.mk
index d1fe9bb0b1..62eaeaf8b4 100644
--- a/package/mono/mono.mk
+++ b/package/mono/mono.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MONO_VERSION = 5.12.0.226
+MONO_VERSION = 5.14.0.177
MONO_SITE = http://download.mono-project.com/sources/mono
MONO_SOURCE = mono-$(MONO_VERSION).tar.bz2
MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial
diff --git a/package/monolite/monolite.hash b/package/monolite/monolite.hash
index 77810a9511..cf72916855 100644
--- a/package/monolite/monolite.hash
+++ b/package/monolite/monolite.hash
@@ -1,2 +1,2 @@
# sha256 locally computed
-sha256 fece21adc06118fa5d79d3621a5fc702ec354abf83be29a36f8718645a2dc058 monolite-linux-1051200002-latest.tar.gz
+sha256 bb4b3b12b9ff04b219ad00dcea78145475d756a1c22ad84e0db978a8eee8c654 monolite-linux-1051400005-latest.tar.gz
diff --git a/package/monolite/monolite.mk b/package/monolite/monolite.mk
index 4e1d548994..2e1e54a549 100644
--- a/package/monolite/monolite.mk
+++ b/package/monolite/monolite.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MONOLITE_VERSION = 1051200002
+MONOLITE_VERSION = 1051400005
MONOLITE_SITE = http://download.mono-project.com/monolite
MONOLITE_SOURCE = monolite-linux-$(MONOLITE_VERSION)-latest.tar.gz
MONOLITE_LICENSE = LGPL-2.0 or commercial
diff --git a/package/mosquitto/0001-Fix-subs-memory-issue.patch b/package/mosquitto/0001-Fix-subs-memory-issue.patch
deleted file mode 100644
index 49ec15630a..0000000000
--- a/package/mosquitto/0001-Fix-subs-memory-issue.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 67fe32672b60afd6cf91f7a3ccc969259dc68a19 Mon Sep 17 00:00:00 2001
-From: Tatsuzo Osawa <tatsuzo.osawa@gmail.com>
-Date: Thu, 24 Aug 2017 12:22:33 +0000
-Subject: [PATCH] Fix subs memory issue.
-
-Patches retrieved from: https://github.com/eclipse/mosquitto/pull/531
-
-Both patches have been merged in a single one as second patch is putting
-back code that is wrongly deleted in first patch.
-First patch needs also an update to apply on version 1.5
-
-Signed-off-by: Tatsuzo Osawa <tatsuzo.osawa@gmail.com>
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- src/database.c | 16 ++++++++++++----
- src/mosquitto_broker_internal.h | 4 ++--
- src/subs.c | 21 ++++++++++++---------
- 3 files changed, 26 insertions(+), 15 deletions(-)
-
-diff --git a/src/database.c b/src/database.c
-index 670cf710..9e02de2d 100644
---- a/src/database.c
-+++ b/src/database.c
-@@ -12,6 +12,7 @@ and the Eclipse Distribution License is available at
-
- Contributors:
- Roger Light - initial implementation and documentation.
-+ Tatsuzo Osawa - Fix subs memory issue.
- */
-
- #include <assert.h>
-@@ -121,10 +122,10 @@ int db__open(struct mosquitto__config *config, struct mosquitto_db *db)
-
- db->subs = NULL;
-
-- subhier = sub__add_hier_entry(&db->subs, "", strlen(""));
-+ subhier = sub__add_hier_entry(NULL, &db->subs, "", strlen(""));
- if(!subhier) return MOSQ_ERR_NOMEM;
-
-- subhier = sub__add_hier_entry(&db->subs, "$SYS", strlen("$SYS"));
-+ subhier = sub__add_hier_entry(NULL, &db->subs, "$SYS", strlen("$SYS"));
- if(!subhier) return MOSQ_ERR_NOMEM;
-
- db->unpwd = NULL;
-diff --git a/src/mosquitto_broker_internal.h b/src/mosquitto_broker_internal.h
-index 3508c555..808b4f2b 100644
---- a/src/mosquitto_broker_internal.h
-+++ b/src/mosquitto_broker_internal.h
-@@ -12,7 +12,7 @@ and the Eclipse Distribution License is available at
-
- Contributors:
- Roger Light - initial implementation and documentation.
-- Tatsuzo Osawa - Add epoll.
-+ Tatsuzo Osawa - Add epoll. Fix subs memory issue.
- */
-
- #ifndef MOSQUITTO_BROKER_INTERNAL_H
-@@ -547,7 +547,7 @@ void sys_tree__update(struct mosquitto_db *db, int interval, time_t start_time);
- * Subscription functions
- * ============================================================ */
- int sub__add(struct mosquitto_db *db, struct mosquitto *context, const char *sub, int qos, struct mosquitto__subhier **root);
--struct mosquitto__subhier *sub__add_hier_entry(struct mosquitto__subhier **parent, const char *topic, size_t len);
-+struct mosquitto__subhier *sub__add_hier_entry(struct mosquitto__subhier *parent, struct mosquitto__subhier **head, const char *topic, size_t len);
- int sub__remove(struct mosquitto_db *db, struct mosquitto *context, const char *sub, struct mosquitto__subhier *root);
- void sub__tree_print(struct mosquitto__subhier *root, int level);
- int sub__clean_session(struct mosquitto_db *db, struct mosquitto *context);
-diff --git a/src/subs.c b/src/subs.c
-index 7b9b457c..b1c0fc78 100644
---- a/src/subs.c
-+++ b/src/subs.c
-@@ -12,6 +12,7 @@ and the Eclipse Distribution License is available at
-
- Contributors:
- Roger Light - initial implementation and documentation.
-+ Tatsuzo Osawa - Fix subs memory issue.
- */
-
- /* A note on matching topic subscriptions.
-@@ -314,7 +315,7 @@ static int sub__add_recurse(struct mosquitto_db *db, struct mosquitto *context,
- return sub__add_recurse(db, context, qos, branch, tokens->next);
- }else{
- /* Not found */
-- branch = sub__add_hier_entry(&subhier->children, UHPA_ACCESS_TOPIC(tokens), tokens->topic_len+1);
-+ branch = sub__add_hier_entry(subhier, &subhier->children, UHPA_ACCESS_TOPIC(tokens), tokens->topic_len+1);
- if(!branch) return MOSQ_ERR_NOMEM;
-
- return sub__add_recurse(db, context, qos, branch, tokens->next);
-@@ -406,18 +407,18 @@ static void sub__search(struct mosquitto_db *db, struct mosquitto__subhier *subh
- }
-
-
--struct mosquitto__subhier *sub__add_hier_entry(struct mosquitto__subhier **parent, const char *topic, size_t len)
-+struct mosquitto__subhier *sub__add_hier_entry(struct mosquitto__subhier *parent, struct mosquitto__subhier **head, const char *topic, size_t len)
- {
- struct mosquitto__subhier *child;
-
-- assert(parent);
-+ assert(head);
-
- child = mosquitto__malloc(sizeof(struct mosquitto__subhier));
- if(!child){
- log__printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory.");
- return NULL;
- }
-- child->parent = *parent;
-+ child->parent = parent;
- child->topic_len = strlen(topic);
- if(UHPA_ALLOC_TOPIC(child) == 0){
- child->topic_len = 0;
-@@ -433,13 +434,13 @@ struct mosquitto__subhier *sub__add_hier_entry(struct mosquitto__subhier **paren
-
- if(child->topic_len+1 > sizeof(child->topic.array)){
- if(child->topic.ptr){
-- HASH_ADD_KEYPTR(hh, *parent, child->topic.ptr, child->topic_len, child);
-+ HASH_ADD_KEYPTR(hh, *head, child->topic.ptr, child->topic_len, child);
- }else{
- mosquitto__free(child);
- return NULL;
- }
- }else{
-- HASH_ADD(hh, *parent, topic.array, child->topic_len, child);
-+ HASH_ADD(hh, *head, topic.array, child->topic_len, child);
- }
-
- return child;
-@@ -460,7 +461,7 @@ int sub__add(struct mosquitto_db *db, struct mosquitto *context, const char *sub
-
- HASH_FIND(hh, *root, UHPA_ACCESS_TOPIC(tokens), tokens->topic_len, subhier);
- if(!subhier){
-- subhier = sub__add_hier_entry(root, UHPA_ACCESS_TOPIC(tokens), tokens->topic_len+1);
-+ subhier = sub__add_hier_entry(NULL, root, UHPA_ACCESS_TOPIC(tokens), tokens->topic_len+1);
- if(!subhier){
- sub__topic_tokens_free(tokens);
- log__printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory.");
-@@ -545,12 +546,14 @@ static struct mosquitto__subhier *tmp_remove_subs(struct mosquitto__subhier *sub
- return NULL;
- }
-
-- if(sub->children || sub->subs){
-+ if(sub->children || sub->subs || sub->retained){
- return NULL;
- }
-
- parent = sub->parent;
-- HASH_DELETE(hh, parent, sub);
-+ HASH_DELETE(hh, parent->children, sub);
-+ UHPA_FREE_TOPIC(sub);
-+ mosquitto__free(sub);
-
- if(parent->subs == NULL
- && parent->children == NULL
diff --git a/package/mosquitto/0001-_GNU_SOURCE-needed-for-EAI_INPROGRESS.patch b/package/mosquitto/0001-_GNU_SOURCE-needed-for-EAI_INPROGRESS.patch
new file mode 100644
index 0000000000..e350e465b4
--- /dev/null
+++ b/package/mosquitto/0001-_GNU_SOURCE-needed-for-EAI_INPROGRESS.patch
@@ -0,0 +1,46 @@
+From d684055b2b92e7ec5793e70c9a80c7f8e45e0696 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Fri, 24 Aug 2018 16:38:42 +0200
+Subject: [PATCH] _GNU_SOURCE needed for EAI_INPROGRESS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Define of _GNU_SOURCE is needed to be able to use EAI_INPROGRESS in
+loop.c.
+
+This patch fixes a build error
+
+loop.c:334:17: error: ‘EAI_INPROGRESS’ undeclared (first use in this function)
+ if(rc == EAI_INPROGRESS){
+
+occuring with a glibc-2.27-based buildroot toolchain for sparc64
+
+Target: sparc64-buildroot-linux-gnu
+[...]
+gcc version 6.4.0 (Buildroot 2018.05)
+
+Source:
+http://autobuild.buildroot.org/toolchains/tarballs/br-sparc64-full-2018.05.tar.bz2
+
+Patch sent upstream as PR 933.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ config.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/config.h b/config.h
+index 7607019..ba0ba93 100644
+--- a/config.h
++++ b/config.h
+@@ -39,4 +39,6 @@
+ # define _POSIX_C_SOURCE 200809L
+ #endif
+
++#define _GNU_SOURCE
++
+ #endif
+--
+2.18.0
+
diff --git a/package/mosquitto/0002-websockets-_GNU_SOURCE-needed-for-S_IF-DIR-REG.patch b/package/mosquitto/0002-websockets-_GNU_SOURCE-needed-for-S_IF-DIR-REG.patch
deleted file mode 100644
index 88f9cbd94a..0000000000
--- a/package/mosquitto/0002-websockets-_GNU_SOURCE-needed-for-S_IF-DIR-REG.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d4442c3df7552756f53e656e446bc1bd7dc79a88 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 18 Jun 2018 19:52:58 +0200
-Subject: [PATCH] websockets: _GNU_SOURCE needed for S_IF{DIR,REG}
-
-Define of _GNU_SOURCE is needed to be able to use S_IFDIR and S_IFREG in
-src/websockets.c
-
-Fixes:
- - http://autobuild.buildroot.net/results/7dcfb6ca9d14a5cd6872590065549356f1ab42a0
-
-[Upstream status: https://github.com/eclipse/mosquitto/pull/862]
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- src/websockets.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/websockets.c b/src/websockets.c
-index 1e513ae..7722b4d 100644
---- a/src/websockets.c
-+++ b/src/websockets.c
-@@ -29,6 +29,8 @@ POSSIBILITY OF SUCH DAMAGE.
-
- #ifdef WITH_WEBSOCKETS
-
-+#define _GNU_SOURCE
-+
- #include "config.h"
-
- #include <libwebsockets.h>
---
-2.14.1
-
diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash
index 87ddad9578..96817d464d 100644
--- a/package/mosquitto/mosquitto.hash
+++ b/package/mosquitto/mosquitto.hash
@@ -1,5 +1,5 @@
# Locally calculated after checking gpg signature
-sha256 80c9606a906c736fe582b67bdfb650ee45239fea058fe34927f81277d3486e21 mosquitto-1.5.tar.gz
+sha256 8557bc7ae34dfaf32a0fb56d2491b7a7f731269c88337227233013502df4d5b0 mosquitto-1.5.1.tar.gz
# License files
sha256 cc77e25bafd40637b7084f04086d606f0a200051b61806f97c93405926670bc1 LICENSE.txt
diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk
index 993da2f925..7ac6487488 100644
--- a/package/mosquitto/mosquitto.mk
+++ b/package/mosquitto/mosquitto.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MOSQUITTO_VERSION = 1.5
+MOSQUITTO_VERSION = 1.5.1
MOSQUITTO_SITE = https://mosquitto.org/files/source
MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0
MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10
diff --git a/package/mysql/Config.in b/package/mysql/Config.in
index 2abf5daecb..ccc014e272 100644
--- a/package/mysql/Config.in
+++ b/package/mysql/Config.in
@@ -16,7 +16,6 @@ choice
config BR2_PACKAGE_MARIADB
bool "mariadb"
- depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_LIBAIO
select BR2_PACKAGE_LIBXML2
@@ -32,7 +31,6 @@ config BR2_PACKAGE_MARIADB
http://www.mariadb.org/
comment "mariadb needs a toolchain w/ dynamic library"
- depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
depends on BR2_STATIC_LIBS
config BR2_PACKAGE_ORACLE_MYSQL
diff --git a/package/netsnmp/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch b/package/netsnmp/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch
deleted file mode 100644
index cf0592233e..0000000000
--- a/package/netsnmp/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch
+++ /dev/null
@@ -1,300 +0,0 @@
-From 57d6c3d36045aab8957ffeb7324728bf17faf8bd Mon Sep 17 00:00:00 2001
-From: Bart Van Assche <bvanassche@acm.org>
-Date: Mon, 2 Feb 2015 20:31:29 +0100
-Subject: [PATCH] configure: Eliminate the hard-coded libnl-3 include path
-
-See also commit 3dde41998625fe0e24119a2e1f4509ba3ba2fd9a.
-
-(cherry picked from commit 852dcd644cfe4cfc7177649eaec163d6221f2be1)
-
-Original commit included modifications to configure script.
-Do not keep these modifications, since they caused lots of conflicts, and
-configure script is meant to be automatically generated.
-
-Signed-off-by: Julien Floret <julien.floret@6wind.com>
-
-Conflicts:
- configure
----
- aclocal.m4 | 1 +
- configure.d/config_os_libs2 | 30 ++++++-
- m4/pkg.m4 | 214 ++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 243 insertions(+), 2 deletions(-)
- create mode 100644 m4/pkg.m4
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index cd80c7486f2f..45e3608ed480 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -22,3 +22,4 @@ m4_include([m4/ltversion.m4])
- m4_include([m4/lt~obsolete.m4])
- m4_include([m4/netsnmp_arg.m4])
- m4_include([m4/netsnmp_search_libs.m4])
-+m4_include([m4/pkg.m4])
-diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2
-index 47491e24ce0a..10bd414b879e 100644
---- a/configure.d/config_os_libs2
-+++ b/configure.d/config_os_libs2
-@@ -225,11 +225,37 @@ fi
- if test "x$with_nl" != "xno"; then
- case $target_os in
- linux*) # Check for libnl (linux)
-+ # The test below verifies whether the libnl-3 package been installed.
-+ # This test works as follows:
-+ # - If pkg-config was not installed at the time autogen.sh was run,
-+ # the definition of the PKG_CHECK_EXISTS() macro will not be found by
-+ # autogen.sh. Augogen.sh will generate a configure script that prints
-+ # a warning about pkg-config and proceeds as if libnl-3 has not been
-+ # installed.
-+ # - If pkg-config was installed at the time autogen.sh was run,
-+ # the generated configure script will try to detect the presence of
-+ # the libnl-3 library by looking up compile and linker flags in the
-+ # file called libnl-3.pc.
-+ # - pkg-config settings can be overridden via the configure variables
-+ # LIBNL3_CFLAGS and LIBNL3_LIBS (added by the pkg-config m4 macro's to
-+ # the configure script -- see also ./configure --help).
-+ # - The LIBNL3_CFLAGS and LIBNL3_LIBS configure variables can be used
-+ # even if the pkg-config executable is not present on the system on
-+ # which the configure script is run.
-+ ifdef(
-+ [PKG_CHECK_EXISTS],
-+ [PKG_CHECK_EXISTS([libnl-3.0],
-+ [PKG_CHECK_MODULES([LIBNL3], [libnl-3.0])])
-+ ],
-+ AC_MSG_WARN([pkg-config has not been installed or is too old.])
-+ AC_MSG_WARN([Detection of libnl-3.0 will be skipped.])
-+ )
-+
- netsnmp_save_CPPFLAGS="$CPPFLAGS"
-- CPPFLAGS="-I/usr/include/libnl3 $CPPFLAGS"
-+ CPPFLAGS="${LIBNL3_CFLAGS} $CPPFLAGS"
- NETSNMP_SEARCH_LIBS(nl_connect, nl-3,
- [AC_CHECK_HEADERS(netlink/netlink.h)
-- EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES -I/usr/include/libnl3"],
-+ EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES ${LIBNL3_CFLAGS}"],
- [CPPFLAGS="$netsnmp_save_CPPFLAGS"], [], [], [LMIBLIBS])
- if test "x$ac_cv_header_netlink_netlink_h" != xyes; then
- NETSNMP_SEARCH_LIBS(nl_connect, nl, [
-diff --git a/m4/pkg.m4 b/m4/pkg.m4
-new file mode 100644
-index 000000000000..c5b26b52e6cd
---- /dev/null
-+++ b/m4/pkg.m4
-@@ -0,0 +1,214 @@
-+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-+# serial 1 (pkg-config-0.24)
-+#
-+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+# ----------------------------------
-+AC_DEFUN([PKG_PROG_PKG_CONFIG],
-+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=m4_default([$1], [0.9.0])
-+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ PKG_CONFIG=""
-+ fi
-+fi[]dnl
-+])# PKG_PROG_PKG_CONFIG
-+
-+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+#
-+# Check to see whether a particular set of modules exists. Similar
-+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-+#
-+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+# only at the first occurence in configure.ac, so if the first place
-+# it's called might be skipped (such as if it is within an "if", you
-+# have to call PKG_CHECK_EXISTS manually
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_EXISTS],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+if test -n "$PKG_CONFIG" && \
-+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-+ m4_default([$2], [:])
-+m4_ifvaln([$3], [else
-+ $3])dnl
-+fi])
-+
-+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+# ---------------------------------------------
-+m4_define([_PKG_CONFIG],
-+[if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ elif test -n "$PKG_CONFIG"; then
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes ],
-+ [pkg_failed=yes])
-+ else
-+ pkg_failed=untried
-+fi[]dnl
-+])# _PKG_CONFIG
-+
-+# _PKG_SHORT_ERRORS_SUPPORTED
-+# -----------------------------
-+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi[]dnl
-+])# _PKG_SHORT_ERRORS_SUPPORTED
-+
-+
-+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+# [ACTION-IF-NOT-FOUND])
-+#
-+#
-+# Note that if there is a possibility the first call to
-+# PKG_CHECK_MODULES might not happen, you should be sure to include an
-+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+#
-+#
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
-+
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-+
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
-+
-+if test $pkg_failed = yes; then
-+ AC_MSG_RESULT([no])
-+ _PKG_SHORT_ERRORS_SUPPORTED
-+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-+
-+ m4_default([$4], [AC_MSG_ERROR(
-+[Package requirements ($2) were not met:
-+
-+$$1_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+_PKG_TEXT])[]dnl
-+ ])
-+elif test $pkg_failed = untried; then
-+ AC_MSG_RESULT([no])
-+ m4_default([$4], [AC_MSG_FAILURE(
-+[The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+_PKG_TEXT
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-+ ])
-+else
-+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+ AC_MSG_RESULT([yes])
-+ $3
-+fi[]dnl
-+])# PKG_CHECK_MODULES
-+
-+
-+# PKG_INSTALLDIR(DIRECTORY)
-+# -------------------------
-+# Substitutes the variable pkgconfigdir as the location where a module
-+# should install pkg-config .pc files. By default the directory is
-+# $libdir/pkgconfig, but the default can be changed by passing
-+# DIRECTORY. The user can override through the --with-pkgconfigdir
-+# parameter.
-+AC_DEFUN([PKG_INSTALLDIR],
-+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-+m4_pushdef([pkg_description],
-+ [pkg-config installation directory @<:@]pkg_default[@:>@])
-+AC_ARG_WITH([pkgconfigdir],
-+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-+ [with_pkgconfigdir=]pkg_default)
-+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-+m4_popdef([pkg_default])
-+m4_popdef([pkg_description])
-+]) dnl PKG_INSTALLDIR
-+
-+
-+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-+# -------------------------
-+# Substitutes the variable noarch_pkgconfigdir as the location where a
-+# module should install arch-independent pkg-config .pc files. By
-+# default the directory is $datadir/pkgconfig, but the default can be
-+# changed by passing DIRECTORY. The user can override through the
-+# --with-noarch-pkgconfigdir parameter.
-+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-+m4_pushdef([pkg_description],
-+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-+AC_ARG_WITH([noarch-pkgconfigdir],
-+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-+ [with_noarch_pkgconfigdir=]pkg_default)
-+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-+m4_popdef([pkg_default])
-+m4_popdef([pkg_description])
-+]) dnl PKG_NOARCH_INSTALLDIR
-+
-+
-+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+# -------------------------------------------
-+# Retrieves the value of the pkg-config variable for the given module.
-+AC_DEFUN([PKG_CHECK_VAR],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-+
-+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-+AS_VAR_COPY([$1], [pkg_cv_][$1])
-+
-+AS_VAR_IF([$1], [""], [$5], [$4])dnl
-+])# PKG_CHECK_VAR
---
-2.1.0
-
diff --git a/package/netsnmp/netsnmp.hash b/package/netsnmp/netsnmp.hash
index fc77926023..d05a7de9da 100644
--- a/package/netsnmp/netsnmp.hash
+++ b/package/netsnmp/netsnmp.hash
@@ -1,3 +1,6 @@
-# From http://sourceforge.net/projects/net-snmp/files/net-snmp/5.7.3/
-md5 d4a3459e1577d0efa8d96ca70a885e53 net-snmp-5.7.3.tar.gz
-sha1 97dc25077257680815de44e34128d365c76bd839 net-snmp-5.7.3.tar.gz
+# From http://sourceforge.net/projects/net-snmp/files/net-snmp/5.8/
+md5 63bfc65fbb86cdb616598df1aff6458a net-snmp-5.8.tar.gz
+sha1 78f70731df9dcdb13fe8f60eb7d80d7583da4d2c net-snmp-5.8.tar.gz
+# Locally computed
+sha256 b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf net-snmp-5.8.tar.gz
+sha256 ed869ea395a1f125819a56676385ab0557a21507764bf56f2943302011381e59 COPYING
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 742fa6e3b3..6c712ae075 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -4,8 +4,8 @@
#
################################################################################
-NETSNMP_VERSION = 5.7.3
-NETSNMP_SITE = http://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION)
+NETSNMP_VERSION = 5.8
+NETSNMP_SITE = https://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION)
NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz
NETSNMP_LICENSE = Various BSD-like
NETSNMP_LICENSE_FILES = COPYING
@@ -36,7 +36,6 @@ NETSNMP_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true inst
NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install
NETSNMP_MAKE = $(MAKE1)
NETSNMP_CONFIG_SCRIPTS = net-snmp-config
-NETSNMP_AUTORECONF = YES
ifeq ($(BR2_ENDIAN),"BIG")
NETSNMP_CONF_OPTS += --with-endianness=big
diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index e2c94ba8db..165f3f109a 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -10,7 +10,7 @@ NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \
libhttpparser libuv zlib \
$(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
-HOST_NODEJS_DEPENDENCIES = host-python host-zlib
+HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib
NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components)
NODEJS_LICENSE_FILES = LICENSE
@@ -50,10 +50,6 @@ define HOST_NODEJS_CONFIGURE_CMDS
mkdir -p $(@D)/bin
ln -sf $(HOST_DIR)/bin/python2 $(@D)/bin/python
- # Build with the static, built-in OpenSSL which is supplied as part of
- # the nodejs source distribution. This is needed on the host because
- # NPM is non-functional without it, and host-openssl isn't part of
- # buildroot.
(cd $(@D); \
$(HOST_CONFIGURE_OPTS) \
PATH=$(@D)/bin:$(BR_PATH) \
@@ -63,6 +59,9 @@ define HOST_NODEJS_CONFIGURE_CMDS
--without-snapshot \
--without-dtrace \
--without-etw \
+ --shared-openssl \
+ --shared-openssl-includes=$(HOST_DIR)/include/openssl \
+ --shared-openssl-libpath=$(HOST_DIR)/lib \
--shared-zlib \
--with-intl=none \
)
diff --git a/package/openresolv/Config.in b/package/openresolv/Config.in
new file mode 100644
index 0000000000..2a393c6bc4
--- /dev/null
+++ b/package/openresolv/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_OPENRESOLV
+ bool "openresolv"
+ help
+ openresolv is a resolvconf implementation which
+ manages resolv.conf. This tool provides a dns management
+ framework to track currently available nameservers.
+
+ https://github.com/rsmarples/openresolv
diff --git a/package/openresolv/openresolv.hash b/package/openresolv/openresolv.hash
new file mode 100644
index 0000000000..e1a1fb5468
--- /dev/null
+++ b/package/openresolv/openresolv.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 96b3f84435a183426c622db7097a930fb0d48a99e82cd87ce83bd343b8c20574 openresolv-fe4e1ec4e2be2adfc1530ade94ebb30aa6f51540.tar.gz
+sha256 d1f9dcd2dac4e095b14caab517cfe791a6e0785346164b7d0cafc13c714f8aa5 LICENSE
diff --git a/package/openresolv/openresolv.mk b/package/openresolv/openresolv.mk
new file mode 100644
index 0000000000..6adf973527
--- /dev/null
+++ b/package/openresolv/openresolv.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# openresolv
+#
+################################################################################
+
+OPENRESOLV_VERSION = fe4e1ec4e2be2adfc1530ade94ebb30aa6f51540
+OPENRESOLV_SITE = $(call github,rsmarples,openresolv,$(OPENRESOLV_VERSION))
+OPENRESOLV_LICENSE = BSD-2-Clause
+OPENRESOLV_LICENSE_FILES = LICENSE
+
+define OPENRESOLV_CONFIGURE_CMDS
+ cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure --prefix=/usr \
+ --sysconfdir=/etc
+endef
+
+define OPENRESOLV_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define OPENRESOLV_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
+endef
+
+$(eval $(generic-package))
diff --git a/package/perl-appconfig/Config.in b/package/perl-appconfig/Config.in
new file mode 100644
index 0000000000..0c40abb9ef
--- /dev/null
+++ b/package/perl-appconfig/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PERL_APPCONFIG
+ bool "perl-appconfig"
+ help
+ AppConfig is a bundle of Perl5 modules for reading
+ configuration files and parsing command line arguments.
+
+ https://metacpan.org/release/AppConfig
diff --git a/package/perl-appconfig/perl-appconfig.hash b/package/perl-appconfig/perl-appconfig.hash
new file mode 100644
index 0000000000..151a2e903f
--- /dev/null
+++ b/package/perl-appconfig/perl-appconfig.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 7747d9241561ed5567d5e134b8648707 AppConfig-1.71.tar.gz
+sha256 1177027025ecb09ee64d9f9f255615c04db5e14f7536c344af632032eb887b0f AppConfig-1.71.tar.gz
+
+# computed by scancpan
+sha256 0b22dd532e4123a511d14989c4169ed56b7316cf844c29c7897a1638a4616868 LICENSE
diff --git a/package/perl-appconfig/perl-appconfig.mk b/package/perl-appconfig/perl-appconfig.mk
new file mode 100644
index 0000000000..7a553e330b
--- /dev/null
+++ b/package/perl-appconfig/perl-appconfig.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# perl-appconfig
+#
+################################################################################
+
+PERL_APPCONFIG_VERSION = 1.71
+PERL_APPCONFIG_SOURCE = AppConfig-$(PERL_APPCONFIG_VERSION).tar.gz
+PERL_APPCONFIG_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NE/NEILB
+PERL_APPCONFIG_LICENSE = Artistic or GPL-1.0+
+PERL_APPCONFIG_LICENSE_FILES = LICENSE
+
+$(eval $(perl-package))
diff --git a/package/perl-astro-suntime/Config.in b/package/perl-astro-suntime/Config.in
new file mode 100644
index 0000000000..22e2cb1aa2
--- /dev/null
+++ b/package/perl-astro-suntime/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PERL_ASTRO_SUNTIME
+ bool "perl-astro-suntime"
+ help
+ A functional module for calculating sunrise/sunset times
+
+ https://metacpan.org/release/Astro-SunTime
diff --git a/package/perl-astro-suntime/perl-astro-suntime.hash b/package/perl-astro-suntime/perl-astro-suntime.hash
new file mode 100644
index 0000000000..e75293d4fb
--- /dev/null
+++ b/package/perl-astro-suntime/perl-astro-suntime.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 42cb8c94de8a111ed652196925c22a45 Astro-SunTime-0.06.tar.gz
+sha256 b4a44fddfc055cc42ee67bfd8939354793da7512ea04f30578d42dc6a701112a Astro-SunTime-0.06.tar.gz
+
+# computed by scancpan
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE
diff --git a/package/perl-astro-suntime/perl-astro-suntime.mk b/package/perl-astro-suntime/perl-astro-suntime.mk
new file mode 100644
index 0000000000..3bd421eec5
--- /dev/null
+++ b/package/perl-astro-suntime/perl-astro-suntime.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# perl-astro-suntime
+#
+################################################################################
+
+PERL_ASTRO_SUNTIME_VERSION = 0.06
+PERL_ASTRO_SUNTIME_SOURCE = Astro-SunTime-$(PERL_ASTRO_SUNTIME_VERSION).tar.gz
+PERL_ASTRO_SUNTIME_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RO/ROBF
+PERL_ASTRO_SUNTIME_DEPENDENCIES = host-perl-module-build
+PERL_ASTRO_SUNTIME_LICENSE = GPL-3.0
+PERL_ASTRO_SUNTIME_LICENSE_FILES = LICENSE
+
+$(eval $(perl-package))
diff --git a/package/perl-class-std-fast/Config.in b/package/perl-class-std-fast/Config.in
new file mode 100644
index 0000000000..10b1e0d786
--- /dev/null
+++ b/package/perl-class-std-fast/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PERL_CLASS_STD_FAST
+ bool "perl-class-std-fast"
+ select BR2_PACKAGE_PERL_CLASS_STD
+ help
+ faster but less secure than Class::Std
+
+ https://metacpan.org/release/Class-Std-Fast
diff --git a/package/perl-class-std-fast/perl-class-std-fast.hash b/package/perl-class-std-fast/perl-class-std-fast.hash
new file mode 100644
index 0000000000..07e830a5ee
--- /dev/null
+++ b/package/perl-class-std-fast/perl-class-std-fast.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 d06d084cb84f295b0aabf2eee78ef746 Class-Std-Fast-v0.0.8.tar.gz
+sha256 1bd43763c6a373183097a30e787f5d6713b0db27511c52d533266b59d2cfa780 Class-Std-Fast-v0.0.8.tar.gz
+
+# computed by scancpan
+sha256 aa1ab90c498aee078076e9a1f83e5f14bbfd841509582795ab5a9571428c0c38 README
diff --git a/package/perl-class-std-fast/perl-class-std-fast.mk b/package/perl-class-std-fast/perl-class-std-fast.mk
new file mode 100644
index 0000000000..7c008622dd
--- /dev/null
+++ b/package/perl-class-std-fast/perl-class-std-fast.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# perl-class-std-fast
+#
+################################################################################
+
+PERL_CLASS_STD_FAST_VERSION = v0.0.8
+PERL_CLASS_STD_FAST_SOURCE = Class-Std-Fast-$(PERL_CLASS_STD_FAST_VERSION).tar.gz
+PERL_CLASS_STD_FAST_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AC/ACID
+PERL_CLASS_STD_FAST_DEPENDENCIES = perl-class-std
+PERL_CLASS_STD_FAST_LICENSE = Artistic or GPL-1.0+
+PERL_CLASS_STD_FAST_LICENSE_FILES = README
+
+$(eval $(perl-package))
diff --git a/package/perl-class-std/Config.in b/package/perl-class-std/Config.in
new file mode 100644
index 0000000000..10734a7902
--- /dev/null
+++ b/package/perl-class-std/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PERL_CLASS_STD
+ bool "perl-class-std"
+ help
+ Support for creating standard "inside-out" classes
+
+ https://metacpan.org/release/Class-Std
diff --git a/package/perl-class-std/perl-class-std.hash b/package/perl-class-std/perl-class-std.hash
new file mode 100644
index 0000000000..0cc3861416
--- /dev/null
+++ b/package/perl-class-std/perl-class-std.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 82bcc56d9769edce671b0bd0e183ec3a Class-Std-0.013.tar.gz
+sha256 bcd6d82f6c8af0fe069fced7dd165a4795b0b6e92351c7d4e5a1ab9a14fc35c6 Class-Std-0.013.tar.gz
+
+# computed by scancpan
+sha256 b8175bf3750dc54096bf1506c681b4f13262e5b82e40244e9a77730c6b72e4d6 README
diff --git a/package/perl-class-std/perl-class-std.mk b/package/perl-class-std/perl-class-std.mk
new file mode 100644
index 0000000000..2e3ba95a8b
--- /dev/null
+++ b/package/perl-class-std/perl-class-std.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# perl-class-std
+#
+################################################################################
+
+PERL_CLASS_STD_VERSION = 0.013
+PERL_CLASS_STD_SOURCE = Class-Std-$(PERL_CLASS_STD_VERSION).tar.gz
+PERL_CLASS_STD_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CH/CHORNY
+PERL_CLASS_STD_DEPENDENCIES = host-perl-module-build
+PERL_CLASS_STD_LICENSE = Artistic or GPL-1.0+
+PERL_CLASS_STD_LICENSE_FILES = README
+
+$(eval $(perl-package))
diff --git a/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.hash b/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.hash
new file mode 100644
index 0000000000..327b06900a
--- /dev/null
+++ b/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 e768fe2c07826b0ac9ea604c79f93032 Crypt-OpenSSL-Guess-0.11.tar.gz
+sha256 aa6b18e38cb852cbad80a58cd90c395b40819d4d01e0ab37e7703149094d7167 Crypt-OpenSSL-Guess-0.11.tar.gz
+
+# computed by scancpan
+sha256 5c739f181ce7aa31d739277996ff230067dad39332e5597c0dffd36e5d784072 LICENSE
diff --git a/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.mk b/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.mk
new file mode 100644
index 0000000000..69d7a0ef8f
--- /dev/null
+++ b/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# perl-crypt-openssl-guess
+#
+################################################################################
+
+PERL_CRYPT_OPENSSL_GUESS_VERSION = 0.11
+PERL_CRYPT_OPENSSL_GUESS_SOURCE = Crypt-OpenSSL-Guess-$(PERL_CRYPT_OPENSSL_GUESS_VERSION).tar.gz
+PERL_CRYPT_OPENSSL_GUESS_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AK/AKIYM
+PERL_CRYPT_OPENSSL_GUESS_LICENSE = Artistic or GPL-1.0+
+PERL_CRYPT_OPENSSL_GUESS_LICENSE_FILES = LICENSE
+
+$(eval $(host-perl-package))
diff --git a/package/perl-crypt-openssl-random/perl-crypt-openssl-random.hash b/package/perl-crypt-openssl-random/perl-crypt-openssl-random.hash
index caacdc9015..57677e3445 100644
--- a/package/perl-crypt-openssl-random/perl-crypt-openssl-random.hash
+++ b/package/perl-crypt-openssl-random/perl-crypt-openssl-random.hash
@@ -1,3 +1,6 @@
# retrieved by scancpan from http://cpan.metacpan.org/
-md5 5d71337503e0356ce1ce1481504e5885 Crypt-OpenSSL-Random-0.11.tar.gz
-sha256 bb8c81c6a39b9b13a22d818ee9a746242f136f0fadceb6b9776ae615e7524c7a Crypt-OpenSSL-Random-0.11.tar.gz
+md5 bcde8d5a822c91376deda3c4f0c75fbe Crypt-OpenSSL-Random-0.15.tar.gz
+sha256 f0876faa1ba3111e39b86aa730c603211eff2905e460c72a57b61e8cf475cef4 Crypt-OpenSSL-Random-0.15.tar.gz
+
+# computed by scancpan
+sha256 fdaba2134145d3e252c5930180b2bcb13b5367ad5a8713d6868f014cd25c496f LICENSE
diff --git a/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk b/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk
index de029e9af0..1e1d7c1112 100644
--- a/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk
+++ b/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk
@@ -4,11 +4,17 @@
#
################################################################################
-PERL_CRYPT_OPENSSL_RANDOM_VERSION = 0.11
+PERL_CRYPT_OPENSSL_RANDOM_VERSION = 0.15
PERL_CRYPT_OPENSSL_RANDOM_SOURCE = Crypt-OpenSSL-Random-$(PERL_CRYPT_OPENSSL_RANDOM_VERSION).tar.gz
PERL_CRYPT_OPENSSL_RANDOM_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN
-PERL_CRYPT_OPENSSL_RANDOM_DEPENDENCIES = openssl
+PERL_CRYPT_OPENSSL_RANDOM_DEPENDENCIES = \
+ host-perl-crypt-openssl-guess \
+ openssl
PERL_CRYPT_OPENSSL_RANDOM_LICENSE = Artistic or GPL-1.0+
PERL_CRYPT_OPENSSL_RANDOM_LICENSE_FILES = LICENSE
+# Try as hard as possible to remedy to the brain-damage their build-system
+# suffers from: don't search for openssl, they pick the host-system one.
+PERL_CRYPT_OPENSSL_RANDOM_CONF_ENV = OPENSSL_PREFIX=$(STAGING_DIR)/usr
+
$(eval $(perl-package))
diff --git a/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.hash b/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.hash
index 6e060ce672..0d101d7bb8 100644
--- a/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.hash
+++ b/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.hash
@@ -1,3 +1,6 @@
# retrieved by scancpan from http://cpan.metacpan.org/
-md5 86217a5036fc63779c30420b5fd84129 Crypt-OpenSSL-RSA-0.28.tar.gz
-sha256 5357f977464bb3a8184cf2d3341851a10d5515b4b2b0dfb88bf78995c0ded7be Crypt-OpenSSL-RSA-0.28.tar.gz
+md5 10bca2fc6d0ba1aa329f227424ae87d5 Crypt-OpenSSL-RSA-0.30.tar.gz
+sha256 23e13531397af102db4fd24bcf70137add7c85c23cca697c43aa71c2959a29ac Crypt-OpenSSL-RSA-0.30.tar.gz
+
+# computed by scancpan
+sha256 8a693ad3f52daeeb5ac5deceb1e1109c9c87095ed5ba6506d6d5c106e4066f5a LICENSE
diff --git a/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk b/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk
index b853d9953e..790af760c7 100644
--- a/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk
+++ b/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk
@@ -4,11 +4,17 @@
#
################################################################################
-PERL_CRYPT_OPENSSL_RSA_VERSION = 0.28
+PERL_CRYPT_OPENSSL_RSA_VERSION = 0.30
PERL_CRYPT_OPENSSL_RSA_SOURCE = Crypt-OpenSSL-RSA-$(PERL_CRYPT_OPENSSL_RSA_VERSION).tar.gz
-PERL_CRYPT_OPENSSL_RSA_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PE/PERLER
-PERL_CRYPT_OPENSSL_RSA_DEPENDENCIES = perl-crypt-openssl-random
+PERL_CRYPT_OPENSSL_RSA_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR
+PERL_CRYPT_OPENSSL_RSA_DEPENDENCIES = \
+ host-perl-crypt-openssl-guess \
+ perl-crypt-openssl-random
PERL_CRYPT_OPENSSL_RSA_LICENSE = Artistic or GPL-1.0+
PERL_CRYPT_OPENSSL_RSA_LICENSE_FILES = LICENSE
+# Try as hard as possible to remedy to the brain-damage their build-system
+# suffers from: don't search for openssl, they pick the host-system one.
+PERL_CRYPT_OPENSSL_RSA_CONF_ENV = OPENSSL_PREFIX=$(STAGING_DIR)/usr
+
$(eval $(perl-package))
diff --git a/package/perl-data-optlist/Config.in b/package/perl-data-optlist/Config.in
new file mode 100644
index 0000000000..0393e65645
--- /dev/null
+++ b/package/perl-data-optlist/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_PERL_DATA_OPTLIST
+ bool "perl-data-optlist"
+ depends on !BR2_STATIC_LIBS
+ select BR2_PACKAGE_PERL_PARAMS_UTIL
+ select BR2_PACKAGE_PERL_SUB_INSTALL
+ help
+ parse and validate simple name/value option pairs
+
+ https://github.com/rjbs/Data-OptList
+
+comment "perl-data-optlist needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/package/perl-data-optlist/perl-data-optlist.hash b/package/perl-data-optlist/perl-data-optlist.hash
new file mode 100644
index 0000000000..93df006486
--- /dev/null
+++ b/package/perl-data-optlist/perl-data-optlist.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 f9236c9ea5607134ad8a2b3dc901c4c5 Data-OptList-0.110.tar.gz
+sha256 366117cb2966473f2559f2f4575ff6ae69e84c69a0f30a0773e1b51a457ef5c3 Data-OptList-0.110.tar.gz
+
+# computed by scancpan
+sha256 73c7bd4c8e4adc474f9dae32b9aa08f6ce27327940751dd6e8373404beabdffa LICENSE
diff --git a/package/perl-data-optlist/perl-data-optlist.mk b/package/perl-data-optlist/perl-data-optlist.mk
new file mode 100644
index 0000000000..ef643cf845
--- /dev/null
+++ b/package/perl-data-optlist/perl-data-optlist.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# perl-data-optlist
+#
+################################################################################
+
+PERL_DATA_OPTLIST_VERSION = 0.110
+PERL_DATA_OPTLIST_SOURCE = Data-OptList-$(PERL_DATA_OPTLIST_VERSION).tar.gz
+PERL_DATA_OPTLIST_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RJ/RJBS
+PERL_DATA_OPTLIST_DEPENDENCIES = perl-params-util perl-sub-install
+PERL_DATA_OPTLIST_LICENSE = Artistic or GPL-1.0+
+PERL_DATA_OPTLIST_LICENSE_FILES = LICENSE
+
+$(eval $(perl-package))
diff --git a/package/perl-data-uuid/Config.in b/package/perl-data-uuid/Config.in
new file mode 100644
index 0000000000..e0752c44ab
--- /dev/null
+++ b/package/perl-data-uuid/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PERL_DATA_UUID
+ bool "perl-data-uuid"
+ depends on !BR2_STATIC_LIBS
+ help
+ Globally/Universally Unique Identifiers (GUIDs/UUIDs)
+
+ https://metacpan.org/release/Data-UUID
+
+comment "perl-data-uuid needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/package/perl-data-uuid/perl-data-uuid.hash b/package/perl-data-uuid/perl-data-uuid.hash
new file mode 100644
index 0000000000..5086936d4e
--- /dev/null
+++ b/package/perl-data-uuid/perl-data-uuid.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 7619929e8fe205a7fb83bc1c29ecbf99 Data-UUID-1.221.tar.gz
+sha256 3cc7b2a3a7b74b45a059e013f7fd878078500ea4b7269036f84556b022078667 Data-UUID-1.221.tar.gz
+
+# computed by scancpan
+sha256 0560c8eea8e1fb8173faa6c2e9b7e9f8728b8ae8250a814709a53c30b778d5fb LICENSE
diff --git a/package/perl-data-uuid/perl-data-uuid.mk b/package/perl-data-uuid/perl-data-uuid.mk
new file mode 100644
index 0000000000..8e612913d9
--- /dev/null
+++ b/package/perl-data-uuid/perl-data-uuid.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# perl-data-uuid
+#
+################################################################################
+
+PERL_DATA_UUID_VERSION = 1.221
+PERL_DATA_UUID_SOURCE = Data-UUID-$(PERL_DATA_UUID_VERSION).tar.gz
+PERL_DATA_UUID_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RJ/RJBS
+# The license is documented at
+# https://fedoraproject.org/wiki/Licensing:MIT#HP_Variant as the "HP
+# Variant" of the MIT license. There is no official SPDX tag for this
+# license, but the other MIT variants are prefixed with "MIT-", so we
+# do the same here.
+PERL_DATA_UUID_LICENSE = MIT-HP
+PERL_DATA_UUID_LICENSE_FILES = LICENSE
+
+$(eval $(perl-package))
diff --git a/package/perl-date-manip/Config.in b/package/perl-date-manip/Config.in
new file mode 100644
index 0000000000..cbfb5c5b30
--- /dev/null
+++ b/package/perl-date-manip/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PERL_DATE_MANIP
+ bool "perl-date-manip"
+ help
+ Date manipulation routines
+
+ https://metacpan.org/release/Date-Manip
diff --git a/package/perl-date-manip/perl-date-manip.hash b/package/perl-date-manip/perl-date-manip.hash
new file mode 100644
index 0000000000..f02f657822
--- /dev/null
+++ b/package/perl-date-manip/perl-date-manip.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 b41b0d476fd7eae3ce81324386266a85 Date-Manip-6.72.tar.gz
+sha256 38f4dd9d94b41092ca7b9da2ef72c3bb8b8c8bff6da14d785c612f3cc7a94da6 Date-Manip-6.72.tar.gz
+
+# computed by scancpan
+sha256 8ba2a138654f8b59b7e1e3ad0d4c81918b9148ff95078b172ccbb45fa241431d LICENSE
diff --git a/package/perl-date-manip/perl-date-manip.mk b/package/perl-date-manip/perl-date-manip.mk
new file mode 100644
index 0000000000..a5e1609a88
--- /dev/null
+++ b/package/perl-date-manip/perl-date-manip.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# perl-date-manip
+#
+################################################################################
+
+PERL_DATE_MANIP_VERSION = 6.72
+PERL_DATE_MANIP_SOURCE = Date-Manip-$(PERL_DATE_MANIP_VERSION).tar.gz
+PERL_DATE_MANIP_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SB/SBECK
+PERL_DATE_MANIP_LICENSE = Artistic or GPL-1.0+
+PERL_DATE_MANIP_LICENSE_FILES = LICENSE
+
+$(eval $(perl-package))
diff --git a/package/perl-dbi/Config.in b/package/perl-dbi/Config.in
new file mode 100644
index 0000000000..069669b9bc
--- /dev/null
+++ b/package/perl-dbi/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PERL_DBI
+ bool "perl-dbi"
+ depends on !BR2_STATIC_LIBS
+ help
+ Database independent interface for Perl
+
+ http://dbi.perl.org/
+
+comment "perl-dbi needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/package/perl-dbi/perl-dbi.hash b/package/perl-dbi/perl-dbi.hash
new file mode 100644
index 0000000000..1d0b7e9ad5
--- /dev/null
+++ b/package/perl-dbi/perl-dbi.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 e77fd37fcf77fc88fde029c1b75ded54 DBI-1.641.tar.gz
+sha256 5509e532cdd0e3d91eda550578deaac29e2f008a12b64576e8c261bb92e8c2c1 DBI-1.641.tar.gz
+
+# computed by scancpan
+sha256 33453c8b0d8d474a42669ac702a13c20f39c91a34b3df4e6ca778fc2f0f711c7 LICENSE
diff --git a/package/perl-dbi/perl-dbi.mk b/package/perl-dbi/perl-dbi.mk
new file mode 100644
index 0000000000..f7ae6ca5a1
--- /dev/null
+++ b/package/perl-dbi/perl-dbi.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# perl-dbi
+#
+################################################################################
+
+PERL_DBI_VERSION = 1.641
+PERL_DBI_SOURCE = DBI-$(PERL_DBI_VERSION).tar.gz
+PERL_DBI_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TI/TIMB
+PERL_DBI_LICENSE = Artistic or GPL-1.0+
+PERL_DBI_LICENSE_FILES = LICENSE
+
+$(eval $(perl-package))
diff --git a/package/perl-device-serialport/Config.in b/package/perl-device-serialport/Config.in
new file mode 100644
index 0000000000..f14e9794d0
--- /dev/null
+++ b/package/perl-device-serialport/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PERL_DEVICE_SERIALPORT
+ bool "perl-device-serialport"
+ depends on !BR2_STATIC_LIBS
+ help
+ Linux/POSIX emulation of Win32::SerialPort functions.
+
+ https://metacpan.org/release/Device-SerialPort
+
+comment "perl-device-serialport needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/package/perl-device-serialport/perl-device-serialport.hash b/package/perl-device-serialport/perl-device-serialport.hash
new file mode 100644
index 0000000000..35ddc13d3f
--- /dev/null
+++ b/package/perl-device-serialport/perl-device-serialport.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 82c698151f934eb28c65d1838cee7d9e Device-SerialPort-1.04.tar.gz
+sha256 d392567cb39b4ea606c0e0acafd8ed72320311b995336ece5fcefcf9b150e9d7 Device-SerialPort-1.04.tar.gz
+
+# computed by scancpan
+sha256 59432e84eca65c10c4b627f8af0b00833685856b68242b816aea2a38283a124c README
diff --git a/package/perl-device-serialport/perl-device-serialport.mk b/package/perl-device-serialport/perl-device-serialport.mk
new file mode 100644
index 0000000000..d9c61e9486
--- /dev/null
+++ b/package/perl-device-serialport/perl-device-serialport.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# perl-device-serialport
+#
+################################################################################
+
+PERL_DEVICE_SERIALPORT_VERSION = 1.04
+PERL_DEVICE_SERIALPORT_SOURCE = Device-SerialPort-$(PERL_DEVICE_SERIALPORT_VERSION).tar.gz
+PERL_DEVICE_SERIALPORT_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CO/COOK
+PERL_DEVICE_SERIALPORT_LICENSE = Artistic or GPL-1.0+
+PERL_DEVICE_SERIALPORT_LICENSE_FILES = README
+
+$(eval $(perl-package))
diff --git a/package/perl-file-slurp/Config.in b/package/perl-file-slurp/Config.in
new file mode 100644
index 0000000000..69a8871717
--- /dev/null
+++ b/package/perl-file-slurp/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PERL_FILE_SLURP
+ bool "perl-file-slurp"
+ help
+ Simple and Efficient Reading/Writing/Modifying of Complete
+ Files
+
+ https://metacpan.org/release/File-Slurp
diff --git a/package/perl-file-slurp/perl-file-slurp.hash b/package/perl-file-slurp/perl-file-slurp.hash
new file mode 100644
index 0000000000..18f9e65ced
--- /dev/null
+++ b/package/perl-file-slurp/perl-file-slurp.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 7d584cd15c4f8b9547765eff8c4ef078 File-Slurp-9999.19.tar.gz
+sha256 ce29ebe995097ebd6e9bc03284714cdfa0c46dc94f6b14a56980747ea3253643 File-Slurp-9999.19.tar.gz
+
+# computed by scancpan
+sha256 17e638d011c04b1d39b300c07ccd0c57d7857b9ccdb9fe7abce1b15f0e7b0c20 README
diff --git a/package/perl-file-slurp/perl-file-slurp.mk b/package/perl-file-slurp/perl-file-slurp.mk
new file mode 100644
index 0000000000..32773ddbbc
--- /dev/null
+++ b/package/perl-file-slurp/perl-file-slurp.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# perl-file-slurp
+#
+################################################################################
+
+PERL_FILE_SLURP_VERSION = 9999.19
+PERL_FILE_SLURP_SOURCE = File-Slurp-$(PERL_FILE_SLURP_VERSION).tar.gz
+PERL_FILE_SLURP_SITE = $(BR2_CPAN_MIRROR)/authors/id/U/UR/URI
+PERL_FILE_SLURP_LICENSE = Artistic or GPL-1.0+
+PERL_FILE_SLURP_LICENSE_FILES = README
+
+$(eval $(perl-package))
diff --git a/package/perl-io-interface/Config.in b/package/perl-io-interface/Config.in
new file mode 100644
index 0000000000..7aa7064ec0
--- /dev/null
+++ b/package/perl-io-interface/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PERL_IO_INTERFACE
+ bool "perl-io-interface"
+ depends on !BR2_STATIC_LIBS
+ help
+ Access and modify network interface card configuration
+
+ https://metacpan.org/release/IO-Interface
+
+comment "perl-io-interface needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/package/perl-io-interface/perl-io-interface.hash b/package/perl-io-interface/perl-io-interface.hash
new file mode 100644
index 0000000000..75e572f918
--- /dev/null
+++ b/package/perl-io-interface/perl-io-interface.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 806f97aff5a7361b6f54cd494f4cc9fd IO-Interface-1.09.tar.gz
+sha256 e63e81c52eb1e0e60ec2d983f5552d2493e117179925c96757f23c4bd9fa713a IO-Interface-1.09.tar.gz
+
+# computed by scancpan
+sha256 b5a5bf59bd1be13f7f498e5aa2ea5c0c603c04a095dcf03a06aa5b83bbccf921 LICENSE
diff --git a/package/perl-io-interface/perl-io-interface.mk b/package/perl-io-interface/perl-io-interface.mk
new file mode 100644
index 0000000000..c0b399ace8
--- /dev/null
+++ b/package/perl-io-interface/perl-io-interface.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# perl-io-interface
+#
+################################################################################
+
+PERL_IO_INTERFACE_VERSION = 1.09
+PERL_IO_INTERFACE_SOURCE = IO-Interface-$(PERL_IO_INTERFACE_VERSION).tar.gz
+PERL_IO_INTERFACE_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LD/LDS
+PERL_IO_INTERFACE_DEPENDENCIES = host-perl-module-build
+PERL_IO_INTERFACE_LICENSE = Artistic-2.0
+PERL_IO_INTERFACE_LICENSE_FILES = LICENSE
+
+$(eval $(perl-package))
diff --git a/package/perl-io-socket-multicast/Config.in b/package/perl-io-socket-multicast/Config.in
new file mode 100644
index 0000000000..f63a4e1bf9
--- /dev/null
+++ b/package/perl-io-socket-multicast/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PERL_IO_SOCKET_MULTICAST
+ bool "perl-io-socket-multicast"
+ depends on !BR2_STATIC_LIBS
+ select BR2_PACKAGE_PERL_IO_INTERFACE
+ help
+ Send and receive multicast messages
+
+ https://metacpan.org/release/IO-Socket-Multicast
+
+comment "perl-io-socket-multicast needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/package/perl-io-socket-multicast/perl-io-socket-multicast.hash b/package/perl-io-socket-multicast/perl-io-socket-multicast.hash
new file mode 100644
index 0000000000..c12da12c41
--- /dev/null
+++ b/package/perl-io-socket-multicast/perl-io-socket-multicast.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 c96e6cbb367b1d11ffe7bb9fbd833540 IO-Socket-Multicast-1.12.tar.gz
+sha256 70e8af4aa21d19bab5edd9f43a6b3d6277748a65145d46ff0ea2ae4c59495c72 IO-Socket-Multicast-1.12.tar.gz
+
+# computed by scancpan
+sha256 ea33bda0e2ec6734e29895a37cd1fc005d86f2abbe7e9943e0213ae64844a697 README
diff --git a/package/perl-io-socket-multicast/perl-io-socket-multicast.mk b/package/perl-io-socket-multicast/perl-io-socket-multicast.mk
new file mode 100644
index 0000000000..41e4fe404c
--- /dev/null
+++ b/package/perl-io-socket-multicast/perl-io-socket-multicast.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# perl-io-socket-multicast
+#
+################################################################################
+
+PERL_IO_SOCKET_MULTICAST_VERSION = 1.12
+PERL_IO_SOCKET_MULTICAST_SOURCE = IO-Socket-Multicast-$(PERL_IO_SOCKET_MULTICAST_VERSION).tar.gz
+PERL_IO_SOCKET_MULTICAST_SITE = $(BR2_CPAN_MIRROR)/authors/id/B/BR/BRAMBLE
+PERL_IO_SOCKET_MULTICAST_DEPENDENCIES = perl-io-interface
+PERL_IO_SOCKET_MULTICAST_LICENSE = Artistic or GPL-1.0+
+PERL_IO_SOCKET_MULTICAST_LICENSE_FILES = README
+
+$(eval $(perl-package))
diff --git a/package/perl-json-maybexs/Config.in b/package/perl-json-maybexs/Config.in
new file mode 100644
index 0000000000..1db82c3684
--- /dev/null
+++ b/package/perl-json-maybexs/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PERL_JSON_MAYBEXS
+ bool "perl-json-maybexs"
+ help
+ Use Cpanel::JSON::XS with a fallback to JSON::XS and JSON::PP
+
+ https://metacpan.org/release/JSON-MaybeXS
diff --git a/package/perl-json-maybexs/perl-json-maybexs.hash b/package/perl-json-maybexs/perl-json-maybexs.hash
new file mode 100644
index 0000000000..c8bf172aaa
--- /dev/null
+++ b/package/perl-json-maybexs/perl-json-maybexs.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 db61fb5515f8e2f19709a317e26dde42 JSON-MaybeXS-1.004000.tar.gz
+sha256 59bda02e8f4474c73913723c608b539e2452e16c54ed7f0150c01aad06e0a126 JSON-MaybeXS-1.004000.tar.gz
+
+# computed by scancpan
+sha256 d972e00126c5337e88d81d64fc349a3f4c54841075f4180a1145441d30c86f83 README
diff --git a/package/perl-json-maybexs/perl-json-maybexs.mk b/package/perl-json-maybexs/perl-json-maybexs.mk
new file mode 100644
index 0000000000..b4eaccddcb
--- /dev/null
+++ b/package/perl-json-maybexs/perl-json-maybexs.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# perl-json-maybexs
+#
+################################################################################
+
+PERL_JSON_MAYBEXS_VERSION = 1.004000
+PERL_JSON_MAYBEXS_SOURCE = JSON-MaybeXS-$(PERL_JSON_MAYBEXS_VERSION).tar.gz
+PERL_JSON_MAYBEXS_SITE = $(BR2_CPAN_MIRROR)/authors/id/H/HA/HAARG
+PERL_JSON_MAYBEXS_LICENSE = Artistic or GPL-1.0+
+PERL_JSON_MAYBEXS_LICENSE_FILES = README
+
+$(eval $(perl-package))
diff --git a/package/perl-mime-tools/Config.in b/package/perl-mime-tools/Config.in
new file mode 100644
index 0000000000..740651d1d0
--- /dev/null
+++ b/package/perl-mime-tools/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PERL_MIME_TOOLS
+ bool "perl-mime-tools"
+ select BR2_PACKAGE_PERL_MAILTOOLS
+ help
+ Tools to manipulate MIME messages
+
+ https://metacpan.org/release/MIME-tools
diff --git a/package/perl-mime-tools/perl-mime-tools.hash b/package/perl-mime-tools/perl-mime-tools.hash
new file mode 100644
index 0000000000..41e13eb0b2
--- /dev/null
+++ b/package/perl-mime-tools/perl-mime-tools.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 a2f0e07da2ff4b0478908544cc4b40fa MIME-tools-5.509.tar.gz
+sha256 64579f0c923d81d9a2194586e47c3475519e2646e4b5c102a8920759facf6973 MIME-tools-5.509.tar.gz
+
+# computed by scancpan
+sha256 151cd94e37eb05239c5a678c7d1c4d9d5241a7c9c138760b85152bc1947e2b93 COPYING
diff --git a/package/perl-mime-tools/perl-mime-tools.mk b/package/perl-mime-tools/perl-mime-tools.mk
new file mode 100644
index 0000000000..03bea508ef
--- /dev/null
+++ b/package/perl-mime-tools/perl-mime-tools.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# perl-mime-tools
+#
+################################################################################
+
+PERL_MIME_TOOLS_VERSION = 5.509
+PERL_MIME_TOOLS_SOURCE = MIME-tools-$(PERL_MIME_TOOLS_VERSION).tar.gz
+PERL_MIME_TOOLS_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DS/DSKOLL
+PERL_MIME_TOOLS_DEPENDENCIES = perl-mailtools
+PERL_MIME_TOOLS_LICENSE = Artistic or GPL-1.0+
+PERL_MIME_TOOLS_LICENSE_FILES = COPYING
+
+$(eval $(perl-package))
diff --git a/package/perl-module-implementation/Config.in b/package/perl-module-implementation/Config.in
new file mode 100644
index 0000000000..354197649d
--- /dev/null
+++ b/package/perl-module-implementation/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PERL_MODULE_IMPLEMENTATION
+ bool "perl-module-implementation"
+ select BR2_PACKAGE_PERL_MODULE_RUNTIME
+ select BR2_PACKAGE_PERL_TRY_TINY
+ help
+ Loads one of several alternate underlying implementations
+ for a module
+
+ http://metacpan.org/release/Module-Implementation
diff --git a/package/perl-module-implementation/perl-module-implementation.hash b/package/perl-module-implementation/perl-module-implementation.hash
new file mode 100644
index 0000000000..caf365c024
--- /dev/null
+++ b/package/perl-module-implementation/perl-module-implementation.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 52e3fe0ca6b1eff0488d59b7aacc0667 Module-Implementation-0.09.tar.gz
+sha256 c15f1a12f0c2130c9efff3c2e1afe5887b08ccd033bd132186d1e7d5087fd66d Module-Implementation-0.09.tar.gz
+
+# computed by scancpan
+sha256 dd34e4dbcadfaa3db992201873e1cbb4b4f4c18e9bf000821d5c768e66d7ff0b LICENSE
diff --git a/package/perl-module-implementation/perl-module-implementation.mk b/package/perl-module-implementation/perl-module-implementation.mk
new file mode 100644
index 0000000000..50ee8610a5
--- /dev/null
+++ b/package/perl-module-implementation/perl-module-implementation.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# perl-module-implementation
+#
+################################################################################
+
+PERL_MODULE_IMPLEMENTATION_VERSION = 0.09
+PERL_MODULE_IMPLEMENTATION_SOURCE = Module-Implementation-$(PERL_MODULE_IMPLEMENTATION_VERSION).tar.gz
+PERL_MODULE_IMPLEMENTATION_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DR/DROLSKY
+PERL_MODULE_IMPLEMENTATION_DEPENDENCIES = perl-module-runtime perl-try-tiny
+PERL_MODULE_IMPLEMENTATION_LICENSE = Artistic-2.0
+PERL_MODULE_IMPLEMENTATION_LICENSE_FILES = LICENSE
+
+$(eval $(perl-package))
diff --git a/package/perl-module-runtime/Config.in b/package/perl-module-runtime/Config.in
new file mode 100644
index 0000000000..fca29f66df
--- /dev/null
+++ b/package/perl-module-runtime/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PERL_MODULE_RUNTIME
+ bool "perl-module-runtime"
+ help
+ runtime module handling
+
+ https://metacpan.org/release/Module-Runtime
diff --git a/package/perl-module-runtime/perl-module-runtime.hash b/package/perl-module-runtime/perl-module-runtime.hash
new file mode 100644
index 0000000000..c52cb75504
--- /dev/null
+++ b/package/perl-module-runtime/perl-module-runtime.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 d3d47222fa2e3dfcb4526f6cc8437b20 Module-Runtime-0.016.tar.gz
+sha256 68302ec646833547d410be28e09676db75006f4aa58a11f3bdb44ffe99f0f024 Module-Runtime-0.016.tar.gz
+
+# computed by scancpan
+sha256 ad1761020436687e8493208336ef53e84589fdba212da59b05b8111cca75ddc1 README
diff --git a/package/perl-module-runtime/perl-module-runtime.mk b/package/perl-module-runtime/perl-module-runtime.mk
new file mode 100644
index 0000000000..5ba95f7056
--- /dev/null
+++ b/package/perl-module-runtime/perl-module-runtime.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# perl-module-runtime
+#
+################################################################################
+
+PERL_MODULE_RUNTIME_VERSION = 0.016
+PERL_MODULE_RUNTIME_SOURCE = Module-Runtime-$(PERL_MODULE_RUNTIME_VERSION).tar.gz
+PERL_MODULE_RUNTIME_SITE = $(BR2_CPAN_MIRROR)/authors/id/Z/ZE/ZEFRAM
+PERL_MODULE_RUNTIME_DEPENDENCIES = host-perl-module-build
+PERL_MODULE_RUNTIME_LICENSE = Artistic or GPL-1.0+
+PERL_MODULE_RUNTIME_LICENSE_FILES = README
+
+$(eval $(perl-package))
diff --git a/package/perl-number-bytes-human/Config.in b/package/perl-number-bytes-human/Config.in
new file mode 100644
index 0000000000..ca43873d49
--- /dev/null
+++ b/package/perl-number-bytes-human/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PERL_NUMBER_BYTES_HUMAN
+ bool "perl-number-bytes-human"
+ help
+ Convert byte count to human readable format
+
+ https://metacpan.org/release/Number-Bytes-Human
diff --git a/package/perl-number-bytes-human/perl-number-bytes-human.hash b/package/perl-number-bytes-human/perl-number-bytes-human.hash
new file mode 100644
index 0000000000..af7a6b65a1
--- /dev/null
+++ b/package/perl-number-bytes-human/perl-number-bytes-human.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 43d2c86a55924aa71535a41de0311efd Number-Bytes-Human-0.11.tar.gz
+sha256 5fc79c49b0b40df780479c43696381343e2b6ad1fe52859f60bc65b66ebe6f2c Number-Bytes-Human-0.11.tar.gz
+
+# computed by scancpan
+sha256 d42143fe4b63cb5d488d65a44e6c55769b098ea447462ff33316b33a837b7cf9 README
diff --git a/package/perl-number-bytes-human/perl-number-bytes-human.mk b/package/perl-number-bytes-human/perl-number-bytes-human.mk
new file mode 100644
index 0000000000..e10c550eed
--- /dev/null
+++ b/package/perl-number-bytes-human/perl-number-bytes-human.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# perl-number-bytes-human
+#
+################################################################################
+
+PERL_NUMBER_BYTES_HUMAN_VERSION = 0.11
+PERL_NUMBER_BYTES_HUMAN_SOURCE = Number-Bytes-Human-$(PERL_NUMBER_BYTES_HUMAN_VERSION).tar.gz
+PERL_NUMBER_BYTES_HUMAN_SITE = $(BR2_CPAN_MIRROR)/authors/id/F/FE/FERREIRA
+PERL_NUMBER_BYTES_HUMAN_LICENSE = Artistic or GPL-1.0+
+PERL_NUMBER_BYTES_HUMAN_LICENSE_FILES = README
+
+$(eval $(perl-package))
diff --git a/package/perl-params-util/Config.in b/package/perl-params-util/Config.in
new file mode 100644
index 0000000000..b155899b06
--- /dev/null
+++ b/package/perl-params-util/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PERL_PARAMS_UTIL
+ bool "perl-params-util"
+ depends on !BR2_STATIC_LIBS
+ help
+ Simple, compact and correct param-checking functions
+
+ https://metacpan.org/release/Params-Util
+
+comment "perl-params-util needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/package/perl-params-util/perl-params-util.hash b/package/perl-params-util/perl-params-util.hash
new file mode 100644
index 0000000000..0c247ebfe5
--- /dev/null
+++ b/package/perl-params-util/perl-params-util.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 02db120c0eef87aae1830cc62bdec37b Params-Util-1.07.tar.gz
+sha256 30f1ec3f2cf9ff66ae96f973333f23c5f558915bb6266881eac7423f52d7c76c Params-Util-1.07.tar.gz
+
+# computed by scancpan
+sha256 71b5fb95de1ba013a517c926feaa2a7d0fb0e8f132818e8529e0da5ec01187cd LICENSE
diff --git a/package/perl-params-util/perl-params-util.mk b/package/perl-params-util/perl-params-util.mk
new file mode 100644
index 0000000000..71868ddff4
--- /dev/null
+++ b/package/perl-params-util/perl-params-util.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# perl-params-util
+#
+################################################################################
+
+PERL_PARAMS_UTIL_VERSION = 1.07
+PERL_PARAMS_UTIL_SOURCE = Params-Util-$(PERL_PARAMS_UTIL_VERSION).tar.gz
+PERL_PARAMS_UTIL_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AD/ADAMK
+PERL_PARAMS_UTIL_LICENSE = Artistic or GPL-1.0+
+PERL_PARAMS_UTIL_LICENSE_FILES = LICENSE
+
+$(eval $(perl-package))
diff --git a/package/perl-sub-install/Config.in b/package/perl-sub-install/Config.in
new file mode 100644
index 0000000000..41d57b237f
--- /dev/null
+++ b/package/perl-sub-install/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PERL_SUB_INSTALL
+ bool "perl-sub-install"
+ help
+ install subroutines into packages easily
+
+ https://github.com/rjbs/Sub-Install
diff --git a/package/perl-sub-install/perl-sub-install.hash b/package/perl-sub-install/perl-sub-install.hash
new file mode 100644
index 0000000000..3abd9940e6
--- /dev/null
+++ b/package/perl-sub-install/perl-sub-install.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 e1ce4f9cb6b2f6b8778b036c31afa5ab Sub-Install-0.928.tar.gz
+sha256 61e567a7679588887b7b86d427bc476ea6d77fffe7e0d17d640f89007d98ef0f Sub-Install-0.928.tar.gz
+
+# computed by scancpan
+sha256 ad5fb5c05003488f924c60ead21694d629055c9db2ee2d9dd0cf0041b9fedaca LICENSE
diff --git a/package/perl-sub-install/perl-sub-install.mk b/package/perl-sub-install/perl-sub-install.mk
new file mode 100644
index 0000000000..fc7c55afb8
--- /dev/null
+++ b/package/perl-sub-install/perl-sub-install.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# perl-sub-install
+#
+################################################################################
+
+PERL_SUB_INSTALL_VERSION = 0.928
+PERL_SUB_INSTALL_SOURCE = Sub-Install-$(PERL_SUB_INSTALL_VERSION).tar.gz
+PERL_SUB_INSTALL_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RJ/RJBS
+PERL_SUB_INSTALL_LICENSE = Artistic or GPL-1.0+
+PERL_SUB_INSTALL_LICENSE_FILES = LICENSE
+
+$(eval $(perl-package))
diff --git a/package/perl-sys-meminfo/Config.in b/package/perl-sys-meminfo/Config.in
new file mode 100644
index 0000000000..3e3155d6cb
--- /dev/null
+++ b/package/perl-sys-meminfo/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PERL_SYS_MEMINFO
+ bool "perl-sys-meminfo"
+ depends on !BR2_STATIC_LIBS
+ help
+ query the total free and used physical memory
+
+ https://metacpan.org/release/Sys-MemInfo
+
+comment "perl-sys-meminfo needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/package/perl-sys-meminfo/perl-sys-meminfo.hash b/package/perl-sys-meminfo/perl-sys-meminfo.hash
new file mode 100644
index 0000000000..207cfad2bf
--- /dev/null
+++ b/package/perl-sys-meminfo/perl-sys-meminfo.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 88f0632691d7de91cbed95ba1ff29025 Sys-MemInfo-0.99.tar.gz
+sha256 0786319d3a3a8bae5d727939244bf17e140b714f52734d5e9f627203e4cf3e3b Sys-MemInfo-0.99.tar.gz
+
+# computed by scancpan
+sha256 62854ade112a6782f476bdc7dc9603776c4e064782623d999f966dba131a15de LICENSE
diff --git a/package/perl-sys-meminfo/perl-sys-meminfo.mk b/package/perl-sys-meminfo/perl-sys-meminfo.mk
new file mode 100644
index 0000000000..43e0995aa0
--- /dev/null
+++ b/package/perl-sys-meminfo/perl-sys-meminfo.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# perl-sys-meminfo
+#
+################################################################################
+
+PERL_SYS_MEMINFO_VERSION = 0.99
+PERL_SYS_MEMINFO_SOURCE = Sys-MemInfo-$(PERL_SYS_MEMINFO_VERSION).tar.gz
+PERL_SYS_MEMINFO_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SC/SCRESTO
+PERL_SYS_MEMINFO_LICENSE = Artistic or GPL-1.0+
+PERL_SYS_MEMINFO_LICENSE_FILES = LICENSE
+
+$(eval $(perl-package))
diff --git a/package/perl-sys-mmap/Config.in b/package/perl-sys-mmap/Config.in
new file mode 100644
index 0000000000..56725f2faa
--- /dev/null
+++ b/package/perl-sys-mmap/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PERL_SYS_MMAP
+ bool "perl-sys-mmap"
+ depends on !BR2_STATIC_LIBS
+ help
+ uses mmap to map in a file as a Perl variable
+
+ https://metacpan.org/release/Sys-Mmap
+
+comment "perl-sys-mmap needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/package/perl-sys-mmap/perl-sys-mmap.hash b/package/perl-sys-mmap/perl-sys-mmap.hash
new file mode 100644
index 0000000000..caeea3d965
--- /dev/null
+++ b/package/perl-sys-mmap/perl-sys-mmap.hash
@@ -0,0 +1,7 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 990c9106a88dc843035f7bcb109e6c0e Sys-Mmap-0.19.tar.gz
+sha256 09295e25cc9b0599d9009d19b2be89fcecaecc62ce594f873d7f70d7c10900fa Sys-Mmap-0.19.tar.gz
+
+# computed by scancpan
+sha256 51c144e9a67644fa8eea0ea63dedb4e837587305b22f073eb5e279e39e7325a8 Copying
+sha256 4ac2afe465736476a06e52edcc78c72cfa0fa4d625916e58ab4f2af6c598709c Artistic
diff --git a/package/perl-sys-mmap/perl-sys-mmap.mk b/package/perl-sys-mmap/perl-sys-mmap.mk
new file mode 100644
index 0000000000..ed2ca79b02
--- /dev/null
+++ b/package/perl-sys-mmap/perl-sys-mmap.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# perl-sys-mmap
+#
+################################################################################
+
+PERL_SYS_MMAP_VERSION = 0.19
+PERL_SYS_MMAP_SOURCE = Sys-Mmap-$(PERL_SYS_MMAP_VERSION).tar.gz
+PERL_SYS_MMAP_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SW/SWALTERS
+PERL_SYS_MMAP_LICENSE = Artistic or GPL-1.0+
+PERL_SYS_MMAP_LICENSE_FILES = Copying Artistic
+
+$(eval $(perl-package))
diff --git a/package/pound/pound.hash b/package/pound/pound.hash
index 6908b9060c..7fbf01b89b 100644
--- a/package/pound/pound.hash
+++ b/package/pound/pound.hash
@@ -1,2 +1,3 @@
# Locally computed
-sha256 cdfbf5a7e8dc8fbbe0d6c1e83cd3bd3f2472160aac65684bb01ef661c626a8e4 Pound-2.7.tgz
+sha256 a7fd8690de0fd390615e79fd0f4bfd56a544b8ef97dd6659c07ecd3207480c25 Pound-2.8.tgz
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL.txt
diff --git a/package/pound/pound.mk b/package/pound/pound.mk
index 6f7cc848f8..9a62cf7a58 100644
--- a/package/pound/pound.mk
+++ b/package/pound/pound.mk
@@ -4,7 +4,7 @@
#
################################################################################
-POUND_VERSION = 2.7
+POUND_VERSION = 2.8
POUND_SITE = http://www.apsis.ch/pound
POUND_SOURCE = Pound-$(POUND_VERSION).tgz
POUND_LICENSE = GPL-3.0+
diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in
index e979d407cf..e7e3c13780 100644
--- a/package/proftpd/Config.in
+++ b/package/proftpd/Config.in
@@ -20,4 +20,10 @@ config BR2_PACKAGE_PROFTPD_MOD_REDIS
The mod_redis module enables ProFTPD support for caching
data in Redis servers, using the hiredis client library.
+config BR2_PACKAGE_PROFTPD_MOD_SFTP
+ bool "mod_sftp support"
+ select BR2_PACKAGE_OPENSSL
+ help
+ Compile ProFTPD with mod_sftp support
+
endif
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 3e165c6ada..b02320f4c0 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -24,7 +24,7 @@ PROFTPD_CONF_OPTS = \
--with-gnu-ld
ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y)
-PROFTPD_CONF_OPTS += --with-modules=mod_rewrite
+PROFTPD_MODULES += mod_rewrite
endif
ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REDIS),y)
@@ -34,6 +34,16 @@ else
PROFTPD_CONF_OPTS += --disable-redis
endif
+ifeq ($(BR2_PACKAGE_PROFTPD_MOD_SFTP),y)
+PROFTPD_CONF_OPTS += --enable-openssl
+PROFTPD_MODULES += mod_sftp
+PROFTPD_DEPENDENCIES += openssl
+else
+PROFTPD_CONF_OPTS += --disable-openssl
+endif
+
+PROFTPD_CONF_OPTS += --with-modules=$(subst $(space),:,$(PROFTPD_MODULES))
+
# configure script doesn't handle detection of %llu format string
# support for printing the file size when cross compiling, breaking
# access for large files.
diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash
index 8a70bb42b7..234f138562 100644
--- a/package/python-can/python-can.hash
+++ b/package/python-can/python-can.hash
@@ -1,3 +1,4 @@
-# md5 from https://pypi.python.org/pypi/python-can/json, sha256 locally computed
-md5 3310f0aa2a8492d0ff614ecf636ec8a8 python-can-2.1.0.tar.gz
-sha256 4a5c01dd67feeda35f88e6c12ea14ac8cabd426b9be0cc5f9fd083fe90a9dbfc python-can-2.1.0.tar.gz
+# sha256 for python-can from https://pypi.org/project/python-can/#files
+# sha256 for LICENSE.txt locally computed
+sha256 b5e93b2ee32bdd597d9d908afe5171c402a04c9678ba47b60f33506738b1375b python-can-2.2.1.tar.gz
+sha256 ea7d049c7705dc13afc202dd18e1827f3484f8212fd3fa7b82fc4a0c363432c9 LICENSE.txt
diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk
index 9a7e903303..01a335f5c8 100644
--- a/package/python-can/python-can.mk
+++ b/package/python-can/python-can.mk
@@ -4,8 +4,8 @@
#
################################################################################
-PYTHON_CAN_VERSION = 2.1.0
-PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/04/87/0d5b0f2f4e5d7f64a44f74b7f0bc1668457e6aa7e90b04ad15c3b9a44411
+PYTHON_CAN_VERSION = 2.2.1
+PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/e6/49/7a25ca6f38421009621b9958a725a0bd57dc0caa656ee508324f26ea5363
PYTHON_CAN_LICENSE = LGPL-3.0
PYTHON_CAN_LICENSE_FILES = LICENSE.txt
PYTHON_CAN_SETUP_TYPE = setuptools
diff --git a/package/python-falcon/Config.in b/package/python-falcon/Config.in
new file mode 100644
index 0000000000..ffd66eec1b
--- /dev/null
+++ b/package/python-falcon/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYTHON_FALCON
+ bool "python-falcon"
+ select BR2_PACKAGE_PYTHON_SIX # runtime
+ select BR2_PACKAGE_PYTHON_MIMEPARSE # runtime
+ help
+ An unladen web framework for building APIs and app
+ backends.
+
+ http://falconframework.org
diff --git a/package/python-falcon/python-falcon.hash b/package/python-falcon/python-falcon.hash
new file mode 100644
index 0000000000..7f6ee6ea3d
--- /dev/null
+++ b/package/python-falcon/python-falcon.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/falcon/json
+md5 3cb880665ee2cd52143cf8a7790a35e6 falcon-1.4.1.tar.gz
+sha256 3981f609c0358a9fcdb25b0e7fab3d9e23019356fb429c635ce4133135ae1bc4 falcon-1.4.1.tar.gz
+# Locally computed sha256 checksums
+sha256 e9e7f1a7ba764f042e56afce6f3563c2be9c4fffbb1404b20f8050ae051f577c LICENSE
diff --git a/package/python-falcon/python-falcon.mk b/package/python-falcon/python-falcon.mk
new file mode 100644
index 0000000000..b724ffadbe
--- /dev/null
+++ b/package/python-falcon/python-falcon.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# python-falcon
+#
+################################################################################
+
+PYTHON_FALCON_VERSION = 1.4.1
+PYTHON_FALCON_SOURCE = falcon-$(PYTHON_FALCON_VERSION).tar.gz
+PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/2f/e6/5045da9df509b9259037f065d15608930fd6c997ee930ad230f9fbfecf15
+PYTHON_FALCON_SETUP_TYPE = setuptools
+PYTHON_FALCON_LICENSE = Apache-2.0
+PYTHON_FALCON_LICENSE_FILES = LICENSE
+
+ifeq ($(BR2_PACKAGE_HOST_PYTHON_CYTHON),y)
+PYTHON_FALCON_DEPENDENCIES += host-python-cython
+endif
+
+$(eval $(python-package))
diff --git a/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch b/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch
index 478bac76f6..ec7aec4072 100644
--- a/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch
+++ b/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch
@@ -4,11 +4,13 @@ Date: Thu, 27 Jul 2017 09:46:07 +0200
Subject: [PATCH] Determine boost_python name depending on current Python
version
-Python2 requires boost_python27 and Python3 requires boost_python36
+Python2 requires boost_python27 and Python3 requires boost_python37
(since boost 1.67).
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Bernd: adapted for python-3.7]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
setup.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
@@ -21,7 +23,7 @@ index fdf5c27..4b38569 100644
from setuptools import setup, find_packages, Extension
import sys, os
-+boostlib = "boost_python36"
++boostlib = "boost_python37"
+if sys.version_info < (3, 0):
+ boostlib = "boost_python27"
+
diff --git a/package/python-lxml/Config.in b/package/python-lxml/Config.in
index 1ccaa5e387..fcb30d56ee 100644
--- a/package/python-lxml/Config.in
+++ b/package/python-lxml/Config.in
@@ -2,7 +2,8 @@ config BR2_PACKAGE_PYTHON_LXML
bool "python-lxml"
select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_LIBXSLT
- select BR2_PACKAGE_ZLIB
+ select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
+ select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
help
The lxml XML toolkit is a Pythonic binding for the C libraries
libxml2 and libxslt.
diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash
index 38607e1b84..9b75a26280 100644
--- a/package/python-lxml/python-lxml.hash
+++ b/package/python-lxml/python-lxml.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 f7bc9f702500e205b1560d620f14015fec76dcd6f9e889a946a2ddcc3c344fd0 lxml-4.0.0.tgz
+sha256 e2afbe403090f5893e254958d02875e0732975e73c4c0cdd33c1f009a61963ca lxml-4.2.4.tgz
diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk
index 7f1692d1b0..80c04c0055 100644
--- a/package/python-lxml/python-lxml.mk
+++ b/package/python-lxml/python-lxml.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PYTHON_LXML_VERSION = 4.0.0
+PYTHON_LXML_VERSION = 4.2.4
PYTHON_LXML_SITE = http://lxml.de/files
PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tgz
diff --git a/package/python-mimeparse/Config.in b/package/python-mimeparse/Config.in
new file mode 100644
index 0000000000..2437c3665b
--- /dev/null
+++ b/package/python-mimeparse/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_MIMEPARSE
+ bool "python-mimeparse"
+ help
+ A module provides basic functions for parsing mime-type
+ names and matching them against a list of media-ranges.
+
+ https://github.com/dbtsai/python-mimeparse
diff --git a/package/python-mimeparse/python-mimeparse.hash b/package/python-mimeparse/python-mimeparse.hash
new file mode 100644
index 0000000000..9721c5fa0c
--- /dev/null
+++ b/package/python-mimeparse/python-mimeparse.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/python-mimeparse/json
+md5 a32ae1df93be1ddb581d1c0fa124bab4 python-mimeparse-1.6.0.tar.gz
+sha256 76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78 python-mimeparse-1.6.0.tar.gz
+# Locally computed sha256 checksums
+sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE
diff --git a/package/python-mimeparse/python-mimeparse.mk b/package/python-mimeparse/python-mimeparse.mk
new file mode 100644
index 0000000000..00bb1cf8f4
--- /dev/null
+++ b/package/python-mimeparse/python-mimeparse.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# python-mimeparse
+#
+################################################################################
+
+PYTHON_MIMEPARSE_VERSION = 1.6.0
+PYTHON_MIMEPARSE_SITE = https://files.pythonhosted.org/packages/0f/40/ac5f9e44a55b678c3cd881b4c3376e5b002677dbeab6fb3a50bac5d50d29
+PYTHON_MIMEPARSE_SETUP_TYPE = setuptools
+PYTHON_MIMEPARSE_LICENSE = MIT
+PYTHON_MIMEPARSE_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash
index 463b5620ce..0f90a0be18 100644
--- a/package/python-pillow/python-pillow.hash
+++ b/package/python-pillow/python-pillow.hash
@@ -1,2 +1,4 @@
-# sha256 from https://pypi.org/project/Pillow/5.1.0/#files
-sha256 cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef Pillow-5.1.0.tar.gz
+# sha256 for python-pillow from https://pypi.org/project/Pillow/5.2.0/#files
+# sha256 for LICENSE locally computed
+sha256 f8b3d413c5a8f84b12cd4c5df1d8e211777c9852c6be3ee9c094b626644d3eab Pillow-5.2.0.tar.gz
+sha256 4960fc18becc286be839c8ff17bd70cd5222533f761129142153443718a25199 LICENSE
diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
index c9b3e316f9..c3a3d13315 100644
--- a/package/python-pillow/python-pillow.mk
+++ b/package/python-pillow/python-pillow.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PILLOW_VERSION = 5.1.0
+PYTHON_PILLOW_VERSION = 5.2.0
PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz
-PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/89/b8/2f49bf71cbd0e9485bb36f72d438421b69b7356180695ae10bd4fd3066f5
+PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/d3/c4/b45b9c0d549f482dd072055e2d3ced88f3b977f7b87c7a990228b20e7da1
PYTHON_PILLOW_LICENSE = PIL Software License
PYTHON_PILLOW_LICENSE_FILES = LICENSE
PYTHON_PILLOW_SETUP_TYPE = setuptools
diff --git a/package/python-pip/Config.in b/package/python-pip/Config.in
new file mode 100644
index 0000000000..4fcd55e5ab
--- /dev/null
+++ b/package/python-pip/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_PIP
+ bool "python-pip"
+ help
+ The PyPA recommended tool for installing Python packages.
+
+ https://pip.pypa.io/
diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash
new file mode 100644
index 0000000000..c9b574a6dd
--- /dev/null
+++ b/package/python-pip/python-pip.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/pip/json
+md5 52f75ceb21e96c258f289859a2996b60 pip-18.0.tar.gz
+sha256 a0e11645ee37c90b40c46d607070c4fd583e2cd46231b1c06e389c5e814eed76 pip-18.0.tar.gz
+# Locally computed sha256 checksums
+sha256 391a8784e319dae5431477d4cc9bc504fc5d71fd9e89e1c80f1cd3855f5d7cfa LICENSE.txt
diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk
new file mode 100644
index 0000000000..0a0dce5bca
--- /dev/null
+++ b/package/python-pip/python-pip.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-pip
+#
+################################################################################
+
+PYTHON_PIP_VERSION = 18.0
+PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz
+PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/69/81/52b68d0a4de760a2f1979b0931ba7889202f302072cc7a0d614211bc7579
+PYTHON_PIP_SETUP_TYPE = setuptools
+PYTHON_PIP_LICENSE = MIT
+PYTHON_PIP_LICENSE_FILES = LICENSE.txt
+
+$(eval $(python-package))
diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash
index 209ab27e53..47a379ce6a 100644
--- a/package/python-pyyaml/python-pyyaml.hash
+++ b/package/python-pyyaml/python-pyyaml.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi/pyyaml/json, sha256 locally computed
-md5 4c129761b661d181ebf7ff4eb2d79950 PyYAML-3.12.tar.gz
-sha256 592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab PyYAML-3.12.tar.gz
+# md5, sha256 from https://pypi.python.org/pypi/pyyaml/json
+md5 b78b96636d68ac581c0e2f38158c224f PyYAML-3.13.tar.gz
+sha256 3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf PyYAML-3.13.tar.gz
diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk
index beeaf88e96..cbf8df7b2d 100644
--- a/package/python-pyyaml/python-pyyaml.mk
+++ b/package/python-pyyaml/python-pyyaml.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PYYAML_VERSION = 3.12
+PYTHON_PYYAML_VERSION = 3.13
PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz
-PYTHON_PYYAML_SITE = https://pypi.python.org/packages/4a/85/db5a2df477072b2902b0eb892feb37d88ac635d36245a72a6a69b23b383a
+PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/9e/a3/1d13970c3f36777c583f136c136f804d70f500168edc1edea6daa7200769
PYTHON_PYYAML_SETUP_TYPE = distutils
PYTHON_PYYAML_LICENSE = MIT
PYTHON_PYYAML_LICENSE_FILES = LICENSE
diff --git a/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch b/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch
index cb52eaf6de..461ef4e5fe 100644
--- a/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch
+++ b/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch
@@ -15,19 +15,22 @@ dynamically, return the version of the buildroot environment.
Written by Michael Rommel, modified for version 16.0.2 by Lionel
Flandrin.
+Modified for version 17.1.2 by Asaf Kahlon.
+
Signed-off-by: Lionel Flandrin <lionel@svkt.org>
+Signed-off-by: Asaf Kahlon <asafka7@gmail.com>
---
buildutils/detect.py | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/buildutils/detect.py b/buildutils/detect.py
-index 9520da7..823144f 100644
+index cb14a8d..b33a3b5 100644
--- a/buildutils/detect.py
+++ b/buildutils/detect.py
-@@ -117,13 +117,15 @@ def detect_zmq(basedir, compiler=None, **compiler_attrs):
+@@ -116,13 +116,15 @@ def detect_zmq(basedir, compiler=None, **compiler_attrs):
cc = get_compiler(compiler=compiler, **compiler_attrs)
- efile = test_compilation(cfile, compiler=cc)
+ efile = test_compilation(cfile, compiler=cc, **compiler_attrs)
- patch_lib_paths(efile, cc.library_dirs)
+ #patch_lib_paths(efile, cc.library_dirs)
@@ -47,5 +50,5 @@ index 9520da7..823144f 100644
handlers = {'vers': lambda val: tuple(int(v) for v in val.split('.'))}
--
-2.11.0
+2.17.1
diff --git a/package/python-pyzmq/0002-replace-compile_and_run-with-compile_and_forget.patch b/package/python-pyzmq/0002-replace-compile_and_run-with-compile_and_forget.patch
deleted file mode 100644
index 278e939e0e..0000000000
--- a/package/python-pyzmq/0002-replace-compile_and_run-with-compile_and_forget.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-detect.py: replace compile_and_run with compile_and_forget
-
-This function is only used in setup.py to detect the availability of
-sys/un.h by compiling and running a small test program. Since we're
-cross-compiling we can't run the generated program, however if the
-header is missing the test will fail at the compilation step so
-running the test in unnecessary.
-
-Signed-off-by: Lionel Flandrin <lionel@svkt.org>
----
- buildutils/detect.py | 16 ++++++++--------
- setup.py | 4 ++--
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/buildutils/detect.py b/buildutils/detect.py
-index 7a6c115..9520da7 100644
---- a/buildutils/detect.py
-+++ b/buildutils/detect.py
-@@ -58,7 +58,7 @@ def test_compilation(cfile, compiler=None, **compiler_attrs):
- cc.link_executable(objs, efile, extra_preargs=lpreargs)
- return efile
-
--def compile_and_run(basedir, src, compiler=None, **compiler_attrs):
-+def compile_and_forget(basedir, src, compiler=None, **compiler_attrs):
- if not os.path.exists(basedir):
- os.makedirs(basedir)
- cfile = pjoin(basedir, os.path.basename(src))
-@@ -66,16 +66,16 @@ def compile_and_run(basedir, src, compiler=None, **compiler_attrs):
- try:
- cc = get_compiler(compiler, **compiler_attrs)
- efile = test_compilation(cfile, compiler=cc)
-- patch_lib_paths(efile, cc.library_dirs)
-- result = Popen(efile, stdout=PIPE, stderr=PIPE)
-- so, se = result.communicate()
-- # for py3k:
-- so = so.decode()
-- se = se.decode()
-+ # patch_lib_paths(efile, cc.library_dirs)
-+ # result = Popen(efile, stdout=PIPE, stderr=PIPE)
-+ # so, se = result.communicate()
-+ # # for py3k:
-+ # so = so.decode()
-+ # se = se.decode()
- finally:
- shutil.rmtree(basedir)
-
-- return result.returncode, so, se
-+ return None
-
-
- def detect_zmq(basedir, compiler=None, **compiler_attrs):
-diff --git a/setup.py b/setup.py
-index c3a2879..b8b0aaf 100755
---- a/setup.py
-+++ b/setup.py
-@@ -54,7 +54,7 @@ from buildutils import (
- info, warn, fatal, debug, line, copy_and_patch_libzmq, localpath,
- fetch_libzmq, stage_platform_hpp,
- bundled_version, customize_mingw,
-- compile_and_run,
-+ compile_and_forget,
- patch_lib_paths,
- )
-
-@@ -327,7 +327,7 @@ class Configure(build_ext):
- except Exception:
- pass
- try:
-- compile_and_run(self.tempdir,
-+ compile_and_forget(self.tempdir,
- pjoin('buildutils', 'check_sys_un.c'),
- **minus_zmq
- )
---
-2.11.0
-
diff --git a/package/python-pyzmq/python-pyzmq.hash b/package/python-pyzmq/python-pyzmq.hash
index 6cdd0b9f18..eb8cf0923b 100644
--- a/package/python-pyzmq/python-pyzmq.hash
+++ b/package/python-pyzmq/python-pyzmq.hash
@@ -1,3 +1,3 @@
# md5 from https://pypi.python.org/pypi/pyzmq/json, sha256 locally computed
-md5 9a8768b00a566a400d70318f8c359cfe pyzmq-16.0.2.tar.gz
-sha256 0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d pyzmq-16.0.2.tar.gz
+md5 6f5d77cb5ec1617ce9b6e5ad7c6174fb pyzmq-17.1.2.tar.gz
+sha256 a72b82ac1910f2cf61a49139f4974f994984475f771b0faa730839607eeedddf pyzmq-17.1.2.tar.gz
diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk
index c34c5af265..1f7cb5d613 100644
--- a/package/python-pyzmq/python-pyzmq.mk
+++ b/package/python-pyzmq/python-pyzmq.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PYZMQ_VERSION = 16.0.2
+PYTHON_PYZMQ_VERSION = 17.1.2
PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz
-PYTHON_PYZMQ_SITE = https://pypi.python.org/packages/af/37/8e0bf3800823bc247c36715a52e924e8f8fd5d1432f04b44b8cd7a5d7e55
+PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/b9/6a/bc9277b78f5c3236e36b8c16f4d2701a7fd4fa2eb697159d3e0a3a991573
PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0
# Apache license only online: http://www.apache.org/licenses/LICENSE-2.0
PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD
diff --git a/package/python-semver/Config.in b/package/python-semver/Config.in
new file mode 100644
index 0000000000..c66231a730
--- /dev/null
+++ b/package/python-semver/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_SEMVER
+ bool "python-semver"
+ help
+ Python helper for Semantic Versioning (http://semver.org/).
+
+ https://github.com/k-bx/python-semver
diff --git a/package/python-semver/python-semver.hash b/package/python-semver/python-semver.hash
new file mode 100644
index 0000000000..e18cc1c672
--- /dev/null
+++ b/package/python-semver/python-semver.hash
@@ -0,0 +1,3 @@
+# md5, sha256 from https://pypi.org/pypi/semver/json
+md5 dc579ba9d0bb2137bad5324d4bdb7e40 semver-2.8.1.tar.gz
+sha256 5b09010a66d9a3837211bb7ae5a20d10ba88f8cb49e92cb139a69ef90d5060d8 semver-2.8.1.tar.gz
diff --git a/package/python-semver/python-semver.mk b/package/python-semver/python-semver.mk
new file mode 100644
index 0000000000..afdd34564e
--- /dev/null
+++ b/package/python-semver/python-semver.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-semver
+#
+################################################################################
+
+PYTHON_SEMVER_VERSION = 2.8.1
+PYTHON_SEMVER_SOURCE = semver-$(PYTHON_SEMVER_VERSION).tar.gz
+PYTHON_SEMVER_SITE = https://files.pythonhosted.org/packages/47/13/8ae74584d6dd33a1d640ea27cd656a9f718132e75d759c09377d10d64595
+PYTHON_SEMVER_SETUP_TYPE = setuptools
+# no license file in tarball, but available in git
+PYTHON_SEMVER_LICENSE = BSD-3-Clause
+
+$(eval $(python-package))
diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash
index f116a69f74..c905d8254a 100644
--- a/package/python-setuptools/python-setuptools.hash
+++ b/package/python-setuptools/python-setuptools.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 2599b4c452e77824bbd6da28d16b1fe8159c7a4c203d8d419d8b348fde7b9549 python-setuptools-v38.4.0.tar.gz
+sha256 327e232b1809c9481256408fe9233bcf6a27f9f63ddbbadc526f451e5027aad5 python-setuptools-v40.0.0.tar.gz
sha256 c32a3ac395af6321efd28be73d06a00f0db6ab887d1c21d4fec46128d2056d5a LICENSE
diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk
index 004fc0db2a..8db8511286 100644
--- a/package/python-setuptools/python-setuptools.mk
+++ b/package/python-setuptools/python-setuptools.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PYTHON_SETUPTOOLS_VERSION = v38.4.0
+PYTHON_SETUPTOOLS_VERSION = v40.0.0
PYTHON_SETUPTOOLS_SITE = $(call github,pypa,setuptools,$(PYTHON_SETUPTOOLS_VERSION))
PYTHON_SETUPTOOLS_LICENSE = MIT
PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE
diff --git a/package/python-websockets/python-websockets.hash b/package/python-websockets/python-websockets.hash
index 0fbe144173..4939c7834f 100644
--- a/package/python-websockets/python-websockets.hash
+++ b/package/python-websockets/python-websockets.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/websockets/json
-md5 cd2f92f07bca588acd9238b18f6cfbcf websockets-5.0.1.tar.gz
-sha256 a49d315db5a7a19d55422e1678e8a1c3b9661d7296bef3179fa620cf80b12674 websockets-5.0.1.tar.gz
+md5 76cf931a525a3415f5a4f59c133e89c3 websockets-6.0.tar.gz
+sha256 8f3b956d11c5b301206382726210dc1d3bee1a9ccf7aadf895aaf31f71c3716c websockets-6.0.tar.gz
# Locally computed sha256 checksums
sha256 2cd4d416e432ca7fda2c103b38b852f8d3cb327d70c3db44410b9fe97e6c4d73 LICENSE
diff --git a/package/python-websockets/python-websockets.mk b/package/python-websockets/python-websockets.mk
index 0e225b90f1..4d547ada81 100644
--- a/package/python-websockets/python-websockets.mk
+++ b/package/python-websockets/python-websockets.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_WEBSOCKETS_VERSION = 5.0.1
+PYTHON_WEBSOCKETS_VERSION = 6.0
PYTHON_WEBSOCKETS_SOURCE = websockets-$(PYTHON_WEBSOCKETS_VERSION).tar.gz
-PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/4b/c6/026da2eeed75a49dd0b72a0c7ed6ee5cb2943e396ca9753eabff7359b27b
+PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/4e/2a/56e60bb4c3696bc736998cc13c3fa1a36210609d7e1a3f2519857b420245
PYTHON_WEBSOCKETS_SETUP_TYPE = setuptools
PYTHON_WEBSOCKETS_LICENSE = BSD-3-Clause
PYTHON_WEBSOCKETS_LICENSE_FILES = LICENSE
diff --git a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch
index 4a8e4e8296..406f873aac 100644
--- a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch
+++ b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch
@@ -18,7 +18,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index 82e830727e..b38bd79121 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1311,6 +1311,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
+@@ -1385,6 +1385,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
fi
@@ -26,7 +26,7 @@ index 82e830727e..b38bd79121 100644
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
-d $(LIBDEST) -f \
-@@ -1338,6 +1339,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
+@@ -1412,6 +1413,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
-d $(LIBDEST)/site-packages -f \
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
@@ -38,7 +38,7 @@ diff --git a/configure.ac b/configure.ac
index 962006704f..a76b5444df 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1113,6 +1113,12 @@ fi
+@@ -1107,6 +1107,12 @@ fi
AC_MSG_CHECKING(LDLIBRARY)
diff --git a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch
index e997f47693..537e23cbfc 100644
--- a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch
+++ b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch
@@ -13,7 +13,7 @@ diff --git a/configure.ac b/configure.ac
index a76b5444df..5f87c4db5a 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3939,7 +3939,7 @@ fi
+@@ -3985,7 +3985,7 @@ fi
AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
diff --git a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch
index 76555d290f..6e07b292e4 100644
--- a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch
+++ b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch
@@ -47,7 +47,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index b38bd79121..4ce917ab8d 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -190,6 +190,8 @@ FILEMODE= 644
+@@ -196,6 +196,8 @@ FILEMODE= 644
# configure script arguments
CONFIG_ARGS= @CONFIG_ARGS@
@@ -56,15 +56,15 @@ index b38bd79121..4ce917ab8d 100644
# Subdirectories with code
SRCDIRS= @SRCDIRS@
-@@ -575,6 +577,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
+@@ -609,6 +611,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
esac; \
- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
+ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
- $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
-
-
-@@ -1436,7 +1439,8 @@ libainstall: @DEF_MAKE_RULE@ python-config
+ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \
+ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
+@@ -1508,7 +1511,8 @@ libainstall: @DEF_MAKE_RULE@ python-config
# Install the dynamically loadable modules
# This goes into $(exec_prefix)
sharedinstall: sharedmods
@@ -78,7 +78,7 @@ diff --git a/configure.ac b/configure.ac
index 5f87c4db5a..d5ee2aedfb 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2810,6 +2810,8 @@ LIBS="$withval $LIBS"
+@@ -2902,6 +2902,8 @@ LIBS="$withval $LIBS"
PKG_PROG_PKG_CONFIG
diff --git a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch
index 989943e473..649ab20585 100644
--- a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch
+++ b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch
@@ -61,7 +61,7 @@ index 2bcd1dd288..422c13fa4f 100644
+ BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
# Path to the base directory of the project. On Windows the binary may
- # live in project/PCBuild/win32 or project/PCBuild/amd64.
+ # live in project/PCbuild/win32 or project/PCbuild/amd64.
--
2.13.5
diff --git a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch
index 250d6ec538..1579415be7 100644
--- a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch
+++ b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch
@@ -12,7 +12,7 @@ diff --git a/setup.py b/setup.py
index 86643ae8bf..cd00fbdbda 100644
--- a/setup.py
+++ b/setup.py
-@@ -786,12 +786,9 @@ class PyBuildExt(build_ext):
+@@ -850,12 +850,9 @@ class PyBuildExt(build_ext):
pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library:
readline_libs.append(curses_library)
diff --git a/package/python3/0006-Don-t-add-multiarch-paths.patch b/package/python3/0006-Don-t-add-multiarch-paths.patch
index 220c54cde8..71c064ad9c 100644
--- a/package/python3/0006-Don-t-add-multiarch-paths.patch
+++ b/package/python3/0006-Don-t-add-multiarch-paths.patch
@@ -20,7 +20,7 @@ diff --git a/setup.py b/setup.py
index cd00fbdbda..c956fa08d1 100644
--- a/setup.py
+++ b/setup.py
-@@ -497,10 +497,10 @@ class PyBuildExt(build_ext):
+@@ -547,10 +547,10 @@ class PyBuildExt(build_ext):
if not cross_compiling:
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
diff --git a/package/python3/0007-Abort-on-failed-module-build.patch b/package/python3/0007-Abort-on-failed-module-build.patch
index a44d6b3ec3..f95889df68 100644
--- a/package/python3/0007-Abort-on-failed-module-build.patch
+++ b/package/python3/0007-Abort-on-failed-module-build.patch
@@ -17,7 +17,7 @@ diff --git a/setup.py b/setup.py
index c956fa08d1..b3add2be76 100644
--- a/setup.py
+++ b/setup.py
-@@ -312,6 +312,7 @@ class PyBuildExt(build_ext):
+@@ -358,6 +358,7 @@ class PyBuildExt(build_ext):
print("Failed to build these modules:")
print_three_column(failed)
print()
diff --git a/package/python3/0008-Serial-ioctl-workaround.patch b/package/python3/0008-Serial-ioctl-workaround.patch
index f303bd04db..39d40f025a 100644
--- a/package/python3/0008-Serial-ioctl-workaround.patch
+++ b/package/python3/0008-Serial-ioctl-workaround.patch
@@ -18,7 +18,7 @@ diff --git a/Modules/termios.c b/Modules/termios.c
index b78d33e688..58b0444565 100644
--- a/Modules/termios.c
+++ b/Modules/termios.c
-@@ -9,7 +9,9 @@
+@@ -15,7 +15,9 @@
#endif
#include <termios.h>
diff --git a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch
index 786e958751..68cba34978 100644
--- a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch
+++ b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch
@@ -21,40 +21,47 @@ Submitted upstream: http://bugs.python.org/issue22907
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
- Misc/python-config.sh.in | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ Misc/python-config.sh.in | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
-index 30c6927871..f905a7132f 100644
+index d1d3275..9e259c0 100644
--- a/Misc/python-config.sh.in
+++ b/Misc/python-config.sh.in
-@@ -29,12 +29,12 @@ prefix_real=$(installed_prefix "$0")
+@@ -24,18 +24,19 @@ installed_prefix ()
+ echo $RESULT
+ }
+
++prefix_build="@prefix@"
+ prefix_real=$(installed_prefix "$0")
# Use sed to fix paths from their built-to locations to their installed-to
- # locations.
--prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#")
+ # locations. Keep prefix & exec_prefix using their original values in case
+ # they are referenced in other configure variables, to prevent double
+ # substitution, issue #22140.
+-prefix="@prefix@"
+-exec_prefix="@exec_prefix@"
+prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#")
- exec_prefix_build="@exec_prefix@"
--exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#")
--includedir=$(echo "@includedir@" | sed "s#$prefix_build#$prefix_real#")
--libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#")
--CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#")
+exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#")
+ exec_prefix_real=${prefix_real}
+-includedir=$(echo "@includedir@" | sed "s#$prefix#$prefix_real#")
+-libdir=$(echo "@libdir@" | sed "s#$prefix#$prefix_real#")
+-CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix#$prefix_real#")
+includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#")
+libdir=$(echo "@libdir@" | sed "s#^$prefix_build#$prefix_real#")
+CFLAGS=$(echo "@CFLAGS@" | sed "s#^$prefix_build#$prefix_real#")
VERSION="@VERSION@"
LIBM="@LIBM@"
LIBC="@LIBC@"
-@@ -48,7 +48,7 @@ OPT="@OPT@"
+@@ -49,7 +50,7 @@ OPT="@OPT@"
PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
LDVERSION="@LDVERSION@"
- LIBDEST=${prefix}/lib/python${VERSION}
--LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#")
+ LIBDEST=${prefix_real}/lib/python${VERSION}
+-LIBPL=$(echo "@LIBPL@" | sed "s#$prefix#$prefix_real#")
+LIBPL=$(echo "@LIBPL@" | sed "s#^$prefix_build#$prefix_real#")
SO="@EXT_SUFFIX@"
PYTHONFRAMEWORK="@PYTHONFRAMEWORK@"
INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}"
--
-2.13.5
+2.14.3
diff --git a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch
index 1c1484011f..c5b301d434 100644
--- a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch
+++ b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch
@@ -23,7 +23,7 @@ diff --git a/setup.py b/setup.py
index b3add2be76..29bfd174d2 100644
--- a/setup.py
+++ b/setup.py
-@@ -457,7 +457,7 @@ class PyBuildExt(build_ext):
+@@ -514,7 +514,7 @@ class PyBuildExt(build_ext):
tmpfile = os.path.join(self.build_temp, 'gccpaths')
if not os.path.exists(self.build_temp):
os.makedirs(self.build_temp)
diff --git a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch
index ed0ca26eb7..5bc9bf498d 100644
--- a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch
+++ b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch
@@ -28,7 +28,7 @@ diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_ext
index 9feec50842..3550013d58 100644
--- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py
-@@ -275,8 +275,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
+@@ -283,8 +283,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
a True value is the same as setting 'optimization' to the empty string
while a False value is equivalent to setting 'optimization' to '1'.
@@ -37,7 +37,7 @@ index 9feec50842..3550013d58 100644
"""
if debug_override is not None:
_warnings.warn('the debug_override parameter is deprecated; use '
-@@ -288,10 +286,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
+@@ -296,10 +294,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
path = _os.fspath(path)
head, tail = _path_split(path)
base, sep, rest = tail.rpartition('.')
@@ -49,7 +49,7 @@ index 9feec50842..3550013d58 100644
if optimization is None:
if sys.flags.optimize == 0:
optimization = ''
-@@ -302,40 +297,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
+@@ -310,40 +305,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
if not optimization.isalnum():
raise ValueError('{!r} is not alphanumeric'.format(optimization))
almost_filename = '{}.{}{}'.format(almost_filename, _OPT, optimization)
diff --git a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch
index fc27eda115..35aa73c36f 100644
--- a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch
+++ b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch
@@ -19,7 +19,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index 4ce917ab8d..4110fff4ac 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1194,8 +1194,28 @@ maninstall: altmaninstall
+@@ -1251,8 +1251,28 @@ maninstall: altmaninstall
# Install the library
XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
@@ -50,10 +50,14 @@ index 4ce917ab8d..4110fff4ac 100644
test/audiodata \
test/capath test/data \
test/cjkencodings test/decimaltestdata test/xmltestdata \
-@@ -1229,29 +1249,26 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \
- test/test_importlib/namespace_pkgs/project3/parent/child \
- test/test_importlib/namespace_pkgs/module_and_namespace_package \
- test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 1ff2362..194dbfc 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1326,26 +1326,24 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
+ test/test_importlib/source \
+ test/test_importlib/zipdata01 \
+ test/test_importlib/zipdata02 \
- asyncio \
test/test_asyncio \
- collections concurrent concurrent/futures encodings \
@@ -72,13 +76,10 @@ index 4ce917ab8d..4110fff4ac 100644
- ctypes ctypes/test ctypes/macholib \
- idlelib idlelib/Icons idlelib/idle_test \
- distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
-- importlib test/test_importlib test/test_importlib/builtin \
+ ctypes/test \
+ idlelib/idle_test \
+ distutils/tests \
+ test/test_importlib test/test_importlib/builtin \
- test/test_importlib/extension test/test_importlib/frozen \
- test/test_importlib/import_ test/test_importlib/source \
test/test_tools test/test_warnings test/test_warnings/data \
- turtledemo \
- multiprocessing multiprocessing/dummy \
@@ -98,8 +99,8 @@ diff --git a/configure.ac b/configure.ac
index d5ee2aedfb..f924937fe1 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3112,6 +3112,11 @@ if test "$posix_threads" = "yes"; then
- AC_CHECK_FUNCS(pthread_atfork)
+@@ -3162,6 +3162,11 @@ if test "$posix_threads" = "yes"; then
+ AC_CHECK_FUNCS(pthread_getcpuclockid)
fi
+AC_SUBST(TEST_MODULES)
diff --git a/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/package/python3/0014-Add-an-option-to-disable-pydoc.patch
index fc565cfe10..8055009d6c 100644
--- a/package/python3/0014-Add-an-option-to-disable-pydoc.patch
+++ b/package/python3/0014-Add-an-option-to-disable-pydoc.patch
@@ -20,7 +20,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index 4110fff4ac..badb2af35d 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1164,7 +1164,9 @@ bininstall: altbininstall
+@@ -1221,7 +1221,9 @@ bininstall: altbininstall
-rm -f $(DESTDIR)$(BINDIR)/idle3
(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
-rm -f $(DESTDIR)$(BINDIR)/pydoc3
@@ -30,7 +30,7 @@ index 4110fff4ac..badb2af35d 100644
-rm -f $(DESTDIR)$(BINDIR)/2to3
(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
-rm -f $(DESTDIR)$(BINDIR)/pyvenv
-@@ -1212,7 +1214,7 @@ LIBSUBDIRS= tkinter site-packages \
+@@ -1269,7 +1271,7 @@ LIBSUBDIRS= tkinter site-packages \
multiprocessing multiprocessing/dummy \
unittest \
venv venv/scripts venv/scripts/common venv/scripts/posix \
@@ -39,7 +39,7 @@ index 4110fff4ac..badb2af35d 100644
TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
tkinter/test/test_ttk test \
-@@ -1269,6 +1271,10 @@ ifeq (@TEST_MODULES@,yes)
+@@ -1344,6 +1346,10 @@ ifeq (@TEST_MODULES@,yes)
LIBSUBDIRS += $(TESTSUBDIRS)
endif
@@ -54,8 +54,8 @@ diff --git a/configure.ac b/configure.ac
index f924937fe1..1621fa1611 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3112,6 +3112,12 @@ if test "$posix_threads" = "yes"; then
- AC_CHECK_FUNCS(pthread_atfork)
+@@ -3162,6 +3162,12 @@ if test "$posix_threads" = "yes"; then
+ AC_CHECK_FUNCS(pthread_getcpuclockid)
fi
+AC_SUBST(PYDOC)
@@ -71,7 +71,7 @@ diff --git a/setup.py b/setup.py
index 29bfd174d2..94dd337fef 100644
--- a/setup.py
+++ b/setup.py
-@@ -2281,6 +2281,12 @@ def main():
+@@ -2332,6 +2332,12 @@ def main():
# turn off warnings when deprecated modules are imported
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -84,7 +84,7 @@ index 29bfd174d2..94dd337fef 100644
setup(# PyPI Metadata (PEP 301)
name = "Python",
version = sys.version.split()[0],
-@@ -2305,8 +2311,7 @@ def main():
+@@ -2356,8 +2362,7 @@ def main():
# If you change the scripts installed here, you also need to
# check the PyBuildScripts command above, and change the links
# created by the bininstall target in Makefile.pre.in
diff --git a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
index e6a39383e5..3d3c5de3bf 100644
--- a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
+++ b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
@@ -20,7 +20,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index badb2af35d..931cc3ed07 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1168,7 +1168,9 @@ ifeq (@PYDOC@,yes)
+@@ -1225,7 +1225,9 @@ ifeq (@PYDOC@,yes)
(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
endif
-rm -f $(DESTDIR)$(BINDIR)/2to3
@@ -30,7 +30,7 @@ index badb2af35d..931cc3ed07 100644
-rm -f $(DESTDIR)$(BINDIR)/pyvenv
(cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv)
if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
-@@ -1205,7 +1207,6 @@ LIBSUBDIRS= tkinter site-packages \
+@@ -1262,7 +1264,6 @@ LIBSUBDIRS= tkinter site-packages \
html json http dbm xmlrpc \
sqlite3 \
logging csv wsgiref urllib \
@@ -38,7 +38,7 @@ index badb2af35d..931cc3ed07 100644
ctypes ctypes/macholib \
idlelib idlelib/Icons \
distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -1255,9 +1256,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
+@@ -1332,9 +1333,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
test/test_email test/test_email/data \
test/test_json \
sqlite3/test \
@@ -48,7 +48,7 @@ index badb2af35d..931cc3ed07 100644
ctypes/test \
idlelib/idle_test \
distutils/tests \
-@@ -1267,6 +1265,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
+@@ -1342,6 +1340,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
test/test_tools test/test_warnings test/test_warnings/data \
unittest/test unittest/test/testmock
@@ -63,7 +63,7 @@ index badb2af35d..931cc3ed07 100644
ifeq (@TEST_MODULES@,yes)
LIBSUBDIRS += $(TESTSUBDIRS)
endif
-@@ -1366,10 +1372,12 @@ ifeq (@PYC_BUILD@,yes)
+@@ -1441,10 +1447,12 @@ ifeq (@PYC_BUILD@,yes)
-d $(LIBDEST)/site-packages -f \
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
endif
@@ -75,12 +75,12 @@ index badb2af35d..931cc3ed07 100644
+endif
python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
- # Substitution happens here, as the completely-expanded BINDIR
+ @ # Substitution happens here, as the completely-expanded BINDIR
diff --git a/configure.ac b/configure.ac
index 1621fa1611..13b2edf8b7 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3124,6 +3124,12 @@ AC_ARG_ENABLE(test-modules,
+@@ -3174,6 +3174,12 @@ AC_ARG_ENABLE(test-modules,
AS_HELP_STRING([--disable-test-modules], [disable test modules]),
[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
@@ -97,7 +97,7 @@ diff --git a/setup.py b/setup.py
index 94dd337fef..76429e1326 100644
--- a/setup.py
+++ b/setup.py
-@@ -2282,10 +2282,11 @@ def main():
+@@ -2333,10 +2333,11 @@ def main():
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
diff --git a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch
index 675e8282be..e5192cc477 100644
--- a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch
+++ b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch
@@ -16,7 +16,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index 931cc3ed07..a1ce0712cd 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1205,7 +1205,6 @@ LIBSUBDIRS= tkinter site-packages \
+@@ -1262,7 +1262,6 @@ LIBSUBDIRS= tkinter site-packages \
email email/mime \
ensurepip ensurepip/_bundled \
html json http dbm xmlrpc \
@@ -24,7 +24,7 @@ index 931cc3ed07..a1ce0712cd 100644
logging csv wsgiref urllib \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
-@@ -1255,7 +1254,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
+@@ -1332,7 +1331,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
test/test_asyncio \
test/test_email test/test_email/data \
test/test_json \
@@ -32,7 +32,7 @@ index 931cc3ed07..a1ce0712cd 100644
ctypes/test \
idlelib/idle_test \
distutils/tests \
-@@ -1273,6 +1271,11 @@ TESTSUBDIRS += lib2to3/tests \
+@@ -1348,6 +1346,11 @@ TESTSUBDIRS += lib2to3/tests \
lib2to3/tests/data/fixers/myfixes
endif
@@ -48,8 +48,8 @@ diff --git a/configure.ac b/configure.ac
index 13b2edf8b7..d7582cfea4 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3112,6 +3112,15 @@ if test "$posix_threads" = "yes"; then
- AC_CHECK_FUNCS(pthread_atfork)
+@@ -3162,6 +3162,15 @@ if test "$posix_threads" = "yes"; then
+ AC_CHECK_FUNCS(pthread_getcpuclockid)
fi
+AC_SUBST(SQLITE3)
diff --git a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch
index 56196416a2..96918f022d 100644
--- a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch
+++ b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch
@@ -16,7 +16,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index a1ce0712cd..dc1e917cc3 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1199,7 +1199,7 @@ maninstall: altmaninstall
+@@ -1256,7 +1256,7 @@ maninstall: altmaninstall
# Install the library
XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
@@ -25,7 +25,7 @@ index a1ce0712cd..dc1e917cc3 100644
asyncio \
collections concurrent concurrent/futures encodings \
email email/mime \
-@@ -1216,8 +1216,7 @@ LIBSUBDIRS= tkinter site-packages \
+@@ -1273,8 +1273,7 @@ LIBSUBDIRS= tkinter site-packages \
venv venv/scripts venv/scripts/common venv/scripts/posix \
curses
@@ -35,7 +35,7 @@ index a1ce0712cd..dc1e917cc3 100644
test/audiodata \
test/capath test/data \
test/cjkencodings test/decimaltestdata test/xmltestdata \
-@@ -1263,6 +1262,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
+@@ -1338,6 +1337,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
test/test_tools test/test_warnings test/test_warnings/data \
unittest/test unittest/test/testmock
@@ -52,7 +52,7 @@ diff --git a/configure.ac b/configure.ac
index d7582cfea4..6a56a5b0c1 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3121,6 +3121,15 @@ if test "$SQLITE3" = "no" ; then
+@@ -3171,6 +3171,15 @@ if test "$SQLITE3" = "no" ; then
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
diff --git a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch
index b68369c16c..8205d2fe9d 100644
--- a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch
+++ b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch
@@ -16,7 +16,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index dc1e917cc3..6a6bc082cd 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1213,8 +1213,7 @@ LIBSUBDIRS= site-packages \
+@@ -1270,8 +1270,7 @@ LIBSUBDIRS= site-packages \
turtledemo \
multiprocessing multiprocessing/dummy \
unittest \
@@ -26,7 +26,7 @@ index dc1e917cc3..6a6bc082cd 100644
TESTSUBDIRS= test \
test/audiodata \
-@@ -1268,6 +1267,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
+@@ -1343,6 +1342,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
tkinter/test/test_ttk
endif
@@ -41,7 +41,7 @@ diff --git a/configure.ac b/configure.ac
index 6a56a5b0c1..5896b39ff9 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3130,6 +3130,15 @@ if test "$TK" = "no"; then
+@@ -3180,6 +3180,15 @@ if test "$TK" = "no"; then
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
fi
diff --git a/package/python3/0019-Add-an-option-to-disable-expat.patch b/package/python3/0019-Add-an-option-to-disable-expat.patch
index 0ec0b21555..6057a7f713 100644
--- a/package/python3/0019-Add-an-option-to-disable-expat.patch
+++ b/package/python3/0019-Add-an-option-to-disable-expat.patch
@@ -23,7 +23,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index 6a6bc082cd..dc4b92b6fe 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1208,7 +1208,7 @@ LIBSUBDIRS= site-packages \
+@@ -1265,7 +1265,7 @@ LIBSUBDIRS= site-packages \
logging csv wsgiref urllib \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
@@ -32,7 +32,7 @@ index 6a6bc082cd..dc4b92b6fe 100644
importlib \
turtledemo \
multiprocessing multiprocessing/dummy \
-@@ -1271,6 +1271,10 @@ ifeq (@CURSES@,yes)
+@@ -1346,6 +1346,10 @@ ifeq (@CURSES@,yes)
LIBSUBDIRS += curses
endif
@@ -47,7 +47,7 @@ diff --git a/configure.ac b/configure.ac
index 5896b39ff9..6f21482207 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2813,13 +2813,21 @@ PKG_PROG_PKG_CONFIG
+@@ -2905,13 +2905,21 @@ PKG_PROG_PKG_CONFIG
AC_SUBST(DISABLED_EXTENSIONS)
# Check for use of the system expat library
@@ -78,7 +78,7 @@ diff --git a/setup.py b/setup.py
index 76429e1326..38aa5e605e 100644
--- a/setup.py
+++ b/setup.py
-@@ -1495,7 +1495,7 @@ class PyBuildExt(build_ext):
+@@ -1485,7 +1485,7 @@ class PyBuildExt(build_ext):
#
# More information on Expat can be found at www.libexpat.org.
#
@@ -86,7 +86,7 @@ index 76429e1326..38aa5e605e 100644
+ if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"):
expat_inc = []
define_macros = []
- expat_lib = ['expat']
+ extra_compile_args = []
--
2.13.5
diff --git a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch
index 6b316d8eba..096278ca49 100644
--- a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch
+++ b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
index 6f21482207..c7742faf41 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3129,6 +3129,12 @@ if test "$SQLITE3" = "no" ; then
+@@ -3179,6 +3179,12 @@ if test "$SQLITE3" = "no" ; then
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
diff --git a/package/python3/0021-Add-an-option-to-disable-NIS.patch b/package/python3/0021-Add-an-option-to-disable-NIS.patch
index f49b23f5c8..ecddd46ec6 100644
--- a/package/python3/0021-Add-an-option-to-disable-NIS.patch
+++ b/package/python3/0021-Add-an-option-to-disable-NIS.patch
@@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac
index c7742faf41..42a871bb09 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3135,6 +3135,12 @@ AC_ARG_ENABLE(codecs-cjk,
+@@ -3185,6 +3185,12 @@ AC_ARG_ENABLE(codecs-cjk,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022"
fi])
diff --git a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch
index 9c207be680..8d2469215f 100644
--- a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch
+++ b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
index 42a871bb09..1d610e132b 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3141,6 +3141,12 @@ AC_ARG_ENABLE(nis,
+@@ -3191,6 +3191,12 @@ AC_ARG_ENABLE(nis,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
diff --git a/package/python3/0023-Add-an-option-to-disable-IDLE.patch b/package/python3/0023-Add-an-option-to-disable-IDLE.patch
index da77c44899..068ff2c1f3 100644
--- a/package/python3/0023-Add-an-option-to-disable-IDLE.patch
+++ b/package/python3/0023-Add-an-option-to-disable-IDLE.patch
@@ -19,7 +19,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index dc4b92b6fe..3e43066d90 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1162,7 +1162,9 @@ bininstall: altbininstall
+@@ -1219,7 +1219,9 @@ bininstall: altbininstall
-rm -f $(DESTDIR)$(LIBPC)/python3.pc
(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc)
-rm -f $(DESTDIR)$(BINDIR)/idle3
@@ -29,7 +29,7 @@ index dc4b92b6fe..3e43066d90 100644
-rm -f $(DESTDIR)$(BINDIR)/pydoc3
ifeq (@PYDOC@,yes)
(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
-@@ -1207,7 +1209,6 @@ LIBSUBDIRS= site-packages \
+@@ -1264,7 +1266,6 @@ LIBSUBDIRS= site-packages \
html json http dbm xmlrpc \
logging csv wsgiref urllib \
ctypes ctypes/macholib \
@@ -37,7 +37,7 @@ index dc4b92b6fe..3e43066d90 100644
distutils distutils/command \
importlib \
turtledemo \
-@@ -1275,6 +1276,10 @@ ifeq (@EXPAT@,yes)
+@@ -1350,6 +1351,10 @@ ifeq (@EXPAT@,yes)
LIBSUBDIRS += $(XMLLIBSUBDIRS)
endif
@@ -52,7 +52,7 @@ diff --git a/configure.ac b/configure.ac
index 1d610e132b..2699e7ceb1 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3183,6 +3183,12 @@ AC_ARG_ENABLE(lib2to3,
+@@ -3233,6 +3233,12 @@ AC_ARG_ENABLE(lib2to3,
AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
@@ -69,7 +69,7 @@ diff --git a/setup.py b/setup.py
index 38aa5e605e..d642825c1e 100644
--- a/setup.py
+++ b/setup.py
-@@ -2282,11 +2282,13 @@ def main():
+@@ -2333,11 +2333,13 @@ def main():
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
diff --git a/package/python3/0024-Add-an-option-to-disable-decimal.patch b/package/python3/0024-Add-an-option-to-disable-decimal.patch
index 76ef508409..3dcaac9687 100644
--- a/package/python3/0024-Add-an-option-to-disable-decimal.patch
+++ b/package/python3/0024-Add-an-option-to-disable-decimal.patch
@@ -9,6 +9,8 @@ Python whether we want to use the system libmpdec (already installed),
the libmpdec builtin the Python sources, or no libmpdec at all.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[aduskett@gmail.com: Update for python 3.7.0]
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
configure.ac | 17 ++++++++++++-----
setup.py | 2 +-
@@ -18,8 +20,8 @@ diff --git a/configure.ac b/configure.ac
index 2699e7ceb1..e2c3b6f25c 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2862,13 +2862,20 @@ AC_SUBST(LIBFFI_INCLUDEDIR)
- AC_MSG_RESULT($with_system_ffi)
+@@ -2956,13 +2956,20 @@ fi
+ AC_SUBST(LIBFFI_INCLUDEDIR)
# Check for use of the system libmpdec library
-AC_MSG_CHECKING(for --with-system-libmpdec)
@@ -48,7 +50,7 @@ diff --git a/setup.py b/setup.py
index d642825c1e..5b98255857 100644
--- a/setup.py
+++ b/setup.py
-@@ -2058,7 +2058,7 @@ class PyBuildExt(build_ext):
+@@ -2010,7 +2010,7 @@ class PyBuildExt(build_ext):
def _decimal_ext(self):
extra_compile_args = []
undef_macros = []
diff --git a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch
index 418936cf0d..83e1e3491a 100644
--- a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch
+++ b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
index e2c3b6f25c..8e3dded25e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2877,6 +2877,12 @@ else
+@@ -2971,6 +2971,12 @@ else
fi
AC_SUBST(MPDEC)
diff --git a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch
index 065e50620d..ad4da1adaa 100644
--- a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch
+++ b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
index 8e3dded25e..28bcdabd67 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3160,6 +3160,12 @@ AC_ARG_ENABLE(unicodedata,
+@@ -3210,6 +3210,12 @@ AC_ARG_ENABLE(unicodedata,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata"
fi])
diff --git a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch
index eb1967534d..ec399a8d3c 100644
--- a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch
+++ b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
index 28bcdabd67..484f6ebaca 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3166,6 +3166,12 @@ AC_ARG_ENABLE(openssl,
+@@ -3216,6 +3216,12 @@ AC_ARG_ENABLE(openssl,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib"
fi])
diff --git a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch
index 39330ace62..7753acf726 100644
--- a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch
+++ b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
index 484f6ebaca..79538df0cf 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3172,6 +3172,24 @@ AC_ARG_ENABLE(readline,
+@@ -3222,6 +3222,24 @@ AC_ARG_ENABLE(readline,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline"
fi])
diff --git a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch
index 49137f27ea..2e45bee15a 100644
--- a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch
+++ b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch
@@ -23,31 +23,31 @@ dbus-python-1.2.4 | NOK | http://autobuild.buildroot.net/results/758858efa97b627
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
---
- Misc/python-config.sh.in | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
+ Misc/python-config.sh.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
-index f905a71..e06be0f 100644
+index 9e259c0..8b249d9 100644
--- a/Misc/python-config.sh.in
+++ b/Misc/python-config.sh.in
-@@ -29,7 +29,7 @@ prefix_real=$(installed_prefix "$0")
-
- # Use sed to fix paths from their built-to locations to their installed-to
- # locations.
+@@ -31,7 +31,7 @@ prefix_real=$(installed_prefix "$0")
+ # locations. Keep prefix & exec_prefix using their original values in case
+ # they are referenced in other configure variables, to prevent double
+ # substitution, issue #22140.
-prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#")
+prefix=$prefix_build
- exec_prefix_build="@exec_prefix@"
exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#")
+ exec_prefix_real=${prefix_real}
includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#")
-@@ -47,7 +46,7 @@ LINKFORSHARED="@LINKFORSHARED@"
+@@ -49,7 +49,7 @@ LINKFORSHARED="@LINKFORSHARED@"
OPT="@OPT@"
PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
LDVERSION="@LDVERSION@"
--LIBDEST=${prefix}/lib/python${VERSION}
+-LIBDEST=${prefix_real}/lib/python${VERSION}
+LIBDEST=$( echo "${prefix}/lib/python${VERSION}" | sed "s#^$prefix_build#$prefix_real#")
LIBPL=$(echo "@LIBPL@" | sed "s#^$prefix_build#$prefix_real#")
SO="@EXT_SUFFIX@"
PYTHONFRAMEWORK="@PYTHONFRAMEWORK@"
--
-1.8.3.1
+2.14.3
diff --git a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch b/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch
new file mode 100644
index 0000000000..93df02f6a2
--- /dev/null
+++ b/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch
@@ -0,0 +1,38 @@
+From ad4537a75c798341824ab18bd1dc622f8dc2bc3a Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@gmail.com>
+Date: Fri, 20 Jul 2018 10:17:39 -0400
+Subject: [PATCH] Fix cross compiling the uuid module
+
+Python 3.7 has a new _uuid module, however, the include directory
+search path for uuid.h is hardcoded to /usr/include/uuid, which should
+not be used when cross-compiling.
+
+To fix this, use the same solution as the one used by the NIS
+detection: append "uuid" to each of the include directories in
+"inc_dirs", instead of hardcoding /usr/include/uuid.
+
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+[Thomas: drop STAGING_DIR based solution, use a solution similar to
+the one used for the NIS detection.]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 1a7085c5c4..f33d0b57b8 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1627,7 +1627,8 @@ class PyBuildExt(build_ext):
+ missing.append('_tkinter')
+
+ # Build the _uuid module if possible
+- uuid_incs = find_file("uuid.h", inc_dirs, ["/usr/include/uuid"])
++ uuid_incs = find_file("uuid.h", inc_dirs,
++ [os.path.join(inc_dir, 'uuid') for inc_dir in inc_dirs])
+ if uuid_incs is not None:
+ if self.compiler.find_library_file(lib_dirs, 'uuid'):
+ uuid_libs = ['uuid']
+--
+2.14.4
+
diff --git a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch b/package/python3/0031-Add-an-option-to-disable-uuid-module.patch
new file mode 100644
index 0000000000..c429c59a39
--- /dev/null
+++ b/package/python3/0031-Add-an-option-to-disable-uuid-module.patch
@@ -0,0 +1,33 @@
+From 1fe33c7bee9e6410f56c956ea19efd2f617176ae Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Date: Sat, 18 Aug 2018 10:54:56 +0200
+Subject: [PATCH] Add an option to disable uuid module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ configure.ac | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index b022460e73..505b7c9be0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3258,6 +3258,15 @@ if test "$CURSES" = "no"; then
+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
+ fi
+
++AC_SUBST(UUID)
++AC_ARG_ENABLE(uuid,
++ AS_HELP_STRING([--disable-uuid], [disable uuid]),
++ [ UUID="${enableval}" ], [ UUID=yes ])
++
++if test "$UUID" = "no"; then
++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _uuid"
++fi
++
+ AC_SUBST(PYDOC)
+
+ AC_ARG_ENABLE(pydoc,
+--
+2.14.4
+
diff --git a/package/python3/0032-fix-building-on-older-distributions.patch b/package/python3/0032-fix-building-on-older-distributions.patch
new file mode 100644
index 0000000000..0f7ee2a25f
--- /dev/null
+++ b/package/python3/0032-fix-building-on-older-distributions.patch
@@ -0,0 +1,38 @@
+From ba10bac420398270a0b992e85d93383373d5fcac Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@greenlots.com>
+Date: Thu, 16 Aug 2018 14:52:37 -0700
+Subject: [PATCH] fix building on older distributions
+
+Python > 3.6.3 calls os.replace in the update_file.py script, during the
+regen-importlib phase of the build process.
+
+According to Doc/whatsnew/3.3.rst line 1631, os.replace acts in the same
+way as os.rename, however, it is now cross-platform compatible for Windows.
+
+Because BuildRoot is guaranteed only to be built in POSIX environment, it is
+safe to change os.replace back to os.rename.
+
+This change fixes building on older systems such as CentOS7, that only come
+with python 2.
+
+Signed-off-by: Adam Duskett <aduskett@greenlots.com>
+---
+ Tools/scripts/update_file.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Tools/scripts/update_file.py b/Tools/scripts/update_file.py
+index 224585c69b..ef458c0c63 100644
+--- a/Tools/scripts/update_file.py
++++ b/Tools/scripts/update_file.py
+@@ -16,7 +16,7 @@ def main(old_path, new_path):
+ with open(new_path, 'rb') as f:
+ new_contents = f.read()
+ if old_contents != new_contents:
+- os.replace(new_path, old_path)
++ os.rename(new_path, old_path)
+ else:
+ os.unlink(new_path)
+
+--
+2.14.4
+
diff --git a/package/python3/Config.in b/package/python3/Config.in
index 623fefe43d..0701d56a6c 100644
--- a/package/python3/Config.in
+++ b/package/python3/Config.in
@@ -88,6 +88,16 @@ config BR2_PACKAGE_PYTHON3_UNICODEDATA
Unicode character database (used by stringprep module)
(large).
+config BR2_PACKAGE_PYTHON3_UUID
+ bool "uuid module"
+ select BR2_PACKAGE_UTIL_LINUX
+ select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+ help
+ This module provides immutable UUID objects (the UUID class)
+ and the functions uuid1(), uuid3(), uuid4(), uuid5() for
+ generating version 1, 3, 4, and 5 UUIDs as specified in RFC
+ 4122.
+
config BR2_PACKAGE_PYTHON3_SQLITE
bool "sqlite module"
select BR2_PACKAGE_SQLITE
diff --git a/package/python3/python3.hash b/package/python3/python3.hash
index 33adb188fb..9138ad6b9c 100644
--- a/package/python3/python3.hash
+++ b/package/python3/python3.hash
@@ -1,4 +1,5 @@
-# From https://www.python.org/downloads/release/python-363/
-md5 b9c2c36c33fb89bda1fefd37ad5af9be Python-3.6.3.tar.xz
+# From https://www.python.org/downloads/release/python-370/
+md5 eb8c2a6b1447d50813c02714af4681f3 Python-3.7.0.tar.xz
# Locally computed
-sha256 cda7d967c9a4bfa52337cdf551bcc5cff026b6ac50a8834e568ce4a794ca81da Python-3.6.3.tar.xz
+sha256 0382996d1ee6aafe59763426cf0139ffebe36984474d0ec4126dd1c40a8b3549 Python-3.7.0.tar.xz
+sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 LICENSE
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 6e61108661..5e94e8e726 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -4,20 +4,13 @@
#
################################################################################
-PYTHON3_VERSION_MAJOR = 3.6
-PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).3
+PYTHON3_VERSION_MAJOR = 3.7
+PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).0
PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz
PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION)
PYTHON3_LICENSE = Python-2.0, others
PYTHON3_LICENSE_FILES = LICENSE
-# Python itself doesn't use libtool, but it includes the source code
-# of libffi, which uses libtool. Unfortunately, it uses a beta version
-# of libtool for which we don't have a matching patch. However, this
-# is not a problem, because we don't use the libffi copy included in
-# the Python sources, but instead use an external libffi library.
-PYTHON3_LIBTOOL_PATCH = NO
-
# This host Python is installed in $(HOST_DIR), as it is needed when
# cross-compiling third-party Python modules.
@@ -47,7 +40,7 @@ HOST_PYTHON3_CONF_ENV += \
PYTHON3_DEPENDENCIES = host-python3 libffi
-HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib
+HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-libffi
PYTHON3_INSTALL_STAGING = YES
@@ -101,6 +94,12 @@ ifneq ($(BR2_PACKAGE_PYTHON3_UNICODEDATA),y)
PYTHON3_CONF_OPTS += --disable-unicodedata
endif
+ifeq ($(BR2_PACKAGE_PYTHON3_UUID),y)
+PYTHON3_DEPENDENCIES += util-linux
+else
+PYTHON3_CONF_OPTS += --disable-uuid
+endif
+
ifeq ($(BR2_PACKAGE_PYTHON3_BZIP2),y)
PYTHON3_DEPENDENCIES += bzip2
else
diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
index 6d6d024d9d..a0c4a6203c 100644
--- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
+++ b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
@@ -17,11 +17,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
user-exec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/user-exec.c b/user-exec.c
+diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index 6db0758..2b3d116 100644
---- a/user-exec.c
-+++ b/user-exec.c
-@@ -409,7 +409,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
+--- a/accel/tcg/user-exec.c
++++ b/accel/tcg/user-exec.c
+@@ -463,7 +463,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
#if defined(__NetBSD__)
pc = uc->uc_mcontext.__gregs[_REG_R15];
diff --git a/package/qemu/0002-memfd-fix-configure-test.patch b/package/qemu/0002-memfd-fix-configure-test.patch
deleted file mode 100644
index 3e06c0e932..0000000000
--- a/package/qemu/0002-memfd-fix-configure-test.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini <pbonzini@redhat.com>
-Date: Tue, 28 Nov 2017 11:51:27 +0100
-Subject: [PATCH] memfd: fix configure test
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Recent glibc added memfd_create in sys/mman.h. This conflicts with
-the definition in util/memfd.c:
-
- /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration
-
-Fix the configure test, and remove the sys/memfd.h inclusion since the
-file actually does not exist---it is a typo in the memfd_create(2) man
-page.
-
-Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: commit 75e5b70e6b5
-
- configure | 2 +-
- util/memfd.c | 4 +---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index 9c8aa5a98bd4..99ccc1725ace 100755
---- a/configure
-+++ b/configure
-@@ -3923,7 +3923,7 @@ fi
- # check if memfd is supported
- memfd=no
- cat > $TMPC << EOF
--#include <sys/memfd.h>
-+#include <sys/mman.h>
-
- int main(void)
- {
-diff --git a/util/memfd.c b/util/memfd.c
-index 4571d1aba866..412e94a405fc 100644
---- a/util/memfd.c
-+++ b/util/memfd.c
-@@ -31,9 +31,7 @@
-
- #include "qemu/memfd.h"
-
--#ifdef CONFIG_MEMFD
--#include <sys/memfd.h>
--#elif defined CONFIG_LINUX
-+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
- #include <sys/syscall.h>
- #include <asm/unistd.h>
-
---
-2.16.2
-
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index 13b615bfba..61a2a1072e 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -54,8 +54,29 @@ config BR2_PACKAGE_QEMU_CUSTOM_TARGETS
x86_64-softmmu | sparc-bsd-user
... | ...
-config QEMU_FOO
- bool # To break the indentation
+comment "Networking options"
+
+config BR2_PACKAGE_QEMU_SLIRP
+ bool "Enable user mode networking (SLIRP)"
+ help
+ Enable user mode network stack, which is the default
+ networking backend. It requires no administrator privileges
+ and generally is the easiest to use but has some
+ limitations:
+
+ - there is a lot of overhead so the performance is poor;
+ - in general ICMP does not work (can't ping from/to a guest)
+ - on Linux hosts, ping does work from within the guest, but it
+ needs initial setup by root (once per host)
+ - the guest is not directly accessible from the host or the
+ external network
+
+ User Networking is implemented using "slirp", which provides a
+ full TCP/IP stack within QEMU and uses that stack to implement
+ a virtual NAT'd network.
+
+ Notice that this option does not disable other networking
+ modes.
if BR2_PACKAGE_QEMU_CUSTOM_TARGETS = ""
diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash
index 1173c1bf3d..fc0b4e87bf 100644
--- a/package/qemu/qemu.hash
+++ b/package/qemu/qemu.hash
@@ -1,4 +1,4 @@
# Locally computed, tarball verified with GPG signature
-sha256 fcfdaa1ecdaac8aead616fe811bfb8fe4a8f2cd59796aa446c5175b5af0e829f qemu-2.10.2.tar.xz
+sha256 e69301f361ff65bf5dabd8a19196aeaa5613c1b5ae1678f0823bdf50e7d5c6fc qemu-2.12.0.tar.xz
sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING
sha256 48ffe9fc7f1d5462dbd19340bc4dd1d8a9e37c61ed535813e614cbe4a5f0d4df COPYING.LIB
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 0a6a6c0609..afb2aa92f6 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -4,7 +4,7 @@
#
################################################################################
-QEMU_VERSION = 2.10.2
+QEMU_VERSION = 2.12.0
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
QEMU_SITE = http://download.qemu.org
QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
@@ -55,6 +55,11 @@ endif
endif
+# There is no "--enable-slirp"
+ifeq ($(BR2_PACKAGE_QEMU_SLIRP),)
+QEMU_OPTS += --disable-slirp
+endif
+
ifeq ($(BR2_PACKAGE_QEMU_SDL),y)
QEMU_OPTS += --enable-sdl
QEMU_DEPENDENCIES += sdl
@@ -95,14 +100,12 @@ define QEMU_CONFIGURE_CMDS
./configure \
--prefix=/usr \
--cross-prefix=$(TARGET_CROSS) \
- --with-system-pixman \
--audio-drv-list= \
--enable-kvm \
--enable-attr \
--enable-vhost-net \
--disable-bsd-user \
--disable-xen \
- --disable-slirp \
--disable-vnc \
--disable-virtfs \
--disable-brlapi \
@@ -120,6 +123,16 @@ define QEMU_CONFIGURE_CMDS
--disable-strip \
--disable-seccomp \
--disable-sparse \
+ --disable-mpath \
+ --disable-sanitizers \
+ --disable-hvf \
+ --disable-whpx \
+ --disable-malloc-trim \
+ --disable-membarrier \
+ --disable-vhost-crypto \
+ --disable-libxml2 \
+ --disable-capstone \
+ --disable-git-update \
$(QEMU_OPTS) \
)
endef
diff --git a/package/qt5/qt5base/5.11.1/0003-Fix-qmake-build-with-glibc-2.28.patch b/package/qt5/qt5base/5.11.1/0003-Fix-qmake-build-with-glibc-2.28.patch
new file mode 100644
index 0000000000..6d8bb28992
--- /dev/null
+++ b/package/qt5/qt5base/5.11.1/0003-Fix-qmake-build-with-glibc-2.28.patch
@@ -0,0 +1,74 @@
+From 25feee4e061b99edab79503d81f5bd045c6c8e3d Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira@intel.com>
+Date: Tue, 7 Aug 2018 09:38:42 -0700
+Subject: [PATCH] Fix qmake build with glibc 2.28
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We haven't yet run the configure checks to see if statx and renameat2
+are present in glibc, so this fails when we redefine the structures and
+functions.
+
+linux/stat.h:56:8: error: redefinition of 'struct statx_timestamp'
+bits/statx.h:25:8: note: previous definition of 'struct statx_timestamp'
+qfilesystemengine_unix.cpp:110:12: error: 'int renameat2(int, const char*, int, const char*, unsigned int)' was declared 'extern' and later 'static' [-fpermissive]
+
+Change-Id: Ia741b559c24d46c78fb2fffd1548a792d22e3368
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
+Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
+
+Downloaded from upstream commit
+http://code.qt.io/cgit/qt/qtbase.git/commit/?id=25feee4e061b99edab79503d81f5bd045c6c8e3d
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/corelib/global/qconfig-bootstrapped.h | 12 ++++++++++--
+ src/corelib/io/qfilesystemengine_unix.cpp | 2 +-
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
+index 3469ebe5e6..c5585ea32a 100644
+--- a/src/corelib/global/qconfig-bootstrapped.h
++++ b/src/corelib/global/qconfig-bootstrapped.h
+@@ -98,10 +98,18 @@
+ #define QT_NO_QOBJECT
+ #define QT_FEATURE_process -1
+ #define QT_FEATURE_regularexpression -1
+-#define QT_FEATURE_renameat2 -1
++#ifdef __GLIBC_PREREQ
++# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1)
++#else
++# define QT_FEATURE_renameat2 -1
++#endif
+ #define QT_FEATURE_sharedmemory -1
+ #define QT_FEATURE_slog2 -1
+-#define QT_FEATURE_statx -1
++#ifdef __GLIBC_PREREQ
++# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1)
++#else
++# define QT_FEATURE_statx -1
++#endif
+ #define QT_FEATURE_syslog -1
+ #define QT_NO_SYSTEMLOCALE
+ #define QT_FEATURE_systemsemaphore -1
+diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
+index 0c9cdb8667..deb4a9f220 100644
+--- a/src/corelib/io/qfilesystemengine_unix.cpp
++++ b/src/corelib/io/qfilesystemengine_unix.cpp
+@@ -91,7 +91,6 @@ extern "C" NSString *NSTemporaryDirectory();
+ # include <sys/syscall.h>
+ # include <sys/sendfile.h>
+ # include <linux/fs.h>
+-# include <linux/stat.h>
+
+ // in case linux/fs.h is too old and doesn't define it:
+ #ifndef FICLONE
+@@ -112,6 +111,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp
+ # endif
+
+ # if !QT_CONFIG(statx) && defined(SYS_statx)
++# include <linux/stat.h>
+ static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
+ { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
+ # elif !QT_CONFIG(statx) && !defined(SYS_statx)
diff --git a/package/qt5/qt5wayland/0001-fix-compilation-without-QtQuick.patch b/package/qt5/qt5wayland/0001-fix-compilation-without-QtQuick.patch
new file mode 100644
index 0000000000..fe5d323db0
--- /dev/null
+++ b/package/qt5/qt5wayland/0001-fix-compilation-without-QtQuick.patch
@@ -0,0 +1,69 @@
+From 2c48ee65e8c3b894caec214641723d0777fc60b8 Mon Sep 17 00:00:00 2001
+From: Alexander Schlarb <alexander@ninetailed.ninja>
+Date: Sun, 29 Jul 2018 21:27:28 +0200
+Subject: Fix compilation of QtWayland without QtQuick
+
+Change-Id: I0baf542f89274f48bf7d02121a07d64f0f3a001b
+Reviewed-by: Johan Helsing <johan.helsing@qt.io>
+Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
+---
+ src/compositor/compositor_api/compositor_api.pri | 10 +++++-----
+ .../hardware_integration/qwlhardwarelayerintegration_p.h | 1 -
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri
+index e5df0f1f..4a0c0aa6 100644
+--- a/src/compositor/compositor_api/compositor_api.pri
++++ b/src/compositor/compositor_api/compositor_api.pri
+@@ -27,7 +27,6 @@ HEADERS += \
+ compositor_api/qwaylandresource.h \
+ compositor_api/qwaylandsurfacegrabber.h \
+ compositor_api/qwaylandoutputmode_p.h \
+- compositor_api/qwaylandquickhardwarelayer_p.h \
+
+ SOURCES += \
+ compositor_api/qwaylandcompositor.cpp \
+@@ -44,8 +43,7 @@ SOURCES += \
+ compositor_api/qwaylanddestroylistener.cpp \
+ compositor_api/qwaylandview.cpp \
+ compositor_api/qwaylandresource.cpp \
+- compositor_api/qwaylandsurfacegrabber.cpp \
+- compositor_api/qwaylandquickhardwarelayer.cpp
++ compositor_api/qwaylandsurfacegrabber.cpp
+
+ qtConfig(im) {
+ HEADERS += \
+@@ -71,14 +69,16 @@ qtHaveModule(quick):qtConfig(opengl) {
+ compositor_api/qwaylandquickcompositor.cpp \
+ compositor_api/qwaylandquicksurface.cpp \
+ compositor_api/qwaylandquickoutput.cpp \
+- compositor_api/qwaylandquickitem.cpp
++ compositor_api/qwaylandquickitem.cpp \
++ compositor_api/qwaylandquickhardwarelayer.cpp
+
+ HEADERS += \
+ compositor_api/qwaylandquickcompositor.h \
+ compositor_api/qwaylandquicksurface.h \
+ compositor_api/qwaylandquickoutput.h \
+ compositor_api/qwaylandquickitem.h \
+- compositor_api/qwaylandquickitem_p.h
++ compositor_api/qwaylandquickitem_p.h \
++ compositor_api/qwaylandquickhardwarelayer_p.h
+
+ QT += qml qml-private quick quick-private
+ }
+diff --git a/src/compositor/hardware_integration/qwlhardwarelayerintegration_p.h b/src/compositor/hardware_integration/qwlhardwarelayerintegration_p.h
+index 02de8e8b..1e5fb1a1 100644
+--- a/src/compositor/hardware_integration/qwlhardwarelayerintegration_p.h
++++ b/src/compositor/hardware_integration/qwlhardwarelayerintegration_p.h
+@@ -54,7 +54,6 @@
+ #include <QtWaylandCompositor/qtwaylandcompositorglobal.h>
+
+ #include <QObject>
+-#include <QQmlParserStatus>
+
+ QT_BEGIN_NAMESPACE
+
+--
+cgit v1.1-6-g87c4
+
diff --git a/package/qt5/qt5wayland/Config.in b/package/qt5/qt5wayland/Config.in
index 0182d3ca56..0d5a108912 100644
--- a/package/qt5/qt5wayland/Config.in
+++ b/package/qt5/qt5wayland/Config.in
@@ -1,12 +1,9 @@
comment "qt5wayland needs an OpenGL-capable backend"
- depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
config BR2_PACKAGE_QT5WAYLAND
bool "qt5wayland"
depends on BR2_PACKAGE_QT5_GL_AVAILABLE
- depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative
- select BR2_PACKAGE_QT5DECLARATIVE
select BR2_PACKAGE_WAYLAND
help
Qt is a cross-platform application and UI framework for
diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk
index 98e592f03d..d6fb6e1888 100644
--- a/package/qt5/qt5wayland/qt5wayland.mk
+++ b/package/qt5/qt5wayland/qt5wayland.mk
@@ -7,9 +7,13 @@
QT5WAYLAND_VERSION = $(QT5_VERSION)
QT5WAYLAND_SITE = $(QT5_SITE)
QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz
-QT5WAYLAND_DEPENDENCIES = qt5base qt5declarative wayland
+QT5WAYLAND_DEPENDENCIES = qt5base wayland
QT5WAYLAND_INSTALL_STAGING = YES
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
+QT5WAYLAND_DEPENDENCIES += qt5declarative
+endif
+
ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y)
QT5WAYLAND_DEPENDENCIES += libxkbcommon
endif
diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash
index a83dea911d..4ad5069486 100644
--- a/package/rust-bin/rust-bin.hash
+++ b/package/rust-bin/rust-bin.hash
@@ -1,33 +1,33 @@
-# From https://static.rust-lang.org/dist/rustc-1.27.1-i686-unknown-linux-gnu.tar.xz.sha256
-sha256 739acc03d50c5fb2ce43037b0b54c37ac99bd1bef9ea61ee969b49a63d11315d rustc-1.27.1-i686-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rustc-1.27.1-x86_64-unknown-linux-gnu.tar.xz.sha256
-sha256 d4c45e15d4ffb150f3eeef1fa2945a5ae541ab791f9464e9a4dcccba77bdf9c7 rustc-1.27.1-x86_64-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.1-aarch64-unknown-linux-gnu.tar.xz.sha256
-sha256 1f9565cac16e600c68ebfb4fe50b1658462698b8d4a1e8392f8182c4e813d99d rust-std-1.27.1-aarch64-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.1-arm-unknown-linux-gnueabi.tar.xz.sha256
-sha256 a58026c1b441c45d21acc9b054232831fceb12f1906995754ef6aa9b20376d6a rust-std-1.27.1-arm-unknown-linux-gnueabi.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.1-arm-unknown-linux-gnueabihf.tar.xz.sha256
-sha256 dc3ee826617487777bd70f52743baa499396c58cbdd3934cf57fa84624b84f05 rust-std-1.27.1-arm-unknown-linux-gnueabihf.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256
-sha256 d846df9113718e3faaf77c7b29690a4f9a9f1432e7d001e2a1fee95514d92c79 rust-std-1.27.1-armv7-unknown-linux-gnueabihf.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.1-i686-unknown-linux-gnu.tar.xz.sha256
-sha256 68f028911a1606e93eb71bdf95fe7d91e2b4cbd247663f3ab1e59d291dcd61b7 rust-std-1.27.1-i686-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.1-mips-unknown-linux-gnu.tar.xz.sha256
-sha256 e15358613566b4a7721cfbebf424f850c771cf2acfc67ea170154447e81a7d5d rust-std-1.27.1-mips-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256
-sha256 a2c8a030964515328cf1cff5d72a53e2d8df30048382318378904df6bd019395 rust-std-1.27.1-mips64-unknown-linux-gnuabi64.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256
-sha256 27444c6892c978d294d24e26409bf924b6644822d18ef1d3e0d4fa3370e7d4da rust-std-1.27.1-mips64el-unknown-linux-gnuabi64.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.1-mipsel-unknown-linux-gnu.tar.xz.sha256
-sha256 ac0c03e7d53439821c2d9eaf1311716b92fe347d83c1009bc031907b4ddef0f2 rust-std-1.27.1-mipsel-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.1-powerpc-unknown-linux-gnu.tar.xz.sha256
-sha256 d2f2b88adb85af25699dd5e866d8e989660ef1a94561a9b73e4b7080e75ef6ee rust-std-1.27.1-powerpc-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.1-powerpc64-unknown-linux-gnu.tar.xz.sha256
-sha256 80b6070996f297f4e9f802b014e88285914de03c1af7b087064035c9ece500bf rust-std-1.27.1-powerpc64-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256
-sha256 a3c1843a583af8a38d49a403ea4e3013c8e1e0092a37353e62e69957fa1e9dbd rust-std-1.27.1-powerpc64le-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.27.1-x86_64-unknown-linux-gnu.tar.xz.sha256
-sha256 d3b0d00357cfaecf85651bea6f1d72793a5a859b6b07e9613ba21285922d5d58 rust-std-1.27.1-x86_64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rustc-1.27.2-i686-unknown-linux-gnu.tar.xz.sha256
+sha256 6d4e19c69231096d81acb9380b37613eab0af8779c70c1e8f76d526ae4b43c3d rustc-1.27.2-i686-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rustc-1.27.2-x86_64-unknown-linux-gnu.tar.xz.sha256
+sha256 927f88b5362e4b601caf619f64d609a88c03852fa505991c08c5f661fe71d7ac rustc-1.27.2-x86_64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.27.2-aarch64-unknown-linux-gnu.tar.xz.sha256
+sha256 1538eff6a3ecb62c362cf463686c28103bb162ea1274705e23116b5534f06c56 rust-std-1.27.2-aarch64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.27.2-arm-unknown-linux-gnueabi.tar.xz.sha256
+sha256 ab17f722883767bce847b4edb15e9ede8ca95b9d0844f6c210a907fbed9ecb0d rust-std-1.27.2-arm-unknown-linux-gnueabi.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.27.2-arm-unknown-linux-gnueabihf.tar.xz.sha256
+sha256 15715678f8c993f86174b588c7c026c7208e46ea0a1023753a473397b61b0cb7 rust-std-1.27.2-arm-unknown-linux-gnueabihf.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.27.2-armv7-unknown-linux-gnueabihf.tar.xz.sha256
+sha256 8390920c9b01c0f0eb08028033862e56062caf751b1aed658fbe3a78a1c5d0bf rust-std-1.27.2-armv7-unknown-linux-gnueabihf.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.27.2-i686-unknown-linux-gnu.tar.xz.sha256
+sha256 9467f43d225238f327047f5ce206f2138391c478f6212f0719c040daf298f81a rust-std-1.27.2-i686-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.27.2-mips-unknown-linux-gnu.tar.xz.sha256
+sha256 73b6097147bb6af5d46cbf2369712fa6faae2b12a42d30d264ab8267492021d5 rust-std-1.27.2-mips-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.27.2-mips64-unknown-linux-gnuabi64.tar.xz.sha256
+sha256 352032f8d05c27f4bf5f1073f96dee576324ea8d96eecf823ca07319578b448e rust-std-1.27.2-mips64-unknown-linux-gnuabi64.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.27.2-mips64el-unknown-linux-gnuabi64.tar.xz.sha256
+sha256 add721a331a520a4fac0689b82eefe3fe15a0330baca7ef5ad761b731ddfafdd rust-std-1.27.2-mips64el-unknown-linux-gnuabi64.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.27.2-mipsel-unknown-linux-gnu.tar.xz.sha256
+sha256 54cc4af92445491127109bab1249d815f8bcbc26dcba46d8e1fe361dddc870f5 rust-std-1.27.2-mipsel-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.27.2-powerpc-unknown-linux-gnu.tar.xz.sha256
+sha256 30a638c82e3508685e1d9bec86ac7581b998425b0e76162fcef4e0eba4713dad rust-std-1.27.2-powerpc-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.27.2-powerpc64-unknown-linux-gnu.tar.xz.sha256
+sha256 7dc7a54cb8c567ab8061055533213bc4f491d042b5a61dc0645339ce2453d611 rust-std-1.27.2-powerpc64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.27.2-powerpc64le-unknown-linux-gnu.tar.xz.sha256
+sha256 6a0e27d22059b1aeb9fcd2b6d3683156f48002a9a0d2f1e2fedb60af589586d6 rust-std-1.27.2-powerpc64le-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.27.2-x86_64-unknown-linux-gnu.tar.xz.sha256
+sha256 d25e00b8a86956bdf0efe0b20d700081c3f279a1e92f86ccc15fb4deefa42e14 rust-std-1.27.2-x86_64-unknown-linux-gnu.tar.xz
# Locally generated
sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE
sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT
diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk
index cebca11133..923642f08d 100644
--- a/package/rust-bin/rust-bin.mk
+++ b/package/rust-bin/rust-bin.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RUST_BIN_VERSION = 1.27.1
+RUST_BIN_VERSION = 1.27.2
RUST_BIN_SITE = https://static.rust-lang.org/dist
RUST_BIN_LICENSE = Apache-2.0 or MIT
RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT
diff --git a/package/rust/rust.hash b/package/rust/rust.hash
index 6e6b0d9b6f..51b736be6d 100644
--- a/package/rust/rust.hash
+++ b/package/rust/rust.hash
@@ -1,5 +1,5 @@
-# From https://static.rust-lang.org/dist/rustc-1.27.1-src.tar.xz.sha256
-sha256 948e2645057960ee1c03d9f0e8f78133a5f73d9ca9a24bc56126e395a212d25c rustc-1.27.1-src.tar.xz
+# From https://static.rust-lang.org/dist/rustc-1.27.2-src.tar.xz.sha256
+sha256 bf0228072ad60abd89dd81c8e25ae1e7b4b31e00e73612e7f4985e3144ad5bda rustc-1.27.2-src.tar.xz
# Locally generated
sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE
sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT
diff --git a/package/rust/rust.mk b/package/rust/rust.mk
index 74df7d234a..541e49d43d 100644
--- a/package/rust/rust.mk
+++ b/package/rust/rust.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RUST_VERSION = 1.27.1
+RUST_VERSION = 1.27.2
RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz
RUST_SITE = https://static.rust-lang.org/dist
RUST_LICENSE = Apache-2.0 or MIT
@@ -61,6 +61,7 @@ define HOST_RUST_CONFIGURE_CMDS
echo 'prefix = "$(HOST_DIR)"'; \
echo '[rust]'; \
echo 'use-jemalloc = $(HOST_RUST_JEMALLOC_ENABLED)'; \
+ echo 'channel = "stable"'; \
echo '[target.$(RUSTC_TARGET_NAME)]'; \
echo 'cc = "$(TARGET_CROSS)gcc"'; \
echo $(HOST_RUST_JEMALLOC_CONF); \
diff --git a/package/sam-ba/sam-ba.hash b/package/sam-ba/sam-ba.hash
index 61feb32d8d..ae1fb5eece 100644
--- a/package/sam-ba/sam-ba.hash
+++ b/package/sam-ba/sam-ba.hash
@@ -1,2 +1,5 @@
-# Locally calculated
-sha256 302734f53e471b5d1a292c9af937262f4fd766ec47ebfea62439761e7c1cd9d7 sam-ba_2.16_linux.zip
+# sha256 locally computed
+sha256 40d5e66b77261d83780fe2b38633b8d9f5c9a26718c2b9de1d5877e853e35e96 sam-ba_cdc_linux.zip
+sha256 f9cac240acadbfd8f4f1c0d65132f85427384697bd6337da6444c531138d56ee doc/license.txt
+sha256 255564ff8953ea95c11a4ab1d56f1edf332298faad209ca80daf745c7ed95124 tcl_lib/boards.tcl
+sha256 74ae62858139cb4e18acc3448483be80ea6b36fdb87260b665f43762ca354ede applets/sam4c/libraries/libchip_sam4c/include/sam4c/sam4c32e-1.h
diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk
index 0d36b0dc59..49505589d0 100644
--- a/package/sam-ba/sam-ba.mk
+++ b/package/sam-ba/sam-ba.mk
@@ -4,9 +4,9 @@
#
################################################################################
-SAM_BA_SITE = http://www.atmel.com/dyn/resources/prod_documents
-SAM_BA_VERSION = 2.16
-SAM_BA_SOURCE = sam-ba_$(SAM_BA_VERSION)_linux.zip
+SAM_BA_SITE = http://ww1.microchip.com/downloads/en/DeviceDoc
+SAM_BA_VERSION = 2.18
+SAM_BA_SOURCE = sam-ba_cdc_linux.zip
SAM_BA_LICENSE = SAM-BA license (sam-ba executable), \
BSD-2-Clause like, BSD-4-Clause (TCL and applets code)
SAM_BA_LICENSE_FILES = doc/license.txt tcl_lib/boards.tcl \
diff --git a/package/samba4/0001-libreplace-disable-libbsd-support.patch b/package/samba4/0001-libreplace-disable-libbsd-support.patch
index 4794cb02fd..ae46c447fd 100644
--- a/package/samba4/0001-libreplace-disable-libbsd-support.patch
+++ b/package/samba4/0001-libreplace-disable-libbsd-support.patch
@@ -9,17 +9,17 @@ This causes redefinition conflicts for link(2) when both standard
unistd.h and bsd/unistd.h get included.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-(rebased for versions 4.7.3 & 4.8.0)
+[Bernd: rebased for versions 4.7.3, 4.8.0 & 4.8.5]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
- lib/replace/wscript | 12 ------------
- 1 file changed, 12 deletions(-)
+ lib/replace/wscript | 15 ---------------
+ 1 file changed, 15 deletions(-)
diff --git a/lib/replace/wscript b/lib/replace/wscript
-index 1dfd902..456be9b 100644
+index 6c7de5953f0..ac230d719f7 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
-@@ -296,21 +296,6 @@
+@@ -304,21 +304,6 @@ def configure(conf):
strlcpy_in_bsd = False
@@ -42,5 +42,5 @@ index 1dfd902..456be9b 100644
struct ucred cred;
socklen_t cred_len;
--
-2.7.3
+2.18.0
diff --git a/package/samba4/0004-Disable-build-of-manpages-and-documentation.patch b/package/samba4/0004-Disable-build-of-manpages-and-documentation.patch
index 41a06801c7..ad8712634e 100644
--- a/package/samba4/0004-Disable-build-of-manpages-and-documentation.patch
+++ b/package/samba4/0004-Disable-build-of-manpages-and-documentation.patch
@@ -19,12 +19,13 @@ the build of manpages and documentation.
Patch was downloaded from
https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/network/samba/patches/samba-950-no-man.patch
+[Bernd: rebased for samba-4.8.5]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
- buildtools/wafsamba/wafsamba.py | 10 +++++-----
- docs-xml/wscript_build | 34 +++++++++++++++++-----------------
+ buildtools/wafsamba/wafsamba.py | 10 ++++-----
+ docs-xml/wscript_build | 40 ++++++++++++++++-----------------
source4/scripting/wscript_build | 4 ++--
- 3 files changed, 24 insertions(+), 24 deletions(-)
+ 3 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 4bb19d070e2..a255d841111 100644
@@ -55,10 +56,10 @@ index 4bb19d070e2..a255d841111 100644
Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
-index 954c62a29bc..1169158fd57 100644
+index ec5d28fc62a..f81c125bcd4 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
-@@ -147,20 +147,20 @@ bld.SAMBA_GENERATOR(parameter_all,
+@@ -148,23 +148,23 @@ bld.SAMBA_GENERATOR(parameter_all,
rule=smbdotconf_generate_parameter_list,
dep_vars=bld.dynconfig_varnames())
@@ -77,6 +78,9 @@ index 954c62a29bc..1169158fd57 100644
- if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
- bld.SAMBAMANPAGES(krb5_locator_manpages)
-
+- if bld.CONFIG_SET('HAVE_KRB5_LOCALAUTH_PLUGIN_H'):
+- bld.SAMBAMANPAGES(krb5_localauth_manpages)
+-
- if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
- bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
+#def SMBDOTCONF_MANPAGE(bld, target):
@@ -94,6 +98,9 @@ index 954c62a29bc..1169158fd57 100644
+# if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
+# bld.SAMBAMANPAGES(krb5_locator_manpages)
+#
++# if bld.CONFIG_SET('HAVE_KRB5_LOCALAUTH_PLUGIN_H'):
++# bld.SAMBAMANPAGES(krb5_localauth_manpages)
++#
+# if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
+# bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build
@@ -112,5 +119,5 @@ index 2f53cce12b7..9841ae0a116 100644
if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
bld.INSTALL_FILES('${BINDIR}',
--
-2.14.4
+2.18.0
diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash
index 00c8466078..9594c7a932 100644
--- a/package/samba4/samba4.hash
+++ b/package/samba4/samba4.hash
@@ -1,4 +1,4 @@
# Locally calculated after checking pgp signature
-# https://download.samba.org/pub/samba/stable/samba-4.8.4.tar.asc
-sha256 f5044d149e01894a08b1d114b8b69aed78171a7bb19608bd1fd771453b9a5406 samba-4.8.4.tar.gz
+# https://download.samba.org/pub/samba/stable/samba-4.8.5.tar.asc
+sha256 e58ee6b1262d4128b8932ceee59d5f0b0a9bbe00547eb3cc4c41552de1a65155 samba-4.8.5.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk
index 03ef6eeeb0..2db7a81df3 100644
--- a/package/samba4/samba4.mk
+++ b/package/samba4/samba4.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SAMBA4_VERSION = 4.8.4
+SAMBA4_VERSION = 4.8.5
SAMBA4_SITE = https://download.samba.org/pub/samba/stable
SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
SAMBA4_INSTALL_STAGING = YES
diff --git a/package/shellinabox/0002-launcher.c-include-sys-ttydefaults.h.patch b/package/shellinabox/0002-launcher.c-include-sys-ttydefaults.h.patch
deleted file mode 100644
index caa5456609..0000000000
--- a/package/shellinabox/0002-launcher.c-include-sys-ttydefaults.h.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c8d9df500b1ca83ad6da9b6055549adaba6ee0d3 Mon Sep 17 00:00:00 2001
-From: Olivier Singla <olivier.singla@gmail.com>
-Date: Thu, 4 Aug 2016 22:05:08 +0200
-Subject: [PATCH] launcher.c: include <sys/ttydefaults.h>
-
-This include is needed to get the definition of TTYDEF_*.
-
-Signed-off-by: Olivier Singla <olivier.singla@gmail.com>
----
- shellinabox/launcher.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/shellinabox/launcher.c b/shellinabox/launcher.c
-index 2bac171..c8ba6cb 100644
---- a/shellinabox/launcher.c
-+++ b/shellinabox/launcher.c
-@@ -66,6 +66,7 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/utsname.h>
-+#include <sys/ttydefaults.h>
- #include <termios.h>
- #include <unistd.h>
-
---
-2.7.4
-
diff --git a/package/shellinabox/shellinabox.hash b/package/shellinabox/shellinabox.hash
index 4bc110385a..6e19207066 100644
--- a/package/shellinabox/shellinabox.hash
+++ b/package/shellinabox/shellinabox.hash
@@ -1,2 +1,4 @@
-# Locally calculated after checking pgp signature
-sha256 d25ba9f72f04471fc1a8a564c65ef466c4553280ff3eeb365ed9c897d05ed2da shellinabox-v2.19.tar.gz
+# Locally calculated
+sha256 27a5ec6c3439f87aee238c47cc56e7357a6249e5ca9ed0f044f0057ef389d81e shellinabox-v2.20.tar.gz
+sha256 04ef60ab9b83cde6f0862ea18474454477efb34c52ebce1f8d8260a398a39362 COPYING
+sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL-2
diff --git a/package/shellinabox/shellinabox.mk b/package/shellinabox/shellinabox.mk
index 1db62e609a..70db551e3c 100644
--- a/package/shellinabox/shellinabox.mk
+++ b/package/shellinabox/shellinabox.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SHELLINABOX_VERSION = v2.19
+SHELLINABOX_VERSION = v2.20
SHELLINABOX_SITE = $(call github,shellinabox,shellinabox,$(SHELLINABOX_VERSION))
SHELLINABOX_LICENSE = GPL-2.0 with OpenSSL exception
SHELLINABOX_LICENSE_FILES = COPYING GPL-2
@@ -23,7 +23,7 @@ SHELLINABOX_CONF_OPTS = \
# musl's implementation of utmpx is a dummy one, and some aspects of
# it cause build failures in shellinabox
ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
-SHELLINABOX_CONF_ENV += ac_cv_header_utmpx_h=no
+SHELLINABOX_CONF_OPTS += --disable-utmp
endif
$(eval $(autotools-package))
diff --git a/package/spi-tools/spi-tools.hash b/package/spi-tools/spi-tools.hash
index 25c73814ba..8fe2d3e6b3 100644
--- a/package/spi-tools/spi-tools.hash
+++ b/package/spi-tools/spi-tools.hash
@@ -1,2 +1,3 @@
# locally computed hash
-sha256 72a6c4a9d13011addc61bc3906543cd06f76f567270ae4b6ca4d0115fd6a9538 spi-tools-0.8.1.tar.gz
+sha256 1f29548187c5a57ca5902d260b01ca9ce04d93e4406ff77f317e1d6423ed3610 spi-tools-0.8.3.tar.gz
+sha256 a01259a1b522cf0de95824f9860613b453153eebac468e96196d5d7dba84786c LICENSE
diff --git a/package/spi-tools/spi-tools.mk b/package/spi-tools/spi-tools.mk
index e5f3774b53..d21e4d64dd 100644
--- a/package/spi-tools/spi-tools.mk
+++ b/package/spi-tools/spi-tools.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SPI_TOOLS_VERSION = 0.8.1
+SPI_TOOLS_VERSION = 0.8.3
SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION))
# autoreconf must be run as specified in package documentation
SPI_TOOLS_AUTORECONF = YES
diff --git a/package/squid/0001-assume-get-certificate-ok.patch b/package/squid/0001-assume-get-certificate-ok.patch
index e26b50d7bb..d3c075a59a 100644
--- a/package/squid/0001-assume-get-certificate-ok.patch
+++ b/package/squid/0001-assume-get-certificate-ok.patch
@@ -2,16 +2,20 @@ The openssl get_certificate working test isn't cross compile friendly.
Just assume it works ok since we're using a modern OpenSSL version.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+[Bernd: Rebased for 4.2]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
diff -Nura squid-3.5.1.orig/configure.ac squid-3.5.1/configure.ac
--- squid-3.5.1.orig/configure.ac 2015-01-27 11:09:15.035711981 -0300
+++ squid-3.5.1/configure.ac 2015-01-27 11:09:25.829084482 -0300
-@@ -1342,7 +1342,7 @@
- AC_DEFINE(USE_OPENSSL,1,[OpenSSL support is available])
+@@ -1377,10 +1377,6 @@
+ ])
+ SQUID_STATE_ROLLBACK(check_SSL_CTX_get0_certificate)
- # check for other specific broken implementations
-- SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS
-+ #SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS
+- # check for other specific broken implementations
+- if test "x$missing_SSL_CTX_get0_certificate" = "xyes"; then
+- SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS
+- fi
SQUID_CHECK_OPENSSL_CONST_SSL_METHOD
- SQUID_CHECK_OPENSSL_TXTDB
- SQUID_CHECK_OPENSSL_HELLO_OVERWRITE_HACK
+ SQUID_CHECK_OPENSSL_CONST_CRYPTO_EX_DATA
+ SQUID_CHECK_OPENSSL_CONST_SSL_SESSION_CB_ARG
diff --git a/package/squid/0003-ESI-make-sure-endofName-never-exceeds-tagEnd-130.patch b/package/squid/0003-ESI-make-sure-endofName-never-exceeds-tagEnd-130.patch
deleted file mode 100644
index 6e71677a19..0000000000
--- a/package/squid/0003-ESI-make-sure-endofName-never-exceeds-tagEnd-130.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From eb2db98a676321b814fc4a51c4fb7928a8bb45d9 Mon Sep 17 00:00:00 2001
-From: Amos Jeffries <yadij@users.noreply.github.com>
-Date: Fri, 19 Jan 2018 13:54:14 +1300
-Subject: [PATCH] ESI: make sure endofName never exceeds tagEnd (#130)
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- src/esi/CustomParser.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc
-index d86d2d309..db634d921 100644
---- a/src/esi/CustomParser.cc
-+++ b/src/esi/CustomParser.cc
-@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool
-
- char * endofName = strpbrk(const_cast<char *>(tag), w_space);
-
-- if (endofName > tagEnd)
-+ if (!endofName || endofName > tagEnd)
- endofName = const_cast<char *>(tagEnd);
-
- *endofName = '\0';
-@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool
-
- char * endofName = strpbrk(const_cast<char *>(tag), w_space);
-
-- if (endofName > tagEnd)
-+ if (!endofName || endofName > tagEnd)
- endofName = const_cast<char *>(tagEnd);
-
- *endofName = '\0';
---
-2.11.0
-
diff --git a/package/squid/0004-Fix-indirect-IP-logging-for-transactions-without-a-c.patch b/package/squid/0004-Fix-indirect-IP-logging-for-transactions-without-a-c.patch
deleted file mode 100644
index 51fff30034..0000000000
--- a/package/squid/0004-Fix-indirect-IP-logging-for-transactions-without-a-c.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8232b83d3fa47a1399f155cb829db829369fbae9 Mon Sep 17 00:00:00 2001
-From: squidadm <squidadm@users.noreply.github.com>
-Date: Sun, 21 Jan 2018 08:07:08 +1300
-Subject: [PATCH] Fix indirect IP logging for transactions without a client
- connection (#129) (#136)
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- src/client_side_request.cc | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/client_side_request.cc b/src/client_side_request.cc
-index be124f355..203f89d46 100644
---- a/src/client_side_request.cc
-+++ b/src/client_side_request.cc
-@@ -488,9 +488,9 @@ clientFollowXForwardedForCheck(allow_t answer, void *data)
- * Ensure that the access log shows the indirect client
- * instead of the direct client.
- */
-- ConnStateData *conn = http->getConn();
-- conn->log_addr = request->indirect_client_addr;
-- http->al->cache.caddr = conn->log_addr;
-+ http->al->cache.caddr = request->indirect_client_addr;
-+ if (ConnStateData *conn = http->getConn())
-+ conn->log_addr = request->indirect_client_addr;
- }
- request->x_forwarded_for_iterator.clean();
- request->flags.done_follow_x_forwarded_for = true;
---
-2.11.0
-
diff --git a/package/squid/Config.in b/package/squid/Config.in
index 141a5029d2..c1eb25c6b9 100644
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -8,6 +8,7 @@ config BR2_PACKAGE_SQUID
# needs fork()
depends on BR2_USE_MMU
select BR2_PACKAGE_LIBCAP
+ select BR2_PACKAGE_LIBXML2
help
Caching proxy for the Web supporting HTTP, HTTPS, FTP, and
more.
diff --git a/package/squid/squid.hash b/package/squid/squid.hash
index 8787cb25ef..47c7e1bb21 100644
--- a/package/squid/squid.hash
+++ b/package/squid/squid.hash
@@ -1,5 +1,6 @@
-# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.27.tar.xz.asc
-md5 39ef8199675d48a314b540f92c00c545 squid-3.5.27.tar.xz
-sha1 1e69c96d13cd49844da3bcf33a0b428fbe7b6f77 squid-3.5.27.tar.xz
+# From http://www.squid-cache.org/Versions/v4/squid-4.2.tar.xz.asc
+md5 2cf3f5f183d04322d798f98ea5ead43f squid-4.2.tar.xz
+sha1 77fd6f06e6028780faf85ba7e7e9aef0922e9dc0 squid-4.2.tar.xz
# Locally calculated
-sha256 58f5d05257af1fb964fde20e134d660fac9afa86b6fd8c70d63ead63068378fa COPYING
+sha256 994807762c59991b32449caf29418fd0ec9d2329746b18eb19bd930b6806d208 squid-4.2.tar.xz
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 2d21ad8858..6675cab790 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,15 +4,14 @@
#
################################################################################
-SQUID_VERSION_MAJOR = 3.5
-SQUID_VERSION = $(SQUID_VERSION_MAJOR).27
+SQUID_VERSION = 4.2
SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz
-SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR)
+SQUID_SITE = http://www.squid-cache.org/Versions/v4
SQUID_LICENSE = GPL-2.0+
SQUID_LICENSE_FILES = COPYING
# For 0001-assume-get-certificate-ok.patch
SQUID_AUTORECONF = YES
-SQUID_DEPENDENCIES = libcap host-libcap host-pkgconf \
+SQUID_DEPENDENCIES = libcap host-libcap libxml2 host-pkgconf \
$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
SQUID_CONF_ENV = \
ac_cv_epoll_works=yes \
@@ -21,6 +20,7 @@ SQUID_CONF_ENV = \
ac_cv_func___va_copy=yes \
ac_cv_func_strnstr=no \
ac_cv_have_squid=yes \
+ ac_cv_libxml2_include="-I$(STAGING_DIR)/usr/include/libxml2" \
BUILDCXX="$(HOSTCXX)" \
BUILDCXXFLAGS="$(HOST_CXXFLAGS)"
SQUID_CONF_OPTS = \
diff --git a/package/sunxi-mali-mainline-driver/Config.in b/package/sunxi-mali-mainline-driver/Config.in
index c939d2a957..057f20db66 100644
--- a/package/sunxi-mali-mainline-driver/Config.in
+++ b/package/sunxi-mali-mainline-driver/Config.in
@@ -14,7 +14,7 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER
Linux kernels (>= 4.4). Note that it should be installed
together with the corresponding userspace OpenGL libraries,
which are provided as binaries only at:
- https://github.com/free-electrons/mali-blobs
+ https://github.com/bootlin/mali-blobs
sunxi-mali-mainline-driver requires a Linux kernel >= 4.4
with the following options enabled:
diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash
new file mode 100644
index 0000000000..bcc794743d
--- /dev/null
+++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 9f479f8ac5e013e33568901b942baf6797464ea9b7f340ee38cd469b4fd2b038 sunxi-mali-mainline-driver-8e6b7d25b13089d53dbfc1ebd9e8737b0dc809cb.tar.gz
diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk
index 24817b07c7..f69765ebb2 100644
--- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk
+++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk
@@ -4,14 +4,13 @@
#
################################################################################
-SUNXI_MALI_MAINLINE_DRIVER_VERSION = 52ef1c5e133cc5fd791ca636239dc5e7b19c26d5
+SUNXI_MALI_MAINLINE_DRIVER_VERSION = 8e6b7d25b13089d53dbfc1ebd9e8737b0dc809cb
SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION))
SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux
SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS = \
- KDIR=$(LINUX_DIR) \
- CROSS_COMPILE=$(TARGET_CROSS) \
- INSTALL_MOD_PATH=$(TARGET_DIR)
+ $(LINUX_MAKE_FLAGS) \
+ KDIR=$(LINUX_DIR)
define SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES
ln -sf $(SUNXI_MALI_MAINLINE_REV)/series $(@D)/patches
diff --git a/package/sunxi-mali-mainline/Config.in b/package/sunxi-mali-mainline/Config.in
index 759bed86ba..a2fb95bd79 100644
--- a/package/sunxi-mali-mainline/Config.in
+++ b/package/sunxi-mali-mainline/Config.in
@@ -1,14 +1,13 @@
config BR2_PACKAGE_SUNXI_MALI_MAINLINE
bool "sunxi-mali-mainline"
- depends on BR2_arm
- depends on BR2_ARM_EABIHF
+ depends on BR2_aarch64 || (BR2_ARM_EABIHF && BR2_arm)
depends on BR2_TOOLCHAIN_USES_GLIBC
select BR2_PACKAGE_HAS_LIBEGL
select BR2_PACKAGE_HAS_LIBGLES
help
Install userspace Allwinner OpenGL libraries.
- https://github.com/free-electrons/mali-blobs
+ https://github.com/bootlin/mali-blobs
if BR2_PACKAGE_SUNXI_MALI_MAINLINE
@@ -26,12 +25,15 @@ choice
config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2
bool "r6p2"
+config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1
+ bool "r8p1"
endchoice
config BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION
string
default "r6p2" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2
+ default "r8p1" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1
endif
diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.hash b/package/sunxi-mali-mainline/sunxi-mali-mainline.hash
new file mode 100644
index 0000000000..978be01024
--- /dev/null
+++ b/package/sunxi-mali-mainline/sunxi-mali-mainline.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 72969ecf470b9e5ce787c2f8f36242926e1e892af0891924ee59a2cd206de39f sunxi-mali-mainline-d691cb93884ca8ac67860502117bbec283dc19aa.tar.gz
+sha256 8a06bcae44a41a886f339b4338422415a786787f113e9ed6456ae117104a0b6a EULA_for_Mali_400MP_AW.pdf
diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk
index 933e2beb0d..701a1fbbb4 100644
--- a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk
+++ b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk
@@ -4,20 +4,29 @@
#
################################################################################
-SUNXI_MALI_MAINLINE_VERSION = cb3e8ece9b2c3a70cbeb3204cd6f30eceaa32023
-SUNXI_MALI_MAINLINE_SITE = $(call github,free-electrons,mali-blobs,$(SUNXI_MALI_MAINLINE_VERSION))
+SUNXI_MALI_MAINLINE_VERSION = d691cb93884ca8ac67860502117bbec283dc19aa
+SUNXI_MALI_MAINLINE_SITE = $(call github,bootlin,mali-blobs,$(SUNXI_MALI_MAINLINE_VERSION))
SUNXI_MALI_MAINLINE_INSTALL_STAGING = YES
SUNXI_MALI_MAINLINE_PROVIDES = libegl libgles
+SUNXI_MALI_MAINLINE_LICENSE = Allwinner End User Licence Agreement
+SUNXI_MALI_MAINLINE_EULA_ORIGINAL = EULA\ for\ Mali\ 400MP\ _AW.pdf
+SUNXI_MALI_MAINLINE_EULA_NO_SPACES = EULA_for_Mali_400MP_AW.pdf
+SUNXI_MALI_MAINLINE_LICENSE_FILES = $(SUNXI_MALI_MAINLINE_EULA_NO_SPACES)
SUNXI_MALI_MAINLINE_REV = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION))
+ifeq ($(BR2_arm),y)
+SUNXI_MALI_MAINLINE_ARCH=arm
+else ifeq ($(BR2_aarch64),y)
+SUNXI_MALI_MAINLINE_ARCH=arm64
+endif
+
define SUNXI_MALI_MAINLINE_INSTALL_STAGING_CMDS
mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include
- cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/fbdev/lib/lib_fb_dev/* \
+ cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/$(SUNXI_MALI_MAINLINE_ARCH)/fbdev/*.so* \
$(STAGING_DIR)/usr/lib/
- cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/fbdev/include/* \
- $(STAGING_DIR)/usr/include/
+ cp -rf $(@D)/include/fbdev/* $(STAGING_DIR)/usr/include/
$(INSTALL) -D -m 0644 package/sunxi-mali-mainline/egl.pc \
$(STAGING_DIR)/usr/lib/pkgconfig/egl.pc
@@ -27,8 +36,14 @@ endef
define SUNXI_MALI_MAINLINE_INSTALL_TARGET_CMDS
mkdir -p $(TARGET_DIR)/usr/lib
- cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/fbdev/lib/lib_fb_dev/* \
+ cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/$(SUNXI_MALI_MAINLINE_ARCH)/fbdev/*.so* \
$(TARGET_DIR)/usr/lib/
endef
+define SUNXI_MALI_MAINLINE_FIXUP_LICENSE_FILE
+ mv $(@D)/$(SUNXI_MALI_MAINLINE_EULA_ORIGINAL) $(@D)/$(SUNXI_MALI_MAINLINE_EULA_NO_SPACES)
+endef
+
+SUNXI_MALI_MAINLINE_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_FIXUP_LICENSE_FILE
+
$(eval $(generic-package))
diff --git a/package/swig/Config.in.host b/package/swig/Config.in.host
new file mode 100644
index 0000000000..fd2049d30a
--- /dev/null
+++ b/package/swig/Config.in.host
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HOST_SWIG
+ bool "host swig"
+ help
+ swig is a software development tool that connects programs
+ written in C and C++ with a variety of high-level
+ programming languages.
+
+ http://www.swig.org/
diff --git a/package/sylpheed/sylpheed.hash b/package/sylpheed/sylpheed.hash
index 39c0927735..08a5d0a221 100644
--- a/package/sylpheed/sylpheed.hash
+++ b/package/sylpheed/sylpheed.hash
@@ -1,2 +1,4 @@
# Locally calculated after checking pgp signature
-sha256 4aeb7c6436ad485a2cc101dd68a1fb84abcad4c6471ed9ddefec65e482e5b2b1 sylpheed-3.2.0.tar.bz2
+sha256 0d6bc5eb46f5d0a463757c62bc80b00d219b294b3c3662840e4540f6db2e3e49 sylpheed-3.7.0.tar.xz
+sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING
+sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB
diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index 14107f0a6a..0453fba521 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -4,9 +4,9 @@
#
################################################################################
-SYLPHEED_VERSION_MAJOR = 3.2
+SYLPHEED_VERSION_MAJOR = 3.7
SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).0
-SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
+SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.xz
SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
SYLPHEED_LICENSE = GPL-2.0+ (executables), LGPL-2.1+ (library, attachment plugin)
SYLPHEED_LICENSE_FILES = COPYING COPYING.LIB
diff --git a/package/synergy/0001-allow-building-of-synergy-without-tests.patch b/package/synergy/0001-allow-building-of-synergy-without-tests.patch
deleted file mode 100644
index 0c550eec16..0000000000
--- a/package/synergy/0001-allow-building-of-synergy-without-tests.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From cb6b00947ea125c3246654bb3dd3986b64e974d4 Mon Sep 17 00:00:00 2001
-From: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
-Date: Mon, 27 Mar 2017 21:51:59 +0200
-Subject: [PATCH] allow building of synergy without tests
-
-Upstream status: https://github.com/symless/synergy/pull/5943
-
-Signed-off-by: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
----
- CMakeLists.txt | 2 ++
- src/CMakeLists.txt | 2 +-
- src/lib/synergy/KeyMap.h | 4 ++++
- src/test/unittests/synergy/KeyMapTests.cpp | 2 ++
- 4 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 94c474e..cceac45 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,6 +39,8 @@ endif()
- # First, declare project (important for prerequisite checks).
- project(synergy C CXX)
-
-+option(BUILD_TESTS "Override building of tests" ON)
-+
- # put binaries in a different dir to make them easier to find.
- set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
- set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 237ba48..96dadd2 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -50,6 +50,6 @@ add_subdirectory(lib)
- add_subdirectory(cmd)
- add_subdirectory(micro)
-
--if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
-+if (BUILD_TESTS AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
- add_subdirectory(test)
- endif()
-diff --git a/src/lib/synergy/KeyMap.h b/src/lib/synergy/KeyMap.h
-index de869e6..51e7e07 100644
---- a/src/lib/synergy/KeyMap.h
-+++ b/src/lib/synergy/KeyMap.h
-@@ -24,7 +24,9 @@
- #include "common/stdset.h"
- #include "common/stdvector.h"
-
-+#ifdef TEST_ENV
- #include "gtest/gtest_prod.h"
-+#endif
-
- namespace synergy {
-
-@@ -326,6 +328,7 @@ public:
-
- //@}
-
-+#ifdef TEST_ENV
- private:
- FRIEND_TEST(KeyMapTests,
- findBestKey_requiredDown_matchExactFirstItem);
-@@ -340,6 +343,7 @@ private:
- FRIEND_TEST(KeyMapTests,
- findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem);
- FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch);
-+#endif
-
- private:
- //! Ways to synthesize a key
-diff --git a/src/test/unittests/synergy/KeyMapTests.cpp b/src/test/unittests/synergy/KeyMapTests.cpp
-index 1a195af..fe2a5e4 100644
---- a/src/test/unittests/synergy/KeyMapTests.cpp
-+++ b/src/test/unittests/synergy/KeyMapTests.cpp
-@@ -15,6 +15,8 @@
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-+#define TEST_ENV
-+
- #include "synergy/KeyMap.h"
-
- #include "test/global/gtest.h"
---
-2.7.4
-
diff --git a/package/synergy/0002-do-not-change-output-path-when-building-in-debug.patch b/package/synergy/0002-do-not-change-output-path-when-building-in-debug.patch
deleted file mode 100644
index a261b6b10c..0000000000
--- a/package/synergy/0002-do-not-change-output-path-when-building-in-debug.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2868add1b7375ef4e2427edb85e27759c5ee226b Mon Sep 17 00:00:00 2001
-From: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
-Date: Fri, 31 Mar 2017 20:05:30 +0200
-Subject: [PATCH] do not change output path when building in debug
-
-Signed-off-by: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
----
- CMakeLists.txt | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 94c474e..1080e41 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -43,15 +43,6 @@ project(synergy C CXX)
- set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
- set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
-
--# for unix, put debug files in a separate bin "debug" dir.
--# release bin files should stay in the root of the bin dir.
--if (CMAKE_GENERATOR STREQUAL "Unix Makefiles")
-- if (CMAKE_BUILD_TYPE STREQUAL Debug)
-- set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin/debug)
-- set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib/debug)
-- endif()
--endif()
--
- # Set some easy to type variables.
- set(root_dir ${CMAKE_SOURCE_DIR})
- set(cmake_dir ${root_dir}/res)
---
-2.7.4
-
diff --git a/package/synergy/Config.in b/package/synergy/Config.in
index 3bb8b8e98c..6005363dcb 100644
--- a/package/synergy/Config.in
+++ b/package/synergy/Config.in
@@ -4,8 +4,6 @@ config BR2_PACKAGE_SYNERGY
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR
depends on BR2_USE_MMU # fork()
- select BR2_PACKAGE_LIBCURL
- select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXTST
help
diff --git a/package/synergy/synergy.hash b/package/synergy/synergy.hash
index 52f9d74d6b..664855fa33 100644
--- a/package/synergy/synergy.hash
+++ b/package/synergy/synergy.hash
@@ -1,2 +1,3 @@
# Locally computed:
-sha256 85c388f93881d741981ce3c675e840a52a76883cb2cea1da306c0c453c5d7d9b synergy-v1.8.8-stable.tar.gz
+sha256 06d1cb1d43251b0b624212652e9c0ab2657d124ac4f7e7d0c7f3e448c953c2a8 synergy-v2.0.12-beta.tar.gz
+sha256 4921009cd76e7d38a8e873c362b25dbaf032c320bbb36a40dec775ddbdcbe1d8 LICENSE
diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk
index 76a4004f06..d357415689 100644
--- a/package/synergy/synergy.mk
+++ b/package/synergy/synergy.mk
@@ -4,11 +4,11 @@
#
################################################################################
-SYNERGY_VERSION = v1.8.8-stable
+SYNERGY_VERSION = v2.0.12-beta
SYNERGY_SITE = $(call github,symless,synergy,$(SYNERGY_VERSION))
SYNERGY_LICENSE = GPL-2.0
SYNERGY_LICENSE_FILES = LICENSE
-SYNERGY_DEPENDENCIES = libcurl openssl xlib_libX11 xlib_libXtst
+SYNERGY_DEPENDENCIES = xlib_libX11 xlib_libXtst
ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT),y)
SYNERGY_DEPENDENCIES += xlib_libXext
diff --git a/package/sysdig/Config.in b/package/sysdig/Config.in
index 6ccb706a5a..672c44d211 100644
--- a/package/sysdig/Config.in
+++ b/package/sysdig/Config.in
@@ -4,7 +4,9 @@ config BR2_PACKAGE_SYSDIG
depends on BR2_INSTALL_LIBSTDCPP # libjson
depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
- depends on !BR2_STATIC_LIBS # luajit
+ depends on !BR2_STATIC_LIBS # luajit, elfutils
+ depends on BR2_USE_WCHAR # elfutils
+ depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_LUAJIT
select BR2_PACKAGE_JSONCPP
@@ -13,6 +15,7 @@ config BR2_PACKAGE_SYSDIG
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_JQ
select BR2_PACKAGE_LIBB64
+ select BR2_PACKAGE_ELFUTILS
help
Sysdig is open source, system-level exploration:
capture system state and activity from a running Linux
@@ -22,7 +25,8 @@ config BR2_PACKAGE_SYSDIG
http://sysdig.org
-comment "sysdig needs a toolchain w/ C++, gcc >= 4.8, dynamic library and a Linux kernel to be built"
+comment "sysdig needs a glibc or uclibc toolchain w/ C++, gcc >= 4.8, dynamic library and a Linux kernel to be built"
depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \
- || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS
+ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS \
+ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
diff --git a/package/sysdig/sysdig.hash b/package/sysdig/sysdig.hash
index 63a9e385d8..565b1e9828 100644
--- a/package/sysdig/sysdig.hash
+++ b/package/sysdig/sysdig.hash
@@ -1,2 +1,3 @@
-# locally computed
-sha256 480d5d8fd7e7373c08008c30bd8e2c7595d5c45d710bf07bd15a522021b560f6 sysdig-0.19.1.tar.gz
+# sha256 locally computed
+sha256 57d5b713b875eba35546a1408bf3f20c2703904a17d956be115ee55272db4cfa sysdig-0.23.1.tar.gz
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/package/sysdig/sysdig.mk b/package/sysdig/sysdig.mk
index a9c9f21bb5..9ac990e3e2 100644
--- a/package/sysdig/sysdig.mk
+++ b/package/sysdig/sysdig.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SYSDIG_VERSION = 0.19.1
+SYSDIG_VERSION = 0.23.1
SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION))
SYSDIG_LICENSE = GPL-2.0
SYSDIG_LICENSE_FILES = COPYING
@@ -12,7 +12,7 @@ SYSDIG_CONF_OPTS = -DUSE_BUNDLED_LUAJIT=OFF -DUSE_BUNDLED_ZLIB=OFF \
-DUSE_BUNDLED_JSONCPP=OFF -DENABLE_DKMS=OFF -DUSE_BUNDLED_CURL=OFF \
-DUSE_BUNDLED_NCURSES=OFF -DUSE_BUNDLED_OPENSSL=OFF \
-DUSE_BUNDLED_JQ=OFF -DUSE_BUNDLED_B64=OFF
-SYSDIG_DEPENDENCIES = zlib luajit jsoncpp libcurl ncurses openssl jq libb64
+SYSDIG_DEPENDENCIES = zlib luajit jsoncpp libcurl ncurses openssl jq libb64 elfutils
SYSDIG_SUPPORTS_IN_SOURCE_BUILD = NO
# sysdig creates the module Makefile from a template, which contains a
diff --git a/package/systemd/0003-build-sys-Detect-whether-struct-statx-is-defined-in-.patch b/package/systemd/0003-build-sys-Detect-whether-struct-statx-is-defined-in-.patch
new file mode 100644
index 0000000000..d849659c77
--- /dev/null
+++ b/package/systemd/0003-build-sys-Detect-whether-struct-statx-is-defined-in-.patch
@@ -0,0 +1,111 @@
+From ebe5606eadb1241796ba9747d8e357bd6b3e912e Mon Sep 17 00:00:00 2001
+From: Filipe Brandenburger <filbranden@google.com>
+Date: Sun, 15 Jul 2018 22:43:35 -0700
+Subject: [PATCH] build-sys: Detect whether struct statx is defined in
+ sys/stat.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Starting with glibc 2.27.9000-36.fc29, include file sys/stat.h will have a
+definition for struct statx, in which case include file linux/stat.h should be
+avoided, in order to prevent a duplicate definition.
+
+ In file included from ../src/basic/missing.h:18,
+ from ../src/basic/util.h:28,
+ from ../src/basic/hashmap.h:10,
+ from ../src/shared/bus-util.h:12,
+ from ../src/libsystemd/sd-bus/bus-creds.c:11:
+ /usr/include/linux/stat.h:99:8: error: redefinition of ‘struct statx’
+ struct statx {
+ ^~~~~
+ In file included from /usr/include/sys/stat.h:446,
+ from ../src/basic/util.h:19,
+ from ../src/basic/hashmap.h:10,
+ from ../src/shared/bus-util.h:12,
+ from ../src/libsystemd/sd-bus/bus-creds.c:11:
+ /usr/include/bits/statx.h:36:8: note: originally defined here
+ struct statx
+ ^~~~~
+
+Extend our meson.build to look for struct statx when only sys/stat.h is
+included and, in that case, do not include linux/stat.h anymore.
+
+Tested that systemd builds correctly when using a glibc version that includes a
+definition for struct statx.
+
+glibc Fedora RPM update:
+https://src.fedoraproject.org/rpms/glibc/c/28cb5d31fc1e5887912283c889689c47076278ae
+
+glibc upstream commit:
+https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=fd70af45528d59a00eb3190ef6706cb299488fcd
+
+(cherry picked from commit 75720bff62a84896e9a0654afc7cf9408cf89a38)
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ meson.build | 5 +++++
+ src/basic/missing.h | 5 ++++-
+ src/basic/xattr-util.c | 1 -
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 04331dd41..a0e724070 100644
+--- a/meson.build
++++ b/meson.build
+@@ -425,6 +425,7 @@ decl_headers = '''
+ #include <sys/stat.h>
+ '''
+ # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail
++# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time
+
+ foreach decl : ['char16_t',
+ 'char32_t',
+@@ -439,6 +440,10 @@ foreach decl : ['char16_t',
+ conf.set10('HAVE_' + decl.underscorify().to_upper(), have)
+ endforeach
+
++conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : '''
++#include <sys/stat.h>
++''', args : '-D_GNU_SOURCE') > 0)
++
+ foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'],
+ ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'],
+ ['IFLA_VRF_TABLE', 'linux/if_link.h'],
+diff --git a/src/basic/missing.h b/src/basic/missing.h
+index 71a07d057..14ad3d491 100644
+--- a/src/basic/missing.h
++++ b/src/basic/missing.h
+@@ -15,7 +15,6 @@
+ #include <linux/neighbour.h>
+ #include <linux/oom.h>
+ #include <linux/rtnetlink.h>
+-#include <linux/stat.h>
+ #include <net/ethernet.h>
+ #include <stdlib.h>
+ #include <sys/resource.h>
+@@ -25,6 +24,10 @@
+ #include <uchar.h>
+ #include <unistd.h>
+
++#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H
++#include <linux/stat.h>
++#endif
++
+ #if HAVE_AUDIT
+ #include <libaudit.h>
+ #endif
+diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
+index c5c55ea84..0ee097983 100644
+--- a/src/basic/xattr-util.c
++++ b/src/basic/xattr-util.c
+@@ -2,7 +2,6 @@
+
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <linux/stat.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+--
+2.14.4
+
diff --git a/package/systemd/0004-meson-unify-linux-stat.h-check-with-other-checks-and.patch b/package/systemd/0004-meson-unify-linux-stat.h-check-with-other-checks-and.patch
new file mode 100644
index 0000000000..70c35c66e2
--- /dev/null
+++ b/package/systemd/0004-meson-unify-linux-stat.h-check-with-other-checks-and.patch
@@ -0,0 +1,77 @@
+From 17bd864a04a0583cfb343c5621b591bdd76d79ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Wed, 18 Jul 2018 17:26:17 +0200
+Subject: [PATCH] meson: unify linux/stat.h check with other checks and use
+ _GNU_SOURCE
+
+Using _GNU_SOURCE is better because that's how we include the headers in the
+actual build, and some headers define different stuff when it is defined.
+sys/stat.h for example defines 'struct statx' conditionally.
+
+(cherry picked from commit 9c869d08d82c73f62ab3527567858ce4b0cf1257)
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ meson.build | 20 ++++++++++++++------
+ src/basic/missing.h | 2 +-
+ 2 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index a0e724070..5dcabdc6c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -421,11 +421,9 @@ decl_headers = '''
+ #include <uchar.h>
+ #include <linux/ethtool.h>
+ #include <linux/fib_rules.h>
+-#include <linux/stat.h>
+ #include <sys/stat.h>
+ '''
+ # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail
+-# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time
+
+ foreach decl : ['char16_t',
+ 'char32_t',
+@@ -436,13 +434,23 @@ foreach decl : ['char16_t',
+ ]
+
+ # We get -1 if the size cannot be determined
+- have = cc.sizeof(decl, prefix : decl_headers) > 0
++ have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0
++
++ if decl == 'struct statx'
++ if have
++ want_linux_stat_h = false
++ else
++ have = cc.sizeof(decl,
++ prefix : decl_headers + '#include <linux/stat.h>',
++ args : '-D_GNU_SOURCE') > 0
++ want_linux_stat_h = have
++ endif
++ endif
++
+ conf.set10('HAVE_' + decl.underscorify().to_upper(), have)
+ endforeach
+
+-conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : '''
+-#include <sys/stat.h>
+-''', args : '-D_GNU_SOURCE') > 0)
++conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h)
+
+ foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'],
+ ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'],
+diff --git a/src/basic/missing.h b/src/basic/missing.h
+index 14ad3d491..9044683b1 100644
+--- a/src/basic/missing.h
++++ b/src/basic/missing.h
+@@ -24,7 +24,7 @@
+ #include <uchar.h>
+ #include <unistd.h>
+
+-#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H
++#if WANT_LINUX_STAT_H
+ #include <linux/stat.h>
+ #endif
+
+--
+2.14.4
+
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 1cc0021b87..c858d89c05 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS
BR2_mipsel || BR2_powerpc || BR2_powerpc64 || \
BR2_powerpc64le || BR2_sh4 || BR2_sh4eb || \
BR2_sh4a || BR2_sh4aeb || BR2_sparc || BR2_x86_64 || \
- BR2_aarch64 || BR2_m68k
+ BR2_aarch64 || BR2_m68k || BR2_arc
menuconfig BR2_PACKAGE_SYSTEMD
bool "systemd"
diff --git a/package/tini/Config.in b/package/tini/Config.in
new file mode 100644
index 0000000000..719e1e1f22
--- /dev/null
+++ b/package/tini/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_TINI
+ bool "tini"
+ depends on BR2_USE_MMU # fork()
+ help
+ tini is a simple but valid init binary to
+ act as PID 1 for containers.
+
+ https://github.com/krallin/tini
+
+if BR2_PACKAGE_TINI
+
+config BR2_PACKAGE_TINI_MINIMAL
+ bool "build minimal variant"
+ help
+ Disables argument parsing and verbose output.
+
+endif
diff --git a/package/tini/tini.hash b/package/tini/tini.hash
new file mode 100644
index 0000000000..34f919f068
--- /dev/null
+++ b/package/tini/tini.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 e5f46bca81266bdd511cf08018d66866870531794569c04f9b45f50dd23c28b0 LICENSE
+sha256 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2 tini-v0.18.0.tar.gz
diff --git a/package/tini/tini.mk b/package/tini/tini.mk
new file mode 100644
index 0000000000..132bfc99dd
--- /dev/null
+++ b/package/tini/tini.mk
@@ -0,0 +1,35 @@
+################################################################################
+#
+# tini
+#
+################################################################################
+
+TINI_VERSION = v0.18.0
+TINI_SITE = $(call github,krallin,tini,$(TINI_VERSION))
+TINI_LICENSE = MIT
+TINI_LICENSE_FILES = LICENSE
+
+TINI_CFLAGS = $(TARGET_CFLAGS) \
+ -DTINI_VERSION=\"$(TINI_VERSION)\" \
+ -DTINI_GIT=\"\"
+
+ifeq ($(BR2_PACKAGE_TINI_MINIMAL),y)
+TINI_CFLAGS += -DTINI_MINIMAL
+endif
+
+define TINI_CONFIGURE_CMDS
+ printf "#pragma once\n" > $(@D)/src/tiniConfig.h
+endef
+
+define TINI_BUILD_CMDS
+ mkdir -p $(@D)/bin
+ $(TARGET_CC) $(TINI_CFLAGS) \
+ -o $(@D)/bin/tini $(@D)/src/tini.c
+endef
+
+define TINI_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/bin/tini $(TARGET_DIR)/usr/bin/tini
+endef
+
+# Tini's CMakeLists.txt is not suitable for Buildroot.
+$(eval $(generic-package))
diff --git a/package/trousers/0002-Check-if-the-compiler-understands-pie-and-relro-options.patch b/package/trousers/0001-Check-if-the-compiler-understands-pie-and-relro-options.patch
index 3275b76a2c..b1179eb4aa 100644
--- a/package/trousers/0002-Check-if-the-compiler-understands-pie-and-relro-options.patch
+++ b/package/trousers/0001-Check-if-the-compiler-understands-pie-and-relro-options.patch
@@ -8,8 +8,10 @@ executables, and -Wl,-z,relro turns on read-only relocation support in gcc.
Add checks to ensure that the compiler and linker understand these options.
Signed-off-by: Lada Trimasova <ltrimas@synopsys.com>
+[Bernd: Rebased for version 0.3.14]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
- configure.in | 5 +++
+ configure.ac | 5 +++
m4/ax_check_compile_flag.m4 | 72 ++++++++++++++++++++++++++++++++++++
m4/ax_check_link_flag.m4 | 71 +++++++++++++++++++++++++++++++++++
src/tcsd/Makefile.am | 4 +-
@@ -19,12 +21,12 @@ Signed-off-by: Lada Trimasova <ltrimas@synopsys.com>
diff --git a/configure.in b/configure.in
index add23dc..9603353 100644
---- a/configure.in
-+++ b/configure.in
+--- a/configure.ac
++++ b/configure.ac
@@ -12,6 +12,7 @@ TSS_VER_MINOR=3
# compute $target
AC_CANONICAL_TARGET
- AM_INIT_AUTOMAKE([foreign 1.6])
+ AM_INIT_AUTOMAKE([foreign subdir-objects 1.6])
+AC_CONFIG_MACRO_DIR([m4])
# Debugging support
@@ -205,11 +207,8 @@ index 2210734..6640ab2 100644
-tcsd_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -I${top_srcdir}/src/include -fPIE -DPIE
+tcsd_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -I${top_srcdir}/src/include $(PIE_CFLAGS)
tcsd_LDADD=${top_builddir}/src/tcs/libtcs.a ${top_builddir}/src/tddl/libtddl.a -lpthread @CRYPTOLIB@
--tcsd_LDFLAGS=-pie -Wl,-z,relro -Wl,-z,now
+-tcsd_LDFLAGS=@TCSD_LDFLAGS@
+tcsd_LDFLAGS=$(PIE_LDFLAGS) $(RELRO_LDFLAGS)
-
tcsd_SOURCES=svrside.c tcsd_conf.c tcsd_threads.c platform.c
---
-2.5.0
-
+ if TSS_BUILD_PS
diff --git a/package/trousers/0001-Remove-inline-for-read_data-and-write_data.patch b/package/trousers/0001-Remove-inline-for-read_data-and-write_data.patch
deleted file mode 100644
index b0db70b49b..0000000000
--- a/package/trousers/0001-Remove-inline-for-read_data-and-write_data.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From f03c7987c234a81f7e4274b26bab07318357a2a5 Mon Sep 17 00:00:00 2001
-From: Sergio Prado <sergio.prado@e-labworks.com>
-Date: Fri, 25 Dec 2015 20:09:21 -0200
-Subject: [PATCH] Remove inline for read_data and write_data
-
-read_data and write_data functions are declared with inline, but
-their definition is not in a .h file. This is causing errors when
-linking:
-
-tcsps.c:(.text+0x4ac): undefined reference to `read_data'
-tcsps.c:(.text+0x1888): undefined reference to `write_data'
-...
-
-Partial backport of upstream commit
-3297fcdf5ac0df868778e976b8b59e35542c1ee2.
-
-Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
----
- src/include/tcsps.h | 5 -----
- src/tcs/ps/ps_utils.c | 8 --------
- src/tspi/ps/ps_utils.c | 4 ++--
- 3 files changed, 2 insertions(+), 15 deletions(-)
-
-diff --git a/src/include/tcsps.h b/src/include/tcsps.h
-index 87542965877d..dcd5db469822 100644
---- a/src/include/tcsps.h
-+++ b/src/include/tcsps.h
-@@ -23,13 +23,8 @@ int get_file();
- int put_file(int);
- void close_file(int);
- void ps_destroy();
--#ifdef SOLARIS
- TSS_RESULT read_data(int, void *, UINT32);
- TSS_RESULT write_data(int, void *, UINT32);
--#else
--inline TSS_RESULT read_data(int, void *, UINT32);
--inline TSS_RESULT write_data(int, void *, UINT32);
--#endif
- int write_key_init(int, UINT32, UINT32, UINT32);
- TSS_RESULT cache_key(UINT32, UINT16, TSS_UUID *, TSS_UUID *, UINT16, UINT32, UINT32);
- TSS_RESULT UnloadBlob_KEY_PS(UINT16 *, BYTE *, TSS_KEY *);
-diff --git a/src/tcs/ps/ps_utils.c b/src/tcs/ps/ps_utils.c
-index 2e7f502b9599..35ac89f8fc12 100644
---- a/src/tcs/ps/ps_utils.c
-+++ b/src/tcs/ps/ps_utils.c
-@@ -42,11 +42,7 @@
- struct key_disk_cache *key_disk_cache_head = NULL;
-
-
--#ifdef SOLARIS
- TSS_RESULT
--#else
--inline TSS_RESULT
--#endif
- read_data(int fd, void *data, UINT32 size)
- {
- int rc;
-@@ -64,11 +60,7 @@ read_data(int fd, void *data, UINT32 size)
- }
-
-
--#ifdef SOLARIS
- TSS_RESULT
--#else
--inline TSS_RESULT
--#endif
- write_data(int fd, void *data, UINT32 size)
- {
- int rc;
-diff --git a/src/tspi/ps/ps_utils.c b/src/tspi/ps/ps_utils.c
-index aac40a147314..83259141d375 100644
---- a/src/tspi/ps/ps_utils.c
-+++ b/src/tspi/ps/ps_utils.c
-@@ -22,7 +22,7 @@
- #include "tspps.h"
- #include "tsplog.h"
-
--inline TSS_RESULT
-+TSS_RESULT
- read_data(int fd, void *data, UINT32 size)
- {
- int rc;
-@@ -39,7 +39,7 @@ read_data(int fd, void *data, UINT32 size)
- return TSS_SUCCESS;
- }
-
--inline TSS_RESULT
-+TSS_RESULT
- write_data(int fd, void *data, UINT32 size)
- {
- int rc;
---
-1.9.1
-
diff --git a/package/trousers/0004-Check-that-getpwent_r-is-available-before-using-it.patch b/package/trousers/0002-Check-that-getpwent_r-is-available-before-using-it.patch
index 7014ad7afb..ab2418c7c5 100644
--- a/package/trousers/0004-Check-that-getpwent_r-is-available-before-using-it.patch
+++ b/package/trousers/0002-Check-that-getpwent_r-is-available-before-using-it.patch
@@ -6,15 +6,17 @@ Subject: [PATCH] Check that getpwent_r is available before using it
This fixes building trousers with musl
Signed-off-by: Noé Rubinstein <nrubinstein@aldebaran.com>
+[Bernd: Rebased for version 0.3.14]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
- configure.in | 4 ++++
+ configure.ac | 4 ++++
src/tspi/ps/tspps.c | 10 +++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/configure.in b/configure.in
index fd3f5f1..e3d7acf 100644
---- a/configure.in
-+++ b/configure.in
+--- a/configure.ac
++++ b/configure.ac
@@ -145,6 +145,10 @@ else
AC_MSG_ERROR(["gtk", "openssl" and "none" are the only supported gui options for trousers])
fi
diff --git a/package/trousers/0003-tsp_tcsi_param-include-limits.h-to-fix-musl-build.patch b/package/trousers/0003-tsp_tcsi_param-include-limits.h-to-fix-musl-build.patch
deleted file mode 100644
index f88e47ac27..0000000000
--- a/package/trousers/0003-tsp_tcsi_param-include-limits.h-to-fix-musl-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 66bbe0a87818a1e3c721780dc33b2d81fdf4a774 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Sun, 21 Aug 2016 23:32:10 +0200
-Subject: [PATCH] tsp_tcsi_param: include limits.h to fix musl build
-
-The musl libc doesn't provide <bits/local_lim.h>, use <limits.h>
-instead.
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- src/tspi/tsp_tcsi_param.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tspi/tsp_tcsi_param.c b/src/tspi/tsp_tcsi_param.c
-index 670f86f..8f2b4e4 100644
---- a/src/tspi/tsp_tcsi_param.c
-+++ b/src/tspi/tsp_tcsi_param.c
-@@ -11,7 +11,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
--#include <bits/local_lim.h>
-+#include <limits.h>
- #include "trousers/tss.h"
- #include "trousers/trousers.h"
- #include "trousers_types.h"
---
-2.5.5
-
diff --git a/package/trousers/trousers.hash b/package/trousers/trousers.hash
index 997cfa97c1..20c65c450e 100644
--- a/package/trousers/trousers.hash
+++ b/package/trousers/trousers.hash
@@ -1,3 +1,6 @@
-# http://sourceforge.net/projects/trousers/files/trousers/0.3.13/
-sha1 d23f1a3df4febffc4174f5cca7d1c54230477bb2 trousers-0.3.13.tar.gz
-md5 ad508f97b406f6e48cd90e85d78e7ca8 trousers-0.3.13.tar.gz
+# http://sourceforge.net/projects/trousers/files/trousers/0.3.14/
+sha1 9ca2cc9e1179465f6c5d9055e2b855e25031b85a trousers-0.3.14.tar.gz
+md5 4a476b4f036dd20a764fb54fc24edbec trousers-0.3.14.tar.gz
+# Locally computed
+sha256 ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47 trousers-0.3.14.tar.gz
+sha256 1ad596d12e7471549663c03e280b5b5d084a2e853fb86e4d766109818f9d7dae LICENSE
diff --git a/package/trousers/trousers.mk b/package/trousers/trousers.mk
index e49c2ac141..1d5364959c 100644
--- a/package/trousers/trousers.mk
+++ b/package/trousers/trousers.mk
@@ -4,7 +4,7 @@
#
################################################################################
-TROUSERS_VERSION = 0.3.13
+TROUSERS_VERSION = 0.3.14
TROUSERS_SITE = http://downloads.sourceforge.net/project/trousers/trousers/$(TROUSERS_VERSION)
TROUSERS_LICENSE = BSD-3-Clause
TROUSERS_LICENSE_FILES = LICENSE
diff --git a/package/tslib/tslib.hash b/package/tslib/tslib.hash
index 76cd79516b..c5fc836d64 100644
--- a/package/tslib/tslib.hash
+++ b/package/tslib/tslib.hash
@@ -1,5 +1,5 @@
-# https://github.com/kergoth/tslib/releases/download/1.16/tslib-1.16.tar.xz.sha256
-sha256 c9a54651337a701a66b074c603c313225579995a7910e519bbc7b1dcdab9a755 tslib-1.16.tar.xz
+# https://github.com/kergoth/tslib/releases/download/1.17/tslib-1.17.tar.xz.sha256
+sha256 9fdd33e66976bf9cc799be33824ba66672f892826e9b22de12b14df15cb0fddc tslib-1.17.tar.xz
# Locally computed
sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 COPYING
diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
index 0d8b31863b..bd5311b93b 100644
--- a/package/tslib/tslib.mk
+++ b/package/tslib/tslib.mk
@@ -4,7 +4,7 @@
#
################################################################################
-TSLIB_VERSION = 1.16
+TSLIB_VERSION = 1.17
TSLIB_SITE = https://github.com/kergoth/tslib/releases/download/$(TSLIB_VERSION)
TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz
TSLIB_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
diff --git a/package/ustream-ssl/ustream-ssl.hash b/package/ustream-ssl/ustream-ssl.hash
new file mode 100644
index 0000000000..ba315f88dc
--- /dev/null
+++ b/package/ustream-ssl/ustream-ssl.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 63ecc9d78ef83020a4539a89c8a3690657e7bbe7580ae02cc0e7b4267ffea5cd ustream-ssl-23a3f2830341acd1db149175baf7315a33bd0edb.tar.gz
+sha256 90dd1590cf400a548438e2575e1ff46d8fb8cebae7d09f544aae7e059e30b6c5 ustream-ssl.h
diff --git a/package/ustream-ssl/ustream-ssl.mk b/package/ustream-ssl/ustream-ssl.mk
index 9b10788293..7804eb5d38 100644
--- a/package/ustream-ssl/ustream-ssl.mk
+++ b/package/ustream-ssl/ustream-ssl.mk
@@ -4,7 +4,7 @@
#
################################################################################
-USTREAM_SSL_VERSION = 45ac93088bc6f2d8ef3b0512d8e1ddfd9c4ee9e5
+USTREAM_SSL_VERSION = 23a3f2830341acd1db149175baf7315a33bd0edb
USTREAM_SSL_SITE = git://git.openwrt.org/project/ustream-ssl.git
USTREAM_SSL_LICENSE = ISC
USTREAM_SSL_LICENSE_FILES = ustream-ssl.h
diff --git a/package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch b/package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch
index 4caa170b02..784ffa35f6 100644
--- a/package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch
+++ b/package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch
@@ -1,4 +1,4 @@
-From 0b701c37d8a409904ea80fb6b74f096d1f28cc84 Mon Sep 17 00:00:00 2001
+From 7c2b3343a30ee53a1cded2ca5e712d8cd7d50f5f Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Tue, 1 May 2018 22:27:21 +0200
Subject: [PATCH] Disable building of statically linked vlc binary
@@ -10,10 +10,10 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index febdc63fe4..dca6354ec9 100644
+index 3ac82623ad..637504a3f5 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -933,7 +933,7 @@ libvlc: libvlccore
+@@ -108,7 +108,7 @@ libvlc: libvlccore
cd lib && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
core: libvlc vlc$(EXEEXT)
@@ -23,18 +23,18 @@ index febdc63fe4..dca6354ec9 100644
doc:
cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
diff --git a/bin/Makefile.am b/bin/Makefile.am
-index 869ac561dc..5e48b70d0a 100644
+index 2877e8b0ea..bef4160e8b 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
-@@ -1,7 +1,7 @@
- # Building vlc
- #
+@@ -6,7 +6,7 @@ bin_PROGRAMS = vlc-osx
+ noinst_PROGRAMS = vlc-osx-static
+ else
bin_PROGRAMS = vlc
-noinst_PROGRAMS = vlc-static
+noinst_PROGRAMS =
- noinst_DATA =
- vlclib_PROGRAMS = vlc-cache-gen
- EXTRA_PROGRAMS = vlc-wrapper
+ endif
+ endif
+ EXTRA_DIST = vlc_win32_rc.rc.in
--
-2.14.3
+2.14.4
diff --git a/package/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch b/package/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch
deleted file mode 100644
index c1cb2fa10e..0000000000
--- a/package/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c0fb6c7662d7b514f20cbb92ab0b2e535cd3bb49 Mon Sep 17 00:00:00 2001
-From: Samuel Martin <s.martin49@gmail.com>
-Date: Sat, 8 Feb 2014 14:33:27 +0100
-Subject: [PATCH] configure.ac: add check for libgcrypt-config program
-
-This allows to override the default libgcrypt-config location (which is
-useful when cross-compiling), instead of using the one from the host
-system.
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-[yann.morin.1998@free.fr: adapt from 2.1.6 to 2.2.0; fix quoting in
- AC_PATH_PROG]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- configure.ac | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b49281cd77..b3841ea77b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4056,16 +4056,17 @@ dnl
- AC_ARG_ENABLE(libgcrypt,
- [ --disable-libgcrypt gcrypt support (default enabled)])
- AS_IF([test "${enable_libgcrypt}" != "no"], [
-+ AC_PATH_PROG([GCRYPT_CONFIG],[libgcrypt-config],[libgcrypt-config])
- AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [
-- libgcrypt-config --version >/dev/null || \
-+ ${GCRYPT_CONFIG} --version >/dev/null || \
- AC_MSG_ERROR([gcrypt.h present but libgcrypt-config could not be found])
- AC_CHECK_LIB(gcrypt, gcry_control, [
- have_libgcrypt="yes"
-- GCRYPT_CFLAGS="`libgcrypt-config --cflags`"
-- GCRYPT_LIBS="`libgcrypt-config --libs`"
-+ GCRYPT_CFLAGS="`${GCRYPT_CONFIG} --cflags`"
-+ GCRYPT_LIBS="`${GCRYPT_CONFIG} --libs`"
- ], [
- AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or pass --disable-libgcrypt.])
-- ], [`libgcrypt-config --libs`])
-+ ], [`${GCRYPT_CONFIG} --libs`])
- ], [
- AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or pass --disable-libgcrypt.])
- ], [#include <gcrypt.h>]
---
-2.14.3
-
diff --git a/package/vlc/0002-lua-Define-LUA_COMPAT_APIINTCASTS-for-Lua-5.3.0-comp.patch b/package/vlc/0002-lua-Define-LUA_COMPAT_APIINTCASTS-for-Lua-5.3.0-comp.patch
new file mode 100644
index 0000000000..11eaaf3b20
--- /dev/null
+++ b/package/vlc/0002-lua-Define-LUA_COMPAT_APIINTCASTS-for-Lua-5.3.0-comp.patch
@@ -0,0 +1,41 @@
+From 00135e21bec84a2fe5920d02fa0982ceb9f89a35 Mon Sep 17 00:00:00 2001
+From: Vinson Lee <vlee@freedesktop.org>
+Date: Thu, 5 Feb 2015 14:48:53 -0800
+Subject: [PATCH] lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0
+ compatibility.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In Lua 5.3.0, luaL_checkint was deprecated.
+
+This patch fixes this build error with Lua 5.3.0.
+
+lua/demux.c: In function ‘vlclua_demux_peek’:
+lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration]
+ int n = luaL_checkint( L, 1 );
+ ^
+
+Signed-off-by: Vinson Lee <vlee@freedesktop.org>
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+[Backport upstream commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ modules/lua/vlc.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
+index 71f381d334..b46b5f67a1 100644
+--- a/modules/lua/vlc.h
++++ b/modules/lua/vlc.h
+@@ -38,6 +38,7 @@
+ #include <vlc_stream.h>
+ #include <vlc_demux.h>
+
++#define LUA_COMPAT_APIINTCASTS
+ #define LUA_COMPAT_MODULE
+ #include <lua.h> /* Low level lua C API */
+ #include <lauxlib.h> /* Higher level C API */
+--
+2.14.4
+
diff --git a/package/vlc/0003-automake-add-subdir-objects-option.patch b/package/vlc/0003-automake-add-subdir-objects-option.patch
index 877114a273..d4493bdf7f 100644
--- a/package/vlc/0003-automake-add-subdir-objects-option.patch
+++ b/package/vlc/0003-automake-add-subdir-objects-option.patch
@@ -1,4 +1,4 @@
-From 7663c856db10274d8dfbf7fb4299d3f76e5847a8 Mon Sep 17 00:00:00 2001
+From 54e7e0bda02099ae9d1c42abed1932ffa8d354e8 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 1 May 2018 22:28:52 +0200
Subject: [PATCH] automake: add subdir-objects option
@@ -15,7 +15,7 @@ Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index b3841ea77b..9a37656ddd 100644
+index 206690b468..dfb4c1c329 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
@@ -26,7 +26,7 @@ index b3841ea77b..9a37656ddd 100644
+AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects)
AC_CONFIG_HEADERS([config.h])
- # Disable with "./configure --disable-silent-rules" or "make V=1"
+ AM_SILENT_RULES([yes])
--
-2.14.3
+2.14.4
diff --git a/package/vlc/0004-Drop-error-implicit-function-declaration-compile-fla.patch b/package/vlc/0004-Drop-error-implicit-function-declaration-compile-fla.patch
deleted file mode 100644
index 62666b3dae..0000000000
--- a/package/vlc/0004-Drop-error-implicit-function-declaration-compile-fla.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d4806743a059ec6720b5c29e7345390978614fc9 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Tue, 1 May 2018 22:29:29 +0200
-Subject: [PATCH] Drop error-implicit-function-declaration compile flag
-
-Fix compile warning being treated as error:
-
-codec/svg.c: In function 'DecodeBlock':
-codec/svg.c:240:5: error: implicit declaration of function 'rsvg_handle_render_cairo' [-Werror=implicit-function-declaration]
-cc1: some warnings being treated as errors
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9a37656ddd..b14ba46797 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -867,7 +867,7 @@ dnl
- dnl Compiler warnings
- dnl
-
--RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration])
-+RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var])
- RDC_PROG_CC_FLAGS([-pipe])
- AC_LANG_PUSH([C++])
- RDC_PROG_CXX_WFLAGS([all extra sign-compare undef pointer-arith volatile-register-var])
---
-2.14.3
-
diff --git a/package/vlc/0004-qt-fix-build-against-Qt-5.11.patch b/package/vlc/0004-qt-fix-build-against-Qt-5.11.patch
new file mode 100644
index 0000000000..fad33b2304
--- /dev/null
+++ b/package/vlc/0004-qt-fix-build-against-Qt-5.11.patch
@@ -0,0 +1,33 @@
+From 30211b7336f2ed6048953390340e86f6cca9eb6f Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Thu, 17 May 2018 17:40:37 +0200
+Subject: [PATCH] qt: fix build against Qt 5.11
+
+Qt 5.11 is in RC phase now, and some headers need to be explicitly
+included in order to build successfully.
+
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+
+Downloaded from
+https://sources.debian.org/src/vlc/3.0.3-1-3/debian/patches/0003-qt-fix-build-against-Qt-5.11.patch/
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ modules/gui/qt/components/simple_preferences.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/gui/qt/components/simple_preferences.cpp b/modules/gui/qt/components/simple_preferences.cpp
+index 635cc274c0..7a31a6ea6f 100644
+--- a/modules/gui/qt/components/simple_preferences.cpp
++++ b/modules/gui/qt/components/simple_preferences.cpp
+@@ -36,6 +36,7 @@
+ #include <QString>
+ #include <QFont>
+ #include <QToolButton>
++#include <QButtonGroup>
+ #include <QSignalMapper>
+ #include <QVBoxLayout>
+ #include <QScrollArea>
+--
+2.14.4
+
diff --git a/package/vlc/0005-Don-t-hardcode-the-name-of-the-vorbis-and-ogg-librar.patch b/package/vlc/0005-Don-t-hardcode-the-name-of-the-vorbis-and-ogg-librar.patch
index bd8231cd03..a5352b7498 100644
--- a/package/vlc/0005-Don-t-hardcode-the-name-of-the-vorbis-and-ogg-librar.patch
+++ b/package/vlc/0005-Don-t-hardcode-the-name-of-the-vorbis-and-ogg-librar.patch
@@ -1,4 +1,4 @@
-From 418e5e692a1f975d41eab3bd15895b2ba0a7eee1 Mon Sep 17 00:00:00 2001
+From 6515c423f9e6b8b607678a260a16db2684d88a4e Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Tue, 1 May 2018 22:30:09 +0200
Subject: [PATCH] Don't hardcode the name of the vorbis and ogg libraries
@@ -14,10 +14,10 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
-index bc39a4facc..c5cd2fb7f9 100644
+index 10132a92f3..2fb52a586e 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
-@@ -234,7 +234,7 @@ codec_LTLIBRARIES += $(LTLIBtheora)
+@@ -324,7 +324,7 @@ codec_LTLIBRARIES += $(LTLIBdaala)
libtremor_plugin_la_SOURCES = codec/vorbis.c
libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor
libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
@@ -27,5 +27,5 @@ index bc39a4facc..c5cd2fb7f9 100644
codec_LTLIBRARIES += $(LTLIBtremor)
--
-2.14.3
+2.14.4
diff --git a/package/vlc/0006-Don-t-assume-X11-is-available-when-Qt5-is-used.patch b/package/vlc/0006-Don-t-assume-X11-is-available-when-Qt5-is-used.patch
deleted file mode 100644
index 0a07dd735d..0000000000
--- a/package/vlc/0006-Don-t-assume-X11-is-available-when-Qt5-is-used.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f87ef7f97e7e35cc1c922d5a3ff2a2275da7c22e Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Tue, 1 May 2018 22:30:39 +0200
-Subject: [PATCH] Don't assume X11 is available when Qt5 is used
-
-libX11 is an optional dependency for the qt4 module.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- modules/gui/qt4/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/gui/qt4/Makefile.am b/modules/gui/qt4/Makefile.am
-index 1a564cf1ea..4d12501eb7 100644
---- a/modules/gui/qt4/Makefile.am
-+++ b/modules/gui/qt4/Makefile.am
-@@ -22,7 +22,7 @@ else
- if HAVE_WIN32
- libqt4_plugin_la_LIBADD += -lole32 -lcomctl32 -luuid
- else
--libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB) -lX11
-+libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB)
- endif
- endif
- if HAVE_DARWIN
---
-2.14.3
-
diff --git a/package/vlc/0006-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch b/package/vlc/0006-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch
new file mode 100644
index 0000000000..a1d7189689
--- /dev/null
+++ b/package/vlc/0006-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch
@@ -0,0 +1,44 @@
+From bbb15b9cbf9353423619f2c40abdf95d861e66ba Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sat, 2 Apr 2016 16:49:54 +0200
+Subject: [PATCH] Fix build error using uClibc by adding sys/types.h
+
+Fixes
+
+ CC core.lo
+In file included from libvlc_internal.h:35:0,
+ from core.c:28:
+../include/vlc/libvlc_media.h:313:18: error: expected declaration specifiers or '...' before '*' token
+ typedef ssize_t (*libvlc_media_read_cb)(void *opaque, unsigned char *buf,
+ ^
+../include/vlc/libvlc_media.h:423:36: error: unknown type name 'libvlc_media_read_cb'
+ libvlc_media_read_cb read_cb,
+ ^
+Bug was reported to trac:
+https://trac.videolan.org/vlc/ticket/16768
+
+This patch was suggested by courmisch in the trac ticket.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Patch sent upstream:
+ https://mailman.videolan.org/pipermail/vlc-devel/2016-April/106952.html]
+---
+ include/vlc/libvlc_media.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h
+index 383f366b69..1cbf00c3e3 100644
+--- a/include/vlc/libvlc_media.h
++++ b/include/vlc/libvlc_media.h
+@@ -26,6 +26,8 @@
+ #ifndef VLC_LIBVLC_MEDIA_H
+ #define VLC_LIBVLC_MEDIA_H 1
+
++#include <sys/types.h> /* for ssize_t */
++
+ # ifdef __cplusplus
+ extern "C" {
+ # endif
+--
+2.14.4
+
diff --git a/package/vlc/0007-Don-t-assume-strerror_l-is-available.patch b/package/vlc/0007-Don-t-assume-strerror_l-is-available.patch
index e587b05d27..685befa6e4 100644
--- a/package/vlc/0007-Don-t-assume-strerror_l-is-available.patch
+++ b/package/vlc/0007-Don-t-assume-strerror_l-is-available.patch
@@ -1,4 +1,4 @@
-From 02a0cf3635eab8b10a5a47a56aa905d925f669a8 Mon Sep 17 00:00:00 2001
+From 0435cf37308652af1cf244b6429e919fa7ffaa95 Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Tue, 1 May 2018 22:31:23 +0200
Subject: [PATCH] Don't assume strerror_l() is available
@@ -18,18 +18,18 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index b14ba46797..15cb4edcfd 100644
+index dfb4c1c329..bfe43512a2 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -537,7 +537,7 @@ need_libc=false
+@@ -590,7 +590,7 @@ dnl Check for system libs needed
+ need_libc=false
dnl Check for usual libc functions
- AC_CHECK_DECLS([nanosleep],,,[#include <time.h>])
--AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap open_memstream openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale])
-+AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap open_memstream openat pread posix_fadvise posix_madvise setlocale strerror_l stricmp strnicmp strptime uselocale])
- AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp])
- AC_CHECK_FUNCS(fdatasync,,
- [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
+-AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale])
++AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale strerror_l stricmp strnicmp strptime uselocale])
+ AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf])
+ AC_REPLACE_FUNCS([gettimeofday])
+ AC_CHECK_FUNC(fdatasync,,
diff --git a/src/posix/error.c b/src/posix/error.c
index db51004601..b4aa6fb3ca 100644
--- a/src/posix/error.c
@@ -53,5 +53,5 @@ index db51004601..b4aa6fb3ca 100644
}
--
-2.14.3
+2.14.4
diff --git a/package/vlc/0008-fix-fallback-code-and-add-required-realtime-library-.patch b/package/vlc/0008-fix-fallback-code-and-add-required-realtime-library-.patch
deleted file mode 100644
index d9f4241309..0000000000
--- a/package/vlc/0008-fix-fallback-code-and-add-required-realtime-library-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b5d4edd81bcb685cbea61b01d54afa1fe200b7d2 Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <wbx@openadk.org>
-Date: Fri, 26 Aug 2016 15:11:25 +0200
-Subject: [PATCH] fix fallback code and add required realtime library to link
- command
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
----
- configure.ac | 1 +
- src/posix/thread.c | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 15cb4edcfd..16e44a8c61 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -121,6 +121,7 @@ case "${host_os}" in
- ;;
- linux*)
- SYS=linux
-+ AC_CHECK_LIB([rt], [posix_spawnp], [VLC_ADD_LIBS([libvlccore],[-lrt])], [], [])
- ;;
- bsdi*)
- SYS=bsdi
-diff --git a/src/posix/thread.c b/src/posix/thread.c
-index 07fa71eb3e..8b8595fcb8 100644
---- a/src/posix/thread.c
-+++ b/src/posix/thread.c
-@@ -85,7 +85,7 @@ static clockid_t vlc_clock_id;
-
- static void vlc_clock_setup_once (void)
- {
--# if (_POSIX_MONOTONIC_CLOCK == 0)
-+# if (_POSIX_MONOTONIC_CLOCK == 0) && (_POSIX_CLOCK_SELECTION > 0)
- long val = sysconf (_SC_MONOTONIC_CLOCK);
- assert (val != 0);
- vlc_clock_id = (val < 0) ? CLOCK_REALTIME : CLOCK_MONOTONIC;
---
-2.14.3
-
diff --git a/package/vlc/0008-posix-remove-ancient-run-time-fallback-to-real-time-.patch b/package/vlc/0008-posix-remove-ancient-run-time-fallback-to-real-time-.patch
new file mode 100644
index 0000000000..4fc639e222
--- /dev/null
+++ b/package/vlc/0008-posix-remove-ancient-run-time-fallback-to-real-time-.patch
@@ -0,0 +1,187 @@
+From 5d561e1e2dcde3c9fca4d925f12447009d0d4a4c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
+Date: Wed, 18 Apr 2018 17:23:57 +0300
+Subject: [PATCH] posix: remove ancient run-time fallback to real-time clock
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+posix: remove ancient run-time fallback to real-time clock
+
+For hysterical raisins, GNU/Linux and possibly some other OSes still
+report that monotonic clock must be checked at run-time, although I
+doubt that VLC or even current glibc would run on such old kernel.
+
+Drop that to simplify and avoid the systematic one-time init check.
+
+Downloaded from upstream commit to fix build error on m68k:
+
+posix/thread.c:79:5: warning: #warning Monotonic clock not available. Expect timing issues. [-Wcpp]
+ # warning Monotonic clock not available. Expect timing issues.
+ ^~~~~~~
+posix/thread.c: In function ‘vlc_clock_setup_once’:
+posix/thread.c:88:18: error: lvalue required as left operand of assignment
+ vlc_clock_id = (val < 0) ? CLOCK_REALTIME : CLOCK_MONOTONIC;
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/posix/thread.c | 96 +++++++-----------------------------------------------
+ 1 file changed, 11 insertions(+), 85 deletions(-)
+
+diff --git a/src/posix/thread.c b/src/posix/thread.c
+index dab8b71f97..8878941913 100644
+--- a/src/posix/thread.c
++++ b/src/posix/thread.c
+@@ -51,62 +51,16 @@
+ # include <sys/pset.h>
+ #endif
+
+-#if !defined (_POSIX_TIMERS)
+-# define _POSIX_TIMERS (-1)
+-#endif
+-#if !defined (_POSIX_CLOCK_SELECTION)
+-/* Clock selection was defined in 2001 and became mandatory in 2008. */
+-# define _POSIX_CLOCK_SELECTION (-1)
+-#endif
+-#if !defined (_POSIX_MONOTONIC_CLOCK)
+-# define _POSIX_MONOTONIC_CLOCK (-1)
+-#endif
+-
+-#if (_POSIX_TIMERS > 0)
+ static unsigned vlc_clock_prec;
+
+-# if (_POSIX_MONOTONIC_CLOCK > 0) && (_POSIX_CLOCK_SELECTION > 0)
+-/* Compile-time POSIX monotonic clock support */
+-# define vlc_clock_id (CLOCK_MONOTONIC)
+-
+-# elif (_POSIX_MONOTONIC_CLOCK == 0) && (_POSIX_CLOCK_SELECTION > 0)
+-/* Run-time POSIX monotonic clock support (see clock_setup() below) */
+-static clockid_t vlc_clock_id;
+-
+-# else
+-/* No POSIX monotonic clock support */
+-# define vlc_clock_id (CLOCK_REALTIME)
+-# warning Monotonic clock not available. Expect timing issues.
+-
+-# endif /* _POSIX_MONOTONIC_CLOKC */
+-
+ static void vlc_clock_setup_once (void)
+ {
+-# if (_POSIX_MONOTONIC_CLOCK == 0)
+- long val = sysconf (_SC_MONOTONIC_CLOCK);
+- assert (val != 0);
+- vlc_clock_id = (val < 0) ? CLOCK_REALTIME : CLOCK_MONOTONIC;
+-# endif
+-
+ struct timespec res;
+- if (unlikely(clock_getres (vlc_clock_id, &res) != 0 || res.tv_sec != 0))
++ if (unlikely(clock_getres(CLOCK_MONOTONIC, &res) != 0 || res.tv_sec != 0))
+ abort ();
+ vlc_clock_prec = (res.tv_nsec + 500) / 1000;
+ }
+
+-static pthread_once_t vlc_clock_once = PTHREAD_ONCE_INIT;
+-
+-# define vlc_clock_setup() \
+- pthread_once(&vlc_clock_once, vlc_clock_setup_once)
+-
+-#else /* _POSIX_TIMERS */
+-
+-# include <sys/time.h> /* gettimeofday() */
+-
+-# define vlc_clock_setup() (void)0
+-# warning Monotonic clock not available. Expect timing issues.
+-#endif /* _POSIX_TIMERS */
+-
+ static struct timespec mtime_to_ts (mtime_t date)
+ {
+ lldiv_t d = lldiv (date, CLOCK_FREQ);
+@@ -233,14 +187,11 @@ void vlc_cond_init (vlc_cond_t *p_condvar)
+ {
+ pthread_condattr_t attr;
+
+- if (unlikely(pthread_condattr_init (&attr)))
+- abort ();
+-#if (_POSIX_CLOCK_SELECTION > 0)
+- vlc_clock_setup ();
+- pthread_condattr_setclock (&attr, vlc_clock_id);
+-#endif
+- if (unlikely(pthread_cond_init (p_condvar, &attr)))
++ if (unlikely(pthread_condattr_init (&attr))
++ || unlikely(pthread_condattr_setclock(&attr, CLOCK_MONOTONIC))
++ || unlikely(pthread_cond_init (p_condvar, &attr)))
+ abort ();
++
+ pthread_condattr_destroy (&attr);
+ }
+
+@@ -625,44 +576,27 @@ void vlc_control_cancel (int cmd, ...)
+
+ mtime_t mdate (void)
+ {
+-#if (_POSIX_TIMERS > 0)
+ struct timespec ts;
+
+- vlc_clock_setup ();
+- if (unlikely(clock_gettime (vlc_clock_id, &ts) != 0))
++ if (unlikely(clock_gettime(CLOCK_MONOTONIC, &ts) != 0))
+ abort ();
+
+ return (INT64_C(1000000) * ts.tv_sec) + (ts.tv_nsec / 1000);
+-
+-#else
+- struct timeval tv;
+-
+- if (unlikely(gettimeofday (&tv, NULL) != 0))
+- abort ();
+- return (INT64_C(1000000) * tv.tv_sec) + tv.tv_usec;
+-
+-#endif
+ }
+
+ #undef mwait
+ void mwait (mtime_t deadline)
+ {
+-#if (_POSIX_CLOCK_SELECTION > 0)
+- vlc_clock_setup ();
++ static pthread_once_t vlc_clock_once = PTHREAD_ONCE_INIT;
++
+ /* If the deadline is already elapsed, or within the clock precision,
+ * do not even bother the system timer. */
++ pthread_once(&vlc_clock_once, vlc_clock_setup_once);
+ deadline -= vlc_clock_prec;
+
+ struct timespec ts = mtime_to_ts (deadline);
+
+- while (clock_nanosleep (vlc_clock_id, TIMER_ABSTIME, &ts, NULL) == EINTR);
+-
+-#else
+- deadline -= mdate ();
+- if (deadline > 0)
+- msleep (deadline);
+-
+-#endif
++ while (clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &ts, NULL) == EINTR);
+ }
+
+ #undef msleep
+@@ -670,15 +604,7 @@ void msleep (mtime_t delay)
+ {
+ struct timespec ts = mtime_to_ts (delay);
+
+-#if (_POSIX_CLOCK_SELECTION > 0)
+- vlc_clock_setup ();
+- while (clock_nanosleep (vlc_clock_id, 0, &ts, &ts) == EINTR);
+-
+-#else
+- while (nanosleep (&ts, &ts) == -1)
+- assert (errno == EINTR);
+-
+-#endif
++ while (clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts) == EINTR);
+ }
+
+ unsigned vlc_GetCPUCount(void)
+--
+2.14.4
+
diff --git a/package/vlc/0009-Changes-for-ffmpeg-3.0.patch b/package/vlc/0009-Changes-for-ffmpeg-3.0.patch
deleted file mode 100644
index a765a0a6c4..0000000000
--- a/package/vlc/0009-Changes-for-ffmpeg-3.0.patch
+++ /dev/null
@@ -1,309 +0,0 @@
-From 960c98831ca75b08168530f1c74af07901e01963 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Tue, 1 May 2018 22:32:02 +0200
-Subject: [PATCH] Changes for ffmpeg 3.0
-
-This file is a copy of debian/patches/04_ffmpeg-3.0.diff, to be found in
-http://www.deb-multimedia.org/pool/main/v/vlc-dmo/vlc-dmo_2.2.4.orig.tar.gz
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- configure.ac | 14 +++++++-------
- modules/codec/avcodec/audio.c | 2 +-
- modules/codec/avcodec/encoder.c | 20 ++++++++++----------
- modules/codec/avcodec/vaapi.c | 2 +-
- modules/codec/avcodec/video.c | 14 +++++++-------
- modules/demux/avformat/demux.c | 10 +++++-----
- 6 files changed, 31 insertions(+), 31 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 16e44a8c61..6886b2b872 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2319,7 +2319,7 @@ AC_ARG_ENABLE(avcodec,
- AS_IF([test "${enable_avcodec}" != "no"], [
- PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
- PKG_CHECK_EXISTS([libavutil < 55],, [
-- AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
-+ AC_MSG_WARN([libavutil versions 55 and later are not supported.])
- ])
- VLC_SAVE_FLAGS
- CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
-@@ -2329,7 +2329,7 @@ AS_IF([test "${enable_avcodec}" != "no"], [
- VLC_RESTORE_FLAGS
- have_avcodec="yes"
- ],[
-- AC_MSG_ERROR([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.])
-+ AC_MSG_WARN([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.])
- ])
- ], [
- have_avcodec="no"
-@@ -2378,7 +2378,7 @@ AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
- case "${avfork}" in
- ffmpeg)
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
-+ AC_MSG_WARN([VA API requires FFmpeg libavcodec < 57.10 or libav.])
- ])
- ;;
- esac
-@@ -2412,7 +2412,7 @@ AS_IF([test "${enable_dxva2}" != "no"], [
- case "${avfork}" in
- ffmpeg)
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
-+ AC_MSG_WARN([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
- ])
- ;;
- esac
-@@ -2504,7 +2504,7 @@ AS_IF([test "${enable_avformat}" != "no"], [
- ])
- VLC_RESTORE_FLAGS
- ],[
-- AC_MSG_ERROR([${AVFORMAT_PKG_ERRORS}. Pass --disable-avformat to ignore this error.])
-+ AC_MSG_WARN([${AVFORMAT_PKG_ERRORS}. Pass --disable-avformat to ignore this error.])
- ])
- ])
- AM_CONDITIONAL([HAVE_AVFORMAT], [test "${enable_avformat}" != "no"])
-@@ -2533,7 +2533,7 @@ then
- ])
- VLC_RESTORE_FLAGS
- ],[
-- AC_MSG_ERROR([${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.])
-+ AC_MSG_WARN([${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.])
- ])
- fi
-
-@@ -3176,7 +3176,7 @@ AS_IF([test "${have_vdpau}" = "yes" -a "${have_avcodec}" = "yes"], [
- libav) av_vdpau_ver="55.26.0" ;;
- ffmpeg) av_vdpau_ver="55.42.100"
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-- AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
-+ AC_MSG_WARN([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
- ])
- ;;
- esac
-diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
-index 7068499d82..b5347ac896 100644
---- a/modules/codec/avcodec/audio.c
-+++ b/modules/codec/avcodec/audio.c
-@@ -39,7 +39,7 @@
- #include <libavcodec/avcodec.h>
- #include <libavutil/mem.h>
-
<