Update for 2018.05-rc3

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

CHANGES

@@ -1,3 +1,74 @@
+2018.05-rc3, Released May 28th, 2018
+
+	Fixes all over the tree.
+
+	Toolchain: ARC tools updated to arc-2018.03-rc2.
+
+	Fs: Ensure hard links in TARGET_DIR are correctly copied for
+	filesystem input. With the recent changes to the file system
+	generation logic, hard links were "expanded" in file system
+	images leading to bloated rootfs images for setups with hard
+	links.
+
+	Infrastructure: Error out for packages using the 'local'
+	method but forgetting to specify <pkg>_SITE.
+
+	Build rpcgen for the host when needed to support distributions
+	no longer shipping rpcgen with glibc (E.G. recent Fedora).
+
+	Updated/fixed packages: autofs, bash-completion, binutils,
+	busybox, cjson, elf2flt, libcoap, libcurl, libtirpc, lrzsz,
+	poppler, procps-ng, qt-webkit-kiosk, quota, samba4, xfsprogs
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#11031: ld-elf2flt: host/bin/ld.real': execvp: No such file..
+	#11036: C compiler cannot create executables
+	#11046: Git package binaries are ~180MB (compared to ~20MB in..
+
+2018.05-rc2, Released May 22nd, 2018
+
+	Fixes all over the tree.
+
+	Dependencies: Check that the current working directory (.)
+	isn't listed in PATH as that causes various build issues.
+
+	Manual: Clarify that git branch names may not be used as
+	version identifiers. This has never been supported, but was
+	kind of working (with some limitations) before the git
+	download rework - Now it does not work at all.
+
+	Linux: Ensure host version of ncurses is picked up and not
+	host-ncurses built by buildroot, as that otherwise causes
+	widechar/non-widechar conflicts and corrupted menuconfig
+	menus.
+
+	Packages: Renamed a number of package options not prefixed
+	with BR2_PACKAGE_<pkg> for consstency.
+
+	Download infrastructure: Fix file:// protocol handling after
+	download rework.
+
+	Updated/fixed packages: acl, apr-util, asterisk, attr,
+	bluez5_utils, cifs-utils, clamav, clang, cups-filters,
+	dahdi-linux, exim, faketime, gdb, go, gst1-plugins-bad,
+	imx-mkimage, ipsec-tools, jamvm, janus-gateway,
+	jquery-ui-themes, libcap, libcurl, libftdi, libkcapi, libkrb5,
+	libmediaart, libmodbus, libmodplug, libmpd,
+	libnetfilter_cthelper, libnetfilter_cttimeout, libnfc,
+	libnfnetlink, libnss, liboauth, libogg, libosip2,
+	libpam-radius-auth, libpcap, libpciaccess, llvm, log4cplus,
+	ltrace, lynx, mbedtls, modem-manager, nfs-utils,
+	python-cython, python-websockets, qt5cinex, qt5wayland, rauc,
+	snort, strace, ti-sgx-km, transmission, wavpack, wget, woff2,
+	xen, zmqpp, znc, zstd
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#10986: Installing package attr when already supplied by...
+	#11011: BUildroot for Raspberry Pi 2
+	#11016: Wrong compiler used for external user host packages
+
 2018.05-rc1, Released May 9th, 2018
 
 	Toolchain: glibc bumped to 2.27, musl bumped to 1.1.19,

Config.in.legacy

@@ -145,6 +145,484 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2018.05"
 
+config BR2_PACKAGE_MEDIAART_BACKEND_NONE
+	bool "libmediaart none backend option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_MEDIAART_BACKEND_NONE has been renamed to
+	  BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
+
+config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF
+	bool "libmediaart gdk-pixbuf backend option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to
+	  BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF
+
+config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF
+	bool "libmediaart qt backend option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_MEDIAART_BACKEND_QT has been renamed to
+	  BR2_PACKAGE_LIBMEDIAART_BACKEND_QT
+
+config BR2_PACKAGE_TI_SGX_AM335X
+	bool "ti-sgx-km AM335X option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_TI_SGX_AM335X has been renamed to
+	  BR2_PACKAGE_TI_SGX_KM_AM335X.
+
+config BR2_PACKAGE_TI_SGX_AM437X
+	bool "ti-sgx-km AM437X option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_TI_SGX_AM437X has been renamed to
+	  BR2_PACKAGE_TI_SGX_KM_AM437X.
+
+config BR2_PACKAGE_TI_SGX_AM4430
+	bool "ti-sgx-km AM4430 option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_TI_SGX_AM4430 has been renamed to
+	  BR2_PACKAGE_TI_SGX_KM_AM4430.
+
+config BR2_PACKAGE_TI_SGX_AM5430
+	bool "ti-sgx-km AM5430 option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_TI_SGX_AM5430 has been renamed to
+	  BR2_PACKAGE_TI_SGX_KM_AM5430.
+
+config BR2_PACKAGE_JANUS_AUDIO_BRIDGE
+	bool "janus-gateway audio-bridge option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_AUDIO_BRIDGE has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE.
+
+config BR2_PACKAGE_JANUS_ECHO_TEST
+	bool "janus-gateway echo-test option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_ECHO_TEST has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST.
+
+config BR2_PACKAGE_JANUS_RECORDPLAY
+	bool "janus-gateway recordplay option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_RECORDPLAY
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_RECORDPLAY has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_RECORDPLAY.
+
+config BR2_PACKAGE_JANUS_SIP_GATEWAY
+	bool "janus-gateway sip-gateway option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_SIP_GATEWAY
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_SIP_GATEWAY has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_SIP_GATEWAY.
+
+config BR2_PACKAGE_JANUS_STREAMING
+	bool "janus-gateway streaming option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_STREAMING
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_STREAMING has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_STREAMING.
+
+config BR2_PACKAGE_JANUS_TEXT_ROOM
+	bool "janus-gateway text-room option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_TEXT_ROOM
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_TEXT_ROOM has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_TEXT_ROOM.
+
+config BR2_PACKAGE_JANUS_VIDEO_CALL
+	bool "janus-gateway video-call option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_VIDEO_CALL
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_VIDEO_CALL has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_VIDEO_CALL.
+
+config BR2_PACKAGE_JANUS_VIDEO_ROOM
+	bool "janus-gateway video-room option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_VIDEO_ROOM
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_VIDEO_ROOM has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_VIDEO_ROOM.
+
+config BR2_PACKAGE_JANUS_MQTT
+	bool "janus-gateway mqtt option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_MQTT
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_MQTT has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_MQTT.
+
+config BR2_PACKAGE_JANUS_RABBITMQ
+	bool "janus-gateway rabbitmq option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_RABBITMQ has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ.
+
+config BR2_PACKAGE_JANUS_REST
+	bool "janus-gateway rest option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_REST
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_REST has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_REST.
+
+config BR2_PACKAGE_JANUS_UNIX_SOCKETS
+	bool "janus-gateway unix-sockets option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_UNIX_SOCKETS has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS.
+
+config BR2_PACKAGE_JANUS_WEBSOCKETS
+	bool "janus-gateway websockets option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS
+	help
+	  For consistency reasons, the janus-gateway option
+	  BR2_PACKAGE_JANUS_WEBSOCKETS has been renamed to
+	  BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS.
+
+config BR2_PACKAGE_IPSEC_SECCTX_DISABLE
+	bool "ipsec-tools security context disable option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_IPSEC_SECCTX_DISABLE was renamed to
+	  BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE.
+
+config BR2_PACKAGE_IPSEC_SECCTX_ENABLE
+	bool "ipsec-tools SELinux security context enable option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_IPSEC_SECCTX_ENABLE was renamed to
+	  BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE.
+
+config BR2_PACKAGE_IPSEC_SECCTX_KERNEL
+	bool "ipsec-tools kernel security context enable option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_IPSEC_SECCTX_KERNEL was renamed to
+	  BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL.
+
+config BR2_PACKAGE_LIBTFDI_CPP
+	bool "libftdi C++ bindings option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_LIBFTDI_CPP
+	help
+	  The option BR2_PACKAGE_LIBTFDI_CPP was renamed to
+	  BR2_PACKAGE_LIBFTDI_CPP in order to fix a typo in the option
+	  name.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
+	bool "jquery-ui-themes option black-tie renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  black-tie theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_BLACK_TIE.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_BLITZER
+	bool "jquery-ui-themes option blitzer renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  blitzer theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_BLITZER to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_BLITZER.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO
+	bool "jquery-ui-themes option cupertino renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  cupertino theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_CUPERTINO.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE
+	bool "jquery-ui-themes option dark-hive renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  dark-hive theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_DARK_HIVE.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV
+	bool "jquery-ui-themes option dot-luv renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  dot-luv theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_DOT_LUV.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT
+	bool "jquery-ui-themes option eggplant renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  eggplant theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_EGGPLANT.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE
+	bool "jquery-ui-themes option excite-bike renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  excite-bike theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_EXCITE_BIKE.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_FLICK
+	bool "jquery-ui-themes option flick renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  flick theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_FLICK to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_FLICK.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS
+	bool "jquery-ui-themes option hot-sneaks renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  hot-sneaks theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_HOT_SNEAKS.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY
+	bool "jquery-ui-themes option humanity renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  humanity theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_HUMANITY.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG
+	bool "jquery-ui-themes option le-frog renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  le-frog theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_LE_FROG.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC
+	bool "jquery-ui-themes option mint-choc renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  mint-choc theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_MINT_CHOC.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST
+	bool "jquery-ui-themes option overcast renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  overcast theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_OVERCAST.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER
+	bool "jquery-ui-themes option pepper-grinder renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  pepper-grinder theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_PEPPER_GRINDER.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_REDMOND
+	bool "jquery-ui-themes option redmond renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  redmond theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_REDMOND to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_REDMOND.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS
+	bool "jquery-ui-themes option smoothness renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  smoothness theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_SMOOTHNESS.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET
+	bool "jquery-ui-themes option south-street renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  south-street theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_SOUTH_STREET.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_START
+	bool "jquery-ui-themes option start renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  start theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_START to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_START.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_SUNNY
+	bool "jquery-ui-themes option sunny renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  sunny theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_SUNNY to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_SUNNY.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE
+	bool "jquery-ui-themes option swanky-purse renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  swanky-purse theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_SWANKY_PURSE.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC
+	bool "jquery-ui-themes option trontastic renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  trontastic theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_TRONTASTIC.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS
+	bool "jquery-ui-themes option ui-darkness renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  ui-darkness theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_UI_DARKNESS.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS
+	bool "jquery-ui-themes option ui-lightness renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  ui-lightness theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_UI_LIGHTNESS.
+
+config BR2_PACKAGE_JQUERY_UI_THEME_VADER
+	bool "jquery-ui-themes option vader renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the jquery-ui-themes option for the
+	  vader theme has been renamed from
+	  BR2_PACKAGE_JQUERY_UI_THEME_VADER to
+	  BR2_PACKAGE_JQUERY_UI_THEMES_VADER.
+
+config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH
+	bool "bluez5-utils health plugin option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH has been renamed to
+	  BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH.
+
+config BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI
+	bool "bluez5-utils midi plugin option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI has been renamed to
+	  BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI.
+
+config BR2_PACKAGE_BLUEZ5_PLUGINS_NFC
+	bool "bluez5-utils nfc plugin option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_BLUEZ5_PLUGINS_NFC has been renamed to
+	  BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC.
+
+config BR2_PACKAGE_BLUEZ5_PLUGINS_SAP
+	bool "bluez5-utils sap plugin option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_BLUEZ5_PLUGINS_SAP has been renamed to
+	  BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP.
+
+config BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS
+	bool "bluez5-utils sixaxis plugin option renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS has been renamed to
+	  BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS.
+
+config BR2_PACKAGE_TRANSMISSION_REMOTE
+	bool "transmission remote tool option removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_TRANSMISSION_DAEMON
+	help
+	  Upstream does not provide a separate configure option for
+	  the tool transmission-remote, it is built when the
+	  transmission daemon has been enabled. Therefore, Buildroot
+	  has automatically enabled BR2_PACKAGE_TRANSMISSION_DAEMON
+	  for you.
+
 config BR2_PACKAGE_LIBKCAPI_APPS
 	bool "libkcapi test applications removed"
 	select BR2_LEGACY

DEVELOPERS

@@ -153,6 +153,9 @@ F:	package/python-pydal/
 F:	package/python-web2py/
 F:	package/sysdig/
 
+N:	Anisse Astier <anisse@astier.eu>
+F:	package/go/
+
 N:	Antony Pavlov <antonynpavlov@gmail.com>
 F:	package/lsscsi/
 
@@ -401,10 +404,11 @@ F:	package/pps-tools/
 N:	Carlo Caione <carlo.caione@gmail.com>
 F:	package/sunxi-boards/
 
-N:	Carlos Santos <casantos@datacom.ind.br>
+N:	Carlos Santos <casantos@datacom.com.br>
 F:	package/gtest/
 F:	package/libpam-radius-auth/
 F:	package/libpam-tacplus/
+F:	package/modem-manager/
 F:	package/perl-file-util/
 F:	package/util-linux/
 F:	package/tpm2-abrmd/
@@ -676,6 +680,7 @@ F:	package/gupnp-tools/
 F:	package/hiredis/
 F:	package/i2pd/
 F:	package/igd2-for-linux/
+F:	package/lcms2/
 F:	package/lftp/
 F:	package/libcap-ng/
 F:	package/libcdio-paranoia/
@@ -689,8 +694,11 @@ F:	package/libgtk2/
 F:	package/libgtk3/
 F:	package/libidn/
 F:	package/libjpeg/
+F:	package/liblockfile/
 F:	package/libmatroska/
 F:	package/libmpdclient/
+F:	package/libnetfilter_conntrack/
+F:	package/libnetfilter_queue/
 F:	package/libupnp/
 F:	package/libupnp18/
 F:	package/minissdpd/
@@ -702,6 +710,7 @@ F:	package/rygel/
 F:	package/safeclib/
 F:	package/tinycbor/
 F:	package/tinydtls/
+F:	package/whois/
 
 N:	Falco Hyfing <hyfinglists@gmail.com>
 F:	package/python-pymodbus/
@@ -933,6 +942,7 @@ F:	configs/qemu_ppc64le_pseries_defconfig
 
 N:	Joseph Kogut <joseph.kogut@gmail.com>
 F:	package/gconf/
+F:	package/libnss/
 F:	package/python-cython/
 F:	package/python-raven/
 F:	package/python-schedule/
@@ -1533,6 +1543,7 @@ F:	package/modem-manager/
 F:	package/network-manager/
 F:	package/ofono/
 F:	package/python-networkmanager/
+F:	support/kconfig/
 
 N:	Phil Eichinger <phil.eichinger@gmail.com>
 F:	package/libqrencode/
@@ -1585,7 +1596,7 @@ F:	package/libhttpparser/
 N:	Rhys Williams <github@wilberforce.co.nz>
 F:	package/lirc-tools/
 
-N:	Ricardo Martincoski <ricardo.martincoski@datacom.ind.br>
+N:	Ricardo Martincoski <ricardo.martincoski@datacom.com.br>
 F:	package/atop/
 
 N:	Ricardo Martincoski <ricardo.martincoski@gmail.com>
@@ -1918,7 +1929,7 @@ F:	package/wayland/
 F:	package/weston/
 F:	toolchain/
 
-N:	Tiago Brusamarello <tiago.brusamarello@datacom.ind.br>
+N:	Tiago Brusamarello <tiago.brusamarello@datacom.com.br>
 F:	package/aer-inject/
 
 N:	Timo Ketola <timo.ketola@exertus.fi>

Makefile

@@ -87,9 +87,9 @@ all:
 .PHONY: all
 
 # Set and export the version string
-export BR2_VERSION := 2018.05-rc1
+export BR2_VERSION := 2018.05-rc3
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1525899000
+BR2_VERSION_EPOCH = 1527540000
 
 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)

board/freescale/imx8mqevk/readme.txt

@@ -1,8 +1,8 @@
 ***************************
-Freescale i.MX8mq EVK board
+Freescale i.MX8MQ EVK board
 ***************************
 
-This file documents the Buildroot support for the Freescale i.MX8mq
+This file documents the Buildroot support for the Freescale i.MX8MQ
 EVK board.
 
 Hardware support
@@ -14,7 +14,7 @@ support for GPU, VPU and other HW features.
 Build
 =====
 
-First, configure Buildroot for the i.MX8mq EVK board:
+First, configure Buildroot for the i.MX8MQ EVK board:
 
   make freescale_imx8mqevk_defconfig
 
@@ -58,11 +58,14 @@ command as root:
 For details about the medium image layout, see the definition in
 board/freescale/common/imx/genimage.cfg.template_imx8.
 
-Boot the i.MX8mq EVK board
+Boot the i.MX8MQ EVK board
 ==========================
 
 To boot your newly created system:
 - insert the SD card in the SD slot of the board;
+- Configure the switches as follows:
+SW801:	ON	ON	OFF	OFF
+SW802:	ON	OFF
 - put a micro USB cable into the Debug USB Port and connect using a terminal
   emulator at 115200 bps, 8n1;
 - power on the board.

configs/mx53loco_defconfig

@@ -2,7 +2,7 @@
 BR2_arm=y
 BR2_cortex_a8=y
 
-# Linux headers same as kernel, a 4.15 series
+# Linux headers same as kernel, a 4.16 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y
 
 # System

docs/manual/adding-packages-generic.txt

@@ -199,12 +199,12 @@ information is (assuming the package name is +libfoo+) :
 * +LIBFOO_VERSION+, mandatory, must contain the version of the
   package. Note that if +HOST_LIBFOO_VERSION+ doesn't exist, it is
   assumed to be the same as +LIBFOO_VERSION+. It can also be a
-  revision number, branch or tag for packages that are fetched
-  directly from their revision control system. +
-  Examples: +
-    +LIBFOO_VERSION = 0.1.2+ +
-    +LIBFOO_VERSION = cb9d6aa9429e838f0e54faa3d455bcbab5eef057+ +
-    +LIBFOO_VERSION = stable+
+  revision number or a tag for packages that are fetched directly
+  from their version control system. Do not use a branch name as
+  version; it does not work. Examples:
+  ** a version for a release tarball: +LIBFOO_VERSION = 0.1.2+
+  ** a sha1 for a git tree: +LIBFOO_VERSION = cb9d6aa9429e838f0e54faa3d455bcbab5eef057+
+  ** a tag for a git tree +LIBFOO_VERSION = v0.1.2+
 
 * +LIBFOO_SOURCE+ may contain the name of the tarball of the package,
   which Buildroot will use to download the tarball from

docs/website/download.html

@@ -77,37 +77,37 @@
       </div>
 -->
 
-      <h3 style="text-align: center;">Latest release candidate: <b>2018.05-rc1</b></h3>
+      <h3 style="text-align: center;">Latest release candidate: <b>2018.05-rc3</b></h3>
       <div class="row mt centered">
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2018.05-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2018.05-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2018.05-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2018.05-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>
 
-	  <h3><a href="/downloads/buildroot-2018.05-rc1.tar.gz">buildroot-2018.05-rc1.tar.gz</a></h3>
-	  <p><a href="/downloads/buildroot-2018.05-rc1.tar.gz.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2018.05-rc3.tar.gz">buildroot-2018.05-rc3.tar.gz</a></h3>
+	  <p><a href="/downloads/buildroot-2018.05-rc3.tar.gz.sign">PGP signature</a></p>
 	</div>
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2018.05-rc1.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2018.05-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2018.05-rc1.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2018.05-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>
 
-	  <h3><a href="/downloads/buildroot-2018.05-rc1.tar.bz2">buildroot-2018.05-rc1.tar.bz2</a></h3>
-	  <p><a href="/downloads/buildroot-2018.05-rc1.tar.bz2.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2018.05-rc3.tar.bz2">buildroot-2018.05-rc3.tar.bz2</a></h3>
+	  <p><a href="/downloads/buildroot-2018.05-rc3.tar.bz2.sign">PGP signature</a></p>
 	</div>
       </div>
 

docs/website/news.html

@@ -9,6 +9,74 @@
 <h2>News</h2>
 <ul class="timeline">
 
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2018.05-rc3 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>28 May 2018</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>Release candidate 3 is out with more cleanups and security
+	  / build fixes. See
+	  the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2018.05-rc3">CHANGES</a>
+	  file for details.</p>
+	<p>Head to the <a href="/downloads/">downloads page</a> to
+	  pick up
+	  the <a href="/downloads/buildroot-2018.02-rc5.tar.bz2">2018.02-rc5
+	    release candidate</a>, and report any problems found to
+	  the <a href="support.html">mailing list</a>
+	  or <a href="https://bugs.uclibc.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2018.05-rc2 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>22 May 2018</small></p>
+      </div>
+      <div class="timeline-body">
+        <p>Another week, another release candidate with more cleanups
+          and build fixes. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2018.05-rc2">CHANGES</a>
+	  file for details.</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2018.05-rc2.tar.bz2">2018.05-rc2
+	  release candidate</a>, and report any problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2018.05-rc1 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>9 May 2018</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>We have a new release candidate! Lots of changes all over the
+	  tree, see the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2018.05-rc1">CHANGES</a>
+	  file for details and read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2018-May/221257.html">announcement</a>.
+	</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2018.02-rc1.tar.bz2">2018.05-rc1
+	    release candidate</a>, and report any problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
   <li class="timeline-inverted">
     <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
     <div class="timeline-panel">

fs/common.mk

@@ -71,7 +71,7 @@ $(ROOTFS_COMMON_TAR): $(ROOTFS_COMMON_DEPENDENCIES) target-finalize
 	@$(call MESSAGE,"Generating common rootfs tarball")
 	rm -rf $(FS_DIR)
 	mkdir -p $(FS_DIR)
-	rsync -au $(BASE_TARGET_DIR)/ $(TARGET_DIR)
+	rsync -auH $(BASE_TARGET_DIR)/ $(TARGET_DIR)
 	echo '#!/bin/sh' > $(FAKEROOT_SCRIPT)
 	echo "set -e" >> $(FAKEROOT_SCRIPT)
 	echo "chown -h -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)

linux/Config.in

@@ -29,7 +29,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION
 	bool "Latest version (4.16)"
 
 config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
-	bool "Latest CIP SLTS version (v4.4.112-cip18)"
+	bool "Latest CIP SLTS version (v4.4.130-cip23)"
 	help
 	  CIP launched in the spring of 2016 to address the needs of
 	  organizations in industries such as power generation and
@@ -116,8 +116,8 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "4.16.7" if BR2_LINUX_KERNEL_LATEST_VERSION
-	default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
+	default "4.16.12" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "v4.4.130-cip23" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

linux/linux.mk

@@ -235,7 +235,14 @@ LINUX_KCONFIG_FILE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE))
 endif
 LINUX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES))
 LINUX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
-LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS)
+
+# LINUX_MAKE_FLAGS overrides HOSTCC to allow the kernel build to find our
+# host-openssl and host-libelf. However, this triggers a bug in the kconfig
+# build script that causes it to build with /usr/include/ncurses.h (which is
+# typically wchar) but link with $(HOST_DIR)/lib/libncurses.so (which is not).
+# We don't actually need any host-package for kconfig, so remove the HOSTCC
+# override again.
+LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS) HOSTCC="$(HOSTCC)"
 
 # If no package has yet set it, set it from the Kconfig option
 LINUX_NEEDS_MODULES ?= $(BR2_LINUX_NEEDS_MODULES)

package/acl/0003-all-use-install-1-to-install-executables.patch

@@ -0,0 +1,67 @@
+From d3bd7b29b79147b4155e78a8ea06ded98b91f92a Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Tue, 8 May 2018 15:23:57 +0200
+Subject: [PATCH] all: use install(1) to install executables
+
+When the destination file already exists, the current install script
+will overwrite it with the new executable.
+
+However, when the existing executable is a symlink or hardlink to
+something else, like busybox, this effectively overwrites that something
+with the new executable, and thus replaces busybox and all its applets
+with the code for either of the three commands.
+
+We fix that by simply calling install(1). install(1) is sufficiently
+widespread that we don't bother checking for it, as tis is just a
+workaround while waiting for the version bump that will eventually fix
+it for good.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+ chacl/Makefile   | 4 ++--
+ getfacl/Makefile | 4 ++--
+ setfacl/Makefile | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/chacl/Makefile b/chacl/Makefile
+index 33858d6..c857329 100644
+--- a/chacl/Makefile
++++ b/chacl/Makefile
+@@ -30,6 +30,6 @@ default: $(LTCOMMAND)
+ include $(BUILDRULES)
+ 
+ install: default
+-	$(INSTALL) -m 755 -d $(PKG_BIN_DIR)
+-	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
++	install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND)
++
+ install-dev install-lib:
+diff --git a/getfacl/Makefile b/getfacl/Makefile
+index 7fbafda..8ac63e0 100644
+--- a/getfacl/Makefile
++++ b/getfacl/Makefile
+@@ -31,6 +31,6 @@ default: $(LTCOMMAND)
+ include $(BUILDRULES)
+ 
+ install: default
+-	$(INSTALL) -m 755 -d $(PKG_BIN_DIR)
+-	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
++	install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND)
++
+ install-dev install-lib:
+diff --git a/setfacl/Makefile b/setfacl/Makefile
+index c44e7c0..eea2ede 100644
+--- a/setfacl/Makefile
++++ b/setfacl/Makefile
+@@ -31,6 +31,6 @@ default: $(LTCOMMAND)
+ include $(BUILDRULES)
+ 
+ install: default
+-	$(INSTALL) -m 755 -d $(PKG_BIN_DIR)
+-	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
++	install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND)
++
+ install-dev install-lib:
+-- 
+2.14.1
+

package/apr-util/apr-util.mk

@@ -48,6 +48,7 @@ APR_UTIL_CONF_OPTS += --without-sqlite3
 endif
 
 ifeq ($(BR2_PACKAGE_OPENLDAP),y)
+APR_UTIL_CONF_ENV += ac_cv_ldap_set_rebind_proc_style=three
 APR_UTIL_CONF_OPTS += \
 	--with-ldap \
 	--with-ldap-include="$(STAGING_DIR)/usr/include/" \

package/asterisk/0006-build-fix-issues-building-without-ssl.patch

@@ -0,0 +1,57 @@
+From 999e0c17d7e4139d36730752a34fbfde18a4f9f1 Mon Sep 17 00:00:00 2001
+From: Corey Farrell <git@cfware.com>
+Date: Sun, 19 Nov 2017 14:52:59 -0500
+Subject: [PATCH] Build: Fix issues building without SSL.
+
+* Fix conditional in libasteriskssl.
+* Use variables produced by configure to link the SSL and uuid libraries
+  into libasteriskpj.so instead of hard-coding them.
+
+ASTERISK-27431
+
+Change-Id: I3977931fd3ef8c4e4376349ccddb354eb839b58d
+
+Downloaded from upstream master branch
+https://github.com/asterisk/asterisk/commit/999e0c17d7e4139d36730752a34fbfde18a4f9f1
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ main/Makefile         | 4 ++--
+ main/libasteriskssl.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/main/Makefile b/main/Makefile
+index 08d1f65580e..c724e2012b0 100644
+--- a/main/Makefile
++++ b/main/Makefile
+@@ -273,7 +273,7 @@ endif
+ 
+ $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTLDFLAGS+=-Wl,-soname=$(ASTPJ_LIB).$(ASTPJ_SO_VERSION) $(PJ_LDFLAGS)
+ $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" -DAST_NOT_MODULE $(PJ_CFLAGS)
+-$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) -lssl -lcrypto -luuid -lm -lpthread $(RT_LIB)
++$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB)
+ ifeq ($(GNU_LD),1)
+     $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): SO_SUPPRESS_SYMBOLS=-Wl,--version-script,libasteriskpj.exports,--warn-common
+ endif
+@@ -298,7 +298,7 @@ ASTPJ_LIB:=libasteriskpj.dylib
+ # /lib or /usr/lib
+ $(ASTPJ_LIB): _ASTLDFLAGS+=-dynamiclib -install_name $(ASTLIBDIR)/$(ASTPJ_LIB) $(PJ_LDFLAGS)
+ $(ASTPJ_LIB): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" $(PJ_CFLAGS) -DAST_NOT_MODULE
+-$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS)  -lssl -lcrypto -luuid -lm -lpthread $(RT_LIB)
++$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS)  $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB)
+ $(ASTPJ_LIB): SOLINK=$(DYLINK)
+ 
+ # Special rules for building a shared library (not a dynamically loadable module)
+diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c
+index 8b19e247da9..e2e256f8ffe 100644
+--- a/main/libasteriskssl.c
++++ b/main/libasteriskssl.c
+@@ -37,7 +37,7 @@
+ #endif
+ 
+ #if defined(HAVE_OPENSSL) && \
+-	!defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++	(!defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
+ 
+ #include <dlfcn.h>
+ 

package/asterisk/asterisk.mk

@@ -102,7 +102,7 @@ ASTERISK_CONF_OPTS = \
 	--with-libxml2 \
 	--with-ncurses="$(STAGING_DIR)/usr" \
 	--with-sqlite3="$(STAGING_DIR)/usr" \
-	--with-sounds-cache=$(BR2_DL_DIR)
+	--with-sounds-cache=$(ASTERISK_DL_DIR)
 
 # avcodec are from ffmpeg. There is virtually zero chance this could
 # even work; asterisk is looking for ffmpeg/avcodec.h which has not

package/attr/0004-all-use-install-1-to-install-executables.patch

@@ -0,0 +1,67 @@
+From 4187e60ab52cac3ed36036a354977310dab68dcb Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Tue, 8 May 2018 15:16:10 +0200
+Subject: [PATCH] all: use install(1) to install executables
+
+When the destination file already exists, the current install script
+will overwrite it with the new executable.
+
+However, when the existing executable is a symlink or hardlink to
+something else, like busybox, this effectively overwrites that something
+with the new executable, and thus replaces busybox and all its applets
+with the code for either of the three commands.
+
+We fix that by simply calling install(1). install(1) is sufficiently
+widespread that we don't bother checking for it, as this is just a
+workaround while waiting for the version bump that will eventually fix
+it for good.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+ attr/Makefile     | 4 ++--
+ getfattr/Makefile | 4 ++--
+ setfattr/Makefile | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/attr/Makefile b/attr/Makefile
+index 1c467e8..326dd7e 100644
+--- a/attr/Makefile
++++ b/attr/Makefile
+@@ -29,6 +29,6 @@ default: $(LTCOMMAND)
+ include $(BUILDRULES)
+ 
+ install: default
+-	$(INSTALL) -m 755 -d $(PKG_BIN_DIR)
+-	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
++	install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND)
++
+ install-dev install-lib:
+diff --git a/getfattr/Makefile b/getfattr/Makefile
+index 91d3df2..f913172 100644
+--- a/getfattr/Makefile
++++ b/getfattr/Makefile
+@@ -30,6 +30,6 @@ default: $(LTCOMMAND)
+ include $(BUILDRULES)
+ 
+ install: default
+-	$(INSTALL) -m 755 -d $(PKG_BIN_DIR)
+-	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
++	install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND)
++
+ install-dev install-lib:
+diff --git a/setfattr/Makefile b/setfattr/Makefile
+index d55461b..26dc5d8 100644
+--- a/setfattr/Makefile
++++ b/setfattr/Makefile
+@@ -30,6 +30,6 @@ default: $(LTCOMMAND)
+ include $(BUILDRULES)
+ 
+ install: default
+-	$(INSTALL) -m 755 -d $(PKG_BIN_DIR)
+-	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
++	install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND)
++
+ install-dev install-lib:
+-- 
+2.14.1
+

package/autofs/autofs.mk

@@ -9,7 +9,7 @@ AUTOFS_SOURCE = autofs-$(AUTOFS_VERSION).tar.xz
 AUTOFS_SITE = $(BR2_KERNEL_MIRROR)/linux/daemons/autofs/v5
 AUTOFS_LICENSE = GPL-2.0+
 AUTOFS_LICENSE_FILES = COPYING COPYRIGHT
-AUTOFS_DEPENDENCIES = host-flex host-bison host-pkgconf
+AUTOFS_DEPENDENCIES = host-flex host-bison host-pkgconf host-nfs-utils
 
 # autofs looks on the build machine for the path of modprobe, so tell
 # it explicitly where it will be located on the target.

package/bash-completion/0001-completions-Makefile.am-Use-install-data-hook-not-in.patch

@@ -0,0 +1,35 @@
+From f9a1dfe7a3d0f35474b3f4ded05e3d97be5017bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Fri, 25 May 2018 17:38:59 +0200
+Subject: [PATCH] completions/Makefile.am: Use install-data-hook, not
+ install-data-local
+
+-hook is run after the main rule, while -local might end up before.
+https://www.gnu.org/software/automake/manual/html_node/Extending.html#index-hook-targets
+
+Closes #212
+
+[backported from ee6b37ad7ff5b309cbb9b886a871252abd9398fa]
+Signed-off-by: Romain Naour <romain.naour@smile.fr>
+---
+ completions/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/completions/Makefile.am b/completions/Makefile.am
+index e442a9e..5c49796 100644
+--- a/completions/Makefile.am
++++ b/completions/Makefile.am
+@@ -993,8 +993,8 @@ symlinks: $(targetdir) $(DATA)
+ all-local: targetdir = .
+ all-local: symlinks
+ 
+-install-data-local: targetdir = $(DESTDIR)$(bashcompdir)
+-install-data-local: symlinks
++install-data-hook: targetdir = $(DESTDIR)$(bashcompdir)
++install-data-hook: symlinks
+ 
+ check-local:
+ 	ret=0
+-- 
+2.7.4
+

package/bash-completion/bash-completion.mk

@@ -10,6 +10,9 @@ BASH_COMPLETION_SOURCE = bash-completion-$(BASH_COMPLETION_VERSION).tar.xz
 BASH_COMPLETION_LICENSE = GPL-2.0
 BASH_COMPLETION_LICENSE_FILES = COPYING
 
+# 0001-completions-Makefile.am-Use-install-data-hook-not-in.patch
+BASH_COMPLETION_AUTORECONF = YES
+
 # Install bash-completion.pc file
 BASH_COMPLETION_INSTALL_STAGING = YES
 

package/binutils/Config.in.host

@@ -24,7 +24,7 @@ endchoice
 
 config BR2_BINUTILS_VERSION
 	string
-	default "arc-2018.03-rc1"	if BR2_BINUTILS_VERSION_ARC
+	default "arc-2018.03-rc2"	if BR2_BINUTILS_VERSION_ARC
 	default "2.28.1"	if BR2_BINUTILS_VERSION_2_28_X
 	default "2.29.1"	if BR2_BINUTILS_VERSION_2_29_X
 	default "2.30"		if BR2_BINUTILS_VERSION_2_30_X

package/binutils/binutils.hash

@@ -4,4 +4,4 @@ sha512  d748d22306477d60d921078804d21943248c23fca0707aac9b016a352c01c75ca69e8262
 sha512  e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839  binutils-2.30.tar.xz
 
 # Locally calculated (fetched from Github)
-sha512  7b8c4a5ec38a234b3ca097ce38e0e60628561251085fc83a614c8cf476eec53ca77ab34088987c80ce79772d5e2cc513b28a7df45f3dc5d0d3a82296e1f6474f  binutils-arc-2018.03-rc1.tar.gz
+sha512  c9d41001bd41d96f1cd78748c1e8df9715aab1158c0a1c9c90a2010e335c357d0d6816202b7fcf7c7d8d4a65e25920b0b35af6a59edd0d29fd9edddd8be95a48  binutils-arc-2018.03-rc2.tar.gz

package/binutils/binutils.mk

@@ -9,13 +9,13 @@
 BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION))
 ifeq ($(BINUTILS_VERSION),)
 ifeq ($(BR2_arc),y)
-BINUTILS_VERSION = arc-2018.03-rc1
+BINUTILS_VERSION = arc-2018.03-rc2
 else
 BINUTILS_VERSION = 2.29.1
 endif
 endif # BINUTILS_VERSION
 
-ifeq ($(BINUTILS_VERSION),arc-2018.03-rc1)
+ifeq ($(BINUTILS_VERSION),arc-2018.03-rc2)
 BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(BINUTILS_VERSION))
 BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
 BINUTILS_FROM_GIT = y
@@ -132,12 +132,13 @@ endif
 
 # Hardlinks between binaries in different directories cause a problem
 # with rpath fixup, so we de-hardlink those binaries, and replace them
-# with symbolic links.
+# with copies instead.
 BINUTILS_TOOLS = ar as ld ld.bfd nm objcopy objdump ranlib readelf strip
 define HOST_BINUTILS_FIXUP_HARDLINKS
 	$(foreach tool,$(BINUTILS_TOOLS),\
-		rm -f $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool) ; \
-		ln -s ../../bin/$(GNU_TARGET_NAME)-$(tool) $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool)
+		rm -f $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool) && \
+		cp -a $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-$(tool) \
+			$(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool)
 	)
 endef
 HOST_BINUTILS_POST_INSTALL_HOOKS += HOST_BINUTILS_FIXUP_HARDLINKS

package/bluez5_utils/Config.in

@@ -56,29 +56,29 @@ config BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL
 	help
 	  Build BlueZ 5.x experimental Nokia OBEX PC Suite plugin
 
-config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH
+config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH
 	bool "build health plugin"
 	help
 	  Build BlueZ 5.x health plugin
 
-config BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI
+config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI
 	bool "build midi profile"
 	select BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_ALSA_LIB_SEQ
 	help
 	  Build BlueZ 5.x midi plugin
 
-config BR2_PACKAGE_BLUEZ5_PLUGINS_NFC
+config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC
 	bool "build nfc plugin"
 	help
 	  Build BlueZ 5.x nfc plugin
 
-config BR2_PACKAGE_BLUEZ5_PLUGINS_SAP
+config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP
 	bool "build sap plugin"
 	help
 	  Build BlueZ 5.x sap plugin
 
-config BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS
+config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS
 	bool "build sixaxis plugin"
 	depends on BR2_PACKAGE_HAS_UDEV
 	help

package/bluez5_utils/bluez5_utils.mk

@@ -41,14 +41,14 @@ BLUEZ5_UTILS_CONF_OPTS += --disable-experimental
 endif
 
 # enable health plugin
-ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH),y)
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH),y)
 BLUEZ5_UTILS_CONF_OPTS += --enable-health
 else
 BLUEZ5_UTILS_CONF_OPTS += --disable-health
 endif
 
 # enable midi profile
-ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI),y)
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI),y)
 BLUEZ5_UTILS_CONF_OPTS += --enable-midi
 BLUEZ5_UTILS_DEPENDENCIES += alsa-lib
 else
@@ -56,21 +56,21 @@ BLUEZ5_UTILS_CONF_OPTS += --disable-midi
 endif
 
 # enable nfc plugin
-ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_NFC),y)
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC),y)
 BLUEZ5_UTILS_CONF_OPTS += --enable-nfc
 else
 BLUEZ5_UTILS_CONF_OPTS += --disable-nfc
 endif
 
 # enable sap plugin
-ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SAP),y)
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP),y)
 BLUEZ5_UTILS_CONF_OPTS += --enable-sap
 else
 BLUEZ5_UTILS_CONF_OPTS += --disable-sap
 endif
 
 # enable sixaxis plugin
-ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS),y)
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS),y)
 BLUEZ5_UTILS_CONF_OPTS += --enable-sixaxis
 else
 BLUEZ5_UTILS_CONF_OPTS += --disable-sixaxis

package/busybox/busybox.hash

@@ -1,7 +1,7 @@
-# From https://busybox.net/downloads/busybox-1.28.3.tar.bz2.sign
-md5 82e5ad09ae4a07c266fc179492b51757  busybox-1.28.3.tar.bz2
-sha1 64b47e83dccc5db7fe4ca596b28c9b901a136fe3  busybox-1.28.3.tar.bz2
+# From https://busybox.net/downloads/busybox-1.28.4.tar.bz2.sign
+md5 5661d013c9ef7cc31a453640c320f56b  busybox-1.28.4.tar.bz2
+sha1 acd0558a659b795da1dfbd7e0ed5353d6836fa37  busybox-1.28.4.tar.bz2
 
 # Locally calculated
-sha256 ad0d22033f23e696f9a71a4c2f9210194dda39b024a79151f4ac278995332a6e  busybox-1.28.3.tar.bz2
+sha256 e3c14a3699dc7e82fed397392957afc78e37bdf25398ac38ead6e84621b2ae6a  busybox-1.28.4.tar.bz2
 sha256	bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548	LICENSE

package/busybox/busybox.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BUSYBOX_VERSION = 1.28.3
+BUSYBOX_VERSION = 1.28.4
 BUSYBOX_SITE = http://www.busybox.net/downloads
 BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
 BUSYBOX_LICENSE = GPL-2.0

package/cifs-utils/cifs-utils.mk

@@ -13,9 +13,9 @@ CIFS_UTILS_LICENSE_FILES = COPYING
 CIFS_UTILS_AUTORECONF = YES
 CIFS_UTILS_DEPENDENCIES = host-pkgconf
 
-ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
-CIFS_UTILS_CONF_OPTS += --disable-pie
-endif
+# Let's disable PIE unconditionally. We want PIE to be enabled only by
+# the global BR2_RELRO_FULL option.
+CIFS_UTILS_CONF_OPTS = --disable-pie
 
 ifeq ($(BR2_PACKAGE_KEYUTILS),y)
 CIFS_UTILS_DEPENDENCIES += keyutils

package/cjson/cjson.hash

@@ -1,3 +1,3 @@
 # Locally computed:
-sha256 d1ca2665b34fea164a877637b4ad1624aa23390fe75de91b88e18c5d6ec91978  cjson-v1.7.6.tar.gz
+sha256 6eb9d852a97ffbe149e747f54d63e39a674fa248bb24902a14c079803067949a  cjson-v1.7.7.tar.gz
 sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c  LICENSE

package/cjson/cjson.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CJSON_VERSION = v1.7.6
+CJSON_VERSION = v1.7.7
 CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION))
 CJSON_INSTALL_STAGING = YES
 CJSON_LICENSE = MIT

package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch

@@ -0,0 +1,34 @@
+From 52fda6e6689e22866a39ec4273713fb6035c38b2 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Mon, 7 May 2018 23:14:46 +0200
+Subject: [PATCH] clamdscan/proto.c: fix build error due to missing sockaddr_un
+ definition
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+proto.c: In function ‘dconnect’:
+proto.c:86:67: error: invalid application of ‘sizeof’ to incomplete type ‘struct sockaddr_un’
+             if (connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock)) == 0)
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+Upstream-status: http://lurker.clamav.net/message/20140928.130829.5494fd68.en.html
+---
+ clamdscan/proto.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/clamdscan/proto.c b/clamdscan/proto.c
+index 0205f6da0..d3396732f 100644
+--- a/clamdscan/proto.c
++++ b/clamdscan/proto.c
+@@ -42,6 +42,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <sys/types.h>
++#include <sys/un.h>
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+ #endif
+-- 
+2.14.3
+

package/clamav/0001-clamdscan.patch

@@ -1,21 +0,0 @@
-Fixes build error
-
-proto.c: In function ‘dconnect’:
-proto.c:86:67: error: invalid application of ‘sizeof’ to incomplete type ‘struct sockaddr_un’
-             if (connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock)) == 0)
-
-Patch sent upstream: http://lurker.clamav.net/message/20140928.130829.5494fd68.en.html
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr clamav-0.98.3.org/clamdscan/proto.c clamav-0.98.3/clamdscan/proto.c
---- clamav-0.98.3.org/clamdscan/proto.c	2014-05-06 20:39:56.000000000 +0200
-+++ clamav-0.98.3/clamdscan/proto.c	2014-05-10 10:41:44.000000000 +0200
-@@ -35,6 +35,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <sys/types.h>
-+#include <sys/un.h>
- #ifdef HAVE_SYS_SELECT_H
- #include <sys/select.h>
- #endif

package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch

@@ -1,4 +1,8 @@
-mbox: do not use backtrace if using uClibc without backtrace support
+From 053bac34b9f0f947c58fcdf80ac03d5a6b05aa12 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Mon, 7 May 2018 23:15:58 +0200
+Subject: [PATCH] mbox: do not use backtrace if using uClibc without backtrace
+ support
 
 Since uClibc can be configured without support for backtrace, disable
 the backtrace if we are building with a uClibc that was built without
@@ -8,10 +12,15 @@ This is a bit hacky, and would greatly benefit from a test in ./configure
 instead, but does nicely as a quick fix for now.
 
 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-diff -durN clamav-0.98.4.orig/libclamav/mbox.c clamav-0.98.4/libclamav/mbox.c
---- clamav-0.98.4.orig/libclamav/mbox.c	2014-05-21 17:25:05.000000000 +0200
-+++ clamav-0.98.4/libclamav/mbox.c	2014-11-16 17:21:04.885383286 +0100
-@@ -83,7 +83,7 @@
+---
+ libclamav/mbox.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libclamav/mbox.c b/libclamav/mbox.c
+index 71f540c0a..4851297a9 100644
+--- a/libclamav/mbox.c
++++ b/libclamav/mbox.c
+@@ -98,7 +98,7 @@
  #include <features.h>
  #endif
  
@@ -20,3 +29,6 @@ diff -durN clamav-0.98.4.orig/libclamav/mbox.c clamav-0.98.4/libclamav/mbox.c
  #define HAVE_BACKTRACE
  #endif
  #endif
+-- 
+2.14.3
+

package/clamav/0003-m4-reorganization-libs-curl.m4-fix-curl-config-detec.patch

@@ -0,0 +1,75 @@
+From 6b6ff53b5931c162be13504a1efc53fc5212f9d1 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Date: Mon, 7 May 2018 22:57:34 +0200
+Subject: [PATCH] m4/reorganization/libs/curl.m4: fix curl-config detection
+ logic
+
+The current logic in curl.m4 doesn't behave properly when
+--without-libcurl is passed to the ./configure script.
+
+Indeed, in this case what happens is that:
+
+ (1) Since --without-libcurl is passed, LIBCURL_HOME is set to nothing
+
+ (2) find_curl is set to "no"
+
+ (3) Due to find_curl being "no", LIBCURL_HOME is not set to
+     /usr/local and remains empty
+
+ (4) We test if $LIBCURL_HOME/bin/curl_config exists, which is
+     equivalent to testing if /bin/curl-config exists. So curl.m4 is
+     looking at /bin/curl-config, which is irrelevant in a
+     cross-compilation context: it is not because the build machine
+     has libcurl installed that it is available for the target.
+
+     Due to this mistake, it sets have_curl="yes"
+
+Due to this, the ./configure script assumes it can build the
+clamsubmit program, which fails at build time because curl/curl.h
+doesn't exist.
+
+To fix this, this commit rewrites the curl-config detection logic with
+a simpler loop. If find_curl=yes, it means we have to find libcurl
+ourselves, so we iterate over /usr/local and /usr, and check if a
+bin/curl-config binary is available there. If so, we use this path as
+LIBCURL_HOME and set have_curl="yes".
+
+This preserves the existing behavior, while fixing the situation where
+--without-libcurl is passed, but /bin/curl-config exists.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Upstream-status: https://github.com/Cisco-Talos/clamav-devel/pull/87
+---
+ m4/reorganization/libs/curl.m4 | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/m4/reorganization/libs/curl.m4 b/m4/reorganization/libs/curl.m4
+index 2a5966ee7..b6a9c2137 100644
+--- a/m4/reorganization/libs/curl.m4
++++ b/m4/reorganization/libs/curl.m4
+@@ -19,17 +19,12 @@ fi
+ [find_curl="yes"])
+ 
+ if test "X$find_curl" = "Xyes"; then
+-    LIBCURL_HOME=/usr/local
+-fi
+-if test -f "$LIBCURL_HOME/bin/curl-config"; then
+-    have_curl="yes"
+-else
+-    if test "X$find_curl" = "Xyes"; then
+-        LIBCURL_HOME=/usr
+-        if test -f "$LIBCURL_HOME/bin/curl-config"; then
+-            have_curl="yes"
++    for p in /usr/local /usr ; do
++        if test -f "${p}/bin/curl-config"; then
++           LIBCURL_HOME=$p
++           have_curl="yes"
+         fi
+-    fi
++    done
+ fi
+ 
+ if test "X$have_curl" = "Xyes"; then
+-- 
+2.14.3
+

package/clamav/clamav.mk

@@ -16,6 +16,8 @@ CLAMAV_DEPENDENCIES = \
 	openssl \
 	zlib \
 	$(TARGET_NLS_DEPENDENCIES)
+# 0003-m4-reorganization-libs-curl.m4-fix-curl-config-detec.patch
+CLAMAV_AUTORECONF = YES
 
 # mmap cannot be detected when cross-compiling, needed for mempool support
 CLAMAV_CONF_ENV = \

package/clang/clang.hash

@@ -1,3 +1,3 @@
 # locally calculated
-sha256 135f6c9b0cd2da1aff2250e065946258eb699777888df39ca5a5b4fe5e23d0ff cfe-5.0.1.src.tar.xz
+sha256 fa9ce9724abdb68f166deea0af1f71ca0dfa9af8f7e1261f2cae63c280282800  cfe-5.0.2.src.tar.xz
 sha256 de4c79665f0f5688b0ace17cba6f8e0343925bb95e0949d66d47bbd4527310d6 LICENSE.TXT

package/clang/clang.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CLANG_VERSION = 5.0.1
+CLANG_VERSION = 5.0.2
 CLANG_SITE = http://llvm.org/releases/$(CLANG_VERSION)
 CLANG_SOURCE = cfe-$(CLANG_VERSION).src.tar.xz
 CLANG_LICENSE = NCSA
@@ -85,5 +85,9 @@ define HOST_CLANG_INSTALL_CLANG_TBLGEN
 endef
 HOST_CLANG_POST_INSTALL_HOOKS = HOST_CLANG_INSTALL_CLANG_TBLGEN
 
+# This option must be enabled to link libclang dynamically against libLLVM.so
+HOST_CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON
+CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON
+
 $(eval $(cmake-package))
 $(eval $(host-cmake-package))

package/cups-filters/cups-filters.mk

@@ -40,7 +40,8 @@ else
 CUPS_FILTERS_CONF_OPTS += --disable-dbus
 endif
 
-ifeq ($(BR2_PACKAGE_AVAHI),y)
+# avahi support requires avahi-client, which needs avahi-daemon and dbus
+ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
 CUPS_FILTERS_DEPENDENCIES += avahi
 CUPS_FILTERS_CONF_OPTS += --enable-avahi
 else

package/dahdi-linux/dahdi-linux.mk

@@ -56,7 +56,7 @@ DAHDI_LINUX_MODULE_MAKE_OPTS = \
 
 define DAHDI_LINUX_EXTRACT_FW
 	$(foreach f,$(DAHDI_LINUX_FW_FILES),\
-		cp $(BR2_DL_DIR)/$(f) $(@D)/drivers/dahdi/firmware/$(f)$(sep))
+		cp $(DAHDI_LINUX_DL_DIR)/$(f) $(@D)/drivers/dahdi/firmware/$(f)$(sep))
 endef
 DAHDI_LINUX_POST_EXTRACT_HOOKS += DAHDI_LINUX_EXTRACT_FW
 

package/ecryptfs-utils/Config.in

@@ -7,6 +7,7 @@ config BR2_PACKAGE_ECRYPTFS_UTILS
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnss -> libnspr
 	depends on !BR2_MIPS_NABI32 # libnss
 	depends on !BR2_STATIC_LIBS # libnss, keyutils
+	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 # microblaze specific & GCC < 7.x
 	select BR2_PACKAGE_KEYUTILS
 	select BR2_PACKAGE_LIBNSS
 	# runtime dependency only, some scripts are using the
@@ -35,3 +36,6 @@ comment "ecryptfs-utils needs a toolchain w/ threads, wchar, dynami library"
 	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
 		BR2_STATIC_LIBS
+
+comment "ecryptfs needs a toolchain not affected by GCC bug 85862"
+	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 # libnss

package/elf2flt/elf2flt.mk

@@ -29,4 +29,20 @@ endif
 
 HOST_ELF2FLT_CONF_ENV = LIBS="$(HOST_ELF2FLT_LIBS)"
 
+# Hardlinks between binaries in different directories cause a problem
+# with rpath fixup, so we de-hardlink those binaries, and replace them
+# with copies instead. Note that elf2flt will rename ld to ld.real
+# before installing its own ld, but we already took care of the
+# original ld from binutils so that it is already de-hardlinked. So
+# ld is now the one from elf2flt, and we want to de-hardlinke it.
+ELF2FLT_TOOLS = elf2flt flthdr ld
+define HOST_ELF2FLT_FIXUP_HARDLINKS
+	$(foreach tool,$(ELF2FLT_TOOLS),\
+		rm -f $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool) && \
+		cp -a $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-$(tool) \
+			$(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool)
+	)
+endef
+HOST_ELF2FLT_POST_INSTALL_HOOKS += HOST_ELF2FLT_FIXUP_HARDLINKS
+
 $(eval $(host-autotools-package))

package/exim/0001-Build-buildconfig-for-the-host.patch

@@ -17,7 +17,7 @@ index 29a6ad3..420ba60 100644
 -	@echo "$(CC) buildconfig.c"
 -	$(FE)$(CC) $(CFLAGS) $(INCLUDE) -o buildconfig buildconfig.c $(LIBS)
 +	@echo "$(HOSTCC) buildconfig.c"
-+	$(FE)$(HOSTCC) $(HOSTCFLAGS) $(INCLUDE) -o buildconfig buildconfig.c $(LIBS)
++	$(FE)$(HOSTCC) $(HOSTCFLAGS) $(INCLUDE) -o buildconfig buildconfig.c
  
  
  # Target for the exicyclog utility script

package/faketime/0002-src-Makefile-disable-Werror.patch

@@ -0,0 +1,32 @@
+From bcde6e6f34c3cf78a254315c5caa530db91802fb Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Date: Thu, 17 May 2018 23:41:03 +0200
+Subject: [PATCH] src/Makefile: disable -Werror
+
+gcc 8.x has enabled additional warnings that break the build due to
+-Werror, so let's drop -Werror for now. A set of patches has been
+submitted upstream (https://github.com/wolfcw/libfaketime/pull/161) to
+properly fix the gcc 8.x issues, but in the mean time, disabling
+-Werror is a simpler option.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index bbbd476..6b0d2cd 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -67,7 +67,7 @@ INSTALL ?= install
+ PREFIX ?= /usr/local
+ LIBDIRNAME ?= /lib/faketime
+ 
+-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"'
++CFLAGS += -std=gnu99 -Wall -Wextra -Wno-nonnull-compare -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"'
+ LIB_LDFLAGS += -shared
+ LDFLAGS += -Wl,--version-script=libfaketime.map -lpthread
+ LDADD += -ldl -lm -lrt
+-- 
+2.14.3
+

package/gcc/Config.in.host

@@ -73,7 +73,7 @@ config BR2_GCC_VERSION
 	default "5.5.0"     if BR2_GCC_VERSION_5_X
 	default "6.4.0"     if BR2_GCC_VERSION_6_X
 	default "7.3.0"     if BR2_GCC_VERSION_7_X
-	default "arc-2018.03-rc1" if BR2_GCC_VERSION_ARC
+	default "arc-2018.03-rc2" if BR2_GCC_VERSION_ARC
 	default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS

package/gcc/gcc.hash

@@ -8,6 +8,6 @@ sha512  02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bb
 sha512  ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4  gcc-7.3.0.tar.xz
 
 # Locally calculated (fetched from Github)
-sha512  16e5f9d1637be9a099a996074dc43803803497965c1eab6c0057f10d193d30dcc405ad852df82c4f8c61b195195ee797b788ba0b235d7b03e4410806ac5f94bc  gcc-arc-2018.03-rc1.tar.gz
+sha512  a0faf2bb34f6c72b6460c6432639d89915cfc63456cfdf016896b3ef075655b2e9f26e745d841bbc38e776bc7a3729359cca88f1e4fb83489fa6775a3ccb55b8  gcc-arc-2018.03-rc2.tar.gz
 # Locally calculated (fetched from Github)
 sha512  2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1  gcc-or1k-musl-5.4.0-20170218.tar.gz

package/gdb/Config.in.host

@@ -74,7 +74,7 @@ endif
 # If cross-gdb is not enabled, the latest working version is chosen.
 config BR2_GDB_VERSION
 	string
-	default "arc-2018.03-rc1-gdb" if BR2_arc
+	default "arc-2018.03-rc2-gdb" if BR2_arc
 	default "7.10.1"   if BR2_GDB_VERSION_7_10
 	default "7.11.1"   if BR2_GDB_VERSION_7_11 || !BR2_PACKAGE_HOST_GDB
 	default "7.12.1"   if BR2_GDB_VERSION_7_12

package/gdb/gdb.hash

@@ -5,4 +5,4 @@ sha512  0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7
 sha512  5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1	gdb-8.0.1.tar.xz
 
 # Locally calculated (fetched from Github)
-sha512  975f0e09c9fd3ba1ca6aefdeb2da4b2804802606518c0cfdf7abe07c83a61341c1af5c2d2ddfd55ba6112fed420dedc529bc484d0c25b289bbed05edc99d0e72 	gdb-arc-2018.03-rc1-gdb.tar.gz
+sha512  0c58dd3e8fff8b51a459aba78f4acd1beaa3427e00a63a7242827f22c6af157e4aea91ab754cdc021e0075a5bf2b70df903dba67dbff2415fd0f82c8aab99087 	gdb-arc-2018.03-rc2-gdb.tar.gz

package/gdb/gdb.mk

@@ -109,7 +109,7 @@ GDB_CONF_OPTS = \
 	--without-x \
 	--disable-sim \
 	$(GDB_DISABLE_BINUTILS_CONF_OPTS) \
-	$(if $(BR2_PACKAGE_GDB_SERVER),--enable-gdbserver) \
+	$(if $(BR2_PACKAGE_GDB_SERVER),--enable-gdbserver,--disable-gdbserver) \
 	--with-curses \
 	--without-included-gettext \
 	--disable-werror \

package/glibc/glibc.hash

@@ -1,7 +1,7 @@
 # Locally calculated (fetched from Github)
 sha256  a74489d14f4017bee6a6c6fe76f1de0dbf7d66c8695116de5aadd141c4757892     glibc-glibc-2.27.tar.gz
 # Locally calculated (fetched from Github)
-sha256  d88f60081285b639122a49425e5fcf8c8cbb0f05efde7a3cb206089fae53c232     glibc-arc-2018.03-rc1.tar.gz
+sha256  ddc63360393ab88ab6a4a0c81d33481f34c5a9ebd758eec2e6bb35385058b4cb     glibc-arc-2018.03-rc2.tar.gz
 
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB

package/glibc/glibc.mk

@@ -5,7 +5,7 @@
 ################################################################################
 
 ifeq ($(BR2_arc),y)
-GLIBC_VERSION =  arc-2018.03-rc1
+GLIBC_VERSION =  arc-2018.03-rc2
 GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VERSION))
 else
 # Generate version string using:

package/go/0001-build.go-explicit-option-for-crosscompilation.patch

@@ -0,0 +1,40 @@
+From e1382a731a726293e30901038c6870fa77ef6095 Mon Sep 17 00:00:00 2001
+From: Angelo Compagnucci <angelo@amarulasolutions.com>
+Date: Tue, 8 May 2018 16:08:44 +0200
+Subject: [PATCH] build.go: explicit option for crosscompilation
+
+Actually if GOHOSTOS == GOOS || GOHOSTARCH == GOARCH the go build system
+assume it's not cross compiling and uses the same toolchain also for the
+bootstrap.  This is a problem in case the cross compilation mandates a
+different toolchain for bootstrap and target.  This patch adds
+GO_ASSUME_CROSSCOMPILING varible to assure that in case of cross
+compilation CC_FOR_TARGET can be different from CC.
+
+Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
+Signed-off-by: Anisse Astier <anisse@astier.eu>
+---
+ src/cmd/dist/build.go | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
+index 99d1db5..eb4097f 100644
+--- a/src/cmd/dist/build.go
++++ b/src/cmd/dist/build.go
+@@ -252,12 +252,13 @@ func xinit() {
+ // $CC_FOR_goos_goarch, if set, applies only to goos/goarch.
+ func compilerEnv(envName, def string) map[string]string {
+ 	m := map[string]string{"": def}
++	crosscompiling := os.Getenv("GO_ASSUME_CROSSCOMPILING")
+ 
+ 	if env := os.Getenv(envName); env != "" {
+ 		m[""] = env
+ 	}
+ 	if env := os.Getenv(envName + "_FOR_TARGET"); env != "" {
+-		if gohostos != goos || gohostarch != goarch {
++		if gohostos != goos || gohostarch != goarch || crosscompiling == "1" {
+ 			m[gohostos+"/"+gohostarch] = m[""]
+ 		}
+ 		m[""] = env
+-- 
+2.7.4
+

package/go/go.hash

@@ -1,2 +1,2 @@
 # From https://golang.org/dl/
-sha256	f3de49289405fda5fd1483a8fe6bd2fa5469e005fd567df64485c4fa000c7f24	go1.10.src.tar.gz
+sha256	6264609c6b9cd8ed8e02ca84605d727ce1898d74efa79841660b2e3e985a98bd	go1.10.2.src.tar.gz

package/go/go.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GO_VERSION = 1.10
+GO_VERSION = 1.10.2
 GO_SITE = https://storage.googleapis.com/golang
 GO_SOURCE = go$(GO_VERSION).src.tar.gz
 
@@ -58,13 +58,7 @@ else
 HOST_GO_CGO_ENABLED = 0
 endif
 
-# The go build system doesn't have the notion of cross compiling, but just the
-# notion of architecture.  When the host and target architectures are different
-# it expects to be given a target cross compiler in CC_FOR_TARGET.  When the
-# architectures are the same it will use CC_FOR_TARGET for both host and target
-# compilation.  To work around this limitation build and install a set of
-# compiler and tool binaries built with CC_FOR_TARGET set to the host compiler.
-# Also, the go build system is not compatible with ccache, so use
+# The go build system is not compatible with ccache, so use
 # HOSTCC_NOCCACHE.  See https://github.com/golang/go/issues/11685.
 HOST_GO_MAKE_ENV = \
 	GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_ROOT) \
@@ -75,31 +69,22 @@ HOST_GO_MAKE_ENV = \
 	$(if $(GO_GOARM),GOARM=$(GO_GOARM)) \
 	GOOS=linux \
 	CC=$(HOSTCC_NOCCACHE) \
-	CXX=$(HOSTCXX_NOCCACHE)
+	CXX=$(HOSTCXX_NOCCACHE) \
+	GO_ASSUME_CROSSCOMPILING=1
 
 HOST_GO_TARGET_CC = \
 	CC_FOR_TARGET="$(TARGET_CC)" \
 	CXX_FOR_TARGET="$(TARGET_CXX)"
 
-HOST_GO_HOST_CC = \
-	CC_FOR_TARGET=$(HOSTCC_NOCCACHE) \
-	CXX_FOR_TARGET=$(HOSTCXX_NOCCACHE)
-
-HOST_GO_TMP = $(@D)/host-go-tmp
-
 define HOST_GO_BUILD_CMDS
 	cd $(@D)/src && \
-		$(HOST_GO_MAKE_ENV) $(HOST_GO_HOST_CC) CGO_ENABLED=0 ./make.bash
-	mkdir -p $(HOST_GO_TMP)
-	mv $(@D)/pkg/tool $(HOST_GO_TMP)/
-	mv $(@D)/bin/ $(HOST_GO_TMP)/
-	cd $(@D)/src && \
-		$(HOST_GO_MAKE_ENV) $(HOST_GO_TARGET_CC) CGO_ENABLED=$(HOST_GO_CGO_ENABLED) ./make.bash
+		$(HOST_GO_MAKE_ENV) $(HOST_GO_TARGET_CC) CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \
+		./make.bash $(if $(VERBOSE),-v)
 endef
 
 define HOST_GO_INSTALL_CMDS
-	$(INSTALL) -D -m 0755 $(HOST_GO_TMP)/bin/go $(HOST_GO_ROOT)/bin/go
-	$(INSTALL) -D -m 0755 $(HOST_GO_TMP)/bin/gofmt $(HOST_GO_ROOT)/bin/gofmt
+	$(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_ROOT)/bin/go
+	$(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_ROOT)/bin/gofmt
 
 	ln -sf ../lib/go/bin/go $(HOST_DIR)/bin/
 	ln -sf ../lib/go/bin/gofmt $(HOST_DIR)/bin/
@@ -108,7 +93,7 @@ define HOST_GO_INSTALL_CMDS
 
 	mkdir -p $(HOST_GO_ROOT)/pkg
 	cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/
-	cp -a $(HOST_GO_TMP)/tool $(HOST_GO_ROOT)/pkg/
+	cp -a $(@D)/pkg/tool $(HOST_GO_ROOT)/pkg/
 
 	# There is a known issue which requires the go sources to be installed
 	# https://golang.org/issue/2775
@@ -116,7 +101,7 @@ define HOST_GO_INSTALL_CMDS
 
 	# Set all file timestamps to prevent the go compiler from rebuilding any
 	# built in packages when programs are built.
-	find $(HOST_GO_ROOT) -type f -exec touch -r $(HOST_GO_TMP)/bin/go {} \;
+	find $(HOST_GO_ROOT) -type f -exec touch -r $(@D)/bin/go {} \;
 endef
 
 $(eval $(host-generic-package))

package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk

@@ -8,10 +8,10 @@ GST1_PLUGINS_BAD_VERSION = 1.12.4
 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz
 GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad
 GST1_PLUGINS_BAD_INSTALL_STAGING = YES
-# Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE and
+# Additional plugin licenses will be appended to GST1_PLUGINS_BAD_LICENSE and
 # GST1_PLUGINS_BAD_LICENSE_FILES if enabled.
 GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB
-GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+, LGPL-2.1+
+GST1_PLUGINS_BAD_LICENSE := LGPL-2.0+, LGPL-2.1+
 
 GST1_PLUGINS_BAD_CONF_OPTS = \
 	--disable-examples \
@@ -198,7 +198,6 @@ endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiovisualizers
-GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
 else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiovisualizers
 endif
@@ -379,7 +378,7 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-mxf
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_NETSIM),y)
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NETSIM),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-netsim
 else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-netsim
@@ -514,6 +513,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-yadif
+GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
 else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-yadif
 endif
@@ -585,7 +585,6 @@ endif
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-fdk_aac
 GST1_PLUGINS_BAD_DEPENDENCIES += fdk-aac
-GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y
 else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-fdk_aac
 endif
@@ -632,6 +631,7 @@ endif
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-dtls
 GST1_PLUGINS_BAD_DEPENDENCIES += openssl
+GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE = y
 else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-dtls
 endif
@@ -682,6 +682,7 @@ endif
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-openh264
 GST1_PLUGINS_BAD_DEPENDENCIES += libopenh264
+GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE = y
 else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-openh264
 endif
@@ -771,13 +772,18 @@ endif
 
 # Add GPL license if GPL licensed plugins enabled.
 ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y)
-GST1_PLUGINS_BAD_LICENSE += GPL
+GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL-2.0+
 GST1_PLUGINS_BAD_LICENSE_FILES += COPYING
 endif
 
+# Add BSD license if BSD licensed plugins enabled.
+ifeq ($(GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE),y)
+GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), BSD-2-Clause
+endif
+
 # Add Unknown license if Unknown licensed plugins enabled.
 ifeq ($(GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE),y)
-GST1_PLUGINS_BAD_LICENSE += UNKNOWN
+GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), UNKNOWN
 endif
 
 # Use the following command to extract license info for plugins.

package/imx-mkimage/imx-mkimage.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 17e8285a346eb19d00780b13916dc281421c5b955707b9f2a662a6734142f1fb  imx-mkimage-rel_imx_4.9.51_8mq_ga.tar.gz
+sha256 bc79e11cfbde303e200287fa6624028c8ce5344f8a35ed179b3fe217d74155da  imx-mkimage-rel_imx_4.9.51_8mq_ga.tar.gz
 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c  iMX8dv/COPYING

package/ipsec-tools/Config.in

@@ -57,17 +57,17 @@ config BR2_PACKAGE_IPSEC_TOOLS_HYBRID
 
 choice
 	prompt "Security context"
-	default BR2_PACKAGE_IPSEC_SECCTX_DISABLE
+	default BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE
 	help
 	  Selects whether or not to enable security context support.
 
-config BR2_PACKAGE_IPSEC_SECCTX_DISABLE
+config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE
 	bool "Disable security context support"
 
-config BR2_PACKAGE_IPSEC_SECCTX_ENABLE
+config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE
 	bool "Enable SELinux security context support"
 
-config BR2_PACKAGE_IPSEC_SECCTX_KERNEL
+config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL
 	bool "Enable kernel security context"
 
 endchoice

package/ipsec-tools/ipsec-tools.mk

@@ -68,13 +68,13 @@ else
 IPSEC_TOOLS_CONF_OPTS += --disable-hybrid
 endif
 
-ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_DISABLE),y)
+ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE),y)
 IPSEC_TOOLS_CONF_OPTS += --enable-security-context=no
 endif
-ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_ENABLE),y)
+ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE),y)
 IPSEC_TOOLS_CONF_OPTS += --enable-security-context=yes
 endif
-ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_KERNEL),y)
+ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL),y)
 IPSEC_TOOLS_CONF_OPTS += --enable-security-context=kernel
 endif
 

package/jamvm/Config.in

@@ -1,10 +1,17 @@
+config BR2_PACKAGE_JAMVM_ARCH_SUPPORTS
+	bool
+	default y if BR2_arm || BR2_armeb
+	default y if BR2_i386 || BR2_x86_64
+	default y if (BR2_mips || BR2_mipsel) \
+		&& (BR2_MIPS_FP32_MODE_32 || BR2_MIPS_SOFT_FLOAT)
+	default y if BR2_powerpc
+
 config BR2_PACKAGE_JAMVM
 	bool "jamvm"
+	depends on BR2_PACKAGE_JAMVM_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
-	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
-		|| BR2_mips || BR2_mipsel || BR2_powerpc
-	depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_CLASSPATH
 	help
@@ -14,7 +21,6 @@ config BR2_PACKAGE_JAMVM
 	  http://jamvm.sf.net
 
 comment "jamvm needs a toolchain w/ threads, dynamic library"
-	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
-		|| BR2_mips || BR2_mipsel || BR2_powerpc
+	depends on BR2_PACKAGE_JAMVM_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

package/janus-gateway/Config.in

@@ -19,21 +19,21 @@ if BR2_PACKAGE_JANUS_GATEWAY
 
 comment "plugins"
 
-config BR2_PACKAGE_JANUS_AUDIO_BRIDGE
+config BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE
 	bool "audio bridge"
 	select BR2_PACKAGE_OPUS
 
-config BR2_PACKAGE_JANUS_ECHO_TEST
+config BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST
 	bool "echo test"
 
-config BR2_PACKAGE_JANUS_RECORDPLAY
+config BR2_PACKAGE_JANUS_GATEWAY_RECORDPLAY
 	bool "record and play"
 
-config BR2_PACKAGE_JANUS_SIP_GATEWAY
+config BR2_PACKAGE_JANUS_GATEWAY_SIP_GATEWAY
 	bool "sip gateway"
 	select BR2_PACKAGE_SOFIA_SIP
 
-config  BR2_PACKAGE_JANUS_STREAMING
+config BR2_PACKAGE_JANUS_GATEWAY_STREAMING
 	bool "streaming"
 	# SO_REUSEPORT
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
@@ -41,22 +41,22 @@ config  BR2_PACKAGE_JANUS_STREAMING
 comment "streaming plugin needs a toolchain w/ headers >= 3.9"
 	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
 
-config BR2_PACKAGE_JANUS_TEXT_ROOM
+config BR2_PACKAGE_JANUS_GATEWAY_TEXT_ROOM
 	bool "text room"
 
-config BR2_PACKAGE_JANUS_VIDEO_CALL
+config BR2_PACKAGE_JANUS_GATEWAY_VIDEO_CALL
 	bool "video call"
 
-config BR2_PACKAGE_JANUS_VIDEO_ROOM
+config BR2_PACKAGE_JANUS_GATEWAY_VIDEO_ROOM
 	bool "video room"
 
-config BR2_PACKAGE_JANUS_VOICE_MAIL
+config BR2_PACKAGE_JANUS_GATEWAY_VOICE_MAIL
 	bool "voice mail"
 	select BR2_PACKAGE_LIBOGG
 
 comment "transports"
 
-config BR2_PACKAGE_JANUS_MQTT
+config BR2_PACKAGE_JANUS_GATEWAY_MQTT
 	bool "MQTT"
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
@@ -65,7 +65,7 @@ config BR2_PACKAGE_JANUS_MQTT
 comment "MQTT transport needs a toolchain w/ threads and dynamic library support"
 	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
 
-config BR2_PACKAGE_JANUS_RABBITMQ
+config BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ
 	bool "RabbitMQ"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_RABBITMQ_C
@@ -73,7 +73,7 @@ config BR2_PACKAGE_JANUS_RABBITMQ
 comment "RabbitMQ transport needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
-config BR2_PACKAGE_JANUS_REST
+config BR2_PACKAGE_JANUS_GATEWAY_REST
 	bool "REST (HTTP/HTTPS)"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LIBMICROHTTPD
@@ -81,11 +81,11 @@ config BR2_PACKAGE_JANUS_REST
 comment "REST transport needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
-config BR2_PACKAGE_JANUS_UNIX_SOCKETS
+config BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS
 	bool "Unix Sockets"
 	default y
 
-config BR2_PACKAGE_JANUS_WEBSOCKETS
+config BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS
 	bool "WebSockets"
 	depends on BR2_USE_MMU
 	select BR2_PACKAGE_LIBWEBSOCKETS

package/janus-gateway/janus-gateway.mk

@@ -26,91 +26,91 @@ JANUS_GATEWAY_CONF_OPTS = \
 	--disable-data-channels \
 	--disable-sample-event-handler
 
-ifeq ($(BR2_PACKAGE_JANUS_AUDIO_BRIDGE),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE),y)
 JANUS_GATEWAY_DEPENDENCIES += opus
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-audiobridge
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-audiobridge
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_ECHO_TEST),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST),y)
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-echotest
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-echotest
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_RECORDPLAY),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_RECORDPLAY),y)
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-recordplay
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-recordplay
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_SIP_GATEWAY),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_SIP_GATEWAY),y)
 JANUS_GATEWAY_DEPENDENCIES += sofia-sip
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-sip
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-sip
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_STREAMING),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_STREAMING),y)
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-streaming
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-streaming
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_TEXT_ROOM),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_TEXT_ROOM),y)
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-textroom
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-textroom
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_VIDEO_CALL),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_VIDEO_CALL),y)
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-videocall
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-videocall
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_VIDEO_ROOM),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_VIDEO_ROOM),y)
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-videoroom
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-videoroom
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_VOICE_MAIL),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_VOICE_MAIL),y)
 JANUS_GATEWAY_DEPENDENCIES += libogg
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-voicemail
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-voicemail
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_MQTT),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_MQTT),y)
 JANUS_GATEWAY_DEPENDENCIES += paho-mqtt-c
 JANUS_GATEWAY_CONF_OPTS += --enable-mqtt
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-mqtt
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_RABBITMQ),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ),y)
 JANUS_GATEWAY_DEPENDENCIES += rabbitmq-c
 JANUS_GATEWAY_CONF_OPTS += --enable-rabbitmq
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-rabbitmq
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_REST),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_REST),y)
 JANUS_GATEWAY_DEPENDENCIES += libmicrohttpd
 JANUS_GATEWAY_CONF_OPTS += --enable-rest
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-rest
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_UNIX_SOCKETS),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS),y)
 JANUS_GATEWAY_CONF_OPTS += --enable-unix-sockets
 else
 JANUS_GATEWAY_CONF_OPTS += --disable-unix-sockets
 endif
 
-ifeq ($(BR2_PACKAGE_JANUS_WEBSOCKETS),y)
+ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS),y)
 JANUS_GATEWAY_DEPENDENCIES += libwebsockets
 JANUS_GATEWAY_CONF_OPTS += --enable-websockets
 else

package/jquery-ui-themes/Config.in

@@ -13,105 +13,105 @@ choice
 	help
 	  Specify the jQuery UI theme to install.
 
-config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
+config BR2_PACKAGE_JQUERY_UI_THEMES_BLACK_TIE
 	bool "black-tie"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_BLITZER
+config BR2_PACKAGE_JQUERY_UI_THEMES_BLITZER
 	bool "blitzer"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO
+config BR2_PACKAGE_JQUERY_UI_THEMES_CUPERTINO
 	bool "cupertino"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE
+config BR2_PACKAGE_JQUERY_UI_THEMES_DARK_HIVE
 	bool "dark-hive"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV
+config BR2_PACKAGE_JQUERY_UI_THEMES_DOT_LUV
 	bool "dot-luv"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT
+config BR2_PACKAGE_JQUERY_UI_THEMES_EGGPLANT
 	bool "eggplant"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE
+config BR2_PACKAGE_JQUERY_UI_THEMES_EXCITE_BIKE
 	bool "excite-bike"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_FLICK
+config BR2_PACKAGE_JQUERY_UI_THEMES_FLICK
 	bool "flick"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS
+config BR2_PACKAGE_JQUERY_UI_THEMES_HOT_SNEAKS
 	bool "hot-sneaks"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY
+config BR2_PACKAGE_JQUERY_UI_THEMES_HUMANITY
 	bool "humanity"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG
+config BR2_PACKAGE_JQUERY_UI_THEMES_LE_FROG
 	bool "le-frog"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC
+config BR2_PACKAGE_JQUERY_UI_THEMES_MINT_CHOC
 	bool "mint-choc"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST
+config BR2_PACKAGE_JQUERY_UI_THEMES_OVERCAST
 	bool "overcast"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER
+config BR2_PACKAGE_JQUERY_UI_THEMES_PEPPER_GRINDER
 	bool "pepper-grinder"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_REDMOND
+config BR2_PACKAGE_JQUERY_UI_THEMES_REDMOND
 	bool "redmond"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS
+config BR2_PACKAGE_JQUERY_UI_THEMES_SMOOTHNESS
 	bool "smoothness"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET
+config BR2_PACKAGE_JQUERY_UI_THEMES_SOUTH_STREET
 	bool "south-street"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_START
+config BR2_PACKAGE_JQUERY_UI_THEMES_START
 	bool "start"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_SUNNY
+config BR2_PACKAGE_JQUERY_UI_THEMES_SUNNY
 	bool "sunny"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE
+config BR2_PACKAGE_JQUERY_UI_THEMES_SWANKY_PURSE
 	bool "swanky-purse"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC
+config BR2_PACKAGE_JQUERY_UI_THEMES_TRONTASTIC
 	bool "trontastic"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS
+config BR2_PACKAGE_JQUERY_UI_THEMES_UI_DARKNESS
 	bool "ui-darkness"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS
+config BR2_PACKAGE_JQUERY_UI_THEMES_UI_LIGHTNESS
 	bool "ui-lightness"
 
-config BR2_PACKAGE_JQUERY_UI_THEME_VADER
+config BR2_PACKAGE_JQUERY_UI_THEMES_VADER
 	bool "vader"
 
 endchoice
 
 config BR2_PACKAGE_JQUERY_UI_THEMES_THEME
 	string
-	default "black-tie"		if BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
-	default "blitzer"		if BR2_PACKAGE_JQUERY_UI_THEME_BLITZER
-	default "cupertino"		if BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO
-	default "dark-hive"		if BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE
-	default "dot-luv"		if BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV
-	default "eggplant"		if BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT
-	default "excite-bike"		if BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE
-	default "flick"			if BR2_PACKAGE_JQUERY_UI_THEME_FLICK
-	default "hot-sneaks"		if BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS
-	default "humanity"		if BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY
-	default "le-frog"		if BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG
-	default "mint-choc"		if BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC
-	default "overcast"		if BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST
-	default "pepper-grinder"	if BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER
-	default "redmond"		if BR2_PACKAGE_JQUERY_UI_THEME_REDMOND
-	default "smoothness"		if BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS
-	default "south-street"		if BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET
-	default "start"			if BR2_PACKAGE_JQUERY_UI_THEME_START
-	default "sunny"			if BR2_PACKAGE_JQUERY_UI_THEME_SUNNY
-	default "swanky-purse"		if BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE
-	default "trontastic"		if BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC
-	default "ui-darkness"		if BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS
-	default "ui-lightness"		if BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS
-	default "vader"			if BR2_PACKAGE_JQUERY_UI_THEME_UI_VADER
+	default "black-tie"		if BR2_PACKAGE_JQUERY_UI_THEMES_BLACK_TIE
+	default "blitzer"		if BR2_PACKAGE_JQUERY_UI_THEMES_BLITZER
+	default "cupertino"		if BR2_PACKAGE_JQUERY_UI_THEMES_CUPERTINO
+	default "dark-hive"		if BR2_PACKAGE_JQUERY_UI_THEMES_DARK_HIVE
+	default "dot-luv"		if BR2_PACKAGE_JQUERY_UI_THEMES_DOT_LUV
+	default "eggplant"		if BR2_PACKAGE_JQUERY_UI_THEMES_EGGPLANT
+	default "excite-bike"		if BR2_PACKAGE_JQUERY_UI_THEMES_EXCITE_BIKE
+	default "flick"			if BR2_PACKAGE_JQUERY_UI_THEMES_FLICK
+	default "hot-sneaks"		if BR2_PACKAGE_JQUERY_UI_THEMES_HOT_SNEAKS
+	default "humanity"		if BR2_PACKAGE_JQUERY_UI_THEMES_HUMANITY
+	default "le-frog"		if BR2_PACKAGE_JQUERY_UI_THEMES_LE_FROG
+	default "mint-choc"		if BR2_PACKAGE_JQUERY_UI_THEMES_MINT_CHOC
+	default "overcast"		if BR2_PACKAGE_JQUERY_UI_THEMES_OVERCAST
+	default "pepper-grinder"	if BR2_PACKAGE_JQUERY_UI_THEMES_PEPPER_GRINDER
+	default "redmond"		if BR2_PACKAGE_JQUERY_UI_THEMES_REDMOND
+	default "smoothness"		if BR2_PACKAGE_JQUERY_UI_THEMES_SMOOTHNESS
+	default "south-street"		if BR2_PACKAGE_JQUERY_UI_THEMES_SOUTH_STREET
+	default "start"			if BR2_PACKAGE_JQUERY_UI_THEMES_START
+	default "sunny"			if BR2_PACKAGE_JQUERY_UI_THEMES_SUNNY
+	default "swanky-purse"		if BR2_PACKAGE_JQUERY_UI_THEMES_SWANKY_PURSE
+	default "trontastic"		if BR2_PACKAGE_JQUERY_UI_THEMES_TRONTASTIC
+	default "ui-darkness"		if BR2_PACKAGE_JQUERY_UI_THEMES_UI_DARKNESS
+	default "ui-lightness"		if BR2_PACKAGE_JQUERY_UI_THEMES_UI_LIGHTNESS
+	default "vader"			if BR2_PACKAGE_JQUERY_UI_THEMES_UI_VADER
 
 endif

package/libcap/libcap.mk

@@ -18,6 +18,9 @@ HOST_LIBCAP_DEPENDENCIES = host-gperf
 ifeq ($(BR2_STATIC_LIBS),y)
 LIBCAP_MAKE_TARGET = libcap.a libcap.pc
 LIBCAP_MAKE_INSTALL_TARGET = install-static
+else ifeq ($(BR2_SHARED_LIBS),y)
+LIBCAP_MAKE_TARGET = all
+LIBCAP_MAKE_INSTALL_TARGET = install-shared
 else
 LIBCAP_MAKE_TARGET = all
 LIBCAP_MAKE_INSTALL_TARGET = install

package/libcoap/libcoap.mk

@@ -9,6 +9,7 @@ LIBCOAP_SITE = $(call github,obgm,libcoap,$(LIBCOAP_VERSION))
 LIBCOAP_INSTALL_STAGING = YES
 LIBCOAP_LICENSE = GPL-2.0+ or BSD-2-Clause
 LIBCOAP_LICENSE_FILES = COPYING LICENSE.GPL LICENSE.BSD
+LIBCOAP_DEPENDENCIES = host-pkgconf
 LIBCOAP_CONF_OPTS = --disable-examples
 LIBCOAP_AUTORECONF = YES
 

package/libcurl/0001-Fix-link-with-ssh2-built-with-a-static-mbedtls.patch

@@ -0,0 +1,40 @@
+From b5fbc486e805805efb8400373ccec2a3dee1c81b Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Mon, 21 May 2018 12:07:00 +0200
+Subject: [PATCH 1/1] Fix link with ssh2 built with a static mbedtls
+
+The ssh2 pkg-config file could contain the following lines when build
+with a static version of mbedtls:
+   Libs: -L${libdir} -lssh2 /xxx/libmbedcrypto.a
+   Libs.private: /xxx/libmbedcrypto.a
+
+This static mbedtls library must be used to correctly detect ssh2
+support and this library must be copied in libcurl.pc otherwise
+compilation of any application (such as upmpdcli) with libcurl will fail
+when trying to found mbedtls functions included in libssh2.
+So, replace pkg-config --libs-only-l by pkg-config --libs.
+
+Fixes:
+ - http://autobuild.buildroot.net/results/43e24b22a77f616d6198c10435dcc23cc3b9088a
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5569a26b4..9e2606885 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -2766,7 +2766,7 @@ if test X"$OPT_LIBSSH2" != Xno; then
+     CURL_CHECK_PKGCONFIG(libssh2)
+ 
+     if test "$PKGCONFIG" != "no" ; then
+-      LIB_SSH2=`$PKGCONFIG --libs-only-l libssh2`
++      LIB_SSH2=`$PKGCONFIG --libs libssh2`
+       LD_SSH2=`$PKGCONFIG --libs-only-L libssh2`
+       CPP_SSH2=`$PKGCONFIG --cflags-only-I libssh2`
+       version=`$PKGCONFIG --modversion libssh2`
+-- 
+2.14.1
+

package/libcurl/0001-openssl-fix-build-with-LibreSSL-2.7.patch

@@ -1,75 +0,0 @@
-From de115e14079d12e8826eabaa396677dc40beb5d1 Mon Sep 17 00:00:00 2001
-From: Bernard Spil <brnrd@FreeBSD.org>
-Date: Mon, 2 Apr 2018 19:04:06 +0200
-Subject: [PATCH] openssl: fix build with LibreSSL 2.7
-
- - LibreSSL 2.7 implements (most of) OpenSSL 1.1 API
-
-Fixes #2319
-Closes #2447
-Closes #2448
-
-Signed-off-by: Bernard Spil <brnrd@FreeBSD.org>
-(cherry picked from commit 7c90c93c0b061da81f69fabdd57125b2783c15fb)
-Signed-off-by: Adam Duskett <aduskett@gmail.com>
----
- lib/vtls/openssl.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
-index 2a6b3cfac..bbb8ec766 100644
---- a/lib/vtls/openssl.c
-+++ b/lib/vtls/openssl.c
-@@ -104,7 +104,8 @@
- #endif
- 
- #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && /* OpenSSL 1.1.0+ */ \
--  !defined(LIBRESSL_VERSION_NUMBER)
-+    !(defined(LIBRESSL_VERSION_NUMBER) && \
-+      LIBRESSL_VERSION_NUMBER < 0x20700000L)
- #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER
- #define HAVE_X509_GET0_EXTENSIONS 1 /* added in 1.1.0 -pre1 */
- #define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */
-@@ -128,7 +129,8 @@ static unsigned long OpenSSL_version_num(void)
- #endif
- 
- #if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* 1.0.2 or later */ \
--  !defined(LIBRESSL_VERSION_NUMBER)
-+    !(defined(LIBRESSL_VERSION_NUMBER) && \
-+      LIBRESSL_VERSION_NUMBER < 0x20700000L)
- #define HAVE_X509_GET0_SIGNATURE 1
- #endif
- 
-@@ -147,7 +149,7 @@ static unsigned long OpenSSL_version_num(void)
-  * Whether SSL_CTX_set_keylog_callback is available.
-  * OpenSSL: supported since 1.1.1 https://github.com/openssl/openssl/pull/2287
-  * BoringSSL: supported since d28f59c27bac (committed 2015-11-19)
-- * LibreSSL: unsupported in at least 2.5.1 (explicitly check for it since it
-+ * LibreSSL: unsupported in at least 2.7.2 (explicitly check for it since it
-  *           lies and pretends to be OpenSSL 2.0.0).
-  */
- #if (OPENSSL_VERSION_NUMBER >= 0x10101000L && \
-@@ -259,7 +261,9 @@ static void tap_ssl_key(const SSL *ssl, ssl_tap_state_t *state)
-   if(!session || !keylog_file_fp)
-     return;
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
-+    !(defined(LIBRESSL_VERSION_NUMBER) && \
-+      LIBRESSL_VERSION_NUMBER < 0x20700000L)
-   /* ssl->s3 is not checked in openssl 1.1.0-pre6, but let's assume that
-    * we have a valid SSL context if we have a non-NULL session. */
-   SSL_get_client_random(ssl, client_random, SSL3_RANDOM_SIZE);
-@@ -2082,8 +2086,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
-   case CURL_SSLVERSION_TLSv1_2:
-   case CURL_SSLVERSION_TLSv1_3:
-     /* it will be handled later with the context options */
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
--    !defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-     req_method = TLS_client_method();
- #else
-     req_method = SSLv23_client_method();
--- 
-2.14.3
-

package/libcurl/libcurl.hash

@@ -1,4 +1,4 @@
 # Locally calculated after checking pgp signature
-# https://curl.haxx.se/download/curl-7.59.0.tar.xz.asc
-sha256 e44eaabdf916407585bf5c7939ff1161e6242b6b015d3f2f5b758b2a330461fc  curl-7.59.0.tar.xz
+# https://curl.haxx.se/download/curl-7.60.0.tar.xz.asc
+sha256 8736ff8ded89ddf7e926eec7b16f82597d029fc1469f3a551f1fafaac164e6a0  curl-7.60.0.tar.xz
 sha256 5f3849ec38ddb927e79f514bf948890c41b8d1407286a49609b8fb1585931095  COPYING

package/libcurl/libcurl.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBCURL_VERSION = 7.59.0
+LIBCURL_VERSION = 7.60.0
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz
 LIBCURL_SITE = https://curl.haxx.se/download
 LIBCURL_DEPENDENCIES = host-pkgconf \
@@ -14,6 +14,8 @@ LIBCURL_DEPENDENCIES = host-pkgconf \
 LIBCURL_LICENSE = curl
 LIBCURL_LICENSE_FILES = COPYING
 LIBCURL_INSTALL_STAGING = YES
+# We're patching configure.ac
+LIBCURL_AUTORECONF = YES
 
 # We disable NTLM support because it uses fork(), which doesn't work
 # on non-MMU platforms. Moreover, this authentication method is

package/libftdi/Config.in

@@ -10,7 +10,7 @@ config BR2_PACKAGE_LIBFTDI
 
 if BR2_PACKAGE_LIBFTDI
 
-config BR2_PACKAGE_LIBTFDI_CPP
+config BR2_PACKAGE_LIBFTDI_CPP
 	bool "C++ bindings"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR

package/libftdi/libftdi.mk

@@ -15,7 +15,7 @@ LIBFTDI_AUTORECONF = YES
 LIBFTDI_CONF_OPTS = --without-examples
 
 # configure detect it automaticaly so we need to force it
-ifeq ($(BR2_PACKAGE_LIBTFDI_CPP),y)
+ifeq ($(BR2_PACKAGE_LIBFTDI_CPP),y)
 LIBFTDI_DEPENDENCIES += boost
 LIBFTDI_CONF_OPTS += --enable-libftdipp
 else

package/libkcapi/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBKCAPI
 	bool "libkcapi"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	help
 	  Linux Kernel Crypto API userspace interface library
 

package/libkrb5/libkrb5.mk

@@ -28,7 +28,8 @@ LIBKRB5_CONF_OPTS = \
 	--without-system-et \
 	--without-system-ss \
 	--without-system-verto \
-	--without-tcl
+	--without-tcl \
+	--disable-rpath
 
 ifeq ($(BR2_PACKAGE_OPENLDAP),y)
 LIBKRB5_CONF_OPTS += --with-ldap

package/libmediaart/Config.in

@@ -20,17 +20,17 @@ choice
 	prompt "media art backend"
 	default BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
 
-config BR2_PACKAGE_MEDIAART_BACKEND_NONE
+config BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
 	bool "none"
 	help
 	  With no backend, libmediaart will not be able to process MP3
 	  album art.
 
-config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF
+config BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF
 	bool "gdk-pixbuf"
 	select BR2_PACKAGE_GDK_PIXBUF
 
-config BR2_PACKAGE_MEDIAART_BACKEND_QT
+config BR2_PACKAGE_LIBMEDIAART_BACKEND_QT
 	bool "Qt"
 	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
 	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
@@ -41,4 +41,4 @@ comment "Qt backend depends on Qt or Qt5"
 
 endchoice
 
-endif # BR2_PACKAGE_MEDIAART
+endif # BR2_PACKAGE_LIBMEDIAART

package/libmediaart/libmediaart.mk

@@ -15,12 +15,12 @@ LIBMEDIAART_INSTALL_STAGING = YES
 LIBMEDIAART_DEPENDENCIES = libglib2
 LIBMEDIAART_CONF_OPTS = --disable-unit-tests
 
-ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF),y)
+ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF),y)
 LIBMEDIAART_DEPENDENCIES += gdk-pixbuf
 LIBMEDIAART_CONF_OPTS += \
 	--enable-gdkpixbuf \
 	--disable-qt
-else ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_QT),y)
+else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_QT),y)
 # qt5 needs c++11 (since qt-5.7)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
@@ -31,7 +31,7 @@ LIBMEDIAART_DEPENDENCIES += \
 LIBMEDIAART_CONF_OPTS += \
 	--disable-gdkpixbuf \
 	--enable-qt
-else ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_NONE),y)
+else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE),y)
 LIBMEDIAART_CONF_OPTS += \
 	--disable-gdkpixbuf \
 	--disable-qt

package/libmodbus/libmodbus.hash

@@ -1,2 +1,3 @@
 # Locally computed
 sha256  c8c862b0e9a7ba699a49bc98f62bdffdfafd53a5716c0e162696b4bf108d3637  libmodbus-3.1.4.tar.gz
+sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LESSER

package/libmodplug/libmodplug.hash

@@ -1,2 +1,3 @@
 # Locally computed:
 sha256  77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad  libmodplug-0.8.8.5.tar.gz
+sha256  49942e7b3b175f549e751feb08b5270ca6f6c5fb7a1be9f9517db275ec32c92e  COPYING

package/libmpd/libmpd.hash

@@ -1,2 +1,3 @@
 # Locally calculated
 sha256	fe20326b0d10641f71c4673fae637bf9222a96e1712f71f170fca2fc34bf7a83	libmpd-11.8.17.tar.gz
+sha256	ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6	COPYING

package/libnetfilter_cthelper/libnetfilter_cthelper.hash

@@ -1,3 +1,6 @@
 # From ftp://ftp.netfilter.org/pub/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0.tar.bz2.{md5sum,sha1sum}
 md5	b2efab1a3a198a5add448960ba011acd	libnetfilter_cthelper-1.0.0.tar.bz2
 sha1	5d0a82794bd46aafde20c16800edca23d563de66	libnetfilter_cthelper-1.0.0.tar.bz2
+
+# Hash for license file:
+sha256	91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad	COPYING

package/libnetfilter_cttimeout/libnetfilter_cttimeout.hash

@@ -1,3 +1,6 @@
 # From ftp://ftp.netfilter.org/pub/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.tar.bz2.{md5sum,sha1sum}
 md5	7697437fc9ebb6f6b83df56a633db7f9	libnetfilter_cttimeout-1.0.0.tar.bz2
 sha1	24cba24b0371e80007be4ea0fa9d872df63b8a7a	libnetfilter_cttimeout-1.0.0.tar.bz2
+
+# Hash for license file:
+sha256	91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad	COPYING

package/libnetfilter_log/libnetfilter_log.hash

@@ -1,3 +1,6 @@
 # From ftp://ftp.netfilter.org/pub/libnetfilter_log/libnetfilter_log-1.0.1.tar.bz2.{md5sum,sha1sum}
 md5	2a4bb0654ae675a52d2e8d1c06090b94	libnetfilter_log-1.0.1.tar.bz2
 sha1	0b95bcb1ad15eea906fa3607cd6c2290bd48d5bd	libnetfilter_log-1.0.1.tar.bz2
+
+# Hash for license file:
+sha256	91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad	COPYING

package/libnfc/libnfc.hash

@@ -1,2 +1,3 @@
 # Locally computed:
 sha256 945e74d8e27683f9b8a6f6e529557b305d120df347a960a6a7ead6cb388f4072  libnfc-1.7.1.tar.bz2
+sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1  COPYING

package/libnfnetlink/libnfnetlink.hash

@@ -1,3 +1,6 @@
 # From ftp://ftp.netfilter.org/pub/libnfnetlink/libnfnetlink-1.0.1.tar.bz2.{md5sum,sha1sum}
 md5	98927583d2016a9fb1936fed992e2c5e	libnfnetlink-1.0.1.tar.bz2
 sha1	27ae2dfbd976e28cb7a417f9e946c901f512dd9a	libnfnetlink-1.0.1.tar.bz2
+
+# Hash for license file:
+sha256	91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad	COPYING

package/libnss/0004-Bug-1438426-Avoid-stringop-truncation-warning-r-fran.patch

@@ -0,0 +1,33 @@
+From f0ce70989526fc9a0223398c99ea0d09777ea5df Mon Sep 17 00:00:00 2001
+From: Martin Thomson <martin.thomson@gmail.com>
+Date: Thu, 15 Feb 2018 16:34:02 +1100
+Subject: [PATCH] Bug 1438426 - Avoid stringop-truncation warning, r=franziskus
+
+--HG--
+extra : rebase_source : 4ea1630d0da0ce3523309e3da33ee50961682242
+
+Upstream-commit: https://github.com/nss-dev/nss/commit/f0ce70989526fc9a0223398c99ea0d09777ea5df
+[Thomas: edited after git format-patch to add the nss/ prefix needed
+for the patch to apply properly on the source code extracted by the
+tarball.]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ nss/coreconf/nsinstall/pathsub.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/coreconf/nsinstall/pathsub.c b/nss/coreconf/nsinstall/pathsub.c
+index a42a9f30a..c31a946f0 100644
+--- a/nss/coreconf/nsinstall/pathsub.c
++++ b/nss/coreconf/nsinstall/pathsub.c
+@@ -212,7 +212,7 @@ reversepath(char *inpath, char *name, int len, char *outpath)
+ 	    xchdir("..");
+ 	} else {
+ 	    cp -= 3;
+-	    strncpy(cp, "../", 3);
++	    memcpy(cp, "../", 3);
+ 	    xchdir(buf);
+ 	}
+     }
+-- 
+2.14.3
+

package/libnss/Config.in

@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBNSS
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnspr
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnspr
 	depends on !BR2_STATIC_LIBS
+	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862
 	select BR2_PACKAGE_LIBNSPR
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_ZLIB
@@ -18,3 +19,6 @@ config BR2_PACKAGE_LIBNSS
 comment "libnss needs a toolchain w/ threads, dynamic library"
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+
+comment "libnss needs a toolchain not affected by GCC bug 85862"
+	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862

package/liboauth/liboauth.hash

@@ -1,2 +1,3 @@
 # Locally computed:
 sha256  0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f  liboauth-1.0.3.tar.gz
+sha256  c30608672733bf3abd2ccf6f3206be8d91b7ee58b007b2fdbcfbc61c655e7fb7  COPYING.MIT

package/libogg/libogg.hash

@@ -1,2 +1,5 @@
 # From: http://www.xiph.org/downloads/
 sha256 4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08 libogg-1.3.3.tar.xz
+
+# Hash for license file:
+sha256 d2ab5758336489da61c12cc5bb757da5339c4ae9001f9bb0562b4370249af814 COPYING

package/libosip2/libosip2.hash

@@ -1,2 +1,5 @@
 # Locally calculated after checking pgp signature
 sha256	c9a18b0c760506d150017cdb1fa5c1cefe12b8dcbbf9a7e784eb75af376e96cd	libosip2-3.6.0.tar.gz
+
+# Hash for license file:
+sha256	8d9e95ed0e48df46dc758eb0d86df611f771eab4eed94bebb77dca87f1c897de	COPYING

package/libpam-radius-auth/libpam-radius-auth.hash

@@ -1,2 +1,5 @@
 # Locally calculated after checking PGP signature
 sha256	  742d79fc39824726c098e746bd3dc3484f983f5ee082c621c1e848b2c3725305	pam_radius-1.4.0.tar.gz
+
+# Hash for license file:
+sha256	  67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34	LICENSE

package/libpcap/libpcap.hash

@@ -1,2 +1,5 @@
 # Locally calculated after checking pgp signature
 sha256	673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e	libpcap-1.8.1.tar.gz
+
+# Hash for license file:
+sha256	8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd	LICENSE

package/libpciaccess/libpciaccess.hash

@@ -3,3 +3,6 @@ md5 8f436e151d5106a9cfaa71857a066d33  libpciaccess-0.14.tar.bz2
 sha1 f70a958bf4e744cb4ee93be64e9bc52ac05cdaeb  libpciaccess-0.14.tar.bz2
 sha256 3df543e12afd41fea8eac817e48cbfde5aed8817b81670a4e9e493bb2f5bf2a4  libpciaccess-0.14.tar.bz2
 sha512 bf40214dfd22f2a223f7c948566e6eaa4bfed60116e71b3eb19f6fe7ab2c4546649eb0416c06d5983e476ea5e27de036936646eb5f800ea97763b6d1f1976f4b  libpciaccess-0.14.tar.bz2
+
+# Hash for license file:
+sha256 47012fd746980d1712ac4f3841ab6164bda1d2b84880760e45dbe1e1dc07f608  COPYING

package/libtirpc/0003-Automatically-generate-XDR-header-files-from-.x-sour.patch

@@ -1,4 +1,4 @@
-From eba198c27f2b8d3f0b27ea4a42f3dc79d397440c Mon Sep 17 00:00:00 2001
+From 001e3f26dc80b8f21bed7d9b5872fe10e8b4af04 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Date: Sat, 10 Nov 2012 17:29:53 +0100
 Subject: [PATCH] Automatically generate XDR header files from .x sources using
@@ -8,21 +8,23 @@ Subject: [PATCH] Automatically generate XDR header files from .x sources using
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 [yann.morin.1998@free.fr: update for 0.3.1]
 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+[baruch: use external rpcgen]
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
 ---
- Makefile.am           |  19 +-
+ Makefile.am           |  16 +-
  src/Makefile.am       |   2 +-
- tirpc/rpc/rpcb_prot.h | 797 --------------------------------------------------
- tirpc/rpcsvc/crypt.h  | 109 -------
- 4 files changed, 17 insertions(+), 910 deletions(-)
+ tirpc/rpc/rpcb_prot.h | 797 ------------------------------------------
+ tirpc/rpcsvc/crypt.h  | 109 ------
+ 4 files changed, 14 insertions(+), 910 deletions(-)
  delete mode 100644 tirpc/rpc/rpcb_prot.h
  delete mode 100644 tirpc/rpcsvc/crypt.h
 
 diff --git a/Makefile.am b/Makefile.am
-index 8558289..aa5908e 100644
+index 3f6063771faf..368fb8a1aed2 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,6 +1,9 @@
- SUBDIRS = src man doc rpcgen
+ SUBDIRS = src man doc
  ACLOCAL_AMFLAGS = -I m4
  
 +GENFILES	       = tirpc/rpcsvc/crypt.h \
@@ -39,7 +41,7 @@ index 8558289..aa5908e 100644
  			 tirpc/rpc/xdr.h \
  			 tirpc/rpc/types.h \
  			 tirpc/rpc/svc_soc.h \
-@@ -20,7 +22,6 @@ nobase_include_HEADERS = tirpc/netconfig.h \
+@@ -21,7 +23,6 @@ nobase_include_HEADERS = tirpc/netconfig.h \
  			 tirpc/rpc/rpcent.h \
  			 tirpc/rpc/rpc_com.h \
  			 tirpc/rpc/rpcb_prot.x \
@@ -47,7 +49,7 @@ index 8558289..aa5908e 100644
  			 tirpc/rpc/rpcb_clnt.h \
  			 tirpc/rpc/raw.h \
  			 tirpc/rpc/pmap_rmt.h \
-@@ -51,5 +52,17 @@ endif
+@@ -48,5 +49,14 @@ endif
  pkgconfigdir=$(libdir)/pkgconfig
  pkgconfig_DATA = libtirpc.pc
  
@@ -55,19 +57,16 @@ index 8558289..aa5908e 100644
 +nobase_nodist_include_HEADERS = $(GENFILES)
 +BUILT_SOURCES = $(GENFILES)
 +
-+$(GENFILES): %.h: %.x $(top_builddir)/rpcgen/rpcgen
++$(GENFILES): %.h: %.x
 +	mkdir -p $(dir $@)
-+	$(top_builddir)/rpcgen/rpcgen -h -o $@ $<
-+
-+$(top_builddir)/rpcgen/rpcgen: force
-+	cd rpcgen && $(MAKE)
++	rpcgen -h -o $@ $<
 +
 +force:
 +
 +CLEANFILES	       = cscope.* *~ $(GENFILES)
  DISTCLEANFILES	       = Makefile.in libtirpc*.tar.gz
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 7428e92..0356171 100644
+index 2af40f16d03a..0b7e23835c36 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -8,7 +8,7 @@
@@ -81,7 +80,7 @@ index 7428e92..0356171 100644
  
 diff --git a/tirpc/rpc/rpcb_prot.h b/tirpc/rpc/rpcb_prot.h
 deleted file mode 100644
-index 7ae48b8..0000000
+index 7ae48b805370..000000000000
 --- a/tirpc/rpc/rpcb_prot.h
 +++ /dev/null
 @@ -1,797 +0,0 @@
@@ -884,7 +883,7 @@ index 7ae48b8..0000000
 -#endif /* !_RPCB_PROT_H_RPCGEN */
 diff --git a/tirpc/rpcsvc/crypt.h b/tirpc/rpcsvc/crypt.h
 deleted file mode 100644
-index da1f9cc..0000000
+index da1f9ccb56ea..000000000000
 --- a/tirpc/rpcsvc/crypt.h
 +++ /dev/null
 @@ -1,109 +0,0 @@
@@ -998,5 +997,5 @@ index da1f9cc..0000000
 -
 -#endif /* !_CRYPT_H_RPCGEN */
 -- 
-1.9.1
+2.17.0