From 4b740dc9fdbca604749cf15f7ea0e6ead345b5a0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 5 May 2020 08:54:39 -0500 Subject: poky: subtree update:a8544811d7..b5763b2f48 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alexander Kanavin (29): rpm: upgrade to 4.15.1 libmodulemd: move from 1.x to 2.x version libdnf: upgrade 0.28.1 -> 0.47.0 dnf: upgrade 4.2.2 -> 4.2.21 dnf: add a patch for base-files installation failures logrotate: update to 3.16.0 rt-tests: further exclusion of development versions kmscube: update to latest commit xcb-proto: update to 1.14 libxcb: update to 1.14 ghostscript: do not hardcode version in SRC_URI ghostscript: update 9.50 -> 9.52 webkitgtk: update to 2.28.2 python3-gitdb: update to 4.0.4 libevdev: update to 1.9.0 python3-dbusmock: add recipe from meta-oe mc: update to 4.8.24 coreutils: update to 8.32 glib-2.0: update 2.62.4 -> 2.64.2 glib-networking: update to 2.64.2 gptfdisk: update to 1.0.5 clutter-1.0: update to 1.26.4 diffoscope: update to 143 wpe: update to 1.6.0 vte: update to 0.60.2 libnotify: update to 0.7.9 connman: update to 1.38 xkeyboard-config: update to 2.29 gcr: update to 3.36.0 Andreas M?ller (1): libsecret: upgrade 0.20.1 -> 0.20.3 / port to meson Anibal Limon (2): ptest-runner: Bump to 2.4.0 oeqa/runtime: Use libdir to run ptest-runner Bartłomiej Burdukiewicz (2): libva: add PACKAGECONFIG and additonal rules for glx. libva: removed opengl from REQUIRED_DISTRO_FEATURES. Benjamin Fair (1): util-linux: fix build error in kill Bruce Ashfield (4): linux-yocto/5.4: update to v5.4.28 linux-yocto/5.4: update to v5.4.32 linux-yocto-dev: bump to v5.7-rc linux-yocto/5.4: update to v5.4.34 Frazer Clews (2): bitbake: lib/toaster: fixup codebase so pydocstyle can parse bitbake: lib/bs4/testing.py: fix bs4 testing Jan Luebbe (1): openssl: upgrade 1.1.1f -> 1.1.1g Joshua Watt (1): jquery: Upgrade 3.4.1 -> 3.5.0 Khem Raj (2): dpkg: Add riscv32 CPU support musl: Remove spurious unused patch Mingli Yu (1): iputils: Initialize libgcrypt Peter Kjellerstedt (1): libdnf: Use single-quotes around string literals used in SQL statements Pierre-Jean Texier (3): timezone: upgrade 2019c -> 2020a curl: upgrade 7.69.1 -> 7.70.0 curl: support mqtt in PACKAGECONFIG Richard Purdie (6): sanity: Require gcc 6 or later gcc-target: Ensure buildtools-extended-tarball doesn't use arch=native abi_version/staging: Bump versions to force rebuild after sstate corruption bitbake: bitdoc: Remove it utils: Drop FILESPATHPKG usage utils: Drop is_machine_specific()/machine_paths() Robert P. J. Day (5): ref-manual: fix excessive command indentation ref-manual: IMAGE_TYPES, add tar.zst, delete elf ref-manual: typo "SSTATE_MIRROR" -> "SSTATE_MIRRORS" ref-manual: Remove long-dead PACKAGE_GROUP variable bitbake: docs: delete reference to obsolete recipe-depends.dot Sakib Sajal (1): sqlite: backport CVE fixes Tim Orling (2): atk: upgrade 2.34.1 -> 2.36.0 at-spi2-core: upgrade 2.34.0 -> 2.36.0 Vyacheslav Yurkov (1): os-release: sanitize required fields Wang Mingyu (1): icu: CVE-2020-10531 Change-Id: Iae5641be5ca6424275d2e0d63ba3a7a5ba90cde2 Signed-off-by: Andrew Geissler --- ...0001-Add-option-to-control-configure-args.patch | 99 ------------------- ...et-3629-configure.ac-drop-bundled-gettext.patch | 110 --------------------- ...-misc-Makefile.am-install-mc.lib-only-onc.patch | 59 +++++++++++ 3 files changed, 59 insertions(+), 209 deletions(-) delete mode 100644 poky/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch delete mode 100644 poky/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch create mode 100644 poky/meta/recipes-extended/mc/files/0001-Ticket-4070-misc-Makefile.am-install-mc.lib-only-onc.patch (limited to 'poky/meta/recipes-extended/mc/files') diff --git a/poky/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch b/poky/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch deleted file mode 100644 index e76aac816..000000000 --- a/poky/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch +++ /dev/null @@ -1,99 +0,0 @@ -From a54501d3c9541bc8600225aa2d42531f93c6def7 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Sat, 9 Nov 2019 20:01:48 -0600 -Subject: [PATCH] Add option to control configure args - -Embedding the configure time options into the executable can lead to -non-reproducible builds, since configure options often have embedded -paths. Add a configure time option to control if the configure args are -embedded so this can be disabled. - -Upstream-Status: Submitted [https://midnight-commander.org/ticket/4031] -Signed-off-by: Joshua Watt ---- - configure.ac | 6 ++++++ - src/args.c | 6 ++++++ - src/textconf.c | 2 ++ - 3 files changed, 14 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 19d1a76be..a1948f6b9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -544,6 +544,12 @@ dnl Clarify do we really need GModule - AM_CONDITIONAL([HAVE_GMODULE], [test -n "$g_module_supported" && \ - test x"$textmode_x11_support" = x"yes" -o x"$enable_aspell" = x"yes"]) - -+AC_ARG_ENABLE([configure-args], -+ AS_HELP_STRING([--enable-configure-args], [Handle all compiler warnings as errors])) -+if test "x$enable_configure_args" != xno; then -+ AC_DEFINE([ENABLE_CONFIGURE_ARGS], 1, [Define to enable showing configure arguments in help]) -+fi -+ - AC_DEFINE_UNQUOTED([MC_CONFIGURE_ARGS], ["$ac_configure_args"], [MC configure arguments]) - - AC_CONFIG_FILES( -diff --git a/src/args.c b/src/args.c -index baef1a1c8..f8dc24020 100644 ---- a/src/args.c -+++ b/src/args.c -@@ -95,7 +95,9 @@ static gboolean mc_args__nouse_subshell = FALSE; - #endif /* ENABLE_SUBSHELL */ - static gboolean mc_args__show_datadirs = FALSE; - static gboolean mc_args__show_datadirs_extended = FALSE; -+#ifdef ENABLE_CONFIGURE_ARGS - static gboolean mc_args__show_configure_opts = FALSE; -+#endif - - static GOptionGroup *main_group; - -@@ -125,6 +127,7 @@ static const GOptionEntry argument_main_table[] = { - NULL - }, - -+#ifdef ENABLE_CONFIGURE_ARGS - /* show configure options */ - { - "configure-options", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, -@@ -132,6 +135,7 @@ static const GOptionEntry argument_main_table[] = { - N_("Print configure options"), - NULL - }, -+#endif - - { - "printwd", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, -@@ -758,11 +762,13 @@ mc_args_show_info (void) - return FALSE; - } - -+#ifdef ENABLE_CONFIGURE_ARGS - if (mc_args__show_configure_opts) - { - show_configure_options (); - return FALSE; - } -+#endif - - return TRUE; - } -diff --git a/src/textconf.c b/src/textconf.c -index 1e0613e58..f39b9e028 100644 ---- a/src/textconf.c -+++ b/src/textconf.c -@@ -232,10 +232,12 @@ show_datadirs_extended (void) - - /* --------------------------------------------------------------------------------------------- */ - -+#ifdef ENABLE_CONFIGURE_ARGS - void - show_configure_options (void) - { - (void) printf ("%s\n", MC_CONFIGURE_ARGS); - } -+#endif - - /* --------------------------------------------------------------------------------------------- */ --- -2.23.0 - diff --git a/poky/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch b/poky/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch deleted file mode 100644 index 8f357378d..000000000 --- a/poky/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 0d677a014a87b968d79eea2353ac4e342b0fd4ca Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Wed, 11 Sep 2019 22:58:18 +0100 -Subject: [PATCH] Ticket #3629: configure.ac: drop bundled gettext - -Bundled libintl did not support linking to internal static -libraries (libmc in our case): directly specified static -libraries are not pulled by libtool and are not usable for -dynamic libraries as PIC-related flags are not passed for -compilation. - -This renders bundled libintl library unusable. - -The change drops libintl bundling support and always relies -on external libintl (or falls back to disabled NLS). - -On a related note gettext-0.20 drops support for bundling -or libintl and this change will ease migration to newer version. - -The change is tested on x86_64-gentoo-linux-musl: mc builds -and links all tests successfully. A few tests fail for lack -of NLS support. - -Upstream-Status: Backport [https://github.com/MidnightCommander/mc/commit/f30e6ff283f4bc86177e4360de94dad794678395] -Signed-off-by: Sergei Trofimovich -Signed-off-by: Andrew Borodin -Signed-off-by: Alexander Kanavin ---- - Makefile.am | 2 +- - configure.ac | 5 +++-- - doc/doxygen.cfg | 2 +- - lib/Makefile.am | 2 +- - m4.include/mc-i18n.m4 | 5 ----- - 5 files changed, 6 insertions(+), 10 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index ac05a83..f86f6ed 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,7 @@ - ## Process this file with automake to create Makefile.in. - AUTOMAKE_OPTIONS = 1.5 - --SUBDIRS = intl po lib src doc contrib misc -+SUBDIRS = po lib src doc contrib misc - - if HAVE_TESTS - SUBDIRS += tests -diff --git a/configure.ac b/configure.ac -index a1948f6..bbc9e71 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -272,7 +272,9 @@ dnl ############################################################################ - dnl Internationalization - dnl ############################################################################ - --AM_GNU_GETTEXT([no-libtool], [need-ngettext]) -+AC_CHECK_FUNCS([setlocale]) -+ -+AM_GNU_GETTEXT([external], [need-ngettext]) - AM_GNU_GETTEXT_VERSION([0.18.1]) - - mc_I18N -@@ -680,7 +682,6 @@ doc/hlp/pl/Makefile - doc/hlp/ru/Makefile - doc/hlp/sr/Makefile - --intl/Makefile - po/Makefile.in - ]) - -diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg -index 07bc973..1118062 100644 ---- a/doc/doxygen.cfg -+++ b/doc/doxygen.cfg -@@ -91,7 +91,7 @@ FILE_PATTERNS = *.c \ - RECURSIVE = YES - EXCLUDE = - EXCLUDE_SYMLINKS = NO --EXCLUDE_PATTERNS = */intl/* */tests/* */.git/* -+EXCLUDE_PATTERNS = */tests/* */.git/* - EXCLUDE_SYMBOLS = - EXAMPLE_PATH = $(SRCDIR) - EXAMPLE_PATTERNS = -diff --git a/lib/Makefile.am b/lib/Makefile.am -index c448e2d..455f9dd 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -74,4 +74,4 @@ else - libmc_la_LIBADD += $(GLIB_LIBS) - endif - --libmc_la_LIBADD += $(PCRE_LIBS) $(LIBICONV) $(LIBINTL) -+libmc_la_LIBADD += $(PCRE_LIBS) -diff --git a/m4.include/mc-i18n.m4 b/m4.include/mc-i18n.m4 -index dd10d00..ec08324 100644 ---- a/m4.include/mc-i18n.m4 -+++ b/m4.include/mc-i18n.m4 -@@ -8,11 +8,6 @@ dnl @license GPL - dnl @copyright Free Software Foundation, Inc. - - AC_DEFUN([mc_I18N],[ -- -- if test "x$USE_INCLUDED_LIBINTL" = xyes; then -- CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl -I\$(top_srcdir)/intl" -- fi -- - dnl User visible support for charset conversion. - AC_ARG_ENABLE([charset], - AS_HELP_STRING([--enable-charset], [Support for charset selection and conversion @<:@yes@:>@])) diff --git a/poky/meta/recipes-extended/mc/files/0001-Ticket-4070-misc-Makefile.am-install-mc.lib-only-onc.patch b/poky/meta/recipes-extended/mc/files/0001-Ticket-4070-misc-Makefile.am-install-mc.lib-only-onc.patch new file mode 100644 index 000000000..824c12f8d --- /dev/null +++ b/poky/meta/recipes-extended/mc/files/0001-Ticket-4070-misc-Makefile.am-install-mc.lib-only-onc.patch @@ -0,0 +1,59 @@ +From 58dd59637ac5c6340ddfe96ad8b76883e4da20ef Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Tue, 3 Mar 2020 09:26:12 +0000 +Subject: [PATCH] Ticket #4070: misc/Makefile.am: install mc.lib only once. + +Before the change mc.lib was installed twice due to being +in two _DATA variables: + +dist_pkgdata_DATA = \ + mc.lib + +pkgdata_DATA = \ + $(dist_pkgdata_DATA) \ + $(PKGDATA_OUT) + +This causes occasional install failures when two parallel +`/usr/bin/install` calls race in installing the file: + +$ make -j20 DESTDIR=/var/tmp/portage/app-misc/mc-4.8.24/image install +... + /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \ + -c -m 644 mc.lib '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc' + /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \ + -c -m 644 mc.lib mc.charsets '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc' +... + /usr/bin/install: cannot create regular file + '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc/mc.lib': File exists + +After the change mc.lib is present only in dist_pkgdata_DATA. + +Upstream-Status: Backport [https://github.com/MidnightCommander/mc/commit/afb09f7cd7024484845ade25e15b8b93d6cf2d2c] + +Signed-off-by: Sergei Trofimovich +Signed-off-by: Andrew Borodin +Signed-off-by: Alexander Kanavin +--- + misc/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/misc/Makefile.am b/misc/Makefile.am +index 8ed1826..24f4a0e 100644 +--- a/misc/Makefile.am ++++ b/misc/Makefile.am +@@ -17,7 +17,6 @@ dist_pkgdata_DATA = \ + mc.lib + + pkgdata_DATA = \ +- $(dist_pkgdata_DATA) \ + $(PKGDATA_OUT) + + SCRIPTS_IN = \ +@@ -54,7 +53,6 @@ EXTRA_DIST = \ + $(LIBFILES_SCRIPT) \ + $(SCRIPTS_IN) \ + $(noinst_DATA) \ +- $(dist_pkgdata_DATA) \ + $(PKGDATA_IN) + + install-data-hook: -- cgit v1.2.3