diff options
Diffstat (limited to 'meta-openembedded')
487 files changed, 6315 insertions, 4808 deletions
diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.2.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.3.bb index 91d0e373b..72d0cd3e4 100644 --- a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.2.bb +++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.3.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "736e8d1ce65c09cb435fbbb500d53dc75f4d6e93bd325d22adc890951cf56337" +SRC_URI[sha256sum] = "eb8373f208b05a39702f9f437f6e49caf4b1ace26a9acb68110b49912078560f" S = "${WORKDIR}/fuse-${PV}" diff --git a/meta-openembedded/meta-gnome/README b/meta-openembedded/meta-gnome/README index a11815fb1..1a9105000 100644 --- a/meta-openembedded/meta-gnome/README +++ b/meta-openembedded/meta-gnome/README @@ -13,6 +13,6 @@ revision: HEAD Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome]' in the subject' When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-gnome][PATCH' Layer maintainer: Andreas Müller <schnitzeltony@gmail.com> diff --git a/meta-openembedded/meta-gnome/classes/clutter.bbclass b/meta-openembedded/meta-gnome/classes/clutter.bbclass new file mode 100644 index 000000000..24b53a13e --- /dev/null +++ b/meta-openembedded/meta-gnome/classes/clutter.bbclass @@ -0,0 +1,18 @@ +def get_minor_dir(v): + import re + m = re.match(r"^([0-9]+)\.([0-9]+)", v) + return "%s.%s" % (m.group(1), m.group(2)) + +def get_real_name(n): + import re + m = re.match(r"^([a-z]+(-[a-z]+)?)(-[0-9]+\.[0-9]+)?", n) + return "%s" % (m.group(1)) + +VERMINOR = "${@get_minor_dir("${PV}")}" +REALNAME = "${@get_real_name("${BPN}")}" + +SRC_URI = "${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive" +S = "${WORKDIR}/${REALNAME}-${PV}" + +CLUTTERBASEBUILDCLASS ??= "autotools" +inherit ${CLUTTERBASEBUILDCLASS} pkgconfig gtk-doc gettext diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.22.0.bb index bc3e66ca2..936f76123 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.22.0.bb @@ -9,7 +9,7 @@ inherit features_check gnomebase gsettings gtk-icon-cache gettext REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.sha256sum] = "ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b" +SRC_URI[archive.sha256sum] = "c70d80b48d40a9cb99ec967cc4389f67e7f0301528a69d481572041331a646be" # We don't not have ubuntu's appindicator (yet?) EXTRA_OEMESON = "-Dappindicator=no" diff --git a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.2.0.bb b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.3.0.bb index d0a499e6e..4eb383bbf 100644 --- a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.2.0.bb +++ b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.3.0.bb @@ -11,7 +11,7 @@ SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ file://0001-Install-polkit-action-unconditionally-executable-pke.patch \ " -SRC_URI[sha256sum] = "6c90715d254d7a7ec0208b29007b64160dd9fb7df4c4aa7f8ec2c9d23114c719" +SRC_URI[sha256sum] = "8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a" DEPENDS += " \ glib-2.0-native \ diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.84.bb b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.86.bb index b49d9d7e8..d264bf8c5 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.84.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.86.bb @@ -15,6 +15,6 @@ CFLAGS_append_toolchain-clang_mipsarch = " -ffp-exception-behavior=ignore " CFLAGS_append_toolchain-clang_riscv64 = " -ffp-exception-behavior=ignore " SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" -SRC_URI[sha256sum] = "e7e38b8441f77feb9dc8231cb434a86190a21f2f3692c281457e99d35e9c34ea" +SRC_URI[sha256sum] = "0b3f595159ad1b216cd729c0504c3a5f6cf780c641f4dc63fc164f3c0382c8f0" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch new file mode 100644 index 000000000..b2f13afd5 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch @@ -0,0 +1,28 @@ +From 073d622fbf8564271cd9be87c2f619ea00498578 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 1 May 2021 08:25:24 -0700 +Subject: [PATCH] Fix build with OpenEXR 3 + +Add a header that is no longer transitively included + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/96] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + operations/external/exr-save.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/operations/external/exr-save.cc b/operations/external/exr-save.cc +index 1e8c09d..87abed5 100644 +--- a/operations/external/exr-save.cc ++++ b/operations/external/exr-save.cc +@@ -45,6 +45,7 @@ extern "C" { + #include <ImfChromaticities.h> + #include <ImfStandardAttributes.h> + #include <ImfArray.h> ++#include <ImfFrameBuffer.h> + #include "ImathRandom.h" + + +-- +2.31.1 + diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch deleted file mode 100644 index 6a49f1d7c..000000000 --- a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6bed199a73a7af39344cf8e799b665011553600c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sat, 8 Feb 2020 14:29:52 +0100 -Subject: [PATCH] meson.build: Give note if sdl2 was found -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Configure output confused me a bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index 9d5b484..296b5f3 100644 ---- a/meson.build -+++ b/meson.build -@@ -374,6 +374,7 @@ message('\n'.join(['', - ' OpenEXR: @0@'.format(openexr.found()), - ' rsvg: @0@'.format(librsvg.found()), - ' SDL: @0@'.format(sdl1.found()), -+' SDL2: @0@'.format(sdl2.found()), - ' libraw: @0@'.format(libraw.found()), - ' Jasper: @0@'.format(jasper.found()), - ' av libs: @0@'.format(avlibs_found), --- -2.21.0 - diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.28.bb b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb index 810036162..bb0cd1f8a 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.28.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb @@ -24,11 +24,11 @@ SHPV = "${@gnome_verdir("${PV}")}" SRC_URI = " \ https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \ - file://0001-meson.build-Give-note-if-sdl2-was-found.patch \ + file://0001-Fix-build-with-OpenEXR-3.patch \ " -SRC_URI[sha256sum] = "1d110d8577d54cca3b34239315bd37c57ccb27dd4355655074a2d2b3fd897900" +SRC_URI[sha256sum] = "c112782cf4096969e23217ccdfabe42284e35d5435ff0c43d40e4c70faeca8dd" -PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2" +PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg poppler sdl2" PACKAGECONFIG_class-native = "libpng librsvg" PACKAGECONFIG[jasper] = "-Djasper=enabled,-Djasper=disabled,jasper" @@ -38,7 +38,9 @@ PACKAGECONFIG[jpeg] = "-Dlibjpeg=enabled,-Dlibjpeg=disabled,jpeg" PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms" PACKAGECONFIG[libav] = "-Dlibav=enabled,-Dlibav=disabled,libav" PACKAGECONFIG[libpng] = "-Dlibpng=enabled,-Dlibpng=disabled,libpng" +PACKAGECONFIG[libraw] = "-Dlibraw=enabled,-Dlibraw=disabled,libraw" PACKAGECONFIG[librsvg] = "-Dlibrsvg=enabled,-Dlibrsvg=disabled,librsvg" +PACKAGECONFIG[poppler] = "-Dpoppler=enabled,-Dpoppler=disabled,poppler" PACKAGECONFIG[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,virtual/libsdl" PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" PACKAGECONFIG[tiff] = "-Dlibtiff=enabled,-Dlibtiff=disabled,tiff" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch deleted file mode 100644 index 7e12487c7..000000000 --- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 1b66e4cca6d95f4607599bcbdd4afeb601aee84e Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Sun, 25 Oct 2020 18:09:21 +0000 -Subject: [PATCH] configure.ac: fix `--with-linux-input` handling with upcoming autoconf-2.70 - -Upcoming autoconf-2.70 exposes deficiency in configure.ac: - -``` -$ autoconf-2.70_beta2 && ./configure --host=x86_64-pc-linux-gnu -./configure: line 1430: 5: Bad file descriptor -checking whether is declared... ./configure: line 1432: ${+y}: bad -``` - -It happens because macros are called with parameters using insufficient quoting. - -More details at https://lists.gnu.org/archive/html/bug-autoconf/2020-10/msg00027.html - -The fix only amends `--with-linux-input`. Other cases of underquoting -will need to be handled separately. - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/cebeb90a87105cd6e35bcb357d53cc04c828ca21] -Fix-by: Zack Weinberg -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> ---- - configure.ac | 17 ++++++++--------- - 1 file changed, 8 insertions(+), 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6e2c193..afbcdd8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2138,15 +2138,14 @@ fi - AC_ARG_WITH(linux-input, [ --without-linux-input don't build linux input event controller module]) - - have_linux_input="no (linux input support disabled)" --if test "x$with_linux_input" != "xno"; then -- AC_CHECK_HEADER(linux/input.h, -- AC_CHECK_DECL(KEY_OK, -- have_linux_input=yes, -- have_linux_input="no (needs Linux 2.6)", -- [#include <linux/input.h>])) --fi -- --AM_CONDITIONAL(HAVE_LINUX_INPUT, test "x$have_linux_input" = xyes) -+AS_IF([test "x$with_linux_input" != "xno"], -+ [AC_CHECK_HEADER([linux/input.h], -+ [AC_CHECK_DECL([KEY_OK], -+ [have_linux_input=yes], -+ [have_linux_input="no (needs Linux 2.6)"], -+ [#include <linux/input.h>])])]) -+ -+AM_CONDITIONAL([HAVE_LINUX_INPUT], [test "x$have_linux_input" = xyes]) - - - ############################### --- -2.30.0 - diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb index aa5112add..e729d9deb 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb @@ -43,19 +43,18 @@ REQUIRED_DISTRO_FEATURES = "x11" SHPV = "${@gnome_verdir("${PV}")}" -SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \ - file://0001-configure.ac-fix-with-linux-input-handling-with-upco.patch \ - " -SRC_URI[sha256sum] = "2db84b57f3778d80b3466d7c21a21d22e315c7b062de2883cbaaeda9a0f618bb" +SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" +SRC_URI[sha256sum] = "bd1bb762368c0dd3175cf05006812dd676949c3707e21f4e6857435cb435989e" EXTRA_OECONF = "--disable-python \ --without-webkit \ --disable-check-update \ --without-wmf" -EXTRA_OECONF_append_libc-musl_mipsarch = " --disable-vector-icons" +EXTRA_OECONF_append_mipsarch = " --disable-vector-icons" EXTRA_OECONF_append_libc-musl_riscv32 = " --disable-vector-icons" -EXTRA_OECONF_append_arm = " --disable-vector-icons" +EXTRA_OECONF_append_libc-musl_x86 = " --disable-vector-icons" +EXTRA_OECONF_append_toolchain-clang_arm = " --disable-vector-icons" do_configure_append() { find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor/0001-Don-t-alter-or-try-to-write-GtkChild-fields.patch b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor/0001-Don-t-alter-or-try-to-write-GtkChild-fields.patch deleted file mode 100644 index 7c83ae339..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor/0001-Don-t-alter-or-try-to-write-GtkChild-fields.patch +++ /dev/null @@ -1,522 +0,0 @@ -From ba4a39b74067b73c9bed64dad7be3d53e837dd8d Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz <ricotz@ubuntu.com> -Date: Sat, 16 Jan 2021 13:26:32 +0100 -Subject: [PATCH] Don't alter or try to write GtkChild fields - -See https://gitlab.gnome.org/GNOME/vala/issues/1121 - -Upstream-Status: Backport [https://github.com/GNOME/dconf-editor/commit/9272e9fb6867e71426bfd0aa5edce5ec39cf0ad4] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - editor/bookmarks-headerbar.vala | 4 +-- - editor/bookmarks-list.vala | 4 +-- - editor/bookmarks.vala | 12 +++---- - editor/delayed-setting-view.vala | 54 ++++++++++++++++---------------- - editor/overlayed-list.vala | 38 +++++++++++----------- - editor/pathentry.vala | 24 +++++++------- - editor/registry-list.vala | 6 ++-- - editor/registry-search.vala | 6 ++-- - editor/registry-view.vala | 2 +- - 9 files changed, 75 insertions(+), 75 deletions(-) - -diff --git a/editor/bookmarks-headerbar.vala b/editor/bookmarks-headerbar.vala -index 54848a5..0522c37 100644 ---- a/editor/bookmarks-headerbar.vala -+++ b/editor/bookmarks-headerbar.vala -@@ -24,7 +24,7 @@ private abstract class BookmarksHeaderBar : BrowserHeaderBar, AdaptativeWidget - install_action_entries (); - - add_bookmarks_revealer (out bookmarks_revealer, -- out bookmarks_button, ref center_box); -+ out bookmarks_button, center_box); - connect_bookmarks_signals (); - add_bookmarks_controller (out bookmarks_controller, ref this); - -@@ -58,7 +58,7 @@ private abstract class BookmarksHeaderBar : BrowserHeaderBar, AdaptativeWidget - private Bookmarks bookmarks_button; - private BookmarksController bookmarks_controller; - -- private static void add_bookmarks_revealer (out Revealer bookmarks_revealer, out Bookmarks bookmarks_button, ref Box center_box) -+ private static void add_bookmarks_revealer (out Revealer bookmarks_revealer, out Bookmarks bookmarks_button, Box center_box) - { - bookmarks_revealer = new Revealer (); - bookmarks_revealer.transition_type = RevealerTransitionType.SLIDE_LEFT; -diff --git a/editor/bookmarks-list.vala b/editor/bookmarks-list.vala -index 393973b..c9280d5 100644 ---- a/editor/bookmarks-list.vala -+++ b/editor/bookmarks-list.vala -@@ -146,10 +146,10 @@ private class BookmarksList : OverlayedList - - internal bool create_bookmark_rows (Variant bookmarks_variant) - { -- _create_bookmark_rows (bookmarks_variant, view_mode, ref main_list_store, ref main_list_box, ref bookmarks_hashtable); -+ _create_bookmark_rows (bookmarks_variant, view_mode, ref main_list_store, main_list_box, ref bookmarks_hashtable); - return n_items == 0; - } -- private static void _create_bookmark_rows (Variant bookmarks_variant, bool view_mode, ref GLib.ListStore main_list_store, ref ListBox main_list_box, ref HashTable<string, Bookmark> bookmarks_hashtable) -+ private static void _create_bookmark_rows (Variant bookmarks_variant, bool view_mode, ref GLib.ListStore main_list_store, ListBox main_list_box, ref HashTable<string, Bookmark> bookmarks_hashtable) - { - string saved_bookmark_name = ""; - ListBoxRow? selected_row = main_list_box.get_selected_row (); -diff --git a/editor/bookmarks.vala b/editor/bookmarks.vala -index 153af10..d8cea7c 100644 ---- a/editor/bookmarks.vala -+++ b/editor/bookmarks.vala -@@ -84,7 +84,7 @@ private class Bookmarks : MenuButton - - construct - { -- update_switch_label (ViewType.SEARCH, ViewType.FOLDER, ref switch_label); // init text with "Bookmark this Location" -+ update_switch_label (ViewType.SEARCH, ViewType.FOLDER, switch_label); // init text with "Bookmark this Location" - - install_action_entries (); - -@@ -184,7 +184,7 @@ private class Bookmarks : MenuButton - - internal void set_path (ViewType type, string path) - { -- update_switch_label (current_type, type, ref switch_label); -+ update_switch_label (current_type, type, switch_label); - - current_path = path; - current_type = type; -@@ -392,7 +392,7 @@ private class Bookmarks : MenuButton - * * Bookmarks management - \*/ - -- private static void update_switch_label (ViewType old_type, ViewType new_type, ref Label switch_label) -+ private static void update_switch_label (ViewType old_type, ViewType new_type, Label switch_label) - { - if (new_type == ViewType.SEARCH && old_type != ViewType.SEARCH) - switch_label.label = bookmark_this_search_text; -@@ -414,18 +414,18 @@ private class Bookmarks : MenuButton - { - if (bookmarks_icon.icon_name != "starred-symbolic") - bookmarks_icon.icon_name = "starred-symbolic"; -- update_switch_state (true, ref bookmarked_switch); -+ update_switch_state (true, bookmarked_switch); - bookmarked_switch.set_detailed_action_name ("bookmarks.unbookmark(" + variant.print (true) + ")"); - } - else - { - if (bookmarks_icon.icon_name != "non-starred-symbolic") - bookmarks_icon.icon_name = "non-starred-symbolic"; -- update_switch_state (false, ref bookmarked_switch); -+ update_switch_state (false, bookmarked_switch); - bookmarked_switch.set_detailed_action_name ("bookmarks.bookmark(" + variant.print (true) + ")"); - } - } -- private static void update_switch_state (bool bookmarked, ref Switch bookmarked_switch) -+ private static void update_switch_state (bool bookmarked, Switch bookmarked_switch) - { - if (bookmarked == bookmarked_switch.active) - return; -diff --git a/editor/delayed-setting-view.vala b/editor/delayed-setting-view.vala -index add6852..b1f774c 100644 ---- a/editor/delayed-setting-view.vala -+++ b/editor/delayed-setting-view.vala -@@ -41,24 +41,24 @@ private class DelayedSettingView : OverlayedListRow - { - // at row creation, key is never ghost - _update_dconf_key_current_value (key_value, -- ref key_value_label, -- ref key_value_default); -+ key_value_label, -+ key_value_default); - - _update_dconf_key_planned_value (cool_planned_value, -- ref planned_value_label, -- ref planned_value_default); -+ planned_value_label, -+ planned_value_default); - } - else - { - _update_gsettings_key_current_value (key_value, - has_schema_and_is_default, -- ref key_value_label, -- ref key_value_default); -+ key_value_label, -+ key_value_default); - - _update_gsettings_key_planned_value (cool_planned_value, - (!) cool_default_value, -- ref planned_value_label, -- ref planned_value_default); -+ planned_value_label, -+ planned_value_default); - } - } - -@@ -74,23 +74,23 @@ private class DelayedSettingView : OverlayedListRow - - private static inline void _update_gsettings_key_planned_value (string? cool_planned_value, - string cool_default_value, -- ref Label planned_value_label, -- ref Label planned_value_default) -+ Label planned_value_label, -+ Label planned_value_default) - { - bool is_default = cool_planned_value == null; - planned_value_label.label = is_default ? cool_default_value : (!) cool_planned_value; -- update_value_default_label (is_default, ref planned_value_default); -+ update_value_default_label (is_default, planned_value_default); - } - - private static inline void _update_dconf_key_planned_value (string? cool_planned_value, -- ref Label planned_value_label, -- ref Label planned_value_default) -+ Label planned_value_label, -+ Label planned_value_default) - { - if (cool_planned_value == null) -- update_labels_dconf_key_erased (ref planned_value_label, ref planned_value_default); -+ update_labels_dconf_key_erased (planned_value_label, planned_value_default); - else - update_labels_dconf_key_values ((!) cool_planned_value, -- ref planned_value_label, ref planned_value_default); -+ planned_value_label, planned_value_default); - } - - /*\ -@@ -99,37 +99,37 @@ private class DelayedSettingView : OverlayedListRow - - internal void update_gsettings_key_current_value (Variant key_value, bool is_default) - { -- _update_gsettings_key_current_value (key_value, is_default, ref key_value_label, ref key_value_default); -+ _update_gsettings_key_current_value (key_value, is_default, key_value_label, key_value_default); - } - private static void _update_gsettings_key_current_value (Variant key_value, - bool is_default, -- ref Label key_value_label, -- ref Label key_value_default) -+ Label key_value_label, -+ Label key_value_default) - { - key_value_label.label = Key.cool_text_value_from_variant (key_value); -- update_value_default_label (is_default, ref key_value_default); -+ update_value_default_label (is_default, key_value_default); - } - - internal void update_dconf_key_current_value (Variant? key_value_or_null) - { -- _update_dconf_key_current_value (key_value_or_null, ref key_value_label, ref key_value_default); -+ _update_dconf_key_current_value (key_value_or_null, key_value_label, key_value_default); - } - private static void _update_dconf_key_current_value (Variant? key_value_or_null, -- ref Label key_value_label, -- ref Label key_value_default) -+ Label key_value_label, -+ Label key_value_default) - { - if (key_value_or_null == null) -- update_labels_dconf_key_erased (ref key_value_label, ref key_value_default); -+ update_labels_dconf_key_erased (key_value_label, key_value_default); - else - update_labels_dconf_key_values (Key.cool_text_value_from_variant ((!) key_value_or_null), -- ref key_value_label, ref key_value_default); -+ key_value_label, key_value_default); - } - - /*\ - * * common utilities - \*/ - -- private static void update_labels_dconf_key_erased (ref Label value_label, ref Label value_default) -+ private static void update_labels_dconf_key_erased (Label value_label, Label value_default) - { - value_label.visible = false; - /* Translators: displayed in the list of pending changes (could be an in-window panel, or in the popover of the bottom bar); for dconf keys */ -@@ -137,14 +137,14 @@ private class DelayedSettingView : OverlayedListRow - value_default.visible = true; - } - -- private static void update_labels_dconf_key_values (string key_value, ref Label value_label, ref Label value_default) -+ private static void update_labels_dconf_key_values (string key_value, Label value_label, Label value_default) - { - value_default.visible = false; - value_label.label = key_value; // TODO move Key.cool_text_value_from_variant here? - value_label.visible = true; - } - -- private static void update_value_default_label (bool is_default, ref Label value_default) -+ private static void update_value_default_label (bool is_default, Label value_default) - { - if (is_default) - /* Translators: displayed in the list of pending changes (could be an in-window panel, or in the popover of the bottom bar); for gsettings keys */ -diff --git a/editor/overlayed-list.vala b/editor/overlayed-list.vala -index 8b0ec51..bcdfc3a 100644 ---- a/editor/overlayed-list.vala -+++ b/editor/overlayed-list.vala -@@ -89,11 +89,11 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - internal void set_window_size (AdaptativeWidget.WindowSize new_size) - { - if (!AdaptativeWidget.WindowSize.is_extra_thin (new_size) && AdaptativeWidget.WindowSize.is_extra_flat (new_size)) -- set_horizontal (ref main_context, ref edit_mode_box); -+ set_horizontal (ref main_context, edit_mode_box); - else -- set_vertical (ref main_context, ref edit_mode_box); -+ set_vertical (ref main_context, edit_mode_box); - } -- private static inline void set_horizontal (ref StyleContext main_context, ref Box edit_mode_box) -+ private static inline void set_horizontal (ref StyleContext main_context, Box edit_mode_box) - { - main_context.remove_class ("vertical"); - edit_mode_box.halign = Align.END; -@@ -102,7 +102,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - edit_mode_box.width_request = 160; - main_context.add_class ("horizontal"); - } -- private static inline void set_vertical (ref StyleContext main_context, ref Box edit_mode_box) -+ private static inline void set_vertical (ref StyleContext main_context, Box edit_mode_box) - { - main_context.remove_class ("horizontal"); - edit_mode_box.halign = Align.CENTER; -@@ -118,9 +118,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - - internal bool next_match () - { -- return _next_match (ref main_list_box); -+ return _next_match (main_list_box); - } -- private static inline bool _next_match (ref ListBox main_list_box) -+ private static inline bool _next_match (ListBox main_list_box) - { - ListBoxRow? row = main_list_box.get_selected_row (); // TODO multiple rows and focus-only lists - if (row == null) -@@ -130,7 +130,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - - if (row == null) - { -- _scroll_bottom (ref main_list_box); -+ _scroll_bottom (main_list_box); - return false; - } - main_list_box.select_row ((!) row); -@@ -140,9 +140,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - - internal bool previous_match () - { -- return _previous_match (ref main_list_box); -+ return _previous_match (main_list_box); - } -- private static inline bool _previous_match (ref ListBox main_list_box) -+ private static inline bool _previous_match (ListBox main_list_box) - { - uint n_items = main_list_box.get_children ().length (); // FIXME OverlayedList.n_items is unreliable - if (n_items == 0) -@@ -189,9 +189,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - - protected int [] get_selected_rows_indices () - { -- return _get_selected_rows_indices (ref main_list_box); -+ return _get_selected_rows_indices (main_list_box); - } -- private static inline int [] _get_selected_rows_indices (ref ListBox main_list_box) -+ private static inline int [] _get_selected_rows_indices (ListBox main_list_box) - { - int [] indices = new int [0]; - main_list_box.selected_foreach ((_list_box, selected_row) => { -@@ -205,9 +205,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - - protected void scroll_top () - { -- _scroll_top (ref main_list_box); -+ _scroll_top (main_list_box); - } -- private static inline void _scroll_top (ref ListBox main_list_box) -+ private static inline void _scroll_top (ListBox main_list_box) - { - Adjustment adjustment = main_list_box.get_adjustment (); - adjustment.set_value (adjustment.get_lower ()); -@@ -215,9 +215,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - - protected void scroll_bottom () - { -- _scroll_bottom (ref main_list_box); -+ _scroll_bottom (main_list_box); - } -- private static inline void _scroll_bottom (ref ListBox main_list_box) -+ private static inline void _scroll_bottom (ListBox main_list_box) - { - Adjustment adjustment = main_list_box.get_adjustment (); - adjustment.set_value (adjustment.get_upper ()); -@@ -225,9 +225,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - - internal bool handle_copy_text (out string copy_text) - { -- return _handle_copy_text (out copy_text, ref main_list_box); -+ return _handle_copy_text (out copy_text, main_list_box); - } -- private static inline bool _handle_copy_text (out string copy_text, ref ListBox main_list_box) -+ private static inline bool _handle_copy_text (out string copy_text, ListBox main_list_box) - { - List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows (); - OverlayedListRow row; -@@ -283,9 +283,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - - internal SelectionState get_selection_state () - { -- return _get_selection_state (ref main_list_box, ref main_list_store); -+ return _get_selection_state (main_list_box, ref main_list_store); - } -- private static inline SelectionState _get_selection_state (ref ListBox main_list_box, ref GLib.ListStore main_list_store) -+ private static inline SelectionState _get_selection_state (ListBox main_list_box, ref GLib.ListStore main_list_store) - { - List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows (); - uint n_selected_rows = selected_rows.length (); -diff --git a/editor/pathentry.vala b/editor/pathentry.vala -index 5000b21..5c7efc5 100644 ---- a/editor/pathentry.vala -+++ b/editor/pathentry.vala -@@ -133,9 +133,9 @@ private class PathEntry : Box, AdaptativeWidget - - internal void entry_grab_focus_without_selecting () - { -- _entry_grab_focus_without_selecting (ref search_entry); -+ _entry_grab_focus_without_selecting (search_entry); - } -- private static void _entry_grab_focus_without_selecting (ref BrowserEntry search_entry) -+ private static void _entry_grab_focus_without_selecting (BrowserEntry search_entry) - { - if (search_entry.text_length != 0) - { -@@ -172,36 +172,36 @@ private class PathEntry : Box, AdaptativeWidget - requires (search_changed_handler != 0) - { - SignalHandler.block (search_entry, search_changed_handler); -- _prepare (mode, nullable_search, ref current_path, ref search_entry); -+ _prepare (mode, nullable_search, ref current_path, search_entry); - SignalHandler.unblock (search_entry, search_changed_handler); - } - - private static inline void _prepare (SearchMode mode, - string? nullable_search, - ref string current_path, -- ref BrowserEntry search_entry) -+ BrowserEntry search_entry) - { - string search; - switch (mode) - { - case SearchMode.EDIT_PATH_MOVE_END: - search = nullable_search == null ? current_path : (!) nullable_search; -- _prepare_move_end (ref search, ref search_entry); -+ _prepare_move_end (ref search, search_entry); - return; - - case SearchMode.EDIT_PATH_SELECT_ALL: - search = nullable_search == null ? current_path : (!) nullable_search; -- _prepare_search (ref search, ref search_entry); -+ _prepare_search (ref search, search_entry); - return; - - case SearchMode.EDIT_PATH_SELECT_LAST_WORD: - search = current_path; -- _prepare_select_last_word (ref search, ref search_entry); -+ _prepare_select_last_word (ref search, search_entry); - return; - - case SearchMode.SEARCH: - search = ""; -- _prepare_search (ref search, ref search_entry); -+ _prepare_search (ref search, search_entry); - return; - - case SearchMode.UNCLEAR: -@@ -210,19 +210,19 @@ private class PathEntry : Box, AdaptativeWidget - } - } - -- private static inline void _prepare_move_end (ref string text, ref BrowserEntry search_entry) -+ private static inline void _prepare_move_end (ref string text, BrowserEntry search_entry) - { - search_entry.text = text; -- _entry_grab_focus_without_selecting (ref search_entry); -+ _entry_grab_focus_without_selecting (search_entry); - } - -- private static inline void _prepare_search (ref string text, ref BrowserEntry search_entry) -+ private static inline void _prepare_search (ref string text, BrowserEntry search_entry) - { - search_entry.text = text; - search_entry.grab_focus (); - } - -- private static inline void _prepare_select_last_word (ref string current_path, ref BrowserEntry search_entry) -+ private static inline void _prepare_select_last_word (ref string current_path, BrowserEntry search_entry) - { - search_entry.move_cursor (MovementStep.DISPLAY_LINE_ENDS, -1, false); - search_entry.text = current_path; -diff --git a/editor/registry-list.vala b/editor/registry-list.vala -index 74b7f99..54aa6fa 100644 ---- a/editor/registry-list.vala -+++ b/editor/registry-list.vala -@@ -291,9 +291,9 @@ private abstract class RegistryList : Grid, BrowsableView, AdaptativeWidget - - internal bool handle_copy_text (out string copy_text) // can compile with "private", but is public 1/2 - { -- return _handle_copy_text (out copy_text, ref key_list_box); -+ return _handle_copy_text (out copy_text, key_list_box); - } -- private bool _handle_copy_text (out string copy_text, ref ListBox key_list_box) -+ private bool _handle_copy_text (out string copy_text, ListBox key_list_box) - { - ListBoxRow? selected_row = (ListBoxRow?) key_list_box.get_selected_row (); - if (selected_row == null) -@@ -1138,7 +1138,7 @@ private abstract class RegistryList : Grid, BrowsableView, AdaptativeWidget - * * headers - \*/ - -- protected static bool is_first_row (int row_index, ref unowned ListBoxRow? before) -+ protected static bool is_first_row (int row_index, ListBoxRow? before) - { - bool is_first_row = row_index == 0; - if (is_first_row != (before == null)) -diff --git a/editor/registry-search.vala b/editor/registry-search.vala -index 220583f..eb8e6f2 100644 ---- a/editor/registry-search.vala -+++ b/editor/registry-search.vala -@@ -48,7 +48,7 @@ private class RegistrySearch : RegistryList - - internal bool handle_alt_copy_text (out string copy_text) - { -- return _handle_alt_copy_text (out copy_text, ref key_list_box); -+ return _handle_alt_copy_text (out copy_text, key_list_box); - } - - internal void clean () -@@ -145,7 +145,7 @@ private class RegistrySearch : RegistryList - * * Keyboard calls - \*/ - -- private static bool _handle_alt_copy_text (out string copy_text, ref ListBox key_list_box) -+ private static bool _handle_alt_copy_text (out string copy_text, ListBox key_list_box) - { - ListBoxRow? selected_row = key_list_box.get_selected_row (); - if (selected_row == null) -@@ -521,7 +521,7 @@ private class RegistrySearch : RegistryList - private void update_row_header (ListBoxRow row, ListBoxRow? before) - { - int row_index = row.get_index (); -- if (is_first_row (row_index, ref before)) -+ if (is_first_row (row_index, before)) - return; - - if (search_is_path_search) -diff --git a/editor/registry-view.vala b/editor/registry-view.vala -index e0ff379..7d9eb1f 100644 ---- a/editor/registry-view.vala -+++ b/editor/registry-view.vala -@@ -114,7 +114,7 @@ private class RegistryView : RegistryList - - private void update_row_header (ListBoxRow row, ListBoxRow? before) - { -- if (is_first_row (row.get_index (), ref before)) -+ if (is_first_row (row.get_index (), before)) - return; - update_row_header_with_context (row, (!) before, modifications_handler.model, /* local search header */ false); - } --- -2.30.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb index 776558ebf..5b68467a1 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb @@ -8,9 +8,7 @@ DEPENDS = "dconf gtk+3" inherit gnomebase vala gettext gsettings bash-completion -SRC_URI += "file://0001-Don-t-alter-or-try-to-write-GtkChild-fields.patch" - -SRC_URI[archive.sha256sum] = "1253dad87e6213fbf313ff9ec9dc4358aa1b10261f28072c1dc0e0997b92f835" +SRC_URI[archive.sha256sum] = "571af4c7dad4f049b53e6cd728b79addf08c27ddab6bc57b396d211866ee79e3" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.38.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_40.1.bb index 9c1d8641e..3b1a978c6 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.38.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_40.1.bb @@ -13,14 +13,18 @@ DEPENDS = " \ gstreamer1.0-plugins-base \ orc \ adwaita-icon-theme \ + libhandy \ ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} \ " GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection upstream-version-is-even gettext mime-xdg gtk-doc +inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection gettext mime-xdg gtk-doc -SRC_URI[archive.sha256sum] = "26df897a417545b476d2606b14731122e84278ae994bd64ea535449c3cf01948" +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "7a666363c350af2e3bbba7f14b3c1befc5012f9ed3d9d073447f4c59f33dcf2d" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index f39440cc6..870a9c0e9 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -9,6 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ inherit gnomebase upstream-version-is-even -SRC_URI[archive.sha256sum] = "c555528c546d457be0dc0eaca5d766d4dfef7c408276cb05f9724c463bfe7fd9" -PV = "3.36.5" - +SRC_URI[archive.sha256sum] = "eac75f348aa5defbe9473fa30ab6084635ee64d8e3eaaec60a62c27f149c3e22" +PV = "3.40.1" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.38.1.bb index 9af88f2a9..379857c94 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.38.1.bb @@ -13,7 +13,7 @@ DEPENDS = " \ inherit gnomebase gsettings itstool gnome-help gettext upstream-version-is-even mime-xdg -SRC_URI[archive.sha256sum] = "0959e10a5d7a7442809624be9879d95db462ca76e8c66ad6299310e6acdb81b7" +SRC_URI[archive.sha256sum] = "94a0130e12d321aa119793a14d09716523e2e4a61f29570cee53fd88dd6abc57" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'packagekit', '', d)}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb index b20f20449..ee94cdd2a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb @@ -16,12 +16,18 @@ DEPENDS = " \ tepl \ " -inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check upstream-version-is-even mime-xdg python3targetconfig +inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg python3targetconfig + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "438217bbbcf92a17c4f259b4a5426b03" -SRC_URI[archive.sha256sum] = "6887554643c5b1b3862ac364d97b7b50224bff95e6758aeaa08f4a482b554197" +SRC_URI[archive.sha256sum] = "55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.2.bb index 12ea5938c..708523ee8 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.2.bb @@ -9,8 +9,8 @@ GTKDOC_MESON_OPTION = "gtk_doc" inherit gnomebase gobject-introspection gtk-doc -SRC_URI[archive.md5sum] = "44a3cfeab1afd83a71e852835d24e656" -SRC_URI[archive.sha256sum] = "8aeafd59653ea88f6b78cb03780ee9fd61a2f993070c5f0d0976bed93ac2bd77" +SRC_URI[archive.md5sum] = "4c0cd962f021f937507904df147ea750" +SRC_URI[archive.sha256sum] = "2322b552aca330eef79724a699c51a302345d5e074738578b398b7f2ff97944c" EXTRA_OEMESON = " \ -Dvapi=false \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.2.bb index 5e833a91a..8eba85941 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.2.bb @@ -9,8 +9,8 @@ DEPENDS = " \ inherit gnomebase gobject-introspection gtk-doc vala -SRC_URI[archive.md5sum] = "3149496d0189623a8e1289bbab4d8385" -SRC_URI[archive.sha256sum] = "0e78713e6f0de339fdee16bab82753ae290fe80fa7b4ba6e3db8c1465b81d0f8" +SRC_URI[archive.md5sum] = "3c8da1a8489255f2aaa5fdb690308e5d" +SRC_URI[archive.sha256sum] = "a48c4d5ce9a9ed05ba8bc8fdeb9af2d1a7bd8091c2911d6c37223c4f488f7c72" do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb index 77c89d95c..31d3bf6eb 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb @@ -18,7 +18,7 @@ REQUIRED_DISTRO_FEATURES = "x11" # gtk-icon-cache bbclass will take care of this for us. EXTRA_OEMESON = "-Dicon_update=false" -SRC_URI[archive.md5sum] = "09b6bab7ceaafb35da766a5476fbc466" -SRC_URI[archive.sha256sum] = "3ec91076c2822cd1f9abdc8e27663c3bda4c9c8a7a9773f9e92bfbf2b745d386" +SRC_URI[archive.md5sum] = "d83faa54abaf64bb40b5313bc233e74e" +SRC_URI[archive.sha256sum] = "6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9" RDEPENDS_${PN} += "bluez5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_3.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_40.1.bb index c250981c4..ef96632bd 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_3.36.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_40.1.bb @@ -11,6 +11,7 @@ DEPENDS = " \ libgee \ libmpc \ gtksourceview4 \ + libhandy \ " GIR_MESON_OPTION = 'disable-introspection' @@ -19,12 +20,14 @@ GIR_MESON_DISABLE_FLAG = 'true' GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gnome-help vala gtk-icon-cache gettext features_check upstream-version-is-even +inherit gnomebase gobject-introspection gnome-help vala gtk-icon-cache gettext features_check + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "71854fb58671b4a88ac990e2f2439e4f" -SRC_URI[archive.sha256sum] = "a2e830f9c9856fad65dad1d6c0ae6abad0f0b496c9984ac005315c5cc4220db3" +SRC_URI[archive.sha256sum] = "7fe6c561f7b1f485ac106219772e45cc135c983bfa4278dd2d3fd83b57ff6af6" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb index 08fd96472..1045dea25 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb @@ -18,7 +18,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-version-is-even mime-xdg -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 polkit" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" @@ -31,4 +31,3 @@ FILES_${PN} += " \ ${datadir}/metainfo \ ${datadir}/dbus-1 \ " - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_3.34.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb index bb70ae7a8..6b69c08eb 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_3.34.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb @@ -18,19 +18,29 @@ DEPENDS = " \ libgdata \ gfbgraph \ tracker \ + libhandy \ " GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gettext upstream-version-is-even gnome-help features_check +inherit gnomebase gettext gnome-help features_check + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "1dd0d477eac4707e8cfe9f35e26d1f29" -SRC_URI[archive.sha256sum] = "3c59c76ef28618ec055a1799d1040287b90a0b021feb0a02b1eac28e9c2eb41a" +SRC_URI[archive.sha256sum] = "e02d73e138af8b2868b5cad7faa1bdd278aeade3b6c3c92836511a4e6f3af1af" + +do_install_append() { + # make gnome-photos available on all desktops + sed -i 's:OnlyShowIn=:#OnlyShowIn=:g' ${D}${datadir}/applications/org.gnome.Photos.desktop +} FILES_${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/metainfo \ ${datadir}/gnome-shell \ " + +RRECOMMENDS_${PN} = "grilo-plugins" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.36.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_40.1.bb index ddd11201b..ecc5a09a0 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.36.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_40.1.bb @@ -10,16 +10,19 @@ DEPENDS = " \ libgtop \ librsvg \ polkit \ + libhandy \ " GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check gettext upstream-version-is-even +inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check gettext REQUIRED_DISTRO_FEATURES = "x11 polkit" -SRC_URI[archive.md5sum] = "b1443ab12c3b7bcca940d28754e5b948" -SRC_URI[archive.sha256sum] = "866b47ab0f4c75b0ec57d6300337a7373463aaad5df95eddfe5354c22be7bca1" +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "fdb30f4367907aab86d7c2bb76a7b773ba850b765c9666a39f42abfe22691d1a" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch new file mode 100644 index 000000000..a07cd49fd --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch @@ -0,0 +1,34 @@ +From 9deaed70221a12e26f968be26233b75fa5669476 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 15 May 2021 23:25:09 +0200 +Subject: [PATCH] Avoid running trackertestutils +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It breaks configuration: +| ../grilo-plugins-0.3.13/tests/tracker3/meson.build:5:0: ERROR: Program '/usr/lib/tracker-3.0/trackertestutils/tracker-sandbox' not found + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6a03778..17ef1e1 100644 +--- a/meson.build ++++ b/meson.build +@@ -78,7 +78,7 @@ totem_plparser_dep = dependency('totem-plparser', version: '>= 3.4.1', required: + totem_plparser_mini_dep = dependency('totem-plparser-mini', version: '>= 3.4.1', required: false) + tracker_sparql_dep = dependency('tracker-sparql-2.0', version: '>= 2.3.0', required: false) + tracker3_dep = dependency('tracker-sparql-3.0', required: false) +-tracker3_testutils_dep = dependency('tracker-testutils-3.0', required: false) ++tracker3_testutils_dep = dependency('tracker-testutils-3.0-avoid-find', required: false) + + lua_dep = dependency('lua', version: '>= 5.3.0', required: false) + if not lua_dep.found() +-- +2.31.1 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.13.bb b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.13.bb new file mode 100644 index 000000000..4ead998c7 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.13.bb @@ -0,0 +1,22 @@ +SUMMARY = "Grilo is a framework forsearching media content from various sources" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS = " \ + glib-2.0-native \ + gperf-native \ + itstool-native \ + grilo \ + tracker \ + lua \ + liboauth \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gnome-help vala + +SRC_URI += "file://0001-Avoid-running-trackertestutils.patch" +SRC_URI[archive.sha256sum] = "1c4305d67364a930543836cc1982f30e946973b8ff6af3efe31d87709ab520f8" + +FILES_${PN} += "${libdir}/grilo-0.3" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb index ad5dab5ec..c8c16a3c5 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb @@ -8,6 +8,8 @@ inherit gnomebase gsettings bash-completion gettext upstream-version-is-even fea DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \ gsettings-desktop-schemas dbus" +RDEPENDS_${PN} += "gsettings-desktop-schemas" + SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" SRC_URI[archive.md5sum] = "72383474f52d05c21ef2be96d0b91974" SRC_URI[archive.sha256sum] = "50ef3245d1b03666a40455109169a2a1bd51419fd2d51f9fa6cfd4f89f04fb46" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb b/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb index 90e553301..24312c78a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb @@ -3,7 +3,9 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "glib-2.0 gtk+3 gdk-pixbuf clutter-1.0 clutter-gtk-1.0 libsoup-2.4" -inherit meson gobject-introspection +inherit features_check gobject-introspection meson + +REQUIRED_DISTRO_FEATURES = "opengl" SRCREV = "145e417f32e507b63c21ad4e915b808a6174099e" SRC_URI = "git://github.com/gnome/libchamplain.git" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop/0001-fix-compile-error-for-cross-compile.patch b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop/0001-fix-compile-error-for-cross-compile.patch new file mode 100644 index 000000000..1bd6e101b --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop/0001-fix-compile-error-for-cross-compile.patch @@ -0,0 +1,37 @@ +From e865a93000913b4597607289356114cd159f4e28 Mon Sep 17 00:00:00 2001 +From: Your Name <you@example.com> +Date: Fri, 21 May 2021 03:02:29 +0000 +Subject: [PATCH] fix compile error for cross compile + +On some distros, such as fedora32, cross compile failed with following +error since host library is used. undefined reference to +`stat64@GLIBC_2.33' + +According doc of ld, set searchdir begins with "=", but not hardcoded +locations. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libgtop/-/merge_requests/26] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 472f44b..ed6a4d7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -270,8 +270,8 @@ AC_ARG_ENABLE(fatal-warnings, + [Define to enable fatal warnings])) + + dnl These definitions are expanded in make. +-LIBGTOP_LIBS='-L$(libdir)' +-LIBGTOP_INCS='-I$(includedir)/libgtop-2.0' ++LIBGTOP_LIBS='-L=$(libdir)' ++LIBGTOP_INCS='-I=$(includedir)/libgtop-2.0' + + if test x$libgtop_have_sysinfo = xyes ; then + LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SYSINFO" +-- +2.26.2 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb index f0c9cdb0e..6d9398f4e 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb @@ -1,4 +1,4 @@ -SUMMARY = "LibGTop2" +SUMMARY = "A library for collecting system monitoring data" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" @@ -8,9 +8,8 @@ inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-ver inherit features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "c6d67325cd97b2208b41e07e6cc7b947" +SRC_URI += "file://0001-fix-compile-error-for-cross-compile.patch" + SRC_URI[archive.sha256sum] = "78f3274c0c79c434c03655c1b35edf7b95ec0421430897fb1345a98a265ed2d4" DEPENDS = "glib-2.0 libxau" - -EXTRA_OEMAKE += "LIBGTOP_LIBS=" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.2.bb index 3ee382937..c2cb2f19b 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.2.bb @@ -7,8 +7,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala features_check upstream-version-is-even -SRC_URI[archive.md5sum] = "d6081108f9c224c5cb594f8ccb025db9" -SRC_URI[archive.sha256sum] = "de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450" +SRC_URI[archive.md5sum] = "ff399cf89e97a3e574ae05db5617b96b" +SRC_URI[archive.sha256sum] = "ee1201a8fc25c14e940d3b26db49a34947c8aebf67dee01ee67fbcb06ecb37a0" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.0.bb index 8bca93f6d..bfb52e5bb 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.36.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.0.bb @@ -17,8 +17,10 @@ GIR_MESON_DISABLE_FLAG = 'disabled' inherit gnomebase gobject-introspection gtk-doc gettext features_check -SRC_URI[archive.md5sum] = "00bb40dc6fab76af0da33e88a34b6378" -SRC_URI[archive.sha256sum] = "bc508150b3ed5d22354b0e6774ad4eee465381ebc0ace45eb0e2d3a4186c925f" +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "30cb79a839f90cd66f3e202f3f98cb5166fa0cd9b92eb571ad9c470a43021d83" # libxres means x11 only REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb index a3e479869..c7f91f0db 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb @@ -27,7 +27,7 @@ SRC_URI[archive.sha256sum] = "23bde87d33b8981358831cec8915bb5ff1eaf9c1de74c90cd1 SRC_URI += "file://0001-EGL-Include-EGL-eglmesaext.h.patch" # x11 is still manadatory - see meson.build -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 polkit" # systemd can be replaced by libelogind (not available atow - make systemd # mandatory distro feature) @@ -57,7 +57,7 @@ PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm" PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof" PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification" -PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland wayland-native, xserver-xorg-xwayland" +PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland wayland-native, xwayland" PACKAGECONFIG[wayland-eglstream] = "-Dwayland_eglstream=true,-Dwayland_eglstream=false" # yes they changed from mutter-4 -> mutter-5 recently so be perpared diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch deleted file mode 100644 index 46831429d..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9ab5acb902a38b420592931ec9e46ccd0624035a Mon Sep 17 00:00:00 2001 -From: Ondrej Holy <oholy@redhat.com> -Date: Wed, 13 Jan 2021 13:22:58 +0100 -Subject: [PATCH] Drop use of volatile - -The `fedora rawhide` CI job currently fails because of usage of the -`volatile` qualifier. Let's drop the `volatile` qualifier as it doesn't -help anyway. It was dropped in GLib as well, see: -https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719 - -Fixes: https://gitlab.gnome.org/GNOME/nautilus/-/issues/1741 ---- -Upstream-Status: Backport [https://github.com/GNOME/nautilus/commit/9b733dd9df9d6d9805c56749d05ada15a7560ef4] - src/nautilus-enum-types.c.template | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/nautilus-enum-types.c.template b/src/nautilus-enum-types.c.template -index 00155ca..9d8ac83 100644 ---- a/src/nautilus-enum-types.c.template -+++ b/src/nautilus-enum-types.c.template -@@ -13,7 +13,7 @@ - GType - @enum_name@_get_type (void) - { -- static volatile GType type_once = 0; -+ static GType type_once = 0; - - if (g_once_init_enter (&type_once)) - { --- -2.30.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb index cf138d973..75fc03237 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb @@ -13,16 +13,23 @@ DEPENDS = " \ gsettings-desktop-schemas \ gnome-autoar \ tracker \ + libhandy \ + libportal \ " -inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check upstream-version-is-even mime-xdg +inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check mime-xdg -SRC_URI += "file://0001-Drop-use-of-volatile.patch" -SRC_URI[archive.md5sum] = "c3c8dbb90d8eeed6c127aa568e131395" -SRC_URI[archive.sha256sum] = "b6cafc7ab1e70a64383de391b6097fcccbf36b208f8502d8c46423224fd30ef8" +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "8ecfb90174a0bd5815b1ceb9cbfcd91fec0fb5e34907a4f2df2d05e5d6c99d33" REQUIRED_DISTRO_FEATURES = "x11" +EXTRA_OEMESON += " \ + -Dtests=none \ +" + PACKAGECONFIG = "extensions" PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base" @@ -30,6 +37,7 @@ FILES_${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/metainfo \ ${datadir}/gnome-shell \ + ${datadir}/tracker3 \ " # mandatory - not checked during configuration: diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb index 275fbaa69..e9fa25c63 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb @@ -21,7 +21,9 @@ SRC_URI += " \ file://0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch \ " -PACKAGECONFIG ?= "sysprofd libsysprof ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'sysprofd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'libsysprof', '', d)} \ + ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle" PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_4.4.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_4.4.0.bb deleted file mode 100644 index 4120c6260..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_4.4.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Tepl library eases the development of GtkSourceView-based projects" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = " \ - glib-2.0-native \ - gtk+3 \ - gtksourceview4 \ - amtk \ - libxml2 \ - uchardet \ -" - -inherit gnomebase gobject-introspection gettext - -SRC_URI[archive.md5sum] = "013ee8aae178f75cc74e05fac70786b3" -SRC_URI[archive.sha256sum] = "e6f6673a8a27e8f280725db8fbacec79b20676ae0558755239d15a9808faa256" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb new file mode 100644 index 000000000..dd0242f4c --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "Tepl library eases the development of GtkSourceView-based projects" +LICENSE = "LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117" + +DEPENDS = " \ + glib-2.0-native \ + gtk+3 \ + gtksourceview4 \ + amtk \ + libxml2 \ + uchardet \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gobject-introspection gettext features_check + +SRC_URI[archive.sha256sum] = "a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.0.5.bb index 07fa10a0e..6672195e0 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.5.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.0.5.bb @@ -13,9 +13,9 @@ DEPENDS = " \ GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check +inherit gnomebase gsettings gobject-introspection vala bash-completion features_check -SRC_URI[archive.sha256sum] = "9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa" +SRC_URI[archive.sha256sum] = "c9be14871b1398e6e656a354a8f8f59e69e93169017f2b28308ef439324fd12b" SRC_URI += "file://0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch" # gobject-introspection is mandatory and cannot be configured @@ -24,34 +24,33 @@ UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" PACKAGECONFIG ??= " \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "ffmpeg", "", d)} \ - flac \ gexiv2 \ gstreamer \ icu \ libexif \ libgsf \ jpeg \ + pdf \ png \ tiff \ xml \ - pdf \ " +PACKAGECONFIG[battery] = "-Dbattery_detection=upower,-Dbattery_detection=none,upower" PACKAGECONFIG[ffmpeg] = ",,ffmpeg" -PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac" PACKAGECONFIG[gexiv2] = ",,gexiv2" PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[gupnp] = ",,gupnp-dlna" +PACKAGECONFIG[gif] = "-Dgif=enabled,-Dgif=disabled,giflib" PACKAGECONFIG[icu] = ",,icu" +PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" PACKAGECONFIG[libexif] = "-Dexif=enabled,-Dexif=disabled,libexif" PACKAGECONFIG[libgsf] = "-Dgsf=enabled,-Dgsf=disabled,libgsf" -PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" +PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler" PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng" PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" PACKAGECONFIG[xml] = "-Dxml=enabled,-Dxml=disabled,libxml2" -PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis" -PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler" -PACKAGECONFIG[upower] = ",,upower" +PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanger" # For security reasons it is strongly recommended to set add meta-security in # your layers and 'libseccomp' to PACKAGECONFIG". @@ -60,12 +59,14 @@ PACKAGECONFIG[libseccomp] = ",,libseccomp" PACKAGECONFIG[rss] = "-Dminer_rss=true,-Dminer_rss=false,libgrss" EXTRA_OEMESON += " \ - -Dsystemd_user_services=${systemd_user_unitdir} \ + -Dman=false \ + -Dsystemd_user_services=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \ + -Dsystemd_user_services_dir=${systemd_user_unitdir} \ " FILES_${PN} += " \ ${datadir}/dbus-1 \ - ${datadir}/tracker \ - ${libdir}/tracker-miners-2.0 \ + ${datadir}/tracker3-miners \ + ${libdir}/tracker-miners-3.0 \ ${systemd_user_unitdir} \ " diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.6.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.0.4.bb index 2c11976ca..82e3d006e 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.6.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.0.4.bb @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = " \ " DEPENDS = " \ - libxml2-native \ dbus-native \ glib-2.0 \ sqlite3 \ @@ -22,30 +21,32 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check -SRC_URI[archive.sha256sum] = "bd1eb4122135296fa7b57b1c3fa0ed602cf7d06c0b8e534d0bd17ff5f97feef2" +SRC_URI[archive.sha256sum] = "c120d81f2df94aa794b1a7953b55cfa46de318ed68e6f3b5ad4fce0c729c2483" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" -PACKAGECONFIG ??= "fts" -PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanger" -# full text search requires sqlite3 build with PACKAGECONFIG[fts5] set -PACKAGECONFIG[fts] = "-Dfts=true,-Dfts=false" +# text search is not an option anymore and requires sqlite3 build with +# PACKAGECONFIG[fts5] set (default) # set required cross property sqlite3_has_fts5 do_write_config[vardeps] += "PACKAGECONFIG" do_write_config_append() { echo "[properties]" > ${WORKDIR}/meson-tracker.cross - echo "sqlite3_has_fts5 = '${@bb.utils.contains('PACKAGECONFIG', 'fts', 'true', 'false', d)}'" >> ${WORKDIR}/meson-tracker.cross + echo "sqlite3_has_fts5 = 'true'" >> ${WORKDIR}/meson-tracker.cross } -EXTRA_OEMESON = "--cross-file ${WORKDIR}/meson-tracker.cross \ - -Dsystemd_user_services=${systemd_user_unitdir} \ +EXTRA_OEMESON = " \ + --cross-file ${WORKDIR}/meson-tracker.cross \ + -Dman=false \ + -Dsystemd_user_services=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \ + -Dsystemd_user_services_dir=${systemd_user_unitdir} \ " FILES_${PN} += " \ ${datadir}/dbus-1 \ - ${libdir}/tracker-2.0 \ + ${datadir}/tracker3 \ + ${libdir}/tracker-3.0 \ ${systemd_user_unitdir} \ " diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc new file mode 100644 index 000000000..80472178b --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc @@ -0,0 +1,49 @@ +SUMMARY = "Graphics library for creating hardware-accelerated user interfaces" +DESCRIPTION = "Clutter is an Open GL based interactive canvas library, \ +designed for creating fast, mainly 2D single window applications such as media \ +box UIs, presentations, kiosk style applications and so on." +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPLv2.1+" + +inherit clutter ptest-gnome features_check upstream-version-is-even gobject-introspection +# depends on cogl-1.0 which needs opengl +REQUIRED_DISTRO_FEATURES ?= "opengl" + +DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" +PACKAGE_BEFORE_PN += "${PN}-examples" +AUTOTOOLS_AUXDIR = "${S}/build-aux" + +EDEPENDS_X11 = "virtual/libx11 libxi libxfixes" +EDEPENDS_GLX = "virtual/libgl" +EDEPENDS_EGL = "virtual/egl" +EDEPENDS_WAYLAND = "wayland libxkbcommon gdk-pixbuf" + +EDEPENDS_EVDEV = "libxkbcommon" +ERDEPENDS_EVDEV = "xkeyboard-config" + +# Disable pretty much everything, override in platform specific set up +EXTRA_OECONF += "--disable-quartz-backend \ + --disable-win32-backend \ + --disable-cex100-backend \ + --disable-tslib-input \ + " + +PACKAGECONFIG[gdk] = "--enable-gdk-backend,--disable-gdk-backend,gtk+3" +PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}" +PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}" +PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}" +PACKAGECONFIG[evdev] = "--enable-evdev-input,--disable-evdev-input,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}" +PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${EDEPENDS_WAYLAND}" +PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" + +# Default configuration, distros might want to override +PACKAGECONFIG ??= "egl gdk \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" + +FILES_${PN}-examples = "${libdir}/clutter/examples" + +do_configure_prepend() { + # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this + touch -t 200001010000 ${S}/po/clutter-1.0.pot +} diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch new file mode 100644 index 000000000..7b3c1980b --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch @@ -0,0 +1,143 @@ +From 3a0404dfbc65c6a864e01d1200a48074e19d5def Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 2 Sep 2016 14:28:38 +0300 +Subject: [PATCH] Remove clutter.types as it is build configuration-specific. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + doc/reference/clutter.types | 122 -------------------------------------------- + 1 file changed, 122 deletions(-) + delete mode 100644 doc/reference/clutter.types + +diff --git a/doc/reference/clutter.types b/doc/reference/clutter.types +deleted file mode 100644 +index 0037acc..0000000 +--- a/doc/reference/clutter.types ++++ /dev/null +@@ -1,122 +0,0 @@ +-cally_actor_get_type +-cally_clone_get_type +-cally_group_get_type +-cally_rectangle_get_type +-cally_root_get_type +-cally_stage_get_type +-cally_text_get_type +-cally_texture_get_type +-cally_util_get_type +-clutter_action_get_type +-clutter_actor_box_get_type +-clutter_actor_get_type +-clutter_actor_meta_get_type +-clutter_align_constraint_get_type +-clutter_alpha_get_type +-clutter_animatable_get_type +-clutter_animation_get_type +-clutter_animator_get_type +-clutter_animator_key_get_type +-clutter_backend_get_type +-clutter_behaviour_depth_get_type +-clutter_behaviour_ellipse_get_type +-clutter_behaviour_get_type +-clutter_behaviour_opacity_get_type +-clutter_behaviour_path_get_type +-clutter_behaviour_rotate_get_type +-clutter_behaviour_scale_get_type +-clutter_bin_layout_get_type +-clutter_bind_constraint_get_type +-clutter_binding_pool_get_type +-clutter_blur_effect_get_type +-clutter_box_get_type +-clutter_box_layout_get_type +-clutter_brightness_contrast_effect_get_type +-clutter_cairo_texture_get_type +-clutter_canvas_get_type +-clutter_child_meta_get_type +-clutter_click_action_get_type +-clutter_clip_node_get_type +-clutter_clone_get_type +-clutter_color_get_type +-clutter_color_node_get_type +-clutter_colorize_effect_get_type +-clutter_constraint_get_type +-clutter_container_get_type +-clutter_content_get_type +-clutter_deform_effect_get_type +-clutter_desaturate_effect_get_type +-clutter_device_manager_get_type +-clutter_drag_action_get_type +-clutter_drop_action_get_type +-clutter_effect_get_type +-clutter_event_get_type +-clutter_event_sequence_get_type +-clutter_fixed_layout_get_type +-clutter_flow_layout_get_type +-clutter_fog_get_type +-clutter_geometry_get_type +-clutter_gesture_action_get_type +-clutter_glx_texture_pixmap_get_type +-clutter_grid_layout_get_type +-clutter_group_get_type +-clutter_image_get_type +-clutter_input_device_get_type +-clutter_interval_get_type +-clutter_keyframe_transition_get_type +-clutter_knot_get_type +-clutter_layout_manager_get_type +-clutter_layout_meta_get_type +-clutter_list_model_get_type +-clutter_margin_get_type +-clutter_media_get_type +-clutter_model_get_type +-clutter_model_iter_get_type +-clutter_offscreen_effect_get_type +-clutter_page_turn_effect_get_type +-clutter_paint_node_get_type +-clutter_paint_volume_get_type +-clutter_pan_action_get_type +-clutter_param_color_get_type +-clutter_param_fixed_get_type +-clutter_param_units_get_type +-clutter_path_constraint_get_type +-clutter_path_get_type +-clutter_path_node_get_type +-clutter_perspective_get_type +-clutter_pipeline_node_get_type +-clutter_point_get_type +-clutter_property_transition_get_type +-clutter_rect_get_type +-clutter_rectangle_get_type +-clutter_rotate_action_get_type +-clutter_score_get_type +-clutter_script_get_type +-clutter_scriptable_get_type +-clutter_scroll_actor_get_type +-clutter_settings_get_type +-clutter_shader_effect_get_type +-clutter_shader_float_get_type +-clutter_shader_get_type +-clutter_shader_int_get_type +-clutter_shader_matrix_get_type +-clutter_size_get_type +-clutter_snap_constraint_get_type +-clutter_stage_get_type +-clutter_stage_manager_get_type +-clutter_state_get_type +-clutter_state_key_get_type +-clutter_swipe_action_get_type +-clutter_table_layout_get_type +-clutter_tap_action_get_type +-clutter_text_buffer_get_type +-clutter_text_get_type +-clutter_text_node_get_type +-clutter_texture_get_type +-clutter_texture_node_get_type +-clutter_timeline_get_type +-clutter_transition_get_type +-clutter_transition_group_get_type +-clutter_units_get_type +-clutter_vertex_get_type +-clutter_zoom_action_get_type +-- +2.9.3 + diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/install-examples.patch b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/install-examples.patch new file mode 100644 index 000000000..ce9ab3a24 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/install-examples.patch @@ -0,0 +1,19 @@ +Install the examples to $libdir/clutter/. + +Signed-off-by: Ross Burton <ross.burton@intel.com> +Upstream-Status: Inappropriate + +Index: clutter-1.26.2/examples/Makefile.am +=================================================================== +--- clutter-1.26.2.orig/examples/Makefile.am ++++ clutter-1.26.2/examples/Makefile.am +@@ -33,7 +33,8 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/clutter \ + -I$(top_builddir)/clutter + +-noinst_PROGRAMS = $(all_examples) ++exampledir = $(pkglibdir)/examples ++example_PROGRAMS = $(all_examples) + + EXTRA_DIST = redhand.png + diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch new file mode 100644 index 000000000..fef82eaf9 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch @@ -0,0 +1,30 @@ +From d6ceb5a44b28e0e50ede22b84984d8516897de4b Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Mon, 27 Apr 2015 20:12:33 +0300 +Subject: [PATCH] Run installed tests with tap output + +Configure output from installed-tests to be TAP compliant such that +gnome-desktop-testing-runner properly interprets the results. + +Upstream-Status: Pending + +Signed-off-by: Tim Orling <TicoTimo@gmail.com> + +--- + build-aux/autotools/glib-tap.mk | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build-aux/autotools/glib-tap.mk b/build-aux/autotools/glib-tap.mk +index a4f0dad..51cfa31 100644 +--- a/build-aux/autotools/glib-tap.mk ++++ b/build-aux/autotools/glib-tap.mk +@@ -127,7 +127,8 @@ installed_test_meta_DATA = $(installed_testcases:=.test) + %.test: %$(EXEEXT) Makefile + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ +- echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> $@.tmp; \ ++ echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$< --tap' >> $@.tmp; \ ++ echo 'Output=TAP' >> $@.tmp; \ + mv $@.tmp $@) + + CLEANFILES += $(installed_test_meta_DATA) diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-ptest b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-ptest new file mode 100644 index 000000000..98877e522 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner clutter diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0_1.26.4.bb b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0_1.26.4.bb new file mode 100644 index 000000000..ee549fbdd --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0_1.26.4.bb @@ -0,0 +1,10 @@ +require clutter-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[archive.md5sum] = "624dd776a5159de0267587b1df6b97b2" +SRC_URI[archive.sha256sum] = "8b48fac159843f556d0a6be3dbfc6b083fc6d9c58a20a49a6b4919ab4263c4e6" +SRC_URI += "file://install-examples.patch \ + file://run-installed-tests-with-tap-output.patch \ + file://0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch \ + file://run-ptest" diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc new file mode 100644 index 000000000..73315c97e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc @@ -0,0 +1,23 @@ +SUMMARY = "GStreamer integration library for Clutter" +DESCRIPTION = "Clutter-Gst is an integration library for using GStreamer with Clutter. \ +It provides a GStreamer sink to upload frames to GL and an actor that \ +implements the ClutterGstPlayer interface using playbin." +HOMEPAGE = "http://www.clutter-project.org/" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/clutter-gst/-/issues" +LICENSE = "LGPLv2+" + +inherit clutter features_check upstream-version-is-even gobject-introspection +# depends on clutter-1.0 which depends on cogl-1.0 +REQUIRED_DISTRO_FEATURES ?= "opengl" + +export GST_PLUGIN_SCANNER_1_0="${S}/gst-plugin-scanner-dummy" + +SRC_URI += "file://0001-Install-example-binary-needed-for-core-image-clutter.patch" + +DEPENDS = "gstreamer1.0-plugins-base gstreamer1.0-plugins-bad clutter-1.0 libgudev" +RDEPENDS_${PN} += "gstreamer1.0-meta-base" +PACKAGES =+ "${PN}-examples" + +FILES_${PN} += "${libdir}/gstreamer-1.0/lib*.so" +FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" +FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink" diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch new file mode 100644 index 000000000..0b26b990d --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch @@ -0,0 +1,33 @@ +From d77c711277bf075ce0545c19b322f040c49c778a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 30 Apr 2015 12:19:13 +0300 +Subject: [PATCH] Install example binary needed for core-image-clutter + +Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> + +Upstream-Status: Inappropriate [configuration] + +Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded, +commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 3.0 + +Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + examples/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index bfbc1b5..09655e3 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,6 +1,6 @@ + NULL = # + +-noinst_PROGRAMS = camera-player video-player video-sink video-sink-navigation video-content ++bin_PROGRAMS = camera-player video-player video-sink video-sink-navigation video-content + + AM_CPPFLAGS = -I$(top_srcdir) \ + $(MAINTAINER_CFLAGS) \ +-- +2.1.4 + diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb new file mode 100644 index 000000000..35382453c --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb @@ -0,0 +1,7 @@ +require clutter-gst-3.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" + +SRC_URI[archive.md5sum] = "2bf9d7ca146c9d71e86c45cd00e9a28e" +SRC_URI[archive.sha256sum] = "fe69bd6c659d24ab30da3f091eb91cd1970026d431179b0724f13791e8ad9f9d" diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0.inc new file mode 100644 index 000000000..9a28b5219 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0.inc @@ -0,0 +1,23 @@ +SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application" +DESCRIPTION = "Clutter-GTK is a library providing facilities to integrate Clutter into GTK+ \ +applications and vice versa. It provides a GTK+ widget, GtkClutterEmbed, for embedding the \ +a Clutter stage into any GtkContainer; and GtkClutterActor, a Clutter \ +actor for embedding any GtkWidget inside a Clutter stage." +HOMEPAGE = "http://www.clutter-project.org/" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/clutter/-/issues" +LICENSE = "LGPLv2+" + +CLUTTERBASEBUILDCLASS = "meson" +inherit clutter features_check upstream-version-is-even gobject-introspection gtk-doc + +# depends on clutter-1.0 which depends on cogl-1.0 +REQUIRED_DISTRO_FEATURES ?= "opengl" +# depends on gtk+3 +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +DEPENDS = "clutter-1.0 gtk+3" +PACKAGES =+ "${PN}-examples" + +GTKDOC_MESON_OPTION = "enable_docs" + +GIR_MESON_OPTION = 'enable_gi' diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch new file mode 100644 index 000000000..e21c6fd90 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch @@ -0,0 +1,37 @@ +From 7233883c6bd4e80c0e91b29b5c76fe798023e9fe Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 11 Feb 2019 16:41:13 +0100 +Subject: [PATCH] Add a config variable for enabling/disabling introspection + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + clutter-gtk/meson.build | 2 +- + meson_options.txt | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/clutter-gtk/meson.build b/clutter-gtk/meson.build +index 5d6847d..5d934b6 100644 +--- a/clutter-gtk/meson.build ++++ b/clutter-gtk/meson.build +@@ -49,7 +49,7 @@ clutter_gtk_dep = declare_dependency(link_with: clutter_gtk, + dependencies: [ mathlib_dep, clutter_dep, gtk_dep ], + include_directories: include_directories('.')) + +-if not meson.is_cross_build() ++if get_option('enable_gi') + gnome.generate_gir(clutter_gtk, + sources: clutter_gtk_headers + clutter_gtk_sources, + namespace: 'GtkClutter', +diff --git a/meson_options.txt b/meson_options.txt +index aaf59f1..b7e51c3 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -2,3 +2,7 @@ option('enable_docs', + type: 'boolean', + value: false, + description: 'Enable generating the API reference (depends on GTK-Doc)') ++option('enable_gi', ++ type: 'boolean', ++ value: false, ++ description: 'Enable gobject introspection') diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb new file mode 100644 index 000000000..53948c894 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb @@ -0,0 +1,7 @@ +require clutter-gtk-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI += " file://0001-Add-a-config-variable-for-enabling-disabling-introsp.patch" +SRC_URI[archive.md5sum] = "b363ac9878e2337be887b8ee9e1da00e" +SRC_URI[archive.sha256sum] = "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06" diff --git a/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0.inc b/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0.inc new file mode 100644 index 000000000..d581ad1c0 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0.inc @@ -0,0 +1,84 @@ +SUMMARY = "Modern 3D graphics API with associated utility APIs" +DESCRIPTION = "Cogl is a small open source library for using 3D graphics \ +hardware for rendering. The API departs from the flat state machine style of \ +OpenGL and is designed to make it easy to write orthogonal components that \ +can render without stepping on each others toes." +HOMEPAGE = "https://gitlab.gnome.org/GNOME/cogl" +LICENSE = "MIT" + +inherit clutter features_check upstream-version-is-even gobject-introspection +# cogl-1.0 needs opengl to build +REQUIRED_DISTRO_FEATURES ?= "opengl" + +DEPENDS = "glib-2.0 gdk-pixbuf" +PACKAGES =+ "${PN}-examples \ + libcogl libcogl-gles2 libcogl-pango libcogl-path \ + " +AUTOTOOLS_AUXDIR = "${S}/build" + +# Extra DEPENDS for PACKAGECONFIG +EDEPENDS_GL = "virtual/libgl libdrm" +EDEPENDS_GLES2 = "virtual/libgles2" +EDEPENDS_KMS = "libdrm virtual/egl" +EDEPENDS_EGL = "virtual/egl" +EDEPENDS_X11 = "virtual/libx11 libxcomposite libxdamage libxfixes libxrandr" +EDEPENDS_WAYLAND = "virtual/egl virtual/libgles2 wayland" + +# Extra RDEPENDS for PACKAGECONFIG +# This has to be explictly listed, because cogl dlopens the backends +ERDEPENDS_GL = "libgl" +ERDEPENDS_GLES2 = "libgles2" + +# GLESv1 is rarely tested, so disable it +EXTRA_OECONF += "--enable-examples-install \ + --enable-debug \ + --disable-gles1 \ + --disable-cairo \ + " +DEBUG_OPTIMIZATION_append = " -Wno-error=maybe-uninitialized" + +# OpenGL/GLX +PACKAGECONFIG[glx] = "--enable-gl --enable-glx,--disable-gl --disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11},${ERDEPENDS_GL}" + +# GLESv2 +PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}" + +# EGL backends +PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}" +PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform" +PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11} ${EDEPENDS_EGL}" +PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}" + +# Wayland (server-side) +PACKAGECONFIG[wayland-server] = "--enable-wayland-egl-server,--disable-wayland-egl-server,${EDEPENDS_WAYLAND}" + +# Support rendering text directly with Pango +PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" + +# Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by +# default. +PACKAGECONFIG ??= "cogl-pango gles2 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx egl-x11', '', d)} \ + " + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/cogl/.libs" +} + +FILES_${PN} = "" +FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" +FILES_libcogl = "${libdir}/libcogl${SOLIBS} ${libdir}/girepository-1.0/Cogl-*.typelib" +FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}" +FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS} ${libdir}/girepository-1.0/CoglPango*.typelib" + +FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}" + +# For backwards compatibility after Debian-renaming +RPROVIDES_libcogl = "cogl-1.0" +RCONFLICTS_libcogl = "cogl-1.0" +RREPLACES_libcogl = "cogl-1.0" + +RDEPENDS_${PN}-dev = "libcogl" + +COMPATIBLE_HOST_armv4 = 'null' diff --git a/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0/0001-configure.ac-don-t-require-eglmesaext.h.patch b/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0/0001-configure.ac-don-t-require-eglmesaext.h.patch new file mode 100644 index 000000000..328984a63 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0/0001-configure.ac-don-t-require-eglmesaext.h.patch @@ -0,0 +1,92 @@ +From bb9765a926588ebfe1eb324fbbe8fc22d419eebe Mon Sep 17 00:00:00 2001 +From: Max Krummenacher <max.krummenacher@toradex.com> +Date: Thu, 25 Jun 2020 11:27:40 +0000 +Subject: [PATCH] configure.ac: don't require eglmesaext.h + +E.g. the Vivante EGL implementation does not provide eglmesaext.h. + +The commit moves the check for header file existence outside of the +check for existence of a egl packageconfig and makes the existence +of eglmesaext.h optional. + +fixes commit fb1acfec ("Fix building against libglvnd-provided EGL headers") +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/cogl/-/merge_requests/28] +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> +--- + configure.ac | 51 ++++++++++++++++++++++++++++++++------------------- + 1 file changed, 32 insertions(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b7ba95d..0d1d8de 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1212,22 +1212,6 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], + PKG_CHECK_EXISTS([egl], + [COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES egl"], + [ +- AC_CHECK_HEADERS( +- [EGL/egl.h], +- [], +- [AC_MSG_ERROR([Unable to locate required EGL headers])]) +- AC_CHECK_HEADERS( +- [EGL/eglext.h], +- [], +- [AC_MSG_ERROR([Unable to locate required EGL headers])], +- [#include <EGL/egl.h>]) +- AC_CHECK_HEADERS( +- [EGL/eglmesaext.h], +- [], +- [AC_MSG_ERROR([Unable to locate required EGL headers])], +- [#include <EGL/egl.h> +-#include <EGL/eglext.h>]) +- + AC_CHECK_LIB(EGL, [eglInitialize], + [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"], + [AC_MSG_ERROR([Unable to locate required EGL library])]) +@@ -1236,9 +1220,38 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], + ] + ) + +- COGL_EGL_INCLUDES="#include <EGL/egl.h> +-#include <EGL/eglext.h> +-#include <EGL/eglmesaext.h>" ++dnl Test for the existence of egl headers. ++dnl egl*.h includes eglplatform.h which on __unix__ defaults to a X11 platform. ++dnl In that case AC_CHECK_HEADERS failes if X11 headers are not available. ++dnl Set the usual include guard define and, if the EGL implementation doesn't ++dnl use that guard fall back to USE_OZONE and EGL_NO_X11 platforms which don't ++dnl require additional headers. ++ AC_CHECK_HEADERS( ++ [EGL/egl.h], ++ [COGL_EGL_INCLUDES="#include <EGL/egl.h>"], ++ [AC_MSG_ERROR([Unable to locate required EGL headers])], ++ [#define __egl_h_ ++ #define USE_OZONE ++ #define EGL_NO_X11]) ++ AC_CHECK_HEADERS( ++ [EGL/eglext.h], ++ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES ++#include <EGL/eglext.h>"], ++ [AC_MSG_ERROR([Unable to locate required EGL headers])], ++ [#define __eglext_h_ ++ #define USE_OZONE ++ #define EGL_NO_X11 ++$COGL_EGL_INCLUDES]) ++ AC_CHECK_HEADERS( ++ [EGL/eglmesaext.h], ++ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES ++#include <EGL/eglmesaext.h>"], ++ [], ++ [#define __eglmesaext_h_ ++#define USE_OZONE ++#define EGL_NO_X11 ++$COGL_EGL_INCLUDES]) ++ + AC_SUBST([COGL_EGL_INCLUDES]) + ]) + +-- +2.20.1 + diff --git a/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0_1.22.8.bb b/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0_1.22.8.bb new file mode 100644 index 000000000..b9446fab3 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0_1.22.8.bb @@ -0,0 +1,6 @@ +require cogl-1.0.inc + +SRC_URI += "file://0001-configure.ac-don-t-require-eglmesaext.h.patch" +SRC_URI[archive.sha256sum] = "a805b2b019184710ff53d0496f9f0ce6dcca420c141a0f4f6fcc02131581d759" + +LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" diff --git a/meta-openembedded/meta-gnome/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta-openembedded/meta-gnome/recipes-graphics/packagegroups/packagegroup-core-clutter.bb new file mode 100644 index 000000000..2e7b47dd4 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/packagegroups/packagegroup-core-clutter.bb @@ -0,0 +1,22 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +SUMMARY = "Clutter package groups" + +PR = "r6" + +inherit packagegroup features_check +# rdepends on clutter-* +REQUIRED_DISTRO_FEATURES = "opengl" + +PACKAGES = "\ + ${PN}-core \ + " + +SUMMARY_${PN}-core = "Clutter graphics library" +RDEPENDS_${PN}-core = "\ + clutter-1.0 \ + clutter-gst-3.0 \ + clutter-gtk-1.0 \ + " diff --git a/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch b/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch index 73ebeb484..37c5c3dc0 100644 --- a/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch +++ b/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch @@ -23,7 +23,7 @@ diff --git a/GNUmakefile b/GNUmakefile index cbd6ff7..a85230b 100644 --- a/GNUmakefile +++ b/GNUmakefile -@@ -142,10 +142,10 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o) +@@ -162,10 +162,10 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o) JAVA_CLASSES = $(JAVA_SOURCES:.java=.class) JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class) @@ -36,7 +36,7 @@ index cbd6ff7..a85230b 100644 clean: rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \ -@@ -192,6 +192,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS) +@@ -212,6 +212,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS) libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) $(AR) -cru $@ $^ @@ -44,7 +44,7 @@ index cbd6ff7..a85230b 100644 + $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^ + stemwords: $(STEMWORDS_OBJECTS) libstemmer.o - $(CC) $(CFLAGS) -o $@ $^ + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ diff --git a/libstemmer/symbol.map b/libstemmer/symbol.map new file mode 100644 diff --git a/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch b/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch deleted file mode 100644 index 69c1d670e..000000000 --- a/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 23eacfbcc10c777ce47283a5285455ec83c8aa41 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sun, 6 Oct 2019 13:05:08 +0200 -Subject: [PATCH] snowball/stemwords: do link with LDFLAGS set by build - environment -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some (cross-)build systems as OpeneEmbedded are picky (for certain reasons) if -their LDFLAGS are ignored. - -Upstream-Status: Submitted [1] - -[1] https://github.com/snowballstem/snowball/pull/120 - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - GNUmakefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/GNUmakefile b/GNUmakefile -index 76f6ae9..47c6077 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -179,7 +179,7 @@ clean: - -rmdir $(js_output_dir) - - snowball: $(COMPILER_OBJECTS) -- $(CC) $(CFLAGS) -o $@ $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ - - $(COMPILER_OBJECTS): $(COMPILER_HEADERS) - -@@ -204,7 +204,7 @@ libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) - $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^ - - stemwords: $(STEMWORDS_OBJECTS) libstemmer.o -- $(CC) $(CFLAGS) -o $@ $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ - - csharp_stemwords: $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES) - $(MCS) -unsafe -target:exe -out:$@ $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES) --- -2.21.0 - diff --git a/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb b/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb index 96dd880b6..c1a06c0d0 100644 --- a/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb +++ b/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb @@ -1,18 +1,17 @@ SUMMARY = "Snowball compiler and stemming algorithms" HOMEPAGE = "https://snowballstem.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=2750797da77c1d784e7626b3f7d7ff3e" +LIC_FILES_CHKSUM = "file://COPYING;md5=19139aaf3c8c8fa1ca6edd59c072fb9f" DEPENDS_class-target = "${BPN}-native" SRC_URI = "\ git://github.com/snowballstem/snowball.git \ file://0001-Build-so-lib.patch \ - file://0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch \ " -SRCREV = "c70ed64f9d41c1032fba4e962b054f8e9d489a74" +SRCREV = "4764395431c8f2a0b4fe18b816ab1fc966a45837" S = "${WORKDIR}/git" -PV = "2.0.0" +PV = "2.1.0" LIBVER = "0.0.0" inherit lib_package diff --git a/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb b/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb index 1f450fd9d..593e5866d 100644 --- a/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb +++ b/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb @@ -14,11 +14,10 @@ RDEPENDS_${PN} = " \ ghex \ gnome-calculator \ gnome-calendar \ - gnome-disk-utility \ gnome-font-viewer \ gnome-photos \ gnome-terminal \ libwnck3 \ nautilus \ - ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'gnome-system-monitor', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'gnome-system-monitor gnome-disk-utility', '', d)} \ " diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch new file mode 100644 index 000000000..ef0c945d0 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch @@ -0,0 +1,61 @@ +From 6eba07bd195e0a1199a0fc62d7cc31ec376bc3dd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Mon, 31 May 2021 17:44:29 +0200 +Subject: [PATCH] Fix build with hardened security flags +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +| ../gupnp-1.2.6/examples/get-volume.c: In function 'on_introspection': +| ../gupnp-1.2.6/examples/get-volume.c:53:17: error: format not a string literal and no format arguments [-Werror=format-security] +| 53 | g_critical (error->message); +| | ^~~~~~~~~~ +| ../gupnp-1.2.6/examples/get-volume.c:114:17: error: format not a string literal and no format arguments [-Werror=format-security] +| 114 | g_critical (error->message); +| | ^~~~~~~~~~ +| ../gupnp-1.2.6/examples/get-volume.c: In function 'main': +| ../gupnp-1.2.6/examples/get-volume.c:150:17: error: format not a string literal and no format arguments [-Werror=format-security] +| 150 | g_error (error->message); +| | ^~~~~~~ + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/17] +--- + examples/get-volume.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/examples/get-volume.c b/examples/get-volume.c +index 4601014..923581c 100644 +--- a/examples/get-volume.c ++++ b/examples/get-volume.c +@@ -50,7 +50,7 @@ on_introspection (GObject *object, GAsyncResult *res, gpointer user_data) + &error); + + if (error != NULL) { +- g_critical (error->message); ++ g_critical ("%s", error->message); + g_clear_error (&error); + } + +@@ -111,7 +111,7 @@ on_introspection (GObject *object, GAsyncResult *res, gpointer user_data) + g_list_free (out_names); + + if (error != NULL) { +- g_critical (error->message); ++ g_critical ("%s", error->message); + g_clear_error (&error); + } else { + g_print ("Current volume: %s\n", +@@ -147,7 +147,7 @@ int main(int argc, char *argv[]) + GUPnPContext *context = gupnp_context_new ("wlp3s0", 0, &error); + + if (error != NULL) { +- g_error (error->message); ++ g_error ("%s", error->message); + } + + GUPnPControlPoint *cp = gupnp_control_point_new (context, CONTENT_DIR); +-- +2.31.1 + diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.4.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.4.bb deleted file mode 100644 index c7b330fa0..000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.4.bb +++ /dev/null @@ -1,8 +0,0 @@ -require gupnp.inc - -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "7c9c7cd80e36d9fb1e5b0267571fc17d" -SRC_URI[sha256sum] = "f7a0307ea51f5e44d1b832f493dd9045444a3a4e211ef85dfd9aa5dd6eaea7d1" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb new file mode 100644 index 000000000..294c361db --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb @@ -0,0 +1,10 @@ +require gupnp.inc + +SRC_URI = " \ + ${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz \ + file://0001-Fix-build-with-hardened-security-flags.patch \ +" +SRC_URI[sha256sum] = "00b20f1e478a72deac92c34723693a2ac55789ed1e4bb4eed99eb4d62092aafd" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp/0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp/0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch new file mode 100644 index 000000000..ee7819677 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp/0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch @@ -0,0 +1,42 @@ +From 343a3b724225d3c87af0b268da14d3acb7a5b9a1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 9 May 2021 15:38:43 -0700 +Subject: [PATCH] ithread: Use + pthread_mutexattr_gettype/pthread_mutexattr_settype on linux + +_np variants are not recommended anymore, and glibc 2.34+ will have +these removed + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + upnp/inc/ithread.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/upnp/inc/ithread.h b/upnp/inc/ithread.h +index f6800ea9..1d0f9dba 100644 +--- a/upnp/inc/ithread.h ++++ b/upnp/inc/ithread.h +@@ -304,7 +304,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void) + * Returns EINVAL if the kind is not supported. + * See man page for pthread_mutexattr_setkind_np + *****************************************************************************/ +-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) ++#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) \ ++ || defined (__linux__) + #define ithread_mutexattr_setkind_np pthread_mutexattr_settype + #else + #define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np +@@ -329,7 +330,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void) + * Always returns 0. + * See man page for pthread_mutexattr_getkind_np + *****************************************************************************/ +-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) ++#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) \ ++ || defined (__linux__) + #define ithread_mutexattr_getkind_np pthread_mutexattr_gettype + #else + #define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np +-- +2.31.1 + diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.0.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.6.bb index 88652a443..81b42da41 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.6.bb @@ -8,8 +8,10 @@ HOMEPAGE = "http://pupnp.sourceforge.net/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=394a0f17b97f33426275571e15920434" -SRCREV = "a6c3616530490ca67db41131572ec18f00d95eb0" -SRC_URI = "git://github.com/mrjimenez/pupnp.git;protocol=https" +SRCREV = "cef2b23fb36baac091b0c7d41136b4c1d9549c6d" +SRC_URI = "git://github.com/pupnp/pupnp.git;protocol=https;branch=branch-1.14.x \ + file://0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch \ + " S="${WORKDIR}/git" @@ -18,5 +20,5 @@ inherit autotools pkgconfig EXTRA_OECONF += "--enable-reuseaddr" # Enable LFS support ( for samples ) -CFLAGS += "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" -CXXFLAGS += "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" +CFLAGS += "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE" +CXXFLAGS += "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/aom/aom_3.0.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/aom/aom_3.0.0.bb index 7ea9b199b..f5a42fb86 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/aom/aom_3.0.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/aom/aom_3.0.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Alliance for Open Media - AV1 Codec Library" DESCRIPTION = "Alliance for Open Media AV1 codec library" -LICENSE = "BSD-2-Clause & AOM-Patent-1.0" +LICENSE = "BSD-2-Clause & AOM-Patent-License-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=6ea91368c1bbdf877159435572b931f5 \ file://PATENTS;md5=e69ad12202bd20da3c76a5d3648cfa83 \ " diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc index 63ba54c34..a8c8b4cd3 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc @@ -5,8 +5,8 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" SRC_URI = "git://github.com/FluidSynth/fluidsynth.git" -SRCREV = "8413c35aca641567baf13e9b16e9839019ebf99d" +SRCREV = "90a6c52e1c347d1c4283b0de9f860ed2fbc413bc" S = "${WORKDIR}/git" -PV = "2.2.0" +PV = "2.2.1" inherit cmake pkgconfig lib_package diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc index ab0f23879..9f03cbd80 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc @@ -4,7 +4,7 @@ JUCE supported platforms, including Linux and Embedded Linux." SECTION = "utils" HOMEPAGE = "http://juce.com/" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a20f91622a47d4e4af9340d5d3f1a2d8" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=12e9c2db7897c0349a4cc1c6d2a8c5d5" inherit pkgconfig features_check @@ -13,14 +13,13 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS = "libx11 libxext libxinerama libxrandr libxcursor freetype alsa-lib curl bzip2 libpng harfbuzz glib-2.0 libpcre" DEPENDS_append_libc-musl = " libexecinfo" -SRCREV = "724ae27c71ef809b836df06713cf9e50bc14162b" +SRCREV = "90e8da0cfb54ac593cdbed74c3d0c9b09bad3a9f" BRANCH = "master" SRC_URI = "git://github.com/WeAreROLI/JUCE.git;protocol=https;branch=${BRANCH} \ - file://0001-Disable-webkit-component.patch \ " S = "${WORKDIR}/git" -PV = "5.4.5" +PV = "6.0.8" JUCE_PROJUCER_BUILD_PATH = "${B}/extras/Projucer/Builds" JUCE_PROJUCER_MAKEFILE_PATH = "${JUCE_PROJUCER_BUILD_PATH}/LinuxMakefile" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer/0001-Disable-webkit-component.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer/0001-Disable-webkit-component.patch deleted file mode 100644 index 3728439c7..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer/0001-Disable-webkit-component.patch +++ /dev/null @@ -1,83 +0,0 @@ -From df7190f430f30ee522f56f9714d42ee796f0d5ff Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 2 Dec 2019 22:18:41 -0800 -Subject: [PATCH] Disable webkit component - -It asks for enable JUCER_ENABLE_GPL_MODE - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - extras/Projucer/Builds/LinuxMakefile/Makefile | 10 +++++----- - extras/Projucer/JuceLibraryCode/AppConfig.h | 4 ++-- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile -index 25b490460..8960f5bc6 100644 ---- a/extras/Projucer/Builds/LinuxMakefile/Makefile -+++ b/extras/Projucer/Builds/LinuxMakefile/Makefile -@@ -35,13 +35,13 @@ ifeq ($(CONFIG),Debug) - TARGET_ARCH := -march=native - endif - -- JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.4.5 -DJUCE_APP_VERSION_HEX=0x50405 $(shell pkg-config --cflags x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) -+ JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.4.5 -DJUCE_APP_VERSION_HEX=0x50405 $(shell pkg-config --cflags x11 xinerama xext freetype2) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) - JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 -DJucePlugin_Build_Unity=0 - JUCE_TARGET_APP := Projucer - - JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) - JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) -- JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -lrt -ldl -lpthread $(LDFLAGS) -+ JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs x11 xinerama xext freetype2) -lrt -ldl -lpthread $(LDFLAGS) - - CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) - endif -@@ -56,13 +56,13 @@ ifeq ($(CONFIG),Release) - TARGET_ARCH := -march=native - endif - -- JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.4.5 -DJUCE_APP_VERSION_HEX=0x50405 $(shell pkg-config --cflags x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) -+ JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.4.5 -DJUCE_APP_VERSION_HEX=0x50405 $(shell pkg-config --cflags x11 xinerama xext freetype2) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) - JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 -DJucePlugin_Build_Unity=0 - JUCE_TARGET_APP := Projucer - - JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) - JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) -- JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -fvisibility=hidden -lrt -ldl -lpthread $(LDFLAGS) -+ JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs x11 xinerama xext freetype2) -fvisibility=hidden -lrt -ldl -lpthread $(LDFLAGS) - - CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) - endif -@@ -136,7 +136,7 @@ all : $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) - - $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : $(OBJECTS_APP) $(RESOURCES) - @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } -- @pkg-config --print-errors x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 -+ @pkg-config --print-errors x11 xinerama xext freetype2 - @echo Linking "Projucer - App" - -$(V_AT)mkdir -p $(JUCE_BINDIR) - -$(V_AT)mkdir -p $(JUCE_LIBDIR) -diff --git a/extras/Projucer/JuceLibraryCode/AppConfig.h b/extras/Projucer/JuceLibraryCode/AppConfig.h -index dffd5af75..53302bd24 100644 ---- a/extras/Projucer/JuceLibraryCode/AppConfig.h -+++ b/extras/Projucer/JuceLibraryCode/AppConfig.h -@@ -32,7 +32,7 @@ - // BEGIN SECTION A
-
- #ifndef JUCER_ENABLE_GPL_MODE
-- #define JUCER_ENABLE_GPL_MODE 0
-+ #define JUCER_ENABLE_GPL_MODE 1
- #endif
-
- // END SECTION A
-@@ -180,7 +180,7 @@ - // juce_gui_extra flags:
-
- #ifndef JUCE_WEB_BROWSER
-- //#define JUCE_WEB_BROWSER 1
-+ #define JUCE_WEB_BROWSER 0
- #endif
-
- #ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR
--- -2.24.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb index b05df3210..30dab1d92 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb @@ -10,12 +10,11 @@ LIC_FILES_CHKSUM = "\ SRC_URI = " \ git://linuxtv.org/libcamera.git;protocol=git \ - file://0001-uvcvideo-Use-auto-variable-to-avoid-range-loop-warni.patch \ " -SRCREV = "f490a87fd339fc7443f5d8467ba56a35c750a5f7" +SRCREV = "193ca8c353a42334f65ddfc988a105a47bca3547" -PV = "202102+git${SRCPV}" +PV = "202105+git${SRCPV}" S = "${WORKDIR}/git" @@ -31,6 +30,10 @@ RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland qt', 'qtwayla inherit meson pkgconfig python3native +do_configure_prepend() { + sed -i -e 's|py_compile=True,||' ${S}/utils/ipc/mojo/public/tools/mojom/mojom/generate/template_expander.py +} + do_install_append() { chrpath -d ${D}${libdir}/libcamera.so } diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-uvcvideo-Use-auto-variable-to-avoid-range-loop-warni.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-uvcvideo-Use-auto-variable-to-avoid-range-loop-warni.patch deleted file mode 100644 index cec5fc287..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-uvcvideo-Use-auto-variable-to-avoid-range-loop-warni.patch +++ /dev/null @@ -1,117 +0,0 @@ -Delivered-To: raj.khem@gmail.com -Received: by 2002:a05:620a:20d3:0:0:0:0 with SMTP id f19csp2716715qka; - Sat, 27 Mar 2021 19:58:30 -0700 (PDT) -X-Google-Smtp-Source: ABdhPJwyDnjZqZmFqHVShb/5/RoVkJ4Avv5bcnyuo85vIRR2vJDQF+QBZpQpEWHgx5GuEuwLVSC+ -X-Received: by 2002:a05:6512:22d0:: with SMTP id g16mr12125441lfu.650.1616900310724; - Sat, 27 Mar 2021 19:58:30 -0700 (PDT) -ARC-Seal: i=1; a=rsa-sha256; t=1616900310; cv=none; - d=google.com; s=arc-20160816; - b=bZlu68tossyE2YcGkt0HzIhqTUroWDT/EgJvAiQBgZ6bPzMJ+wjwWp3LzViqOxiRPQ - r0cFyme7CJ9YRf2TLmpjGuv2RPQ+EkrtFdlB7i65nhDrwvBoxt78vF2tUoDgVLL1YrU9 - wKgHPtBjtDcDveOXKQJH2j5HRwiBjCXlPRBhlSxV8kJPBj//dRaKm0MsxfiW/IgyN1tZ - FFxfe4Lk1Awm8ZKAklhdKMly3MFA6IbnjwNcN/84a0R/0+PLu9X8XIR6+CnrfqSgWOBx - zsV8p3HuVQTpX7Hhnkiz7PYudHsJJ/7KXeXTP6s9NNnZGu9A6U/E6VOob5BSm9DDIA5z - 4AnA== -ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; - h=content-transfer-encoding:mime-version:message-id:date:subject:cc - :to:from:dkim-signature; - bh=fbAn+wsNks5BGTY34H4T90NDFJaNV4nnt9vc9DBFaWQ=; - b=mLZNiQR/CdgcVTAc7OQmK0ZYTVpofG/EOqTIi2NYIYFhanWhatYY9Hx2xwxIp6kQ5R - n0uXh5tLth6aPYD09z3YcXYasEIszBKwoNUFjRA85lFm3d5/J2S1wC5rBy25QeCDOg57 - QdzYrTBX2QGRHGQKauEnX5FLDTT+I53sPa87TyvxUKBS+lTAbJig70KfmL7FJIEWT1ZI - CZKCErYFlQTGNnwM0CYVXyHv54D2tA25veHQIJN8KK+XObNWuAY3rYpqKoUpOP4vpSPi - MXJWAV4L6NZEShWvwJiC4Zdy2xFzXASX27CAKIsX6T5Rub03grVTg6WVt9bChK1x5jeg - A2Yw== -ARC-Authentication-Results: i=1; mx.google.com; - dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=MniKswyT; - spf=pass (google.com: domain of laurent.pinchart@ideasonboard.com designates 213.167.242.64 as permitted sender) smtp.mailfrom=laurent.pinchart@ideasonboard.com -Return-Path: <laurent.pinchart@ideasonboard.com> -Received: from perceval.ideasonboard.com (perceval.ideasonboard.com. [213.167.242.64]) - by mx.google.com with ESMTPS id v18si12339470ljj.208.2021.03.27.19.58.30 - for <raj.khem@gmail.com> - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Sat, 27 Mar 2021 19:58:30 -0700 (PDT) -Received-SPF: pass (google.com: domain of laurent.pinchart@ideasonboard.com designates 213.167.242.64 as permitted sender) client-ip=213.167.242.64; -Authentication-Results: mx.google.com; - dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=MniKswyT; - spf=pass (google.com: domain of laurent.pinchart@ideasonboard.com designates 213.167.242.64 as permitted sender) smtp.mailfrom=laurent.pinchart@ideasonboard.com -Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) - by perceval.ideasonboard.com (Postfix) with ESMTPSA id 11F12332; - Sun, 28 Mar 2021 04:58:28 +0200 (CEST) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; - s=mail; t=1616900309; - bh=BwCg4h9N9fJysbMT1Yjbazbp7zTImD9mkWJSjCKzCmg=; - h=From:To:Cc:Subject:Date:From; - b=MniKswyT+aUtPgeMFeLqW6cRMFsPRN4W1XtVDA6pqI0QTSSx5koEuzSfEybjs6Qbp - ZdQar1r5nBIRCg9uq85YoLKoFeT7WN4PrwnRYPwaYGAFHfV44rDrq4RBe3VOIb+85W - tKn4HEzjlFelrImVbeymBsgpVhITveSVH1MdYRsE= -From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> -To: libcamera-devel@lists.libcamera.org -Cc: Khem Raj <raj.khem@gmail.com> -Subject: [PATCH v2] libcamera: pipeline: uvcvideo: Avoid reference to temporary object -Date: Sun, 28 Mar 2021 05:57:41 +0300 -Message-Id: <20210328025741.30246-1-laurent.pinchart@ideasonboard.com> -X-Mailer: git-send-email 2.28.1 -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit - -From: Khem Raj <raj.khem@gmail.com> - -A range-based for loop whose range expression is an array of char -pointers and range variable declaration is a const reference to a -std::string creates a temporary string from the char pointer and binds -the range variable reference to it. This creates a const reference to a -temporary, which is valid in C++, and extends the lifetime of the -temporary to the lifetime of the reference. - -However, lifetime extension in range-based for loops is considered as a -sign of a potential issue, as a temporary is created for every -iteration, which can be costly, and the usage of a reference in the -range declaration doesn't make it obvious that the code isn't simply -binding a reference to an existing object. gcc 11, with the --Wrange-loop-construct option, flags this: - -uvcvideo.cpp:432:33: error: loop variable 'name' of type 'const string&' {aka 'const std::__cxx11::basic_string<cha -r>&'} binds to a temporary constructed from type 'const char* const' [-Werror=range-loop-construct] -| 432 | for (const std::string &name : { "idVendor", "idProduct" }) { -| | ^~~~ - -To please the compiler, make the range variable a const char *. This may -bring a tiny performance improvement, as the name is only used once, in -a location where the compiler can use - - operator+(const std::string &, const char *) - -instead of - - operator+(const std::string &, const std::string &) - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> - -Use a const char * type instead of auto, and update the commit message -accordingly. - -Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> ---- - src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp -index 031f96e28449..b6c6ade5ebaf 100644 ---- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp -+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp -@@ -429,7 +429,7 @@ std::string PipelineHandlerUVC::generateId(const UVCCameraData *data) - - /* Creata a device ID from the USB devices vendor and product ID. */ - std::string deviceId; -- for (const std::string &name : { "idVendor", "idProduct" }) { -+ for (const char *name : { "idVendor", "idProduct" }) { - std::ifstream file(path + "/../" + name); - - if (!file.is_open()) --- -Regards, - -Laurent Pinchart - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libdvdnav/libdvdnav_5.0.3.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libdvdnav/libdvdnav_6.1.1.bb index c2dd96f9d..06308d96c 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libdvdnav/libdvdnav_5.0.3.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libdvdnav/libdvdnav_6.1.1.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libdvdread" SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.bz2" -SRC_URI[md5sum] = "e9ea4de3bd8f204e61301d407d09f033" -SRC_URI[sha256sum] = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d" +SRC_URI[md5sum] = "46c46cb0294fbd1fcb8a0181818dad15" +SRC_URI[sha256sum] = "c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48" inherit autotools lib_package binconfig pkgconfig diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch deleted file mode 100644 index db4d6e8c9..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch +++ /dev/null @@ -1,21 +0,0 @@ -Allow LIB_INSTALL_DIR to be set by the the cmake configure invocation. We dont -easily have a way of determining something that patches ${LIB_SUFFIX} so we'll -set LIB_INSTALL_DIR. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Kumar Gala <galak@kernel.crashing.org> - -Index: git/CMakeLists.txt -=================================================================== ---- git.orig/CMakeLists.txt -+++ git/CMakeLists.txt -@@ -36,7 +36,7 @@ FIND_PACKAGE(LibXml2 REQUIRED) - SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") - SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE) - SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE) --SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries" FORCE) -+SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries") - SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE) - - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz5.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz5.pc) diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb index ca9d94a19..f73b549df 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb @@ -3,38 +3,23 @@ DESCRIPTION = "The MusicBrainz client is a library which can be built into other HOMEPAGE = "http://musicbrainz.org" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24" -DEPENDS = "expat libxml2 libxml2-native neon neon-native" +DEPENDS = "expat libxml2 libxml2-native neon neon-native libmusicbrainz-native" PV = "5.1.0+git${SRCPV}" -SRCREV = "44c05779dd996035758f5ec426766aeedce29cc3" -SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git \ - file://allow-libdir-override.patch " +SRCREV = "8be45b12a86bc0e46f2f836c8ac88e1e98d82aee" +SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git" S = "${WORKDIR}/git" inherit cmake pkgconfig -do_configure_prepend() { - # The native build really doesn't like being rebuilt, so delete - # it if it's already present. Also delete all other files not - # known to Git to fix subsequent invocations of do_configure. - git clean -dfx -e /.pc/ -e /patches/ . - mkdir build-native - cd build-native - LDFLAGS="${BUILD_LDFLAGS}" \ - cmake -DCMAKE_C_FLAGS=${BUILD_CFLAGS} \ - -DCMAKE_C_COMPILER=${BUILD_CC} \ - -DCMAKE_CXX_FLAGS=${BUILD_CXXFLAGS} \ - -DCMAKE_CXX_COMPILER=${BUILD_CXX} \ - -DCMAKE_EXE_LINKER_FLAGS=${BUILD_LDFLAGS} \ - .. - make make-c-interface - cd .. -} +EXTRA_OECMAKE_append_class-target = " -DIMPORT_EXECUTABLES=${STAGING_LIBDIR_NATIVE}/cmake/${BPN}/ImportExecutables.cmake" -EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:PATH=${libdir} \ - -DIMPORT_EXECUTABLES=build-native/ImportExecutables.cmake" +do_install_append_class-native() { + install -Dm 0755 ${B}/src/make-c-interface ${D}${bindir}/make-c-interface + install -Dm 0644 ${B}/ImportExecutables.cmake ${D}${libdir}/cmake/${BPN}/ImportExecutables.cmake + sed -i -e s:'${B}'/src/::g ${D}${libdir}/cmake/${BPN}/ImportExecutables.cmake +} -# out-of-tree building doesn't appear to work for this package. -B = "${S}" +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb b/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb index 1102bb95a..c0556e739 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb @@ -23,8 +23,9 @@ inherit lib_package LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1fc37e1037ae673975fbcb96a98f7191" -SRCREV = "8ef7680081c61b486622f2d983c0d3d21e83caad" -SRC_URI = "git://www.bearssl.org/git/BearSSL;protocol=https;nobranch=1 \ +PV .= "+git${SRCPV}" +SRCREV = "79b1a9996c094ff593ae50bc4edc1f349f39dd6d" +SRC_URI = "git://www.bearssl.org/git/BearSSL;protocol=https \ file://0001-conf-Unix.mk-remove-fixed-command-definitions.patch \ file://0002-test-test_x509.c-fix-potential-overflow-issue.patch \ file://0001-make-Pass-LDFLAGS-when-building-shared-objects.patch \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb new file mode 100644 index 000000000..b178180ec --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb @@ -0,0 +1,72 @@ +SECTION = "console/network" +SUMMARY = "Internet Software Consortium DHCP Relay Agent" +DESCRIPTION = "A DHCP relay agent passes DHCP requests from one \ +LAN to another, so that a DHCP server is not needed on every LAN." + +HOMEPAGE = "http://www.isc.org/" + +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01" + +DEPENDS = "openssl libcap zlib" + +SRC_URI = "https://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \ + file://default-relay \ + file://init-relay \ + file://dhcrelay.service \ + file://0001-Makefile.am-only-build-dhcrelay.patch \ + " + +SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1" +SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521" + +UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/" + +S = "${WORKDIR}/dhcp-${PV}" + +inherit autotools-brokensep systemd + +SYSTEMD_SERVICE_${PN} = "dhcrelay.service" +SYSTEMD_AUTO_ENABLE_${PN} = "disable" + +CFLAGS += "-D_GNU_SOURCE -fcommon" +LDFLAGS_append = " -pthread" + +EXTRA_OECONF = "--enable-paranoia \ + --disable-static \ + --enable-libtool \ + --with-randomdev=/dev/random \ + " +EXTRA_OEMAKE += "LIBTOOL='${S}/${HOST_SYS}-libtool'" + +# Enable shared libs per dhcp README +do_configure_prepend () { + cp configure.ac+lt configure.ac +} +do_compile_prepend() { + rm -rf ${S}/bind/bind-9.11.14/ + tar xf ${S}/bind/bind.tar.gz -C ${S}/bind + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/bind/bind-9.11.14/ + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/bind/bind-9.11.14/ + cp -fpR ${S}/m4/*.m4 ${S}/bind/bind-9.11.14/libtool.m4/ + rm -rf ${S}/bind/bind-9.11.14/libtool + install -m 0755 ${S}/${HOST_SYS}-libtool ${S}/bind/bind-9.11.14/ +} + +do_install_append () { + install -d ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcrelay.service + sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service + else + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay + fi +} + +PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch new file mode 100644 index 000000000..fed85d2a8 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch @@ -0,0 +1,30 @@ +From 17cc080e58894644dd18664ac6f3451096d5f065 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Thu, 13 May 2021 15:23:16 +0800 +Subject: [PATCH] Makefile.am: only build dhcrelay + +Drop client and server build as we don't need them. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index ed692a5..34f9772 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -38,7 +38,7 @@ endif + + # Use an autoconf substitution vs an automake conditional here + # to fool automake when the bind directory does not exist. +-SUBDIRS = @BINDSUBDIR@ includes tests common omapip client dhcpctl relay server ++SUBDIRS = @BINDSUBDIR@ includes common omapip relay + + DIST_SUBDIRS = $(SUBDIRS) keama + +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/default-relay b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/default-relay new file mode 100644 index 000000000..7961f014b --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/default-relay @@ -0,0 +1,12 @@ +# Defaults for dhcp-relay initscript +# sourced by /etc/init.d/dhcp-relay + +# What servers should the DHCP relay forward requests to? +# e.g: SERVERS="192.168.0.1" +SERVERS="" + +# On what interfaces should the DHCP relay (dhrelay) serve DHCP requests? +INTERFACES="" + +# Additional options that are passed to the DHCP relay daemon? +OPTIONS="" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/dhcrelay.service b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/dhcrelay.service new file mode 100644 index 000000000..15ff927d3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/dhcrelay.service @@ -0,0 +1,10 @@ +[Unit] +Description=DHCP Relay Agent Daemon +After=network.target + +[Service] +EnvironmentFile=@SYSCONFDIR@/default/dhcp-relay +ExecStart=@SBINDIR@/dhcrelay -d --no-pid -q $SERVERS + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/init-relay b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/init-relay new file mode 100644 index 000000000..019a7e84c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/init-relay @@ -0,0 +1,44 @@ +#!/bin/sh +# +# $Id: dhcp3-relay,v 1.1 2004/04/16 15:41:08 ml Exp $ +# + +# It is not safe to start if we don't have a default configuration... +if [ ! -f /etc/default/dhcp-relay ]; then + echo "/etc/default/dhcp-relay does not exist! - Aborting..." + echo "create this file to fix the problem." + exit 1 +fi + +# Read init script configuration (interfaces the daemon should listen on +# and the DHCP server we should forward requests to.) +. /etc/default/dhcp-relay + +# Build command line for interfaces (will be passed to dhrelay below.) +IFCMD="" +if test "$INTERFACES" != ""; then + for I in $INTERFACES; do + IFCMD=${IFCMD}"-i "${I}" " + done +fi + +DHCRELAYPID=/var/run/dhcrelay.pid + +case "$1" in + start) + start-stop-daemon -S -x /usr/sbin/dhcrelay -- -q $OPTIONS $IFCMD $SERVERS + ;; + stop) + start-stop-daemon -K -x /usr/sbin/dhcrelay + ;; + restart | force-reload) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "Usage: /etc/init.d/dhcp-relay {start|stop|restart|force-reload}" + exit 1 +esac + +exit 0 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index c2f482716..b19364e1e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb @@ -29,6 +29,8 @@ inherit autotools DEPENDS += "flex-native" +LDFLAGS += "-pthread" + PACKAGES =+ "${PN}-requestor ${PN}-client ${PN}-relay ${PN}-server" FILES_${PN}-client = "${sbindir}/${PN}-client" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/check-openssl-cmds-in-script-bootstrap.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/check-openssl-cmds-in-script-bootstrap.patch new file mode 100644 index 000000000..fcadae93a --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/check-openssl-cmds-in-script-bootstrap.patch @@ -0,0 +1,38 @@ +bootstrap: check commands of openssl exist + +It calls openssl commands dhparam and pkcs12 in script bootstrap. These +commands are configurable based on configure options 'no-dh' and +'no-des', and may not be provided by openssl. So check existence of +these commands. If not, abort running of script bootstrap. + +1. https://github.com/openssl/openssl/blob/master/apps/build.info#L37 +2. https://github.com/openssl/openssl/blob/master/apps/build.info#L22 + +Upstream-Status: Denied [https://github.com/FreeRADIUS/freeradius-server/pull/4059] + The maintainer commented in the pull that the script could + be run on a host which provides these openssl commands. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + raddb/certs/bootstrap | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/raddb/certs/bootstrap b/raddb/certs/bootstrap +index 0f719aafd4..17feddbeeb 100755 +--- a/raddb/certs/bootstrap ++++ b/raddb/certs/bootstrap +@@ -13,6 +13,14 @@ + umask 027 + cd `dirname $0` + ++# check commands of openssl exist ++for cmd in dhparam pkcs12; do ++ if ! openssl ${cmd} -help >/dev/null 2>&1; then ++ echo "Error: command ${cmd} is not supported by openssl." ++ exit 1 ++ fi ++done ++ + make -h > /dev/null 2>&1 + + # diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb index 864a4e944..a6df2aeb0 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb @@ -31,6 +31,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x;lfs=0 file://0001-workaround-error-with-autoconf-2.7.patch \ file://radiusd.service \ file://radiusd-volatiles.conf \ + file://check-openssl-cmds-in-script-bootstrap.patch \ " SRCREV = "af428abda249b2279ba0582180985a9f6f4a144a" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0003-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch index 65567610b..2168a0713 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0003-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch @@ -1,4 +1,4 @@ -From 89f326a427c7ad13c115e2d3f2ac27807aa5a795 Mon Sep 17 00:00:00 2001 +From d4ddfc7a350011b7944ed8d6bca80f164dfd1387 Mon Sep 17 00:00:00 2001 From: Romain Naour <romain.naour@smile.fr> Date: Fri, 10 Jul 2020 17:08:34 +0200 Subject: [PATCH] pyiec61850: don't break CMAKE_INSTALL_PATH by trying to find @@ -33,5 +33,5 @@ index 159ef4b..d1732a1 100644 add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) -- -2.21.3 +2.31.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0001-use-poll.h-instead-of-sys-poll.h.patch b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0001-use-poll.h-instead-of-sys-poll.h.patch deleted file mode 100644 index a04473d21..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0001-use-poll.h-instead-of-sys-poll.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4cad505fc98240eb66eaabfae61a9694f8158dda Mon Sep 17 00:00:00 2001 -From: Romain Naour <romain.naour@smile.fr> -Date: Tue, 7 Apr 2020 20:58:37 +0200 -Subject: [PATCH] use <poll.h> instead of <sys/poll.h> - -The manpage of poll(2) states that the prototype of poll is defined -in <poll.h>. Use that header file instead of <sys/poll.h> to allow -compilation against musl-libc. - -Upstream status: Pending -https://github.com/mz-automation/libiec61850/pull/228 - -Signed-off-by: Romain Naour <romain.naour@smile.fr> ---- - hal/ethernet/linux/ethernet_linux.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hal/ethernet/linux/ethernet_linux.c b/hal/ethernet/linux/ethernet_linux.c -index c3ab2e2..9aa5c28 100644 ---- a/hal/ethernet/linux/ethernet_linux.c -+++ b/hal/ethernet/linux/ethernet_linux.c -@@ -23,7 +23,7 @@ - - #include <sys/socket.h> - #include <sys/ioctl.h> --#include <sys/poll.h> -+#include <poll.h> - #include <linux/if_packet.h> - #include <linux/if_ether.h> - #include <linux/if_arp.h> --- -2.21.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0002-serial_port_linux-Add-missing-include-sys-time.h.patch b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0002-serial_port_linux-Add-missing-include-sys-time.h.patch deleted file mode 100644 index e1b8ca15b..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0002-serial_port_linux-Add-missing-include-sys-time.h.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 661405eb6066b67dfe51d5ff9635e29f86bdd238 Mon Sep 17 00:00:00 2001 -From: Romain Naour <romain.naour@smile.fr> -Date: Tue, 7 Apr 2020 21:02:54 +0200 -Subject: [PATCH] serial_port_linux: Add missing include sys/time.h - -POSIX says `struct timeval` is defined if <sys/time.h> is included. - -Adding this header allow to build against musl-libc. - -Upstream status: Pending -https://github.com/mz-automation/libiec61850/pull/228 - -Signed-off-by: Romain Naour <romain.naour@smile.fr> ---- - hal/serial/linux/serial_port_linux.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/hal/serial/linux/serial_port_linux.c b/hal/serial/linux/serial_port_linux.c -index e6308c0..15e5794 100644 ---- a/hal/serial/linux/serial_port_linux.c -+++ b/hal/serial/linux/serial_port_linux.c -@@ -29,6 +29,7 @@ - #include <termios.h> - #include <fcntl.h> - #include <unistd.h> -+#include <sys/time.h> - - #include "hal_serial.h" - #include "hal_time.h" --- -2.21.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.4.2.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.0.bb index 18cb0cd8e..18e299283 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.4.2.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.0.bb @@ -13,12 +13,10 @@ SECTION = "console/network" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "swig-native python3" -SRCREV = "d798814fb463115a835da597535a625b68a39cff" +SRCREV = "fcefc746fea286aeaa40d2f62240216da81c85e5" -SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.4 \ - file://0001-use-poll.h-instead-of-sys-poll.h.patch \ - file://0002-serial_port_linux-Add-missing-include-sys-time.h.patch \ - file://0003-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ +SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5 \ + file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.2.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.4.0.bb index 77be27ffa..f61aa0549 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.2.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.4.0.bb @@ -2,20 +2,23 @@ SUMMARY = "nanomsg-next-generation -- light-weight brokerless messaging" DESCRIPTION = "NNG, like its predecessors nanomsg (and to some extent ZeroMQ), is a lightweight, broker-less library, offering a simple API to solve common recurring messaging problems, such as publish/subscribe, RPC-style request/reply, or service discovery." HOMEPAGE = "https://github.com/nanomsg/nng" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a19b15be6e844b39a54de2ef665bd6de" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a41e579bb4326c21c774f8e51e41d8a3" SECTION = "libs/networking" -SRCREV = "53ae1a5ab37fdfc9ad5c236df3eaf4dd63f0fee9" +SRCREV = "d020adda8f0348d094790618703b8341a26007a3" -SRC_URI = "git://github.com/nanomsg/nng.git;branch=v1.2.x" +SRC_URI = "git://github.com/nanomsg/nng.git" S = "${WORKDIR}/git" inherit cmake pkgconfig -EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DNNG_ENABLE_NNGCAT=ON" PACKAGECONFIG ??= "" PACKAGECONFIG[mbedtls] = "-DNNG_ENABLE_TLS=ON,-DNNG_ENABLE_TLS=OFF,mbedtls" + +PACKAGES =+ "${PN}-tools" +FILES_${PN}-tools = "${bindir}/*" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.4.bb index ec3bdd22b..7c07b0a34 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.4.bb @@ -31,7 +31,7 @@ SRC_URI_append_libc-musl = " \ file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ file://musl/0002-Fix-build-with-musl-systemd-specific.patch \ " -SRC_URI[sha256sum] = "0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2" +SRC_URI[sha256sum] = "6050b724212ea3ce7386113359bea9afa1f679a54f60d999a5999892e672c190" S = "${WORKDIR}/NetworkManager-${PV}" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb b/meta-openembedded/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb new file mode 100644 index 000000000..e3567961a --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb @@ -0,0 +1,31 @@ +SUMMARY = "Header-only C++14 library that gives you an embedded HTTP server" +DESCRIPTION = "Cross-platform, efficient, customizable, and robust \ + asynchronous HTTP/WebSocket server C++14 library with the \ + right balance between performance and ease of use" +AUTHOR = "Stefan Wiehler <stefan.wiehler@missinglinkelectronics.com>" +HOMEPAGE = "https://stiffstream.com/en/products/restinio.html" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=f399b62ce0a152525d1589a5a40c0ff6" +DEPENDS = "asio fmt http-parser" + +SRC_URI = "https://github.com/Stiffstream/restinio/releases/download/v.${PV}/restinio-${PV}.tar.bz2" +SRC_URI[md5sum] = "37a4310e98912030a74bdd4ed789f33c" +SRC_URI[sha256sum] = "b35d696e6fafd4563ca708fcecf9d0cf6705c846d417b5000f5252e0188848e7" + +S = "${WORKDIR}/${PN}-${PV}/dev" + +inherit cmake + +EXTRA_OECMAKE += "\ + -DRESTINIO_TEST=OFF \ + -DRESTINIO_SAMPLE=OFF \ + -DRESTINIO_BENCH=OFF \ + -DRESTINIO_FIND_DEPS=ON \ + -DRESTINIO_ALLOW_SOBJECTIZER=OFF \ + -DRESTINIO_USE_EXTERNAL_HTTP_PARSER=ON \ + " + +# Header-only library +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.17.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.17.1.bb index 9c20be537..b5ff43099 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.17.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.17.1.bb @@ -74,7 +74,7 @@ do_install_append() { install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/volatiles.99_snort ${D}${sysconfdir}/default/volatiles/99_snort - sed -i -e 's|-fdebug-prefix-map[^ ]*||g; s|-fmacro-prefix-map[^ ]*||g; s|${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc + sed -i -e 's|-ffile-prefix-map[^ ]*||g; s|-fdebug-prefix-map[^ ]*||g; s|-fmacro-prefix-map[^ ]*||g; s|${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc } pkg_postinst_${PN}() { diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0001-optimize-boot.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0001-optimize-boot.patch index a1e56b7ca..28068bba1 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0001-optimize-boot.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0001-optimize-boot.patch @@ -1,18 +1,31 @@ -Author: Jamie Strandboge <jamie@canonical.com> -Description: to improve boot speed when disabled, don't source all of - ufw-init-functions (which also sources in other files). +From 92fcdbc1a57086e4decc1597217c0739dc16342a Mon Sep 17 00:00:00 2001 +From: Silcet <camorga1@gmail.com> +Date: Tue, 27 Apr 2021 05:34:59 +0000 +Subject: [PATCH] Author: Jamie Strandboge <jamie@canonical.com> +Description: +to improve boot speed when disabled, don't source all of ufw-init-functions +(which also sources in other files). Upstream-Status: Inappropriate [ not author ] Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> -Index: ufw-0.31/src/ufw-init -=================================================================== ---- ufw-0.31.orig/src/ufw-init 2012-03-09 17:07:11.000000000 -0600 -+++ ufw-0.31/src/ufw-init 2012-03-17 09:37:51.000000000 -0500 -@@ -18,6 +18,12 @@ - # - set -e +The patch was imported from the OpenEmbedded git server +(git://git.openembedded.org/openembedded) as of commit id +2cc1bd9dd060f5002c2fde7aacba86fe230c12af. + +Signed-off-by: Silcet <camorga1@gmail.com> +--- + src/ufw-init | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/ufw-init b/src/ufw-init +index 3505a02..dde37f0 100755 +--- a/src/ufw-init ++++ b/src/ufw-init +@@ -31,6 +31,12 @@ if [ "$1" = "--datadir" ] && [ -s "$2" ]; then + fi + export DATA_DIR="$datadir" +# Debian/Ubuntu: small boot speed improvement +. "#CONFIG_PREFIX#/ufw/ufw.conf" @@ -20,6 +33,6 @@ Index: ufw-0.31/src/ufw-init + exit 0 +fi + - if [ -s "#STATE_PREFIX#/ufw-init-functions" ]; then - . "#STATE_PREFIX#/ufw-init-functions" + if [ -s "${rootdir}#STATE_PREFIX#/ufw-init-functions" ]; then + . "${rootdir}#STATE_PREFIX#/ufw-init-functions" else diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setup-add-an-option-to-specify-iptables-location.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch index 511742338..884fa1647 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setup-add-an-option-to-specify-iptables-location.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch @@ -1,6 +1,6 @@ -From c54d36d0582a60fd281cd9287077cea205fd849d Mon Sep 17 00:00:00 2001 -From: Joe MacDonald <joe_macdonald@mentor.com> -Date: Thu, 27 Nov 2014 15:20:34 -0500 +From 808577f8464f542076840d0d93fe168a5f79442c Mon Sep 17 00:00:00 2001 +From: Silcet <camorga1@gmail.com> +Date: Tue, 27 Apr 2021 05:40:03 +0000 Subject: [PATCH] setup: add an option to specify iptables location When cross-compiling it isn't certain that the location of iptables on the @@ -13,15 +13,21 @@ version of iptables to be used. Upstream-Status: Pending Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> + +The patch was imported from the OpenEmbedded git server +(git://git.openembedded.org/openembedded) as of commit id +2cc1bd9dd060f5002c2fde7aacba86fe230c12af. + +Signed-off-by: Silcet <camorga1@gmail.com> --- - setup.py | 69 ++++++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 39 insertions(+), 30 deletions(-) + setup.py | 65 ++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/setup.py b/setup.py -index 6fb3751..b13d11c 100644 +index 09204d3..2343bc9 100644 --- a/setup.py +++ b/setup.py -@@ -225,41 +225,50 @@ shutil.copytree('src', 'staging') +@@ -246,41 +246,50 @@ shutil.copytree('src', 'staging') os.unlink(os.path.join('staging', 'ufw-init')) os.unlink(os.path.join('staging', 'ufw-init-functions')) @@ -43,14 +49,6 @@ index 6fb3751..b13d11c 100644 - if iptables_exe != "": - break - -- --if iptables_exe == '': -- print("ERROR: could not find required binary 'iptables'", file=sys.stderr) -- sys.exit(1) -- --for e in ['ip6tables', 'iptables-restore', 'ip6tables-restore']: -- if not os.path.exists(os.path.join(iptables_dir, e)): -- print("ERROR: could not find required binary '%s'" % (e), file=sys.stderr) +if "--iptables-dir" in sys.argv: + iptables_dir = sys.argv[sys.argv.index("--iptables-dir") + 1] + iptables_exe = os.path.join(iptables_dir, "iptables") @@ -70,10 +68,16 @@ index 6fb3751..b13d11c 100644 + print("Found '%s'" % iptables_exe) + else: + continue -+ + +-if iptables_exe == '': +- print("ERROR: could not find required binary 'iptables'", file=sys.stderr) +- sys.exit(1) + if iptables_exe != "": + break -+ + +-for e in ['ip6tables', 'iptables-restore', 'ip6tables-restore']: +- if not os.path.exists(os.path.join(iptables_dir, e)): +- print("ERROR: could not find required binary '%s'" % (e), file=sys.stderr) + if iptables_exe == '': + print("ERROR: could not find required binary 'iptables'", file=sys.stderr) sys.exit(1) @@ -102,6 +106,3 @@ index 6fb3751..b13d11c 100644 setup (name='ufw', version=ufw_version, --- -1.9.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-lp1044361.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-lp1044361.patch deleted file mode 100644 index 804c18bc9..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-lp1044361.patch +++ /dev/null @@ -1,118 +0,0 @@ -Origin: r795, r796 -Description: move netfilter capabilities checking into initcaps(), and call - initcaps() only when we need it. -Bug-Ubuntu: https://launchpad.net/bugs/1044361 - -Upstream-Status: Inappropriate [ not author ] - -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> - -Index: ufw-0.33/src/backend_iptables.py -=================================================================== ---- ufw-0.33.orig/src/backend_iptables.py 2012-09-23 09:58:34.000000000 -0500 -+++ ufw-0.33/src/backend_iptables.py 2012-09-23 09:58:36.000000000 -0500 -@@ -160,6 +160,9 @@ - out += "> " + _("Checking raw ip6tables\n") - return out - -+ # Initialize the capabilities database -+ self.initcaps() -+ - args = ['-n', '-v', '-x', '-L'] - items = [] - items6 = [] -@@ -470,6 +473,9 @@ - if self.dryrun: - return False - -+ # Initialize the capabilities database -+ self.initcaps() -+ - prefix = "ufw" - exe = self.iptables - if v6: -@@ -684,6 +690,9 @@ - except Exception: - raise - -+ # Initialize the capabilities database -+ self.initcaps() -+ - chain_prefix = "ufw" - rules = self.rules - if v6: -@@ -830,6 +839,10 @@ - * updating user rules file - * reloading the user rules file if rule is modified - ''' -+ -+ # Initialize the capabilities database -+ self.initcaps() -+ - rstr = "" - - if rule.v6: -@@ -1073,6 +1086,9 @@ - if self.dryrun: - return - -+ # Initialize the capabilities database -+ self.initcaps() -+ - rules_t = [] - try: - rules_t = self._get_logging_rules(level) -Index: ufw-0.33/src/backend.py -=================================================================== ---- ufw-0.33.orig/src/backend.py 2012-09-23 09:58:34.000000000 -0500 -+++ ufw-0.33/src/backend.py 2012-09-23 09:59:03.000000000 -0500 -@@ -21,7 +21,7 @@ - import stat - import sys - import ufw.util --from ufw.util import warn, debug -+from ufw.util import error, warn, debug - from ufw.common import UFWError, config_dir, iptables_dir, UFWRule - import ufw.applications - -@@ -68,6 +68,17 @@ - err_msg = _("Couldn't determine iptables version") - raise UFWError(err_msg) - -+ # Initialize via initcaps only when we need it (LP: #1044361) -+ self.caps = None -+ -+ def initcaps(self): -+ '''Initialize the capabilities database. This needs to be called -+ before accessing the database.''' -+ -+ # Only initialize if not initialized already -+ if self.caps != None: -+ return -+ - self.caps = {} - self.caps['limit'] = {} - -@@ -78,14 +89,20 @@ - # Try to get capabilities from the running system if root - if self.do_checks and os.getuid() == 0 and not self.dryrun: - # v4 -- nf_caps = ufw.util.get_netfilter_capabilities(self.iptables) -+ try: -+ nf_caps = ufw.util.get_netfilter_capabilities(self.iptables) -+ except OSError as e: -+ error("initcaps\n%s" % e) - if 'recent-set' in nf_caps and 'recent-update' in nf_caps: - self.caps['limit']['4'] = True - else: - self.caps['limit']['4'] = False - - # v6 -- nf_caps = ufw.util.get_netfilter_capabilities(self.ip6tables) -+ try: -+ nf_caps = ufw.util.get_netfilter_capabilities(self.ip6tables) -+ except OSError as e: -+ error("initcaps\n%s" % e) - if 'recent-set' in nf_caps and 'recent-update' in nf_caps: - self.caps['limit']['6'] = True - else: diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0003-fix-typeerror-on-error.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0003-fix-typeerror-on-error.patch deleted file mode 100644 index b259fdf78..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0003-fix-typeerror-on-error.patch +++ /dev/null @@ -1,20 +0,0 @@ -Origin: r797 -Description: src/backend_iptables.py: fix misplaced parenthesis - -Upstream-Status: Inappropriate [ not author ] - -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> - -Index: ufw-0.33/src/backend_iptables.py -=================================================================== ---- ufw-0.33.orig/src/backend_iptables.py 2012-09-24 08:51:13.000000000 -0500 -+++ ufw-0.33/src/backend_iptables.py 2012-09-24 08:52:00.000000000 -0500 -@@ -1075,7 +1075,7 @@ - exe = self.ip6tables - (rc, out) = cmd([exe] + args) - if rc != 0: -- err_msg = _("Could not perform '%s'") % (args) -+ err_msg = _("Could not perform '%s'" % (args)) - if fail_ok: - debug("FAILOK: " + err_msg) - else: diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0003-only-make-one-reference-to-env.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0003-only-make-one-reference-to-env.patch new file mode 100644 index 000000000..556d4459d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0003-only-make-one-reference-to-env.patch @@ -0,0 +1,73 @@ +From 42170d379eddc12bd2d1fe84dc268882d8eb4d64 Mon Sep 17 00:00:00 2001 +From: Silcet <camorga1@gmail.com> +Date: Mon, 3 May 2021 08:59:28 +0000 +Subject: [PATCH] setup: only make one reference to env + +If sys.executable happens to be '/usr/bin/env python' or something +similar, the setup script will result in 'ufw' getting /usr/bin/env +repeated on the top line. This causes an error at runtime. Perform a +quick sanity check on sys.executable before doing the substitution. + +While we're at it, change the default value of 'exe' to the one we either +detected or specified on the build line. + +Upstream-Status: Inappropriate [ embedded specific ] + +Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> + +The patch was imported from the OpenEmbedded git server +(git://git.openembedded.org/openembedded) as of commit id +2cc1bd9dd060f5002c2fde7aacba86fe230c12af. + +A previous change had modified the way the python shebang was updated to +follow the same version as the one used to call setup.py. However, it +used a regex that was not matching anymore. To fix this, the regex +condition is removed so the shebang line is substituted with the sys.executable +value. Later in the installation distutils finds the string with the path +of sys.executable and replaces it with "#! /usr/bin/env python3". + +Signed-off-by: Silcet <camorga1@gmail.com> +--- + setup.py | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 2343bc9..f8a638b 100644 +--- a/setup.py ++++ b/setup.py +@@ -64,7 +64,7 @@ class Install(_install, object): + real_sharedir = os.path.join(real_prefix, 'share', 'ufw') + + # Update the modules' paths +- for fn in [ 'common.py' ]: ++ for fn in [ 'common.py', 'util.py' ]: + # 'staging' is used with just 'install' but build_lib is used when + # using 'build'. We could probably override 'def build()' but this + # at least works +@@ -97,6 +97,12 @@ class Install(_install, object): + "-i", + "s%#SHARE_DIR#%" + real_sharedir + "%g", + f]) ++ ++ subprocess.call(["sed", ++ "-i.jjm", ++ "s%/sbin/iptables%" + iptables_exe + "%g", ++ f]) ++ + + if fn == 'common.py' and 'UFW_SKIP_CHECKS' in os.environ and \ + os.environ['UFW_SKIP_CHECKS'] != '': +@@ -123,10 +129,12 @@ class Install(_install, object): + self.mkpath(os.path.dirname(f)) + + # update the interpreter to that of the one the user specified for setup ++ # Distutils searches for the string of sys.executable and replaces it ++ # with the "#! /usr/bin/env pythonX" shebang on a later step + print("Updating staging/ufw to use %s" % (sys.executable)) + subprocess.call(["sed", + "-i", +- "1s%^#.*python.*%#! /usr/bin/env " + sys.executable + "%g", ++ "1s%/.*python.*%" + sys.executable + "%g", + 'staging/ufw']) + self.copy_file('staging/ufw', script) + self.copy_file('doc/ufw.8', manpage) diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0004-lp1039729.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0004-lp1039729.patch deleted file mode 100644 index 695b26567..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0004-lp1039729.patch +++ /dev/null @@ -1,40 +0,0 @@ -Origin: r803, r804 -Description: Don't call get_netfilter_capabilities() with ipv6 if ipv6 is - disabled. -Bug-Ubuntu: https://launchpad.net/ufw/bugs/1039729 - -Upstream-Status: Inappropriate [ not author ] - -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> - -Index: ufw-0.33/src/backend.py -=================================================================== ---- ufw-0.33.orig/src/backend.py 2012-12-04 09:21:57.000000000 -0600 -+++ ufw-0.33/src/backend.py 2012-12-04 09:22:40.000000000 -0600 -@@ -98,15 +98,17 @@ - else: - self.caps['limit']['4'] = False - -- # v6 -- try: -- nf_caps = ufw.util.get_netfilter_capabilities(self.ip6tables) -- except OSError as e: -- error("initcaps\n%s" % e) -- if 'recent-set' in nf_caps and 'recent-update' in nf_caps: -- self.caps['limit']['6'] = True -- else: -- self.caps['limit']['6'] = False -+ # v6 (skip capabilities check for ipv6 if ipv6 is disabled in ufw -+ # because the system may not have ipv6 support (LP: #1039729) -+ if self.use_ipv6(): -+ try: -+ nf_caps = ufw.util.get_netfilter_capabilities(self.ip6tables) -+ except OSError as e: -+ error("initcaps\n%s" % e) -+ if 'recent-set' in nf_caps and 'recent-update' in nf_caps: -+ self.caps['limit']['6'] = True -+ else: -+ self.caps['limit']['6'] = False - - def is_enabled(self): - '''Is firewall configured as enabled''' diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0005-lp1191197.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0005-lp1191197.patch deleted file mode 100644 index b760d3fd3..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0005-lp1191197.patch +++ /dev/null @@ -1,32 +0,0 @@ -Origin: r816 -Description: add check for -m rt --rt-type 0 -Bug-Ubuntu: https://launchpad.net/bugs/1191197 -Forwarded: yes - -Upstream-Status: Inappropriate [ not author ] - -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> - -Index: ufw-0.33/tests/check-requirements -=================================================================== ---- ufw-0.33.orig/tests/check-requirements 2012-08-17 16:12:49.000000000 -0500 -+++ ufw-0.33/tests/check-requirements 2013-06-15 07:47:00.000000000 -0500 -@@ -3,7 +3,7 @@ - # check-requirements: verify all the required iptables functionality is - # available - # --# Copyright 2008-2012 Canonical Ltd. -+# Copyright 2008-2013 Canonical Ltd. - # - # This program is free software: you can redistribute it and/or modify - # it under the terms of the GNU General Public License version 3, -@@ -218,6 +218,9 @@ - echo -n "icmpv6 with hl ($j): " - runcmd $exe -A $c -p icmpv6 --icmpv6-type $j -m hl --hl-eq 255 -j ACCEPT - done -+ -+ echo -n "ipv6 rt: " -+ runcmd $exe -A $c -m rt --rt-type 0 -j ACCEPT - fi - - echo "" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch deleted file mode 100644 index ff704b5a4..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch +++ /dev/null @@ -1,77 +0,0 @@ -From be53eea06a5655fdc98f47a73be8277b65bb42ed Mon Sep 17 00:00:00 2001 -From: Joe MacDonald <joe_macdonald@mentor.com> -Date: Tue, 11 Nov 2014 21:41:14 -0500 -Subject: [PATCH] setup: only make one reference to env - -If sys.executable happens to be '/usr/bin/env python' or something -similar, the setup script will result in 'ufw' getting /usr/bin/env -repeated on the top line. This causes an error at runtime. Perform a -quick sanity check on sys.executable before doing the substitution. - -While we're at it, change the default value of 'exe' to the one we either -detected or specified on the build line. - -Upstream-Status: Inappropriate [ embedded specific ] - -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> ---- - setup.py | 34 ++++++++++++++++++++++++++++------ - 1 file changed, 28 insertions(+), 6 deletions(-) - -diff --git a/setup.py b/setup.py -index b13d11c..73acdef 100644 ---- a/setup.py -+++ b/setup.py -@@ -64,7 +64,7 @@ class Install(_install, object): - real_sharedir = os.path.join(real_prefix, 'share', 'ufw') - - # Update the modules' paths -- for file in [ 'common.py' ]: -+ for file in [ 'common.py', 'util.py' ]: - print("Updating " + file) - subprocess.call(["sed", - "-i", -@@ -91,6 +91,11 @@ class Install(_install, object): - "s%#SHARE_DIR#%" + real_sharedir + "%g", - os.path.join('staging', file)]) - -+ subprocess.call(["sed", -+ "-i.jjm", -+ "s%/sbin/iptables%" + iptables_exe + "%g", -+ os.path.join('staging', file)]) -+ - # Now byte-compile everything - super(Install, self).run() - -@@ -107,12 +112,23 @@ class Install(_install, object): - for f in [ script, manpage, manpage_f ]: - self.mkpath(os.path.dirname(f)) - -+ # if sys.executable == /usr/bin/env python* the result will be the top -+ # of ufw getting: -+ # -+ # #! /usr/bin/env /usr/bin/env python -+ # -+ # which is not ideal -+ # - # update the interpreter to that of the one the user specified for setup -- print("Updating staging/ufw to use %s" % (sys.executable)) -- subprocess.call(["sed", -- "-i", -- "1s%^#.*python.*%#! /usr/bin/env " + sys.executable + "%g", -- 'staging/ufw']) -+ print("Updating staging/ufw to use (%s)" % (sys.executable)) -+ -+ if re.search("(/usr/bin/env)", sys.executable): -+ print("found 'env' in sys.executable (%s)" % (sys.executable)) -+ subprocess.call(["sed", -+ "-i.jjm", -+ "1s%^#.*python.*%#! " + sys.executable + "%g", -+ 'staging/ufw']) -+ - self.copy_file('staging/ufw', script) - self.copy_file('doc/ufw.8', manpage) - self.copy_file('doc/ufw-framework.8', manpage_f) --- -1.9.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb index 42fc26258..8e35dc01e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb @@ -1,3 +1,4 @@ + SUMMARY = "Uncomplicated Firewall" DESCRIPTION = "UFW stands for Uncomplicated Firewall, and is program for \ managing a netfilter firewall. It provides a command line interface and aims \ @@ -7,23 +8,18 @@ SECTION = "net" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" -SRC_URI = " \ - https://launchpad.net/ufw/0.33/0.33/+download/ufw-0.33.tar.gz \ - file://setup-add-an-option-to-specify-iptables-location.patch \ - file://setup-only-make-one-reference-to-env.patch \ +SRC_URI = "https://launchpad.net/ufw/0.36/0.36/+download/ufw-0.36.tar.gz \ file://0001-optimize-boot.patch \ - file://0002-lp1044361.patch \ - file://0003-fix-typeerror-on-error.patch \ - file://0004-lp1039729.patch \ - file://0005-lp1191197.patch \ -" + file://0002-add-an-option-to-specify-iptables-location.patch \ + file://0003-only-make-one-reference-to-env.patch \ + " UPSTREAM_CHECK_URI = "https://launchpad.net/ufw" -SRC_URI[md5sum] = "3747b453d76709e5a99da209fc0bb5f5" -SRC_URI[sha256sum] = "5f85a8084ad3539b547bec097286948233188c971f498890316dec170bdd1da8" +SRC_URI[md5sum] = "6d8ab1506da21ae003f4628f93d05781" +SRC_URI[sha256sum] = "754b22ae5edff0273460ac9f57509c3938187e0cf4fb9692c6a02833fff33cfc" -inherit setuptools3 features_check +inherit setuptools3 features_check systemd update-rc.d RDEPENDS_${PN} = " \ iptables \ @@ -43,6 +39,19 @@ RRECOMMENDS_${PN} = " \ kernel-module-nf-recent \ " +do_install_append() { + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${S}/doc/systemd.example ${D}${systemd_unitdir}/system/ufw.service + + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${S}/doc/initscript.example ${D}${sysconfdir}/init.d/ufw +} + +SYSTEMD_SERVICE_${PN} = "ufw.service" + +INITSCRIPT_NAME = "ufw" +INITSCRIPT_PARAMS = "defaults" + # Certain items are explicitly put under /lib, not base_libdir when installed. # FILES_${PN} += " \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.7.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.7.1.bb index 83406f507..76a5fd75c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.7.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.7.1.bb @@ -14,7 +14,7 @@ RPROVIDES_${PN} = "cyassl" SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https \ " -SRCREV = "830de9a9fb99e30f9ac9caa0a7f7bba29c3b4863" +SRCREV = "95b91d89133a712a3d0f389442924612c103da24" S = "${WORKDIR}/git" inherit autotools diff --git a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index 231d8d4da..24b9a1b49 100644 --- a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -100,6 +100,7 @@ RDEPENDS_packagegroup-meta-networking-daemons_remove_libc-musl = "opensaf" RDEPENDS_packagegroup-meta-networking-devtools = "\ python3-ldap \ + python3-scapy \ " RDEPENDS_packagegroup-meta-networking-extended = "\ @@ -192,6 +193,7 @@ RDEPENDS_packagegroup-meta-networking-support = "\ geoipupdate \ fwknop \ htpdate \ + http-parser \ iftop \ ifmetric \ ipvsadm \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch b/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch index 9816d4d22..d888dd826 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch @@ -9,10 +9,10 @@ redefine PR_RUN_DIR as ${localstatedir}/run Signed-off-By: Armin Kuster <akuster808@gmail.com> -Index: proftpd-1.3.6/Make.rules.in -=================================================================== ---- proftpd-1.3.6.orig/Make.rules.in -+++ proftpd-1.3.6/Make.rules.in +diff --git a/Make.rules.in b/Make.rules.in +index a5028ac..ccd7807 100644 +--- a/Make.rules.in ++++ b/Make.rules.in @@ -30,9 +30,9 @@ INSTALL=@INSTALL@ INSTALL_STRIP=@INSTALL_STRIP@ INSTALL_USER=@install_user@ @@ -26,11 +26,11 @@ Index: proftpd-1.3.6/Make.rules.in RM=rm -f SHELL=@CONFIG_SHELL@ -Index: proftpd-1.3.6/Makefile.in -=================================================================== ---- proftpd-1.3.6.orig/Makefile.in -+++ proftpd-1.3.6/Makefile.in -@@ -105,7 +105,6 @@ check: proftpd$(EXEEXT) +diff --git a/Makefile.in b/Makefile.in +index 9434cbd..13f2e16 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -123,7 +123,6 @@ check: proftpd$(EXEEXT) $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: @if [ ! -d $@ ]; then \ mkdir -p $@; \ @@ -38,20 +38,20 @@ Index: proftpd-1.3.6/Makefile.in chmod 0755 $@; \ fi -@@ -115,7 +114,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc +@@ -133,7 +132,6 @@ install-proftpd: proftpd$(EXEEXT) $(DESTDIR)$(includedir) $(DESTDIR)$(localstate rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \ fi - ln -s proftpd $(DESTDIR)$(sbindir)/in.proftpd + ln -s $(top_builddir)/proftpd $(DESTDIR)$(sbindir)/in.proftpd - -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd install-libs: $(DESTDIR)$(libdir)/proftpd cd lib/ && $(MAKE) install -@@ -152,11 +150,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE - $(INSTALL_SBIN) ftpshut $(DESTDIR)$(sbindir)/ftpshut - $(INSTALL_BIN) ftptop $(DESTDIR)$(bindir)/ftptop - $(INSTALL_BIN) ftpwho $(DESTDIR)$(bindir)/ftpwho -- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs -+ $(INSTALL) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs +@@ -170,11 +168,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) + $(INSTALL_SBIN) $(top_builddir)/ftpshut $(DESTDIR)$(sbindir)/ftpshut + $(INSTALL_BIN) $(top_builddir)/ftptop $(DESTDIR)$(bindir)/ftptop + $(INSTALL_BIN) $(top_builddir)/ftpwho $(DESTDIR)$(bindir)/ftpwho +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs ++ $(INSTALL) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs install-conf: $(DESTDIR)$(sysconfdir) if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \ @@ -60,11 +60,11 @@ Index: proftpd-1.3.6/Makefile.in $(top_srcdir)/sample-configurations/basic.conf \ $(DESTDIR)$(sysconfdir)/proftpd.conf ; \ fi -Index: proftpd-1.3.6/configure -=================================================================== ---- proftpd-1.3.6.orig/configure -+++ proftpd-1.3.6/configure -@@ -41777,7 +41777,7 @@ _ACEOF +diff --git a/configure b/configure +index 0a51670..69fa130 100755 +--- a/configure ++++ b/configure +@@ -25116,7 +25116,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF @@ -73,7 +73,7 @@ Index: proftpd-1.3.6/configure _ACEOF -@@ -41787,7 +41787,7 @@ _ACEOF +@@ -25126,7 +25126,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF @@ -82,11 +82,11 @@ Index: proftpd-1.3.6/configure _ACEOF -Index: proftpd-1.3.6/configure.in -=================================================================== ---- proftpd-1.3.6.orig/configure.in -+++ proftpd-1.3.6/configure.in -@@ -3833,8 +3833,8 @@ locale_dir="`eval echo ${locale_dir}`" +diff --git a/configure.in b/configure.in +index 50561de..93cad3f 100644 +--- a/configure.in ++++ b/configure.in +@@ -4059,8 +4059,8 @@ locale_dir="`eval echo ${locale_dir}`" AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory]) AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory]) @@ -97,16 +97,3 @@ Index: proftpd-1.3.6/configure.in prefix="$pr_saved_prefix" exec_prefix="$pr_saved_exec_prefix" -Index: proftpd-1.3.6/lib/libcap/Makefile -=================================================================== ---- proftpd-1.3.6.orig/lib/libcap/Makefile -+++ proftpd-1.3.6/lib/libcap/Makefile -@@ -26,7 +26,7 @@ OBJS=$(addsuffix .o, $(FILES)) - all: $(LIBNAME) - - _makenames: _makenames.c cap_names.sed -- $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ -+ $(BUILD_CC) $(CFLAGS) $(LDFLAGS) $< -o $@ - - cap_names.h: _makenames - ./_makenames > cap_names.h diff --git a/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/contrib.patch b/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/contrib.patch index 7e2a8e3ce..96c237d38 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/contrib.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/contrib.patch @@ -11,32 +11,29 @@ Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 5b2e683..ee72fe1 100644 +index 9434cbd..8da7d1f 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -120,7 +120,7 @@ install-modules: $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir) +@@ -163,7 +163,7 @@ install-modules: $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir) test -z "$(SHARED_MODULE_OBJS)" -a -z "$(SHARED_MODULE_DIRS)" -a -z "$(STATIC_MODULE_DIRS)" || (cd modules/ && $(MAKE) install) install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) - cd contrib/ && $(MAKE) install-utils + cd contrib/ && $(MAKE) DESTDIR=${DESTDIR} install-utils - $(INSTALL_BIN) ftpcount $(DESTDIR)$(bindir)/ftpcount - $(INSTALL_BIN) ftpdctl $(DESTDIR)$(bindir)/ftpdctl - $(INSTALL_SBIN) ftpscrub $(DESTDIR)$(sbindir)/ftpscrub + $(INSTALL_BIN) $(top_builddir)/ftpcount $(DESTDIR)$(bindir)/ftpcount + $(INSTALL_BIN) $(top_builddir)/ftpdctl $(DESTDIR)$(bindir)/ftpdctl + $(INSTALL_SBIN) $(top_builddir)/ftpscrub $(DESTDIR)$(sbindir)/ftpscrub diff --git a/contrib/Makefile.in b/contrib/Makefile.in -index 5bcc038..51d248c 100644 +index d1a31af..65d2abc 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in -@@ -18,6 +18,6 @@ Makefile: Makefile.in ../config.status +@@ -17,6 +17,6 @@ Makefile: Makefile.in ../config.status cd ../ && ./config.status install-utils: -- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpasswd $(DESTDIR)$(bindir)/ftpasswd -- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail -- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota -+ $(INSTALL) -m 0755 ftpasswd $(DESTDIR)$(bindir)/ftpasswd -+ $(INSTALL) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail -+ $(INSTALL) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota --- -1.7.9.5 - +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpasswd $(DESTDIR)$(bindir)/ftpasswd +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpmail $(DESTDIR)$(bindir)/ftpmail +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpquota $(DESTDIR)$(bindir)/ftpquota ++ $(INSTALL) -m 0755 $(srcdir)/ftpasswd $(DESTDIR)$(bindir)/ftpasswd ++ $(INSTALL) -m 0755 $(srcdir)/ftpmail $(DESTDIR)$(bindir)/ftpmail ++ $(INSTALL) -m 0755 $(srcdir)/ftpquota $(DESTDIR)$(bindir)/ftpquota diff --git a/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb b/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7a.bb index 1e4697a63..f2a89e5a2 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7a.bb @@ -4,7 +4,10 @@ HOMEPAGE = "http://www.proftpd.org" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184" -SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \ +SRCREV = "715eadc1aa4f6b07d69f9d09558e9cb471e51d87" +BRANCH = "1.3.7" + +SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH} \ file://basic.conf.patch \ file://proftpd-basic.init \ file://default \ @@ -13,13 +16,14 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \ file://build_fixup.patch \ file://proftpd.service \ " -SRC_URI[md5sum] = "13270911c42aac842435f18205546a1b" -SRC_URI[sha256sum] = "91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf" + +S = "${WORKDIR}/git" inherit autotools-brokensep useradd update-rc.d systemd multilib_script PACKAGECONFIG ??= "shadow \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ + static \ " PACKAGECONFIG[curses] = "--enable-curses --enable-ncurses, --disable-curses --disable-ncurses, ncurses" @@ -28,6 +32,7 @@ PACKAGECONFIG[pam] = "--enable-auth-pam, --disable-auth-pam, libpam, libpam" PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6" PACKAGECONFIG[shadow] = "--enable-shadow, --disable-shadow" PACKAGECONFIG[pcre] = "--enable-pcre, --disable-pcre, libpcre " +PACKAGECONFIG[static] = "--enable-static=yes, --enable-static=no" # enable POSIX.1e capabilities PACKAGECONFIG[cap] = "--enable-cap, --disable-cap, libcap, libcap" @@ -58,14 +63,12 @@ PACKAGECONFIG[largefile] = "--enable-largefile, --disable-largefile" #omit mod_auth_file from core modules PACKAGECONFIG[auth] = "--enable-auth-file, --disable-auth-file" - # proftpd uses libltdl which currently makes configuring using # autotools.bbclass a pain... do_configure () { install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} oe_runconf - cp ${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool ${S}/libtool } FTPUSER = "ftp" @@ -109,6 +112,7 @@ do_install () { sed -e 's|--sysroot=${STAGING_DIR_HOST}||g' \ -e 's|${STAGING_DIR_NATIVE}||g' \ + -e 's|-ffile-prefix-map=[^ ]*||g' \ -e 's|-fdebug-prefix-map=[^ ]*||g' \ -e 's|-fmacro-prefix-map=[^ ]*||g' \ -i ${D}/${bindir}/prxs diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch b/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch index 28a410c26..ff51f5344 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch @@ -11,10 +11,8 @@ Upstream-Status: Backport [https://github.com/kraj/squid/commit/1f8b5f0e1cc27634 src/Makefile.am | 4 ++++ src/ip/QosConfig.cc | 1 + src/ipc/mem/PageStack.cc | 1 + - src/proxyp/Parser.cc | 1 + - src/security/ServerOptions.cc | 2 ++ src/ssl/helper.cc | 2 ++ - 6 files changed, 11 insertions(+) + 4 files changed, 8 insertions(+) --- a/src/Makefile.am +++ b/src/Makefile.am @@ -70,17 +68,6 @@ Upstream-Status: Backport [https://github.com/kraj/squid/commit/1f8b5f0e1cc27634 /// used to mark a stack slot available for storing free page offsets const Ipc::Mem::PageStack::Value Writable = 0; ---- a/src/security/ServerOptions.cc -+++ b/src/security/ServerOptions.cc -@@ -24,6 +24,8 @@ - #endif - #endif - -+#include <limits> -+ - Security::ServerOptions & - Security::ServerOptions::operator =(const Security::ServerOptions &old) { - if (this != &old) { --- a/src/ssl/helper.cc +++ b/src/ssl/helper.cc @@ -19,6 +19,8 @@ @@ -92,14 +79,4 @@ Upstream-Status: Backport [https://github.com/kraj/squid/commit/1f8b5f0e1cc27634 Ssl::CertValidationHelper::LruCache *Ssl::CertValidationHelper::HelperCache = nullptr; #if USE_SSL_CRTD ---- a/src/acl/ConnMark.cc -+++ b/src/acl/ConnMark.cc -@@ -16,6 +16,8 @@ - #include "http/Stream.h" - #include "sbuf/Stream.h" -+#include <limits> -+ - bool - Acl::ConnMark::empty() const - { diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.14.bb b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.15.bb index 6d154c87e..8ba10674c 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.14.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.15.bb @@ -29,7 +29,7 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.bz2 SRC_URI_remove_toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" -SRC_URI[sha256sum] = "4ad08884f065f8e1dac166aa13db6a872cde419a1717dff4c82c2c5337ee5756" +SRC_URI[sha256sum] = "71635811e766ce8b155225a9e3c7757cfc7ff93df26b28d82e5e6fc021b9a605" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://errors/COPYRIGHT;md5=0e03cd976052c45697ad5d96e7dff8dc \ diff --git a/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy/run-ptest b/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy/run-ptest new file mode 100644 index 000000000..797d8ecf7 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy/run-ptest @@ -0,0 +1,4 @@ +#!/bin/sh +UTscapy3 -t regression.uts -f text -l -C \ + -o @PTEST_PATH@/scapy_ptest_$(date +%Y%m%d-%H%M%S).log \ + 2>&1 | sed -e 's/^passed None/PASS:/' -e 's/^failed None/FAIL:/' diff --git a/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb b/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb new file mode 100644 index 000000000..01ca63746 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb @@ -0,0 +1,41 @@ +SUMMARY = "Network scanning and manipulation tool" +DESCRIPTION = "Scapy is a powerful interactive packet manipulation program. \ +It is able to forge or decode packets of a wide number of protocols, send \ +them on the wire, capture them, match requests and replies, and much more. \ +It can easily handle most classical tasks like scanning, tracerouting, probing, \ +unit tests, attacks or network discovery (it can replace hping, 85% of nmap, \ +arpspoof, arp-sk, arping, tcpdump, tethereal, p0f, etc.). It also performs very \ +well at a lot of other specific tasks that most other tools can't handle, like \ +sending invalid frames, injecting your own 802.11 frames, combining technics \ +(VLAN hopping+ARP cache poisoning, VOIP decoding on WEP encrypted channel, ...), etc." +SECTION = "security" +LICENSE = "GPLv2" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +# If you want ptest support, use the git repo +# UTscapy does not exist in the pypi pkg +# +SRCREV = "32cd7eb0f620d9adf171c48d55514e8326a538d7" +SRC_URI = "git://github.com/secdev/scapy.git \ + file://run-ptest" + +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_COMMITS = "1" + +inherit setuptools3 ptest + +do_install_append() { + mv ${D}${bindir}/scapy ${D}${bindir}/scapy3 + mv ${D}${bindir}/UTscapy ${D}${bindir}/UTscapy3 +} + +do_install_ptest() { + install -m 0644 ${S}/test/regression.uts ${D}${PTEST_PATH} + sed -i 's,@PTEST_PATH@,${PTEST_PATH},' ${D}${PTEST_PATH}/run-ptest +} + +RDEPENDS_${PN} = "tcpdump ${PYTHON_PN}-compression ${PYTHON_PN}-cryptography ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-netserver ${PYTHON_PN}-pydoc ${PYTHON_PN}-pkgutil ${PYTHON_PN}-shell \ + ${PYTHON_PN}-threading ${PYTHON_PN}-numbers ${PYTHON_PN}-pycrypto" diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20210219.bb index 64958a75b..0525b4135 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20210219.bb @@ -1,6 +1,6 @@ require wireguard.inc -SRCREV = "fe402261666821514377d06c2c68ed9bc19e7634" +SRCREV = "122f06bfd8fc7b06a0899fa9adc4ce8e06900d98" SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat" @@ -31,3 +31,4 @@ module_do_install() { # OE-core post dunfell has moved to use kernel 5.8 which now means we cant build this module in world builds # for reference machines e.g. qemu EXCLUDE_FROM_WORLD = "1" + diff --git a/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.2.bb b/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.10.bb index a7d7fc81f..5af4c31d1 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.2.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.10.bb @@ -13,7 +13,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754" SRC_URI = "git://github.com/jech/babeld.git;protocol=git" -SRCREV = "a1043879225ac205614259b480d7f577025d8bb0" +SRCREV = "dbb8799d1b5b3bfaf4387386c92369c847704480" UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb index d9040c164..de0aeeec7 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb @@ -120,6 +120,7 @@ do_install_append() { sed -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \ -i ${D}${bindir}/net-snmp-create-v3-user sed -e 's@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g' \ + -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ -e 's@[^ ]*--sysroot=[^ "]*@@g' \ @@ -172,6 +173,7 @@ net_snmp_sysroot_preprocess () { -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \ -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \ -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=${S}@g" \ + -e "s@-ffile-prefix-map=${SNMP_DBGDIR}@-ffile-prefix-map=${WORKDIR}=${SNMP_DBGDIR}@g" \ -e "s@-fdebug-prefix-map=${SNMP_DBGDIR}@-fdebug-prefix-map=${WORKDIR}=${SNMP_DBGDIR}@g" \ -e "s@-fdebug-prefix-map= -fdebug-prefix-map=@-fdebug-prefix-map=${STAGING_DIR_NATIVE}= \ -fdebug-prefix-map=${STAGING_DIR_HOST}=@g" \ diff --git a/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch b/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch index 97b44dc7a..837cb6d72 100644 --- a/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch +++ b/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch @@ -41,9 +41,9 @@ Subject: [PATCH] chrony: fix build failure for arma9 SCMP_SYS(getpid), - SCMP_SYS(getrlimit), SCMP_SYS(getuid), + SCMP_SYS(getuid32), SCMP_SYS(rt_sigaction), - SCMP_SYS(rt_sigreturn), -@@ -519,7 +517,6 @@ SYS_Linux_EnableSystemCallFilter(int lev +@@ -520,7 +518,6 @@ SYS_Linux_EnableSystemCallFilter(int lev /* Memory */ SCMP_SYS(brk), SCMP_SYS(madvise), @@ -51,7 +51,7 @@ Subject: [PATCH] chrony: fix build failure for arma9 SCMP_SYS(mmap2), SCMP_SYS(mprotect), SCMP_SYS(mremap), -@@ -573,8 +570,6 @@ SYS_Linux_EnableSystemCallFilter(int lev +@@ -580,8 +577,6 @@ SYS_Linux_EnableSystemCallFilter(int lev SCMP_SYS(sendmsg), SCMP_SYS(sendto), SCMP_SYS(shutdown), @@ -60,7 +60,7 @@ Subject: [PATCH] chrony: fix build failure for arma9 /* General I/O */ SCMP_SYS(_newselect), -@@ -597,7 +592,6 @@ SYS_Linux_EnableSystemCallFilter(int lev +@@ -604,7 +599,6 @@ SYS_Linux_EnableSystemCallFilter(int lev #ifdef __NR_futex_time64 SCMP_SYS(futex_time64), #endif @@ -68,7 +68,7 @@ Subject: [PATCH] chrony: fix build failure for arma9 SCMP_SYS(set_robust_list), SCMP_SYS(write), -@@ -605,6 +599,15 @@ SYS_Linux_EnableSystemCallFilter(int lev +@@ -612,6 +606,15 @@ SYS_Linux_EnableSystemCallFilter(int lev SCMP_SYS(getrandom), SCMP_SYS(sysinfo), SCMP_SYS(uname), @@ -83,4 +83,4 @@ Subject: [PATCH] chrony: fix build failure for arma9 +#endif }; - const int socket_domains[] = { + const int denied_any[] = { diff --git a/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.0.bb b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.1.bb index c8987013b..0262a6e8d 100644 --- a/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.1.bb @@ -39,7 +39,7 @@ SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \ SRC_URI_append_libc-musl = " \ file://0001-Fix-compilation-with-musl.patch \ " -SRC_URI[sha256sum] = "be27ea14c55e7a4434b2fa51d53018c7051c42fa6a3198c9aa6a1658bae0c625" +SRC_URI[sha256sum] = "ed76f2d3f9347ac6221a91ad4bd553dd0565ac188cd7490d0801d08f7171164c" DEPENDS = "pps-tools" diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.12.bb b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb index c68b474cc..41a9b8e76 100644 --- a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.12.bb +++ b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb @@ -4,7 +4,7 @@ SECTION = "otherosfs" LICENSE = "GPLv3 & LGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRCREV = "73008e3292e4d46fde3eab5d5f618886210ec4a1" +SRCREV = "464a60344a324311a6f5bb326fdf5f422a3c9005" SRC_URI = "git://git.samba.org/cifs-utils.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.84.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.84.bb deleted file mode 100644 index 3dd9154f3..000000000 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.84.bb +++ /dev/null @@ -1,8 +0,0 @@ -require dnsmasq.inc - -SRC_URI[dnsmasq-2.84.md5sum] = "6bf24b5bcf9293db2941fbdb545c1133" -SRC_URI[dnsmasq-2.84.sha256sum] = "4caf385376f34fae5c55244a1f870dcf6f90e037bb7c4487210933dc497f9c36" -SRC_URI += "\ - file://lua.patch \ -" - diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.85.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.85.bb new file mode 100644 index 000000000..023dda3e5 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.85.bb @@ -0,0 +1,8 @@ +require dnsmasq.inc + +SRC_URI[dnsmasq-2.85.md5sum] = "4079e1e6e1065e4bd14ded268cdd7bd7" +SRC_URI[dnsmasq-2.85.sha256sum] = "f36b93ecac9397c15f461de9b1689ee5a2ed6b5135db0085916233053ff3f886" +SRC_URI += "\ + file://lua.patch \ +" + diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch new file mode 100644 index 000000000..ec7a26a32 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch @@ -0,0 +1,30 @@ +From 6c0ff65f782ad38130b18e4ecb1538d9a8633684 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 29 May 2021 14:32:17 -0700 +Subject: [PATCH] m4: Check for libunwind instead of libunwind-generic + +libunwind-generic is specific to nongnu libunwind, when using llvm +libunwind this fails, so poking for libunwind make it generic + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4/want_unwind.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/want_unwind.m4 b/m4/want_unwind.m4 +index cadb62b..5517314 100644 +--- a/m4/want_unwind.m4 ++++ b/m4/want_unwind.m4 +@@ -2,7 +2,7 @@ AC_DEFUN([DOVECOT_WANT_UNWIND], [ + have_libunwind=no + AS_IF([test "$want_libunwind" != "no"], [ + PKG_CHECK_EXISTS([libunwind], [ +- PKG_CHECK_MODULES([LIBUNWIND], [libunwind-generic],[ ++ PKG_CHECK_MODULES([LIBUNWIND], [libunwind],[ + have_libunwind=yes + AC_DEFINE([HAVE_LIBUNWIND],,[Define this if you have libunwind]) + ]) +-- +2.31.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb index c0f2863db..19ba2b1fc 100644 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb @@ -10,6 +10,7 @@ SRC_URI = "http://dovecot.org/releases/2.3/dovecot-${PV}.tar.gz \ file://dovecot.service \ file://dovecot.socket \ file://0001-not-check-pandoc.patch \ + file://0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch \ " SRC_URI[md5sum] = "2f03532cec3280ae45a101a7a55ccef5" diff --git a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.18.bb b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.19.bb index 7254a4713..aead5e9f0 100644 --- a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.18.bb +++ b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.19.bb @@ -6,13 +6,13 @@ connections). It supports every remote-mail protocol now in use on the Internet: RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC." SECTION = "mail" LICENSE = "GPLv2 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=06a8d16599e1d0b131390bec01fb571c" +LIC_FILES_CHKSUM = "file://COPYING;md5=ad73c6bd421c137fbf18cf8b92474186" DEPENDS = "openssl" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "302dc9bcdc6927dedf375d2baaead2347557faa70d98b1da83f2409fa6fb259f" +SRC_URI[sha256sum] = "cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f" inherit autotools gettext python3-dir python3native diff --git a/meta-openembedded/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb b/meta-openembedded/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb new file mode 100644 index 000000000..2d04ded34 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb @@ -0,0 +1,30 @@ +SUMMARY = "HTTP request/response parser for C" +DESCRIPTION = "This is a parser for HTTP messages written in C. It parses \ + both requests and responses. The parser is designed to be used \ + in performance HTTP applications. It does not make any \ + syscalls nor allocations, it does not buffer data, it can be \ + interrupted at anytime. Depending on your architecture, it \ + only requires about 40 bytes of data per message stream (in a \ + web server that is per connection)." +AUTHOR = "Stefan Wiehler <stefan.wiehler@missinglinkelectronics.com>" +HOMEPAGE = "https://github.com/nodejs/http-parser" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=9bfa835d048c194ab30487af8d7b3778" + +SRC_URI = "git://github.com/nodejs/http-parser.git" +SRCREV = "2343fd6b5214b2ded2cdcf76de2bf60903bb90cd" + +S = "${WORKDIR}/git" + +do_configure[noexec] = "1" + +do_compile() { + oe_runmake library package +} + +do_install() { + oe_runmake install DESTDIR=${D} PREFIX=${prefix} +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.11.bb b/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.12.bb index 0db9e8a0a..db2d3a964 100644 --- a/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.11.bb +++ b/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.12.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=acc89812938cf9ad6b1debc37cea0253 inherit manpages MAN_PKG = "${PN}" -SRCREV = "c26e9310f552e69d0d44eb48746e02c9ae4b4f6f" +SRCREV = "88410a7003c31993e79471e151b24662fc2a0d64" SRC_URI = "git://salsa.debian.org/debian/ifenslave.git;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-m4-sctp.m4-make-conpatible-to-autoconf-2.70.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-m4-sctp.m4-make-conpatible-to-autoconf-2.70.patch deleted file mode 100644 index 484af4e0f..000000000 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-m4-sctp.m4-make-conpatible-to-autoconf-2.70.patch +++ /dev/null @@ -1,89 +0,0 @@ -From d6d7130f0a2e3b81880fca29966e42c1b2be40a7 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Fri, 8 Jan 2021 22:22:52 +0000 -Subject: [PATCH] m4/sctp.m4: make conpatible to autoconf-2.70 - -On recently released `autoconf-2.70` generated `./configure` -fails as: - -``` -$ ./configure -... -checking for struct sctp_event_subscribe.sctp_stream_reset_event... yes -checking for gcc options needed to detect all undeclared functions... none needed -./configure: line 16464: syntax error: unexpected end of file -``` - -This happens becuase new autoconf generates less whitespace: - -``` -{ -if ... -... -fi} -``` - -It requires at least whitespace between `fi` and `}`. - -As input already has newlines the change just drops extra `{}`. - -Tested on `autoconf-2.69` and `autoconf-2.70`. - -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> -Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> - -Upstream-Status: Backport [git://github.com/sctp/lksctp-tools.git] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - m4/sctp.m4 | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/m4/sctp.m4 b/m4/sctp.m4 -index 6593517..94527a6 100644 ---- a/m4/sctp.m4 -+++ b/m4/sctp.m4 -@@ -6,7 +6,7 @@ - - # Macros to assist on probing kernel features - # Probes if a type is defined --AC_DEFUN([LKSCTP_CHECK_TYPE], [{ -+AC_DEFUN([LKSCTP_CHECK_TYPE], [ - AC_CHECK_TYPE([$1], - AC_DEFINE([$2], 1, - [Define if $1 is present.]) -@@ -22,10 +22,10 @@ AC_CHECK_TYPE([$1], - #ifdef HAVE_LINUX_SCTP_H - # include <linux/sctp.h> - #endif --])}]) -+])]) - - # Probes if a struct has a given member --AC_DEFUN([LKSCTP_CHECK_MEMBER], [{ -+AC_DEFUN([LKSCTP_CHECK_MEMBER], [ - AC_CHECK_MEMBER([$1], - AC_DEFINE([$2], 1, - [Define if $1 is present.]) -@@ -41,10 +41,10 @@ AC_CHECK_MEMBER([$1], - #ifdef HAVE_LINUX_SCTP_H - # include <linux/sctp.h> - #endif --])}]) -+])]) - - # Probes if a declaration is present --AC_DEFUN([LKSCTP_CHECK_DECL], [{ -+AC_DEFUN([LKSCTP_CHECK_DECL], [ - AC_CHECK_DECL([$1], - AC_DEFINE([$2], 1, - [Define if $1 is present.]) -@@ -60,4 +60,4 @@ AC_CHECK_DECL([$1], - #ifdef HAVE_LINUX_SCTP_H - # include <linux/sctp.h> - #endif --])}]) -+])]) --- -2.27.0 - diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb index f481ffee1..5eea5c208 100644 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb +++ b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb @@ -8,14 +8,13 @@ LIC_FILES_CHKSUM = " \ file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \ " -SRCREV = "12c74404e09755561dee40cf194954f7ff5afd60" +SRCREV = "05b50d379ff0037de4957bb2a1befcce88b70225" PV .= "+git${SRCPV}" -LK_REL = "1.0.18" +LK_REL = "1.0.19" SRC_URI = " \ git://github.com/sctp/lksctp-tools.git \ - file://0001-m4-sctp.m4-make-conpatible-to-autoconf-2.70.patch \ file://run-ptest \ file://v4test.sh \ file://v6test.sh \ diff --git a/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.25.5.bb b/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.25.7.bb index a6070ccf8..9dceb0f26 100644 --- a/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.25.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.25.7.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9dcc2d8acdde215fa4bd6ac12bb14f0" SRC_URI = "git://github.com/libguestfs/nbdkit.git;protocol=https \ " -SRCREV = "c828c6d48ff6b69454cad98054a1920d03c4b4c7" +SRCREV = "babc2e2717c9025392dce613006a6ecae5886a57" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/ncp/libowfat/0001-replace-__pure__-with-compiler-attribute-pure.patch b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat/0001-replace-__pure__-with-compiler-attribute-pure.patch new file mode 100644 index 000000000..3ad3b4aa8 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat/0001-replace-__pure__-with-compiler-attribute-pure.patch @@ -0,0 +1,562 @@ +From 408e7dfaf2eb735804f62728de679972867c30d5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 3 May 2021 13:53:10 -0700 +Subject: [PATCH] replace __pure__ with compiler attribute 'pure' + +Remove defining __deprecated__ + +Upstream-Status: OE-Specific [Untested with dietlibc] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + byte.h | 22 ++++++---- + critbit.h | 12 ++++-- + fmt.h | 100 +++++++++++++++++++++++--------------------- + str.h | 22 ++++++---- + stralloc.h | 20 +++++---- + 5 files changed, 103 insertions(+), 73 deletions(-) + +--- a/byte.h ++++ b/byte.h +@@ -2,6 +2,16 @@ + #ifndef BYTE_H + #define BYTE_H + ++#ifndef __has_attribute ++ #define __has_attribute(x) 0 ++#endif ++ ++#if __has_attribute(pure) ++#define __PURE __attribute__ ((pure)) ++#else ++#define __PURE ++#endif ++ + /* for size_t: */ + #include <stddef.h> + +@@ -9,17 +19,13 @@ + extern "C" { + #endif + +-#ifndef __pure__ +-#define __pure__ +-#endif +- + /* byte_chr returns the smallest integer i between 0 and len-1 + * inclusive such that one[i] equals needle, or len if not found. */ +-size_t byte_chr(const void* haystack, size_t len, char needle) __pure__; ++size_t byte_chr(const void* haystack, size_t len, char needle) __PURE; + + /* byte_rchr returns the largest integer i between 0 and len-1 inclusive + * such that one[i] equals needle, or len if not found. */ +-size_t byte_rchr(const void* haystack,size_t len,char needle) __pure__; ++size_t byte_rchr(const void* haystack,size_t len,char needle) __PURE; + + /* byte_copy copies in[0] to out[0], in[1] to out[1], ... and in[len-1] + * to out[len-1]. */ +@@ -34,14 +40,14 @@ void byte_copyr(void* out, size_t len, c + * than, equal to, or greater than the string b[0], b[1], ..., + * b[len-1]. When the strings are different, byte_diff does not read + * bytes past the first difference. */ +-int byte_diff(const void* a, size_t len, const void* b) __pure__; ++int byte_diff(const void* a, size_t len, const void* b) __PURE; + + /* byte_zero sets the bytes out[0], out[1], ..., out[len-1] to 0 */ + void byte_zero(void* out, size_t len); + + #define byte_equal(s,n,t) (!byte_diff((s),(n),(t))) + +-int byte_equal_notimingattack(const void* a, size_t len,const void* b) __pure__; ++int byte_equal_notimingattack(const void* a, size_t len,const void* b) __PURE; + + #if defined(__i386__) || defined(__x86_64__) + #define UNALIGNED_ACCESS_OK +--- a/critbit.h ++++ b/critbit.h +@@ -8,15 +8,21 @@ extern "C" { + /* for __pure__ if we are compiling under dietlibc */ + #include <stddef.h> + +-#ifndef __pure__ +-#define __pure__ ++#ifndef __has_attribute ++ #define __has_attribute(x) 0 ++#endif ++ ++#if __has_attribute(pure) ++#define __PURE __attribute__ ((pure)) ++#else ++#define __PURE + #endif + + typedef struct { + void *root; + } critbit0_tree; + +-int critbit0_contains(critbit0_tree *t, const char *u) __pure__; ++int critbit0_contains(critbit0_tree *t, const char *u) __PURE; + int critbit0_insert(critbit0_tree *t, const char *u); + int critbit0_delete(critbit0_tree *t, const char *u); + void critbit0_clear(critbit0_tree *t); +--- a/fmt.h ++++ b/fmt.h +@@ -2,6 +2,16 @@ + #ifndef FMT_H + #define FMT_H + ++#ifndef __has_attribute ++ #define __has_attribute(x) 0 ++#endif ++ ++#if __has_attribute(pure) ++#define __PURE __attribute__ ((pure)) ++#else ++#define __PURE ++#endif ++ + /* for size_t: */ + #include <stddef.h> + /* for uint32_t */ +@@ -15,10 +25,6 @@ + extern "C" { + #endif + +-#ifndef __pure__ +-#define __pure__ +-#endif +- + #define FMT_LONG 41 /* enough space to hold -2^127 in decimal, plus \0 */ + #define FMT_ULONG 40 /* enough space to hold 2^128 - 1 in decimal, plus \0 */ + #define FMT_8LONG 44 /* enough space to hold 2^128 - 1 in octal, plus \0 */ +@@ -46,31 +52,31 @@ extern "C" { + /* convert signed src integer -23 to ASCII '-','2','3', return number of + * bytes of value in output format (3 in this example). + * If dest is not NULL, write result to dest */ +-size_t fmt_long(char *dest,signed long src) __pure__; ++size_t fmt_long(char *dest,signed long src) __PURE; + + /* convert unsigned src integer 23 to ASCII '2','3', return number of + * bytes of value in output format (2 in this example). + * If dest is not NULL, write result to dest */ +-size_t fmt_ulong(char *dest,unsigned long src) __pure__; ++size_t fmt_ulong(char *dest,unsigned long src) __PURE; + + /* convert unsigned src integer 0x23 to ASCII '2','3', return number of + * bytes of value in output format (2 in this example). + * If dest is not NULL, write result to dest */ +-size_t fmt_xlong(char *dest,unsigned long src) __pure__; ++size_t fmt_xlong(char *dest,unsigned long src) __PURE; + + /* convert unsigned src integer 023 to ASCII '2','3', return number of + * bytes of value in output format (2 in this example). + * If dest is not NULL, write result to dest */ +-size_t fmt_8long(char *dest,unsigned long src) __pure__; ++size_t fmt_8long(char *dest,unsigned long src) __PURE; + + /* like fmt_long but for long long */ +-size_t fmt_longlong(char *dest,signed long long src) __pure__; ++size_t fmt_longlong(char *dest,signed long long src) __PURE; + + /* like fmt_ulong but for unsigned long long */ +-size_t fmt_ulonglong(char *dest,unsigned long long src) __pure__; ++size_t fmt_ulonglong(char *dest,unsigned long long src) __PURE; + + /* like fmt_xlong but for unsigned long long */ +-size_t fmt_xlonglong(char *dest,unsigned long long src) __pure__; ++size_t fmt_xlonglong(char *dest,unsigned long long src) __PURE; + + #define fmt_uint(dest,src) fmt_ulong(dest,src) + #define fmt_int(dest,src) fmt_long(dest,src) +@@ -81,22 +87,22 @@ size_t fmt_xlonglong(char *dest,unsigned + * Does not truncate! */ + /* fmt_ulong0(buf,23,4) -> '0','0','2','3' return 4 */ + /* fmt_ulong0(buf,234,2) -> '2','3','4', return 3 */ +-size_t fmt_ulong0(char *,unsigned long src,size_t padto) __pure__; ++size_t fmt_ulong0(char *,unsigned long src,size_t padto) __PURE; + + #define fmt_uint0(buf,src,padto) fmt_ulong0(buf,src,padto) + + /* convert src double 1.7 to ASCII '1','.','7', return length. + * If dest is not NULL, write result to dest */ +-size_t fmt_double(char *dest, double d,int max,int prec) __pure__; ++size_t fmt_double(char *dest, double d,int max,int prec) __PURE; + + /* if src is negative, write '-' and return 1. + * if src is positive, write '+' and return 1. + * otherwise return 0 */ +-size_t fmt_plusminus(char *dest,int src) __pure__; ++size_t fmt_plusminus(char *dest,int src) __PURE; + + /* if src is negative, write '-' and return 1. + * otherwise return 0. */ +-size_t fmt_minus(char *dest,int src) __pure__; ++size_t fmt_minus(char *dest,int src) __PURE; + + /* copy str to dest until \0 byte, return number of copied bytes. */ + /* fmt_str(NULL,str) == strlen(str) */ +@@ -108,11 +114,11 @@ size_t fmt_minus(char *dest,int src) __p + * This is more efficient because strcat needs to scan the string to + * find the end and append. + */ +-size_t fmt_str(char *dest,const char *src) __pure__; ++size_t fmt_str(char *dest,const char *src) __PURE; + + /* copy str to dest until \0 byte or limit bytes copied. + * return number of copied bytes. */ +-size_t fmt_strn(char *dest,const char *src,size_t limit) __pure__; ++size_t fmt_strn(char *dest,const char *src,size_t limit) __PURE; + + /* copy n bytes from src to dest, return n */ + static inline size_t fmt_copybytes(char* dest,const char* src,size_t n) { +@@ -124,56 +130,56 @@ static inline size_t fmt_copybytes(char* + * write padlen-srclen spaces, if that is >= 0. Then copy srclen + * characters from src. Truncate only if total length is larger than + * maxlen. Return number of characters written. */ +-size_t fmt_pad(char* dest,const char* src,size_t srclen,size_t padlen,size_t maxlen) __pure__; ++size_t fmt_pad(char* dest,const char* src,size_t srclen,size_t padlen,size_t maxlen) __PURE; + + /* "foo" -> "foo " + * append padlen-srclen spaces after dest, if that is >= 0. Truncate + * only if total length is larger than maxlen. Return number of + * characters written. */ +-size_t fmt_fill(char* dest,size_t srclen,size_t padlen,size_t maxlen) __pure__; ++size_t fmt_fill(char* dest,size_t srclen,size_t padlen,size_t maxlen) __PURE; + + /* 1 -> "1", 4900 -> "4.9k", 2300000 -> "2.3M" */ +-size_t fmt_human(char* dest,unsigned long long l) __pure__; ++size_t fmt_human(char* dest,unsigned long long l) __PURE; + + /* 1 -> "1", 4900 -> "4.8k", 2300000 -> "2.2M" */ +-size_t fmt_humank(char* dest,unsigned long long l) __pure__; ++size_t fmt_humank(char* dest,unsigned long long l) __PURE; + + /* "Sun, 06 Nov 1994 08:49:37 GMT" */ + size_t fmt_httpdate(char* dest,time_t t); /* not marked pure because it calls gmtime */ + + /* "2014-05-27T19:22:16.247Z" */ +-size_t fmt_iso8601(char* dest,time_t t) __pure__; ++size_t fmt_iso8601(char* dest,time_t t) __PURE; + + #define FMT_UTF8 5 + #define FMT_ASN1LENGTH 17 /* enough space to hold 2^128-1 */ + #define FMT_ASN1TAG 19 /* enough space to hold 2^128-1 */ + + /* some variable length encodings for integers */ +-size_t fmt_utf8(char* dest,uint32_t n) __pure__; /* can store 0-0x7fffffff */ +-size_t fmt_asn1derlength(char* dest,unsigned long long l) __pure__; /* 0-0x7f: 1 byte, above that 1+bytes_needed bytes */ +-size_t fmt_asn1dertag(char* dest,unsigned long long l) __pure__; /* 1 byte for each 7 bits; upper bit = more bytes coming */ ++size_t fmt_utf8(char* dest,uint32_t n) __PURE; /* can store 0-0x7fffffff */ ++size_t fmt_asn1derlength(char* dest,unsigned long long l) __PURE; /* 0-0x7f: 1 byte, above that 1+bytes_needed bytes */ ++size_t fmt_asn1dertag(char* dest,unsigned long long l) __PURE; /* 1 byte for each 7 bits; upper bit = more bytes coming */ + + /* Google Protocol Buffers, https://developers.google.com/protocol-buffers/docs/encoding */ +-size_t fmt_varint(char* dest,unsigned long long l) __pure__; /* protocol buffers encoding; like asn1dertag but little endian */ +-size_t fmt_pb_tag(char* dest,size_t fieldno,unsigned char type) __pure__; /* protocol buffer tag */ +-size_t fmt_pb_type0_int(char* dest,unsigned long long l) __pure__; /* protocol buffers encoding: type 0 bool/enum/int32/uint32/int64/uint64 */ +-size_t fmt_pb_type0_sint(char* dest,signed long long l) __pure__;/* protocol buffers encoding: type 0 sint32/sint64 */ +-size_t fmt_pb_type1_double(char* dest,double d) __pure__; /* protocol buffers encoding: double (64-bit little endian blob) */ +-size_t fmt_pb_type1_fixed64(char* dest,uint64_t l) __pure__; /* protocol buffers encoding: 64-bit little endian blob */ ++size_t fmt_varint(char* dest,unsigned long long l) __PURE; /* protocol buffers encoding; like asn1dertag but little endian */ ++size_t fmt_pb_tag(char* dest,size_t fieldno,unsigned char type) __PURE; /* protocol buffer tag */ ++size_t fmt_pb_type0_int(char* dest,unsigned long long l) __PURE; /* protocol buffers encoding: type 0 bool/enum/int32/uint32/int64/uint64 */ ++size_t fmt_pb_type0_sint(char* dest,signed long long l) __PURE;/* protocol buffers encoding: type 0 sint32/sint64 */ ++size_t fmt_pb_type1_double(char* dest,double d) __PURE; /* protocol buffers encoding: double (64-bit little endian blob) */ ++size_t fmt_pb_type1_fixed64(char* dest,uint64_t l) __PURE; /* protocol buffers encoding: 64-bit little endian blob */ + + /* fmt_pb_type2_string can return 0 if (s,l) is clearly invalid */ +-size_t fmt_pb_type2_string(char* dest,const char* s,size_t l) __pure__; /* protocol buffers encoding: varint length + blob */ +-size_t fmt_pb_type5_float(char* dest,float f) __pure__; /* protocol buffers encoding: float (32-bit little endian blob) */ +-size_t fmt_pb_type5_fixed32(char* dest,uint32_t l) __pure__; /* protocol buffers encoding: 32-bit little endian blob */ +- +-size_t fmt_pb_int(char* dest,size_t fieldno,unsigned long long l) __pure__; +-size_t fmt_pb_sint(char* dest,size_t fieldno,signed long long l) __pure__; +-size_t fmt_pb_double(char* dest,size_t fieldno,double d) __pure__; +-size_t fmt_pb_float(char* dest,size_t fieldno,float f) __pure__; +-size_t fmt_pb_string(char* dest,size_t fieldno,const char* s,size_t l) __pure__; ++size_t fmt_pb_type2_string(char* dest,const char* s,size_t l) __PURE; /* protocol buffers encoding: varint length + blob */ ++size_t fmt_pb_type5_float(char* dest,float f) __PURE; /* protocol buffers encoding: float (32-bit little endian blob) */ ++size_t fmt_pb_type5_fixed32(char* dest,uint32_t l) __PURE; /* protocol buffers encoding: 32-bit little endian blob */ ++ ++size_t fmt_pb_int(char* dest,size_t fieldno,unsigned long long l) __PURE; ++size_t fmt_pb_sint(char* dest,size_t fieldno,signed long long l) __PURE; ++size_t fmt_pb_double(char* dest,size_t fieldno,double d) __PURE; ++size_t fmt_pb_float(char* dest,size_t fieldno,float f) __PURE; ++size_t fmt_pb_string(char* dest,size_t fieldno,const char* s,size_t l) __PURE; + + /* fmt_netstring can return 0 if (src,len) is clearly invalid */ +-size_t fmt_netstring(char* dest,const char* src,size_t len) __pure__; ++size_t fmt_netstring(char* dest,const char* src,size_t len) __PURE; + + /* Marshaling helper functions. + * Escape one character, no matter if it needs escaping or not. +@@ -185,27 +191,27 @@ size_t fmt_netstring(char* dest,const ch + * unicode codepoint) may be limited to 0x7f, 0xff or 0x10ffff. */ + + /* XML escaping: '&' -> '&', '<' -> '<', 'ö' -> 'ö' */ +-size_t fmt_escapecharxml(char* dest,uint32_t ch) __pure__; ++size_t fmt_escapecharxml(char* dest,uint32_t ch) __PURE; + /* HTML escaping is the same as XML escaping. */ +-size_t fmt_escapecharhtml(char* dest,uint32_t ch) __pure__; ++size_t fmt_escapecharhtml(char* dest,uint32_t ch) __PURE; + + /* JSON escaping: '\' -> '\\', '"' -> '\"', 'ö' -> '\u00f6' */ +-size_t fmt_escapecharjson(char* dest,uint32_t ch) __pure__; ++size_t fmt_escapecharjson(char* dest,uint32_t ch) __PURE; + + /* MIME quoted-printable escaping: 'ö' -> '=f6', characters > 0xff not supported */ +-size_t fmt_escapecharquotedprintable(char* dest,uint32_t ch) __pure__; ++size_t fmt_escapecharquotedprintable(char* dest,uint32_t ch) __PURE; + + /* MIME quoted-printable escaping with UTF-8: 'ö' -> '=c3=b6', characters > 0x7fffffff not supported */ +-size_t fmt_escapecharquotedprintableutf8(char* dest,uint32_t ch) __pure__; ++size_t fmt_escapecharquotedprintableutf8(char* dest,uint32_t ch) __PURE; + + /* C99 style escaping: '\' -> '\\', newline -> '\n', 0xc2 -> '\302' */ +-size_t fmt_escapecharc(char* dest,uint32_t ch) __pure__; ++size_t fmt_escapecharc(char* dest,uint32_t ch) __PURE; + + /* internal functions, may be independently useful */ + char fmt_tohex(char c) __attribute__((__const__)); + + #define fmt_strm(b,...) fmt_strm_internal(b,__VA_ARGS__,(char*)0) +-size_t fmt_strm_internal(char* dest,...) __pure__; ++size_t fmt_strm_internal(char* dest,...) __PURE; + + #ifndef MAX_ALLOCA + #define MAX_ALLOCA 100000 +--- a/str.h ++++ b/str.h +@@ -8,8 +8,14 @@ + extern "C" { + #endif + +-#ifndef __pure__ +-#define __pure__ ++#ifndef __has_attribute ++ #define __has_attribute(x) 0 ++#endif ++ ++#if __has_attribute(pure) ++#define __PURE __attribute__ ((pure)) ++#else ++#define __PURE + #endif + + /* str_copy copies leading bytes from in to out until \0. +@@ -21,7 +27,7 @@ size_t str_copy(char *out,const char *in + * equal to, or greater than the string b[0], b[1], ..., b[m-1]=='\0'. + * If the strings are different, str_diff does not read bytes past the + * first difference. */ +-int str_diff(const char *a,const char *b) __pure__; ++int str_diff(const char *a,const char *b) __PURE; + + /* str_diffn returns negative, 0, or positive, depending on whether the + * string a[0], a[1], ..., a[n]=='\0' is lexicographically smaller than, +@@ -29,24 +35,24 @@ int str_diff(const char *a,const char *b + * If the strings are different, str_diffn does not read bytes past the + * first difference. The strings will be considered equal if the first + * limit characters match. */ +-int str_diffn(const char *a,const char *b,size_t limit) __pure__; ++int str_diffn(const char *a,const char *b,size_t limit) __PURE; + + #ifdef __dietlibc__ + #include <string.h> + #define str_len(foo) strlen(foo) + #else + /* str_len returns the index of \0 in s */ +-size_t str_len(const char *s) __pure__; ++size_t str_len(const char *s) __PURE; + #endif + + /* str_chr returns the index of the first occurance of needle or \0 in haystack */ +-size_t str_chr(const char *haystack,char needle) __pure__; ++size_t str_chr(const char *haystack,char needle) __PURE; + + /* str_rchr returns the index of the last occurance of needle or \0 in haystack */ +-size_t str_rchr(const char *haystack,char needle) __pure__; ++size_t str_rchr(const char *haystack,char needle) __PURE; + + /* str_start returns 1 if the b is a prefix of a, 0 otherwise */ +-int str_start(const char *a,const char *b) __pure__; ++int str_start(const char *a,const char *b) __PURE; + + /* convenience shortcut to test for string equality */ + #define str_equal(s,t) (!str_diff((s),(t))) +--- a/stralloc.h ++++ b/stralloc.h +@@ -2,16 +2,22 @@ + #ifndef STRALLOC_H + #define STRALLOC_H + ++#ifndef __has_attribute ++ #define __has_attribute(x) 0 ++#endif ++ ++#if __has_attribute(pure) ++#define __PURE __attribute__ ((pure)) ++#else ++#define __PURE ++#endif ++ + #include <stddef.h> + + #ifdef __cplusplus + extern "C" { + #endif + +-#ifndef __pure__ +-#define __pure__ +-#endif +- + /* stralloc is the internal data structure all functions are working on. + * s is the string. + * len is the used length of the string. +@@ -101,17 +107,17 @@ static inline int stralloc_APPEND(strall + /* stralloc_starts returns 1 if the \0-terminated string in "in", without + * the terminating \0, is a prefix of the string stored in sa. Otherwise + * it returns 0. sa must already be allocated. */ +-int stralloc_starts(stralloc* sa,const char* in) __pure__; ++int stralloc_starts(stralloc* sa,const char* in) __PURE; + + /* stralloc_diff returns negative, 0, or positive, depending on whether + * a is lexicographically smaller than, equal to, or greater than the + * string b. */ +-int stralloc_diff(const stralloc* a,const stralloc* b) __pure__; ++int stralloc_diff(const stralloc* a,const stralloc* b) __PURE; + + /* stralloc_diffs returns negative, 0, or positive, depending on whether + * a is lexicographically smaller than, equal to, or greater than the + * string b[0], b[1], ..., b[n]=='\0'. */ +-int stralloc_diffs(const stralloc* a,const char* b) __pure__; ++int stralloc_diffs(const stralloc* a,const char* b) __PURE; + + #define stralloc_equal(a,b) (!stralloc_diff((a),(b))) + #define stralloc_equals(a,b) (!stralloc_diffs((a),(b))) +--- a/scan.h ++++ b/scan.h +@@ -15,8 +15,14 @@ + extern "C" { + #endif + +-#ifndef __pure__ +-#define __pure__ ++#ifndef __has_attribute ++ #define __has_attribute(x) 0 ++#endif ++ ++#if __has_attribute(pure) ++#define __PURE __attribute__ ((pure)) ++#else ++#define __PURE + #endif + + /* This file declared functions used to decode / scan / unmarshal +@@ -84,18 +90,18 @@ size_t scan_double(const char *in, doubl + size_t scan_plusminus(const char *src,signed int *dest); + + /* return the highest integer n<=limit so that isspace(in[i]) for all 0<=i<=n */ +-size_t scan_whitenskip(const char *in,size_t limit) __pure__; ++size_t scan_whitenskip(const char *in,size_t limit) __PURE; + + /* return the highest integer n<=limit so that !isspace(in[i]) for all 0<=i<=n */ +-size_t scan_nonwhitenskip(const char *in,size_t limit) __pure__; ++size_t scan_nonwhitenskip(const char *in,size_t limit) __PURE; + + /* return the highest integer n<=limit so that in[i] is element of + * charset (ASCIIZ string) for all 0<=i<=n */ +-size_t scan_charsetnskip(const char *in,const char *charset,size_t limit) __pure__; ++size_t scan_charsetnskip(const char *in,const char *charset,size_t limit) __PURE; + + /* return the highest integer n<=limit so that in[i] is not element of + * charset (ASCIIZ string) for all 0<=i<=n */ +-size_t scan_noncharsetnskip(const char *in,const char *charset,size_t limit) __pure__; ++size_t scan_noncharsetnskip(const char *in,const char *charset,size_t limit) __PURE; + + /* try to parse ASCII GMT date; does not understand time zones. */ + /* example dates: +@@ -103,17 +109,17 @@ size_t scan_noncharsetnskip(const char * + * "Sunday, 06-Nov-94 08:49:37 GMT" + * "Sun Nov 6 08:49:37 1994" + */ +-size_t scan_httpdate(const char *in,time_t *t) __pure__; ++size_t scan_httpdate(const char *in,time_t *t) __PURE; + + /* try to parse ASCII ISO-8601 date; does not understand time zones. */ + /* example date: "2014-05-27T19:22:16Z" */ +-size_t scan_iso8601(const char* in,struct timespec* t) __pure__; ++size_t scan_iso8601(const char* in,struct timespec* t) __PURE; + + /* some variable length encodings for integers */ +-size_t scan_utf8(const char* in,size_t len,uint32_t* n) __pure__; +-size_t scan_utf8_sem(const char* in,size_t len,uint32_t* n) __pure__; +-size_t scan_asn1derlength(const char* in,size_t len,unsigned long long* n) __pure__; +-size_t scan_asn1dertag(const char* in,size_t len,unsigned long long* n) __pure__; ++size_t scan_utf8(const char* in,size_t len,uint32_t* n) __PURE; ++size_t scan_utf8_sem(const char* in,size_t len,uint32_t* n) __PURE; ++size_t scan_asn1derlength(const char* in,size_t len,unsigned long long* n) __PURE; ++size_t scan_asn1dertag(const char* in,size_t len,unsigned long long* n) __PURE; + + /* Google protocol buffers */ + /* A protocol buffer is a sequence of (tag,value). +@@ -121,16 +127,16 @@ size_t scan_asn1dertag(const char* in,si + * which field in your struct is being sent. Integers must have type + * 0, double type 1, strings type 2 and floats type 5. However, you + * have to check this yourself. +- */ +-size_t scan_varint(const char* in,size_t len, unsigned long long* n) __pure__; /* internal */ +-size_t scan_pb_tag(const char* in,size_t len, size_t* fieldno,unsigned char* type) __pure__; ++ */ ++size_t scan_varint(const char* in,size_t len, unsigned long long* n) __PURE; /* internal */ ++size_t scan_pb_tag(const char* in,size_t len, size_t* fieldno,unsigned char* type) __PURE; + + /* Then, depending on the field number, validate the type and call the + * corresponding of these functions to parse the value */ +-size_t scan_pb_type0_int(const char* in,size_t len,unsigned long long* l) __pure__; +-size_t scan_pb_type0_sint(const char* in,size_t len,signed long long* l) __pure__; +-size_t scan_pb_type1_double(const char* in,size_t len,double* d) __pure__; +-size_t scan_pb_type1_fixed64(const char* in,size_t len,uint64_t* b) __pure__; ++size_t scan_pb_type0_int(const char* in,size_t len,unsigned long long* l) __PURE; ++size_t scan_pb_type0_sint(const char* in,size_t len,signed long long* l) __PURE; ++size_t scan_pb_type1_double(const char* in,size_t len,double* d) __PURE; ++size_t scan_pb_type1_fixed64(const char* in,size_t len,uint64_t* b) __PURE; + /* NOTE: scan_pb_type2_stringlen only parses the length of the string, + * not the string itself. It will return the number of bytes parsed in + * the length, then set slen to the value of the length integer it just +@@ -141,9 +147,9 @@ size_t scan_pb_type1_fixed64(const char* + * parsing early without having to read and allocate memory for the rest + * (potentially gigabytes) of the data announced by one unreasonable + * string length value. */ +-size_t scan_pb_type2_stringlen(const char* in,size_t len,const char** string, size_t* slen) __pure__; +-size_t scan_pb_type5_float(const char* in,size_t len,float* f) __pure__; +-size_t scan_pb_type5_fixed32(const char* in,size_t len,uint32_t* b) __pure__; ++size_t scan_pb_type2_stringlen(const char* in,size_t len,const char** string, size_t* slen) __PURE; ++size_t scan_pb_type5_float(const char* in,size_t len,float* f) __PURE; ++size_t scan_pb_type5_fixed32(const char* in,size_t len,uint32_t* b) __PURE; + + /* parse a netstring, input buffer is in (len bytes). + * if parsing is successful: +@@ -153,7 +159,7 @@ size_t scan_pb_type5_fixed32(const char* + * return 0 + * Note: *dest will point inside the input buffer! + */ +-size_t scan_netstring(const char* in,size_t len,char** dest,size_t* slen) __pure__; ++size_t scan_netstring(const char* in,size_t len,char** dest,size_t* slen) __PURE; + + /* internal function that might be useful independently */ + /* convert from hex ASCII, return 0 to 15 for success or -1 for failure */ +--- a/scan/scan_httpdate.c ++++ b/scan/scan_httpdate.c +@@ -1,5 +1,4 @@ + #define _GNU_SOURCE +-#define __deprecated__ + #include "scan.h" + #include "byte.h" + #include "case.h" +--- a/scan/scan_iso8601.c ++++ b/scan/scan_iso8601.c +@@ -1,5 +1,4 @@ + #define _GNU_SOURCE +-#define __deprecated__ + #include "scan.h" + #include "byte.h" + #include "case.h" diff --git a/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb index d2f4df78e..ec24578b7 100644 --- a/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb +++ b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz \ file://0001-Depend-on-haveuint128.h-for-umult64.c.patch \ + file://0001-replace-__pure__-with-compiler-attribute-pure.patch \ " SRC_URI[md5sum] = "ee015ccf45cb2bc61c942642038c2bdc" SRC_URI[sha256sum] = "f4b9b3d9922dc25bc93adedf9e9ff8ddbebaf623f14c8e7a5f2301bfef7998c1" diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.1.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.2.bb index 6aa7b17be..f82107dbe 100644 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.2.bb @@ -14,8 +14,8 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" -SRC_URI[md5sum] = "b1c279e89d97849d5fcde31d76812f04" -SRC_URI[sha256sum] = "e9582b8e9457994bd8d50012be82c23b2f465da51460c9b2360a81da0f4e06e6" +SRC_URI[md5sum] = "7643f135b49aee49df7d83c1f434dc4e" +SRC_URI[sha256sum] = "b9d295988b34e39964ac475b619c3585d667b36c350cf1adec19e5e3c843ba11" SYSTEMD_SERVICE_${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_33.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_35.0.bb index 1c1569cfb..af4b3788b 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_33.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_35.0.bb @@ -6,7 +6,7 @@ DEPENDS = "libnl" RDEPENDS_${PN} = "bash perl" SRC_URI = "git://github.com/linux-rdma/rdma-core.git" -SRCREV = "e66ca0832e58dafac7af7ad9e6799eaef438061a" +SRCREV = "e29a698e99028e9a092bb00c03ee4bfa31ae0cf3" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md @@ -26,7 +26,7 @@ FILES_SOLIBSDEV = "" FILES_${PN} += "${libdir}/*" INSANE_SKIP_${PN} += "dev-so" -inherit cmake cpan-base systemd +inherit cmake cpan-base python3native systemd SYSTEMD_SERVICE_${PN} = " \ srp_daemon.service \ diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.2.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.2.bb index dd50fba3d..c178b4cda 100644 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.2.bb @@ -24,7 +24,7 @@ EXTRA_OECONF = " \ EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" -PACKAGECONFIG ??= "curl gmp openssl sqlite3 swanctl \ +PACKAGECONFIG ?= "curl gmp openssl sqlite3 swanctl \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-charon', 'charon', d)} \ " PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.3.bb b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.4.bb index 3346daddb..eda51bb7f 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.4.bb @@ -4,12 +4,12 @@ HOMEPAGE = "http://tcpreplay.synfin.net/" SECTION = "net" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=890b830b22fd632e9ffd996df20338f8" +LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8" SRC_URI = "https://github.com/appneta/tcpreplay/releases/download/v${PV}/tcpreplay-${PV}.tar.gz" -SRC_URI[md5sum] = "53b52bf64f0b6b9443428e657b37bc6b" -SRC_URI[sha256sum] = "ed2402caa9434ff5c74b2e7b31178c73e7c7c5c4ea1e1d0e2e39a7dc46958fde" +SRC_URI[md5sum] = "305a84d84265705bd28f148698142188" +SRC_URI[sha256sum] = "ee065310806c22e2fd36f014e1ebb331b98a7ec4db958e91c3d9cbda0640d92c" UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases" diff --git a/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch index 91508d721..af99edcb5 100644 --- a/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch +++ b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch @@ -1,14 +1,14 @@ -From b71eb384522b5ce4629dee6e8be257fb4880fef3 Mon Sep 17 00:00:00 2001 -From: Benjamin Gaignard <benjamin.gaignard@linaro.org> +From b71eb384522b5ce4629dee6e8be257fb4880fef3 Mon Sep 17 00:00:00 2001 +From: Benjamin Gaignard <benjamin.gaignard@linaro.org> Date: Thu, 20 Apr 2017 14:25:18 +0200 --- - Makefile.am | 1 - - configure.ac | 9 --------- - 2 files changed, 10 deletions(-) + Makefile.am | 1 - + configure.ac | 17 ----------------- + 2 files changed, 18 deletions(-) diff --git a/Makefile.am b/Makefile.am -index e9113c2..2fe3d54 100644 +index 4a3ead6..a12cb98 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,6 @@ SUBDIRS = \ @@ -17,24 +17,32 @@ index e9113c2..2fe3d54 100644 etc \ - docs \ m4macros \ - tests - + tests \ + scripts diff --git a/configure.ac b/configure.ac -index 48ee0b2..a1a5fa1 100644 +index 3849383..9f3a633 100644 --- a/configure.ac +++ b/configure.ac -@@ -194,10 +194,6 @@ AC_SUBST(ADDITIONAL_OBJECTS) - AC_PATH_PROG(XSLTPROC, xsltproc, no) - AM_CONDITIONAL(HAVE_XSLTPROC, test "x$XSLTPROC" != "xno") +@@ -190,18 +190,6 @@ AC_SUBST(CPPFLAGS) + AC_SUBST(LIBS) + AC_SUBST(ADDITIONAL_OBJECTS) --# Check for asciidoc --AC_PATH_PROG(A2X, a2x, no) --AM_CONDITIONAL(HAVE_A2X, test "x$A2X" != "xno") +-if test x"$manpage_support_enabled" = x"yes"; then +-AC_PATH_PROG(POD2MAN, pod2man, no) +- +-if test "x$POD2MAN" = "xno" && \ +- ! test -e docs/man5/tinyproxy.conf.5 -a -e docs/man8/tinyproxy.8 ; then +-AC_MSG_ERROR([ +- manpage generation requested, but neither pod2man +- nor pre-generated manpages found. +- Use --disable-manpage-support if you want to compile anyway.]) +-fi +-fi #manpage_support_enabled - - # checking xmllint - AC_PATH_PROG(XMLLINT, xmllint, no) - if test "x$XMLLINT" != "xno"; then -@@ -219,11 +215,6 @@ src/Makefile + AM_CONDITIONAL(HAVE_POD2MAN, test "x$POD2MAN" != "x" -a "x$POD2MAN" != "xno") + + AC_PATH_PROG(GPERF, gperf, no) +@@ -226,11 +214,6 @@ src/Makefile data/Makefile data/templates/Makefile etc/Makefile @@ -46,3 +54,6 @@ index 48ee0b2..a1a5fa1 100644 m4macros/Makefile tests/Makefile tests/scripts/Makefile +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.10.0.bb b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.0.bb index 82d67014b..7fb29279e 100644 --- a/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.10.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.0.bb @@ -9,8 +9,8 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz file://tinyproxy.conf \ " -SRC_URI[md5sum] = "423047c8dc53a15e19f78e238198549c" -SRC_URI[sha256sum] = "6020955e6a0ef0ef898ad5bb17a448c47f9e4c003c464b4ae7c4dba063272055" +SRC_URI[md5sum] = "658db5558ffb849414341b756a546a99" +SRC_URI[sha256sum] = "20f74769e40144e4d251d2977cc4c40d2d428a2bec8c1b8709cd07315454baef" UPSTREAM_CHECK_URI = "https://github.com/tinyproxy/tinyproxy/releases" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.4.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.5.bb index b75f41835..3100e4c2c 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.5.bb @@ -19,7 +19,7 @@ SRC_URI += " \ UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "729cd11e9715c600e5ad74ca472bacf8af32c20902192d5f2b271268511d4d29" +SRC_URI[sha256sum] = "de1aafd100a1e1207c850d180e97dd91ab8da0f5eb6beec545f725cdb145d333" PE = "1" @@ -44,6 +44,7 @@ PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" PACKAGECONFIG[libssh] = ",,libssh2" PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" +PACKAGECONFIG[zstd] = "-DENABLE_STTD=ON,-DENABLE_ZSTD=OFF, zstd" # these next two options require addional layers PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Do-not-use-MINSIGSTKSZ.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Do-not-use-MINSIGSTKSZ.patch new file mode 100644 index 000000000..0ee64e9c6 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Do-not-use-MINSIGSTKSZ.patch @@ -0,0 +1,34 @@ +From 027044a692b588ef586d495f65eb58b07cc711a3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 11 May 2021 10:15:51 -0700 +Subject: [PATCH] Do not use MINSIGSTKSZ + +Since glibc 2.34+ MINSIGSTKSZ is no more a constant. So, +let's hardwire this for now until better fix is found. +64Kb should be good anyway + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/mongo/stdx/thread.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/mongo/stdx/thread.h b/src/mongo/stdx/thread.h +index f8058279e3..f31f309959 100644 +--- a/src/mongo/stdx/thread.h ++++ b/src/mongo/stdx/thread.h +@@ -104,10 +104,7 @@ private: + // . N Y : 4,344 | 13,048 | 7,352 + // . Y Y : 4,424 | 13,672 | 8,392 + // ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt ) +- static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10; +- +- static constexpr std::size_t kStackSize = +- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ}); ++ static constexpr std::size_t kStackSize = std::size_t{64} << 10; + std::unique_ptr<std::byte[]> _stackStorage = std::make_unique<std::byte[]>(kStackSize); + + #else // !MONGO_HAS_SIGALTSTACK +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-explicit-typecast-to-size_t.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-explicit-typecast-to-size_t.patch new file mode 100644 index 000000000..5b724ff8a --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-explicit-typecast-to-size_t.patch @@ -0,0 +1,35 @@ +From 6fdb2d304e05a17e57b2efd7f8252794a8722dbe Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 1 Jun 2021 08:25:36 -0700 +Subject: [PATCH] Use explicit typecast to size_t + +maxMemoryUsageBytes is size_t type which may not match long long value +internalDocumentSourceGroupMaxMemoryBytes.load() returns, so typecast it +to avoid narrowing warning from clang + +document_source_group.cpp:378:22: error: non-constant-expression cannot be narrowed from type 'long long' to 'size_t' (aka 'unsigned int') in initializer list [-Wc++11-narrowing] + maxMemoryUsageBytes ? *maxMemoryUsageBytes + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/mongodb/mongo/pull/1405] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/mongo/db/pipeline/document_source_group.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mongo/db/pipeline/document_source_group.cpp b/src/mongo/db/pipeline/document_source_group.cpp +index c7bf44e72e..a52906a940 100644 +--- a/src/mongo/db/pipeline/document_source_group.cpp ++++ b/src/mongo/db/pipeline/document_source_group.cpp +@@ -376,7 +376,7 @@ DocumentSourceGroup::DocumentSourceGroup(const intrusive_ptr<ExpressionContext>& + _doingMerge(false), + _memoryTracker{pExpCtx->allowDiskUse && !pExpCtx->inMongos, + maxMemoryUsageBytes ? *maxMemoryUsageBytes +- : internalDocumentSourceGroupMaxMemoryBytes.load()}, ++ : (size_t)internalDocumentSourceGroupMaxMemoryBytes.load()}, + _initialized(false), + _groups(pExpCtx->getValueComparator().makeUnorderedValueMap<Accumulators>()), + _spilled(false) { +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-kms-message-bump-libmongocrypto-to-v1.0.4.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-kms-message-bump-libmongocrypto-to-v1.0.4.patch deleted file mode 100644 index df4cee2b4..000000000 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-kms-message-bump-libmongocrypto-to-v1.0.4.patch +++ /dev/null @@ -1,714 +0,0 @@ -From 44272ce47e768e090263df5cb9cb7ce17e544ad3 Mon Sep 17 00:00:00 2001 -From: Vincent Prince <vincent.prince.external@saftbatteries.com> -Date: Tue, 15 Sep 2020 11:40:15 +0200 -Subject: [PATCH] kms-message: bump libmongocrypto to v1.0.4 - -This fixes compilation with alpinelinux -see https://github.com/mongodb/libmongocrypt/pull/89 - -Upstream-Status: Pending - -Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com> ---- - .../kms-message/THIRD_PARTY_NOTICES | 2 +- - src/third_party/kms-message/src/hexlify.c | 21 +---- - src/third_party/kms-message/src/hexlify.h | 2 - - .../kms-message/src/kms_crypto_apple.c | 5 + - .../kms-message/src/kms_crypto_libcrypto.c | 94 +++++++++++++++++++ - .../kms-message/src/kms_crypto_none.c | 4 + - .../kms-message/src/kms_crypto_windows.c | 4 + - .../kms-message/src/kms_decrypt_request.c | 2 +- - .../kms-message/src/kms_encrypt_request.c | 2 +- - src/third_party/kms-message/src/kms_kv_list.c | 11 ++- - .../kms-message/src/kms_message/kms_message.h | 2 + - .../src/kms_message/kms_message_defines.h | 10 ++ - src/third_party/kms-message/src/kms_port.c | 33 +++++++ - src/third_party/kms-message/src/kms_port.h | 27 +++--- - src/third_party/kms-message/src/kms_request.c | 41 +++++--- - .../kms-message/src/kms_request_str.c | 13 ++- - .../kms-message/src/kms_request_str.h | 5 - - .../kms-message/src/kms_response_parser.c | 26 ++++- - .../scripts/kms_message_get_sources.sh | 2 +- - 19 files changed, 244 insertions(+), 62 deletions(-) - create mode 100644 src/third_party/kms-message/src/kms_crypto_libcrypto.c - create mode 100644 src/third_party/kms-message/src/kms_port.c - -diff --git a/src/third_party/kms-message/THIRD_PARTY_NOTICES b/src/third_party/kms-message/THIRD_PARTY_NOTICES -index 3fc095170c..4110c1b91e 100644 ---- a/src/third_party/kms-message/THIRD_PARTY_NOTICES -+++ b/src/third_party/kms-message/THIRD_PARTY_NOTICES -@@ -1,4 +1,4 @@ --License notice for common-b64.c -+License notice for kms_b64.c - ------------------------------------------------------------------------------- - - ISC License -diff --git a/src/third_party/kms-message/src/hexlify.c b/src/third_party/kms-message/src/hexlify.c -index be9ee030b9..941fc93d1b 100644 ---- a/src/third_party/kms-message/src/hexlify.c -+++ b/src/third_party/kms-message/src/hexlify.c -@@ -24,6 +24,8 @@ char * - hexlify (const uint8_t *buf, size_t len) - { - char *hex_chars = malloc (len * 2 + 1); -+ KMS_ASSERT (hex_chars); -+ - char *p = hex_chars; - size_t i; - -@@ -35,22 +37,3 @@ hexlify (const uint8_t *buf, size_t len) - - return hex_chars; - } -- --uint8_t * --unhexlify (const char *hex_chars, size_t *len) --{ -- uint8_t *buf; -- uint8_t *pos; -- -- *len = strlen (hex_chars) / 2; -- buf = malloc (*len); -- pos = buf; -- -- while (*hex_chars) { -- KMS_ASSERT (1 == sscanf (hex_chars, "%2hhx", pos)); -- pos++; -- hex_chars += 2; -- } -- -- return buf; --} -diff --git a/src/third_party/kms-message/src/hexlify.h b/src/third_party/kms-message/src/hexlify.h -index e0096eb6ca..a6a504ebe8 100644 ---- a/src/third_party/kms-message/src/hexlify.h -+++ b/src/third_party/kms-message/src/hexlify.h -@@ -19,5 +19,3 @@ - - char * - hexlify (const uint8_t *buf, size_t len); --uint8_t * --unhexlify (const char *hex_chars, size_t *len); -diff --git a/src/third_party/kms-message/src/kms_crypto_apple.c b/src/third_party/kms-message/src/kms_crypto_apple.c -index 61da0a6288..a26e0d65e8 100644 ---- a/src/third_party/kms-message/src/kms_crypto_apple.c -+++ b/src/third_party/kms-message/src/kms_crypto_apple.c -@@ -16,9 +16,12 @@ - - #include "kms_crypto.h" - -+#ifdef KMS_MESSAGE_ENABLE_CRYPTO_COMMON_CRYPTO -+ - #include <CommonCrypto/CommonDigest.h> - #include <CommonCrypto/CommonHMAC.h> - -+ - int - kms_crypto_init () - { -@@ -54,3 +57,5 @@ kms_sha256_hmac (void *unused_ctx, - CCHmac (kCCHmacAlgSHA256, key_input, key_len, input, len, hash_out); - return true; - } -+ -+#endif /* KMS_MESSAGE_ENABLE_CRYPTO_COMMON_CRYPTO */ -diff --git a/src/third_party/kms-message/src/kms_crypto_libcrypto.c b/src/third_party/kms-message/src/kms_crypto_libcrypto.c -new file mode 100644 -index 0000000000..6f25657fdd ---- /dev/null -+++ b/src/third_party/kms-message/src/kms_crypto_libcrypto.c -@@ -0,0 +1,94 @@ -+/* -+ * Copyright 2018-present MongoDB, Inc. -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "kms_crypto.h" -+ -+#ifdef KMS_MESSAGE_ENABLE_CRYPTO_LIBCRYPTO -+ -+#include <openssl/sha.h> -+#include <openssl/evp.h> -+#include <openssl/hmac.h> -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) -+static EVP_MD_CTX * -+EVP_MD_CTX_new (void) -+{ -+ return calloc (sizeof (EVP_MD_CTX), 1); -+} -+ -+static void -+EVP_MD_CTX_free (EVP_MD_CTX *ctx) -+{ -+ EVP_MD_CTX_cleanup (ctx); -+ free (ctx); -+} -+#endif -+ -+int -+kms_crypto_init () -+{ -+ return 0; -+} -+ -+void -+kms_crypto_cleanup () -+{ -+} -+ -+bool -+kms_sha256 (void *unused_ctx, -+ const char *input, -+ size_t len, -+ unsigned char *hash_out) -+{ -+ EVP_MD_CTX *digest_ctxp = EVP_MD_CTX_new (); -+ bool rval = false; -+ -+ if (1 != EVP_DigestInit_ex (digest_ctxp, EVP_sha256 (), NULL)) { -+ goto cleanup; -+ } -+ -+ if (1 != EVP_DigestUpdate (digest_ctxp, input, len)) { -+ goto cleanup; -+ } -+ -+ rval = (1 == EVP_DigestFinal_ex (digest_ctxp, hash_out, NULL)); -+ -+cleanup: -+ EVP_MD_CTX_free (digest_ctxp); -+ -+ return rval; -+} -+ -+bool -+kms_sha256_hmac (void *unused_ctx, -+ const char *key_input, -+ size_t key_len, -+ const char *input, -+ size_t len, -+ unsigned char *hash_out) -+{ -+ return HMAC (EVP_sha256 (), -+ key_input, -+ key_len, -+ (unsigned char *) input, -+ len, -+ hash_out, -+ NULL) != NULL; -+} -+ -+#endif /* KMS_MESSAGE_ENABLE_CRYPTO_LIBCRYPTO */ -diff --git a/src/third_party/kms-message/src/kms_crypto_none.c b/src/third_party/kms-message/src/kms_crypto_none.c -index 9ef2147687..94da5abd88 100644 ---- a/src/third_party/kms-message/src/kms_crypto_none.c -+++ b/src/third_party/kms-message/src/kms_crypto_none.c -@@ -16,6 +16,8 @@ - - #include "kms_crypto.h" - -+#ifndef KMS_MESSAGE_ENABLE_CRYPTO -+ - int - kms_crypto_init () - { -@@ -48,3 +50,5 @@ kms_sha256_hmac (void *unused_ctx, - /* only gets called if hooks were mistakenly not set */ - return false; - } -+ -+#endif /* KMS_MESSAGE_ENABLE_CRYPTO */ -diff --git a/src/third_party/kms-message/src/kms_crypto_windows.c b/src/third_party/kms-message/src/kms_crypto_windows.c -index ccdc7e095d..8177b0ddc0 100644 ---- a/src/third_party/kms-message/src/kms_crypto_windows.c -+++ b/src/third_party/kms-message/src/kms_crypto_windows.c -@@ -16,6 +16,8 @@ - - #include "kms_crypto.h" - -+#ifdef KMS_MESSAGE_ENABLE_CRYPTO_CNG -+ - // tell windows.h not to include a bunch of headers we don't need: - #define WIN32_LEAN_AND_MEAN - -@@ -130,3 +132,5 @@ cleanup: - - return status == STATUS_SUCCESS ? 1 : 0; - } -+ -+#endif /* KMS_MESSAGE_ENABLE_CRYPTO_CNG */ -diff --git a/src/third_party/kms-message/src/kms_decrypt_request.c b/src/third_party/kms-message/src/kms_decrypt_request.c -index 06faa43119..f1ca282768 100644 ---- a/src/third_party/kms-message/src/kms_decrypt_request.c -+++ b/src/third_party/kms-message/src/kms_decrypt_request.c -@@ -48,7 +48,7 @@ kms_decrypt_request_new (const uint8_t *ciphertext_blob, - if (!(b64 = malloc (b64_len))) { - KMS_ERROR (request, - "Could not allocate %d bytes for base64-encoding payload", -- b64_len); -+ (int) b64_len); - goto done; - } - -diff --git a/src/third_party/kms-message/src/kms_encrypt_request.c b/src/third_party/kms-message/src/kms_encrypt_request.c -index b5f4d6436e..24b064d95f 100644 ---- a/src/third_party/kms-message/src/kms_encrypt_request.c -+++ b/src/third_party/kms-message/src/kms_encrypt_request.c -@@ -47,7 +47,7 @@ kms_encrypt_request_new (const uint8_t *plaintext, - if (!(b64 = malloc (b64_len))) { - KMS_ERROR (request, - "Could not allocate %d bytes for base64-encoding payload", -- b64_len); -+ (int) b64_len); - goto done; - } - -diff --git a/src/third_party/kms-message/src/kms_kv_list.c b/src/third_party/kms-message/src/kms_kv_list.c -index 2d6845a1aa..0cff3dc2c6 100644 ---- a/src/third_party/kms-message/src/kms_kv_list.c -+++ b/src/third_party/kms-message/src/kms_kv_list.c -@@ -17,6 +17,7 @@ - - #include "kms_kv_list.h" - #include "kms_message/kms_message.h" -+#include "kms_message_private.h" - #include "kms_request_str.h" - #include "kms_port.h" - #include "sort.h" -@@ -39,9 +40,12 @@ kms_kv_list_t * - kms_kv_list_new (void) - { - kms_kv_list_t *lst = malloc (sizeof (kms_kv_list_t)); -+ KMS_ASSERT (lst); - - lst->size = 16; - lst->kvs = malloc (lst->size * sizeof (kms_kv_t)); -+ KMS_ASSERT (lst->kvs); -+ - lst->len = 0; - - return lst; -@@ -72,6 +76,7 @@ kms_kv_list_add (kms_kv_list_t *lst, - if (lst->len == lst->size) { - lst->size *= 2; - lst->kvs = realloc (lst->kvs, lst->size * sizeof (kms_kv_t)); -+ KMS_ASSERT (lst->kvs); - } - - kv_init (&lst->kvs[lst->len], key, value); -@@ -84,7 +89,7 @@ kms_kv_list_find (const kms_kv_list_t *lst, const char *key) - size_t i; - - for (i = 0; i < lst->len; i++) { -- if (0 == strcasecmp (lst->kvs[i].key->str, key)) { -+ if (0 == kms_strcasecmp (lst->kvs[i].key->str, key)) { - return &lst->kvs[i]; - } - } -@@ -119,8 +124,12 @@ kms_kv_list_dup (const kms_kv_list_t *lst) - } - - dup = malloc (sizeof (kms_kv_list_t)); -+ KMS_ASSERT (dup); -+ - dup->size = dup->len = lst->len; - dup->kvs = malloc (lst->len * sizeof (kms_kv_t)); -+ KMS_ASSERT (dup->kvs); -+ - - for (i = 0; i < lst->len; i++) { - kv_init (&dup->kvs[i], lst->kvs[i].key, lst->kvs[i].value); -diff --git a/src/third_party/kms-message/src/kms_message/kms_message.h b/src/third_party/kms-message/src/kms_message/kms_message.h -index 6ea95dd04c..8048528f2e 100644 ---- a/src/third_party/kms-message/src/kms_message/kms_message.h -+++ b/src/third_party/kms-message/src/kms_message/kms_message.h -@@ -17,6 +17,8 @@ - #ifndef KMS_MESSAGE_H - #define KMS_MESSAGE_H - -+#include <sys/types.h> -+ - #include "kms_message_defines.h" - #include "kms_request_opt.h" - #include "kms_request.h" -diff --git a/src/third_party/kms-message/src/kms_message/kms_message_defines.h b/src/third_party/kms-message/src/kms_message/kms_message_defines.h -index a4d019bd77..a539d531ef 100644 ---- a/src/third_party/kms-message/src/kms_message/kms_message_defines.h -+++ b/src/third_party/kms-message/src/kms_message/kms_message_defines.h -@@ -53,4 +53,14 @@ kms_message_cleanup (void); - } /* extern "C" */ - #endif - -+#ifdef _MSC_VER -+#include <basetsd.h> -+#pragma warning(disable : 4142) -+#ifndef _SSIZE_T_DEFINED -+#define _SSIZE_T_DEFINED -+typedef SSIZE_T ssize_t; -+#endif -+#pragma warning(default : 4142) -+#endif -+ - #endif /* KMS_MESSAGE_DEFINES_H */ -diff --git a/src/third_party/kms-message/src/kms_port.c b/src/third_party/kms-message/src/kms_port.c -new file mode 100644 -index 0000000000..ee9e6ed9c9 ---- /dev/null -+++ b/src/third_party/kms-message/src/kms_port.c -@@ -0,0 +1,33 @@ -+/* -+ * Copyright 2020-present MongoDB, Inc. -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "kms_port.h" -+#if defined(_WIN32) -+#include <stdlib.h> -+#include <string.h> -+char * kms_strndup (const char *src, size_t len) -+{ -+ char *dst = (char *) malloc (len + 1); -+ if (!dst) { -+ return 0; -+ } -+ -+ memcpy (dst, src, len); -+ dst[len] = '\0'; -+ -+ return dst; -+} -+#endif -\ No newline at end of file -diff --git a/src/third_party/kms-message/src/kms_port.h b/src/third_party/kms-message/src/kms_port.h -index c3cbbac369..2123a99dc9 100644 ---- a/src/third_party/kms-message/src/kms_port.h -+++ b/src/third_party/kms-message/src/kms_port.h -@@ -15,21 +15,18 @@ - * limitations under the License. - */ - --#if defined(_WIN32) --#define strcasecmp _stricmp -- --inline char * --strndup (const char *src, size_t len) --{ -- char *dst = (char *) malloc (len + 1); -- if (!dst) { -- return 0; -- } -- -- memcpy (dst, src, len); -- dst[len] = '\0'; -+#ifndef KMS_PORT_H -+#define KMS_PORT_H - -- return dst; --} -+#include <stddef.h> - -+#if defined(_WIN32) -+#define kms_strcasecmp _stricmp -+char * -+kms_strndup (const char *src, size_t len); -+#else -+#define kms_strndup strndup -+#define kms_strcasecmp strcasecmp - #endif -+ -+#endif /* KMS_PORT_H */ -\ No newline at end of file -diff --git a/src/third_party/kms-message/src/kms_request.c b/src/third_party/kms-message/src/kms_request.c -index fa2d487123..ac2b07ea6b 100644 ---- a/src/third_party/kms-message/src/kms_request.c -+++ b/src/third_party/kms-message/src/kms_request.c -@@ -61,6 +61,7 @@ kms_request_new (const char *method, - kms_request_t *request = calloc (1, sizeof (kms_request_t)); - const char *question_mark; - -+ KMS_ASSERT (request); - /* parsing may set failed to true */ - request->failed = false; - -@@ -92,10 +93,14 @@ kms_request_new (const char *method, - request->header_fields = kms_kv_list_new (); - request->auto_content_length = true; - -- kms_request_set_date (request, NULL); -+ if (!kms_request_set_date (request, NULL)) { -+ return request; -+ } - - if (opt && opt->connection_close) { -- kms_request_add_header_field (request, "Connection", "close"); -+ if (!kms_request_add_header_field (request, "Connection", "close")) { -+ return request; -+ } - } - - if (opt && opt->crypto.sha256) { -@@ -164,7 +169,9 @@ kms_request_set_date (kms_request_t *request, const struct tm *tm) - kms_request_str_set_chars (request->date, buf, sizeof "YYYYmmDD" - 1); - kms_request_str_set_chars (request->datetime, buf, sizeof AMZ_DT_FORMAT - 1); - kms_kv_list_del (request->header_fields, "X-Amz-Date"); -- kms_request_add_header_field (request, "X-Amz-Date", buf); -+ if (!kms_request_add_header_field (request, "X-Amz-Date", buf)) { -+ return false; -+ } - - return true; - } -@@ -309,7 +316,8 @@ append_canonical_headers (kms_kv_list_t *lst, kms_request_str_t *str) - * values in headers that have multiple values." */ - for (i = 0; i < lst->len; i++) { - kv = &lst->kvs[i]; -- if (previous_key && 0 == strcasecmp (previous_key->str, kv->key->str)) { -+ if (previous_key && -+ 0 == kms_strcasecmp (previous_key->str, kv->key->str)) { - /* duplicate header */ - kms_request_str_append_char (str, ','); - kms_request_str_append_stripped (str, kv->value); -@@ -339,12 +347,13 @@ append_signed_headers (kms_kv_list_t *lst, kms_request_str_t *str) - - for (i = 0; i < lst->len; i++) { - kv = &lst->kvs[i]; -- if (previous_key && 0 == strcasecmp (previous_key->str, kv->key->str)) { -+ if (previous_key && -+ 0 == kms_strcasecmp (previous_key->str, kv->key->str)) { - /* duplicate header */ - continue; - } - -- if (0 == strcasecmp (kv->key->str, "connection")) { -+ if (0 == kms_strcasecmp (kv->key->str, "connection")) { - continue; - } - -@@ -412,7 +421,8 @@ finalize (kms_request_t *request) - static int - cmp_header_field_names (const void *a, const void *b) - { -- return strcasecmp (((kms_kv_t *) a)->key->str, ((kms_kv_t *) b)->key->str); -+ return kms_strcasecmp (((kms_kv_t *) a)->key->str, -+ ((kms_kv_t *) b)->key->str); - } - - static kms_kv_list_t * -@@ -447,6 +457,7 @@ kms_request_get_canonical (kms_request_t *request) - kms_request_str_append_newline (canonical); - normalized = kms_request_str_path_normalized (request->path); - kms_request_str_append_escaped (canonical, normalized, false); -+ kms_request_str_destroy (normalized); - kms_request_str_append_newline (canonical); - append_canonical_query (request, canonical); - kms_request_str_append_newline (canonical); -@@ -454,12 +465,14 @@ kms_request_get_canonical (kms_request_t *request) - append_canonical_headers (lst, canonical); - kms_request_str_append_newline (canonical); - append_signed_headers (lst, canonical); -- kms_request_str_append_newline (canonical); -- kms_request_str_append_hashed ( -- &request->crypto, canonical, request->payload); -- -- kms_request_str_destroy (normalized); - kms_kv_list_destroy (lst); -+ kms_request_str_append_newline (canonical); -+ if (!kms_request_str_append_hashed ( -+ &request->crypto, canonical, request->payload)) { -+ KMS_ERROR (request, "could not generate hash"); -+ kms_request_str_destroy (canonical); -+ return NULL; -+ } - - return kms_request_str_detach (canonical); - } -@@ -514,6 +527,10 @@ kms_request_get_string_to_sign (kms_request_t *request) - kms_request_str_append_chars (sts, "/aws4_request\n", -1); - - creq = kms_request_str_wrap (kms_request_get_canonical (request), -1); -+ if (!creq) { -+ goto done; -+ } -+ - if (!kms_request_str_append_hashed (&request->crypto, sts, creq)) { - goto done; - } -diff --git a/src/third_party/kms-message/src/kms_request_str.c b/src/third_party/kms-message/src/kms_request_str.c -index 0f7c19c972..65207d2f4f 100644 ---- a/src/third_party/kms-message/src/kms_request_str.c -+++ b/src/third_party/kms-message/src/kms_request_str.c -@@ -51,10 +51,13 @@ kms_request_str_t * - kms_request_str_new (void) - { - kms_request_str_t *s = malloc (sizeof (kms_request_str_t)); -+ KMS_ASSERT (s); - - s->len = 0; - s->size = 16; - s->str = malloc (s->size); -+ KMS_ASSERT (s->str); -+ - s->str[0] = '\0'; - - return s; -@@ -64,11 +67,15 @@ kms_request_str_t * - kms_request_str_new_from_chars (const char *chars, ssize_t len) - { - kms_request_str_t *s = malloc (sizeof (kms_request_str_t)); -+ KMS_ASSERT (s); -+ - size_t actual_len; - - actual_len = len < 0 ? strlen (chars) : (size_t) len; - s->size = actual_len + 1; - s->str = malloc (s->size); -+ KMS_ASSERT (s->str); -+ - memcpy (s->str, chars, actual_len); - s->str[actual_len] = '\0'; - s->len = actual_len; -@@ -86,6 +93,8 @@ kms_request_str_wrap (char *chars, ssize_t len) - } - - s = malloc (sizeof (kms_request_str_t)); -+ KMS_ASSERT (s); -+ - - s->str = chars; - s->len = len < 0 ? strlen (chars) : (size_t) len; -@@ -148,8 +157,10 @@ kms_request_str_t * - kms_request_str_dup (kms_request_str_t *str) - { - kms_request_str_t *dup = malloc (sizeof (kms_request_str_t)); -+ KMS_ASSERT (dup); -+ - -- dup->str = strndup (str->str, str->len); -+ dup->str = kms_strndup (str->str, str->len); - dup->len = str->len; - dup->size = str->len + 1; - -diff --git a/src/third_party/kms-message/src/kms_request_str.h b/src/third_party/kms-message/src/kms_request_str.h -index f053a595aa..0898f59067 100644 ---- a/src/third_party/kms-message/src/kms_request_str.h -+++ b/src/third_party/kms-message/src/kms_request_str.h -@@ -25,11 +25,6 @@ - #include <stdint.h> - #include <string.h> - --#if defined(_WIN32) --#include <basetsd.h> --typedef SSIZE_T ssize_t; --#endif // _WIN32 -- - typedef struct { - char *str; - size_t len; -diff --git a/src/third_party/kms-message/src/kms_response_parser.c b/src/third_party/kms-message/src/kms_response_parser.c -index 31e4868a68..6f86fac854 100644 ---- a/src/third_party/kms-message/src/kms_response_parser.c -+++ b/src/third_party/kms-message/src/kms_response_parser.c -@@ -1,7 +1,7 @@ - #include "kms_message/kms_response_parser.h" - #include "kms_message_private.h" - --#include "kms_message_private.h" -+#include <errno.h> - #include <limits.h> - #include <stdio.h> - #include <stdlib.h> -@@ -24,6 +24,7 @@ _parser_init (kms_response_parser_t *parser) - parser->raw_response = kms_request_str_new (); - parser->content_length = -1; - parser->response = calloc (1, sizeof (kms_response_t)); -+ KMS_ASSERT (parser->response); - parser->response->headers = kms_kv_list_new (); - parser->state = PARSING_STATUS_LINE; - parser->start = 0; -@@ -34,6 +35,8 @@ kms_response_parser_t * - kms_response_parser_new (void) - { - kms_response_parser_t *parser = malloc (sizeof (kms_response_parser_t)); -+ KMS_ASSERT (parser); -+ - _parser_init (parser); - return parser; - } -@@ -59,11 +62,26 @@ static bool - _parse_int (const char *str, int *result) - { - char *endptr = NULL; -+ int64_t long_result; - -- *result = (int) strtol (str, &endptr, 10); -- if (*endptr) { -+ errno = 0; -+ long_result = strtol (str, &endptr, 10); -+ if (endptr == str) { -+ /* No digits were parsed. Consider this an error */ -+ return false; -+ } -+ if (endptr != NULL && *endptr != '\0') { -+ /* endptr points to the first invalid character. */ -+ return false; -+ } -+ if (errno == EINVAL || errno == ERANGE) { -+ return false; -+ } -+ if (long_result > INT32_MAX || long_result < INT32_MIN) { - return false; - } -+ *result = (int) long_result; -+ - return true; - } - -@@ -72,6 +90,8 @@ static bool - _parse_int_from_view (const char *str, int start, int end, int *result) - { - char *num_str = malloc (end - start + 1); -+ KMS_ASSERT (num_str); -+ - bool ret; - - strncpy (num_str, str + start, end - start); -diff --git a/src/third_party/scripts/kms_message_get_sources.sh b/src/third_party/scripts/kms_message_get_sources.sh -index 6ad2fbb0e6..52ce21b9dd 100755 ---- a/src/third_party/scripts/kms_message_get_sources.sh -+++ b/src/third_party/scripts/kms_message_get_sources.sh -@@ -18,7 +18,7 @@ if grep -q Microsoft /proc/version; then - fi - - NAME=libmongocrypt --REVISION=59c8c17bbdfa1cf0fdec60cfdde73a437a868221 -+REVISION=052f7fc610f0cea83a2adf3dd263a5ff04833371 - - if grep -q Microsoft /proc/version; then - SRC_ROOT=$(wslpath -u $(powershell.exe -Command "Get-ChildItem Env:TEMP | Get-Content | Write-Host")) --- -2.24.0 - diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index b78255a04..95e0cf7a8 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb @@ -11,11 +11,10 @@ DEPENDS = "openssl libpcap zlib boost curl python3 \ inherit scons dos2unix siteinfo python3native systemd useradd -PV = "4.4.4" -#v4.4.4 -SRCREV = "8db30a63db1a9d84bdcad0c83369623f708e0397" +PV = "4.4.6" +#v4.4.6 +SRCREV = "72e66213c2c3eab37d9358d5e78ad7f5c1d0d0d7" SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4 \ - file://0001-kms-message-bump-libmongocrypto-to-v1.0.4.patch \ file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ file://0001-Use-long-long-instead-of-int64_t.patch \ file://0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch \ @@ -30,6 +29,8 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4 \ file://0001-include-needed-c-header.patch \ file://disable_runtime_check.patch \ file://ppc64_ARCH_BITS.patch \ + file://0001-Do-not-use-MINSIGSTKSZ.patch \ + file://0001-Use-explicit-typecast-to-size_t.patch \ " SRC_URI_append_libc-musl ="\ file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \ diff --git a/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.3.bb b/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.4.bb index 049cdeffc..63930b960 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.3.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.4.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=015106c62262b2383f6c72063f0998f2" SRC_URI = "git://github.com/tristanpenman/valijson.git" -SRCREV = "7a52fc88cdffd6678c009ca2fad700151f7363c6" +SRCREV = "9183462118f58a3ca4be82b8f656f18707229737" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/licenses/Bellcore b/meta-openembedded/meta-oe/licenses/Bellcore new file mode 100644 index 000000000..6bbbf94e6 --- /dev/null +++ b/meta-openembedded/meta-oe/licenses/Bellcore @@ -0,0 +1,13 @@ +Copyright: (c) 1991 Bell Communications Research, Inc. (Bellcore) +License: Bellcore + Permission to use, copy, modify, and distribute this material + for any purpose and without fee is hereby granted, provided + that the above copyright notice and this permission notice + appear in all copies, and that the name of Bellcore not be + used in advertising or publicity pertaining to this + material without the specific, prior written permission + of an authorized representative of Bellcore. BELLCORE + MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY + OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED "AS IS", + WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/qperf/qperf_0.4.11.bb b/meta-openembedded/meta-oe/recipes-benchmark/qperf/qperf_0.4.11.bb new file mode 100644 index 000000000..f21af4b80 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/qperf/qperf_0.4.11.bb @@ -0,0 +1,19 @@ +SUMMARY = "Measure socket and RDMA performance" +DESCRIPTION = "qperf measures bandwidth and latency between two nodes." +HOMEPAGE = "https://github.com/linux-rdma/qperf" +AUTHOR = "Johann George" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +inherit autotools-brokensep + +SRCREV = "c706363815a38ff2c5cbc07b73e2cfaaa59bae0f" +SRC_URI = "git://github.com/linux-rdma/qperf.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +do_configure() { + ./cleanup + ./autogen.sh + oe_runconf +} diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.5.bb index a02442862..271a66875 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.5.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ " -SRCREV = "95cfb8f6d8985e2fb8ba51c4887dd70aa7551a03" +SRCREV = "ed307629e067a9ef55d79beec9c9f67b86efbaaf" SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=2.2.x" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0001-Prepare-for-CVE-2021-30004.patch.patch b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0001-Prepare-for-CVE-2021-30004.patch.patch new file mode 100644 index 000000000..1bedb4f75 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0001-Prepare-for-CVE-2021-30004.patch.patch @@ -0,0 +1,45 @@ +From 14fab0772db19297c82dd1b8612c9335369dce41 Mon Sep 17 00:00:00 2001 +From: Alexander Vickberg <wickbergster@gmail.com> +Date: Mon, 17 May 2021 17:54:13 +0200 +Subject: [PATCH] Prepare for CVE-2021-30004.patch + +Without this building fails for CONFIG_TLS=internal + +Signed-off-by: Alexander Vickberg <wickbergster@gmail.com> +--- + src/tls/asn1.h | 6 ++++++ + src/utils/includes.h | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/src/tls/asn1.h b/src/tls/asn1.h +index 6bd7df5..77b94ef 100644 +--- a/src/tls/asn1.h ++++ b/src/tls/asn1.h +@@ -66,6 +66,12 @@ void asn1_oid_to_str(const struct asn1_oid *oid, char *buf, size_t len); + unsigned long asn1_bit_string_to_long(const u8 *buf, size_t len); + int asn1_oid_equal(const struct asn1_oid *a, const struct asn1_oid *b); + ++static inline bool asn1_is_null(const struct asn1_hdr *hdr) ++{ ++ return hdr->class == ASN1_CLASS_UNIVERSAL && ++ hdr->tag == ASN1_TAG_NULL; ++} ++ + extern struct asn1_oid asn1_sha1_oid; + extern struct asn1_oid asn1_sha256_oid; + +diff --git a/src/utils/includes.h b/src/utils/includes.h +index 75513fc..741fc9c 100644 +--- a/src/utils/includes.h ++++ b/src/utils/includes.h +@@ -18,6 +18,7 @@ + + #include <stdlib.h> + #include <stddef.h> ++#include <stdbool.h> + #include <stdio.h> + #include <stdarg.h> + #include <string.h> +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb index e58601868..a9780bc6d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb @@ -11,6 +11,7 @@ SRC_URI = " \ file://defconfig \ file://init \ file://hostapd.service \ + file://0001-Prepare-for-CVE-2021-30004.patch.patch \ file://CVE-2019-16275.patch \ file://CVE-2019-5061.patch \ file://CVE-2021-0326.patch \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.2.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.2.3.bb index 1c5a912f2..c95741cd9 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.2.3.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55fdc1113306167d6ea2561404ce02f8" DEPENDS = "glib-2.0 ncurses openssl" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" -SRC_URI[md5sum] = "8547f89e014e23e1bbbb665bcf7e2f70" -SRC_URI[sha256sum] = "6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578" +SRC_URI[md5sum] = "381d3af259ad15d658be50c0a01f0c28" +SRC_URI[sha256sum] = "a647bfefed14d2221fa77b6edac594934dc672c4a560417b1abcbbc6b88d769f" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch new file mode 100644 index 000000000..9ed73104e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch @@ -0,0 +1,37 @@ +From b0b51d762f45ff9d320b96bd0acb89313148a446 Mon Sep 17 00:00:00 2001 +From: Zang Ruochen <zangrc.fnst@fujitsu.com> +Date: Wed, 12 May 2021 14:28:24 +0900 +Subject: [PATCH] build: Use abs_top_srcdir instead of abs_srcdir for ell sources + +this makes it build when build dir is outside of sources dir + +Upstream-Status: Submitted [https://lists.01.org/hyperkitty/list/iwd@lists.01.org/message/SYX6Z7SUQHU7UWM6ECZTTJ6SPODIS6KB/] +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 68035e4..e3f7990 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -628,7 +628,7 @@ ell/shared: Makefile + $(AM_V_at)$(MKDIR_P) ell + $(AM_V_GEN)for f in $(ell_shared) ; do \ + if [ ! -f $$f ] ; then \ +- $(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \ ++ $(LN_S) -t ell -f $(abs_top_srcdir)/ell/$$f ; \ + fi \ + done > $@ + +@@ -636,7 +636,7 @@ ell/internal: Makefile + $(AM_V_at)$(MKDIR_P) ell + $(AM_V_GEN)for f in $(ell_headers) $(ell_sources) ; do \ + if [ ! -f $$f ] ; then \ +- $(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \ ++ $(LN_S) -t ell -f $(abs_top_srcdir)/ell/$$f ; \ + fi \ + done > $@ + +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.14.bb index ccdc65ac6..dbcc319dc 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.14.bb @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" DEPENDS = "ell" -SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ +SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ + file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ " -SRCREV = "bde3e0f6e3364e9c884b6b93a944d8138345b8e5" -S = "${WORKDIR}/git" +SRC_URI[sha256sum] = "21be6ad59ba666ba1e50e01889d647472b9b2f96f4941123db036fd33c257f0b" inherit autotools manpages pkgconfig python3native systemd diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.7.bb b/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb index 07a7a1d23..0d35465c8 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.7.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://github.com/jpirko/libndp \ " -# tag for v1.6 -SRCREV = "96674e7d4f4d569c2c961e865cc16152dfab5f09" +# tag for v1.8 +SRCREV = "009ce9cd9b950ffa1f4f94c9436027b936850d0c" S = "${WORKDIR}/git" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.28.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.28.4.bb index 9be48b75f..c6422c392 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.28.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.28.4.bb @@ -14,7 +14,7 @@ inherit autotools pkgconfig bash-completion gobject-introspection SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "8c8c3ee719874d2529bce9b35b028fe435b36f003979a360d3ad0938449db783" +SRC_URI[sha256sum] = "3b14cd2ab5221a7adbb39fed16ef697538ea1c79308821ad2d19b505e1daaea0" PACKAGECONFIG ??= "udev mbim" PACKAGECONFIG[udev] = ",--without-udev,libgudev" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.1.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.0.bb index 6a3eb917f..89c98fec0 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.1.6.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.0.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8c47b078124308a4e1354e8d59f606b7" DEPENDS = "zlib" S = "${WORKDIR}/git" -SRCREV = "736f0739ed8c75db0e29c7678b5a9194e957c347" -SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.1-stable" +SRCREV = "1367c11e1ee44d9e19daa50e1d015365bae17354" +SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.2-stable" UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.4.bb index d1ba8e43e..f8e8aa1d4 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.4.bb @@ -12,7 +12,7 @@ inherit gnomebase gettext systemd vala gobject-introspection bash-completion DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" -SRC_URI[sha256sum] = "efa9a963499e0885f3f163096d433334143c4937545134ecd682e0157fa591e3" +SRC_URI[sha256sum] = "167e60b26fa05887f87a0b3fb54143d7845e6e4d8c2f2dd93afac059f41e7edf" S = "${WORKDIR}/ModemManager-${PV}" PACKAGECONFIG ??= "mbim qmi \ diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.2.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb index 207d9394e..ae2bf2d02 100644 --- a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb @@ -6,8 +6,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase -SRC_URI[archive.md5sum] = "440133a2676275ae26770b3651f89827" -SRC_URI[archive.sha256sum] = "a2a99f3fa943cf662f189163ed39a2cfc19a428d906dd4f92b387d3659d1641d" +SRC_URI[archive.sha256sum] = "e81596625899aacf1d0bf27ccc2fcc7f373405ec48735ca1c7273c0fbcdc1ef5" SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 59908e2c0..d0665f258 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -74,6 +74,7 @@ RDEPENDS_packagegroup-meta-oe-benchmarks = "\ memtester \ nbench-byte \ phoronix-test-suite \ + qperf \ s-suite \ stressapptest \ sysbench \ @@ -300,6 +301,7 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\ xmlrpc-c \ yasm \ json-schema-validator \ + poke \ " RDEPENDS_packagegroup-meta-oe-devtools_append_x86 = " cpuid msr-tools pmtools" RDEPENDS_packagegroup-meta-oe-devtools_append_x86-64 = " cpuid msr-tools pcimem pmtools" @@ -481,6 +483,7 @@ RDEPENDS_packagegroup-meta-oe-graphics ="\ libforms \ lxdm \ numlockx \ + nyancat \ obconf \ openbox \ packagegroup-fonts-truetype \ @@ -696,6 +699,7 @@ RDEPENDS_packagegroup-meta-oe-security ="\ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "passwdqc", "", d)} \ softhsm \ tomoyo-tools \ + auditd \ " RDEPENDS_packagegroup-meta-oe-shells ="\ @@ -727,6 +731,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ digitemp \ dstat \ espeak \ + evemu-tools \ exiv2 \ libnice \ c-periphery \ @@ -921,7 +926,7 @@ RDEPENDS_packagegroup-meta-oe-support_remove_arm ="numactl" RDEPENDS_packagegroup-meta-oe-support_remove_mipsarch = "gperftools" RDEPENDS_packagegroup-meta-oe-support_remove_riscv64 = "gperftools uim" RDEPENDS_packagegroup-meta-oe-support_remove_riscv32 = "gperftools uim" -RDEPENDS_packagegroup-meta-oe-support_remove_powerpc = "ssiapi" +RDEPENDS_packagegroup-meta-oe-support_remove_powerpc = "ssiapi tbb" RDEPENDS_packagegroup-meta-oe-support_remove_powerpc64le = "ssiapi" RDEPENDS_packagegroup-meta-oe-test ="\ diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Do-not-download-gtest-automatically.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Do-not-download-gtest-automatically.patch new file mode 100644 index 000000000..5bd3801f3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Do-not-download-gtest-automatically.patch @@ -0,0 +1,44 @@ +From af91a20ee201f13e56f225df536a56e5d8d259e8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 27 May 2021 09:56:49 -0700 +Subject: [PATCH] Do not download gtest automatically + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/CMakeLists.txt | 9 +-------- + tests/googletest-download/CMakeLists.txt.in | 3 --- + 2 files changed, 1 insertion(+), 11 deletions(-) + +--- a/tests/googletest-download/CMakeLists.txt.in ++++ b/tests/googletest-download/CMakeLists.txt.in +@@ -7,10 +7,7 @@ project(googletest-download NONE) + include(ExternalProject) + + ExternalProject_Add(googletest +- GIT_REPOSITORY https://github.com/google/googletest.git +- GIT_TAG master +- GIT_SHALLOW 1 +- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src" ++ SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/googletest-src" + BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build" + UPDATE_COMMAND "" + CONFIGURE_COMMAND "" +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -6,9 +6,7 @@ include(FetchContent) + + message("Fetching googletest...") + FetchContent_Declare(googletest +- GIT_REPOSITORY https://github.com/google/googletest.git +- GIT_TAG master +- GIT_SHALLOW 1 ++ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/googletest-src + UPDATE_COMMAND "") + + #FetchContent_MakeAvailable(googletest) # Not available in CMake 3.13 :-( Let's do it manually: +@@ -144,4 +142,4 @@ endif() + if(NOT CMAKE_CROSSCOMPILING) + add_test(NAME sdbus-c++-unit-tests COMMAND sdbus-c++-unit-tests) + add_test(NAME sdbus-c++-integration-tests COMMAND sdbus-c++-integration-tests) +-endif() ++endif() diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-test-Check-for-googletest-on-system-first.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-test-Check-for-googletest-on-system-first.patch new file mode 100644 index 000000000..8a6aceac8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-test-Check-for-googletest-on-system-first.patch @@ -0,0 +1,41 @@ +From dc5fa7a4b342ef80cda533cdb821841d8183287c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 23 May 2021 09:01:09 -0700 +Subject: [PATCH] test: Check for googletest on system first + +This ensures if googletest is instslled already then use that version +before downloading and building own copy + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 97f7c1a..3dfdd1c 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -2,6 +2,10 @@ + # DOWNLOAD AND BUILD OF GOOGLETEST + #------------------------------- + ++find_package(GTest) ++ ++if(NOT GTest_FOUND) ++ + include(FetchContent) + + message("Fetching googletest...") +@@ -23,7 +27,7 @@ if(NOT googletest_POPULATED) + add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) + set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_BAK}) + endif() +- ++endif() + #------------------------------- + # SOURCE FILES CONFIGURATION + #------------------------------- +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch new file mode 100644 index 000000000..ae449791f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch @@ -0,0 +1,53 @@ +From 7c5fd25119a495009ea62f79e5daec34cc464628 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +Date: Mon, 12 Apr 2021 14:03:32 +0200 +Subject: [PATCH] meson: do not fail if rsync is not installed with meson + 0.57.2 + +https://github.com/mesonbuild/meson/issues/8641 + +Our CI started to fail. Even if the change is reverted in meson, +we need a quick workaround here. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + man/meson.build | 25 ++++++++++++++----------- + 1 file changed, 14 insertions(+), 11 deletions(-) + +diff --git a/man/meson.build b/man/meson.build +index 3cae8446cda..f9c4b83dc81 100644 +--- a/man/meson.build ++++ b/man/meson.build +@@ -184,17 +184,20 @@ html = custom_target( + depends : html_pages, + command : ['echo']) + +-run_target( +- 'doc-sync', +- depends : man_pages + html_pages, +- command : ['rsync', '-rlv', +- '--delete-excluded', +- '--include=man', +- '--include=*.html', +- '--exclude=*', +- '--omit-dir-times', +- meson.current_build_dir(), +- get_option('www-target')]) ++rsync = find_program('rsync', required : false) ++if rsync.found() ++ run_target( ++ 'doc-sync', ++ depends : man_pages + html_pages, ++ command : [rsync, '-rlv', ++ '--delete-excluded', ++ '--include=man', ++ '--include=*.html', ++ '--exclude=*', ++ '--omit-dir-times', ++ meson.current_build_dir(), ++ get_option('www-target')]) ++endif + + ############################################################ + diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb index 4b93087f4..dee3eab49 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb @@ -12,9 +12,10 @@ DEPENDS += "gperf-native gettext-native util-linux libcap" SRCREV = "efb536d0cbe2e58f80e501d19999928c75e08f6a" SRCBRANCH = "v243-stable" -SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" - -SRC_URI += "file://static-libsystemd-pkgconfig.patch" +SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \ + file://static-libsystemd-pkgconfig.patch \ + file://7c5fd25119a495009ea62f79e5daec34cc464628.patch \ + " # patches needed by musl SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb index 98829765c..338a89dda 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb @@ -17,7 +17,13 @@ PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${B DEPENDS += "expat" SRCREV = "6e8e5aadb674cccea5bdd55141db5dad887fbacd" -SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master" +SRCREV_gtest = "a3460d1aeeaa43fdf137a6adefef10ba0b59fe4b" +SRCREV_FORMAT = "default_gtest" + +SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master \ + git://github.com/google/googletest.git;protocol=https;branch=master;name=gtest;destsuffix=git/tests/googletest-src \ + file://0001-Do-not-download-gtest-automatically.patch \ +" SRC_URI += "file://run-ptest" EXTRA_OECMAKE = "-DBUILD_CODE_GEN=ON \ diff --git a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.14.0.bb b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.18.1.bb index 13b2c6649..041eff039 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.14.0.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.18.1.bb @@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://license.txt;md5=a02e03c8fa2c5e7b9b3fcc1b9811fd3b" SECTION = "libs" SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz" -SRC_URI[md5sum] = "ebc68c08b99bbc4b4fc9bdbfad398b02" -SRC_URI[sha256sum] = "0c10f12b424a40ee19bde00292098e201d7498535c062d8d5b586d07861a54b5" +SRC_URI[sha256sum] = "f8c7b46222a857168a754a5cc329bb780504122b270018dda5304c98db28ae29" S = "${WORKDIR}/Botan-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.9.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb index 73b2a0980..73b2a0980 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.9.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 9833b2885..25e630a16 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -11,7 +11,6 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://install_db \ file://mysql-systemd-start \ file://configure.cmake-fix-valgrind.patch \ - file://fix-a-building-failure.patch \ file://support-files-CMakeLists.txt-fix-do_populate_sysroot.patch \ file://sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ file://0001-disable-ucontext-on-musl.patch \ @@ -22,10 +21,12 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \ file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \ file://sys_futex.patch \ + file://cross-compiling.patch \ + file://ssize_t.patch \ " SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf" +SRC_URI[sha256sum] = "a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch index 9149ee21f..0f4815b18 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch @@ -1,28 +1,21 @@ -From 1b2b6a61c9f82157cd2e0c3744f6c07e07aeb0bd Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Mon, 4 Mar 2019 01:11:30 -0800 -Subject: [PATCH] fix a building failure - -Upstream-Status: Inappropriate [configuration] +This is not needed for OE builds building failed since native does not generate import_executables.cmake In fact, our building system will export the needed commands +Upstream-Status: Inappropriate [configuration] + Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - CMakeLists.txt | 5 ----- - 1 file changed, 5 deletions(-) +Signed-off-by: Khem Raj <raj.khem@gmail.com> -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fc30750..4f9110e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -347,11 +347,6 @@ CHECK_PCRE() +@@ -392,11 +392,6 @@ CHECK_PCRE() CHECK_SYSTEMD() --IF(CMAKE_CROSSCOMPILING) +-IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR) - SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build") - INCLUDE(${IMPORT_EXECUTABLES}) -ENDIF() @@ -30,6 +23,3 @@ index fc30750..4f9110e 100644 # # Setup maintainer mode options. Platform checks are # not run with the warning options as to not perturb fragile checks --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch index 1ca86bcca..d082d424b 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch @@ -36,7 +36,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> + __builtin_ppc_get_timebase(); #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) /* Mainly, prevent the compiler from optimizing away delay loops */ - __asm__ __volatile__ ("":::"memory"); + __asm__ __volatile__ ("isb":::"memory"); --- a/storage/tokudb/PerconaFT/portability/toku_time.h +++ b/storage/tokudb/PerconaFT/portability/toku_time.h @@ -124,7 +124,7 @@ static inline tokutime_t toku_time_now(v diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch new file mode 100644 index 000000000..4e499d413 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch @@ -0,0 +1,15 @@ +ssize_t comes from sys/types.h therefore include it + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/wsrep-lib/include/wsrep/gtid.hpp ++++ b/wsrep-lib/include/wsrep/gtid.hpp +@@ -25,7 +25,7 @@ + #include "compiler.hpp" + + #include <iosfwd> +- ++#include <sys/types.h> + /** + * Minimum number of bytes guaratneed to store GTID string representation, + * terminating '\0' not included (36 + 1 + 20). diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.9.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb index e6743fe97..8ae8241b0 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.9.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb @@ -2,7 +2,7 @@ require mariadb.inc EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" -DEPENDS += "mariadb-native bison-native libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" +DEPENDS += "mariadb-native bison-native boost libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" PROVIDES += "mysql5 libmysqlclient" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch index 970d750b1..45f283a02 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch @@ -16,7 +16,7 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> +++ b/configure.in @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un - AC_INIT([PostgreSQL], [13.2], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [13.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.2.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.3.bb index ca8a6c7ce..862dd61bd 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.2.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.3.bb @@ -9,4 +9,4 @@ SRC_URI += "\ file://0001-configure.in-bypass-autoconf-2.69-version-check.patch \ " -SRC_URI[sha256sum] = "5fd7fcd08db86f5b2aed28fcfaf9ae0aca8e9428561ac547764c2a2b0f41adfc" +SRC_URI[sha256sum] = "3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1" diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch new file mode 100644 index 000000000..52d4f42d5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch @@ -0,0 +1,100 @@ +From a9831f1cbf93fb18dd951453635f488037454ce9 Mon Sep 17 00:00:00 2001 +From: Abseil Team <absl-team@google.com> +Date: Mon, 3 May 2021 07:37:39 -0700 +Subject: [PATCH] Export of internal Abseil changes + +-- +cf88f9cf40eab54c06bca7f20795352ec23bb583 by Derek Mauro <dmauro@google.com>: + +Fixes build with latest glibc +Fixes #952 + +PiperOrigin-RevId: 371693908 + +-- +99bcd0f4a747ce7a401e23c745adf34d0ec5131b by Samuel Benzaquen <sbenza@google.com>: + +Add support for std::string_view in StrFormat even when +absl::string_view != std::string_view. + +PiperOrigin-RevId: 371693633 + +-- +e35463572149a6c2d4a0d439b9300ce03fd6b96d by Abseil Team <absl-team@google.com>: + +Cmake builds should only install pkg-config when explicitly requested. + +PiperOrigin-RevId: 371403419 +GitOrigin-RevId: cf88f9cf40eab54c06bca7f20795352ec23bb583 +Change-Id: I4360a18c638a4d901ff44ab1e0a9d8f321c302ea +--- + CMake/AbseilHelpers.cmake | 3 ++- + absl/debugging/failure_signal_handler.cc | 3 ++- + absl/strings/internal/str_format/arg.h | 8 ++++++++ + absl/strings/internal/str_format/convert_test.cc | 3 +++ + 4 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake +index 1f754392..1a80b5b4 100644 +--- a/CMake/AbseilHelpers.cmake ++++ b/CMake/AbseilHelpers.cmake +@@ -141,7 +141,8 @@ function(absl_cc_library) + endif() + + # Generate a pkg-config file for every library: +- if(_build_type STREQUAL "static" OR _build_type STREQUAL "shared") ++ if((_build_type STREQUAL "static" OR _build_type STREQUAL "shared") ++ AND ABSL_ENABLE_INSTALL) + if(NOT ABSL_CC_LIB_TESTONLY) + if(absl_VERSION) + set(PC_VERSION "${absl_VERSION}") +diff --git a/absl/debugging/failure_signal_handler.cc b/absl/debugging/failure_signal_handler.cc +index e458a795..689e5979 100644 +--- a/absl/debugging/failure_signal_handler.cc ++++ b/absl/debugging/failure_signal_handler.cc +@@ -136,7 +136,8 @@ static bool SetupAlternateStackOnce() { + #else + const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; + #endif +- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; ++ size_t stack_size = ++ (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask; + #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \ + defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER) + // Account for sanitizer instrumentation requiring additional stack space. +diff --git a/absl/strings/internal/str_format/arg.h b/absl/strings/internal/str_format/arg.h +index 7040c866..3c91be70 100644 +--- a/absl/strings/internal/str_format/arg.h ++++ b/absl/strings/internal/str_format/arg.h +@@ -122,6 +122,14 @@ StringConvertResult FormatConvertImpl(const std::string& v, + StringConvertResult FormatConvertImpl(string_view v, + FormatConversionSpecImpl conv, + FormatSinkImpl* sink); ++#if defined(ABSL_HAVE_STD_STRING_VIEW) && !defined(ABSL_USES_STD_STRING_VIEW) ++inline StringConvertResult FormatConvertImpl(std::string_view v, ++ FormatConversionSpecImpl conv, ++ FormatSinkImpl* sink) { ++ return FormatConvertImpl(absl::string_view(v.data(), v.size()), conv, sink); ++} ++#endif // ABSL_HAVE_STD_STRING_VIEW && !ABSL_USES_STD_STRING_VIEW ++ + ArgConvertResult<FormatConversionCharSetUnion( + FormatConversionCharSetInternal::s, FormatConversionCharSetInternal::p)> + FormatConvertImpl(const char* v, const FormatConversionSpecImpl conv, +diff --git a/absl/strings/internal/str_format/convert_test.cc b/absl/strings/internal/str_format/convert_test.cc +index 926283cf..91e03609 100644 +--- a/absl/strings/internal/str_format/convert_test.cc ++++ b/absl/strings/internal/str_format/convert_test.cc +@@ -229,6 +229,9 @@ TEST_F(FormatConvertTest, BasicString) { + TestStringConvert(static_cast<const char*>("hello")); + TestStringConvert(std::string("hello")); + TestStringConvert(string_view("hello")); ++#if defined(ABSL_HAVE_STD_STRING_VIEW) ++ TestStringConvert(std::string_view("hello")); ++#endif // ABSL_HAVE_STD_STRING_VIEW + } + + TEST_F(FormatConvertTest, NullString) { +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch index ee0c25473..a4937e1b3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch @@ -53,21 +53,21 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #include "absl/base/attributes.h" #include "absl/base/internal/raw_logging.h" #include "absl/base/macros.h" -@@ -55,8 +59,10 @@ void* GetProgramCounter(void* vuc) { +@@ -63,8 +67,10 @@ void* GetProgramCounter(void* vuc) { return reinterpret_cast<void*>(context->uc_mcontext.pc); #elif defined(__powerpc64__) return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]); -#elif defined(__powerpc__) +#elif defined(__powerpc__) && defined(__GLIBC__) - return reinterpret_cast<void*>(context->uc_mcontext.regs->nip); + return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]); +#elif defined(__powerpc__) -+ return reinterpret_cast<void*>(((struct pt_regs *)context->uc_regs)->nip); ++ return reinterpret_cast<void*>(((struct pt_regs *)context->uc_regs)->gregs[32]); #elif defined(__riscv) return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]); #elif defined(__s390__) && !defined(__s390x__) --- a/absl/debugging/internal/stacktrace_config.h +++ b/absl/debugging/internal/stacktrace_config.h -@@ -64,7 +64,7 @@ +@@ -55,7 +55,7 @@ #elif defined(__i386__) || defined(__x86_64__) #define ABSL_STACKTRACE_INL_HEADER \ "absl/debugging/internal/stacktrace_x86-inl.inc" @@ -76,19 +76,3 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #define ABSL_STACKTRACE_INL_HEADER \ "absl/debugging/internal/stacktrace_powerpc-inl.inc" #elif defined(__aarch64__) ---- a/absl/debugging/internal/stacktrace_powerpc-inl.inc -+++ b/absl/debugging/internal/stacktrace_powerpc-inl.inc -@@ -130,8 +130,13 @@ static void **NextStackFrame(void **old_ - StacktracePowerPCGetLR(new_sp) == kernel_sigtramp_rt64_address) { - const ucontext_t* signal_context = - reinterpret_cast<const ucontext_t*>(uc); -+#if defined(__powerpc64__) - void **const sp_before_signal = - reinterpret_cast<void**>(signal_context->uc_mcontext.gp_regs[PT_R1]); -+#else -+ void **const sp_before_signal = -+ reinterpret_cast<void**>(signal_context->uc_mcontext.uc_regs->gregs[PT_R1]); -+#endif - // Check that alleged sp before signal is nonnull and is reasonably - // aligned. - if (sp_before_signal != nullptr && diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb index 903b7b4b8..01dd9f550 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -7,13 +7,14 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" -PV = "20200923+git${SRCPV}" -SRCREV = "6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c" -BRANCH = "lts_2020_09_23" +PV = "20210324+git${SRCPV}" +SRCREV = "e1d388e7e74803050423d035e4374131b9b57919" +BRANCH = "lts_2021_03_24" SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH} \ file://0001-absl-always-use-asm-sgidefs.h.patch \ file://0002-Remove-maes-option-from-cross-compilation.patch \ file://abseil-ppc-fixes.patch \ + file://0001-Export-of-internal-Abseil-changes.patch \ " S = "${WORKDIR}/git" @@ -30,5 +31,4 @@ EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \ BBCLASSEXTEND = "native nativesdk" -FILES_${PN} = "${libdir}/libabsl_*.so" -FILES_${PN}-dev = "${includedir} ${libdir}/cmake" +FILES_${PN}-dev += "${includedir} ${libdir}/cmake ${libdir}/pkgconfig" diff --git a/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace/0001-libbacktrace-include-config.h.patch b/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace/0001-libbacktrace-include-config.h.patch new file mode 100644 index 000000000..87fb4992d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace/0001-libbacktrace-include-config.h.patch @@ -0,0 +1,33 @@ +From bdd5f0834d95a9598b0d87a18e7e96afade9d418 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 10 May 2021 15:28:05 -0700 +Subject: [PATCH] libbacktrace: include config.h + +Fixes +thirdparty/libbacktrace/backtrace.h:53:10: fatal error: gstdint.h: No such file or directory + 53 | #include "gstdint.h" + | ^~~~~~~~~~~ +compilation terminated. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + thirdparty/libbacktrace/backtrace.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/thirdparty/libbacktrace/backtrace.h b/thirdparty/libbacktrace/backtrace.h +index 2814763f..802cf989 100644 +--- a/thirdparty/libbacktrace/backtrace.h ++++ b/thirdparty/libbacktrace/backtrace.h +@@ -33,6 +33,7 @@ POSSIBILITY OF SUCH DAMAGE. */ + #ifndef BACKTRACE_H + #define BACKTRACE_H + ++#include <config.h> + #include <stddef.h> + #include <stdio.h> + +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_9.0.bb b/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb index 826291a5e..616d56daa 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_9.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb @@ -5,8 +5,10 @@ LICENSE = "MIT & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \ file://thirdparty/snappy/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" -SRCREV = "cae55f54c53449fd07f8a917dcd0874db2c15032" -SRC_URI = "git://github.com/${BPN}/${BPN}.git" +SRCREV = "03e4e9d2cab4f1a61d3f589785641a73dff027c5" +SRC_URI = "git://github.com/${BPN}/${BPN}.git \ + file://0001-libbacktrace-include-config.h.patch \ + " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch new file mode 100644 index 000000000..afe8a61b2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch @@ -0,0 +1,34 @@ +From 66a2b6e4ba8e2b49115043127ce4aa0fcd71ad1e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 11 May 2021 11:12:35 -0700 +Subject: [PATCH] exception_handler.cc: Match the types for SIGSTKSZ + +In glibc 2.34, SIGSTKSZ is a syscall which returns a long int, therefore +current check fails + +| ../git/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' +| 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); +| | ~~~~~~~~^~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/client/linux/handler/exception_handler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc +index ca353c40..dc0fc4a9 100644 +--- a/src/client/linux/handler/exception_handler.cc ++++ b/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ static const unsigned kSigStackSize = std::max(16384u, (unsigned)SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb index 81955f450..4756ef772 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb @@ -40,6 +40,7 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main \ file://0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch \ file://mcontext.patch \ file://0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch \ + file://0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch \ file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \ file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \ file://0001-Do-not-add-stack-pointer-to-clobber-list.patch;patchdir=src/third_party/lss \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.88.bb b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.90.bb index b6a4ae773..d34f8c98d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.88.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.90.bb @@ -5,9 +5,9 @@ AUTHOR = "Al Danial" LICENSE="GPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" -SRC_URI = "https://github.com/AlDanial/cloc/releases/download/${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "9f12f29c824ef61c5eaba6cf2dd6e183" -SRC_URI[sha256sum] = "e4e30f083bf4e4a5efbe29efa0f6cefa223ba4e841ad1337653ad1f52702dc6f" +SRC_URI = "https://github.com/AlDanial/cloc/releases/download/v${PV}/${BP}.tar.gz" +SRC_URI[md5sum] = "e2364c2c9c9eda1d20890c19911c51fb" +SRC_URI[sha256sum] = "152502a61d4bae4a406a05a01bf52489b310ec03dbd8c645d0bb051fa4717ddb" UPSTREAM_CHECK_URI = "https://github.com/AlDanial/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.8.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.8.bb deleted file mode 100644 index d006d83aa..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.8.bb +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2015 Igor Santos <igor.santos@aker.com.br> -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Exuberant Ctags" -DESCRIPTION = "Exuberant Ctags is a multilanguage reimplementation of the \ - Unix ctags utility. Ctags generates an index of source code \ - definitions which is used by numerous editors and utilities \ - to instantly locate the definitions." - -HOMEPAGE = "http://ctags.sourceforge.net/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -inherit autotools-brokensep - -SRC_URI = "http://prdownloads.sourceforge.net/${BPN}/${BP}.tar.gz" - -SRC_URI[md5sum] = "c00f82ecdcc357434731913e5b48630d" -SRC_URI[sha256sum] = "0e44b45dcabe969e0bbbb11e30c246f81abe5d32012db37395eb57d66e9e99c7" - -do_install() { - install -Dm 755 ${B}/ctags ${D}${bindir}/ctags - install -Dm 644 ${B}/ctags.1 ${D}${mandir}/man1/ctags.1 -} diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210502.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210502.0.bb new file mode 100644 index 000000000..273d6e573 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210502.0.bb @@ -0,0 +1,34 @@ +# Copyright (C) 2015 Igor Santos <igor.santos@aker.com.br> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Universal Ctags" +DESCRIPTION = "Universal Ctags is a multilanguage reimplementation of the \ + Unix ctags utility. Ctags generates an index of source code \ + definitions which is used by numerous editors and utilities \ + to instantly locate the definitions." + +HOMEPAGE = "https://ctags.io/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" + +inherit autotools-brokensep pkgconfig manpages + +SRCREV = "6df08b82d4845d1b9420d9268f24d5db16ee4480" +SRC_URI = "git://github.com/universal-ctags/ctags" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= " \ + readcmd \ + xml \ + json \ + yaml \ +" +PACKAGECONFIG[readcmd] = "--enable-readcmd,--disable-readcmd" +PACKAGECONFIG[etags] = "--enable-etags,--disable-etags" +PACKAGECONFIG[xml] = "--enable-xml,--disable-xml,libxml2" +PACKAGECONFIG[json] = "--enable-json,--disable-json,jansson" +PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" +PACKAGECONFIG[yaml] = "--enable-yaml,--disable-yaml,libyaml" +PACKAGECONFIG[manpages] = ",,python3-docutils-native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.123.bb b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.124.bb index bb4345687..300c98f91 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.123.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.124.bb @@ -10,11 +10,15 @@ SRC_URI = "\ file://0002-support-to-override-usr-bin-arch-test.patch \ " -SRC_URI[md5sum] = "b959c7ac01839e9b96a733d27b19e59e" -SRC_URI[sha256sum] = "5e5a8147ecdd6be0eea5ac4d6ed8192cc653e93f744dd3306c9b1cc51d6ca328" +SRC_URI[md5sum] = "8a5e97f60236c3a63f715c056a5f0e29" +SRC_URI[sha256sum] = "7700e9864b29f166b26c54153ed8c275b46f4b9a60468bb607e019a64c16cd8f" S = "${WORKDIR}/debootstrap" +DEPENDS = " \ + virtual/fakeroot-native \ +" + fakeroot do_install() { oe_runmake 'DESTDIR=${D}' install chown -R root:root ${D}${datadir}/debootstrap diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb index bbc2a4a1d..f4f08012b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb @@ -13,9 +13,9 @@ RDEPENDS_${PN}-dev += "${PN}-compiler" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "6df40a2471737b27271bdd9b900ab5f3aec746c7" - +SRCREV = "a9a295fecf3fbd5a4f571f53b01f63202a3e2113" SRC_URI = "git://github.com/google/flatbuffers.git" +S = "${WORKDIR}/git" CVE_CHECK_WHITELIST += "CVE-2020-35864" @@ -31,8 +31,6 @@ EXTRA_OECMAKE += "\ inherit cmake -S = "${WORKDIR}/git" - do_install_append() { install -d ${D}${PYTHON_SITEPACKAGES_DIR} cp -rf ${S}/python/flatbuffers ${D}${PYTHON_SITEPACKAGES_DIR} diff --git a/meta-openembedded/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch b/meta-openembedded/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch deleted file mode 100644 index 9957be82f..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 799eb6a3af8a3dd81e2429bf11a72a57e541f908 Mon Sep 17 00:00:00 2001 -From: "Eric S. Raymond" <esr@thyrsus.com> -Date: Sun, 17 Mar 2019 12:37:21 -0400 -Subject: [PATCH] Address SF bug #119: MemorySanitizer: FPE on unknown address - ---- - dgif_lib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Upstream-status: Backport [https://sourceforge.net/p/giflib/code/ci/799eb6a3af8a3dd81e2429bf11a72a57e541f908/] -CVE: CVE-2019-15133 - ---- a/lib/dgif_lib.c 2021-01-13 19:28:18.923493586 +0100 -+++ b/lib/dgif_lib.c 2021-01-13 19:28:55.245863085 +0100 -@@ -1099,7 +1099,7 @@ DGifSlurp(GifFileType *GifFile) - - sp = &GifFile->SavedImages[GifFile->ImageCount - 1]; - /* Allocate memory for the image */ -- if (sp->ImageDesc.Width < 0 && sp->ImageDesc.Height < 0 && -+ if (sp->ImageDesc.Width <= 0 && sp->ImageDesc.Height <= 0 && - sp->ImageDesc.Width > (INT_MAX / sp->ImageDesc.Height)) { - return GIF_ERROR; - } diff --git a/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb b/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.2.1.bb index 1871bab46..105c53eab 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.2.1.bb @@ -3,14 +3,17 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a" -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.bz2 \ - file://CVE-2019-15133.patch \ -" - CVE_PRODUCT = "giflib_project:giflib" -inherit autotools +DEPENDS = "xmlto-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.gz" +SRC_URI[sha256sum] = "31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd" + +do_install() { + # using autotools's default will end up in /usr/local + oe_runmake DESTDIR=${D} PREFIX=${prefix} LIBDIR=${libdir} install +} PACKAGES += "${PN}-utils" FILES_${PN} = "${libdir}/libgif.so.*" @@ -19,6 +22,3 @@ FILES_${PN}-utils = "${bindir}" BBCLASSEXTEND = "native" RDEPENDS_${PN}-utils = "perl" - -SRC_URI[md5sum] = "2c171ced93c0e83bb09e6ccad8e3ba2b" -SRC_URI[sha256sum] = "df27ec3ff24671f80b29e6ab1c4971059c14ac3db95406884fc26574631ba8d5" diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch new file mode 100644 index 000000000..faa18bb7f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch @@ -0,0 +1,37 @@ +From 9af185be6068d279736c0d2b2162a4e768444d3d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 29 May 2021 00:41:32 -0700 +Subject: [PATCH] gsec: Fix build on musl + +musl defines iovec struct in alltypes.h file which is included by many +system include files, therefore check for appropriate define from musl +before defining it again + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/core/tsi/alts/crypt/gsec.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/core/tsi/alts/crypt/gsec.h b/src/core/tsi/alts/crypt/gsec.h +index 4d65caa944..3c367b2895 100644 +--- a/src/core/tsi/alts/crypt/gsec.h ++++ b/src/core/tsi/alts/crypt/gsec.h +@@ -26,11 +26,14 @@ + #include <stdlib.h> + + #include <grpc/grpc.h> ++#include <sys/uio.h> + ++#if !defined(__DEFINED_struct_iovec) + struct iovec { + void* iov_base; + size_t iov_len; + }; ++#endif + + /** + * A gsec interface for AEAD encryption schemes. The API is thread-compatible. +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.36.4.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.38.0.bb index 03de4997b..2095d81d4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.36.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.38.0.bb @@ -16,8 +16,8 @@ RDEPENDS_${PN}-compiler = "${PN}" RDEPENDS_${PN}-dev += "${PN}-compiler" S = "${WORKDIR}/git" -SRCREV_grpc = "3e53dbe8213137d2c731ecd4d88ebd2948941d75" -BRANCH = "v1.36.x" +SRCREV_grpc = "54dc182082db941aa67c7c3f93ad858c99a16d7d" +BRANCH = "v1.38.x" SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ " # Fixes build with older compilers 4.8 especially on ubuntu 14.04 diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0001-track-Check-for-unw_set_caching_policy-before-using.patch b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0001-track-Check-for-unw_set_caching_policy-before-using.patch new file mode 100644 index 000000000..a6547eded --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0001-track-Check-for-unw_set_caching_policy-before-using.patch @@ -0,0 +1,41 @@ +From bcfc4c8d7dc70bd81367c183a68cc9ee02ab4744 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 28 May 2021 17:52:57 -0700 +Subject: [PATCH] track: Check for unw_set_caching_policy before using + +llvm libunwind does not implement unw_cache_* functions yet +Include inttypes.h got PRI* macros + +Upstream-Status: Submitted [https://github.com/KDE/heaptrack/pull/33] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/track/trace_libunwind.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/track/trace_libunwind.cpp b/src/track/trace_libunwind.cpp +index c76337c..96b2176 100644 +--- a/src/track/trace_libunwind.cpp ++++ b/src/track/trace_libunwind.cpp +@@ -26,6 +26,7 @@ + + #define UNW_LOCAL_ONLY + #include <libunwind.h> ++#include <inttypes.h> + + #include <stdio.h> + +@@ -60,9 +61,11 @@ void Trace::print() + void Trace::setup() + { + // configure libunwind for better speed ++#if UNW_CACHE_PER_THREAD + if (unw_set_caching_policy(unw_local_addr_space, UNW_CACHE_PER_THREAD)) { + fprintf(stderr, "WARNING: Failed to enable per-thread libunwind caching.\n"); + } ++#endif + #if LIBUNWIND_HAS_UNW_SET_CACHE_SIZE + if (unw_set_cache_size(unw_local_addr_space, 1024, 0)) { + fprintf(stderr, "WARNING: Failed to set libunwind cache size.\n"); +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb index f2235afef..207c45284 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/KDE/heaptrack.git;protocol=https \ file://0002-heaptrack_inject-Include-dlfcn.h-for-dlopen-dlclose.patch \ file://0003-heaptrack_preload-Make-noexcept-attribute-conditiona.patch \ file://0004-backtrace-Always-include-stdint.h.patch \ + file://0001-track-Check-for-unw_set_caching_policy-before-using.patch \ " SRCREV = "bc9e3744bcc47de978673d1e382f4125a1ab5fa8" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.2.bb index 77e080c8b..0ee02d685 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.2.bb @@ -6,7 +6,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bd4d7ab13df98988b1ca2a4e01c8c163" SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz" -SRC_URI[sha256sum] = "8836939804ef6d492bcee7d54abafd6477d2beca247157d92688654d13779727" +SRC_URI[sha256sum] = "5c19bea8b84e8d74cca5f047e82b147ff3fba096144270e3911ad623d6c587bf" RDEPENDS_${PN} += "bash perl libxml2" @@ -31,6 +31,8 @@ PACKAGECONFIG += " \ " PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--without-x,virtual/libx11" +LDFLAGS_append_x86-64 = " -lgcc" + inherit autotools gettext pkgconfig do_configure() { diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch index 4dd121f48..d6e439ba2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch @@ -1,4 +1,4 @@ -From c2aff16cc196a61f4ab1cdae4a91c7926123c239 Mon Sep 17 00:00:00 2001 +From 7d94bfe53beeb2d25eb5f2ff6b1d509df7e6ab80 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova <zsvetlik@redhat.com> Date: Thu, 27 Apr 2017 14:25:42 +0200 Subject: [PATCH] Disable running gyp on shared deps @@ -8,18 +8,15 @@ Subject: [PATCH] Disable running gyp on shared deps 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 0947300f24..6c98691984 100644 +index 93d63110..79caaec2 100644 --- a/Makefile +++ b/Makefile -@@ -141,7 +141,7 @@ test-code-cache: with-code-cache - echo "'test-code-cache' target is a noop" +@@ -138,7 +138,7 @@ with-code-cache test-code-cache: + $(warning '$@' target is a noop) out/Makefile: config.gypi common.gypi node.gyp \ -- deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \ -+ deps/http_parser/http_parser.gyp \ +- deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \ ++ deps/llhttp/llhttp.gyp \ tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp $(PYTHON) tools/gyp_node.py -f make --- -2.20.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch deleted file mode 100644 index a23f1c243..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch +++ /dev/null @@ -1,53 +0,0 @@ -From be8d3cd6eab4b8f9849133060abb1aba4400276b Mon Sep 17 00:00:00 2001 -From: Amy Huang <akhuang@google.com> -Date: Thu, 23 Apr 2020 11:25:53 -0700 -Subject: [PATCH] Remove use of register r7 because llvm now issues an error - when "r7" is used (starting in commit d85b3877) - -Bug: chromium:1073270 -Change-Id: I7ec8112f170b98d2edaf92bc9341e738f8de07a3 -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2163435 -Reviewed-by: Nico Weber <thakis@chromium.org> -Reviewed-by: Ross McIlroy <rmcilroy@chromium.org> -Commit-Queue: Nico Weber <thakis@chromium.org> -Cr-Commit-Position: refs/heads/master@{#67371} -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Backport [https://chromium.googlesource.com/v8/v8/+/00604cd2806b5d26bef592dd19989a234bd07a4b%5E%21/] - deps/v8/src/codegen/arm/cpu-arm.cc | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/deps/v8/src/codegen/arm/cpu-arm.cc b/deps/v8/src/codegen/arm/cpu-arm.cc -index 868f360..654d68f 100644 ---- a/deps/v8/src/codegen/arm/cpu-arm.cc -+++ b/deps/v8/src/codegen/arm/cpu-arm.cc -@@ -30,18 +30,6 @@ V8_NOINLINE void CpuFeatures::FlushICache(void* start, size_t size) { - register uint32_t end asm("r1") = beg + size; - register uint32_t flg asm("r2") = 0; - --#ifdef __clang__ -- // This variant of the asm avoids a constant pool entry, which can be -- // problematic when LTO'ing. It is also slightly shorter. -- register uint32_t scno asm("r7") = __ARM_NR_cacheflush; -- -- asm volatile("svc 0\n" -- : -- : "r"(beg), "r"(end), "r"(flg), "r"(scno) -- : "memory"); --#else -- // Use a different variant of the asm with GCC because some versions doesn't -- // support r7 as an asm input. - asm volatile( - // This assembly works for both ARM and Thumb targets. - -@@ -59,7 +47,6 @@ V8_NOINLINE void CpuFeatures::FlushICache(void* start, size_t size) { - : "r"(beg), "r"(end), "r"(flg), [scno] "i"(__ARM_NR_cacheflush) - : "memory"); - #endif --#endif - #endif // !USE_SIMULATOR - } - --- -2.29.2 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-binaries.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-binaries.patch index b5142dc9c..c6fc2dcd7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-binaries.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-binaries.patch @@ -8,64 +8,55 @@ Subject: [PATCH] Using native binaries tools/v8_gypfiles/v8.gyp | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) -diff --git a/node.gyp b/node.gyp -index 8f4dc518..d9389190 100644 --- a/node.gyp +++ b/node.gyp -@@ -446,7 +446,7 @@ - '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc', +@@ -487,6 +487,7 @@ + 'action_name': 'run_mkcodecache', + 'process_outputs_as_sources': 1, + 'inputs': [ ++ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh', + '<(mkcodecache_exec)', ], - 'action': [ -- '<@(_inputs)', -+ 'mkcodecache', - '<@(_outputs)', + 'outputs': [ +@@ -512,6 +513,7 @@ + 'action_name': 'node_mksnapshot', + 'process_outputs_as_sources': 1, + 'inputs': [ ++ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh', + '<(node_mksnapshot_exec)', ], - }, -@@ -471,7 +471,7 @@ - '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', - ], - 'action': [ -- '<@(_inputs)', -+ 'node_mksnapshot', - '<@(_outputs)', - ], - }, -diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp -index a506a67d..c91f7dde 100644 + 'outputs': [ --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp -@@ -140,7 +140,8 @@ - '<@(torque_outputs)', - ], - 'action': [ -- '<@(_inputs)', -+ 'torque', -+ '<@(torque_files)', - '-o', '<(torque_output_root)/torque-generated', - '-v8-root', '<(V8_ROOT)' +@@ -220,6 +220,7 @@ + { + 'action_name': 'run_torque_action', + 'inputs': [ # Order matters. ++ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh', + '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)', + '<@(torque_files)', ], -@@ -247,9 +248,7 @@ - '<(generate_bytecode_builtins_list_output)', +@@ -351,6 +352,7 @@ + { + 'action_name': 'generate_bytecode_builtins_list_action', + 'inputs': [ ++ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh', + '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)bytecode_builtins_list_generator<(EXECUTABLE_SUFFIX)', ], - 'action': [ -- 'python', -- '<(V8_ROOT)/tools/run.py', -- '<@(_inputs)', -+ 'bytecode_builtins_list_generator', - '<@(_outputs)', + 'outputs': [ +@@ -533,6 +535,7 @@ + ], + }, + 'inputs': [ ++ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh', + '<(mksnapshot_exec)', ], - }, -@@ -1396,9 +1395,7 @@ - '<(SHARED_INTERMEDIATE_DIR)/src/regexp/special-case.cc', + 'outputs': [ +@@ -1448,6 +1451,7 @@ + { + 'action_name': 'run_gen-regexp-special-case_action', + 'inputs': [ ++ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh', + '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)gen-regexp-special-case<(EXECUTABLE_SUFFIX)', ], - 'action': [ -- 'python', -- '<(V8_ROOT)/tools/run.py', -- '<@(_inputs)', -+ 'gen-regexp-special-case', - '<@(_outputs)', - ], - }, --- -2.20.1 - + 'outputs': [ diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch index 92386fa77..622392099 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch @@ -1,28 +1,31 @@ -From 5bfeffdf4b5de1c60a2ff0d1ddf65db2bb9a1533 Mon Sep 17 00:00:00 2001 +From 5b22fac923d1ca3e9fefb97f5a171124a88f5e22 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade <quantum.analyst@gmail.com> Date: Tue, 19 Mar 2019 23:22:40 -0400 -Subject: [PATCH 3/3] Install both binaries and use libdir. +Subject: [PATCH] Install both binaries and use libdir. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit This allows us to build with a shared library for other users while still providing the normal executable. -Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com> - -Stolen from [1] - -[1] https://src.fedoraproject.org/rpms/nodejs/raw/master/f/0003-Install-both-binaries-and-use-libdir.patch +Taken from - https://src.fedoraproject.org/rpms/nodejs/raw/rawhide/f/0002-Install-both-binaries-and-use-libdir.patch Upstream-Status: Pending +Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- configure.py | 7 +++++++ - tools/install.py | 31 ++++++++++++++----------------- - 2 files changed, 21 insertions(+), 17 deletions(-) + tools/install.py | 21 +++++++++------------ + 2 files changed, 16 insertions(+), 12 deletions(-) +diff --git a/configure.py b/configure.py +index e6f7e4db..6cf5c45d 100755 --- a/configure.py +++ b/configure.py -@@ -602,6 +602,12 @@ parser.add_option('--shared', +@@ -626,6 +626,12 @@ parser.add_option('--shared', help='compile shared library for embedding node in another project. ' + '(This mode is not officially supported for regular applications)') @@ -35,7 +38,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> parser.add_option('--without-v8-platform', action='store_true', dest='without_v8_platform', -@@ -1168,6 +1174,7 @@ def configure_node(o): +@@ -1202,6 +1208,7 @@ def configure_node(o): o['variables']['node_no_browser_globals'] = b(options.no_browser_globals) o['variables']['node_shared'] = b(options.shared) @@ -43,9 +46,11 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> node_module_version = getmoduleversion.get_version() if options.dest_os == 'android': +diff --git a/tools/install.py b/tools/install.py +index 729b416f..9bfc6234 100755 --- a/tools/install.py +++ b/tools/install.py -@@ -121,26 +121,23 @@ def subdir_files(path, dest, action): +@@ -121,22 +121,19 @@ def subdir_files(path, dest, action): def files(action): is_windows = sys.platform == 'win32' @@ -64,16 +69,8 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> - output_file += '.dll' - else: - output_file = 'lib' + output_file + '.' + variables.get('shlib_suffix') -- # GYP will output to lib.target except on OS X, this is hardcoded -- # in its source - see the _InstallableTargetInstallPath function. -- if sys.platform != 'darwin': -- output_prefix += 'lib.target/' + output_bin = 'node' + output_lib = 'libnode.' + variables.get('shlib_suffix') -+ # GYP will output to lib.target except on OS X, this is hardcoded -+ # in its source - see the _InstallableTargetInstallPath function. -+ if sys.platform != 'darwin': -+ output_libprefix += 'lib.target/' - if 'false' == variables.get('node_shared'): - action([output_prefix + output_file], 'bin/' + output_file) diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch new file mode 100644 index 000000000..cdf6bc8e2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch @@ -0,0 +1,21 @@ +Link mksnapshot with libatomic on x86 + +Clang-12 on x86 emits atomic builtins + +Fixes +| module-compiler.cc:(.text._ZN2v88internal4wasm12_GLOBAL__N_123ExecuteCompilationUnitsERKSt10shared_ptrINS2_22BackgroundCompileTokenEEPNS0_8CountersEiNS2_19CompileBaselineOnlyE+0x558): un +defined reference to `__atomic_load' + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/tools/v8_gypfiles/v8.gyp ++++ b/tools/v8_gypfiles/v8.gyp +@@ -1336,6 +1336,7 @@ + { + 'target_name': 'mksnapshot', + 'type': 'executable', ++ 'libraries': [ '-latomic' ], + 'dependencies': [ + 'v8_base_without_compiler', + 'v8_compiler_for_mksnapshot', diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/mips-less-memory.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/mips-less-memory.patch new file mode 100644 index 000000000..56e93c50c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/mips-less-memory.patch @@ -0,0 +1,32 @@ +Description: mksnapshot uses too much memory on 32-bit mipsel +Author: Jérémy Lal <kapouer@melix.org> +Last-Update: 2020-06-03 +Forwarded: https://bugs.chromium.org/p/v8/issues/detail?id=10586 + +This ensures that we reserve 500M instead of 2G range for codegen +ensures that qemu-mips can allocate such large ranges + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/deps/v8/src/common/globals.h ++++ b/deps/v8/src/common/globals.h +@@ -224,7 +224,7 @@ constexpr size_t kMinimumCodeRangeSize = + constexpr size_t kMinExpectedOSPageSize = 64 * KB; // OS page on PPC Linux + #elif V8_TARGET_ARCH_MIPS + constexpr bool kPlatformRequiresCodeRange = false; +-constexpr size_t kMaximalCodeRangeSize = 2048LL * MB; ++constexpr size_t kMaximalCodeRangeSize = 512 * MB; + constexpr size_t kMinimumCodeRangeSize = 0 * MB; + constexpr size_t kMinExpectedOSPageSize = 4 * KB; // OS page. + #else +--- a/deps/v8/src/codegen/mips/constants-mips.h ++++ b/deps/v8/src/codegen/mips/constants-mips.h +@@ -140,7 +140,7 @@ const uint32_t kLeastSignificantByteInIn + namespace v8 { + namespace internal { + +-constexpr size_t kMaxPCRelativeCodeRangeInMB = 4096; ++constexpr size_t kMaxPCRelativeCodeRangeInMB = 1024; + + // ----------------------------------------------------------------------------- + // Registers and FPURegisters. diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/v8-call-new-ListFormatter-createInstance.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/v8-call-new-ListFormatter-createInstance.patch new file mode 100644 index 000000000..806360084 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/v8-call-new-ListFormatter-createInstance.patch @@ -0,0 +1,93 @@ +From 035c305ce7761f51328b45f1bd83e26aef267c9d Mon Sep 17 00:00:00 2001 +From: Frank Tang <ftang@chromium.org> +Date: Thu, 15 Oct 2020 22:44:27 -0700 +Subject: [PATCH] [Intl] call new ListFormatter::createInstance + +The one we currently using is now marked as internal and to be removed +for 68. Migrating to the style which already avaiable in ICU 67-1. + +Upstream-Status: Backport +Bug: v8:11031 +Change-Id: I668382a2e1b8602ddca02bf231c5008a6c92bf2d +Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477751 +Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> +Commit-Queue: Frank Tang <ftang@chromium.org> +Cr-Commit-Position: refs/heads/master@{#70638} +--- + deps/v8/src/objects/js-list-format.cc | 55 ++++++++++++----------------------- + 1 file changed, 18 insertions(+), 37 deletions(-) + +--- a/deps/v8/src/objects/js-list-format.cc ++++ b/deps/v8/src/objects/js-list-format.cc +@@ -29,46 +29,27 @@ namespace v8 { + namespace internal { + + namespace { +-const char* kStandard = "standard"; +-const char* kOr = "or"; +-const char* kUnit = "unit"; +-const char* kStandardShort = "standard-short"; +-const char* kOrShort = "or-short"; +-const char* kUnitShort = "unit-short"; +-const char* kStandardNarrow = "standard-narrow"; +-const char* kOrNarrow = "or-narrow"; +-const char* kUnitNarrow = "unit-narrow"; + +-const char* GetIcuStyleString(JSListFormat::Style style, +- JSListFormat::Type type) { ++UListFormatterWidth GetIcuWidth(JSListFormat::Style style) { ++ switch (style) { ++ case JSListFormat::Style::LONG: ++ return ULISTFMT_WIDTH_WIDE; ++ case JSListFormat::Style::SHORT: ++ return ULISTFMT_WIDTH_SHORT; ++ case JSListFormat::Style::NARROW: ++ return ULISTFMT_WIDTH_NARROW; ++ } ++ UNREACHABLE(); ++} ++ ++UListFormatterType GetIcuType(JSListFormat::Type type) { + switch (type) { + case JSListFormat::Type::CONJUNCTION: +- switch (style) { +- case JSListFormat::Style::LONG: +- return kStandard; +- case JSListFormat::Style::SHORT: +- return kStandardShort; +- case JSListFormat::Style::NARROW: +- return kStandardNarrow; +- } ++ return ULISTFMT_TYPE_AND; + case JSListFormat::Type::DISJUNCTION: +- switch (style) { +- case JSListFormat::Style::LONG: +- return kOr; +- case JSListFormat::Style::SHORT: +- return kOrShort; +- case JSListFormat::Style::NARROW: +- return kOrNarrow; +- } ++ return ULISTFMT_TYPE_OR; + case JSListFormat::Type::UNIT: +- switch (style) { +- case JSListFormat::Style::LONG: +- return kUnit; +- case JSListFormat::Style::SHORT: +- return kUnitShort; +- case JSListFormat::Style::NARROW: +- return kUnitNarrow; +- } ++ return ULISTFMT_TYPE_UNITS; + } + UNREACHABLE(); + } +@@ -143,7 +124,7 @@ MaybeHandle<JSListFormat> JSListFormat:: + icu::Locale icu_locale = r.icu_locale; + UErrorCode status = U_ZERO_ERROR; + icu::ListFormatter* formatter = icu::ListFormatter::createInstance( +- icu_locale, GetIcuStyleString(style_enum, type_enum), status); ++ icu_locale, GetIcuType(type_enum), GetIcuWidth(style_enum), status); + if (U_FAILURE(status) || formatter == nullptr) { + delete formatter; + THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError), diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.21.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_14.16.1.bb index 9b86bf337..48bf2f4a8 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.21.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_14.16.1.bb @@ -1,12 +1,12 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" LICENSE = "MIT & BSD & Artistic-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8c66ff8861d9f96076a7cb61e3d75f54" +LIC_FILES_CHKSUM = "file://LICENSE;md5=85bf260d8b6de1588f57abc5dc66587c" DEPENDS = "openssl" -DEPENDS_append_class-target = " nodejs-native" +DEPENDS_append_class-target = " qemu-native" -inherit pkgconfig python3native +inherit pkgconfig python3native qemu COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" @@ -21,12 +21,16 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0004-v8-don-t-override-ARM-CFLAGS.patch \ file://big-endian.patch \ file://mips-warnings.patch \ - file://0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch \ + file://v8-call-new-ListFormatter-createInstance.patch \ + file://mips-less-memory.patch \ " SRC_URI_append_class-target = " \ file://0002-Using-native-binaries.patch \ " -SRC_URI[sha256sum] = "052f37ace6f569b513b5a1154b2a45d3c4d8b07d7d7c807b79f1566db61e979d" +SRC_URI_append_toolchain-clang_x86 = " \ + file://libatomic.patch \ + " +SRC_URI[sha256sum] = "e44adbbed6756c2c1a01258383e9f00df30c147b36e438f6369b5ef1069abac3" S = "${WORKDIR}/node-v${PV}" @@ -93,12 +97,43 @@ python do_unpack() { shutil.rmtree(d.getVar('S') + '/deps/zlib', True) } +# V8's JIT infrastructure requires binaries such as mksnapshot and +# mkpeephole to be run in the host during the build. However, these +# binaries must have the same bit-width as the target (e.g. a x86_64 +# host targeting ARMv6 needs to produce a 32-bit binary). Instead of +# depending on a third Yocto toolchain, we just build those binaries +# for the target and run them on the host with QEMU. +python do_create_v8_qemu_wrapper () { + """Creates a small wrapper that invokes QEMU to run some target V8 binaries + on the host.""" + qemu_libdirs = [d.expand('${STAGING_DIR_HOST}${libdir}'), + d.expand('${STAGING_DIR_HOST}${base_libdir}')] + qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST', True), + qemu_libdirs) + wrapper_path = d.expand('${B}/v8-qemu-wrapper.sh') + with open(wrapper_path, 'w') as wrapper_file: + wrapper_file.write("""#!/bin/sh + +# This file has been generated automatically. +# It invokes QEMU to run binaries built for the target in the host during the +# build process. + +%s "$@" +""" % qemu_cmd) + os.chmod(wrapper_path, 0o755) +} + +do_create_v8_qemu_wrapper[dirs] = "${B}" +addtask create_v8_qemu_wrapper after do_configure before do_compile + +LDFLAGS_append_x86 = " -latomic" + # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi do_configure () { export LD="${CXX}" GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES # $TARGET_ARCH settings don't match --dest-cpu settings - python3 configure.py --prefix=${prefix} --cross-compiling --without-snapshot --shared-openssl \ + python3 configure.py --prefix=${prefix} --cross-compiling --shared-openssl \ --without-dtrace \ --without-etw \ --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ @@ -110,6 +145,7 @@ do_configure () { do_compile () { export LD="${CXX}" + install -Dm 0755 ${B}/v8-qemu-wrapper.sh ${B}/out/Release/v8-qemu-wrapper.sh oe_runmake BUILDTYPE=Release } diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/CVE-2020-7069.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/CVE-2020-7069.patch deleted file mode 100644 index 0cf4d5ed6..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/CVE-2020-7069.patch +++ /dev/null @@ -1,158 +0,0 @@ -Subject: Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption - for a 12 bytes IV) - ---- - ext/openssl/openssl.c | 10 ++++----- - ext/openssl/tests/cipher_tests.inc | 21 +++++++++++++++++ - ext/openssl/tests/openssl_decrypt_ccm.phpt | 22 +++++++++++------- - ext/openssl/tests/openssl_encrypt_ccm.phpt | 26 ++++++++++++++-------- - 4 files changed, 57 insertions(+), 22 deletions(-) - -diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c -index 04cb9b0f..fdad2c3b 100644 ---- a/ext/openssl/openssl.c -+++ b/ext/openssl/openssl.c -@@ -6521,11 +6521,6 @@ static int php_openssl_validate_iv(char **piv, size_t *piv_len, size_t iv_requir - { - char *iv_new; - -- /* Best case scenario, user behaved */ -- if (*piv_len == iv_required_len) { -- return SUCCESS; -- } -- - if (mode->is_aead) { - if (EVP_CIPHER_CTX_ctrl(cipher_ctx, mode->aead_ivlen_flag, *piv_len, NULL) != 1) { - php_error_docref(NULL, E_WARNING, "Setting of IV length for AEAD mode failed"); -@@ -6534,6 +6529,11 @@ static int php_openssl_validate_iv(char **piv, size_t *piv_len, size_t iv_requir - return SUCCESS; - } - -+ /* Best case scenario, user behaved */ -+ if (*piv_len == iv_required_len) { -+ return SUCCESS; -+ } -+ - iv_new = ecalloc(1, iv_required_len + 1); - - if (*piv_len == 0) { -diff --git a/ext/openssl/tests/cipher_tests.inc b/ext/openssl/tests/cipher_tests.inc -index b1e46b41..779bfa85 100644 ---- a/ext/openssl/tests/cipher_tests.inc -+++ b/ext/openssl/tests/cipher_tests.inc -@@ -1,5 +1,26 @@ - <?php - $php_openssl_cipher_tests = array( -+ 'aes-128-ccm' => array( -+ array( -+ 'key' => '404142434445464748494a4b4c4d4e4f', -+ 'iv' => '1011121314151617', -+ 'aad' => '000102030405060708090a0b0c0d0e0f', -+ 'tag' => '1fc64fbfaccd', -+ 'pt' => '202122232425262728292a2b2c2d2e2f', -+ 'ct' => 'd2a1f0e051ea5f62081a7792073d593d', -+ ), -+ array( -+ 'key' => '404142434445464748494a4b4c4d4e4f', -+ 'iv' => '101112131415161718191a1b', -+ 'aad' => '000102030405060708090a0b0c0d0e0f' . -+ '10111213', -+ 'tag' => '484392fbc1b09951', -+ 'pt' => '202122232425262728292a2b2c2d2e2f' . -+ '3031323334353637', -+ 'ct' => 'e3b201a9f5b71a7a9b1ceaeccd97e70b' . -+ '6176aad9a4428aa5', -+ ), -+ ), - 'aes-256-ccm' => array( - array( - 'key' => '1bde3251d41a8b5ea013c195ae128b21' . -diff --git a/ext/openssl/tests/openssl_decrypt_ccm.phpt b/ext/openssl/tests/openssl_decrypt_ccm.phpt -index a5f01b87..08ef5bb7 100644 ---- a/ext/openssl/tests/openssl_decrypt_ccm.phpt -+++ b/ext/openssl/tests/openssl_decrypt_ccm.phpt -@@ -10,14 +10,16 @@ if (!in_array('aes-256-ccm', openssl_get_cipher_methods())) - --FILE-- - <?php - require_once __DIR__ . "/cipher_tests.inc"; --$method = 'aes-256-ccm'; --$tests = openssl_get_cipher_tests($method); -+$methods = ['aes-128-ccm', 'aes-256-ccm']; - --foreach ($tests as $idx => $test) { -- echo "TEST $idx\n"; -- $pt = openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA, -- $test['iv'], $test['tag'], $test['aad']); -- var_dump($test['pt'] === $pt); -+foreach ($methods as $method) { -+ $tests = openssl_get_cipher_tests($method); -+ foreach ($tests as $idx => $test) { -+ echo "$method - TEST $idx\n"; -+ $pt = openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA, -+ $test['iv'], $test['tag'], $test['aad']); -+ var_dump($test['pt'] === $pt); -+ } - } - - // no IV -@@ -32,7 +34,11 @@ var_dump(openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA, - - ?> - --EXPECTF-- --TEST 0 -+aes-128-ccm - TEST 0 -+bool(true) -+aes-128-ccm - TEST 1 -+bool(true) -+aes-256-ccm - TEST 0 - bool(true) - - Warning: openssl_decrypt(): Setting of IV length for AEAD mode failed in %s on line %d -diff --git a/ext/openssl/tests/openssl_encrypt_ccm.phpt b/ext/openssl/tests/openssl_encrypt_ccm.phpt -index fb5dbbc8..8c4c41f8 100644 ---- a/ext/openssl/tests/openssl_encrypt_ccm.phpt -+++ b/ext/openssl/tests/openssl_encrypt_ccm.phpt -@@ -10,15 +10,17 @@ if (!in_array('aes-256-ccm', openssl_get_cipher_methods())) - --FILE-- - <?php - require_once __DIR__ . "/cipher_tests.inc"; --$method = 'aes-256-ccm'; --$tests = openssl_get_cipher_tests($method); -+$methods = ['aes-128-ccm', 'aes-256-ccm']; - --foreach ($tests as $idx => $test) { -- echo "TEST $idx\n"; -- $ct = openssl_encrypt($test['pt'], $method, $test['key'], OPENSSL_RAW_DATA, -- $test['iv'], $tag, $test['aad'], strlen($test['tag'])); -- var_dump($test['ct'] === $ct); -- var_dump($test['tag'] === $tag); -+foreach ($methods as $method) { -+ $tests = openssl_get_cipher_tests($method); -+ foreach ($tests as $idx => $test) { -+ echo "$method - TEST $idx\n"; -+ $ct = openssl_encrypt($test['pt'], $method, $test['key'], OPENSSL_RAW_DATA, -+ $test['iv'], $tag, $test['aad'], strlen($test['tag'])); -+ var_dump($test['ct'] === $ct); -+ var_dump($test['tag'] === $tag); -+ } - } - - // Empty IV error -@@ -32,7 +34,13 @@ var_dump(strlen($tag)); - var_dump(openssl_encrypt('data', $method, 'password', 0, str_repeat('x', 16), $tag, '', 1024)); - ?> - --EXPECTF-- --TEST 0 -+aes-128-ccm - TEST 0 -+bool(true) -+bool(true) -+aes-128-ccm - TEST 1 -+bool(true) -+bool(true) -+aes-256-ccm - TEST 0 - bool(true) - bool(true) - --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/CVE-2020-7070.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/CVE-2020-7070.patch deleted file mode 100644 index e5b527f98..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/CVE-2020-7070.patch +++ /dev/null @@ -1,24 +0,0 @@ -Subject: Patch fix-urldecode for HTTP related Bug #79699 - ---- - main/php_variables.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/main/php_variables.c b/main/php_variables.c -index 1a40c2a1..cbdc7cf1 100644 ---- a/main/php_variables.c -+++ b/main/php_variables.c -@@ -514,7 +514,9 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) - } - - val = estrndup(val, val_len); -- php_url_decode(var, strlen(var)); -+ if (arg != PARSE_COOKIE) { -+ php_url_decode(var, strlen(var)); -+ } - if (sapi_module.input_filter(arg, var, &val, val_len, &new_val_len)) { - php_register_variable_safe(var, val, new_val_len, &array); - } --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.16.bb index e19d5dd21..821d9cd04 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.16.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.php.net" SECTION = "console/network" LICENSE = "PHP-3.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7e571b888d585b31f9ef5edcc647fa30" +LIC_FILES_CHKSUM = "file://LICENSE;md5=99532e0f6620bc9bca34f12fadaee33c" BBCLASSEXTEND = "native" DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native" @@ -30,13 +30,10 @@ SRC_URI_append_class-target = " \ file://phar-makefile.patch \ file://0001-opcache-config.m4-enable-opcache.patch \ file://xfail_two_bug_tests.patch \ - file://CVE-2020-7070.patch \ - file://CVE-2020-7069.patch \ " S = "${WORKDIR}/php-${PV}" -SRC_URI[md5sum] = "e68a66c54b080d108831f6dc2e1e403d" -SRC_URI[sha256sum] = "2e270958a4216480da7886743438ccc92b6acf32ea96fefda88d07e0a5095deb" +SRC_URI[sha256sum] = "85710f007cfd0fae94e13a02a3a036f4e81ef43693260cae8a2e1ca93659ce3e" inherit autotools pkgconfig python3native gettext diff --git a/meta-openembedded/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch b/meta-openembedded/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch new file mode 100644 index 000000000..3bd041a0e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch @@ -0,0 +1,43 @@ +From cef3fc90f02ef4fc49515745194bac3d81a2265b Mon Sep 17 00:00:00 2001 +From: "Jose E. Marchesi" <jose.marchesi@oracle.com> +Date: Fri, 30 Apr 2021 13:17:05 +0200 +Subject: [PATCH] build: do not check for Tcl/Tk if --disable-gui is specified + +2021-04-30 Jose E. Marchesi <jemarch@gnu.org> + + * configure.ac: Do not check for tcl/tk if --disable-gui is + specified at configure time. + +(cherry picked from commit 280a5e154287e43c0a40d9530a9cc658a7367a9c) +[Romain: remove Changelog entry] +Signed-off-by: Romain Naour <romain.naour@gmail.com> +--- + configure.ac | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c7205513..c2f0760a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -214,12 +214,15 @@ fi + dnl The GUI is optional, and depends on the availability of Tcl and + dnl Tk. + +-POKE_TCLTK +- + AC_ARG_ENABLE([gui], + AS_HELP_STRING([--enable-gui], + [Enable the GUI (default is YES)]), +- [gui_enabled=$enableval], [gui_enabled=$has_tcltk]) ++ [gui_enabled=$enableval], [gui_enabled=yes]) ++ ++if test "x$gui_enabled" = "xyes"; then ++ POKE_TCLTK ++ gui_enabled=$has_tcltk ++fi + + AM_CONDITIONAL([GUI], [test "x$gui_enabled" = "xyes"]) + +-- +2.30.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch b/meta-openembedded/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch new file mode 100644 index 000000000..fa55f817f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch @@ -0,0 +1,45 @@ +From c37419e459bd5863534719fa50755174d0912e6d Mon Sep 17 00:00:00 2001 +From: Romain Naour <romain.naour@gmail.com> +Date: Fri, 30 Apr 2021 14:32:21 +0200 +Subject: [PATCH] jitter: jitter-config.in: avoit host poisoning while + cross-compiling + +When jitter is bundled into another project (poke), jitter-config --cppflags +return an unsafe path "-I /usr/include". + +In the context of Buildroot, such configuration script woulf be "fixed" +after installation. But jitter-config is not installed by poke since it's +build as static library and liked to poke. + +For now, patch jitter-config.in instead of jitter-config.in.m4sh since +there is an issue while converting the M4sh m4sh script ( .in.m4sh ) +into a portable shell script ( .in ) ready to be processed by aclocal +for @-substitutions. + +[1] https://git.buildroot.net/buildroot/tree/package/pkg-generic.mk?h=2021.02.1#n291 + +Signed-off-by: Romain Naour <romain.naour@gmail.com> +--- + jitter/bin/jitter-config.in | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/jitter/bin/jitter-config.in b/jitter/bin/jitter-config.in +index 5e124f0..af0ac9d 100644 +--- a/jitter/bin/jitter-config.in ++++ b/jitter/bin/jitter-config.in +@@ -998,11 +998,7 @@ while test "$#" != "0"; do + append_to_output cflags;; + --cppflags) + no_option_argument +- append_to_output cppflags +- # Append a -I argument. This is defined separately from the rest, +- # as the installation prefix can be decided very late, at Jitter +- # installation time. +- output="$output -I $includedir";; ++ append_to_output cppflags;; + --ldadd) + no_option_argument + append_to_output ldadd;; +-- +2.30.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch b/meta-openembedded/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch new file mode 100644 index 000000000..f217c917f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch @@ -0,0 +1,34 @@ +From 8ba76a5a7ce311f67890199c5595bc1f626495ad Mon Sep 17 00:00:00 2001 +From: Romain Naour <romain.naour@gmail.com> +Date: Fri, 30 Apr 2021 15:43:59 +0200 +Subject: [PATCH] configure.ac: HELP2MAN replace ':' by 'true' when + cross-compiling + +Avoid: +/usr/bin/make ./../poke/poke +../run \ + : -p poke --name="The GNU extensible binary editor" \ + ./../poke/poke -o ./poke.1 +../run: line 51: exec: :: not found + +Signed-off-by: Romain Naour <romain.naour@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c2f0760a..93769ef9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -74,7 +74,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) + if test $cross_compiling = no; then + AM_MISSING_PROG(HELP2MAN, help2man) + else +- HELP2MAN=: ++ HELP2MAN=true + fi + + dnl recfix is part of the GNU recutils suite, and is used in cfg.mk to +-- +2.30.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/poke/poke_1.2.bb b/meta-openembedded/meta-oe/recipes-devtools/poke/poke_1.2.bb new file mode 100644 index 000000000..dd118a0aa --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/poke/poke_1.2.bb @@ -0,0 +1,32 @@ +SUMMARY = "GNU poke is an extensible editor for structured binary data" +HOMEPAGE = "https://pokology.org" +DESCRIPTION = "GNU poke is an interactive, extensible editor for binary data. Not limited to editing basic entities such as bits and bytes, it provides a full-fledged procedural, interactive programming language designed to describe data structures and to operate on them." +SECTION = "console/utils" +LICENSE = "GPL-3.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${GNU_MIRROR}/poke/poke-${PV}.tar.gz \ + file://0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch \ + file://0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch \ + file://0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch \ + " + +DEPENDS = "flex-native bison-native bdwgc readline" + +SRC_URI[sha256sum] = "f61cf8da5b64c01a1359373725aad1ca257f35c1c9269e4d50dd0664183ddf62" + +# poke does not support using out-of-tree builds +inherit autotools-brokensep gettext pkgconfig + +# The automatic m4 path detection gets confused, so force the right value from +# the poke bootstrap script. +acpaths = "-I ./m4" + +EXTRA_OECONF = "--disable-gui \ + --disable-libnbd \ + --with-libreadline-prefix=${STAGING_INCDIR} \ + " + +PACKAGECONFIG[mi] = "--enable-mi,--disable-mi,json-c" + +FILES_${PN} += "${datadir}/emacs/site-lisp" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.15.2.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.17.0.bb index 0392f9339..81af2d50f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.15.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.17.0.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" -SRCREV = "d7e943b8d2bc444a8c770644e73d090b486f8b37" +SRCREV = "652d99a8ee8aa6b801e11977951fbf444cfccc8f" SRC_URI = "git://github.com/protocolbuffers/protobuf.git \ file://run-ptest \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb index b564e1260..34fca8189 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb @@ -28,6 +28,8 @@ SRC_URI[sha256sum] = "63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30 S = "${WORKDIR}/${BPN}${PV}/unix" +PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${BPN}${PV}" + # Short version format: "8.6" VER = "${@os.path.splitext(d.getVar('PV'))[0]}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace/0001-Fix-error-on-aarch64-with-binutils2.35.1.patch b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace/0001-Fix-error-on-aarch64-with-binutils2.35.1.patch deleted file mode 100644 index ac17cf433..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace/0001-Fix-error-on-aarch64-with-binutils2.35.1.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0bc502989822506af308a559ac1cd52af82cac03 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Wed, 14 Apr 2021 09:35:35 +0900 -Subject: [PATCH] Fix error on aarch64 with binutils2.35.1. - -WARN: child terminated by signal: 11: Segmentation fault - -Upstream-status: Pending - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - arch/aarch64/mcount-arch.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/aarch64/mcount-arch.h b/arch/aarch64/mcount-arch.h -index 69efe521..60c2c1ba 100644 ---- a/arch/aarch64/mcount-arch.h -+++ b/arch/aarch64/mcount-arch.h -@@ -31,7 +31,7 @@ struct mcount_arch_context { - double d[ARCH_MAX_FLOAT_REGS]; - }; - --#define ARCH_PLT0_SIZE 32 -+#define ARCH_PLT0_SIZE 16 - #define ARCH_PLTHOOK_ADDR_OFFSET 0 - - struct mcount_disasm_engine; diff --git a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.10.bb index 4b4fc831c..828c21cf9 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.10.bb @@ -11,9 +11,8 @@ DEPENDS_append_libc-musl = " argp-standalone" inherit autotools PV .= "+git${SRCPV}" -SRCREV = "d648bbffedef529220896283fb59e35531c13804" +SRCREV = "a5e5a51d32bdfe59af8b453ca08d78cbdf0b3c61" SRC_URI = "git://github.com/namhyung/${BPN} \ - file://0001-Fix-error-on-aarch64-with-binutils2.35.1.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.41.bb b/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.42.bb index 037822781..04d4ca6e4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.41.bb +++ b/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.42.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" SRC_URI = "https://github.com/mellowcandle/bitwise/releases/download/v${PV}/bitwise-v${PV}.tar.gz \ file://0001-makefile.am-Fix-build-when-build-dir-is-not-same-as-.patch \ " -SRC_URI[sha256sum] = "33ce934fb99dadf7652224152cc135a0abf6a211adde53d96e9be7067567749c" +SRC_URI[sha256sum] = "d3d43cef47bf8f49e85f7ed381c3eaf1df921ca51805e0962f1a97a517e1d1d2" UPSTREAM_CHECK_URI = "https://github.com/mellowcandle/bitwise/releases" diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20210319.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20210509.bb index 5f165617c..2bfa575d7 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20210319.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20210509.bb @@ -8,10 +8,8 @@ DEPENDS = "ncurses" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" -SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ - " -SRC_URI[md5sum] = "45a28836769d52c00c800fa3226c530d" -SRC_URI[sha256sum] = "42c6c2b35dd6d1c6cf231238e3bd6d3b7af53fc279a1af547ab9890044d46652" +SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz" +SRC_URI[sha256sum] = "ae478fe7d5fca82bcf4b51684641e07d2ee68489d319710fe1e81f41a197bd66" # hardcoded here for use in dialog-static recipe S = "${WORKDIR}/dialog-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch index f8f1fd00f..7a2ecdc10 100644 --- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch +++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch @@ -21,11 +21,8 @@ index 9241ce5..b24e291 100644 ## Process this file with automake to produce Makefile.in -*-Makefile-*- AUTOMAKE_OPTIONS = foreign --SUBDIRS = config m4 term src docs man demo tutorial share +-SUBDIRS = config m4 term src docs man demo share +SUBDIRS = docs - EXTRA_DIST = BUGS Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ - Makefile.maint PATCHLEVEL PGPKEYS README RELEASE_NOTES \ --- -2.14.3 - + EXTRA_DIST = BUGS Copyright FAQ.pdf INSTALL INSTALL.gnu \ + PATCHLEVEL PGPKEYS README RELEASE_NOTES \ diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch index 8e0b4a271..5f96cdf69 100644 --- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch +++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch @@ -14,18 +14,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 9241ce5..b24e291 100644 +index 7e2c400..a8dbf96 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- AUTOMAKE_OPTIONS = foreign --SUBDIRS = config m4 term src docs man demo tutorial share -+SUBDIRS = config m4 term src docs man tutorial share +-SUBDIRS = config m4 term src docs man demo share ++SUBDIRS = config m4 term src docs man share - EXTRA_DIST = BUGS Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ - Makefile.maint PATCHLEVEL PGPKEYS README RELEASE_NOTES \ + EXTRA_DIST = BUGS Copyright FAQ.pdf INSTALL INSTALL.gnu \ + PATCHLEVEL PGPKEYS README RELEASE_NOTES \ -- -2.14.3 +2.31.1 diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch index a4039c317..c2d2f7f3f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch +++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch @@ -6,16 +6,22 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> + --- docs/Makefile.am | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am -index 3baf0c4..e82f87d 100644 +index b20918a..47406eb 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am -@@ -152,7 +152,7 @@ gnuplot-groff.ps: gnuplot.ms $(srcdir)/titlepag.ms +@@ -156,7 +156,7 @@ gnuplot-groff.ps: gnuplot.ms $(srcdir)/titlepag.ms ### doc2xxx dependencies gnuplot.ms: doc2ms$(EXEEXT) $(srcdir)/gnuplot.doc @@ -24,7 +30,7 @@ index 3baf0c4..e82f87d 100644 doc2ms_SOURCES = doc2ms.c termdoc.c doc2ms_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS) -@@ -173,10 +173,10 @@ pdf_figures: $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu +@@ -177,10 +177,10 @@ pdf_figures: $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu $(AM_V_GEN)touch $@ figures.tex: allterm.h doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc @@ -37,7 +43,7 @@ index 3baf0c4..e82f87d 100644 pdf: gnuplot.pdf pdf_nofig: nofigures.pdf -@@ -256,7 +256,7 @@ gnuplot.ps: gnuplot.dvi +@@ -260,7 +260,7 @@ gnuplot.ps: gnuplot.dvi hlp: gnuplot.hlp gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc @@ -46,7 +52,7 @@ index 3baf0c4..e82f87d 100644 doc2hlp_SOURCES = doc2hlp.c termdoc.c -@@ -264,14 +264,14 @@ doc2hlp_SOURCES = doc2hlp.c termdoc.c +@@ -268,14 +268,14 @@ doc2hlp_SOURCES = doc2hlp.c termdoc.c gih: gnuplot.gih gnuplot.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc @@ -63,16 +69,16 @@ index 3baf0c4..e82f87d 100644 alldoc2gih_SOURCES = doc2gih.c termdoc.c alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS) -@@ -286,7 +286,7 @@ $(srcdir)/windows/wgnuplot.hhk +@@ -290,7 +290,7 @@ $(srcdir)/windows/wgnuplot.hhk wxhelp/wgnuplot.hhc wxhelp/wgnuplot.hhk wxhelp/*.html windows/*.png wxhelp/wgnuplot.html: doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc - $(AM_V_GEN) ./doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc wxhelp/ + $(AM_V_GEN) doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc wxhelp/ - #doc2wxhtml_SOURCES = windows/doc2html.c termdoc.c xref.c allterm.h - #doc2wxhtml_CPPFLAGS = -DALL_TERM_DOC -DWXHELP -I../src $(AM_CPPFLAGS) -@@ -336,7 +336,7 @@ install-info: gnuplot.info + doc2wxhtml_SOURCES = windows/doc2html.c termdoc.c xref.c allterm.h + doc2wxhtml_CPPFLAGS = -DALL_TERM_DOC -DWXHELP -I../src $(AM_CPPFLAGS) +@@ -340,7 +340,7 @@ install-info: gnuplot.info ipf: gnuplot.ipf gnuplot.ipf: doc2ipf$(EXEEXT) $(srcdir)/gnuplot.doc @@ -81,7 +87,7 @@ index 3baf0c4..e82f87d 100644 doc2ipf_SOURCES = doc2ipf.c termdoc.c xref.c -@@ -344,7 +344,7 @@ doc2ipf_SOURCES = doc2ipf.c termdoc.c xref.c +@@ -348,7 +348,7 @@ doc2ipf_SOURCES = doc2ipf.c termdoc.c xref.c rtf: gnuplot.rtf gnuplot.rtf: doc2rtf$(EXEEXT) $(srcdir)/gnuplot.doc @@ -90,7 +96,7 @@ index 3baf0c4..e82f87d 100644 doc2rtf_SOURCES = doc2rtf.c termdoc.c xref.c -@@ -352,13 +352,13 @@ doc2rtf_SOURCES = doc2rtf.c termdoc.c xref.c +@@ -356,13 +356,13 @@ doc2rtf_SOURCES = doc2rtf.c termdoc.c xref.c rnh: gnuplot.rnh gnuplot.rnh: doc2rnh$(EXEEXT) $(srcdir)/gnuplot.doc diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.1.bb index b2c41756e..3d75f0604 100644 --- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.1.bb @@ -11,7 +11,8 @@ inherit autotools features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BP}.tar.gz;name=archive \ http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \ file://gnuplot.desktop \ file://gnuplot.png \ @@ -22,9 +23,7 @@ SRC_URI_append_class-target = " \ file://0004-Add-configure-option-to-find-qt5-native-tools.patch \ " -SRC_URI[archive.md5sum] = "2df8767c7399bee57a96296d46b4d5fb" -SRC_URI[archive.sha256sum] = "60a6764ccf404a1668c140f11cc1f699290ab70daa1151bb58fed6139a28ac37" -SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" +SRC_URI[archive.sha256sum] = "6b690485567eaeb938c26936e5e0681cf70c856d273cc2c45fabf64d8bc6590e" SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132" # for building docs (they deserve it) we need *doc2* tools native @@ -45,9 +44,10 @@ PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango" PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua" PACKAGECONFIG[qt5] = "--with-qt --with-qt5nativesysroot=${STAGING_DIR_NATIVE},--without-qt,qtbase-native qtbase qtsvg qttools-native" -EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \ - --without-tutorial \ - --disable-wxwidgets" +EXTRA_OECONF = " \ + --with-readline=${STAGING_LIBDIR}/.. \ + -disable-wxwidgets \ +" do_compile_prepend() { install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/ diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch index 794394855..c5e210afc 100644 --- a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch @@ -10,11 +10,9 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/configure.ac b/configure.ac -index c5e3ca03..4b89396a 100644 --- a/configure.ac +++ b/configure.ac -@@ -140,7 +140,7 @@ AC_CHECK_FUNC([getloadavg],[AC_DEFINE([HAVE_GETLOADAVG2], 1, [getloadavg() is av +@@ -160,7 +160,7 @@ AC_CHECK_FUNCS([backtrace_symbols_fd mem AC_FUNC_SELECT_ARGTYPES AC_MSG_CHECKING([for strlcpy]) @@ -23,7 +21,7 @@ index c5e3ca03..4b89396a 100644 char a[2]; if (strlcpy(a, "yes", 2) != 3) return 1;]])], -@@ -156,7 +156,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ +@@ -176,7 +176,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#includ ]) AC_MSG_CHECKING([for strlcat]) @@ -32,6 +30,25 @@ index c5e3ca03..4b89396a 100644 char a[4] = "no"; if (strlcat(a, "yes", 4) != 5) return 1;]])], --- -2.17.1 - +@@ -191,21 +191,6 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#includ + [Define to 1 if you have the strlcat function.]) + ]) + +-AC_MSG_CHECKING([for C++11 by default]) +-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <regex>]],[[ +- if (__cplusplus < 201103L) return 1;]])], +- [AC_MSG_RESULT([yes])], +- [AC_MSG_RESULT([no]) +- AC_MSG_CHECKING([for C++11 when forced]) +- CXXFLAGS="$CXXFLAGS -std=c++11" +- AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <regex>]],[[ +- if (__cplusplus < 201103L) return 1;]])], +- [AC_MSG_RESULT([yes])], +- [AC_MSG_RESULT([no]) +- AC_MSG_ERROR([Need C++11. Please set CXXFLAGS.]) +- ]) +- ]) +- + PKG_CHECK_MODULES([CORE],[fontconfig xrender xcomposite xdamage xfixes xext x11]) + AC_SUBST([CORE_CFLAGS]) + AC_SUBST([CORE_LIBS]) diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.6.5.bb b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.3.3.bb index 241a2b30f..abc3e098c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.6.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.3.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4a26952467ef79a7efca4a9cf52d417b" SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.lz \ file://0001-configure.ac-skip-running-test-program-when-cross-co.patch \ " -SRC_URI[sha256sum] = "d41e6abf842ff3f8705a81d352be7c5b181c587549c183de0641c3820234a7b2" +SRC_URI[sha256sum] = "4162565cf7566d78d786e4ecf4b0639451b8464bcb24e761b1f08ef43e95e513" UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" @@ -19,7 +19,7 @@ EXTRA_OECONF += "--with-libdir=${datadir}/icewm \ --enable-xinerama \ --enable-shape" -DEPENDS = "asciidoc-native fontconfig gdk-pixbuf libxft libxpm libxrandr \ +DEPENDS = "asciidoc-native fontconfig fribidi gdk-pixbuf imlib2 libxft libxpm libxrandr \ libxinerama libice libsm libx11 libxext libxrender libxcomposite libxdamage \ libxfixes" DEPENDS_append = " qemu-native" diff --git a/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb b/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb index b7c1958ee..116ecd84a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb @@ -8,9 +8,9 @@ DEPENDS = "libusb1" inherit autotools pkgconfig -PV = "0.6.0" +PV = "0.7.0" -SRCREV = "1195abc2f4acc7b10175d570ec73549d0938c83e" +SRCREV = "47cbed5355ffda7b952193a770a9a9fa9f89b25b" SRC_URI = "git://github.com/libdivecomputer/libdivecomputer.git;protocol=https \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-build-with-libc.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-build-with-libc.patch new file mode 100644 index 000000000..c1c118196 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-build-with-libc.patch @@ -0,0 +1,36 @@ +From 72e0fe484444169007e481c9b33d8f78ebe03674 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 27 May 2021 15:44:10 -0700 +Subject: [PATCH] Fix build with libc++ + +In libc++ on 32-bit platforms, int64_t is defined as alias of long long. On 64-bit platforms: long. + +On the other hand in definition of std::chrono::duration aliases, that you can find here long long is used + +Therefore create custom unit to avoid incompatibility between libstdc++ +and libc++ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + extensions/expression-language/Expression.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/extensions/expression-language/Expression.cpp b/extensions/expression-language/Expression.cpp +index a25e1d3f..68d6320c 100644 +--- a/extensions/expression-language/Expression.cpp ++++ b/extensions/expression-language/Expression.cpp +@@ -629,7 +629,8 @@ Value expr_toDate(const std::vector<Value> &args) { + #endif // EXPRESSION_LANGUAGE_USE_DATE + + Value expr_now(const std::vector<Value> &args) { +- return Value(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count()); ++ using Milliseconds = std::chrono::duration<std::int64_t, std::chrono::milliseconds::period>; ++ return Value(std::chrono::duration_cast<Milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count()); + } + + Value expr_unescapeCsv(const std::vector<Value> &args) { +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index 322b58477..86c149ba5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -29,6 +29,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git \ file://0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch \ file://0001-civetweb-CMakeLists.txt-do-not-search-gcc-ar-and-gcc.patch \ file://0001-cxxopts-Add-limits-header.patch \ + file://0001-Fix-build-with-libc.patch \ file://minifi.service \ file://systemd-volatile.conf \ file://sysvinit-volatile.conf \ diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.1.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.2.bb index c382ad87f..c3505ab06 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.2.bb @@ -22,10 +22,10 @@ DEPENDS = " \ PREMIRRORS = "" SRC_URI = " \ - gitsm://github.com/ostreedev/ostree \ + gitsm://github.com/ostreedev/ostree;branch=main \ file://run-ptest \ " -SRCREV = "e9e4b9112083228b8c385ad26924b6c4623f4179" +SRCREV = "6a72674ec621a2282043c3a083fe1e45cd6a8761" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" @@ -176,7 +176,7 @@ RDEPENDS_${PN}-ptest += " \ util-linux \ xz \ ${PN}-trivial-httpd \ - ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'python3-pyyaml', '', d)} \ + python3-pyyaml \ ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \ " RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils glibc-localedata-en-us" diff --git a/meta-openembedded/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch b/meta-openembedded/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch index ae2751745..1f08d1603 100644 --- a/meta-openembedded/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch +++ b/meta-openembedded/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch @@ -1,4 +1,4 @@ -From b6b1782af4aa7f9084d32e4144738dc2535c8d6f Mon Sep 17 00:00:00 2001 +From 653674e11872465dd5edf1c1e8413ea813d7e086 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 23 Apr 2018 23:07:21 -0700 Subject: [PATCH] Fix narrowing errors -Wc++11-narrowing @@ -17,6 +17,7 @@ also reported here https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224930 Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- CPP/Windows/ErrorMsg.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch b/meta-openembedded/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch index 177d1455f..9ba107807 100644 --- a/meta-openembedded/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch +++ b/meta-openembedded/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch @@ -1,4 +1,7 @@ -p7zip: Fix CVE-2017-17969 +From 7f2da4f810b429ddb7afa0e252e3d02ced0eba87 Mon Sep 17 00:00:00 2001 +From: Radovan Scasny <radovan.scasny@siemens.com> +Date: Tue, 20 Feb 2018 12:08:13 +0100 +Subject: [PATCH] p7zip: Fix CVE-2017-17969 [No upstream tracking] -- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888297 @@ -8,12 +11,18 @@ Compress/ShrinkDecoder.cpp: Heap-based buffer overflow in the NCompress::NShrink::CDecoder::CodeReal method in 7-Zip before 18.00 and p7zip allows remote attackers to cause a denial of service (out-of-bounds write) -or potentially execute arbitrary code via a crafted ZIP archive. +or potentially execute arbitrary code via a crafted ZIP archive. Upstream-Status: Backport [https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/8316/attachment/CVE-2017-17969.patch] CVE: CVE-2017-17969 Signed-off-by: Radovan Scasny <radovan.scasny@siemens.com> +--- + CPP/7zip/Compress/ShrinkDecoder.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp +index 80b7e67..5bb0559 100644 --- a/CPP/7zip/Compress/ShrinkDecoder.cpp +++ b/CPP/7zip/Compress/ShrinkDecoder.cpp @@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * diff --git a/meta-openembedded/meta-oe/recipes-extended/p7zip/files/change_numMethods_from_bool_to_unsigned.patch b/meta-openembedded/meta-oe/recipes-extended/p7zip/files/change_numMethods_from_bool_to_unsigned.patch new file mode 100644 index 000000000..93eb0588c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/p7zip/files/change_numMethods_from_bool_to_unsigned.patch @@ -0,0 +1,34 @@ +From 0820ef4b9238c1e39ae5bda32cc08cce3fd3ce89 Mon Sep 17 00:00:00 2001 +From: Nisha Parrakat <Nisha.Parrakat@kpit.com> +Date: Wed, 26 May 2021 19:59:28 +0000 +Subject: [PATCH] fixes the below error + +| ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp: In member function 'virtual LONG NArchive::NWim::CHandler::GetArchiveProperty(PROPID, PROPVARIANT*)': +| ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp:308:11: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17 +| 308 | numMethods++; +| | ^~~~~~~~~~ +| ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp:318:9: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17 +| 318 | numMethods++; + +use unsigned instead of bool +Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com> + +Upstream-Status: Pending + +--- + CPP/7zip/Archive/Wim/WimHandler.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CPP/7zip/Archive/Wim/WimHandler.cpp b/CPP/7zip/Archive/Wim/WimHandler.cpp +index 27d3298..4ff5cfe 100644 +--- a/CPP/7zip/Archive/Wim/WimHandler.cpp ++++ b/CPP/7zip/Archive/Wim/WimHandler.cpp +@@ -298,7 +298,7 @@ STDMETHODIMP CHandler::GetArchiveProperty(PROPID propID, PROPVARIANT *value) + + AString res; + +- bool numMethods = 0; ++ unsigned numMethods = 0; + for (unsigned i = 0; i < ARRAY_SIZE(k_Methods); i++) + { + if (methodMask & ((UInt32)1 << i)) diff --git a/meta-openembedded/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch b/meta-openembedded/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch index b0a560fe9..2636e7f6f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch +++ b/meta-openembedded/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch @@ -1,4 +1,7 @@ -do not override compiler and do not strip +From b2aa209dfc5e59d6329b55b9764782334b63dbe8 Mon Sep 17 00:00:00 2001 +From: Raphael Freudiger <raphael.freudiger@siemens.com> +Date: Wed, 11 Feb 2015 09:11:47 +0100 +Subject: [PATCH] do not override compiler and do not strip The default makefile sets the compiler to g++ or gcc. This leads to a wrong architecture when cross-compiling. Remove the hardcoded compiler and just append the flags to CXX and CC. @@ -7,9 +10,14 @@ Upstream-Status: Pending Signed-off-by: Raphael Freudiger <raphael.freudiger@siemens.com> Reviewed-By: Pascal Bach <pascal.bach@siemens.com> -diff -Nurp p7zip_15.14.1_orig/makefile.machine p7zip_15.14.1/makefile.machine ---- p7zip_15.14.1_orig/makefile.machine 2016-03-23 20:37:47.000000000 +0100 -+++ p7zip_15.14.1/makefile.machine 2016-06-17 15:33:39.720454477 +0200 +--- + makefile.machine | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/makefile.machine b/makefile.machine +index 9e34c34..e9244d9 100644 +--- a/makefile.machine ++++ b/makefile.machine @@ -2,7 +2,7 @@ # makefile for Linux (x86, PPC, alpha ...) # diff --git a/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb b/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb index 13479a90f..ada49114c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb +++ b/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb @@ -9,6 +9,7 @@ SRC_URI = "http://downloads.sourceforge.net/p7zip/p7zip/${PV}/p7zip_${PV}_src_al file://do_not_override_compiler_and_do_not_strip.patch \ file://CVE-2017-17969.patch \ file://0001-Fix-narrowing-errors-Wc-11-narrowing.patch \ + file://change_numMethods_from_bool_to_unsigned.patch \ " SRC_URI[md5sum] = "a0128d661cfe7cc8c121e73519c54fbf" @@ -16,10 +17,26 @@ SRC_URI[sha256sum] = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6 S = "${WORKDIR}/${BPN}_${PV}" +do_compile_append() { + oe_runmake 7z +} +FILES_${PN} += "${libdir}/* ${bindir}/7z" + +FILES_SOLIBSDEV = "" +INSANE_SKIP_${PN} += "dev-so" + do_install() { install -d ${D}${bindir} - install -m 0755 ${S}/bin/* ${D}${bindir} + install -d ${D}${bindir}/Codecs + install -d ${D}${libdir} + install -d ${D}${libdir}/Codecs + install -m 0755 ${S}/bin/7za ${D}${bindir} ln -s 7za ${D}${bindir}/7z + install -m 0755 ${S}/bin/Codecs/* ${D}${libdir}/Codecs/ + install -m 0755 ${S}/bin/7z.so ${D}${libdir}/lib7z.so } -BBCLASSEXTEND = "native" +RPROVIDES_${PN} += "lib7z.so()(64bit) 7z lib7z.so" +RPROVIDES_${PN}-dev += "lib7z.so()(64bit) 7z lib7z.so" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch index b5c4133e3..66ab0ee33 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch @@ -10,15 +10,16 @@ e.g. -latomic is needed on clang/x86 to provide for 64bit atomics Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index 7f7c625..c71dd3b 100644 +index 5564351..83ccd76 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -75,7 +75,7 @@ endif +@@ -91,7 +91,7 @@ endif FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) @@ -26,7 +27,4 @@ index 7f7c625..c71dd3b 100644 +FINAL_LIBS+=-lm DEBUG=-g -ggdb - # Linux ARM needs -latomic at linking time --- -2.23.0 - + # Linux ARM32 needs -latomic at linking time diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.1.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.3.bb index 89990df3d..67ac974de 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.3.bb @@ -17,7 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://GNU_SOURCE.patch \ file://0006-Define-correct-gregs-for-RISCV32.patch \ " -SRC_URI[sha256sum] = "cd222505012cce20b25682fca931ec93bd21ae92cb4abfe742cf7b76aa907520" +SRC_URI[sha256sum] = "98ed7d532b5e9671f5df0825bb71f0f37483a16546364049384c63db8764512b" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2102.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2104.0.bb index 921124024..3f1ec91ab 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2102.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2104.0.bb @@ -31,8 +31,8 @@ SRC_URI_append_libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[md5sum] = "1f6150dfd2ef38db37c2165e98d2f2b1" -SRC_URI[sha256sum] = "94ee0d0312c2edea737665594cbe4a9475e4e3b593e12b5b8ae3a743ac9c72a7" +SRC_URI[md5sum] = "a0213c989bce297944901e1a85286b8b" +SRC_URI[sha256sum] = "710981c3c34f88d5d1fb55ecfc042aecad8af69414b2b1602b304f4dedbf9f43" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-extended/snappy/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch b/meta-openembedded/meta-oe/recipes-extended/snappy/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch new file mode 100644 index 000000000..27357d88a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/snappy/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch @@ -0,0 +1,71 @@ +From 4728803cc8687431449c8c9fbfabb1da04943400 Mon Sep 17 00:00:00 2001 +From: "Georgi D. Sotirov" <gdsotirov@gmail.com> +Date: Wed, 5 May 2021 14:16:46 +0300 +Subject: [PATCH] Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE + +Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE on AdvanceToNextTag to +fix the following compilation errors and a warning with GCC: + +[ 2%] Building CXX object CMakeFiles/snappy.dir/snappy.cc.o +/usr/bin/c++ -DHAVE_CONFIG_H -Dsnappy_EXPORTS +-I/tmp/snappy-1.1.9/build -I/tmp/snappy-1.1.9 -O3 +-march=i586 -mtune=i686 -Wall -Wextra -fno-exceptions -fno-rtti -O3 +-DNDEBUG -fPIC -std=c++11 -o CMakeFiles/snappy.dir/snappy.cc.o -c +/tmp/snappy-1.1.9/snappy.cc +/tmp/snappy-1.1.9/snappy.cc:1017:8: warning: always_inline +function might not be inlinable [-Wattributes] + size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + ^ +/tmp/snappy-1.1.9/snappy.cc: In function 'std::pair<const +unsigned char*, int> snappy::DecompressBranchless(const uint8_t*, const +uint8_t*, ptrdiff_t, T, ptrdiff_t) [with T = char*; uint8_t = unsigned +char; ptrdiff_t = int]': +/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in +call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, +size_t*)': function body can be overwritten at link time +/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here + size_t tag_type = AdvanceToNextTag(&ip, &tag); + ^ +/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in +call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, +size_t*)': function body can be overwritten at link time + size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + ^ +/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here + size_t tag_type = AdvanceToNextTag(&ip, &tag); + ^ +/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in +call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, +size_t*)': function body can be overwritten at link time + size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + ^ +/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here + size_t tag_type = AdvanceToNextTag(&ip, &tag); + ^ +CMakeFiles/snappy.dir/build.make:137: recipe for target +'CMakeFiles/snappy.dir/snappy.cc.o' failed + +Just like with other functions using SNAPPY_ATTRIBUTE_ALWAYS_INLINE +macro (i.e. __attribute__((always_inline)) ) it is necessary to use C++ +inline specifier. + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +Upstream-Status: Submitted [https://github.com/google/snappy/pull/128] +--- + snappy.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/snappy.cc b/snappy.cc +index 79dc0e8..51157be 100644 +--- a/snappy.cc ++++ b/snappy.cc +@@ -1014,7 +1014,7 @@ void MemMove(ptrdiff_t dst, const void* src, size_t size) { + } + + SNAPPY_ATTRIBUTE_ALWAYS_INLINE +-size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { ++inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + const uint8_t*& ip = *ip_p; + // This section is crucial for the throughput of the decompression loop. + // The latency of an iteration is fundamentally constrained by the diff --git a/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.8.bb b/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb index d6d1e4110..5c786d891 100644 --- a/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb @@ -10,10 +10,12 @@ compression ratio." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" -SRC_URI = "https://src.fedoraproject.org/repo/pkgs/snappy/snappy-1.1.8.tar.gz/sha512/efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c/snappy-1.1.8.tar.gz" +SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https \ + file://0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch \ +" +SRCREV = "2b63814b15a2aaae54b7943f0cd935892fae628f" +S = "${WORKDIR}/git" -SRC_URI[md5sum] = "70e48cba7fecf289153d009791c9977f" -SRC_URI[sha256sum] = "16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f" inherit cmake pkgconfig @@ -21,5 +23,4 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[lzo] = "-DHAVE_LIBLZO2=1,-DHAVE_LIBLZO2=0,lzo," TARGET_CFLAGS += "-fPIC" -EXTRA_OECMAKE += '-DBUILD_SHARED_LIBS="ON" \ - ' +EXTRA_OECMAKE += '-DBUILD_SHARED_LIBS="ON" -DSNAPPY_BUILD_TESTS="OFF" -DSNAPPY_BUILD_BENCHMARKS="OFF"' diff --git a/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb index d9da19057..f1b77070c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -14,6 +14,7 @@ JIT_mipsarchn32 = "" JIT_mipsarchn64 = "" JIT_riscv64 = "" JIT_riscv32 = "" +JIT_powerpc = "" DEPENDS += "libb64 lua${JIT} zlib c-ares grpc-native grpc curl ncurses jsoncpp tbb jq openssl elfutils protobuf protobuf-native jq-native" RDEPENDS_${PN} = "bash" @@ -49,3 +50,4 @@ COMPATIBLE_HOST_libc-musl = "null" COMPATIBLE_HOST_mips = "null" COMPATIBLE_HOST_riscv64 = "null" COMPATIBLE_HOST_riscv32 = "null" +COMPATIBLE_HOST_powerpc = "null" diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init index ccc3aafe3..28082f7ff 100755 --- a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init +++ b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init @@ -24,3 +24,8 @@ modprobe -q zram || true zramctl -a ${ZRAM_ALGORITHM} -s ${memzram}KB $device mkswap -L "zram-swap" $device + +devname="${device##*/}" +if [ ! -z ${ZRAM_SIZE_LIMIT+x} ]; then + echo ${ZRAM_SIZE_LIMIT} > /sys/block/$devname/mem_limit +fi diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.6.bb b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.7.bb index bbfba55a3..b857cc5bd 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.6.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.7.bb @@ -11,7 +11,7 @@ SRC_URI = "\ git://github.com/hughsie/libjcat.git \ file://run-ptest \ " -SRCREV = "c4f032468c56a5750e1e15b01fa31539b5c7ae51" +SRCREV = "e5307885528cf07058be073d0621624749cc10df" S = "${WORKDIR}/git" inherit gobject-introspection gtk-doc meson ptest-gnome vala diff --git a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch deleted file mode 100644 index 86586fe71..000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 53a4f19887d9ae4e77f32dd6d71c8a7b516b4d5d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Mon, 10 Aug 2020 21:53:33 +0200 -Subject: [PATCH] Do not build tests when introspection is disabled/missing -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: -| ../libpeas-1.26.0/tests/libpeas/introspection/meson.build:47:0: ERROR: Unknown variable "libpeas_gir". - -Upstrem-Status: Submitted[https://gitlab.gnome.org/GNOME/libpeas/-/merge_requests/28] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - meson.build | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 8322fea..43fb062 100644 ---- a/meson.build -+++ b/meson.build -@@ -254,7 +254,9 @@ subdir('loaders') - if build_demos == true - subdir('peas-demo') - endif --subdir('tests') -+if generate_gir == true -+ subdir('tests') -+endif - - summary = [ - '', --- -2.26.2 - diff --git a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/add_missing_locale_include.patch b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/add_missing_locale_include.patch deleted file mode 100644 index 664693128..000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/add_missing_locale_include.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 3cc69f1eaa86163c3816265fa64cb660f4def364 Mon Sep 17 00:00:00 2001 -From: Christian Hergert <chergert@redhat.com> -Date: Fri, 13 Mar 2020 10:32:21 -0700 -Subject: [PATCH] demo: add missing locale.h include - -Fixes #39 - -Upstream-Status: backport - -diff --git a/peas-demo/peas-demo.c b/peas-demo/peas-demo.c -index 47ac005..466a392 100644 ---- a/peas-demo/peas-demo.c -+++ b/peas-demo/peas-demo.c -@@ -26,6 +26,7 @@ - #include <girepository.h> - #include <glib/gi18n.h> - #include <gtk/gtk.h> -+#include <locale.h> - - #include <libpeas/peas.h> - #include <libpeas-gtk/peas-gtk.h> diff --git a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.30.0.bb index fd4ce7de5..316a92784 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.30.0.bb @@ -12,13 +12,7 @@ inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI += " \ - file://add_missing_locale_include.patch \ - file://0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch \ -" - -SRC_URI[archive.md5sum] = "f7723bf8433b7984121157e1e9a629b5" -SRC_URI[archive.sha256sum] = "a976d77e20496479a8e955e6a38fb0e5c5de89cf64d9f44e75c2213ee14f7376" +SRC_URI[archive.sha256sum] = "0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3" PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.0.bb b/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.1.bb index d677d2436..72d3aba44 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.1.bb @@ -6,7 +6,7 @@ SRC_URI = "\ git://github.com/hughsie/libxmlb.git \ file://run-ptest \ " -SRCREV = "8f2f28eda419dbe31cb1a9aa022f0ca9d30ecb6a" +SRCREV = "98fc241305306de9468249301474820696acb4be" S = "${WORKDIR}/git" inherit gobject-introspection gtk-doc meson ptest-gnome diff --git a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.108.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.108.bb deleted file mode 100644 index d9b6886ec..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.108.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "VCD (Value Change Dump) file waveform viewer" -DESCRIPTION = "gtkwave is a viewer for VCD (Value Change Dump) files which are usually created by digital circuit simulators. (These files have no connection to video CDs!) " -HOMEPAGE = "http://gtkwave.sourceforge.net/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" - -SRC_URI = "http://gtkwave.sourceforge.net/${BP}.tar.gz" - -SRC_URI[md5sum] = "dd40f09f44d7aed937e63c29b63cd3af" -SRC_URI[sha256sum] = "ece447340442e7ad029713789552e8392b75dd3808c882ac5193d42fce55eb3b" - -inherit pkgconfig autotools gettext texinfo mime mime-xdg -DEPENDS += "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0" -RDEPENDS_${PN} += "tk-lib" - -# depends on gtk+ which has this restriction -inherit features_check -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" - -EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS} --with-tirpc --disable-mime-update" - -FILES_${PN} = "${bindir} ${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.109.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.109.bb new file mode 100644 index 000000000..e1cb3d4a5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.109.bb @@ -0,0 +1,44 @@ +SUMMARY = "VCD (Value Change Dump) file waveform viewer" +DESCRIPTION = "gtkwave is a viewer for VCD (Value Change Dump) files which are usually created by digital circuit simulators. (These files have no connection to video CDs!) " +HOMEPAGE = "http://gtkwave.sourceforge.net/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +SRC_URI = "http://gtkwave.sourceforge.net/gtkwave-gtk3-${PV}.tar.gz" +SRC_URI[sha256sum] = "35461eccd9b8b4470caa78ab9a8f14ecacbcc9eff63033d8dce58093e786deb7" +S = "${WORKDIR}/${BPN}-gtk3-${PV}" + +DEPENDS = " \ + gperf-native \ + gtk+3 \ + gdk-pixbuf \ + tcl \ + tk \ + bzip2 \ + xz \ + pango \ + zlib \ +" + +inherit pkgconfig autotools gettext texinfo mime mime-xdg + +inherit features_check +# depends on gtk+3 which has this restriction +# ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +# but https://github.com/gtkwave/gtkwave/blob/f9d82a82aa3ddc30ca47984278371f62c9a3bd81/gtkwave3-gtk3/src/gtk23compat.h#L10 +# explicitly includes gdk/gdkwayland.h for gtk-3.22.26 and newer (oe-core currently has 3.24.29) +# and it needs x11 as well for tk dependency (so it happends to be both GTK3DISTROFEATURES instead of either of them) +REQUIRED_DISTRO_FEATURES = "wayland x11" + +EXTRA_OECONF = " \ + --enable-gtk3 \ + --with-tcl=${STAGING_BINDIR_CROSS} \ + --with-tk=${STAGING_BINDIR_CROSS} \ + --with-tirpc \ + --disable-mime-update \ +" + +FILES_${PN} = "${bindir} ${datadir}" + +RDEPENDS_${PN} += "tk-lib" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch new file mode 100644 index 000000000..2db67966c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch @@ -0,0 +1,27 @@ +From 97fefd050976bbbfca9608499f6a7d9fb86e70db Mon Sep 17 00:00:00 2001 +From: Sam Lantinga <slouken@libsdl.org> +Date: Tue, 30 Jul 2019 11:00:00 -0700 +Subject: [PATCH] Fixed bug 4538 - validate image size when loading BMP files +--- + src/video/SDL_bmp.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/video/SDL_bmp.c b/src/video/SDL_bmp.c +index 8eadc5f..5b5e12c 100644 +--- a/src/video/SDL_bmp.c ++++ b/src/video/SDL_bmp.c +@@ -143,6 +143,11 @@ SDL_Surface * SDL_LoadBMP_RW (SDL_RWops *src, int freesrc) + (void) biYPelsPerMeter; + (void) biClrImportant; + ++ if (biWidth <= 0 || biHeight == 0) { ++ SDL_SetError("BMP file with bad dimensions (%dx%d)", biWidth, biHeight); ++ was_error = SDL_TRUE; ++ goto done; ++ } + if (biHeight < 0) { + topDown = SDL_TRUE; + biHeight = -biHeight; +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb index 7a0190832..d91a1856b 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb @@ -27,6 +27,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://CVE-2019-7637.patch \ file://CVE-2019-7638.patch \ file://CVE-2019-7576.patch \ + file://CVE-2019-13616.patch \ " UPSTREAM_CHECK_REGEX = "SDL-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-oe/recipes-graphics/nyancat/nyancat_1.5.2.bb b/meta-openembedded/meta-oe/recipes-graphics/nyancat/nyancat_1.5.2.bb new file mode 100644 index 000000000..7ba8f38a9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/nyancat/nyancat_1.5.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "Render a loop of the Nyan Cat / Poptart Cat animation" +HOMEPAGE = "https://nyancat.dakko.us/" +SECTION = "graphics" + +LICENSE = "NCSA" +LIC_FILES_CHKSUM = "file://src/nyancat.c;beginline=27;endline=49;md5=285f7ac87da4a631f348800687d845bd" + +S = "${WORKDIR}/git" + +SRCREV = "5ffb6c5c03d0e9156db8f360599d4f0449bb16b9" +SRC_URI = " \ + git://github.com/klange/nyancat;protocol=https;branch=master \ +" + +do_install_append() { + install -Dm 0755 ${S}/src/${BPN} ${D}${bindir}/${BPN} +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch deleted file mode 100644 index 6ba1e4268..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 49dd914109fd1ee9e1e917890bf18f85dd95ff31 Mon Sep 17 00:00:00 2001 -From: Reid Kleckner <rnk@google.com> -Date: Sun, 29 Dec 2019 23:17:16 -0800 -Subject: [PATCH] Remove glslang::pool_allocator::setAllocator - -TPoolAllocator is not copy assignable, so this setter could never have -been used. After a recent change (878a24ee2), new versions of Clang -reject this code outright. - -Upstream-Status: Backport [https://github.com/KhronosGroup/glslang/commit/0de87ee9a5bf5d094a3faa1a71fd9080e80b6be0] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h b/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h -index 0e237a6a2..b8eccb883 100644 ---- a/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h -+++ b/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h -@@ -304,7 +304,6 @@ public: - size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); } - size_type max_size(int size) const { return static_cast<size_type>(-1) / size; } - -- void setAllocator(TPoolAllocator* a) { allocator = *a; } - TPoolAllocator& getAllocator() const { return allocator; } - - protected: --- -2.24.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb index 6ea632d06..fa74fb39e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb @@ -2,12 +2,12 @@ SUMMARY = "RenderDoc recipe providing renderdoccmd" DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger" HOMEPAGE = "https://github.com/baldurk/renderdoc" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=df7ea9e196efc7014c124747a0ef9772" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5486c0df458c74c85828e0cdbffd499e" -SRCREV = "a56af589d94dc851809fd5344d0ae441da70c1f2" -SRC_URI = "git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \ - file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ - file://0001-Remove-glslang-pool_allocator-setAllocator.patch \ +SRCREV = "cc05b288b6d1660ab04c6cf01173f1bb62e6f5dd" +SRC_URI = " \ + git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \ + file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch b/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch index fb90432ea..93f1a9f42 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch @@ -1,41 +1,28 @@ -From e97bb73851f5bbd94260da553a222526485cdfb1 Mon Sep 17 00:00:00 2001 +From 9de4f5fa81891e14e205fe61e1408f1218369e55 Mon Sep 17 00:00:00 2001 From: Leon Anavi <leon.anavi@konsulko.com> -Date: Fri, 15 Nov 2019 18:24:42 +0000 +Date: Tue, 18 May 2021 15:03:22 +0000 Subject: [PATCH] config.mk: Fix compiler and linker -Do not set explicitly compiler and linker. +Fix LIBS Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- - config.mk | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + config.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mk b/config.mk -index df6e812..5deb991 100644 +index 2eb9fb0..032bf9f 100644 --- a/config.mk +++ b/config.mk -@@ -15,17 +15,17 @@ GTKINC = `pkg-config --cflags gtk+-3.0 webkit2gtk-4.0` - GTKLIB = `pkg-config --libs gtk+-3.0 webkit2gtk-4.0` +@@ -19,7 +19,7 @@ WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio- # includes and libs --INCS = -I. -I/usr/include -I${X11INC} ${GTKINC} --LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0 -+INCS = ${GTKINC} + INCS = $(X11INC) $(GTKINC) +-LIBS = $(X11LIB) $(GTKLIB) -lgthread-2.0 +LIBS = -lc -lX11 ${GTKLIB} -lgthread-2.0 # flags - CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE - CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} --LDFLAGS = -s ${LIBS} -+LDFLAGS = ${LIBS} - - # Solaris - #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" - #LDFLAGS = ${LIBS} - - # compiler and linker --CC = cc -+CC ?= cc + CPPFLAGS = -DVERSION=\"$(VERSION)\" -DGCR_API_SUBJECT_TO_CHANGE \ -- -2.7.4 +2.17.1 diff --git a/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.0.bb b/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.1.bb index 989730186..307ee9b98 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.1.bb @@ -3,16 +3,16 @@ DESCRIPTION = "Simple open source web browser based on WebKit2/GTK" HOMEPAGE = "https://surf.suckless.org/" SECTION = "x11/graphics" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b57e7f7720307a02d5a6598b00fe3afa" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2a6f86d002ae9ae1eb1ccc466289f146" -DEPENDS = "webkitgtk gtk+3 glib-2.0" +DEPENDS = "webkitgtk gtk+3 glib-2.0 gcr" REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \ file://0001-config.mk-Fix-compiler-and-linker.patch \ " -SRCREV = "b814567e2bf8bda07cea8de1c7a062f4aa437b65" +SRCREV = "bcd7d74e613fb8af11b40c351f0a6c1a771b2d2b" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch index 4e875ba82..5a42e67d0 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch @@ -1,29 +1,30 @@ -From c3460d63f0b6cd50b9a64265f420f0439e12a1d5 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 25 Apr 2017 01:36:44 -0400 -Subject: [PATCH 2/4] do not build tests sub directory +From 076d0e12a7be6cd2108e4ca0dcde1cb658918fa5 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Mon, 19 Apr 2021 23:02:45 -0700 +Subject: [PATCH] do not build tests sub directory -Upstream-Status: Inappropriate [oe specific] +Upstream-Status: Inappropriate [OE Specific] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Hongxu Jia <Hongxu.Jia@windriver.com> +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 94ec2ef..fb72a00 100644 +index 7bf99441..bda80598 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -300,9 +300,6 @@ if(BUILD_VIEWER) +@@ -304,9 +304,6 @@ if(BUILD_VIEWER) add_subdirectory(media) endif() -add_subdirectory(tests) - - - include(cmake/BuildPackages.cmake) + add_subdirectory(release) # uninstall -- -2.7.4 +2.30.2 diff --git a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch index 97b0a388a..5f14665b8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch @@ -1,44 +1,34 @@ -From 9563b69640227da2220ee0c39077afb736cc96d1 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 20 Jul 2017 17:12:17 +0800 -Subject: [PATCH 4/4] tigervnc: add fPIC option to COMPILE_FLAGS +From 7f8acd59bb2e54f9be25a98dd71534700a9e355a Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Mon, 19 Apr 2021 23:14:28 -0700 +Subject: [PATCH] tigervnc: add fPIC option to COMPILE_FLAGS -The static libraries in Xregion/network/rdr/rfb were linked by shared +The static libraries in network/rdr/rfb were linked by shared library libvnc.so, so we should add fPIC option to COMPILE_FLAGS to fix relocation issue. Upstream-Status: Pending Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- - common/Xregion/CMakeLists.txt | 1 + common/network/CMakeLists.txt | 1 + common/rdr/CMakeLists.txt | 1 + common/rfb/CMakeLists.txt | 1 + - 4 files changed, 4 insertions(+) + 3 files changed, 3 insertions(+) -diff --git a/common/Xregion/CMakeLists.txt b/common/Xregion/CMakeLists.txt -index 40ca97e..9411328 100644 ---- a/common/Xregion/CMakeLists.txt -+++ b/common/Xregion/CMakeLists.txt -@@ -3,4 +3,5 @@ add_library(Xregion STATIC - - if(UNIX) - libtool_create_control_file(Xregion) -+ set_target_properties(Xregion PROPERTIES COMPILE_FLAGS -fPIC) - endif() diff --git a/common/network/CMakeLists.txt b/common/network/CMakeLists.txt -index b624c8e..6c06ec9 100644 +index d00ca452..e84e0290 100644 --- a/common/network/CMakeLists.txt +++ b/common/network/CMakeLists.txt -@@ -9,4 +9,5 @@ endif() +@@ -16,4 +16,5 @@ endif() if(UNIX) libtool_create_control_file(network) + set_target_properties(network PROPERTIES COMPILE_FLAGS -fPIC) endif() diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt -index 989ba2f..20f6489 100644 +index 989ba2f4..20f6489d 100644 --- a/common/rdr/CMakeLists.txt +++ b/common/rdr/CMakeLists.txt @@ -27,4 +27,5 @@ target_link_libraries(rdr ${RDR_LIBRARIES}) @@ -48,15 +38,15 @@ index 989ba2f..20f6489 100644 + set_target_properties(rdr PROPERTIES COMPILE_FLAGS -fPIC) endif() diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt -index 5047e5e..88838ab 100644 +index fc5a37bf..7f5ce131 100644 --- a/common/rfb/CMakeLists.txt +++ b/common/rfb/CMakeLists.txt -@@ -98,4 +98,5 @@ target_link_libraries(rfb ${RFB_LIBRARIES}) +@@ -99,4 +99,5 @@ target_link_libraries(rfb ${RFB_LIBRARIES}) if(UNIX) libtool_create_control_file(rfb) + set_target_properties(rfb PROPERTIES COMPILE_FLAGS -fPIC) endif() -- -2.7.4 +2.30.2 diff --git a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb index f97c2b2d6..c45fc028f 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb @@ -2,22 +2,22 @@ DESCRIPTION = "TigerVNC remote display system" HOMEPAGE = "http://www.tigervnc.com/" LICENSE = "GPLv2+" SECTION = "x11/utils" -DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk" -RDEPENDS_${PN} = "coreutils hicolor-icon-theme perl" +DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk libpam" +RDEPENDS_${PN} = "coreutils hicolor-icon-theme perl bash" LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3" S = "${WORKDIR}/git" inherit features_check -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 pam" inherit autotools cmake B = "${S}" -SRCREV = "4739493b635372bd40a34640a719f79fa90e4dba" +SRCREV = "540bfc3278e396321124d4b18a798ac2bc18b6ca" -SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.10-branch \ +SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.11-branch \ file://0002-do-not-build-tests-sub-directory.patch \ file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \ file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \ @@ -83,6 +83,8 @@ EXTRA_OECONF = "--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ --disable-xwayland \ " +EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DCMAKE_INSTALL_UNITDIR=${systemd_unitdir}', '-DINSTALL_SYSTEMD_UNITS=OFF', d)}" + do_configure_append () { olddir=`pwd` cd ${XSERVER_SOURCE_DIR} @@ -125,6 +127,7 @@ do_install_append() { FILES_${PN} += " \ ${libdir}/xorg/modules/extensions \ ${datadir}/icons \ + ${systemd_unitdir} \ " FILES_${PN}-dbg += "${libdir}/xorg/modules/extensions/.debug" diff --git a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.22.bb b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.22.bb index 5d3508857..326818eef 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.22.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.22.bb @@ -23,9 +23,10 @@ UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" inherit autotools pkgconfig -PACKAGECONFIG ??= "debounce dejitter iir linear median pthres skip lowpass invert variance input touchkit waveshare" +PACKAGECONFIG ??= "debounce dejitter evthres iir linear median pthres skip lowpass invert variance input touchkit waveshare" PACKAGECONFIG[debounce] = "--enable-debounce,--disable-debounce" PACKAGECONFIG[dejitter] = "--enable-dejitter,--disable-dejitter" +PACKAGECONFIG[evthres] = "--enable-evthres,--disable-evthres" PACKAGECONFIG[iir] = "--enable-iir,--disable-iir" PACKAGECONFIG[linear] = "--enable-linear,--disable-linear" PACKAGECONFIG[median] = "--enable-median,--disable-median" @@ -49,6 +50,7 @@ PACKAGECONFIG[arctic2] = "--enable-arctic2,--disable-arctic2" PACKAGECONFIG[dmc_dus3000] = "--enable-dmc_dus3000,--disable-dmc_dus3000" PACKAGECONFIG[cy8mrln-palmpre] = "--enable-cy8mrln-palmpre,--disable-cy8mrln-palmpre" PACKAGECONFIG[galax] = "--enable-galax,--disable-galax" +PACKAGECONFIG[one-wire-ts-input] = "--enable-one-wire-ts-input,--disable-one-wire-ts-input" PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" do_install_prepend() { diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.92.1.bb index 0af0e91d6..c9cb74c9f 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.92.1.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://fedorahosted.org/lohit" LICENSE = "OFL-1.1" LIC_FILES_CHKSUM = "file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402" -SRCREV = "d678f1b1807ea5602586279e90b5db6d62ed475e" +SRCREV = "a403c9b7f509dad5e58dde85ef63b1c36fde3a21" SRC_URI = "git://github.com/pravins/lohit.git;branch=master" DEPENDS = "fontforge-native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Do-not-error-on-uninitialized-warnings.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Do-not-error-on-uninitialized-warnings.patch deleted file mode 100644 index 4f3c7554c..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Do-not-error-on-uninitialized-warnings.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f9906a3a1b7f1ade7a6c4e1a8aa67cb3a5e663a9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 3 Mar 2021 11:33:15 -0800 -Subject: [PATCH] Do not error on uninitialized warnings - -code in verifier.cc violates C/C++ aliasing rules so code should be -perhaps changed to use a union - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - external/amber/src/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/external/amber/src/CMakeLists.txt b/external/amber/src/CMakeLists.txt -index 80a0df7..4323c81 100644 ---- a/external/amber/src/CMakeLists.txt -+++ b/external/amber/src/CMakeLists.txt -@@ -133,6 +133,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - -Werror - -Wextra - -Wno-unknown-pragmas -+ -Wno-error=uninitialized - -Wpedantic - -pedantic-errors) - elseif(MSVC) --- -2.30.1 diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-limits-header-for-numeric_limits.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-limits-header-for-numeric_limits.patch new file mode 100644 index 000000000..746497d04 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-limits-header-for-numeric_limits.patch @@ -0,0 +1,88 @@ +From aec0be857ed3faef8802c7fd61f3d7798a565108 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 29 Apr 2021 16:03:42 -0700 +Subject: [PATCH] Include <limits> header for numeric_limits + +Fixes +vulkancts/framework/vulkan/vkRayTracingUtil.hpp:116:32: error: 'numeric_limits' is not a member of 'std' + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + framework/vulkan/vkRayTracingUtil.hpp | 1 + + modules/vulkan/api/vktApiBufferTests.cpp | 1 + + modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp | 2 ++ + 3 files changed, 4 insertions(+) + +--- a/framework/vulkan/vkRayTracingUtil.hpp ++++ b/framework/vulkan/vkRayTracingUtil.hpp +@@ -33,6 +33,7 @@ + #include "tcuVector.hpp" + #include "tcuVectorType.hpp" + ++#include <limits> + #include <vector> + + namespace vk +--- a/modules/vulkan/api/vktApiBufferTests.cpp ++++ b/modules/vulkan/api/vktApiBufferTests.cpp +@@ -35,6 +35,7 @@ + #include "tcuPlatform.hpp" + + #include <algorithm> ++#include <limits> + + namespace vkt + { +--- a/modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp ++++ b/modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp +@@ -28,6 +28,8 @@ + #include "vktSpvAsmComputeShaderCase.hpp" + #include "vktSpvAsmGraphicsShaderTestUtil.hpp" + ++#include <limits> ++ + namespace vkt + { + namespace SpirVAssembly +--- a/modules/vulkan/memory/vktMemoryDeviceMemoryReportTests.cpp ++++ b/modules/vulkan/memory/vktMemoryDeviceMemoryReportTests.cpp +@@ -40,6 +40,7 @@ + + #include "deSharedPtr.hpp" + ++#include <limits> + #include <set> + #include <vector> + +--- a/modules/vulkan/draw/vktDrawDepthClampTests.cpp ++++ b/modules/vulkan/draw/vktDrawDepthClampTests.cpp +@@ -38,6 +38,7 @@ + #include "vkQueryUtil.hpp" + #include "tcuTextureUtil.hpp" + ++#include <limits> + #include <cmath> + + namespace vkt +--- a/modules/vulkan/wsi/vktWsiFullScreenExclusiveTests.cpp ++++ b/modules/vulkan/wsi/vktWsiFullScreenExclusiveTests.cpp +@@ -39,6 +39,8 @@ + #include "tcuPlatform.hpp" + #include "tcuCommandLine.hpp" + ++#include <limits> ++ + #if ( DE_OS == DE_OS_WIN32 ) + #define NOMINMAX + #define WIN32_LEAN_AND_MEAN +--- a/modules/vulkan/synchronization/vktSynchronizationUtil.cpp ++++ b/modules/vulkan/synchronization/vktSynchronizationUtil.cpp +@@ -21,6 +21,7 @@ + * \brief Synchronization tests utilities + *//*--------------------------------------------------------------------*/ + ++#include <limits> + #include "vktSynchronizationUtil.hpp" + #include "vkTypeUtil.hpp" + #include "vkCmdUtil.hpp" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch new file mode 100644 index 000000000..6c87cad0a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch @@ -0,0 +1,73 @@ +From 9cd614dd5481a4fdf552effac4820f51a10092c7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mika=20V=C3=A4in=C3=B6l=C3=A4?= + <33728696+mvainola@users.noreply.github.com> +Date: Wed, 7 Apr 2021 13:12:17 +0300 +Subject: [PATCH] Workaround for GCC 11 uninit variable warnings (#946) + +Building Amber with GCC 11.0.1 produces some uninitialized variable +warnings. This commit works around them by replacing +reinterpret_cast with memcpy when type punning unsigned integers to +floats. + +Upstream-Status: Backport [https://github.com/google/amber/commit/aa69a0ac23ea7f68dd32bbef210546a5d84c1734] +--- + src/float16_helper.cc | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +diff --git a/src/float16_helper.cc b/src/float16_helper.cc +index 617bd72..5cb35e7 100644 +--- a/src/float16_helper.cc ++++ b/src/float16_helper.cc +@@ -15,6 +15,7 @@ + #include "src/float16_helper.h" + + #include <cassert> ++#include <cstring> + + // Float10 + // | 9 8 7 6 5 | 4 3 2 1 0 | +@@ -75,8 +76,11 @@ float HexFloat16ToFloat(const uint8_t* value) { + } + + uint32_t hex = sign | exponent | mantissa; +- float* hex_float = reinterpret_cast<float*>(&hex); +- return *hex_float; ++ float hex_float; ++ static_assert((sizeof(uint32_t) == sizeof(float)), ++ "sizeof(uint32_t) != sizeof(float)"); ++ memcpy(&hex_float, &hex, sizeof(float)); ++ return hex_float; + } + + // Convert float |value| whose size is 11 bits to 32 bits float +@@ -89,8 +93,11 @@ float HexFloat11ToFloat(const uint8_t* value) { + uint32_t mantissa = (static_cast<uint32_t>(value[0]) & 0x3f) << 17U; + + uint32_t hex = exponent | mantissa; +- float* hex_float = reinterpret_cast<float*>(&hex); +- return *hex_float; ++ float hex_float; ++ static_assert((sizeof(uint32_t) == sizeof(float)), ++ "sizeof(uint32_t) != sizeof(float)"); ++ memcpy(&hex_float, &hex, sizeof(float)); ++ return hex_float; + } + + // Convert float |value| whose size is 10 bits to 32 bits float +@@ -103,8 +110,11 @@ float HexFloat10ToFloat(const uint8_t* value) { + uint32_t mantissa = (static_cast<uint32_t>(value[0]) & 0x1f) << 18U; + + uint32_t hex = exponent | mantissa; +- float* hex_float = reinterpret_cast<float*>(&hex); +- return *hex_float; ++ float hex_float; ++ static_assert((sizeof(uint32_t) == sizeof(float)), ++ "sizeof(uint32_t) != sizeof(float)"); ++ memcpy(&hex_float, &hex, sizeof(float)); ++ return hex_float; + } + + } // namespace +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch new file mode 100644 index 000000000..2fd1d7123 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch @@ -0,0 +1,40 @@ +From 273df2423d9226093310cbcaa8b924bb6b5d6586 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 31 May 2021 17:31:33 -0700 +Subject: [PATCH] vulkancts: + +O_TRUNC value in OperationId enum collides with the macro O_TRUNC +defined in the POSIX header fnctl.h. To avoid the collision undefine +O_TRUNC in this particular sourcefile before its is used in enums +down below. + +This is fixed upstream differently +https://github.com/KhronosGroup/VK-GL-CTS/commit/564c6062f72fe7ecd92b4aea1558c441e651c76b + +But until we get this module uprev'ed to that, lets use a simpler +workaround + +Upstream-Status: Inappropriate [Fixed Differently] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp +index 22e6c75fa..db7f4b54a 100644 +--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp ++++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp +@@ -38,6 +38,10 @@ + #include <limits> + #include <fenv.h> + ++#ifdef O_TRUNC ++#undef O_TRUNC ++#endif ++ + namespace vkt + { + namespace SpirVAssembly +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch index b4573b38b..ea7659c69 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch @@ -1,7 +1,5 @@ -Index: git/external/glslang/src/glslang/Include/PoolAlloc.h -=================================================================== ---- git.orig/external/glslang/src/glslang/Include/PoolAlloc.h -+++ git/external/glslang/src/glslang/Include/PoolAlloc.h +--- a/external/glslang/src/glslang/Include/PoolAlloc.h ++++ b/external/glslang/src/glslang/Include/PoolAlloc.h @@ -240,8 +240,9 @@ protected: int numCalls; // just an interesting statistic diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch index 4116ae7d1..99cb87b30 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch @@ -1,19 +1,15 @@ -Index: git/framework/delibs/dethread/CMakeLists.txt -=================================================================== ---- git.orig/framework/delibs/dethread/CMakeLists.txt -+++ git/framework/delibs/dethread/CMakeLists.txt -@@ -39,6 +39,7 @@ include_directories( - - if (DE_OS_IS_UNIX) - add_definitions(-D_GNU_SOURCE) +--- a/framework/delibs/dethread/CMakeLists.txt ++++ b/framework/delibs/dethread/CMakeLists.txt +@@ -42,6 +42,7 @@ if (DE_OS_IS_UNIX) + add_definitions(-D__BSD_VISIBLE) + add_definitions(-D_XOPEN_SOURCE=600) + endif () + add_definitions(-D_XOPEN_SOURCE=600) - set(DETHREAD_LIBS ${DETHREAD_LIBS} pthread) - endif () + add_definitions(-D_GNU_SOURCE) -Index: git/framework/qphelper/CMakeLists.txt -=================================================================== ---- git.orig/framework/qphelper/CMakeLists.txt -+++ git/framework/qphelper/CMakeLists.txt + set(DETHREAD_LIBS ${DETHREAD_LIBS} pthread) +--- a/framework/qphelper/CMakeLists.txt ++++ b/framework/qphelper/CMakeLists.txt @@ -28,6 +28,7 @@ set(QPHELPER_LIBS if (DE_OS_IS_UNIX OR DE_OS_IS_QNX) # For vsnprintf() diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index e64a935dd..dc38bd169 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -22,6 +22,11 @@ REQUIRED_DISTRO_FEATURES += "opengl" DEPENDS += "libpng zlib virtual/libgles2 virtual/egl" +SRC_URI += "file://0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch;patchdir=external/amber/src \ + file://0001-Include-limits-header-for-numeric_limits.patch;patchdir=external/vulkancts \ + file://0001-vulkancts.patch \ +" + SRC_URI_append_libc-musl = "\ file://fix-musl.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.7.0.bb index 184547aa7..a67992ee9 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.7.0.bb @@ -1,16 +1,14 @@ DESCRIPTION = "OpenGL CTS" require khronos-cts.inc -# opengl-es-cts-3.2.6.1 -SRCREV_vk-gl-cts = "7e023f81b4fff54b558882fe739d7c959d0a02a8" -SRCREV_amber = "d26ee22dd7faab1845a531d410f7ec1db407402a" -SRCREV_glslang = "c538b5d796fb24dd418fdd650c7f76e56bcc3dd8" -SRCREV_spirv-headers = "e4322e3be589e1ddd44afb20ea842a977c1319b8" -SRCREV_spirv-tools = "1eb89172a82b436d8037e8a8c29c80f7e1f7df74" +# opengl-es-cts-3.2.7.0 +SRCREV_vk-gl-cts = "7cba7113c40f2ff03573c8c2c90661b2249e04fa" +SRCREV_amber = "4d0115cccfcb3b73d20b6513b1c40748e6403c50" +SRCREV_glslang = "ffccefddfd9a02ec0c0b6dd04ef5e1042279c97f" +SRCREV_spirv-headers = "104ecc356c1bea4476320faca64440cd1df655a3" +SRCREV_spirv-tools = "cd590fa3341284cd6d1ee82366155786cfd44c96" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" -SRC_URI += "file://0001-Do-not-error-on-uninitialized-warnings.patch" - S = "${WORKDIR}/git" do_install() { diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.3.2.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.6.0.bb index f07b12dec..f816c1bd1 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.6.0.bb @@ -1,12 +1,12 @@ DESCRIPTION = "Vulkan CTS" require khronos-cts.inc -# vulkan-cts-1.2.3.2 -SRCREV_vk-gl-cts = "5cd2240b60825fbbf6bd9ddda6af176ee3100c70" -SRCREV_amber = "a40bef4dba98d2d80b48e5a940d8574fbfceb197" -SRCREV_glslang = "b5f003d7a3ece37db45578a8a3140b370036fc64" -SRCREV_spirv-headers = "f8bf11a0253a32375c32cad92c841237b96696c0" -SRCREV_spirv-tools = "d2b486219495594f2e5d0e8d457fc234a3460b3b" +# vulkan-cts-1.2.6.0 +SRCREV_vk-gl-cts = "2cab49df5ad25a2d0061152367a21c6da83ed097" +SRCREV_amber = "dabae26164714abf951c6815a2b4513260f7c6a4" +SRCREV_glslang = "5c4f421121c4d24aad23a507e630dc5dc6c92c7c" +SRCREV_spirv-headers = "faa570afbc91ac73d594d787486bcf8f2df1ace0" +SRCREV_spirv-tools = "f11f7434815838bbad349124767b258ce7df41f0" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch index 270cc3562..2b108ab6c 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch @@ -17,10 +17,8 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Makefile | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile +--- a/Makefile ++++ b/Makefile @@ -8,12 +8,6 @@ ifeq ($(strip $CC),) CC = gcc endif @@ -79,7 +77,7 @@ Index: git/Makefile + -DRELEASE_DATE='"$(DATE)"' + SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h - SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c + SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c printk.c OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) @@ -52,12 +53,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) @@ -104,7 +102,7 @@ Index: git/Makefile +CFLAGS_COMMON += -DUSESNAPPY endif - LIBS := -lpthread $(LIBS) + LIBS := $(LIBS) -lpthread @@ -90,14 +91,14 @@ LIBS := $(LIBS) $(call try-run,\ all: makedumpfile diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch index 85d883365..f46fb3117 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch @@ -28,10 +28,8 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> arch/ppc64.c | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) -Index: git/arch/ppc64.c -=================================================================== ---- git.orig/arch/ppc64.c -+++ git/arch/ppc64.c +--- a/arch/ppc64.c ++++ b/arch/ppc64.c @@ -462,44 +462,6 @@ ppc64_vtop_level4(unsigned long vaddr) return paddr; } diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.9.bb index 475465124..79bad0a01 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.9.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" LICENSE = "GPLv2.0" SRCBRANCH ?= "master" -SRCREV = "18e0cdba48feeccea2429b3b0b2691f4314d1062" +SRCREV = "a9ad811c15e769c8e6d8d915a05cebc32f2ea2f5" DEPENDS = "bzip2 zlib elfutils xz" RDEPENDS_${PN}-tools = "perl ${PN}" diff --git a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch deleted file mode 100644 index ad255fae0..000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6181d9c3c407ee030b4c3a94045318b9e3a3cc89 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 25 Jul 2017 14:08:54 -0700 -Subject: [PATCH] minicoredumper: Initialize pointer to config struct to null - -Fixes -corestripper.c:3632:13: error: variable 'cfg' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/minicoredumper/corestripper.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/minicoredumper/corestripper.c b/src/minicoredumper/corestripper.c -index a764073..ddb0d25 100644 ---- a/src/minicoredumper/corestripper.c -+++ b/src/minicoredumper/corestripper.c -@@ -3605,7 +3605,7 @@ out: - - static int do_all_dumps(struct dump_info *di, int argc, char *argv[]) - { -- struct config *cfg; -+ struct config *cfg = 0; - const char *recept; - bool live_dumper; - char *comm_base; --- -2.13.3 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch new file mode 100644 index 000000000..455e6f318 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch @@ -0,0 +1,33 @@ +From 5895caba6573e84f73f159d9e84cd1aa7e969f18 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 9 May 2021 14:37:00 -0700 +Subject: [PATCH] replace pthread_mutexattr_setrobust_np with + pthread_mutexattr_setrobust + +This is now part of standard POSIX function [1] + +Upstream-Status: Submitted [https://github.com/diamon/minicoredumper/pull/3] + +[1] https://man7.org/linux/man-pages/man3/pthread_mutexattr_setrobust_np.3.html + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/minicoredumper_regd/daemon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/minicoredumper_regd/daemon.c b/src/minicoredumper_regd/daemon.c +index 115ec92..b9ad1ea 100644 +--- a/src/minicoredumper_regd/daemon.c ++++ b/src/minicoredumper_regd/daemon.c +@@ -224,7 +224,7 @@ static int setup_shm(void) + + pthread_mutexattr_init(&attr); + pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT); +- pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP); ++ pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST); + pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); + pthread_mutex_init(&sh->m, &attr); + +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb index d381c83ae..6a04e7891 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb @@ -14,6 +14,7 @@ SRCREV = "16a0d44f1725eaa93096eaa0e086f42ef4c2712c" PR .= "+git${SRCPV}" SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https \ + file://0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch \ file://minicoredumper.service \ file://minicoredumper.init \ " diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch new file mode 100644 index 000000000..33557275f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch @@ -0,0 +1,51 @@ +From 9bbc991a927722439cad38c892fc9f57207089d3 Mon Sep 17 00:00:00 2001 +From: Liwei Song <liwei.song@windriver.com> +Date: Mon, 24 May 2021 08:27:28 +0000 +Subject: [PATCH] sleepgraph.py: parse unfished cpu exec line + +exist the below case in ftrace file: +sleepgraph-6508 [003] .... 18197.824037: tracing_mark_write: ps - xxx..., lock_torture_wr-94 169,lock_torture_wr-95 143,lock_tort +sleepgraph-6508 [003] .... 18197.824043: tracing_mark_write: ure_wr-96 189,lock_torture_wr-97 174,lock_torture_wr-98 160,lock_torture_st-99 1 + +lock_torture_wr-96 was split to different line due to limited buffer +size(1k) set in kernel, check this case and re-parse the unfinished +line. + +Upstream-Status: [Submitted: https://github.com/intel/pm-graph/pull/20] + +Signed-off-by: Liwei Song <liwei.song@windriver.com> +--- + sleepgraph.py | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/sleepgraph.py b/sleepgraph.py +index e340d5b3f03b..38b4439db8eb 100755 +--- a/sleepgraph.py ++++ b/sleepgraph.py +@@ -3365,8 +3365,21 @@ def parseTraceLog(live=False): + val = ps.split() + if not val: + continue +- name = val[0].replace('--', '-') +- proclist[name] = int(val[1]) ++ if not len(val) < 2: ++ name = val[0].replace('--', '-') ++ proclist[name] = int(val[1]) ++ else: ++ proclist = dict() ++ nextline = next(tf) ++ mcont = re.match(tp.ftrace_line_fmt, nextline) ++ n = m.group('ps') + mcont.group('msg').split(': ')[1] ++ for pscont in n.split(','): ++ val = pscont.split() ++ if not val: ++ continue ++ if not len(val) < 2: ++ name = val[0].replace('--', '-') ++ proclist[name] = int(val[1]) + data.pstl[t.time] = proclist + continue + # find the end of resume +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb index 4526eeed3..4d7a1b2d4 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb @@ -10,6 +10,7 @@ SRC_URI = "git://github.com/intel/pm-graph.git \ file://0001-Makefile-fix-multilib-build-failure.patch \ file://0001-sleepgraph.py-use-python3.patch \ file://0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch \ + file://0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb index d39afff8e..906ca2c1f 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb @@ -12,6 +12,8 @@ S = "${WORKDIR}/git" do_install() { oe_runmake etcdir=${sysconfdir} DESTDIR=${D} install + mkdir -p ${D}${libdir}/traceevent/plugins/${BPN} + mv ${D}/${libdir}/traceevent/plugins/*.so ${D}${libdir}/traceevent/plugins/${BPN}/ } FILES_${PN} += "${libdir}/traceevent/plugins" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb index 3344821fa..54d396343 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb @@ -12,6 +12,9 @@ SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://0002-Do-not-use-rcmd-on-build-with-musl.patch \ file://0001-genisoimage-Add-missing-extern-definition.patch \ " +SRC_URI_append_class-nativesdk = " \ + file://0001-install-netscsid-to-bin-for-nativesdk.patch \ +" SRC_URI[md5sum] = "efe08e2f3ca478486037b053acd512e9" SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da" @@ -51,7 +54,7 @@ FILES_wodim = " \ " do_install_append() { - ln -sf ${bindir}/genisoimage ${D}${bindir}/mkisofs + ln -sf --relative ${D}${bindir}/genisoimage ${D}${bindir}/mkisofs } -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-install-netscsid-to-bin-for-nativesdk.patch b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-install-netscsid-to-bin-for-nativesdk.patch new file mode 100644 index 000000000..fdf1563b3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-install-netscsid-to-bin-for-nativesdk.patch @@ -0,0 +1,28 @@ +From 6b698b7c1045d279fe24818d45c67d9884d5fd81 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 7 May 2021 15:10:04 +0800 +Subject: [PATCH] install netscsid to bin for nativesdk + +For Yocto, the nativesdk does not have sbin dir, use bin to relpace + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + netscsid/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/netscsid/CMakeLists.txt b/netscsid/CMakeLists.txt +index f6bddf1..cf23312 100644 +--- a/netscsid/CMakeLists.txt ++++ b/netscsid/CMakeLists.txt +@@ -9,5 +9,5 @@ ADD_EXECUTABLE (netscsid netscsid.c) + #SET_SOURCE_FILES_PROPERTIES(netscsid.c ) + TARGET_LINK_LIBRARIES(netscsid ${EXTRA_LIBS} ) + #SET_TARGET_PROPERTIES(netscsid PROPERTIES SKIP_BUILD_RPATH TRUE) +-INSTALL(TARGETS netscsid DESTINATION sbin) ++INSTALL(TARGETS netscsid DESTINATION bin) + +-- +2.27.0 + diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.17.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.18.bb index d5288c7b7..038e9ce11 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.17.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.18.bb @@ -17,7 +17,7 @@ DEPENDS = "libsamplerate0 libsndfile1 readline" SRC_URI = "git://github.com/jackaudio/jack2.git \ file://0001-example-clients-Use-c-compiler-for-jack_simdtests.patch \ " -SRCREV = "9e23888b8def6527774889cf4ef6348fb78c7154" +SRCREV = "5041ab0fe7fb719efa5122386d355397289a91f0" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.2.bb index 65f5b6adf..ed7443dfd 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.2.bb @@ -4,8 +4,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27" SRC_URI = "http://download.videolan.org/pub/videolan/libdvdread/${PV}/libdvdread-${PV}.tar.bz2" -SRC_URI[md5sum] = "09c7423568fb679279fd2a2bc6b10b6e" -SRC_URI[sha256sum] = "3e357309a17c5be3731385b9eabda6b7e3fa010f46022a06f104553bf8e21796" +SRC_URI[md5sum] = "034581479968405ed415c34a50d00224" +SRC_URI[sha256sum] = "cc190f553758ced7571859e301f802cb4821f164d02bfacfd320c14a4e0da763" inherit autotools lib_package binconfig pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.33.1.bb index 171eef7b7..1a9150479 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.33.1.bb @@ -3,7 +3,13 @@ DESCRIPTION = "mpv is a fork of mplayer2 and MPlayer. It shares some features wi SECTION = "multimedia" HOMEPAGE = "http://www.mpv.io/" -DEPENDS = "zlib ffmpeg jpeg libv4l" +DEPENDS = " \ + zlib \ + ffmpeg \ + jpeg \ + libv4l \ + libass \ +" DEPENDS += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' virtual/libx11 xsp libxv libxscrnsaver libxinerama', '', d)} \ @@ -12,9 +18,9 @@ DEPENDS += " \ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=91f1cb870c1cc2d31351a4d2595441cb" -SRCREV_mpv = "70b991749df389bcc0a4e145b5687233a03b4ed7" +SRCREV_mpv = "b5d3e43198b9d57af5620b63537885aaa41fa8cd" SRC_URI = " \ - git://github.com/mpv-player/mpv;name=mpv \ + git://github.com/mpv-player/mpv;name=mpv;branch=release/0.33;protocol=https \ https://waf.io/waf-2.0.20;name=waf;subdir=git \ " SRC_URI[waf.sha256sum] = "bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f" @@ -27,18 +33,16 @@ LDFLAGS_append_riscv64 = " -latomic" LUA ?= "lua" LUA_mips64 = "" -LUA_aarch64 = "" LUA_powerpc64 = "" LUA_powerpc64le = "" LUA_riscv64 = "" LUA_riscv32 = "" LUA_powerpc = "" -# Note: both lua and libass are required to get on-screen-display (controls) +# Note: lua is required to get on-screen-display (controls) PACKAGECONFIG ??= " \ ${LUA} \ - libass \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ " @@ -46,11 +50,10 @@ PACKAGECONFIG ??= " \ PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11" PACKAGECONFIG[xv] = "--enable-xv,--disable-xv,libxv" PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" -PACKAGECONFIG[egl] = "--enable-egl,--disable-egl," +PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm" PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgbm" PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit" -PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive" PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack" PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" @@ -90,7 +93,6 @@ EXTRA_OECONF = " \ --confdir=${sysconfdir} \ --datadir=${datadir} \ --disable-manpage-build \ - --disable-libsmbclient \ --disable-libbluray \ --disable-dvdnav \ --disable-cdda \ diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0008-configure.ac-autodetect-availability-of-systemd.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0008-configure.ac-autodetect-availability-of-systemd.patch new file mode 100644 index 000000000..5aec3c574 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0008-configure.ac-autodetect-availability-of-systemd.patch @@ -0,0 +1,47 @@ +From 3f61e353424fb9ea3dce742022b94dfd7ea1ed9f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ulrich=20=C3=96lmann?= <u.oelmann@pengutronix.de> +Date: Thu, 4 Mar 2021 14:23:39 +0100 +Subject: [PATCH] configure.ac: autodetect availability of systemd +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Import systemd's official suggestion [1] how this should be handled in packages +using autoconf. A side effect of this is the removal of the hardcoded fallback +path "/lib/systemd/system" which leaks build host information when cross +compiling v4l-utils and therefore defeats reproducible builds. + +[1] https://www.freedesktop.org/software/systemd/man/daemon.html#Installing%20systemd%20Service%20Files + +Upstream-Status: Backport [https://git.linuxtv.org/v4l-utils.git/commit/?id=3f61e353424fb9ea3dce742022b94dfd7ea1ed9f] + +Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> +Signed-off-by: Sean Young <sean@mess.org> +--- + configure.ac | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 727730c5ccf4..8470116df4b1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -388,7 +388,15 @@ AC_ARG_WITH(udevdir, + AC_ARG_WITH(systemdsystemunitdir, + AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [set systemd system unit directory]), + [], +- [with_systemdsystemunitdir=`$PKG_CONFIG --variable=systemdsystemunitdir systemd || echo /lib/systemd/system`]) ++ [with_systemdsystemunitdir=auto]) ++AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], ++ [def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) ++ AS_IF([test "x$def_systemdsystemunitdir" = "x"], ++ [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], ++ [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) ++ with_systemdsystemunitdir=no], ++ [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) ++AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + + # Generic check: works with most distributions + def_gconv_dir=`for i in /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib; do if @<:@ -d \$i/gconv @:>@; then echo \$i/gconv; break; fi; done` +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0009-keytable-restrict-installation-of-50-rc_keymap.conf.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0009-keytable-restrict-installation-of-50-rc_keymap.conf.patch new file mode 100644 index 000000000..63a695f8f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0009-keytable-restrict-installation-of-50-rc_keymap.conf.patch @@ -0,0 +1,40 @@ +From 01f2c6c58e6f4441df7df8e27eb7919f1f01e310 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ulrich=20=C3=96lmann?= <u.oelmann@pengutronix.de> +Date: Thu, 4 Mar 2021 14:23:40 +0100 +Subject: [PATCH] keytable: restrict installation of 50-rc_keymap.conf +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It is only needed if BPF is effectively used and the package is compiled for a +systemd based target. + +Upstream-Status: Backport [https://git.linuxtv.org/v4l-utils.git/commit/?id=01f2c6c58e6f4441df7df8e27eb7919f1f01e310] + +Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> +Signed-off-by: Sean Young <sean@mess.org> +--- + utils/keytable/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/utils/keytable/Makefile.am b/utils/keytable/Makefile.am +index c5eb414acf2f..eee61f0e0551 100644 +--- a/utils/keytable/Makefile.am ++++ b/utils/keytable/Makefile.am +@@ -3,9 +3,13 @@ man_MANS = ir-keytable.1 rc_keymap.5 + sysconf_DATA = rc_maps.cfg + keytablesystem_DATA = $(srcdir)/rc_keymaps/* + udevrules_DATA = 70-infrared.rules ++if WITH_BPF ++if HAVE_SYSTEMD + if HAVE_UDEVDSYSCALLFILTER + systemdsystemunit_DATA = 50-rc_keymap.conf + endif ++endif ++endif + + ir_keytable_SOURCES = keytable.c parse.h ir-encode.c ir-encode.h toml.c toml.h keymap.c keymap.h + +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.20.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.20.0.bb index 3e92d49b4..2261feb56 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.20.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.20.0.bb @@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ PROVIDES = "libv4l media-ctl" DEPENDS = "jpeg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" DEPENDS_append_libc-musl = " argp-standalone" DEPENDS_append_class-target = " udev" LDFLAGS_append = " -pthread" @@ -21,13 +22,14 @@ SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \ file://export-mediactl-headers.patch \ file://0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch \ file://0007-Do-not-use-getsubopt.patch \ + file://0008-configure.ac-autodetect-availability-of-systemd.patch \ + file://0009-keytable-restrict-installation-of-50-rc_keymap.conf.patch \ " SRC_URI[md5sum] = "46f9e2c0b2fdccd009da2f7e1aa87894" SRC_URI[sha256sum] = "956118713f7ccb405c55c7088a6a2490c32d54300dd9a30d8d5008c28d3726f7" EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev \ - --disable-v4l2-compliance-32 --disable-v4l2-ctl-32 \ - --with-systemdsystemunitdir=${systemd_system_unitdir}" + --disable-v4l2-compliance-32 --disable-v4l2-ctl-32" VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps" @@ -37,8 +39,7 @@ RPROVIDES_${PN}-dbg += "libv4l-dbg" FILES_media-ctl = "${bindir}/media-ctl ${libdir}/libmediactl.so.*" -FILES_ir-keytable = "${bindir}/ir-keytable ${base_libdir}/udev/rules.d/*-infrared.rules \ - ${systemd_system_unitdir}/systemd-udevd.service.d/50-rc_keymap.conf" +FILES_ir-keytable = "${bindir}/ir-keytable ${base_libdir}/udev/rules.d/*-infrared.rules" RDEPENDS_ir-keytable += "${VIRTUAL-RUNTIME_ir-keytable-keymaps}" FILES_rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc*" diff --git a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.2.0.bb b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.3.2.bb index 4f21575c3..53ebf7b6a 100644 --- a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.3.2.bb @@ -7,8 +7,7 @@ DEPENDS = "libpcre zlib libjpeg-turbo" SRC_URI = "${SOURCEFORGE_MIRROR}/qpdf/qpdf-${PV}.tar.gz" LIC_FILES_CHKSUM = "file://Artistic-2.0;md5=7806296b9fae874361e6fb10072b7ee3" -SRC_URI[md5sum] = "c8f4430823603ee3b430b3250015ede5" -SRC_URI[sha256sum] = "43ef260f4e70672660e1882856d59b9319301c6f170673ab465430a71cffe44c" +SRC_URI[sha256sum] = "062808c40ef8741ec8160ae00168638a712cfa1d4bf673e8e595ab5eba1da947" inherit autotools-brokensep gettext diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit/Add-substitue-functions-for-strndupa-rawmemchr.patch b/meta-openembedded/meta-oe/recipes-security/audit/audit/Add-substitue-functions-for-strndupa-rawmemchr.patch new file mode 100644 index 000000000..bb6c61e80 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit/Add-substitue-functions-for-strndupa-rawmemchr.patch @@ -0,0 +1,133 @@ +From bdcdc3dff4469aac88e718bd15958d5ed4b9392a Mon Sep 17 00:00:00 2001 +From: Steve Grubb <sgrubb@redhat.com> +Date: Tue, 26 Feb 2019 18:33:33 -0500 +Subject: [PATCH] Add substitue functions for strndupa & rawmemchr + +Upstream-Status: Backport +[https://github.com/linux-audit/audit-userspace/commit/d579a08bb1cde71f939c13ac6b2261052ae9f77e] +--- + auparse/auparse.c | 12 +++++++++++- + auparse/interpret.c | 9 ++++++++- + configure.ac | 14 +++++++++++++- + src/ausearch-lol.c | 12 +++++++++++- + 4 files changed, 43 insertions(+), 4 deletions(-) + +diff --git a/auparse/auparse.c b/auparse/auparse.c +index 650db02..2e1c737 100644 +--- a/auparse/auparse.c ++++ b/auparse/auparse.c +@@ -1,5 +1,5 @@ + /* auparse.c -- +- * Copyright 2006-08,2012-17 Red Hat Inc., Durham, North Carolina. ++ * Copyright 2006-08,2012-19 Red Hat Inc., Durham, North Carolina. + * All Rights Reserved. + * + * This library is free software; you can redistribute it and/or +@@ -1118,6 +1118,16 @@ static int str2event(char *s, au_event_t *e) + return 0; + } + ++#ifndef HAVE_STRNDUPA ++static inline char *strndupa(const char *old, size_t n) ++{ ++ size_t len = strnlen(old, n); ++ char *tmp = alloca(len + 1); ++ tmp[len] = 0; ++ return memcpy(tmp, old, len); ++} ++#endif ++ + /* Returns 0 on success and 1 on error */ + static int extract_timestamp(const char *b, au_event_t *e) + { +diff --git a/auparse/interpret.c b/auparse/interpret.c +index 51c4a5e..67b7b77 100644 +--- a/auparse/interpret.c ++++ b/auparse/interpret.c +@@ -853,6 +853,13 @@ err_out: + return print_escaped(id->val); + } + ++// rawmemchr is faster. Let's use it if we have it. ++#ifdef HAVE_RAWMEMCHR ++#define STRCHR rawmemchr ++#else ++#define STRCHR strchr ++#endif ++ + static const char *print_proctitle(const char *val) + { + char *out = (char *)print_escaped(val); +@@ -863,7 +870,7 @@ static const char *print_proctitle(const char *val) + // Proctitle has arguments separated by NUL bytes + // We need to write over the NUL bytes with a space + // so that we can see the arguments +- while ((ptr = rawmemchr(ptr, '\0'))) { ++ while ((ptr = STRCHR(ptr, '\0'))) { + if (ptr >= end) + break; + *ptr = ' '; +diff --git a/configure.ac b/configure.ac +index 54bdbf1..aef07fb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,7 +1,7 @@ + dnl + define([AC_INIT_NOTICE], + [### Generated automatically using autoconf version] AC_ACVERSION [ +-### Copyright 2005-18 Steve Grubb <sgrubb@redhat.com> ++### Copyright 2005-19 Steve Grubb <sgrubb@redhat.com> + ### + ### Permission is hereby granted, free of charge, to any person obtaining a + ### copy of this software and associated documentation files (the "Software"), +@@ -72,6 +72,18 @@ dnl; posix_fallocate is used in audisp-remote + AC_CHECK_FUNCS([posix_fallocate]) + dnl; signalfd is needed for libev + AC_CHECK_FUNC([signalfd], [], [ AC_MSG_ERROR([The signalfd system call is necessary for auditd]) ]) ++dnl; check if rawmemchr is available ++AC_CHECK_FUNCS([rawmemchr]) ++dnl; check if strndupa is available ++AC_LINK_IFELSE( ++ [AC_LANG_SOURCE( ++ [[ ++ #define _GNU_SOURCE ++ #include <string.h> ++ int main() { (void) strndupa("test", 10); return 0; }]])], ++ [AC_DEFINE(HAVE_STRNDUPA, 1, [Let us know if we have it or not])], ++ [] ++) + + ALLWARNS="" + ALLDEBUG="-g" +diff --git a/src/ausearch-lol.c b/src/ausearch-lol.c +index 5d17a72..758c33e 100644 +--- a/src/ausearch-lol.c ++++ b/src/ausearch-lol.c +@@ -1,6 +1,6 @@ + /* + * ausearch-lol.c - linked list of linked lists library +-* Copyright (c) 2008,2010,2014,2016 Red Hat Inc., Durham, North Carolina. ++* Copyright (c) 2008,2010,2014,2016,2019 Red Hat Inc., Durham, North Carolina. + * All Rights Reserved. + * + * This software may be freely redistributed and/or modified under the +@@ -152,6 +152,16 @@ static int compare_event_time(event *e1, event *e2) + return 0; + } + ++#ifndef HAVE_STRNDUPA ++static inline char *strndupa(const char *old, size_t n) ++{ ++ size_t len = strnlen(old, n); ++ char *tmp = alloca(len + 1); ++ tmp[len] = 0; ++ return memcpy(tmp, old, len); ++} ++#endif ++ + /* + * This function will look at the line and pick out pieces of it. + */ +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit/Fixed-swig-host-contamination-issue.patch b/meta-openembedded/meta-oe/recipes-security/audit/audit/Fixed-swig-host-contamination-issue.patch new file mode 100644 index 000000000..740bcb5a7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit/Fixed-swig-host-contamination-issue.patch @@ -0,0 +1,57 @@ +From 3d13f92c1bb293523670ba01aea7e655b00a6709 Mon Sep 17 00:00:00 2001 +From: Li xin <lixin.fnst@cn.fujitsu.com> +Date: Sun, 19 Jul 2015 02:42:58 +0900 +Subject: [PATCH] audit: Fixed swig host contamination issue + +The audit build uses swig to generate a python wrapper. +Unfortunately, the swig info file references host include +directories. Some of these were previously noticed and +eliminated, but the one fixed here was not. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Anders Hedlund <anders.hedlund@windriver.com> +Signed-off-by: Joe Slater <jslater@windriver.com> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + bindings/swig/python3/Makefile.am | 3 ++- + bindings/swig/src/auditswig.i | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/bindings/swig/python3/Makefile.am b/bindings/swig/python3/Makefile.am +index dd9d934..61b486d 100644 +--- a/bindings/swig/python3/Makefile.am ++++ b/bindings/swig/python3/Makefile.am +@@ -22,6 +22,7 @@ + CONFIG_CLEAN_FILES = *.loT *.rej *.orig + AM_CFLAGS = -fPIC -DPIC -fno-strict-aliasing $(PYTHON3_CFLAGS) + AM_CPPFLAGS = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES) ++STDINC ?= /usr/include + LIBS = $(top_builddir)/lib/libaudit.la + SWIG_FLAGS = -python -py3 -modern + SWIG_INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES) +@@ -36,7 +37,7 @@ _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h ${top_builddir}/lib/libaudi + _audit_la_LIBADD = ${top_builddir}/lib/libaudit.la + nodist__audit_la_SOURCES = audit_wrap.c + audit.py audit_wrap.c: ${srcdir}/../src/auditswig.i +- swig -o audit_wrap.c ${SWIG_FLAGS} ${SWIG_INCLUDES} ${srcdir}/../src/auditswig.i ++ swig -o audit_wrap.c ${SWIG_FLAGS} ${SWIG_INCLUDES} -I$(STDINC) ${srcdir}/../src/auditswig.i + + CLEANFILES = audit.py* audit_wrap.c *~ + +diff --git a/bindings/swig/src/auditswig.i b/bindings/swig/src/auditswig.i +index 21aafca..dd0f62c 100644 +--- a/bindings/swig/src/auditswig.i ++++ b/bindings/swig/src/auditswig.i +@@ -39,7 +39,7 @@ signed + #define __attribute(X) /*nothing*/ + typedef unsigned __u32; + typedef unsigned uid_t; +-%include "/usr/include/linux/audit.h" ++%include "linux/audit.h" + #define __extension__ /*nothing*/ + %include <stdint.i> + %include "../lib/libaudit.h" +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit/audit-volatile.conf b/meta-openembedded/meta-oe/recipes-security/audit/audit/audit-volatile.conf new file mode 100644 index 000000000..9cbe1547a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit/audit-volatile.conf @@ -0,0 +1 @@ +d /var/log/audit 0750 root root - diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit/auditd b/meta-openembedded/meta-oe/recipes-security/audit/audit/auditd new file mode 100644 index 000000000..6aa7f9475 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit/auditd @@ -0,0 +1,153 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: auditd +# Required-Start: $local_fs +# Required-Stop: $local_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Audit Daemon +# Description: Collects audit information from Linux 2.6 Kernels. +### END INIT INFO + +# Author: Philipp Matthias Hahn <pmhahn@debian.org> +# Based on Debians /etc/init.d/skeleton and Auditds init.d/auditd.init + +# June, 2012: Adopted for yocto <amy.fong@windriver.com> + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DESC="audit daemon" +NAME=auditd +DAEMON=/sbin/auditd +PIDFILE=/var/run/"$NAME".pid +SCRIPTNAME=/etc/init.d/"$NAME" + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/"$NAME" ] && . /etc/default/"$NAME" + +. /etc/default/rcS + +. /etc/init.d/functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon -S --quiet --pidfile "$PIDFILE" --exec "$DAEMON" --test > /dev/null \ + || return 1 + start-stop-daemon -S --quiet --pidfile "$PIDFILE" --exec "$DAEMON" -- \ + $EXTRAOPTIONS \ + || return 2 + if [ -f /etc/audit/audit.rules ] + then + /sbin/auditctl -R /etc/audit/audit.rules >/dev/null + fi +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon -K --quiet --pidfile "$PIDFILE" --name "$NAME" + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f "$PIDFILE" + rm -f /var/run/audit_events + # Remove watches so shutdown works cleanly + case "$AUDITD_CLEAN_STOP" in + no|NO) ;; + *) /sbin/auditctl -D >/dev/null ;; + esac + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + start-stop-daemon -K --signal HUP --quiet --pidfile $PIDFILE --name $NAME + return 0 +} + +if [ ! -e /var/log/audit ]; then + mkdir -p /var/log/audit + [ -x /sbin/restorecon ] && /sbin/restorecon -F $(readlink -f /var/log/audit) +fi + +case "$1" in + start) + [ "$VERBOSE" != no ] && echo "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && echo 0 ;; + 2) [ "$VERBOSE" != no ] && echo 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && echo "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && echo 0 ;; + 2) [ "$VERBOSE" != no ] && echo 1 ;; + esac + ;; + reload|force-reload) + echo "Reloading $DESC" "$NAME" + do_reload + echo $? + ;; + restart) + echo "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) echo 0 ;; + 1) echo 1 ;; # Old process is still running + *) echo 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + echo 1 + ;; + esac + ;; + rotate) + echo "Rotating $DESC logs" "$NAME" + start-stop-daemon -K --signal USR1 --quiet --pidfile "$PIDFILE" --name "$NAME" + echo $? + ;; + status) + pidofproc "$DAEMON" >/dev/null + status=$? + if [ $status -eq 0 ]; then + echo "$NAME is running." + else + echo "$NAME is not running." + fi + exit $status + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|rotate|status}" >&2 + exit 3 + ;; +esac + +: diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit/auditd.service b/meta-openembedded/meta-oe/recipes-security/audit/audit/auditd.service new file mode 100644 index 000000000..06c63f0e5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit/auditd.service @@ -0,0 +1,28 @@ +[Unit] +Description=Security Auditing Service +DefaultDependencies=no +After=local-fs.target systemd-tmpfiles-setup.service +Before=sysinit.target shutdown.target +Conflicts=shutdown.target +ConditionKernelCommandLine=!audit=0 + +[Service] +Type=forking +PIDFile=/run/auditd.pid +ExecStart=/sbin/auditd +## To use augenrules, uncomment the next line and comment/delete the auditctl line. +## NOTE: augenrules expect any rules to be added to /etc/audit/rules.d/ +#ExecStartPost=-/sbin/augenrules --load +ExecStartPost=-/sbin/auditctl -R /etc/audit/audit.rules +# By default we don't clear the rules on exit. +# To enable this, uncomment the next line. +#ExecStopPost=/sbin/auditctl -R /etc/audit/audit-stop.rules + +### Security Settings ### +MemoryDenyWriteExecute=true +LockPersonality=true +ProtectControlGroups=true +ProtectKernelModules=true + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit_2.8.5.bb b/meta-openembedded/meta-oe/recipes-security/audit/audit_2.8.5.bb new file mode 100644 index 000000000..ee3b3b5e0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit_2.8.5.bb @@ -0,0 +1,105 @@ +SUMMARY = "User space tools for kernel auditing" +DESCRIPTION = "The audit package contains the user space utilities for \ +storing and searching the audit records generated by the audit subsystem \ +in the Linux kernel." +HOMEPAGE = "http://people.redhat.com/sgrubb/audit/" +SECTION = "base" +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=2.8_maintenance \ + file://Add-substitue-functions-for-strndupa-rawmemchr.patch \ + file://Fixed-swig-host-contamination-issue.patch \ + file://auditd \ + file://auditd.service \ + file://audit-volatile.conf \ +" + +S = "${WORKDIR}/git" +SRCREV = "5fae55c1ad15b3cefe6890eba7311af163e9133c" + +inherit autotools python3native update-rc.d systemd + +UPDATERCPN = "auditd" +INITSCRIPT_NAME = "auditd" +INITSCRIPT_PARAMS = "defaults" + +SYSTEMD_PACKAGES = "auditd" +SYSTEMD_SERVICE_auditd = "auditd.service" + +DEPENDS += "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native" + +EXTRA_OECONF += "--without-prelude \ + --with-libwrap \ + --enable-gssapi-krb5=no \ + --with-libcap-ng=yes \ + --with-python3=yes \ + --libdir=${base_libdir} \ + --sbindir=${base_sbindir} \ + --without-python \ + --without-golang \ + --disable-zos-remote \ + " +EXTRA_OECONF_append_arm = " --with-arm=yes" +EXTRA_OECONF_append_aarch64 = " --with-aarch64=yes" + +EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \ + PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \ + pyexecdir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ + STDINC='${STAGING_INCDIR}' \ + pkgconfigdir=${libdir}/pkgconfig \ + " + +SUMMARY_audispd-plugins = "Plugins for the audit event dispatcher" +DESCRIPTION_audispd-plugins = "The audispd-plugins package provides plugins for the real-time \ +interface to the audit system, audispd. These plugins can do things \ +like relay events to remote machines or analyze events for suspicious \ +behavior." + +PACKAGES =+ "audispd-plugins" +PACKAGES += "auditd ${PN}-python" + +FILES_${PN} = "${sysconfdir}/libaudit.conf ${base_libdir}/libaudit.so.1* ${base_libdir}/libauparse.so.*" +FILES_auditd += "${bindir}/* ${base_sbindir}/* ${sysconfdir}/*" +FILES_audispd-plugins += "${sysconfdir}/audisp/audisp-remote.conf \ + ${sysconfdir}/audisp/plugins.d/au-remote.conf \ + ${sbindir}/audisp-remote ${localstatedir}/spool/audit \ + " +FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" +FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" + +CONFFILES_auditd += "${sysconfdir}/audit/audit.rules" +RDEPENDS_auditd += "bash" + +do_install_append() { + rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a + rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la + + # reuse auditd config + [ ! -e ${D}/etc/default ] && mkdir ${D}/etc/default + mv ${D}/etc/sysconfig/auditd ${D}/etc/default + rmdir ${D}/etc/sysconfig/ + + # replace init.d + install -D -m 0755 ${WORKDIR}/auditd ${D}/etc/init.d/auditd + rm -rf ${D}/etc/rc.d + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d/ + install -m 0644 ${WORKDIR}/audit-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ + fi + + # install systemd unit files + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/auditd.service ${D}${systemd_unitdir}/system + + # audit-2.5 doesn't install any rules by default, so we do that here + mkdir -p ${D}/etc/audit ${D}/etc/audit/rules.d + cp ${S}/rules/10-base-config.rules ${D}/etc/audit/rules.d/audit.rules + + chmod 750 ${D}/etc/audit ${D}/etc/audit/rules.d + chmod 640 ${D}/etc/audit/auditd.conf ${D}/etc/audit/rules.d/audit.rules + + # Based on the audit.spec "Copy default rules into place on new installation" + cp ${D}/etc/audit/rules.d/audit.rules ${D}/etc/audit/audit.rules +} diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.1.bb b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.1.bb new file mode 100644 index 000000000..ba24d360e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.1.bb @@ -0,0 +1,109 @@ +SUMMARY = "User space tools for kernel auditing" +DESCRIPTION = "The audit package contains the user space utilities for \ +storing and searching the audit records generated by the audit subsystem \ +in the Linux kernel." +HOMEPAGE = "http://people.redhat.com/sgrubb/audit/" +SECTION = "base" +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master \ + file://Fixed-swig-host-contamination-issue.patch \ + file://auditd \ + file://auditd.service \ + file://audit-volatile.conf \ +" + +S = "${WORKDIR}/git" +SRCREV = "46cb7d92443c9ec7b3af15fb0baa65f65f6415d3" + +inherit autotools python3native update-rc.d systemd + +UPDATERCPN = "auditd" +INITSCRIPT_NAME = "auditd" +INITSCRIPT_PARAMS = "defaults" + +SYSTEMD_PACKAGES = "auditd" +SYSTEMD_SERVICE_auditd = "auditd.service" + +DEPENDS = "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native" + +EXTRA_OECONF = " --with-libwrap \ + --enable-gssapi-krb5=no \ + --with-libcap-ng=yes \ + --with-python3=yes \ + --libdir=${base_libdir} \ + --sbindir=${base_sbindir} \ + --without-python \ + --without-golang \ + --disable-zos-remote \ + --with-arm=yes \ + --with-aarch64=yes \ + " + +EXTRA_OEMAKE = "PYLIBVER='python${PYTHON_BASEVERSION}' \ + PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \ + pyexecdir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ + STDINC='${STAGING_INCDIR}' \ + pkgconfigdir=${libdir}/pkgconfig \ + " + +SUMMARY_audispd-plugins = "Plugins for the audit event dispatcher" +DESCRIPTION_audispd-plugins = "The audispd-plugins package provides plugins for the real-time \ +interface to the audit system, audispd. These plugins can do things \ +like relay events to remote machines or analyze events for suspicious \ +behavior." + +PACKAGES =+ "audispd-plugins" +PACKAGES += "auditd ${PN}-python" + +FILES_${PN} = "${sysconfdir}/libaudit.conf ${base_libdir}/libaudit.so.1* ${base_libdir}/libauparse.so.*" +FILES_auditd = "${bindir}/* ${base_sbindir}/* ${sysconfdir}/* ${datadir}/audit/*" +FILES_audispd-plugins = "${sysconfdir}/audit/audisp-remote.conf \ + ${sysconfdir}/audit/plugins.d/au-remote.conf \ + ${sysconfdir}/audit/plugins.d/syslog.conf \ + ${base_sbindir}/audisp-remote \ + ${base_sbindir}/audisp-syslog \ + ${localstatedir}/spool/audit \ + " +FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" +FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" + +CONFFILES_auditd = "${sysconfdir}/audit/audit.rules" +RDEPENDS_auditd = "bash" + +do_install_append() { + rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a + rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la + + # reuse auditd config + [ ! -e ${D}/etc/default ] && mkdir ${D}/etc/default + mv ${D}/etc/sysconfig/auditd ${D}/etc/default + rmdir ${D}/etc/sysconfig/ + + # replace init.d + install -D -m 0755 ${WORKDIR}/auditd ${D}/etc/init.d/auditd + rm -rf ${D}/etc/rc.d + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + # install systemd unit files + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/auditd.service ${D}${systemd_unitdir}/system + + install -d ${D}${sysconfdir}/tmpfiles.d/ + install -m 0644 ${WORKDIR}/audit-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ + fi + + # audit-2.5 doesn't install any rules by default, so we do that here + mkdir -p ${D}/etc/audit ${D}/etc/audit/rules.d + cp ${S}/rules/10-base-config.rules ${D}/etc/audit/rules.d/audit.rules + + chmod 750 ${D}/etc/audit ${D}/etc/audit/rules.d + chmod 640 ${D}/etc/audit/auditd.conf ${D}/etc/audit/rules.d/audit.rules + + # Based on the audit.spec "Copy default rules into place on new installation" + cp ${D}/etc/audit/rules.d/audit.rules ${D}/etc/audit/audit.rules + + # Create /var/spool/audit directory for audisp-remote + install -m 0700 -d ${D}${localstatedir}/spool/audit +} diff --git a/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb b/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb index c76d2324e..17bc40911 100644 --- a/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb +++ b/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb @@ -50,9 +50,11 @@ do_configure() { } do_install_append() { - if [ -f "${D}${bindir}/ndiff" ]; then - sed -i 's@^#!.*$@#!/usr/bin/env python3@g' ${D}${bindir}/ndiff - fi + for f in ndiff uninstall_ndiff; do + if [ -f ${D}${bindir}/$f ]; then + sed -i 's@^#!.*$@#!/usr/bin/env python3@g' ${D}${bindir}/$f + fi + done } FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}/ncat" diff --git a/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.22.03.bb b/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb index fab626c61..f74f582e3 100644 --- a/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.22.03.bb +++ b/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb @@ -13,8 +13,8 @@ SRC_URI = " \ file://0001-Enable-system-malloc-on-all-linux.patch \ file://0002-Add-debian-csh-scripts.patch \ " -SRC_URI[md5sum] = "c9387b7c8cf958956e75b1fa4e59b612" -SRC_URI[sha256sum] = "be2cfd653d2a0c7f506d2dd14c12324ba749bd484037be6df44a3973f52262b7" +SRC_URI[md5sum] = "fa2b347fa9ae866eb036e6e4bb85fe1a" +SRC_URI[sha256sum] = "eb16356243218c32f39e07258d72bf8b21e62ce94bb0e8a95e318b151397e231" EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}'" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.4.2.bb b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.8.bb index 3aab65bf5..f87231db2 100644 --- a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.4.2.bb +++ b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.8.bb @@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=1a4c4cda3e8096d2fd483ff2f4514fec" DEPENDS = "ncurses bison-native libcap libpcre gdbm groff-native" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "dfe156fd69b0d8d1745ecf6d6e02e047" -SRC_URI[sha256sum] = "957bcdb2c57f64c02f673693ea5a7518ef24b6557aeb3a4ce222cefa6d74acc9" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/5.8/${BP}.tar.xz" +SRC_URI[sha256sum] = "dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27" -inherit autotools gettext update-alternatives +inherit autotools-brokensep gettext update-alternatives manpages EXTRA_OECONF = " \ --bindir=${base_bindir} \ @@ -38,7 +37,7 @@ EXTRA_OEMAKE = "-e MAKEFLAGS=" ALTERNATIVE_${PN} = "sh" ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}" -ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_PRIORITY = "90" export AUTOHEADER = "true" @@ -47,19 +46,13 @@ do_configure () { oe_runconf } -do_install_append () { - rm -fr ${D}/usr/share - rmdir --ignore-fail-on-non-empty ${D}/usr -} - pkg_postinst_${PN} () { touch $D${sysconfdir}/shells grep -q "bin/zsh" $D${sysconfdir}/shells || echo /bin/zsh >> $D${sysconfdir}/shells grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells } -FILES_${PN}-dbg += "\ - ${libdir}/${PN}/${PV}/${PN}/.debug/*.so \ - ${libdir}/${PN}/${PV}/${PN}/db/.debug/*.so \ - ${libdir}/${PN}/${PV}/${PN}/net/.debug/*.so \ -" +# work around QA failures with usrmerge installing zsh in /usr/bin/zsh instead of /bin/zsh +# ERROR: QA Issue: /usr/share/zsh/5.8/functions/zed contained in package zsh requires /bin/zsh, but no providers found in RDEPENDS_zsh? [file-rdeps] +# like bash does since https://git.openembedded.org/openembedded-core/commit/?id=4759408677a4e60c5fa7131afcb5bc184cf2f90a +RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/zsh', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-openembedded/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch index 278b90e07..aae2be8c1 100644 --- a/meta-openembedded/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch @@ -89,11 +89,11 @@ index a5e2328..dec509a 100644 +} + diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c -index f231814..2c8fe77 100644 +index 8beec43..398ff7a 100644 --- a/lib/colord/cd-icc.c +++ b/lib/colord/cd-icc.c -@@ -3094,68 +3094,6 @@ out: - return ret; +@@ -3114,68 +3114,6 @@ cd_icc_create_default (CdIcc *icc, GError **error) + return cd_icc_create_default_full (icc, CD_ICC_LOAD_FLAGS_NONE, error); } -/** diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord.inc b/meta-openembedded/meta-oe/recipes-support/colord/colord.inc index 7497fed51..09e600c94 100644 --- a/meta-openembedded/meta-oe/recipes-support/colord/colord.inc +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord.inc @@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = " \ file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \ " -PV = "1.4.4" +PV = "1.4.5" SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "32c2709a6002d9ee750483aaed6379c8" -SRC_URI[sha256sum] = "9a0fe80160bf88efddb582a9fc0169f56065276dc3882c47dddb9eecd048c0a5" +SRC_URI[sha256sum] = "b774ea443d239f4a2ee1853bd678426e669ddeda413dcb71cea1638c4d6c5e17" diff --git a/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.2.bb b/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.2.bb index e3157ec42..01629f416 100644 --- a/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.2.bb @@ -4,8 +4,9 @@ HOMEPAGE = "https://www.gnu.org/software/emacs/" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" -SRC_URI = "https://ftp.gnu.org/pub/gnu/emacs/emacs-${PV}.tar.xz" - +SRC_URI = "https://ftp.gnu.org/pub/gnu/emacs/emacs-${PV}.tar.xz \ + file://emacs-glibc-2.34.patch \ + " SRC_URI_append_class-target = " file://usemake-docfile-native.patch" SRC_URI[sha256sum] = "b4a7cc4e78e63f378624e0919215b910af5bb2a0afc819fad298272e9f40c1b9" diff --git a/meta-openembedded/meta-oe/recipes-support/emacs/files/emacs-glibc-2.34.patch b/meta-openembedded/meta-oe/recipes-support/emacs/files/emacs-glibc-2.34.patch new file mode 100644 index 000000000..6d764aa26 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/emacs/files/emacs-glibc-2.34.patch @@ -0,0 +1,40 @@ +From f97e07ea807cc6d38774a3888a15091b20645ac6 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Tue, 9 Mar 2021 11:22:59 -0800 +Subject: [PATCH] Port alternate signal stack to upcoming glibc 2.34 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* src/sysdep.c (sigsegv_stack): Increase size to 64 KiB and align +it to max_align_t. This copies from Gnulib’s c-stack.c, and works +around a portability bug in draft glibc 2.34, which no longer +defines SIGSTKSZ when _GNU_SOURCE is defined. +--- + src/sysdep.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/sysdep.c b/src/sysdep.c +index 941b4e2fa2..24d8832b2f 100644 +--- a/src/sysdep.c ++++ b/src/sysdep.c +@@ -1785,7 +1785,15 @@ handle_arith_signal (int sig) + + /* Alternate stack used by SIGSEGV handler below. */ + +-static unsigned char sigsegv_stack[SIGSTKSZ]; ++/* Storage for the alternate signal stack. ++ 64 KiB is not too large for Emacs, and is large enough ++ for all known platforms. Smaller sizes may run into trouble. ++ For example, libsigsegv 2.6 through 2.8 have a bug where some ++ architectures use more than the Linux default of an 8 KiB alternate ++ stack when deciding if a fault was caused by stack overflow. */ ++static max_align_t sigsegv_stack[(64 * 1024 ++ + sizeof (max_align_t) - 1) ++ / sizeof (max_align_t)]; + + + /* Return true if SIGINFO indicates a stack overflow. */ +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb b/meta-openembedded/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb new file mode 100644 index 000000000..c9a382ad4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "Kernel evdev device emulation" +DESCRIPTION = "The evemu library and tools are used to describe devices, record data, create devices and replay data from kernel evdev devices." +HOMEPAGE = "https://www.freedesktop.org/wiki/Evemu" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" + +DEPENDS = "libevdev" + +SRCREV = "86a5627dbeac8d9d9bc34326a758d6a477e876e4" +SRC_URI = "git://git@gitlab.freedesktop.org/libevdev/evemu.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" +PV = "gitr${SRCPV}" + +inherit autotools pkgconfig + +PACKAGES =+ "${PN}-python" +FILES_${PN}-python = "${libdir}/python*/site-packages/*" +RDEPENDS_${PN}-python = "python3" + diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29457.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29457.patch new file mode 100644 index 000000000..e5d069487 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29457.patch @@ -0,0 +1,26 @@ +From 13e5a3e02339b746abcaee6408893ca2fd8e289d Mon Sep 17 00:00:00 2001 +From: Pydera <pydera@mailbox.org> +Date: Thu, 8 Apr 2021 17:36:16 +0200 +Subject: [PATCH] Fix out of buffer access in #1529 + +--- + src/jp2image.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/jp2image.cpp b/src/jp2image.cpp +index 88ab9b2d6..12025f966 100644 +--- a/src/jp2image.cpp ++++ b/src/jp2image.cpp +@@ -776,9 +776,10 @@ static void boxes_check(size_t b,size_t m) + #endif + box.length = (uint32_t) (io_->size() - io_->tell() + 8); + } +- if (box.length == 1) ++ if (box.length < 8) + { +- // FIXME. Special case. the real box size is given in another place. ++ // box is broken, so there is nothing we can do here ++ throw Error(kerCorruptedMetadata); + } + + // Read whole box : Box header + Box data (not fixed size - can be null). diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29458.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29458.patch new file mode 100644 index 000000000..285f6fe4c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29458.patch @@ -0,0 +1,37 @@ +From 9b7a19f957af53304655ed1efe32253a1b11a8d0 Mon Sep 17 00:00:00 2001 +From: Kevin Backhouse <kevinbackhouse@github.com> +Date: Fri, 9 Apr 2021 13:37:48 +0100 +Subject: [PATCH] Fix integer overflow. +--- + src/crwimage_int.cpp | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/crwimage_int.cpp b/src/crwimage_int.cpp +index aefaf22..2e3e507 100644 +--- a/src/crwimage_int.cpp ++++ b/src/crwimage_int.cpp +@@ -559,7 +559,7 @@ namespace Exiv2 { + void CiffComponent::setValue(DataBuf buf) + { + if (isAllocated_) { +- delete pData_; ++ delete[] pData_; + pData_ = 0; + size_ = 0; + } +@@ -1167,7 +1167,11 @@ namespace Exiv2 { + pCrwMapping->crwDir_); + if (edX != edEnd || edY != edEnd || edO != edEnd) { + uint32_t size = 28; +- if (cc && cc->size() > size) size = cc->size(); ++ if (cc) { ++ if (cc->size() < size) ++ throw Error(kerCorruptedMetadata); ++ size = cc->size(); ++ } + DataBuf buf(size); + std::memset(buf.pData_, 0x0, buf.size_); + if (cc) std::memcpy(buf.pData_ + 8, cc->pData() + 8, cc->size() - 8); +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29463.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29463.patch new file mode 100644 index 000000000..5ab64a7d3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29463.patch @@ -0,0 +1,120 @@ +From 783b3a6ff15ed6f82a8f8e6c8a6f3b84a9b04d4b Mon Sep 17 00:00:00 2001 +From: Kevin Backhouse <kevinbackhouse@github.com> +Date: Mon, 19 Apr 2021 18:06:00 +0100 +Subject: [PATCH] Improve bound checking in WebPImage::doWriteMetadata() + +--- + src/webpimage.cpp | 41 ++++++++++++++++++++++++++++++----------- + 1 file changed, 30 insertions(+), 11 deletions(-) + +diff --git a/src/webpimage.cpp b/src/webpimage.cpp +index 4ddec544c..fee110bca 100644 +--- a/src/webpimage.cpp ++++ b/src/webpimage.cpp +@@ -145,7 +145,7 @@ namespace Exiv2 { + DataBuf chunkId(WEBP_TAG_SIZE+1); + chunkId.pData_ [WEBP_TAG_SIZE] = '\0'; + +- io_->read(data, WEBP_TAG_SIZE * 3); ++ readOrThrow(*io_, data, WEBP_TAG_SIZE * 3, Exiv2::kerCorruptedMetadata); + uint64_t filesize = Exiv2::getULong(data + WEBP_TAG_SIZE, littleEndian); + + /* Set up header */ +@@ -185,13 +185,20 @@ namespace Exiv2 { + case we have any exif or xmp data, also check + for any chunks with alpha frame/layer set */ + while ( !io_->eof() && (uint64_t) io_->tell() < filesize) { +- io_->read(chunkId.pData_, WEBP_TAG_SIZE); +- io_->read(size_buff, WEBP_TAG_SIZE); +- long size = Exiv2::getULong(size_buff, littleEndian); ++ readOrThrow(*io_, chunkId.pData_, WEBP_TAG_SIZE, Exiv2::kerCorruptedMetadata); ++ readOrThrow(*io_, size_buff, WEBP_TAG_SIZE, Exiv2::kerCorruptedMetadata); ++ const uint32_t size_u32 = Exiv2::getULong(size_buff, littleEndian); ++ ++ // Check that `size_u32` is safe to cast to `long`. ++ enforce(size_u32 <= static_cast<size_t>(std::numeric_limits<unsigned int>::max()), ++ Exiv2::kerCorruptedMetadata); ++ const long size = static_cast<long>(size_u32); + DataBuf payload(size); +- io_->read(payload.pData_, payload.size_); +- byte c; +- if ( payload.size_ % 2 ) io_->read(&c,1); ++ readOrThrow(*io_, payload.pData_, payload.size_, Exiv2::kerCorruptedMetadata); ++ if ( payload.size_ % 2 ) { ++ byte c; ++ readOrThrow(*io_, &c, 1, Exiv2::kerCorruptedMetadata); ++ } + + /* Chunk with information about features + used in the file. */ +@@ -199,6 +206,7 @@ namespace Exiv2 { + has_vp8x = true; + } + if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8X) && !has_size) { ++ enforce(size >= 10, Exiv2::kerCorruptedMetadata); + has_size = true; + byte size_buf[WEBP_TAG_SIZE]; + +@@ -227,6 +235,7 @@ namespace Exiv2 { + } + #endif + if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8) && !has_size) { ++ enforce(size >= 10, Exiv2::kerCorruptedMetadata); + has_size = true; + byte size_buf[2]; + +@@ -244,11 +253,13 @@ namespace Exiv2 { + + /* Chunk with with lossless image data. */ + if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8L) && !has_alpha) { ++ enforce(size >= 5, Exiv2::kerCorruptedMetadata); + if ((payload.pData_[4] & WEBP_VP8X_ALPHA_BIT) == WEBP_VP8X_ALPHA_BIT) { + has_alpha = true; + } + } + if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8L) && !has_size) { ++ enforce(size >= 5, Exiv2::kerCorruptedMetadata); + has_size = true; + byte size_buf_w[2]; + byte size_buf_h[3]; +@@ -276,11 +287,13 @@ namespace Exiv2 { + + /* Chunk with animation frame. */ + if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_ANMF) && !has_alpha) { ++ enforce(size >= 6, Exiv2::kerCorruptedMetadata); + if ((payload.pData_[5] & 0x2) == 0x2) { + has_alpha = true; + } + } + if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_ANMF) && !has_size) { ++ enforce(size >= 12, Exiv2::kerCorruptedMetadata); + has_size = true; + byte size_buf[WEBP_TAG_SIZE]; + +@@ -309,16 +322,22 @@ namespace Exiv2 { + + io_->seek(12, BasicIo::beg); + while ( !io_->eof() && (uint64_t) io_->tell() < filesize) { +- io_->read(chunkId.pData_, 4); +- io_->read(size_buff, 4); ++ readOrThrow(*io_, chunkId.pData_, 4, Exiv2::kerCorruptedMetadata); ++ readOrThrow(*io_, size_buff, 4, Exiv2::kerCorruptedMetadata); ++ ++ const uint32_t size_u32 = Exiv2::getULong(size_buff, littleEndian); + +- long size = Exiv2::getULong(size_buff, littleEndian); ++ // Check that `size_u32` is safe to cast to `long`. ++ enforce(size_u32 <= static_cast<size_t>(std::numeric_limits<unsigned int>::max()), ++ Exiv2::kerCorruptedMetadata); ++ const long size = static_cast<long>(size_u32); + + DataBuf payload(size); +- io_->read(payload.pData_, size); ++ readOrThrow(*io_, payload.pData_, size, Exiv2::kerCorruptedMetadata); + if ( io_->tell() % 2 ) io_->seek(+1,BasicIo::cur); // skip pad + + if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8X)) { ++ enforce(size >= 1, Exiv2::kerCorruptedMetadata); + if (has_icc){ + payload.pData_[0] |= WEBP_VP8X_ICC_BIT; + } else { diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29464.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29464.patch new file mode 100644 index 000000000..f0c482450 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29464.patch @@ -0,0 +1,72 @@ +From 61734d8842cb9cc59437463e3bac54d6231d9487 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Tue, 18 May 2021 10:52:54 +0900 +Subject: [PATCH] modify + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + src/jp2image.cpp | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/src/jp2image.cpp b/src/jp2image.cpp +index 52723a4..0ac4f50 100644 +--- a/src/jp2image.cpp ++++ b/src/jp2image.cpp +@@ -643,11 +643,11 @@ static void boxes_check(size_t b,size_t m) + void Jp2Image::encodeJp2Header(const DataBuf& boxBuf,DataBuf& outBuf) + { + DataBuf output(boxBuf.size_ + iccProfile_.size_ + 100); // allocate sufficient space +- int outlen = sizeof(Jp2BoxHeader) ; // now many bytes have we written to output? +- int inlen = sizeof(Jp2BoxHeader) ; // how many bytes have we read from boxBuf? ++ long outlen = sizeof(Jp2BoxHeader) ; // now many bytes have we written to output? ++ long inlen = sizeof(Jp2BoxHeader) ; // how many bytes have we read from boxBuf? + Jp2BoxHeader* pBox = (Jp2BoxHeader*) boxBuf.pData_; +- int32_t length = getLong((byte*)&pBox->length, bigEndian); +- int32_t count = sizeof (Jp2BoxHeader); ++ uint32_t length = getLong((byte*)&pBox->length, bigEndian); ++ uint32_t count = sizeof (Jp2BoxHeader); + char* p = (char*) boxBuf.pData_; + bool bWroteColor = false ; + +@@ -664,6 +664,7 @@ static void boxes_check(size_t b,size_t m) + #ifdef EXIV2_DEBUG_MESSAGES + std::cout << "Jp2Image::encodeJp2Header subbox: "<< toAscii(subBox.type) << " length = " << subBox.length << std::endl; + #endif ++ enforce(subBox.length <= length - count, Exiv2::kerCorruptedMetadata); + count += subBox.length; + newBox.type = subBox.type; + } else { +@@ -672,12 +673,13 @@ static void boxes_check(size_t b,size_t m) + count = length; + } + +- int32_t newlen = subBox.length; ++ uint32_t newlen = subBox.length; + if ( newBox.type == kJp2BoxTypeColorHeader ) { + bWroteColor = true ; + if ( ! iccProfileDefined() ) { + const char* pad = "\x01\x00\x00\x00\x00\x00\x10\x00\x00\x05\x1cuuid"; + uint32_t psize = 15; ++ enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); + ul2Data((byte*)&newBox.length,psize ,bigEndian); + ul2Data((byte*)&newBox.type ,newBox.type,bigEndian); + ::memcpy(output.pData_+outlen ,&newBox ,sizeof(newBox)); +@@ -686,6 +688,7 @@ static void boxes_check(size_t b,size_t m) + } else { + const char* pad = "\0x02\x00\x00"; + uint32_t psize = 3; ++ enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); + ul2Data((byte*)&newBox.length,psize+iccProfile_.size_,bigEndian); + ul2Data((byte*)&newBox.type,newBox.type,bigEndian); + ::memcpy(output.pData_+outlen ,&newBox ,sizeof(newBox) ); +@@ -694,6 +697,7 @@ static void boxes_check(size_t b,size_t m) + newlen = psize + iccProfile_.size_; + } + } else { ++ enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); + ::memcpy(output.pData_+outlen,boxBuf.pData_+inlen,subBox.length); + } + +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29470.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29470.patch new file mode 100644 index 000000000..eedf9d79a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29470.patch @@ -0,0 +1,32 @@ +From 6628a69c036df2aa036290e6cd71767c159c79ed Mon Sep 17 00:00:00 2001 +From: Kevin Backhouse <kevinbackhouse@github.com> +Date: Wed, 21 Apr 2021 12:06:04 +0100 +Subject: [PATCH] Add more bounds checks in Jp2Image::encodeJp2Header +--- + src/jp2image.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/jp2image.cpp b/src/jp2image.cpp +index b424225..349a9f0 100644 +--- a/src/jp2image.cpp ++++ b/src/jp2image.cpp +@@ -645,13 +645,16 @@ static void boxes_check(size_t b,size_t m) + DataBuf output(boxBuf.size_ + iccProfile_.size_ + 100); // allocate sufficient space + long outlen = sizeof(Jp2BoxHeader) ; // now many bytes have we written to output? + long inlen = sizeof(Jp2BoxHeader) ; // how many bytes have we read from boxBuf? ++ enforce(sizeof(Jp2BoxHeader) <= static_cast<size_t>(output.size_), Exiv2::kerCorruptedMetadata); + Jp2BoxHeader* pBox = (Jp2BoxHeader*) boxBuf.pData_; + uint32_t length = getLong((byte*)&pBox->length, bigEndian); ++ enforce(length <= static_cast<size_t>(output.size_), Exiv2::kerCorruptedMetadata); + uint32_t count = sizeof (Jp2BoxHeader); + char* p = (char*) boxBuf.pData_; + bool bWroteColor = false ; + + while ( count < length || !bWroteColor ) { ++ enforce(sizeof(Jp2BoxHeader) <= length - count, Exiv2::kerCorruptedMetadata); + Jp2BoxHeader* pSubBox = (Jp2BoxHeader*) (p+count) ; + + // copy data. pointer could be into a memory mapped file which we will decode! +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29473.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29473.patch new file mode 100644 index 000000000..4afedf8e5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29473.patch @@ -0,0 +1,21 @@ +From e6a0982f7cd9282052b6e3485a458d60629ffa0b Mon Sep 17 00:00:00 2001 +From: Kevin Backhouse <kevinbackhouse@github.com> +Date: Fri, 23 Apr 2021 11:44:44 +0100 +Subject: [PATCH] Add bounds check in Jp2Image::doWriteMetadata(). + +--- + src/jp2image.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/jp2image.cpp b/src/jp2image.cpp +index 1694fed27..ca8c9ddbb 100644 +--- a/src/jp2image.cpp ++++ b/src/jp2image.cpp +@@ -908,6 +908,7 @@ static void boxes_check(size_t b,size_t m) + + case kJp2BoxTypeUuid: + { ++ enforce(boxBuf.size_ >= 24, Exiv2::kerCorruptedMetadata); + if(memcmp(boxBuf.pData_ + 8, kJp2UuidExif, 16) == 0) + { + #ifdef EXIV2_DEBUG_MESSAGES diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-3482.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-3482.patch new file mode 100644 index 000000000..e7c5e1b65 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/CVE-2021-3482.patch @@ -0,0 +1,54 @@ +From 22ea582c6b74ada30bec3a6b15de3c3e52f2b4da Mon Sep 17 00:00:00 2001 +From: Robin Mills <robin@clanmills.com> +Date: Mon, 5 Apr 2021 20:33:25 +0100 +Subject: [PATCH] fix_1522_jp2image_exif_asan + +--- + src/jp2image.cpp | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/jp2image.cpp b/src/jp2image.cpp +index eb31cea4a..88ab9b2d6 100644 +--- a/src/jp2image.cpp ++++ b/src/jp2image.cpp +@@ -28,6 +28,7 @@ + #include "image.hpp" + #include "image_int.hpp" + #include "basicio.hpp" ++#include "enforce.hpp" + #include "error.hpp" + #include "futils.hpp" + #include "types.hpp" +@@ -353,7 +354,7 @@ static void boxes_check(size_t b,size_t m) + if (io_->error()) throw Error(kerFailedToReadImageData); + if (bufRead != rawData.size_) throw Error(kerInputDataReadFailed); + +- if (rawData.size_ > 0) ++ if (rawData.size_ > 8) // "II*\0long" + { + // Find the position of Exif header in bytes array. + long pos = ( (rawData.pData_[0] == rawData.pData_[1]) +@@ -497,6 +498,7 @@ static void boxes_check(size_t b,size_t m) + position = io_->tell(); + box.length = getLong((byte*)&box.length, bigEndian); + box.type = getLong((byte*)&box.type, bigEndian); ++ enforce(box.length <= io_->size()-io_->tell() , Exiv2::kerCorruptedMetadata); + + if (bPrint) { + out << Internal::stringFormat("%8ld | %8ld | ", (size_t)(position - sizeof(box)), +@@ -581,12 +583,13 @@ static void boxes_check(size_t b,size_t m) + throw Error(kerInputDataReadFailed); + + if (bPrint) { +- out << Internal::binaryToString(makeSlice(rawData, 0, 40)); ++ out << Internal::binaryToString( ++ makeSlice(rawData, 0, rawData.size_>40?40:rawData.size_)); + out.flush(); + } + lf(out, bLF); + +- if (bIsExif && bRecursive && rawData.size_ > 0) { ++ if (bIsExif && bRecursive && rawData.size_ > 8) { // "II*\0long" + if ((rawData.pData_[0] == rawData.pData_[1]) && + (rawData.pData_[0] == 'I' || rawData.pData_[0] == 'M')) { + BasicIo::AutoPtr p = BasicIo::AutoPtr(new MemIo(rawData.pData_, rawData.size_)); diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb index ed1e8de5c..d5d9e62ff 100644 --- a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb @@ -9,7 +9,14 @@ SRC_URI[sha256sum] = "a79f5613812aa21755d578a297874fb59a85101e793edc64ec2c6bd994 # Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either inherit dos2unix -SRC_URI += "file://0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch" +SRC_URI += "file://0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch \ + file://CVE-2021-29457.patch \ + file://CVE-2021-29458.patch \ + file://CVE-2021-29463.patch \ + file://CVE-2021-29464.patch \ + file://CVE-2021-29470.patch \ + file://CVE-2021-29473.patch \ + file://CVE-2021-3482.patch" S = "${WORKDIR}/${BPN}-${PV}-Source" diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb b/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb index 2636287e3..5d5a236be 100644 --- a/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb +++ b/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb @@ -9,12 +9,15 @@ EXTRA_OECMAKE += " \ -DOPTION_USE_THREADS=OFF \ -DOPTION_USE_XDBE=OFF \ -DOPTION_USE_XFT=OFF \ - -DOPTION_BUILD_EXAMPLES=OFF \ + -DFLTK_BUILD_TEST=OFF \ -DOPTION_USE_XINERAMA=OFF \ -DOPTION_USE_XFIXES=OFF \ -DOPTION_USE_XCURSOR=OFF \ " +# lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): undefined reference to symbol 'dlsym@@GLIBC_2.2.5' +LDFLAGS += "-ldl" + do_install_append() { # make sure native fltk-config is not used accidentaly rm -f ${D}${bindir}/fltk-config diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb index 09344cf7d..51b4a0bc8 100644 --- a/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb +++ b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb @@ -5,14 +5,10 @@ DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft" inherit features_check binconfig lib_package gtk-icon-cache mime mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += " \ - file://0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch \ - file://0004-Fix-build-error-when-enable-package-config-examples.patch \ -" - EXTRA_OECMAKE = " \ -DOPTION_BUILD_SHARED_LIBS=ON \ -DOPTION_USE_THREADS=ON \ + -DFLTK_BUILD_TEST=OFF \ -DOPTION_USE_XDBE=ON \ -DOPTION_USE_XFT=ON \ -DFLTK_CONFIG_PATH=${libdir}/cmake \ @@ -20,7 +16,6 @@ EXTRA_OECMAKE = " \ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" -PACKAGECONFIG[examples] = "-DOPTION_BUILD_EXAMPLES=ON,-DOPTION_BUILD_EXAMPLES=OFF,fltk-native" PACKAGECONFIG[cairo] = "-DOPTION_CAIRO=ON,-DOPTION_CAIRO=OFF,cairo" PACKAGECONFIG[opengl] = "-DOPTION_USE_GL=ON,-DOPTION_USE_GL=OFF,virtual/libgl" PACKAGECONFIG[xinerama] = "-DOPTION_USE_XINERAMA=ON,-DOPTION_USE_XINERAMA=OFF,libxinerama" diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc index 97a1fbfc7..403cbddbb 100644 --- a/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc +++ b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc @@ -11,9 +11,8 @@ SRC_URI = " \ file://0002-always-build-fluid-and-export-pointers.patch \ " -PV = "1.3.5" -SRC_URI[md5sum] = "0de2b45a1896be2b4a8cafae89b84248" -SRC_URI[sha256sum] = "2933c72400f9e7c0f4c3a81a1ce98bc9582b2a3edc44b8597ccd26e240e32c3c" +PV = "1.3.6" +SRC_URI[sha256sum] = "20d2627c97b4485ee3eab5522303985bc22b798a878ba80239e6d43dcfed067e" inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch b/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch index cca977c66..0d91aab3a 100644 --- a/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch +++ b/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch @@ -1,6 +1,6 @@ From 16010cb1a69ea2326d8102b7f1e34b65aca4b278 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 28 Feb 2017 01:20:42 +0100 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 22 May 2021 12:33:15 +0200 Subject: [PATCH] always build fluid and export pointers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -8,24 +8,24 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- CMake/export.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/export.cmake b/CMake/export.cmake -index 968186a..95e04eb 100644 +index 6e8bc5d..71b6f6c 100644 --- a/CMake/export.cmake +++ b/CMake/export.cmake -@@ -21,7 +21,7 @@ - # final config and export +@@ -20,7 +20,7 @@ ####################################################################### + # Set the fluid executable path --if(CMAKE_CROSSCOMPILING) -+if(FALSE) - find_file(FLUID_PATH - NAMES fluid fluid.exe - PATHS ENV PATH +-if (CMAKE_CROSSCOMPILING) ++if (FALSE) + find_file(FLUID_PATH + NAMES fluid fluid.exe + PATHS ENV PATH -- -2.9.3 +2.31.1 diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch b/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch deleted file mode 100644 index 1f2f8aecf..000000000 --- a/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch +++ /dev/null @@ -1,41 +0,0 @@ -From bc38fb41044503c9debf5710910c51dd29674b6a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Fri, 15 Dec 2017 22:14:01 +0100 -Subject: [PATCH] CMake build: Force shared libs with unsuffixed names -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -For windows build sake CMake complains when a project wants to build shared and -static libraries with same name. This caused the authors of fltk to generate -libraries with names suffixed by '_SHARED' when building fltk with cmake - -autotools builds do not suffix. - -Reasons to build shared libs with correct names: - -* Shared libraries are the preferred choice for embedded devices -* There are projects (e.g yoshimi) expecting shared libraries with unsuffixed - names - as created by autotools build. These projects link against static - libraries by accident causing unusable binaries. - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - CMake/macros.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMake/macros.cmake b/CMake/macros.cmake -index 4def62d..ab675f0 100644 ---- a/CMake/macros.cmake -+++ b/CMake/macros.cmake -@@ -49,7 +49,7 @@ macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES) - PROPERTIES - VERSION ${FLTK_VERSION_FULL} - SOVERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR} -- PREFIX "lib" # for MSVC static/shared coexistence -+ OUTPUT_NAME ${LIBNAME} CLEAN_DIRECT_OUTPUT 1 - ) - endif (${LIBTYPE} STREQUAL "SHARED") - --- -2.9.5 - diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch b/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch deleted file mode 100644 index 974c02fe6..000000000 --- a/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch +++ /dev/null @@ -1,182 +0,0 @@ -Fix build error when enable package config examples. - -Upstream-Status: Backport [https://github.com/fltk/fltk/commit/16774dd] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - - -From 16774ddc4e000c89e560fde0ced8be9814ef041e Mon Sep 17 00:00:00 2001 -From: Albrecht Schlosser <albrechts.fltk@online.de> -Date: Wed, 8 Feb 2017 02:06:52 +0000 -Subject: [PATCH] Rename test/help demo program to test/help_dialog. - -This change avoids a name conflict with CMake's auto-generated target 'help' -for "Unix Makefiles", "Ninja", and supposedly other generators as well. - - -git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12171 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 ---- - CMake/macros.cmake | 5 ----- - documentation/src/examples.dox | 8 +++---- - test/CMakeLists.txt | 27 +++++++++++++++++++---- - test/demo.menu | 2 +- - test/{help.cxx => help_dialog.cxx} | 6 ++--- - test/{help-test.html => help_dialog.html} | 0 - 6 files changed, 31 insertions(+), 17 deletions(-) - rename test/{help.cxx => help_dialog.cxx} (88%) - rename test/{help-test.html => help_dialog.html} (100%) - -diff --git a/CMake/macros.cmake b/CMake/macros.cmake -index 5b0d0fa..7134fcb 100644 ---- a/CMake/macros.cmake -+++ b/CMake/macros.cmake -@@ -90,11 +90,6 @@ function(CREATE_EXAMPLE NAME SOURCES LIBRARIES) - - set (tname ${NAME}) # target name - -- # rename reserved target name "help" (CMake 2.8.12 and later) -- if (${tname} MATCHES "^help$") -- set (tname "test_help") -- endif (${tname} MATCHES "^help$") -- - foreach(src ${SOURCES}) - if ("${src}" MATCHES "\\.fl$") - list(APPEND flsrcs ${src}) -diff --git a/documentation/src/examples.dox b/documentation/src/examples.dox -index 5105b7b..7961b02 100644 ---- a/documentation/src/examples.dox -+++ b/documentation/src/examples.dox -@@ -60,7 +60,7 @@ you build FLTK, unlike those in the 'test' directory shown below. - </tr> - <tr> - <td> \ref examples_hello </td> --<td> \ref examples_help </td> -+<td> \ref examples_help_dialog </td> - <td> \ref examples_iconize </td> - <td> \ref examples_image </td> - <td> \ref examples_inactive </td> -@@ -326,13 +326,13 @@ easily under FLTK. - tiny demo shows how little is needed to get a functioning application - running with FLTK. Quite impressive, I'd say. - --\subsection examples_help help -+\subsection examples_help_dialog help_dialog - - \par --\c help displays the built-in FLTK help browser. The -+\c help_dialog displays the built-in FLTK help browser. The - Fl_Help_Dialog understands a subset of html and renders - various image formats. This widget makes it easy to provide help --pages to the user without depending on the operating system's -+pages to the user without depending on the operating system's - html browser. - - \subsection examples_iconize iconize -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 22ec9ab..4caffa5 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -1,3 +1,22 @@ -+# -+# "$Id$" -+# -+# CMakeLists.txt used to build test and demo apps by the CMake build system -+# -+# Copyright 2004-2017 by Bill Spitzak and others. -+# -+# This library is free software. Distribution and use rights are outlined in -+# the file "COPYING" which should have been included with this file. If this -+# file is missing or damaged, see the license at: -+# -+# http://www.fltk.org/COPYING.php -+# -+# Please report all bugs and problems on the following page: -+# -+# http://www.fltk.org/str.php -+# -+####################################################################### -+ - set(EXECUTABLE_OUTPUT_PATH ${FLTK_BINARY_DIR}/bin/examples) - - ####################################################################### -@@ -64,7 +83,7 @@ CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk;fltk_images") - CREATE_EXAMPLE(fonts fonts.cxx fltk) - CREATE_EXAMPLE(forms forms.cxx "fltk;fltk_forms") - CREATE_EXAMPLE(hello hello.cxx fltk) --CREATE_EXAMPLE(help help.cxx "fltk;fltk_images") -+CREATE_EXAMPLE(help_dialog help_dialog.cxx "fltk;fltk_images") - CREATE_EXAMPLE(icon icon.cxx fltk) - CREATE_EXAMPLE(iconize iconize.cxx fltk) - CREATE_EXAMPLE(image image.cxx fltk) -@@ -134,7 +153,7 @@ endif(FLTK_HAVE_CAIRO) - # Note: this is incomplete as of 11 Feb 2015 - # Todo: currently all files are copied, but some of them need configuration: - # - demo.menu: fluid can't be started (wrong path) --# - demo.menu: help (help-test.html) can't find its images (not copied) -+# - demo.menu: help_dialog (help_dialog.html) can't find its images (not copied) - # - maybe more ... - - # prepare for a "better" test file installation path -@@ -149,11 +168,11 @@ configure_file(demo.menu ${TESTFILE_PATH}/demo.menu COPYONLY) - - # use target directory only to avoid redundancy - configure_file(rgb.txt ${TESTFILE_PATH} COPYONLY) --configure_file(help-test.html ${TESTFILE_PATH} COPYONLY) -+configure_file(help_dialog.html ${TESTFILE_PATH} COPYONLY) - configure_file(browser.cxx ${TESTFILE_PATH} COPYONLY) - configure_file(editor.cxx ${TESTFILE_PATH} COPYONLY) - if(APPLE AND NOT OPTION_APPLE_X11) - configure_file(browser.cxx "${TESTFILE_PATH}/browser.app/Contents/Resources/browser.cxx" COPYONLY) - configure_file(rgb.txt ${TESTFILE_PATH}/colbrowser.app/Contents/Resources/rgb.txt COPYONLY) -- configure_file(help-test.html ${TESTFILE_PATH}/help.app/Contents/Resources/help-test.html COPYONLY) -+ configure_file(help_dialog.html ${TESTFILE_PATH}/help_dialog.app/Contents/Resources/help_dialog.html COPYONLY) - endif(APPLE AND NOT OPTION_APPLE_X11) -diff --git a/test/demo.menu b/test/demo.menu -index 337a71c..97e522a 100644 ---- a/test/demo.menu -+++ b/test/demo.menu -@@ -77,7 +77,7 @@ - @o:Font Tests...:@of - @of:Fonts:fonts - @of:UTF-8:utf8 -- @o:HelpDialog:help -+ @o:HelpDialog:help_dialog - @o:Input Choice:input_choice - @o:Preferences:preferences - @o:Threading:threads -diff --git a/test/help.cxx b/test/help_dialog.cxx -similarity index 88% -rename from test/help.cxx -rename to test/help_dialog.cxx -index f5c51d6..7866641 100644 ---- a/test/help.cxx -+++ b/test/help_dialog.cxx -@@ -3,7 +3,7 @@ - // - // Fl_Help_Dialog test program. - // --// Copyright 1999-2010 by Easy Software Products. -+// Copyright 2011-2017 by Bill Spitzak and others. - // - // This library is free software. Distribution and use rights are outlined in - // the file "COPYING" which should have been included with this file. If this -@@ -46,13 +46,13 @@ main(int argc, // I - Number of command-line arguments - strcpy(buf, argv[0]); - char *slash = strrchr(buf, '/'); - if (slash) -- strcpy(slash, "/../Resources/help-test.html"); -+ strcpy(slash, "/../Resources/help_dialog.html"); - help->load(buf); - - #else - - if (argc <= 1) -- help->load("help-test.html"); -+ help->load("help_dialog.html"); - else - help->load(argv[1]); - -diff --git a/test/help-test.html b/test/help_dialog.html -similarity index 100% -rename from test/help-test.html -rename to test/help_dialog.html diff --git a/meta-openembedded/meta-oe/recipes-support/gd/gd/0001-replace-uint32-with-uint32_t-and-uint16-with-uint16_.patch b/meta-openembedded/meta-oe/recipes-support/gd/gd/0001-replace-uint32-with-uint32_t-and-uint16-with-uint16_.patch new file mode 100644 index 000000000..faf349b0b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gd/gd/0001-replace-uint32-with-uint32_t-and-uint16-with-uint16_.patch @@ -0,0 +1,170 @@ +From 4ae9904a10f61ed60f4d4ee02eb1994a95664d7b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 22 Apr 2021 22:48:59 -0700 +Subject: [PATCH] replace uint32 with uint32_t and uint16 with uint16_6 + +uint16 and uint32 are now deprecated in libtiff and suggestion is to use +standard C99 types + +Upstream-Status: Submitted [https://github.com/libgd/libgd/pull/694] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/gd_tiff.c | 52 +++++++++++++++++++++++++-------------------------- + 1 file changed, 26 insertions(+), 26 deletions(-) + +diff --git a/src/gd_tiff.c b/src/gd_tiff.c +index b22ee6c..699d719 100644 +--- a/src/gd_tiff.c ++++ b/src/gd_tiff.c +@@ -237,10 +237,10 @@ void tiffWriter(gdImagePtr image, gdIOCtx *out, int bitDepth) + int transparentColorR = -1; + int transparentColorG = -1; + int transparentColorB = -1; +- uint16 extraSamples[1]; +- uint16 *colorMapRed = NULL; +- uint16 *colorMapGreen = NULL; +- uint16 *colorMapBlue = NULL; ++ uint16_t extraSamples[1]; ++ uint16_t *colorMapRed = NULL; ++ uint16_t *colorMapGreen = NULL; ++ uint16_t *colorMapBlue = NULL; + + tiff_handle *th; + +@@ -292,18 +292,18 @@ void tiffWriter(gdImagePtr image, gdIOCtx *out, int bitDepth) + + /* build the color map for 8 bit images */ + if(bitDepth != 24) { +- colorMapRed = (uint16 *) gdMalloc(3 * (1 << bitsPerSample)); ++ colorMapRed = (uint16_t *) gdMalloc(3 * (1 << bitsPerSample)); + if (!colorMapRed) { + gdFree(th); + return; + } +- colorMapGreen = (uint16 *) gdMalloc(3 * (1 << bitsPerSample)); ++ colorMapGreen = (uint16_t *) gdMalloc(3 * (1 << bitsPerSample)); + if (!colorMapGreen) { + gdFree(colorMapRed); + gdFree(th); + return; + } +- colorMapBlue = (uint16 *) gdMalloc(3 * (1 << bitsPerSample)); ++ colorMapBlue = (uint16_t *) gdMalloc(3 * (1 << bitsPerSample)); + if (!colorMapBlue) { + gdFree(colorMapRed); + gdFree(colorMapGreen); +@@ -448,7 +448,7 @@ BGD_DECLARE(void) gdImageTiffCtx(gdImagePtr image, gdIOCtx *out) + /* Check if we are really in 8bit mode */ + static int checkColorMap(n, r, g, b) + int n; +-uint16 *r, *g, *b; ++uint16_t *r, *g, *b; + { + while (n-- > 0) + if (*r++ >= 256 || *g++ >= 256 || *b++ >= 256) +@@ -460,8 +460,8 @@ uint16 *r, *g, *b; + /* Read and convert a TIFF colormap */ + static int readTiffColorMap(gdImagePtr im, TIFF *tif, char is_bw, int photometric) + { +- uint16 *redcmap, *greencmap, *bluecmap; +- uint16 bps; ++ uint16_t *redcmap, *greencmap, *bluecmap; ++ uint16_t bps; + int i; + + if (is_bw) { +@@ -473,7 +473,7 @@ static int readTiffColorMap(gdImagePtr im, TIFF *tif, char is_bw, int photometri + gdImageColorAllocate(im, 255,255,255); + } + } else { +- uint16 min_sample_val, max_sample_val; ++ uint16_t min_sample_val, max_sample_val; + + if (!TIFFGetField(tif, TIFFTAG_MINSAMPLEVALUE, &min_sample_val)) { + min_sample_val = 0; +@@ -515,7 +515,7 @@ static int readTiffColorMap(gdImagePtr im, TIFF *tif, char is_bw, int photometri + + static void readTiffBw (const unsigned char *src, + gdImagePtr im, +- uint16 photometric, ++ uint16_t photometric, + int startx, + int starty, + int width, +@@ -547,7 +547,7 @@ static void readTiffBw (const unsigned char *src, + + static void readTiff8bit (const unsigned char *src, + gdImagePtr im, +- uint16 photometric, ++ uint16_t photometric, + int startx, + int starty, + int width, +@@ -634,10 +634,10 @@ static void readTiff8bit (const unsigned char *src, + } + } + +-static int createFromTiffTiles(TIFF *tif, gdImagePtr im, uint16 bps, uint16 photometric, ++static int createFromTiffTiles(TIFF *tif, gdImagePtr im, uint16_t bps, uint16_t photometric, + char has_alpha, char is_bw, int extra) + { +- uint16 planar; ++ uint16_t planar; + int im_width, im_height; + int tile_width, tile_height; + int x, y, height, width; +@@ -682,11 +682,11 @@ end: + return success; + } + +-static int createFromTiffLines(TIFF *tif, gdImagePtr im, uint16 bps, uint16 photometric, ++static int createFromTiffLines(TIFF *tif, gdImagePtr im, uint16_t bps, uint16_t photometric, + char has_alpha, char is_bw, int extra) + { +- uint16 planar; +- uint32 im_height, im_width, y; ++ uint16_t planar; ++ uint32_t im_height, im_width, y; + + unsigned char *buffer; + int success = GD_SUCCESS; +@@ -761,11 +761,11 @@ static int createFromTiffRgba(TIFF * tif, gdImagePtr im) + int color; + int width = im->sx; + int height = im->sy; +- uint32 *buffer; +- uint32 rgba; ++ uint32_t *buffer; ++ uint32_t rgba; + int success; + +- buffer = (uint32 *) gdCalloc(sizeof(uint32), width * height); ++ buffer = (uint32_t *) gdCalloc(sizeof(uint32_t), width * height); + if (!buffer) { + return GD_FAILURE; + } +@@ -810,11 +810,11 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromTiffCtx(gdIOCtx *infile) + TIFF *tif; + tiff_handle *th; + +- uint16 bps, spp, photometric; +- uint16 orientation; ++ uint16_t bps, spp, photometric; ++ uint16_t orientation; + int width, height; +- uint16 extra, *extra_types; +- uint16 planar; ++ uint16_t extra, *extra_types; ++ uint16_t planar; + char has_alpha, is_bw, is_gray; + char force_rgba = FALSE; + char save_transparent; +@@ -867,7 +867,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromTiffCtx(gdIOCtx *infile) + } + + if (!TIFFGetField (tif, TIFFTAG_PHOTOMETRIC, &photometric)) { +- uint16 compression; ++ uint16_t compression; + if (TIFFGetField(tif, TIFFTAG_COMPRESSION, &compression) && + (compression == COMPRESSION_CCITTFAX3 || + compression == COMPRESSION_CCITTFAX4 || diff --git a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb index 37896415e..4e95fa954 100644 --- a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb @@ -14,7 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8e5bc8627b9494741c905d65238c66b7" DEPENDS = "freetype libpng jpeg zlib tiff" SRC_URI = "git://github.com/libgd/libgd.git;branch=master \ - " + file://0001-replace-uint32-with-uint32_t-and-uint16-with-uint16_.patch \ + " SRCREV = "2e40f55bfb460fc9d8cbcd290a0c9eb908d5af7e" diff --git a/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb b/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb index 3da67d1e3..28c2d809a 100644 --- a/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb +++ b/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb @@ -141,7 +141,7 @@ S = "${WORKDIR}/git" do_install() { for LANGUAGE in `ls -d1 ${S}/dictionaries/*` ; do - LANGUAGE_DIR=`basename $LANGUAGE` + LANGUAGE_DIR=`basename $LANGUAGE | sed 's:-:_:'` install -D -m0644 $LANGUAGE/index.dic ${D}${datadir}/hunspell/$LANGUAGE_DIR.dic install -D -m0644 $LANGUAGE/index.aff ${D}${datadir}/hunspell/$LANGUAGE_DIR.aff install -D -m0644 $LANGUAGE/LICENSE ${D}${datadir}/hunspell/LICENSE-$LANGUAGE_DIR 2>/dev/null || echo "No LICENSE for language $LANGUAGE" diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.347.bb index 738c32d63..43fb9189c 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.347.bb @@ -5,10 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.346" -SRCREV = "a2bff16032a68b089eeb169f09dea08094891c9c" +SRCREV = "ae89c73d89bb9f416b25ad9e850e9606e66a573e" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" - S = "${WORKDIR}/git" do_configure() { diff --git a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb index 6ce318d0b..d6ef98f94 100644 --- a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb @@ -6,14 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad" SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;nobranch=1" -SRCREV = "21ae2afd4edaa1b69782c67a54182d34efe43f9c" +SRCREV = "0fd6b4f71dd85b2009ee4d1aeb296e2c11fc9d68" S = "${WORKDIR}/git" inherit cmake -FILES_${PN} = "${libdir}" -FILES_${PN}-dev = "${includedir} ${datadir}/eigen3/cmake ${datadir}/cmake/Modules ${datadir}/pkgconfig" +FILES_${PN}-dev += "${datadir}/eigen3/cmake" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.5.bb b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.6.bb index c4b0ff372..2f74013ca 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.6.bb @@ -6,7 +6,6 @@ DEPENDS = "glib-2.0 libusb" inherit meson gobject-introspection gtk-doc gettext vala -SRC_URI = "git://github.com/hughsie/libgusb.git \ - " -SRCREV = "1f712812327091c42c62b1ab1148d738d1a22b51" +SRC_URI = "git://github.com/hughsie/libgusb.git" +SRCREV = "b0464454048cac6779d4d51f12fe7f37ae4bbd57" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb index 00c016db4..6f37d1e89 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -27,10 +27,11 @@ EXTRA_OECMAKE = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \ " -PACKAGECONFIG ??= "usb_backend network_backend" +PACKAGECONFIG ??= "usb_backend network_backend serial_backend" -PACKAGECONFIG[usb_backend] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1,libxml2" +PACKAGECONFIG[usb_backend] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1 libxml2" PACKAGECONFIG[network_backend] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" +PACKAGECONFIG[serial_backend] = "-DWITH_SERIAL_BACKEND=ON,-DWITH_SERIAL_BACKEND=off,libserialport libxml2" PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF" PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}" diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb deleted file mode 100644 index 66c48da3b..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" -HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" -LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=57d09285feac8a64efa878e692b14f36" -SECTION = "net" - -DEPENDS = "file" - -SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "2a286193af88ab2ae3149748d4b46187" -SRC_URI[sha256sum] = "0ae825f8e0d7f41201fd44a0df1cf454c1cb0bc50fe9d59c26552260264c2ff8" - -inherit autotools lib_package pkgconfig gettext - -CFLAGS += "-pthread -D_REENTRANT" - -EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../" - -PACKAGECONFIG ?= "curl https" -PACKAGECONFIG_append_class-target = "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \ -" -PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," -PACKAGECONFIG[https] = "--enable-https,--disable-https,libgcrypt gnutls," - -do_compile_append() { - sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.1.bb b/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.2.bb index 4e77d6cc0..c0ed72d99 100644 --- a/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.2.bb @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" HOMEPAGE = "https://www.msweet.org/mxml/" BUGTRACKER = "https://github.com/michaelrsweet/mxml/issues" -SRC_URI = "git://github.com/michaelrsweet/mxml.git" -SRCREV = "e483e5fd8a33386fd46967681521bdd2da2b548f" +SRC_URI = "git://github.com/michaelrsweet/mxml.git;nobranch=1" +SRCREV = "38b044ed8ca2a611ed9ed3e26c4b46416335194e" S = "${WORKDIR}/git" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.20.2.bb b/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.20.2.bb new file mode 100644 index 000000000..0a7c534be --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.20.2.bb @@ -0,0 +1,11 @@ +SUMMARY = "raw image decoder" +LICENSE = "LGPL-2.1 | CDDL-1.0" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=74c9dffdc42805f9c0de2f97df6031fc" + +SRC_URI = "git://github.com/LibRaw/LibRaw.git" +SRCREV = "0209b6a2caec189e6d1a9b21c10e9e49f46e5a92" +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +DEPENDS = "jpeg jasper lcms" diff --git a/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.1.bb b/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.2.bb index 004c93d0f..f1997136a 100644 --- a/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.2.bb @@ -5,7 +5,7 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRC_URI = "git://github.com/librsync/librsync.git" -SRCREV = "27f738650c20fef1285f11d85a34e5094a71c06f" +SRCREV = "42b636d2a65ab6914ea7cac50886da28192aaf9b" S = "${WORKDIR}/git" DEPENDS = "popt" diff --git a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.0.0.bb b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb index a2491cf9e..5245059a8 100644 --- a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb @@ -6,10 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" SRC_URI = "git://github.com/leethomason/tinyxml2.git" -SRCREV = "bf15233ad88390461f6ab0dbcf046cce643c5fcb" +SRCREV = "3291390336141573e51dfa991b4179c8bcd8f306" S = "${WORKDIR}/git" inherit cmake BBCLASSEXTEND = "native" + +EXTRA_OECMAKE += "-Dtinyxml2_SHARED_LIBS=YES" diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch index 19bf14708..03ab07531 100644 --- a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch @@ -1,4 +1,4 @@ -From 3ee2f1e231bde18a99f86da747a9b8feca3c179d Mon Sep 17 00:00:00 2001 +From 653c39b0b30b2a329db5041e558cfc97c03d6bfb Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 17 Feb 2021 19:18:16 -0800 Subject: [PATCH] do not build examples @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile -index 948e004..8b63024 100644 +index 5d9c4dc..53e1615 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,6 @@ default: all @@ -23,8 +23,8 @@ index 948e004..8b63024 100644 @$(MAKE) -C test - @$(MAKE) -C examples - partcheck: all - @echo "make partcheck => TODO add tests with out kernel support" + .PHONY: all install default clean test + .PHONY: FORCE cscope -- -2.30.1 +2.31.1 diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-examples-ucontext-cp.c-Do-not-use-SIGSTKSZ.patch b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-examples-ucontext-cp.c-Do-not-use-SIGSTKSZ.patch new file mode 100644 index 000000000..a2ba66c3a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-examples-ucontext-cp.c-Do-not-use-SIGSTKSZ.patch @@ -0,0 +1,37 @@ +From a30d62dfb9ea30af58ef331fae1e6f727d0558c0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 4 May 2021 10:32:08 -0700 +Subject: [PATCH] examples/ucontext-cp.c: Do not use SIGSTKSZ + +glibc 2.34 has removed SIGSTKSZ therefore we replace it + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + examples/ucontext-cp.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +--- a/examples/ucontext-cp.c ++++ b/examples/ucontext-cp.c +@@ -3,6 +3,7 @@ + * gcc -Wall -O2 -D_GNU_SOURCE -o ucontext-cp ucontext-cp.c -luring + */ + #define _POSIX_C_SOURCE 199309L ++#include <stddef.h> + #include <stdio.h> + #include <fcntl.h> + #include <string.h> +@@ -22,13 +23,9 @@ + #define QD 64 + #define BS 1024 + +-#ifndef SIGSTKSZ +-#define SIGSTKSZ 8192 +-#endif +- + typedef struct { + struct io_uring *ring; +- unsigned char stack_buf[SIGSTKSZ]; ++ max_align_t stack_buf[(8 * 1024 + sizeof (max_align_t) - 1) / sizeof (max_align_t)]; + ucontext_t ctx_main, ctx_fnew; + } async_context; + diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Fix-build-on-32bit-architectures-with-6bit-time.patch b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Fix-build-on-32bit-architectures-with-6bit-time.patch deleted file mode 100644 index 01c5ccd53..000000000 --- a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Fix-build-on-32bit-architectures-with-6bit-time.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0a9b12eda0f6e487398dad004121bdd1be792428 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 14 Nov 2020 16:18:44 -0800 -Subject: [PATCH] test: Fix build on 32bit architectures with 6bit time_t - -It uses SYS_futex, which it expects from system C library. -in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) -rv32 is using 64bit time_t from get go unlike other 32bit architectures -in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 -this aliases it to NR_futex so that SYS_futex is then defined for rv32 - -Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/237] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - test/35fa71a030ca-test.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/test/35fa71a030ca-test.c b/test/35fa71a030ca-test.c -index 4ecf211..7f2124b 100644 ---- a/test/35fa71a030ca-test.c -+++ b/test/35fa71a030ca-test.c -@@ -24,6 +24,10 @@ - - #include <linux/futex.h> - -+#if !defined(SYS_futex) && defined(SYS_futex_time64) -+# define SYS_futex SYS_futex_time64 -+#endif -+ - static void sleep_ms(uint64_t ms) - { - usleep(ms * 1000); --- -2.29.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-tests-fix-portability-issue-when-using-__NR_mmap-sys.patch b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-tests-fix-portability-issue-when-using-__NR_mmap-sys.patch new file mode 100644 index 000000000..f2f03c18b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-tests-fix-portability-issue-when-using-__NR_mmap-sys.patch @@ -0,0 +1,53 @@ +From 2d3940163e14d183fddc4d8b24cc1d3865bba0b3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 5 May 2021 09:36:36 -0700 +Subject: [PATCH] tests: fix portability issue when using __NR_mmap syscall + +On some architectures e.g. ARM and RISCV32, __NR_mmap does not exist and +libc will then use NR_mmap2 to implement mmap() API, therefore use +system C library mmap() API instead of calling the syscall directly + +Upstream-Status: Partial Backport [https://github.com/axboe/liburing/commit/808b6c72ab753bda0c300b5683cfd31750d1d49b] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + test/double-poll-crash.c | 6 +++--- + test/sqpoll-disable-exit.c | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/test/double-poll-crash.c b/test/double-poll-crash.c +index 1a219c7..6e08285 100644 +--- a/test/double-poll-crash.c ++++ b/test/double-poll-crash.c +@@ -150,9 +150,9 @@ int main(int argc, char *argv[]) + if (argc > 1) + return 0; + +- syscall(__NR_mmap, 0x1ffff000ul, 0x1000ul, 0ul, 0x32ul, -1, 0ul); +- syscall(__NR_mmap, 0x20000000ul, 0x1000000ul, 7ul, 0x32ul, -1, 0ul); +- syscall(__NR_mmap, 0x21000000ul, 0x1000ul, 0ul, 0x32ul, -1, 0ul); ++ mmap((void *) 0x1ffff000, (size_t) 0x1000, PROT_NONE, MAP_FIXED | MAP_ANONYMOUS, -1, 0); ++ mmap((void *) 0x20000000, (size_t) 0x1000000, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_FIXED | MAP_ANONYMOUS, -1, 0); ++ mmap((void *) 0x21000000, (size_t) 0x1000, PROT_NONE, MAP_FIXED | MAP_ANONYMOUS, -1, 0); + intptr_t res = 0; + *(uint32_t*)0x20000484 = 0; + *(uint32_t*)0x20000488 = 0; +diff --git a/test/sqpoll-disable-exit.c b/test/sqpoll-disable-exit.c +index d4e17f8..a0d00cc 100644 +--- a/test/sqpoll-disable-exit.c ++++ b/test/sqpoll-disable-exit.c +@@ -223,9 +223,9 @@ void execute_one(void) + } + int main(void) + { +- syscall(__NR_mmap, 0x1ffff000ul, 0x1000ul, 0ul, 0x32ul, -1, 0ul); +- syscall(__NR_mmap, 0x20000000ul, 0x1000000ul, 7ul, 0x32ul, -1, 0ul); +- syscall(__NR_mmap, 0x21000000ul, 0x1000ul, 0ul, 0x32ul, -1, 0ul); ++ mmap((void *) 0x1ffff000, (size_t) 0x1000, PROT_NONE, MAP_FIXED | MAP_ANONYMOUS, -1, 0); ++ mmap((void *) 0x20000000, (size_t) 0x1000000, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_FIXED | MAP_ANONYMOUS, -1, 0); ++ mmap((void *) 0x21000000, (size_t) 0x1000, PROT_NONE, MAP_FIXED | MAP_ANONYMOUS, -1, 0); + loop(); + return 0; + } +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.0.bb index d79389a69..9eddf2e2a 100644 --- a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.0.bb @@ -10,12 +10,13 @@ LICENSE = "LGPLv2.1 | MIT" LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=d51b5805e2a675685e6a66ca50904cf9" SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \ - file://0001-test-Fix-build-on-32bit-architectures-with-6bit-time.patch \ + file://0001-examples-ucontext-cp.c-Do-not-use-SIGSTKSZ.patch \ + file://0001-tests-fix-portability-issue-when-using-__NR_mmap-sys.patch \ " SRC_URI_append_libc-musl_riscv64 = " file://0001-do-not-build-examples.patch " SRC_URI_append_libc-musl_riscv32 = " file://0001-do-not-build-examples.patch " -SRCREV = "45f0735219a615ae848033c47c7e2d85d101d43e" +SRCREV = "b013dfd5a5f65116373d5e0f0bdfb73db9d8816e" S = "${WORKDIR}/git" DEPENDS_append_libc-musl = " libucontext" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index 6618e21f3..ccb4f7ac1 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -21,12 +21,11 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \ SRCREV = "3e8bd8d1bd70691f09a170785836aeb4f83154e6" S = "${WORKDIR}/git" -inherit autotools-brokensep pkgconfig systemd license +inherit autotools-brokensep pkgconfig systemd LVM2_PACKAGECONFIG = "dmeventd" LVM2_PACKAGECONFIG_append_class-target = " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ - ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \ " # odirect is always enabled because there currently is a bug in @@ -39,6 +38,7 @@ PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd" PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" +# NOTE: Add thin-provisioning-tools only if your distro policy allows GPL-3.0 license PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools" # Unset user/group to unbreak install. @@ -55,4 +55,3 @@ EXTRA_OECONF = "--with-user= \ --with-thin-repair=${sbindir}/thin_repair \ --with-thin-restore=${sbindir}/thin_restore \ " - diff --git a/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.52.bb b/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.53.bb index 69e1788e9..c3cd57fb6 100644 --- a/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.52.bb +++ b/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.53.bb @@ -18,8 +18,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8dce08227d135cfda1f19d4c0c6689de" SRC_URI = "https://releases.pagure.org/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "3d1a14a80bb85564c323562670f1c01f" -SRC_URI[sha256sum] = "e6f615ec2ffe705522075d960744534c443ece66acfb34fada38d567d8823639" +SRC_URI[md5sum] = "ee02da867389d290923cc138487176f9" +SRC_URI[sha256sum] = "5eea2ef17b304977ba3ecb87afad4319fa0440f825e4f6fba6e8fa2ffeb88785" inherit update-alternatives diff --git a/meta-openembedded/meta-oe/recipes-support/mime-support/mime-support_3.48.bb b/meta-openembedded/meta-oe/recipes-support/mime-support/mime-support_3.62.bb index 1137f5012..858521b65 100644 --- a/meta-openembedded/meta-oe/recipes-support/mime-support/mime-support_3.48.bb +++ b/meta-openembedded/meta-oe/recipes-support/mime-support/mime-support_3.62.bb @@ -1,13 +1,17 @@ SECTION = "base" SUMMARY = "MIME files 'mime.types' & 'mailcap', and support programs" -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://debian/README;md5=36bbe2ace0a05c3fb684b73208fbf30b" +LICENSE = "PD & Bellcore" +LICENSE_${PN} = "PD" +# mailcap.man's license is Bellcore +LICENSE_${PN}-doc = "PD & Bellcore" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=53c851e31d27c3ea8a6217073a5ff01c" DEPENDS = "file" RDEPENDS_${PN} = "perl" RRECOMMENDS_${PN} = "file" -SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}-1.tar.gz" +SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}.tar.gz" +SRC_URI[sha256sum] = "54e0a03e0cd63c7c9fe68a18ead0a2143fd3c327604215f989d85484d0409f4a" S = "${WORKDIR}/${BPN}" inherit update-alternatives @@ -27,22 +31,22 @@ do_install () { install -d ${D}${mandir}/man8 install -m 644 mime.types ${D}${sysconfdir}/ install -m 644 mailcap ${D}${libdir}/mime/ - install -m 644 mailcap.order ${D}${sysconfdir}/ + install -m 644 mailcap.order ${D}${sysconfdir}/ install -m 644 mailcap.man ${D}${mandir}/man5/mailcap.5 - install -m 644 mailcap.order.man ${D}${mandir}/man5/mailcap.order.5 -# install -m 755 install-mime ${D}${sbindir}/ -# install -m 644 install-mime.man ${D}${mandir}/man8/install-mime.8 + install -m 644 mailcap.order.man ${D}${mandir}/man5/mailcap.order.5 +# install -m 755 install-mime ${D}${sbindir}/ +# install -m 644 install-mime.man ${D}${mandir}/man8/install-mime.8 install -m 755 update-mime ${D}${sbindir}/ - install -m 644 update-mime.man ${D}${mandir}/man8/update-mime.8 + install -m 644 update-mime.man ${D}${mandir}/man8/update-mime.8 install -m 755 run-mailcap ${D}${bindir}/ - install -m 644 run-mailcap.man ${D}${mandir}/man1/run-mailcap.1 -# install -m 644 rfcs/* ${D}${docdir}/ - install -m 644 debian/changelog ${D}${docdir}/changelog.Debian - install -m 644 debian/README ${D}${docdir}/copyright + install -m 644 run-mailcap.man ${D}${mandir}/man1/run-mailcap.1 +# install -m 644 rfcs/* ${D}${docdir}/ + install -m 644 debian/changelog ${D}${docdir}/changelog.Debian + install -m 644 debian/copyright ${D}${docdir}/copyright install -m 755 debian-view ${D}${libdir}/mime/ - install -m 755 playaudio ${D}${libdir}/mime/ + install -m 755 playaudio ${D}${libdir}/mime/ install -m 755 playdsp ${D}${libdir}/mime/ - install -m 644 mailcap.entries ${D}${libdir}/mime/packages/mime-support + install -m 644 mailcap.entries ${D}${libdir}/mime/packages/mime-support cd ${D}${mandir}; gzip -9fv */* cd ${D}${docdir}; gzip -9v * cd ${D}${docdir}; gunzip copyright.gz @@ -56,9 +60,6 @@ do_install () { cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz print.1.gz } -SRC_URI[md5sum] = "d6e5d715e331147352c50c158dbdec6d" -SRC_URI[sha256sum] = "a529c7892cb786f514af71f4ca5a4c3ebc58b538a49ff959c0d97592d38f040a" - ALTERNATIVE_PRIORITY = "90" ALTERNATIVE_${PN} = "mime.types" ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types" diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.6.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.7.bb index 1ce08dd50..6a293c763 100644 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.7.bb @@ -1,3 +1,4 @@ +SUMMARY = "Small and friendly console text editor" DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ Not ANOther editor) is an enhanced clone of the \ Pico text editor." @@ -12,7 +13,7 @@ RDEPENDS_${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[sha256sum] = "fce183e4a7034d07d219c79aa2f579005d1fd49f156db6e50f53543a87637a32" +SRC_URI[sha256sum] = "d4b181cc2ec11def3711b4649e34f2be7a668e70ab506860514031d069cccafa" UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.63.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb index ab2c43d01..fce5a856e 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.63.bb +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb @@ -11,11 +11,12 @@ SECTION = "libs" DEPENDS = "sqlite3 nspr zlib nss-native" DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" -LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" +LICENSE = "(MPL-2.0 & MIT) | (MPL-2.0 & GPL-2.0+ & MIT) | (MPL-2.0 & LGPL-2.1+ & MIT)" LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" + file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132 \ + file://nss/lib/freebl/verified/Hacl_Poly1305_256.c;beginline=1;endline=22;md5=d4096c1e4421ee56e9e0f441a8161f78" VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" @@ -32,7 +33,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://nss-fix-nsinstall-build.patch \ file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ " -SRC_URI[sha256sum] = "182d2fef629102ae9423aabf2c192242b565cf5098e82c5a26cf70c5e4ea2221" +SRC_URI[sha256sum] = "d3175427172e9c3a6f1ebc74452cb791590f28191c6a1a443dbc0d87c9df1126" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" @@ -42,10 +43,6 @@ inherit siteinfo TD = "${S}/tentative-dist" TDS = "${S}/tentative-dist-staging" -# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a -# which caused -march conflicts in gcc -TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto" - TARGET_CC_ARCH += "${LDFLAGS}" do_configure_prepend_libc-musl () { @@ -95,6 +92,7 @@ do_compile() { export NS_USE_GCC=1 export NSS_USE_SYSTEM_SQLITE=1 export NSS_ENABLE_ECC=1 + export NSS_ENABLE_WERROR=0 ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} @@ -121,8 +119,6 @@ do_compile() { fi export NSS_DISABLE_GTESTS=1 - # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99420 - export NSS_ENABLE_WERROR=0 # We can modify CC in the environment, but if we set it via an # argument to make, nsinstall, a host program, will also build with it! # diff --git a/meta-openembedded/meta-oe/recipes-support/onig/onig_6.9.4.bb b/meta-openembedded/meta-oe/recipes-support/onig/onig_6.9.4.bb index 50d9f5235..701f65c29 100644 --- a/meta-openembedded/meta-oe/recipes-support/onig/onig_6.9.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/onig/onig_6.9.4.bb @@ -31,3 +31,5 @@ do_install_ptest() { mkdir -p ${D}${PTEST_PATH}/tests install -m 0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/* } + +PROVIDES += "oniguruma" diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb index 311355bd7..31dcc3c29 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb @@ -106,6 +106,12 @@ PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" +# TBB does not build for powerpc so disable that package config +PACKAGECONFIG_remove_powerpc = "tbb" +# tbb now needs getcontect/setcontext which is not there for all arches on musl +PACKAGECONFIG_remove_libc-musl_riscv64 = "tbb" +PACKAGECONFIG_remove_libc-musl_riscv32 = "tbb" + PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade" PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," @@ -224,5 +230,3 @@ do_install_append() { -i ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake fi } - -TOOLCHAIN = "gcc" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.04.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.05.0.bb index de5f38036..4cfc5bd86 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.04.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.05.0.bb @@ -7,7 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ " -SRC_URI[sha256sum] = "5e2219656c6bbd36154133fef2e12b7d0938464518827098b29a10b1697ea79c" +SRC_URI[sha256sum] = "dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" diff --git a/meta-openembedded/meta-oe/recipes-support/portaudio/files/ldflags.patch b/meta-openembedded/meta-oe/recipes-support/portaudio/files/ldflags.patch deleted file mode 100644 index aca93a51f..000000000 --- a/meta-openembedded/meta-oe/recipes-support/portaudio/files/ldflags.patch +++ /dev/null @@ -1,51 +0,0 @@ -Upstream forgot to pass LDFLAGS to everything apart from the main library. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/Makefile.in b/Makefile.in -index 5e1a764..61ecdd1 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -171,20 +171,20 @@ lib/$(PALIB): lib-stamp $(LTOBJS) $(MAKEFILE) $(PAINC) - @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) $(PA_LDFLAGS) -o lib/$(PALIB) $(LTOBJS) $(DLL_LIBS) - - $(ALL_TESTS): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) test/%.c -- @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS) -- @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS) - - $(EXAMPLES): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) examples/%.c -- @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS) -- @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS) - - $(SELFTESTS): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) qa/%.c -- @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS) -- @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS) - - bin/paloopback: lib/$(PALIB) $(MAKEFILE) $(PAINC) $(LOOPBACK_OBJS) -- @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS) -- @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS) - - install: lib/$(PALIB) portaudio-2.0.pc - $(INSTALL) -d $(DESTDIR)$(libdir) -@@ -224,10 +224,10 @@ distclean: clean - $(CC) -c $(CFLAGS) $< -o $@ - - %.lo: %.c $(MAKEFILE) $(PAINC) -- $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< -o $@ -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(LDFLAGS) $< -o $@ - - %.lo: %.cpp $(MAKEFILE) $(PAINC) -- $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(CXXFLAGS) $< -o $@ -+ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(CXXFLAGS) $(LDFLAGS) $< -o $@ - - %.o: %.cpp $(MAKEFILE) $(PAINC) - $(CXX) -c $(CXXFLAGS) $< -o $@ diff --git a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19/0001-Find-jack.patch b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19/0001-Find-jack.patch new file mode 100644 index 000000000..d6c6300ec --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19/0001-Find-jack.patch @@ -0,0 +1,32 @@ +From 8ec1b100afda5b3e31f9d44af04b04b16dfff2e4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Tue, 18 May 2021 00:15:46 +0200 +Subject: [PATCH] Find jack with pkgconfig +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 122fe93..ab7d7f5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -274,7 +274,8 @@ ELSE() + + ELSEIF(UNIX) + +- FIND_PACKAGE(Jack) ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules (JACK jack) + IF(JACK_FOUND) + OPTION(PA_USE_JACK "Enable support for Jack" ON) + ELSE() +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb new file mode 100644 index 000000000..3a0f7894f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb @@ -0,0 +1,32 @@ +SUMMARY = "A portable audio library" +SECTION = "libs/multimedia" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df" + +PV = "v190700" + +SRC_URI = " \ + git://github.com/PortAudio/portaudio.git \ + file://0001-Find-jack.patch \ +" +SRCREV = "147dd722548358763a8b649b3e4b41dfffbcfbb6" +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGECONFIG ??= "alsa jack" +PACKAGECONFIG[alsa] = ",,alsa-lib" +PACKAGECONFIG[jack] = ",,jack" +PACKAGECONFIG[examples] = "-DPA_BUILD_EXAMPLES=ON,-DPA_BUILD_EXAMPLES=OFF" + +do_install_append() { + if [ -d ${B}/examples ]; then + install -d ${D}${bindir} + for example in ${B}/examples/pa*; do + install -m755 $example ${D}${bindir}/ + done + fi +} + +FILES_SOLIBSDEV = "" +FILES_${PN} += "${libdir}/libportaudio.so" diff --git a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_20161030.bb b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_20161030.bb deleted file mode 100644 index 489f8ad9e..000000000 --- a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_20161030.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "A portable audio library" -SECTION = "libs/multimedia" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df" - -PV = "v190600" - -SRC_URI = "http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz \ - file://ldflags.patch" -SRC_URI[md5sum] = "4df8224e047529ca9ad42f0521bf81a8" -SRC_URI[sha256sum] = "f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513" - -S = "${WORKDIR}/portaudio" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "alsa jack" -PACKAGECONFIG[alsa] = "--with-alsa, --without-alsa, alsa-lib," -PACKAGECONFIG[jack] = "--with-jack, --without-jack, jack," - -EXTRA_OECONF = "--without-oss --without-asihpi" - -do_install_append() { - mkdir --parents ${D}${bindir} - for b in ${B}/bin/pa*; do - # Bit nasty, should always work - ${B}/*-libtool --mode install install $b ${D}${bindir} - done -} - -PACKAGES += "portaudio-examples" -FILES_portaudio-examples = "${bindir}" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.11.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.17.bb index 215c04a22..ef7876786 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.17.bb @@ -3,34 +3,44 @@ HOMEPAGE = "https://remmina.org" SECTION = "Support" LICENSE = "GPLv2 & openssl" LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" -DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret libxkbfile" +DEPENDS = " \ + glib-2.0-native \ + openssl \ + freerdp \ + gtk+3 \ + gdk-pixbuf \ + atk \ + libgcrypt \ + libsodium \ + libssh \ + vte \ + json-glib \ + libsoup-2.4 \ + libvncserver \ + libsecret \ + libxkbfile \ +" DEPENDS_append_libc-musl = " libexecinfo" LDFLAGS_append_libc-musl = " -lexecinfo" -SRCREV = "6a8737111adebf571c46f35599cc62e7f7b0bd65" -SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=rel/v1.4.11 \ -" - -PV .= "+git${SRCPV}" - +SRCREV = "0ef1621b3e16b3168213147a2bfca39da2c2668f" +SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https" S = "${WORKDIR}/git" -inherit cmake features_check mime-xdg +inherit cmake features_check mime mime-xdg gtk-icon-cache REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF" -do_install_append(){ - # We dont need the extra stuff form other desktop environments - rm -rf ${D}/${datadir}/xsessions - rm -rf ${D}/${datadir}/metainfo - rm -rf ${D}/${datadir}/gnome-session -} - PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" +# Switch on gtk support in avahi recipe if you want to enable avahi support +PACKAGECONFIG[avahi] = "-DWITH_AVAHI=ON, -DWITH_AVAHI=OFF, avahi" RDEPENDS_${PN} = "bash" -FILES_${PN}_append = " ${datadir}/icons/hicolor/*" +FILES_${PN}+= " \ + ${datadir}/metainfo \ + ${datadir}/mime \ +" diff --git a/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.11.bb b/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.12.bb index 7fc87db2b..d0a4a0467 100644 --- a/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.12.bb @@ -17,8 +17,8 @@ UPSTREAM_CHECK_REGEX = "sdparm-(?P<pver>\d+(\.\d+)+)\.tgz" PACKAGES =+ "${PN}-scripts" RDEPENDS_${PN}-scripts += "bash ${PN}" -SRC_URI[md5sum] = "cd998d1c12a4ec11652d0af580f06b4d" -SRC_URI[sha256sum] = "432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0" +SRC_URI[md5sum] = "2902fd29e6834fd62c16bb5d1ac53c7e" +SRC_URI[sha256sum] = "e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.8.1.bb b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.9.2.bb index 6956f5fe6..16b7c3e54 100644 --- a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.9.2.bb @@ -4,7 +4,7 @@ LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SRC_URI += "git://github.com/martinmoene/span-lite" -SRCREV = "937262f25fb702592cbc5c772111a73a5e3c1e07" +SRCREV = "126453198fe2236b31ddfa7353e95d3a06c478ab" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch deleted file mode 100644 index b5bfcd025..000000000 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch +++ /dev/null @@ -1,74 +0,0 @@ -Subject: [PATCH] syslog-ng: fix segment fault during service start on arm64 - -service start failed since segment fault on arch arm64, -syslog-ng have a submodule ivykis, from ivykis V0.42, -it use pthread_atfork, but for arm64, this symbol is -not included by libpthread, so cause segment fault. - -refer systemd, replace pthread_atfork with __register_atfork -to fix this problem. - -I have create an issue, and this proposal to upstream. -https://github.com/buytenh/ivykis/issues/15 - -Upstream-Status: Pending - -Signed-off-by: Changqing Li <changqing.li@windriver.com> - -Update for 3.24.1. -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - lib/ivykis/src/pthr.h | 23 ++++++++++++----------- - 1 file changed, 12 insertions(+), 11 deletions(-) - -diff --git a/lib/ivykis/src/pthr.h b/lib/ivykis/src/pthr.h -index 29e4be7..5d29096 100644 ---- a/lib/ivykis/src/pthr.h -+++ b/lib/ivykis/src/pthr.h -@@ -24,6 +24,16 @@ - #include <pthread.h> - #include <signal.h> - -+#ifdef __GLIBC__ -+/* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc -+ * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against -+ * libpthread, as it is part of glibc anyway. */ -+extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle); -+extern void* __dso_handle __attribute__ ((__weak__)); -+#else -+#define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child) -+#endif -+ - #ifdef HAVE_PRAGMA_WEAK - #pragma weak pthread_create - #endif -@@ -36,16 +46,7 @@ static inline int pthreads_available(void) - - #ifdef HAVE_PRAGMA_WEAK - --/* -- * On Linux, pthread_atfork() is defined in libc_nonshared.a (for -- * glibc >= 2.28) or libpthread_nonshared.a (for glibc <= 2.27), and -- * we want to avoid "#pragma weak" for that symbol because that causes -- * it to be undefined even if you link lib*_nonshared.a in explicitly. -- */ --#if !defined(HAVE_LIBC_NONSHARED) && !defined(HAVE_LIBPTHREAD_NONSHARED) --#pragma weak pthread_atfork --#endif -- -+#pragma weak __register_atfork - #pragma weak pthread_create - #pragma weak pthread_detach - #pragma weak pthread_getspecific -@@ -73,7 +74,7 @@ static inline int - pthr_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) - { - if (pthreads_available()) -- return pthread_atfork(prepare, parent, child); -+ return __register_atfork(prepare, parent, child, __dso_handle); - - return ENOSYS; - } --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0002-scl-fix-wrong-ownership-during-installation.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0002-scl-fix-wrong-ownership-during-installation.patch new file mode 100644 index 000000000..b2683350b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0002-scl-fix-wrong-ownership-during-installation.patch @@ -0,0 +1,30 @@ +From 7a8c458b7acf4732af74317f8a535077eb451b1e Mon Sep 17 00:00:00 2001 +From: Ming Liu <ming.liu@windriver.com> +Date: Thu, 17 Jul 2014 05:37:08 -0400 +Subject: [PATCH] scl: fix wrong ownership during installation + +The ownership of build user is preserved for some target files, fixed it by +adding --no-same-owner option to tar when extracting files. + +Signed-off-by: Ming Liu <ming.liu@windriver.com> + +Upstream-Status: Backport [9045908] + +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> +--- + scl/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scl/Makefile.am b/scl/Makefile.am +index 940a467..3c19e50 100644 +--- a/scl/Makefile.am ++++ b/scl/Makefile.am +@@ -51,7 +51,7 @@ scl-install-data-local: + fi; \ + done + $(mkinstalldirs) $(DESTDIR)/$(scldir) +- (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf -) ++ (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf - --no-same-owner) + chmod -R u+rwX $(DESTDIR)/$(scldir) + + scl-uninstall-local: diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch new file mode 100644 index 000000000..a8be7d81d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch @@ -0,0 +1,53 @@ +From b64fcc414316592968f181c85447cfd01d1e461e Mon Sep 17 00:00:00 2001 +From: Yi Fan Yu <yifan.yu@windriver.com> +Date: Thu, 15 Apr 2021 13:48:19 -0400 +Subject: [PATCH] *.py: s/python/python3/ (exclude tests) + +As stated by https://github.com/syslog-ng/syslog-ng/pull/3603 +python2 is EOL. + +Fix all shebangs calling python instead of python3 +except the tests. + +(correcting lib/merge-grammar.py) +Signed-off-by: Joe Slater <joe.slater@windriver.com> +(adding the rest) +Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/3647] + +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> +--- + contrib/scripts/config-graph-json-to-dot.py | 2 +- + lib/merge-grammar.py | 2 +- + modules/python/pylib/setup.py | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/contrib/scripts/config-graph-json-to-dot.py b/contrib/scripts/config-graph-json-to-dot.py +index 4955c81..0351a9a 100755 +--- a/contrib/scripts/config-graph-json-to-dot.py ++++ b/contrib/scripts/config-graph-json-to-dot.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + import json, sys + + j = None +diff --git a/lib/merge-grammar.py b/lib/merge-grammar.py +index 7313ff5..459712d 100755 +--- a/lib/merge-grammar.py ++++ b/lib/merge-grammar.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + ############################################################################# + # Copyright (c) 2010-2017 Balabit + # +diff --git a/modules/python/pylib/setup.py b/modules/python/pylib/setup.py +index 23bb5cc..a2fa05e 100755 +--- a/modules/python/pylib/setup.py ++++ b/modules/python/pylib/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + ############################################################################# + # Copyright (c) 2015-2016 Balabit + # diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch deleted file mode 100644 index 4f8a3d077..000000000 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch +++ /dev/null @@ -1,47 +0,0 @@ -configure.ac: add option --enable-thread-tls to manage thread ssl support - -Add option --enable-thread-tls to manage the including of thread -local storage, so we could explicitly disable it. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - configure.ac | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -Index: syslog-ng-3.15.1/configure.ac -=================================================================== ---- syslog-ng-3.15.1.orig/configure.ac -+++ syslog-ng-3.15.1/configure.ac -@@ -190,6 +190,9 @@ AC_ARG_ENABLE(gprof, - AC_ARG_ENABLE(memtrace, - [ --enable-memtrace Enable alternative leak debugging code.]) - -+AC_ARG_ENABLE(thread-tls, -+ [ --enable-thread-tls Enable Thread Local Storage support.],,enable_thread_tls="no") -+ - AC_ARG_ENABLE(dynamic-linking, - [ --enable-dynamic-linking Link everything dynamically.],,enable_dynamic_linking="auto") - -@@ -591,12 +594,14 @@ dnl *************************************************************************** - dnl Is the __thread keyword available? - dnl *************************************************************************** - --AC_LINK_IFELSE([AC_LANG_PROGRAM( --[[#include <pthread.h> --__thread int a; --]], --[a=0;])], --[ac_cv_have_tls=yes; AC_DEFINE_UNQUOTED(HAVE_THREAD_KEYWORD, 1, "Whether Thread Local Storage is supported by the system")]) -+if test "x$enable_thread_tls" != "xno"; then -+ AC_LINK_IFELSE([AC_LANG_PROGRAM( -+ [[#include <pthread.h> -+ __thread int a; -+ ]], -+ [a=0;])], -+ [ac_cv_have_tls=yes; AC_DEFINE_UNQUOTED(HAVE_THREAD_KEYWORD, 1, "Whether Thread Local Storage is supported by the system")]) -+fi - - dnl *************************************************************************** - dnl How to do static linking? diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch deleted file mode 100644 index 4ad0afa95..000000000 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch +++ /dev/null @@ -1,65 +0,0 @@ -Subject: [PATCH] add libnet enable option - -Upstream-Status: Pending - -This would avoid a implicit auto-detecting result. - -Signed-off-by: Ming Liu <ming.liu@windriver.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> - -Update for 3.24.1. -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - configure.ac | 28 ++++++++++++++++------------ - 1 file changed, 16 insertions(+), 12 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 00eb566..e7d5ac1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -143,6 +143,9 @@ AC_CONFIG_HEADERS(config.h) - dnl *************************************************************************** - dnl Arguments - -+AC_ARG_ENABLE(libnet, -+ [ --enable-libnet Enable libnet support.],, enable_libnet="no") -+ - AC_ARG_WITH(libnet, - [ --with-libnet=path use path to libnet-config script], - , -@@ -1047,19 +1050,20 @@ dnl *************************************************************************** - dnl libnet headers/libraries - dnl *************************************************************************** - AC_MSG_CHECKING(for LIBNET) --if test "x$with_libnet" = "x"; then -- LIBNET_CONFIG="`which libnet-config`" --else -- LIBNET_CONFIG="$with_libnet/libnet-config" --fi -+if test "x$enable_libnet" = xyes; then -+ if test "x$with_libnet" = "x"; then -+ LIBNET_CONFIG="`which libnet-config`" -+ else -+ LIBNET_CONFIG="$with_libnet/libnet-config" -+ fi - --if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then -- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" -- LIBNET_LIBS="`$LIBNET_CONFIG --libs`" -- AC_MSG_RESULT(yes) --dnl libnet-config does not provide the _DEFAULT_SOURCE define, that can cause warning during build --dnl as upstream libnet-config does uses _DEFAULT_SOURCE this is just a fix till -- LIBNET_CFLAGS="$LIBNET_CFLAGS -D_DEFAULT_SOURCE" -+ if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then -+ LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" -+ LIBNET_LIBS="`$LIBNET_CONFIG --libs`" -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_ERROR([Could not find libnet, and libnet support was explicitly enabled.]) -+ fi - - else - LIBNET_LIBS= --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch deleted file mode 100644 index 54ecce57e..000000000 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch +++ /dev/null @@ -1,25 +0,0 @@ -syslog-ng: fix wrong ownership issue - -Upstream-Status: Pending - -The ownership of build user is preserved for some target files, fixed it by -adding --no-same-owner option to tar when extracting files. - -Signed-off-by: Ming Liu <ming.liu@windriver.com> ---- - scl/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -Index: syslog-ng-3.8.1/scl/Makefile.am -=================================================================== ---- syslog-ng-3.8.1.orig/scl/Makefile.am -+++ syslog-ng-3.8.1/scl/Makefile.am -@@ -27,7 +27,7 @@ scl-install-data-local: - fi; \ - done - $(mkinstalldirs) $(DESTDIR)/$(scldir) -- (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf -) -+ (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf - --no-same-owner) - chmod -R u+rwX $(DESTDIR)/$(scldir) - - scl-uninstall-local: diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/shebang.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/shebang.patch deleted file mode 100644 index 35d967753..000000000 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/shebang.patch +++ /dev/null @@ -1,18 +0,0 @@ -syslog-ng: change shebang to use python3 - -Correct shebang for python3. This is far from the only python file with an out of date shebang, -but it is the only one that winds up on a target. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - - ---- a/lib/merge-grammar.py -+++ b/lib/merge-grammar.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ############################################################################# - # Copyright (c) 2010-2017 Balabit - # diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd index 6a8627672..b63f46ddc 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd @@ -1,4 +1,4 @@ -@version: 3.24 +@version: 3.31 # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit index 32b98610d..07cd3b086 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit @@ -1,4 +1,4 @@ -@version: 3.24 +@version: 3.31 # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb deleted file mode 100644 index 10bf00fdc..000000000 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -require syslog-ng.inc - -# We only want to add stuff we need to the defaults provided in syslog-ng.inc. -# -SRC_URI += " \ - file://fix-config-libnet.patch \ - file://fix-invalid-ownership.patch \ - file://syslog-ng.service-the-syslog-ng-service.patch \ - file://0001-syslog-ng-fix-segment-fault-during-service-start.patch \ - file://shebang.patch \ - file://syslog-ng-tmp.conf \ - " - -SRC_URI[md5sum] = "ef9de066793f7358af7312b964ac0450" -SRC_URI[sha256sum] = "d4d0a0357b452be96b69d6f741129275530d8f0451e35adc408ad5635059fa3d" diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.31.2.bb index 818cad5bc..ce1c41e35 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.31.2.bb @@ -10,21 +10,25 @@ ideal for firewalled environments. \ HOMEPAGE = "http://www.balabit.com/network-security/syslog-ng/opensource-logging-system" LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=24c0c5cb2c83d9f2ab725481e4df5240" +LIC_FILES_CHKSUM = "file://COPYING;md5=189c3826d32deaf83ad8d0d538a10023" # util-linux added to get libuuid DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native" -# We expect the recipe to add anything specific for that version to these defaults. -# SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ file://syslog-ng.conf.systemd \ file://syslog-ng.conf.sysvinit \ file://initscript \ file://volatiles.03_syslog-ng \ - file://configure.ac-add-option-enable-thread-tls-to-manage-.patch \ + file://syslog-ng-tmp.conf \ + file://syslog-ng.service-the-syslog-ng-service.patch \ + file://0002-scl-fix-wrong-ownership-during-installation.patch \ + file://0005-.py-s-python-python3-exclude-tests.patch \ " +SRC_URI[md5sum] = "69ef4dc5628d5e603e9e4a1b937592f8" +SRC_URI[sha256sum] = "2eeb8e0dbbcb556fdd4e50bc9f29bc8c66c9b153026f87caa7567bd3139c186a" + UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" inherit autotools gettext systemd pkgconfig update-rc.d multilib_header @@ -42,12 +46,8 @@ EXTRA_OECONF = " \ --disable-python \ --disable-java --disable-java-modules \ --with-pidfile-dir=${localstatedir}/run/${BPN} \ - ${CONFIG_TLS} \ " -CONFIG_TLS = "--enable-thread-tls" -CONFIG_TLS_arm = "${@oe.utils.conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}" - PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \ " @@ -55,7 +55,7 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd --without-systemdsystemunitdir,systemd," PACKAGECONFIG[linux-caps] = "--enable-linux-caps,--disable-linux-caps,libcap," PACKAGECONFIG[dbi] = "--enable-sql,--disable-sql,libdbi," -PACKAGECONFIG[libnet] = "--enable-libnet --with-libnet=${STAGING_BINDIR_CROSS},--disable-libnet,libnet," +PACKAGECONFIG[spoof-source] = "--enable-spoof-source --with-libnet=${STAGING_BINDIR_CROSS},--disable-spoof-source,libnet," PACKAGECONFIG[http] = "--enable-http,--disable-http,curl," PACKAGECONFIG[smtp] = "--enable-smtp --with-libesmtp=${STAGING_LIBDIR},--disable-smtp,libesmtp," PACKAGECONFIG[json] = "--enable-json,--disable-json,json-c," diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-set_my_tls_end_of_input-Use-an-arbitrary-but-valid-p.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-set_my_tls_end_of_input-Use-an-arbitrary-but-valid-p.patch new file mode 100644 index 000000000..caa68e64c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-set_my_tls_end_of_input-Use-an-arbitrary-but-valid-p.patch @@ -0,0 +1,37 @@ +From a996fd451bbd7be93cff5f466bff7282ae972fe1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 11 May 2021 10:52:51 -0700 +Subject: [PATCH] set_my_tls_end_of_input: Use an arbitrary but valid pointer + as value + +Pass a valid pointer to pthread_setspecific to avoid GCC 11 warning. +Fixes + +src/tbb/tls.h:44:46: error: 'int pthread_setspecific(pthread_key_t, const void*)' expecting 1 byte in a region of size 0 [-Werror=stringop-overread] +| 44 | void set( T value ) { pthread_setspecific(my_key, (void*)value); } +| | ~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~ +| compilation terminated due to -Wfatal-errors. + +Upstream-Status: Submitted [https://github.com/oneapi-src/oneTBB/pull/394] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/tbb/parallel_pipeline.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/tbb/parallel_pipeline.cpp b/src/tbb/parallel_pipeline.cpp +index b7655c6b..ca518b5b 100644 +--- a/src/tbb/parallel_pipeline.cpp ++++ b/src/tbb/parallel_pipeline.cpp +@@ -243,7 +243,8 @@ public: + return end_of_input_tls.get() != 0; + } + void set_my_tls_end_of_input() { +- end_of_input_tls.set(1); ++ // Use an arbitrary but valid pointer as value. ++ end_of_input_tls.set(array_size); + } + }; + +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb index b05a59dc7..f4c52daf4 100644 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb @@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=86d3f3a95c324c9479bd8986968f4327" DEPENDS_append_libc-musl = " libucontext" +PE = "1" + BRANCH = "onetbb_2021" SRCREV = "2dba2072869a189b9fdab3ffa431d3ea49059a19" SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ @@ -16,6 +18,7 @@ SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH file://GLIBC-PREREQ-is-not-defined-on-musl.patch \ file://0001-CMakeLists.txt-exclude-riscv64-riscv32.patch \ file://0001-Disable-use-of-_tpause-instruction.patch \ + file://0001-set_my_tls_end_of_input-Use-an-arbitrary-but-valid-p.patch \ " S = "${WORKDIR}/git" @@ -43,3 +46,6 @@ LDFLAGS_append_mips = " -latomic" LDFLAGS_append_mipsel = " -latomic" LDFLAGS_append_libc-musl = " -lucontext" + +# The latest version of oneTBB does not support PPC +COMPATIBLE_MACHINE_powerpc = "(!.*ppc).*" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch deleted file mode 100644 index a6b0a0454..000000000 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch +++ /dev/null @@ -1,23 +0,0 @@ -Origin: https://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg461494.html -From 80bfab5ec8575703ef26b442a3af2d030793ebde Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org> -Date: Thu, 24 Dec 2020 23:03:55 +0100 -Subject: [PATCH] - DECLCALLBACK generates incorrect code on ix86, remove it - ---- - kernel-5.10.patch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel-5.10.patch b/kernel-5.10.patch -index b28d6e0..729235d 100644 ---- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -@@ -536,7 +536,7 @@ typedef const LNXAPPLYPGRANGE *PCLNXAPPLYPGRANGE; - * @param uAddr The address to apply the new protection to. - * @param pvUser The opaque user data. - */ --static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser) -+static int rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser) - { - PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser; - PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx; diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb index 1def1a311..a074d0a55 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb @@ -13,11 +13,10 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ - file://kernel-5.10.patch \ file://add__divmoddi4.patch \ " -SRC_URI[md5sum] = "c61001386eb3822ab8f06d688a82e84b" -SRC_URI[sha256sum] = "108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40" +SRC_URI[md5sum] = "abb1a20021e5915fe38c666e8c11cf80" +SRC_URI[sha256sum] = "99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49" S ?= "${WORKDIR}/vbox_module" S_task-patch = "${WORKDIR}/${VBOX_NAME}" diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch index c06aa7b6c..ea3eb11f0 100644 --- a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch @@ -9,14 +9,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> common/arch.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/common/arch.h b/common/arch.h +index 617feb5e..6edb39db 100644 --- a/common/arch.h +++ b/common/arch.h -@@ -84,7 +84,7 @@ typedef int bool_t; +@@ -85,7 +85,7 @@ typedef int bool_t; #define NEED_ALIGN #elif defined(__x86__) || defined(__x86_64__) || \ defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \ - defined(__i386__) || defined(__aarch64__) || \ + defined(__i386__) || defined(__aarch64__) || defined(__powerpc64__) || \ + defined(__PPC__) || defined(__LITTLE_ENDIAN__) || \ + defined(__s390__) || defined (__s390x__) || \ defined(__riscv) - #define NO_NEED_ALIGN - #else +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.15.bb b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.16.bb index 039ba1a76..d7a371b08 100644 --- a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.15.bb +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.16.bb @@ -16,7 +16,7 @@ SRC_URI = "git://github.com/neutrinolabs/xrdp.git;branch=devel \ file://0001-Fix-the-compile-error.patch \ file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ " -SRCREV = "f24b7b7988140b18202908654db3289659303772" +SRCREV = "a4c7ee077c049202d73f82f518b2de958d722890" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.13.4.bb b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.13.6.bb index 21004726a..fd677a3e3 100644 --- a/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.13.4.bb +++ b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.13.6.bb @@ -6,7 +6,7 @@ LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SRC_URI = "git://github.com/catchorg/Catch2.git;branch=v2.x" -SRCREV = "de6fe184a9ac1a06895cdd1c9b437f0a0bdf14ad" +SRCREV = "5c88067bd339465513af4aec606bd2292f1b594a" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb index 354e7de33..2e0fecf7a 100644 --- a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb @@ -2,15 +2,14 @@ DESCRIPTION = "Google's framework for writing C++ tests" HOMEPAGE = "https://github.com/google/googletest" SECTION = "libs" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://googlemock/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ - file://googletest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" +LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" -PV = "1.10.0" +PV = "1.10.0+git${SRCPV}" PROVIDES += "gmock gtest" S = "${WORKDIR}/git" -SRCREV = "703bd9caab50b139428cea1aaff9974ebee5742e" +SRCREV = "662fe38e44900c007eccb65a5d2ea19df7bd520e" SRC_URI = "git://github.com/google/googletest.git" inherit cmake diff --git a/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.08.bb b/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.10.bb index 3f1d35be8..94f5a0825 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.08.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.10.bb @@ -15,8 +15,8 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://META.json;beginline=8;endline=10;md5=b12e3be1e17a7e99ca4f429ff32c28b5" SRC_URI = "${CPAN_MIRROR}/authors/id/D/DA/DANKOGAI/Encode-${PV}.tar.gz" -SRC_URI[md5sum] = "3889cf6d1b75e486d54f9fd6517a02b4" -SRC_URI[sha256sum] = "ed063d01d01a140a3a3ec0aeba2f2b4849a35c18ca96ac231a5d7c7d54d17b5b" +SRC_URI[md5sum] = "7377c8694a7afeeaa46ee035d0d7335c" +SRC_URI[sha256sum] = "c2d7906af17664d6b6f16bf76572c95c16c30ad096b7dd980c08c3de33e319a9" UPSTREAM_CHECK_REGEX = "Encode\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_6.0.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_6.0.1.bb index 4a936b49a..2d46e9611 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_6.0.0.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_6.0.1.bb @@ -4,7 +4,6 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5bf1c68e73fbaec2b1687b7e71514393" -SRC_URI[md5sum] = "30136a712e092b1a45ae3cad3ae93131" -SRC_URI[sha256sum] = "742d2a4bc3152a340a49d59f32e33ec420aa8e7054c1444ef5c7efff255842f1" +SRC_URI[sha256sum] = "ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 0418b5930..9f3d48253 100644 --- a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -38,6 +38,7 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-astroid \ python3-asttokens \ python3-async-timeout \ + python3-asyncio-glib \ python3-attr \ python3-autobahn \ python3-automat \ @@ -215,7 +216,6 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-lxml \ python3-lz4 \ python3-m2crypto \ - python3-markdown \ python3-markupsafe \ python3-matplotlib \ python3-mccabe \ @@ -290,6 +290,7 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-pybind11-json \ python3-pybluez \ python3-pychromecast \ + python3-pycocotools \ python3-pycodestyle \ python3-pyconnman \ python3-pycparser \ @@ -366,7 +367,6 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-robotframework-seriallibrary \ python3-rsa \ python3-ruamel-yaml \ - python3-scapy \ python3-scrypt \ python3-sdnotify \ python3-semver \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto.inc deleted file mode 100644 index 797a0354b..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto.inc +++ /dev/null @@ -1,63 +0,0 @@ -SUMMARY = "A Python crypto and SSL toolkit" -HOMEPAGE = "https://gitlab.com/m2crypto/m2crypto" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" - -FILESEXTRAPATHS_prepend := "${THISDIR}/python-m2crypto:" - -SRC_URI += "file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \ - file://cross-compile-platform.patch \ - file://m2crypto-0.26.4-gcc_macros.patch \ - " -SRC_URI[md5sum] = "7fce3cbf85eb84a669682892b935746b" -SRC_URI[sha256sum] = "a1b2751cdadc6afac3df8a5799676b7b7c67a6ad144bb62d38563062e7cd3fc6" - -PYPI_PACKAGE = "M2Crypto" -inherit pypi siteinfo - -DEPENDS += "openssl swig-native" -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-distutils \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-smtpd \ - ${PYTHON_PN}-xmlrpc \ -" - -DISTUTILS_BUILD_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR} -I${STAGING_INCDIR}" -DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR}" - -SWIG_FEATURES_x86 = "-D__i386__" -SWIG_FEATURES_x32 = "-D__ILP32__" -SWIG_FEATURES ?= "-D__${HOST_ARCH}__" -export SWIG_FEATURES - -# Get around a problem with swig, but only if the -# multilib header file exists. -# -do_configure_prepend() { - ${CPP} -dM - < /dev/null | grep -v '__\(STDC\|REGISTER_PREFIX\|GNUC\|STDC_HOSTED\)__' \ - | sed 's/^\(#define \([^ ]*\) .*\)$/#undef \2\n\1/' > ${S}/SWIG/gcc_macros.h - - if [ "${SITEINFO_BITS}" = "64" ];then - bit="64" - else - bit="32" - fi - - if [ -e ${STAGING_INCDIR}/openssl/opensslconf-${bit}.h ] ;then - for i in SWIG/_ec.i SWIG/_evp.i; do - sed -i -e "s/opensslconf.*\./opensslconf-${bit}\./" "${S}/$i" - done - elif [ -e ${STAGING_INCDIR}/openssl/opensslconf-n${bit}.h ] ;then - for i in SWIG/_ec.i SWIG/_evp.i; do - sed -i -e "s/opensslconf.*\./opensslconf-n${bit}\./" "${S}/$i" - done - fi -} - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch deleted file mode 100644 index 7f6dd29f8..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch +++ /dev/null @@ -1,35 +0,0 @@ -Imported from Fedora - -Index: M2Crypto-0.30.1/SWIG/_m2crypto.i -=================================================================== ---- M2Crypto-0.30.1.orig/SWIG/_m2crypto.i -+++ M2Crypto-0.30.1/SWIG/_m2crypto.i -@@ -8,6 +8,11 @@ - * - */ - -+%import "gcc_macros.h" -+ -+%ignore WCHAR_MAX; -+%ignore WCHAR_MIN; -+ - %module(threads=1) m2crypto - /* We really don't need threadblock (PyGILState_Ensure() etc.) anywhere. - Disable threadallow as well, only enable it for operations likely to -@@ -15,11 +20,6 @@ - %nothreadblock; - %nothreadallow; - --#if SWIG_VERSION >= 0x030000 --#define __WCHAR_MAX__ __WCHAR_MAX --#define __WCHAR_MIN__ __WCHAR_MIN --#endif -- - %{ - #ifdef _WIN32 - #define _WINSOCKAPI_ -@@ -95,4 +95,3 @@ static PyObject *x509_store_verify_cb_fu - %constant int encrypt = 1; - %constant int decrypt = 0; - #endif -- diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.1.0.bb index cb8462d24..cb5eab15a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/aenum/" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://aenum/LICENSE;md5=c6a85477543f8b8591b9c1f82abebbe9" -SRC_URI[sha256sum] = "17cd8cfed1ee4b617198c9fabbabd70ebd8f01e54ac29cd6c3a92df14bd86656" +SRC_URI[sha256sum] = "87f0e9ef4f828578ab06af30e4d7944043bf4ecd3f4b7bd1cbe37e2173cde94a" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_0.7.0.bb index 89157b504..9d7a49eb6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_0.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_0.7.0.bb @@ -4,8 +4,7 @@ HOMEPAGE = "https://github.com/aio-libs/aiohttp" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" -SRC_URI[md5sum] = "3b7ba03babd3d3a6101524469358843e" -SRC_URI[sha256sum] = "e0281b157d3d5d59d803e3f4557dcc9a3dff28a4dd4829a9ff478adae50ca092" +SRC_URI[sha256sum] = "a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4" PYPI_PACKAGE = "aiofiles" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_2.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_2.2.0.bb deleted file mode 100644 index a2a7363f6..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_2.2.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Asynchronous library to control Philips Hue" -HOMEPAGE = "https://pypi.org/project/aiohue/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -# No license file available but the license is specified in PKG-INFO and setup.py. -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" - -SRC_URI[sha256sum] = "35696d04d6eb0328b7031ea3c0a3cfe5d83dfcf62f920522e4767d165c6bc529" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "${PYTHON_PN}-aiohttp" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_2.5.0.bb new file mode 100644 index 000000000..a29625acc --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_2.5.0.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Asynchronous library to control Philips Hue" +HOMEPAGE = "https://pypi.org/project/aiohue/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dab31a1d28183826937f4b152143a33f" + +SRC_URI[sha256sum] = "e2ae49be45261283a899cc1b95786f07fe5076be9a311d250dbe2de1b8c38f0f" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-aiohttp" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.5.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.6.5.bb index fdf0d36b5..6b58c7704 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.5.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.6.5.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c4ece55266dcdd02ce165b1ee0e490bb" inherit pypi setuptools3 -SRC_URI[sha256sum] = "e27fd67732c97a1c370c33169ef4578cf96436fa0e7dcfaeeef4a917d0737d56" +SRC_URI[sha256sum] = "a21fedebb3fb8f6bbbba51a11114f08c78709377051384c9c5ead5705ee93a51" PYPI_PACKAGE = "alembic" @@ -13,4 +13,5 @@ RDEPENDS_${PN} += "\ ${PYTHON_PN}-editor \ ${PYTHON_PN}-mako \ ${PYTHON_PN}-sqlalchemy \ + ${PYTHON_PN}-misc \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_1.12.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_1.12.3.bb index a08f882ab..7fdf9e019 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_1.12.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_1.12.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/kislyuk/argcomplete" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2ee41112a44fe7014dce33e26468ba93" -SRC_URI[sha256sum] = "de0e1282330940d52ea92a80fea2e4b9e0da1932aaa570f84d268939d1897b04" +SRC_URI[sha256sum] = "2c7dbffd8c045ea534921e63b0be6fe65e88599990d8dc408ac8c542b72a5445" PYPI_PACKAGE = "argcomplete" @@ -11,6 +11,7 @@ inherit pypi setuptools3 RDEPENDS_${PN} += "\ ${PYTHON_PN}-core \ + ${PYTHON_PN}-io \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-arpeggio_1.10.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-arpeggio_1.10.2.bb index 38e26623f..468e6d5fd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-arpeggio_1.10.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-arpeggio_1.10.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/Arpeggio/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=33b8d1ba459a2fa4d801acfd1d1b7ceb" -SRC_URI[sha256sum] = "920d12cc762edb2eb56daae64a14c93e43dc181b481c88fc79314c0df6ee639e" +SRC_URI[sha256sum] = "bfe349f252f82f82d84cb886f1d5081d1a31451e6045275e9f90b65d0daa06f1" PYPI_PACKAGE = "Arpeggio" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.5.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.5.7.bb index f1d9c66af..c805dc4dc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.5.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.5.7.bb @@ -2,9 +2,9 @@ SUMMARY = "An abstract syntax tree for Python with inference support." HOMEPAGE = "https://pypi.python.org/pypi/astroid" SECTION = "devel/python" LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" -SRC_URI[sha256sum] = "ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91" +SRC_URI[sha256sum] = "d66a600e1602736a0f24f725a511b0e50d12eb18f54b31ec276d2c26a0a62c6a" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-asttokens_2.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-asttokens_2.0.5.bb index c2149336f..429a56bae 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-asttokens_2.0.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-asttokens_2.0.5.bb @@ -7,7 +7,7 @@ PYPI_PACKAGE = "asttokens" inherit pypi setuptools3 -SRC_URI[sha256sum] = "a42e57e28f2ac1c85ed9b1f84109401427e5c63c04f61d15b8842b027eec5128" +SRC_URI[sha256sum] = "9a54c114f02c7a9480d56550932546a3f1fe71d8a02f1bc7ccd0ee3ee35cf4d5" DEPENDS += "\ python3-setuptools-scm-native \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-asyncio-glib_0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-asyncio-glib_0.1.bb new file mode 100644 index 000000000..72da6081a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-asyncio-glib_0.1.bb @@ -0,0 +1,11 @@ +SUMMARY = "An implementation of the Python 3 asyncio event loop on top of GLib" +AUTHOR = "James Henstridge" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" + +inherit setuptools3 pypi + +SRC_URI[md5sum] = "60153055e76ceaacdfbaeafb03d61dd9" +SRC_URI[sha256sum] = "fe3ceb2ba5f541330c07ca1bd7ae792468d625bad1acf5354a3a7a0b9fd87521" + +RDEPENDS_${PN} += "python3-asyncio python3-pygobject" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.9.1.bb index 7248abf33..a54f0d210 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.9.1.bb @@ -1,9 +1,9 @@ DESCRIPTION = "A collection of tools for internationalizing Python applications" HOMEPAGE = "http://babel.edgewall.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=22a580b27e4ebf9689e466b63aedeb7f" +LIC_FILES_CHKSUM = "file://LICENSE;md5=05fb707293a85504aa67afc8ea34d747" -SRC_URI[sha256sum] = "da031ab54472314f210b0adcff1588ee5d1d1d0ba4dbd07b94dba82bde791e05" +SRC_URI[sha256sum] = "bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0" PYPI_PACKAGE = "Babel" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bidict_0.21.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bidict_0.21.2.bb new file mode 100644 index 000000000..237bd2a63 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bidict_0.21.2.bb @@ -0,0 +1,11 @@ +SUMMARY = "The bidirectional mapping library for Python." +DESCRIPTION = "The bidirectional mapping library for Python." +HOMEPAGE = "https://bidict.readthedocs.io/" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" + +SRC_URI[sha256sum] = "4fa46f7ff96dc244abfc437383d987404ae861df797e2fd5b190e233c302be09" + +inherit pypi setuptools3 + +DEPENDS += "python3-setuptools-scm-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.9.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.1.0.bb index 0716e8e1d..12de2c97a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.9.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/ilanschnell/bitarray" LICENSE = "PSF" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" -SRC_URI[sha256sum] = "d7a49d21ae04c5af195023b140800186ebf208e3a4fc5b21a1389531cb7a7170" +SRC_URI[sha256sum] = "97224a19325ecee49a3bf4df3ee0531d3af9cf288b67d089a7ef44a3c4ea3839" inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.2.bb index 616e88045..43049dafe 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.2.bb @@ -6,7 +6,7 @@ Python 3 Standard Library @lru_cache function decorator." SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2d1e1bf0ccb26126a230c51f997ce362" +LIC_FILES_CHKSUM = "file://LICENSE;md5=439a07e400525964c3c82684146e46eb" inherit pypi setuptools3 ptest @@ -27,6 +27,6 @@ do_install_ptest() { cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ } -SRC_URI[sha256sum] = "f469e29e7aa4cff64d8de4aad95ce76de8ea1125a16c68e0d93f65c3c3dc92e9" +SRC_URI[sha256sum] = "61b5ed1e22a0924aed1d23b478f37e8d52549ff8a961de2909c69bf950020cff" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-can_3.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-can_3.3.4.bb index 4da233959..3ca303c72 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-can_3.3.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-can_3.3.4.bb @@ -3,8 +3,8 @@ SECTION = "devel/python" LICENSE = "LGPLv3" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e6a600fd5e1d9cbde2d983680233ad02" -SRC_URI[md5sum] = "1310da316799e4b12944a6c1dcb017a9" -SRC_URI[sha256sum] = "ecd69cf6b2f0235345ebe607a15325cf1384c85b24ffbe1d68c3754357f87488" +SRC_URI[md5sum] = "305075968c56bd85130b19d86e9e505d" +SRC_URI[sha256sum] = "2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449" PYPI_PACKAGE="python-can" @@ -21,6 +21,7 @@ RDEPENDS_${PN}_class-target += "\ ${PYTHON_PN}-netserver \ ${PYTHON_PN}-sqlite3 \ ${PYTHON_PN}-wrapt \ + ${PYTHON_PN}-pkg-resources \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.3.0.bb index cc067c41a..32d2016e5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.3.0.bb @@ -4,8 +4,7 @@ DEPENDS +="${PYTHON_PN}-setuptools-scm-native" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -SRC_URI[sha256sum] = "a33aa2e5534fd74401ac95686886e655e3b2ce6383b3f958199b6e70a87c94bf" -SRC_URI[md5sum] = "0940aa8bfd1a07f06a983bb6dc78f1ca" +SRC_URI[sha256sum] = "462b3604d9579458a79e6ca350943c49aabbc98c794c111a79b98720b9164336" inherit pypi setuptools3 ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cerberus_1.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cerberus_1.3.4.bb index fa0bbb0aa..95934c6e4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cerberus_1.3.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cerberus_1.3.4.bb @@ -4,8 +4,10 @@ SECTION = "devel/python" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=48f8e9432d0dac5e0e7a18211a0bacdb" +RDEPENDS_${PN} += "python3-setuptools" + # The PyPI package uses a capital letter so we have to specify this explicitly PYPI_PACKAGE = "Cerberus" inherit pypi setuptools3 -SRC_URI[sha256sum] = "eec10585c33044fb7c69650bc5b68018dac0443753337e2b07684ee0f3c83329" +SRC_URI[sha256sum] = "d1b21b3954b2498d9a79edf16b3170a3ac1021df88d197dc2ce5928ba519237c" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.12.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2021.5.30.bb index dd2f6a2f6..ef2c66b14 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.12.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2021.5.30.bb @@ -5,9 +5,9 @@ which ships with the Requests codebase, and is derived from Mozilla Firefox's ca HOMEPAGE = " http://certifi.io/" LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f77f61d14ee6feac4228d3ebd26cc1f1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=67da0714c3f9471067b729eca6c9fbe8" -SRC_URI[sha256sum] = "1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c" +SRC_URI[sha256sum] = "2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-click-repl_0.1.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-click-repl_0.2.0.bb index fce9f9805..76affe274 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-click-repl_0.1.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-click-repl_0.2.0.bb @@ -3,7 +3,8 @@ HOMEPAGE = "https://github.com/untitaker/click-repl" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=fee2943fdd4d8afbac9ccc1c8ac137d5" -SRC_URI[md5sum] = "2d5f4d42cbd1da9a50a49dff4d6087ca" -SRC_URI[sha256sum] = "b9f29d52abc4d6059f8e276132a111ab8d94980afe6a5432b9d996544afa95d5" +SRC_URI[sha256sum] = "cd12f68d745bf6151210790540b4cb064c7b13e571bc64b6957d98d120dacfd8" inherit pypi setuptools3 + +RDEPENDS_${PN} = "${PYTHON_PN}-click" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-click_7.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.0.1.bb index 0b513e7cb..22c6c7903 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-click_7.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.0.1.bb @@ -8,8 +8,7 @@ HOMEPAGE = "http://click.pocoo.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=1fa98232fd645608937a0fdc82e999b8" -SRC_URI[md5sum] = "53692f62cb99a1a10c59248f1776d9c0" -SRC_URI[sha256sum] = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a" +SRC_URI[sha256sum] = "8c04c11192119b1ef78ea049e0a6f0463e4c48ef00a30160c704337586f3ad7a" inherit pypi setuptools3 ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_1.4.1.bb index 393f13874..0c851fef3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_1.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_1.4.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/bw2/ConfigArgParse" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=da746463714cc35999ed9a42339f2943" -SRC_URI[sha256sum] = "abef9ff44fb0091f0e3bb2ee7e5b26a02b5b62d45408a5272a9bd461f5b59b4b" +SRC_URI[sha256sum] = "6df537158f28c5ef2e8a8146781833abbc6cb7fca81b1b55d18808ce3439235e" PYPI_PACKAGE = "ConfigArgParse" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.0.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.0.13.bb index fd7046895..c520fa715 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.0.12.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.0.13.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=b8ee59850b882cbf623188489ea748e2" PYPI_PACKAGE = "croniter" -SRC_URI[sha256sum] = "3603ef0d60fc6df98ce356c01529de90b06a002379b9f5e9eae981fb9c1fd936" +SRC_URI[sha256sum] = "57f36df4f5a1c31bbf50bbffa3551612c19f6156ab1e88e2e42342ccbb9f9b9a" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.3.2.bb index 79a7ac1bf..0a36ffe1b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.3.2.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bf405a8056a6647e7d077b0e7bc36aba" LDSHARED += "-pthread" -SRC_URI[sha256sum] = "7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6" +SRC_URI[sha256sum] = "5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed" SRC_URI += " \ file://run-ptest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_5.0.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_5.0.9.bb index 3131b2bc0..c3acc518a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_5.0.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_5.0.9.bb @@ -9,7 +9,7 @@ decorator, just because you can." LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=be2fd2007972bf96c08af3293d728b22" -SRC_URI[sha256sum] = "6f201a6c4dac3d187352661f508b9364ec8091217442c9478f1f83c003a0f060" +SRC_URI[sha256sum] = "72ecfba4320a893c53f9706bebb2d55c270c1e51a28789361aa93e4a21319ed5" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-deprecated_1.2.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-deprecated_1.2.12.bb new file mode 100644 index 000000000..4651a8ae3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-deprecated_1.2.12.bb @@ -0,0 +1,9 @@ +SUMMARY = "Python @deprecated decorator to deprecate old python classes, functions or methods." +HOMEPAGE = "https://deprecated.readthedocs.io/en/latest/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=44288e26f4896bdab14072d4fa35ff01" + +PYPI_PACKAGE = "Deprecated" +SRC_URI[sha256sum] = "6d2de2de7931a968874481ef30208fd4e08da39177d61d3d4ebdf4366e7dbca1" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.16.bb deleted file mode 100644 index 0715abbd4..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.16.bb +++ /dev/null @@ -1,9 +0,0 @@ -require python-django.inc -inherit setuptools3 - -SRC_URI[md5sum] = "93faf5bbd54a19ea49f4932a813b9758" -SRC_URI[sha256sum] = "62cf45e5ee425c52e411c0742e641a6588b7e8af0d2c274a27940931b2786594" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-sqlparse \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.23.bb new file mode 100644 index 000000000..ab4b68fc8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.23.bb @@ -0,0 +1,9 @@ +require python-django.inc +inherit setuptools3 + +SRC_URI[md5sum] = "d72405637143e201b745714e300bb546" +SRC_URI[sha256sum] = "12cfc045a4ccb2348719aaaa77b17e66a26bff9fc238b4c765a3e825ef92e414" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-sqlparse \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_3.2.3.bb index e147e2f9d..7a9611ca1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_3.2.3.bb @@ -1,7 +1,7 @@ require python-django.inc inherit setuptools3 -SRC_URI[sha256sum] = "21f0f9643722675976004eb683c55d33c05486f94506672df3d6a141546f389d" +SRC_URI[sha256sum] = "13ac78dbfd189532cad8f383a27e58e18b3d33f80009ceb476d7fcbfc5dcebd8" RDEPENDS_${PN} += "\ ${PYTHON_PN}-sqlparse \ @@ -9,5 +9,5 @@ RDEPENDS_${PN} += "\ # Set DEFAULT_PREFERENCE so that the LTS version of django is built by # default. To build the 3.x branch, -# PREFERRED_VERSION_python3-django = "3.2" can be added to local.conf +# PREFERRED_VERSION_python3-django = "3.2.2" can be added to local.conf DEFAULT_PREFERENCE = "-1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-docutils_0.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-docutils_0.17.bb deleted file mode 100644 index 8605e93b5..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-docutils_0.17.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Docutils is a modular system for processing documentation into useful formats" -HOMEPAGE = "https://pypi.org/project/docutils/" -SECTION = "devel/python" -LICENSE = "BSD-2-Clause & GPL-2.0 & Python-2.0" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=836a1950177996968a49ff477a4a61c4" - -SRC_URI[sha256sum] = "e2ffeea817964356ba4470efba7c2f42b6b0de0b04e66378507e3e2504bbff4c" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.16.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.17.0.bb index 819d41e86..1401f8e58 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.16.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.17.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=66ffc5e30f76cbb5358fe54b645e5a1d" DEPENDS += "python3-pip python3-pbr" PYPI_PACKAGE = "ecdsa" -SRC_URI[sha256sum] = "cfc046a2ddd425adbd1a78b3c46f0d1325c657811c0f45ecc3a0a6236c1e50ff" +SRC_URI[sha256sum] = "b9f500bb439e4153d0330610f5d26baaf18d17b8ced1bc54410d189385ea68aa" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.2.2.bb index b0a733968..c793592be 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.2.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/elementpath" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf" -SRC_URI[sha256sum] = "c7b996c5624926f329f4379fbcffd5787629e08b2f8d7159d23525e9243ba637" +SRC_URI[sha256sum] = "68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157" PYPI_PACKAGE = "elementpath" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_3.13.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.2.0.bb index 51f853390..15b321c35 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_3.13.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.2.0.bb @@ -9,5 +9,13 @@ inherit pypi setuptools3 PYPI_PACKAGE = "python-engineio" -SRC_URI[md5sum] = "822b5dba0308dde6b8cbfd022daae0e4" -SRC_URI[sha256sum] = "2da5e1e5565e170a17169d1a76eb6a099cc96f0a25a5b1e0f9785f151485daea" +RDEPENDS_${PN} += " \ + python3-netclient \ + python3-json \ + python3-logging \ + python3-compression \ + python3-asyncio \ +" + +SRC_URI[md5sum] = "1fa937ec2a9f6feac27e9f65824c5781" +SRC_URI[sha256sum] = "4e97c1189c23923858f5bb6dc47cfcd915005383c3c039ff01c89f2c00d62077" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-et-xmlfile_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-et-xmlfile_1.0.1.bb deleted file mode 100644 index cfff150cc..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-et-xmlfile_1.0.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "et_xmlfile is a low memory library for creating large XML files" -DESCRIPTION = "It is based upon the xmlfile module from lxml with the aim of allowing code \ -to be developed that will work with both libraries. It was developed initially for \ -the openpyxl project but is now a standalone module." - -HOMEPAGE = "https://bitbucket.org/openpyxl/et_xmlfile/src/default/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=b3d89cae66f26c3a0799be8a96f3178b" - -SRC_URI[md5sum] = "f47940fd9d556375420b2e276476cfaf" -SRC_URI[sha256sum] = "614d9722d572f6246302c4491846d2c393c199cfa4edc9af593437691683335b" - -RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell" - -inherit setuptools3 -PYPI_PACKAGE ?= "et_xmlfile" -PYPI_SRC_URI ?= "https://files.pythonhosted.org/packages/source/e/et_xmlfile/et_xmlfile-1.0.1.tar.gz" -SECTION = "devel/python" -SRC_URI += "${PYPI_SRC_URI}" -S = "${WORKDIR}/${PYPI_PACKAGE}-${PV}" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-et-xmlfile_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-et-xmlfile_1.1.0.bb new file mode 100644 index 000000000..182a81d69 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-et-xmlfile_1.1.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "et_xmlfile is a low memory library for creating large XML files" +DESCRIPTION = "It is based upon the xmlfile module from lxml with the aim of allowing code \ +to be developed that will work with both libraries. It was developed initially for \ +the openpyxl project but is now a standalone module." + +HOMEPAGE = "https://foss.heptapod.net/openpyxl/et_xmlfile" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" + +SRC_URI[sha256sum] = "8eb9e2bc2f8c97e37a2dc85a09ecdcdec9d8a396530a6d5a33b30b9a92da0c5c" + +RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell" + +inherit setuptools3 pypi + +PYPI_PACKAGE = "et_xmlfile" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_3.0.0.bb index 1bf0dfa80..8f84e0597 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_3.0.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "SQLAlchemy database migrations for Flask applications using Alemb LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b69377f79f3f48c661701236d5a6a85" -SRC_URI[sha256sum] = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38" +SRC_URI[sha256sum] = "a6607e66bf1d68489b2281ead5caa6fdf7a21b71984fae922ef5f915ac45bbcb" PYPI_PACKAGE = "Flask-Migrate" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.9.bb index 3de916afd..4b83158a7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.9.bb @@ -6,8 +6,7 @@ HOMEPAGE = "https://github.com/flask-restful/flask-restful" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=685bb55ed99a366bb431995f5eef2783" -SRC_URI[md5sum] = "e8051ff104ab4b3b867ba18d28953fae" -SRC_URI[sha256sum] = "5ea9a5991abf2cb69b4aac19793faac6c032300505b325687d7c305ffaa76915" +SRC_URI[sha256sum] = "ccec650b835d48192138c85329ae03735e6ced58e9b2d9c2146d6c84c06fa53e" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_5.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_5.0.3.bb index 4c5d0a3fb..5def7621e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_5.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_5.0.3.bb @@ -9,7 +9,7 @@ inherit pypi setuptools3 PYPI_PACKAGE = "Flask-SocketIO" -SRC_URI[sha256sum] = "5c4319f5214ada20807857dc8fdf3dc7d2afe8d6dd38f5c516c72e2be47d2227" +SRC_URI[sha256sum] = "4fb968c43bc384f184cd1a25c1842297c2e3d6efc2f755a61be6d4406858220f" RDEPENDS_${PN} += "\ ${PYTHON_PN}-flask \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_0.14.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_0.15.1.bb index 213a0b58b..84b2a9e27 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_0.14.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_0.15.1.bb @@ -2,8 +2,7 @@ DESCRIPTION = "Simple integration of Flask and WTForms." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=3ca6bb31670492f791e6a9f2fb9f8a80" -SRC_URI[md5sum] = "1b60b7dd1245b0d0173c21123717af61" -SRC_URI[sha256sum] = "d417e3a0008b5ba583da1763e4db0f55a1269d9dd91dcc3eb3c026d3c5dbd720" +SRC_URI[sha256sum] = "ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc" PYPI_PACKAGE = "Flask-WTF" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_1.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.0.1.bb index 23799617f..6c63a388a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_1.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.0.1.bb @@ -6,8 +6,7 @@ HOMEPAGE = "https://github.com/mitsuhiko/flask/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" -SRC_URI[md5sum] = "0da4145d172993cd28a6c619630cc19c" -SRC_URI[sha256sum] = "4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060" +SRC_URI[sha256sum] = "1c4c257b1892aec1398784c63791cbaa43062f1f7aeb555c4da961b20ee68f55" PYPI_PACKAGE = "Flask" @@ -15,4 +14,10 @@ inherit pypi setuptools3 CLEANBROKEN = "1" -RDEPENDS_${PN} = "${PYTHON_PN}-werkzeug ${PYTHON_PN}-jinja2 ${PYTHON_PN}-itsdangerous ${PYTHON_PN}-click" +RDEPENDS_${PN} = " \ + ${PYTHON_PN}-werkzeug \ + ${PYTHON_PN}-jinja2 \ + ${PYTHON_PN}-itsdangerous \ + ${PYTHON_PN}-click \ + ${PYTHON_PN}-profile \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.6.0.bb index da7cae6c3..c6ae6e847 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.6.0.bb @@ -4,6 +4,6 @@ HOMEPAGE = "https://github.com/googleapis/google-api-python-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3" -SRC_URI[sha256sum] = "29447c8e95c23ae76fcf9817432f5ed015495513abeac564905640a0ef7d1898" +SRC_URI[sha256sum] = "6a87f324334247bf7ba24406da586424b09e715d04336fb7cf45a402b80d38e8" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_1.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_1.1.0.bb index 32194dba7..0f0f18fe3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_1.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_1.1.0.bb @@ -1,8 +1,9 @@ SUMMARY = "Python lightweight in-process concurrent programming" +HOMEPAGE = "https://greenlet.readthedocs.io/en/latest/" LICENSE = "MIT & PSF" LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \ file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" -SRC_URI[sha256sum] = "719e169c79255816cdcf6dccd9ed2d089a72a9f6c42273aae12d55e8d35bdcf8" +SRC_URI[sha256sum] = "c87df8ae3f01ffb4483c796fe1b15232ce2b219f0b18126948616224d3f658ee" inherit pypi distutils3 setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch index 343f25a46..775afa415 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch @@ -12,4 +12,4 @@ +#elif defined(__mips__) && defined(__LP64__) #define OPENSSL_64_BIT #define OPENSSL_MIPS64 - #elif defined(__riscv) + #elif defined(__riscv) && __SIZEOF_POINTER__ == 8 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch deleted file mode 100644 index 350c67dea..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch +++ /dev/null @@ -1,21 +0,0 @@ -Add RISC-V 64bit support - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/third_party/boringssl-with-bazel/src/include/openssl/base.h -+++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h -@@ -108,6 +108,14 @@ extern "C" { - #elif defined(__MIPSEL__) && defined(__LP64__) - #define OPENSSL_64_BIT - #define OPENSSL_MIPS64 -+#elif defined(__riscv) -+# if (__riscv_xlen == 64) -+# define OPENSSL_64_BIT -+# define OPENSSL_RISCV64 -+# elif(__riscv_xlen == 32) -+# define OPENSSL_32_BIT -+# define OPENSSL_RISCV32 -+# endif - #elif defined(__pnacl__) - #define OPENSSL_32_BIT - #define OPENSSL_PNACL diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.37.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.38.0.bb index 47fb71120..d9e00422b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.37.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.38.0.bb @@ -8,12 +8,11 @@ DEPENDS += "${PYTHON_PN}-protobuf" SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" SRC_URI_append_class-target = " file://ppc-boringssl-support.patch \ - file://riscv64_support.patch \ file://boring_ssl.patch \ file://mips_bigendian.patch \ file://0001-absl-always-use-asm-sgidefs.h.patch \ " -SRC_URI[sha256sum] = "b3ce16aa91569760fdabd77ca901b2288152eb16941d28edd9a3a75a0c4a8a85" +SRC_URI[sha256sum] = "abbf9c8c3df4d5233d5888c6cfa85c1bb68a6923749bd4dd1abc6e1e93986f17" RDEPENDS_${PN} = "${PYTHON_PN}-protobuf \ ${PYTHON_PN}-setuptools \ @@ -46,4 +45,3 @@ CCACHE_DISABLE = "1" # needs vdso support COMPATIBLE_HOST_libc-musl_powerpc64le = "null" - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine/0001-setup.py-Correct-the-license-assignment.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine/0001-setup.py-Correct-the-license-assignment.patch new file mode 100644 index 000000000..bb5955a44 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine/0001-setup.py-Correct-the-license-assignment.patch @@ -0,0 +1,32 @@ +From 56b421a18ef8acb41ab9e4bde7e1f5452ec67da9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 17 May 2021 22:17:07 -0700 +Subject: [PATCH] setup.py: Correct the license assignment + +latest python/2.9 + setuptools bail out otherwise + +lines = header.split('\n') +| AttributeError: 'list' object has no attribute 'split' + +Upstream-Status: Submitted [https://github.com/mapado/haversine/pull/38] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 549436d..9e7fb00 100755 +--- a/setup.py ++++ b/setup.py +@@ -15,7 +15,7 @@ setup( + maintainer_email='julien.deniau@mapado.com', + url='https://github.com/mapado/haversine', + packages=['haversine'], +- license=['MIT'], ++ license='MIT', + classifiers=[ + 'Development Status :: 4 - Beta', + 'Intended Audience :: Developers', +-- +2.31.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine_2.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine_2.3.0.bb index 6e02fcf71..624d30ca0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine_2.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine_2.3.0.bb @@ -2,6 +2,8 @@ SUMMARY = "Calculate the distance between 2 points on Earth" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +SRC_URI += "file://0001-setup.py-Correct-the-license-assignment.patch" + SRC_URI[md5sum] = "ff2d43a74195ec00c42ccd5da2a3f3de" SRC_URI[sha256sum] = "72c76855ac25e6ad054c7ed380e95c1a96803185f005dd11f40ccaa9620b551f" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.3.2.bb index d8141c8e8..4ef80c4a8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.3.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5cac039fcc82f01141cc170b48f315d4" PYPI_PACKAGE = "huey" -SRC_URI[sha256sum] = "de9b6d0fd59794378fe05813d302be68038044ef3b68274b84ca8d285e20f803" +SRC_URI[sha256sum] = "7176acb113850824490da5a31f328cc48a2002a59bfb396efbab8ecbd3573910" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.6.0.bb index 5ffc2b593..1c269bac9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.6.0.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE;md5=4ecc42519e84f6f3e23529464df7bd1d" -SRC_URI[sha256sum] = "6e04cdd75d66074c34ff93c30a2ad6d19d91202a65c1bd400b2edeedae399bda" +SRC_URI[sha256sum] = "a31704cf41f023e268032c4813c6482573320150a0d986f76b245e0451bb89e1" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu/fix_host_include.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch index 1b6e89043..c45217a88 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu/fix_host_include.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch @@ -1,17 +1,24 @@ -Fixed host contamination of include files +From 8abf79f77d9151d6786da3c8e868117822bce6d4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 16 Apr 2021 10:48:36 -0700 +Subject: [PATCH] Fix host contamination of include files python3-icu-2.5-r0 do_package_qa: QA Issue: python3-icu: The compile log indicates that host include and/or library paths were used. Also, don't use icu-config -Upstream-Status: [inappropriate] OE specific +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Armin Kuster <akuster808@gmail.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + setup.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) -Index: PyICU-2.5/setup.py -=================================================================== ---- PyICU-2.5.orig/setup.py -+++ PyICU-2.5/setup.py -@@ -81,7 +81,7 @@ Building PyICU %s for ICU %s (max ICU ma +diff --git a/setup.py b/setup.py +index e647db4..abed399 100644 +--- a/setup.py ++++ b/setup.py +@@ -81,7 +81,7 @@ Building PyICU %s for ICU %s (max ICU major version supported: %s) CONFIGURE_WITH_ICU_CONFIG = { 'darwin': True, @@ -20,7 +27,7 @@ Index: PyICU-2.5/setup.py 'freebsd': False, # not tested 'win32': False, # no icu-config 'sunos5': False, # not tested -@@ -274,7 +274,6 @@ setup(name="PyICU", +@@ -267,7 +267,6 @@ setup(name="PyICU", ext_modules=[Extension('_icu', [filename for filename in sorted(os.listdir(os.curdir)) if filename.endswith('.cpp')], @@ -28,3 +35,6 @@ Index: PyICU-2.5/setup.py extra_compile_args=_cflags, extra_link_args=_lflags, libraries=_libraries)], +-- +2.31.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.6.bb deleted file mode 100644 index 58f5e563b..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.6.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Python extension wrapping the ICU C++ API" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c7c4bfd81a21e3b6368bdcced992bf59" - -DEPENDS += "pkgconfig icu" - -PYPI_PACKAGE = "PyICU" -SRC_URI[sha256sum] = "a9a5bf6833360f8f69e9375b91c1a7dd6e0c9157a42aee5bb7d6891804d96371" - -SRC_URI += "file://fix_host_include.patch" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.7.2.bb new file mode 100644 index 000000000..4c064c3d4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.7.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "Python extension wrapping the ICU C++ API" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://setup.py;beginline=244;endline=252;md5=3e00c41c6d04310707992b93307a224f" + +DEPENDS += "pkgconfig icu" + +PYPI_PACKAGE = "PyICU" +SRC_URI[sha256sum] = "1382869b22d91cc99274f9b525fa7d9199b44d9007ff0036a09747839a01e9dc" + +SRC_URI += "file://0001-Fix-host-contamination-of-include-files.patch" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.22.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.24.0.bb index 7bc0d1d00..1c11eeca0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.22.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.24.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" PYPI_PACKAGE = "ipython" -SRC_URI[sha256sum] = "9c900332d4c5a6de534b4befeeb7de44ad0cc42e8327fa41b7685abde58cec74" +SRC_URI[sha256sum] = "a171caa3d3d4c819a1c0742e3abecfd5a2b8ab525ca1c9f114b40b76b0679ab1" RDEPENDS_${PN} = "\ ${PYTHON_PN}-setuptools \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.0.1.bb index 7f50641c8..f8f2fbdaa 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.0.1.bb @@ -1,10 +1,9 @@ SUMMARY = "Various helpers to pass trusted data to untrusted environments and back." HOMEPAGE = "http://github.com/mitsuhiko/itsdangerous" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=370799bf709a1e4a6a369fa089ac73a6" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=4cda9a0ebd516714f360b0e9418cfb37" -SRC_URI[md5sum] = "9b7f5afa7f1e3acfb7786eeca3d99307" -SRC_URI[sha256sum] = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19" +SRC_URI[sha256sum] = "9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0" inherit pypi setuptools3 @@ -14,4 +13,5 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-simplejson \ ${PYTHON_PN}-netclient \ ${PYTHON_PN}-compression \ + ${PYTHON_PN}-json \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.3.bb index 2f2421981..eb93e7173 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.3.bb @@ -5,9 +5,9 @@ DESCRIPTION = "python-javaobj is a python library that provides functions\ representation is a standard data interchange format in Java world." HOMEPAGE = "https://github.com/tcalmant/python-javaobj" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "ed3b1ffcfd39f165729cb53587cca02ab0bfa4c332c837a92d5ffe6aef5c8010" +SRC_URI[sha256sum] = "38f74db3a57e9998a9774e3614afb95cb396f139f29b3fdb130c5af554435259" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend b/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend deleted file mode 100644 index 9fe358427..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -# Main recipe was moved to oe-core, but with ptest disabled -inherit ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)} - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-toml \ - ${PYTHON_PN}-unixadmin \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.6.0.bb index 700c70e53..60eb2a62b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.6.0.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://LICENSE;md5=9c5c2c74370826468065c5702b8a1fcf" -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "${PYTHON_PN}-setuptools-scm-native ${PYTHON_PN}-pip-native" SRC_URI[sha256sum] = "489000d368377571c6f982fba6497f2aa13c6d1facc40660963da62f5c379726" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Allow-verify_cb_-to-be-called-with-ok-True.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Allow-verify_cb_-to-be-called-with-ok-True.patch new file mode 100644 index 000000000..3c836635a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Allow-verify_cb_-to-be-called-with-ok-True.patch @@ -0,0 +1,47 @@ +From 73fbd1e646f6bbf202d4418bae80eb9941fbf552 Mon Sep 17 00:00:00 2001 +From: Casey Deccio <casey@deccio.net> +Date: Fri, 8 Jan 2021 12:43:09 -0700 +Subject: [PATCH] Allow verify_cb_* to be called with ok=True + +With https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58 +OpenSSL allowed verificaton to continue on UNABLE_TO_VERIFY_LEAF_SIGNATURE +--- + tests/test_ssl.py | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/tests/test_ssl.py b/tests/test_ssl.py +index 92b6942..7a3271a 100644 +--- a/tests/test_ssl.py ++++ b/tests/test_ssl.py +@@ -59,8 +59,13 @@ def allocate_srv_port(): + + + def verify_cb_new_function(ok, store): +- assert not ok + err = store.get_error() ++ # If err is X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, then instead of ++ # aborting, this callback is called to retrieve additional error ++ # information. In this case, ok might not be False. ++ # See https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58 ++ if err != m2.X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE: ++ assert not ok + assert err in [m2.X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT, + m2.X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, + m2.X509_V_ERR_CERT_UNTRUSTED, +@@ -618,7 +623,12 @@ class MiscSSLClientTestCase(BaseSSLClientTestCase): + + def verify_cb_old(self, ctx_ptr, x509_ptr, err, depth, ok): + try: +- self.assertFalse(ok) ++ # If err is X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, then instead of ++ # aborting, this callback is called to retrieve additional error ++ # information. In this case, ok might not be False. ++ # See https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58 ++ if err != m2.X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE: ++ self.assertFalse(ok) + self.assertIn(err, + [m2.X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT, + m2.X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, +-- +2.29.2 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch new file mode 100644 index 000000000..2313a324a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch @@ -0,0 +1,29 @@ +From d06eaa88a5f491827733f32027c46de3557fbd05 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu> +Date: Fri, 19 Feb 2021 15:53:02 +0100 +Subject: [PATCH] Use of RSA_SSLV23_PADDING has been deprecated. + +Fixes #293. +--- + tests/test_rsa.py | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/tests/test_rsa.py b/tests/test_rsa.py +index 3de5016..7299785 100644 +--- a/tests/test_rsa.py ++++ b/tests/test_rsa.py +@@ -124,11 +124,6 @@ class RSATestCase(unittest.TestCase): + ptxt = priv.private_decrypt(ctxt, p) + self.assertEqual(ptxt, self.data) + +- # sslv23_padding +- ctxt = priv.public_encrypt(self.data, RSA.sslv23_padding) +- res = priv.private_decrypt(ctxt, RSA.sslv23_padding) +- self.assertEqual(res, self.data) +- + # no_padding + with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'): + priv.public_encrypt(self.data, RSA.no_padding) +-- +2.29.2 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch index b339d93f7..f4c74384f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch @@ -10,19 +10,17 @@ Upstream-status: Unknown setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: M2Crypto-0.30.1/setup.py -=================================================================== ---- M2Crypto-0.30.1.orig/setup.py -+++ M2Crypto-0.30.1/setup.py -@@ -130,6 +130,7 @@ class _M2CryptoBuildExt(build_ext.build_ +--- a/setup.py ++++ b/setup.py +@@ -135,6 +135,7 @@ class _M2CryptoBuildExt(build_ext.build_ self.set_undefined_options('build', ('bundledlls', 'bundledlls')) self.libraries = ['ssl', 'crypto'] + self.openssl = os.environ.get( "STAGING_DIR" ) if sys.platform == 'win32': self.libraries = ['ssleay32', 'libeay32'] - if self.openssl and openssl_version(self.openssl, 0x10100000, True): -@@ -150,8 +151,8 @@ class _M2CryptoBuildExt(build_ext.build_ + if self.openssl and openssl_version(self.openssl, +@@ -159,8 +160,8 @@ class _M2CryptoBuildExt(build_ext.build_ if self.openssl is not None: log.debug('self.openssl = %s', self.openssl) diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/cross-compile-platform.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch index 4b64f4613..f039ae866 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/cross-compile-platform.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch @@ -4,11 +4,9 @@ since it pokes at the system for getting architecture values Upstream-Status: Inappropriate Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: M2Crypto-0.30.1/setup.py -=================================================================== ---- M2Crypto-0.30.1.orig/setup.py -+++ M2Crypto-0.30.1/setup.py -@@ -160,22 +160,6 @@ class _M2CryptoBuildExt(build_ext.build_ +--- a/setup.py ++++ b/setup.py +@@ -169,22 +169,6 @@ class _M2CryptoBuildExt(build_ext.build_ log.debug('self.include_dirs = %s', self.include_dirs) log.debug('self.library_dirs = %s', self.library_dirs) diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto_0.30.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto_0.30.1.bb deleted file mode 100644 index 4d63d4bd3..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto_0.30.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-m2crypto.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb new file mode 100644 index 000000000..e1f92928c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb @@ -0,0 +1,44 @@ +SUMMARY = "A Python crypto and SSL toolkit" +HOMEPAGE = "https://gitlab.com/m2crypto/m2crypto" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" + +FILESEXTRAPATHS_prepend := "${THISDIR}/python-m2crypto:" + +SRC_URI += "file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \ + file://cross-compile-platform.patch \ + file://0001-Allow-verify_cb_-to-be-called-with-ok-True.patch \ + file://0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch \ + " +SRC_URI[sha256sum] = "e4e42f068b78ccbf113e5d0a72ae5f480f6c3ace4940b91e4fff5598cfff6fb3" + +PYPI_PACKAGE = "M2Crypto" +inherit pypi siteinfo setuptools3 + +DEPENDS += "openssl swig-native" +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-distutils \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-smtpd \ + ${PYTHON_PN}-xmlrpc \ +" + +DISTUTILS_BUILD_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR} -I${STAGING_INCDIR}" +DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR}" + +SWIG_FEATURES_x86 = "-D__i386__" +SWIG_FEATURES_x32 = "-D__ILP32__" + +SWIG_FEATURES ?= "-D__${HOST_ARCH}__ ${@['-D__ILP32__','-D__LP64__'][d.getVar('SITEINFO_BITS') != '32']}" + +SWIG_FEATURES_append_riscv64 = " -D__SIZEOF_POINTER__=${SITEINFO_BITS}/8 -D__riscv_xlen=${SITEINFO_BITS}" +SWIG_FEATURES_append_riscv32 = " -D__SIZEOF_POINTER__=${SITEINFO_BITS}/8 -D__riscv_xlen=${SITEINFO_BITS}" +SWIG_FEATURES_append_mipsarch = " -D_MIPS_SZPTR=${SITEINFO_BITS}" +export SWIG_FEATURES + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.4.bb deleted file mode 100644 index b51e8eef1..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.4.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "A Python implementation of John Gruber's Markdown." -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=745aaad0c69c60039e638bff9ffc59ed" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "Markdown" -SRC_URI[sha256sum] = "31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49" - -BBCLASSEXTEND = "native" - -RDEPENDS_${PN} += "${PYTHON_PN}-logging ${PYTHON_PN}-setuptools" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.%.bbappend b/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.%.bbappend deleted file mode 100644 index abfda6065..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.%.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -# Main recipe was moved to oe-core, but with ptest disabled -inherit ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)} - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -f ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib-inline_0.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib-inline_0.1.2.bb new file mode 100644 index 000000000..f060f9333 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib-inline_0.1.2.bb @@ -0,0 +1,8 @@ +SUMMARY = "Inline Matplotlib backend for Jupyter" +HOMEPAGE = "https://pypi.org/project/matplotlib-inline/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c2728819a4288030f51c594327977be0" + +SRC_URI[sha256sum] = "f41d5ff73c9f5385775d5c0bc13b424535c8402fe70ea8210f93e11f3683993e" + +inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-netifaces_0.10.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-netifaces_0.11.0.bb index 7edb7e7fb..09e54b0ba 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-netifaces_0.10.9.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-netifaces_0.11.0.bb @@ -4,7 +4,6 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=a53cbc7cb75660694e138ba973c148df" -SRC_URI[md5sum] = "de92cc322b4f56047c073f802ad77860" -SRC_URI[sha256sum] = "2dee9ffdd16292878336a58d04a20f0ffe95555465fee7c9bd23b3490ef2abf3" +SRC_URI[sha256sum] = "043a79146eb2907edf439899f262b3dfe41717d34124298ed281139a8b93ca32" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ntplib_0.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ntplib_0.4.0.bb index ae4c10f38..9477a7606 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ntplib_0.3.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ntplib_0.4.0.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://ntplib.py;beginline=1;endline=23;md5=afa07338a9595257e94c205c3e72224d" SRC_URI = "git://github.com/cf-natali/ntplib.git" -SRCREV ?= "aea7925c26152024ca8cf207e77f403f8127727a" +SRCREV ?= "b9c11c5906bc802a20a2dab390e57c50be558808" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.5.1.bb index d93bc884e..d002c0fc5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.5.1.bb @@ -13,6 +13,17 @@ SRC_URI[sha256sum] = "9feb068e822be7b3a116324e01fb6028eb1d66412bf98595ae72698965 DEPENDS += "${PYTHON_PN}-pytest-runner-native" +do_install_append() { + install -d -m0755 ${D}${datadir}/${BPN}/examples + cp --preserve=mode,timestamps -R ${S}/examples/* ${D}${datadir}/${BPN}/examples +} + +PACKAGES =+ "${PN}-examples" + +RDEPENDS_${PN}-examples += "${PN}" + +FILES_${PN}-examples = "${datadir}/${BPN}/examples" + RDEPENDS_${PN} = "\ ${PYTHON_PN}-io \ ${PYTHON_PN}-logging \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.1.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.1.6.bb index 0fa107c33..a1076f9f0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.1.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.1.6.bb @@ -7,6 +7,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=05f1e16a8e59ce3e9a979e881816c2ab" inherit pypi setuptools3 -SRC_URI[sha256sum] = "ed62fd1450336026f55c7d40b92b7159efd81d1420c778dd1b592bb634b14b4c" +SRC_URI[sha256sum] = "725b65da806fb79df05c0b6383b01631c510f371d9bc0ece93a996b4260ba085" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_2.1.0.bb index fe7206255..70034f840 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_2.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_2.1.0.bb @@ -31,7 +31,8 @@ RDEPENDS_${PN} += " \ " RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-sqlite3 \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.14.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.17.0.bb index 3cf850d1f..be846f799 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.14.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.17.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=19e8f490f9526b1de8 inherit pypi setuptools3 -SRC_URI[sha256sum] = "1d63eb389347293d8915fb47bee0951c7b5dab522a4a60118b9a18f33e21f8ce" +SRC_URI[sha256sum] = "05dfe9319939a8473c21b469f34f6486646e54fb8542637cf7ed8e2fbfe21538" # http://errors.yoctoproject.org/Errors/Details/184715/ # Can't find required file: ../src/google/protobuf/descriptor.proto diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_21.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_21.5.17.bb index a4455eeb1..3c0a9c0e5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_21.3.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_21.5.17.bb @@ -3,8 +3,11 @@ HOMEPAGE = "https://github.com/mk-fg/python-pulse-control" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=f1d10048469ff90123263eb5e214061d" -SRC_URI[sha256sum] = "faa8b9336237565990298f20870e13dd1678a4586847ca5a7ff2abf10752f356" +SRC_URI[sha256sum] = "3f782b3adf6d91b2398504002d248b36aa047bd04d5acd0ae5d4e2d3c8e746a0" -RDEPENDS_${PN} += "pulseaudio" +RDEPENDS_${PN} += " \ + libpulse \ + python3-ctypes \ +" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycocotools_2.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycocotools_2.0.2.bb new file mode 100644 index 000000000..ef2a7c589 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycocotools_2.0.2.bb @@ -0,0 +1,12 @@ +SUMMARY = "COCO is a large image dataset designed for object detection, segmentation, \ + person keypoints detection, stuff segmentation, and caption generation." +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://pycocotools/coco.py;beginline=45;endline=45;md5=12cb539683cf245df8b6ce782d78f647" + +inherit setuptools3 pypi + +SRC_URI[md5sum] = "33858f23c8b99ce8116b70c32f6b6dd9" +SRC_URI[sha256sum] = "24717a12799b4471c2e54aa210d642e6cd4028826a1d49fcc2b0e3497e041f1a" + +DEPENDS = "python3-cython-native python3-numpy-native virtual/crypt" +RDEPENDS_${PN} = "python3-matplotlib python3-pillow python3-profile" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus-manager_git.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus-manager_git.bb index ae9e42160..9fb3a485b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus-manager_git.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus-manager_git.bb @@ -11,3 +11,5 @@ SRCREV = "6b576b969cbda50521dca62a7df929167207f9fc" PV = "git${SRCPV}" S = "${WORKDIR}/git" + +RDEPENDS_${PN} += "python3-pydbus" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_2.1.0.bb index ed52da4d4..f1486f477 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_2.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_2.1.0.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://github.com/jpadilla/pyjwt" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=68626705a7b513ca8d5f44a3e200ed0c" -SRC_URI[sha256sum] = "a5c70a06e1f33d81ef25eecd50d50bd30e34de1ca8b2b9fa3fe0daaabcf69bf7" +SRC_URI[sha256sum] = "fba44e7898bbca160a2b2b501f492824fc8382485d3a6f11ba5d0c1937ce6130" PYPI_PACKAGE = "PyJWT" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.141.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.143.bb index df6f1c762..1e3ef27a7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.141.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.143.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" SRC_URI = "git://github.com/MISP/PyMISP.git;protocol=https;branch=main" -SRCREV = "62cd5173f087e88834e88472060181b681b0b4d2" +SRCREV = "c2e9663765e83f1a4aa70099546bec653ed770e7" S = "${WORKDIR}/git" inherit setuptools3 @@ -15,6 +15,8 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-jsonschema \ ${PYTHON_PN}-requests \ ${PYTHON_PN}-six \ + ${PYTHON_PN}-deprecated \ + ${PYTHON_PN}-wrapt \ " # Fixes: python3-pymisp requires /bin/bash, but no diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.4.bb index 3549adce7..0c07344cb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.4.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://github.com/mongodb/mongo-python-driver" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "db5098587f58fbf8582d9bda2462762b367207246d3e19623782fb449c3c5fcc" +SRC_URI[sha256sum] = "539d4cb1b16b57026999c53e5aab857fe706e70ae5310cc8c232479923f932e6" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.18.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.19.bb index 439d383f8..903bd6459 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.18.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.19.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2 & Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.GPL.v2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.Apache.v2;md5=34281e312165f843a2b7d1f114fe65ce" -SRC_URI[sha256sum] = "08ac40cad52c0bb2e0f20087520599aa91fcce0b221dd26e9042330428810bc5" +SRC_URI[sha256sum] = "45460d12ed2a5caf272a357a3360b36d1e346f17afe1425b66fc21d70f462b29" inherit setuptools3 pypi ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.0.2.bb index b0f8f3e9f..bba94f8a0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.0.2.bb @@ -12,6 +12,6 @@ inherit pypi setuptools3 PYPI_PACKAGE = "PyScaffold" -SRC_URI[sha256sum] = "8fd7b2bdbfc7f7758a66d66cbf796af338e40d69fd4f7b4ddb9996c38add1dbe" +SRC_URI[sha256sum] = "cfa719c2d97392ec3cd5f44d95ec0d40df2dd483d5ee05ea029896cfd7c04af8" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pysonos_0.0.42.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pysonos_0.0.50.bb index 25defabc5..cfa0d6ef0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pysonos_0.0.42.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pysonos_0.0.50.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=07b0e2ca9ac77cd65cd4edf2e13367ea" -SRC_URI[sha256sum] = "20b45fa1779a01325e67822d243e1a3f7657d8b515308d84c1eb3c805cc3bdb5" +SRC_URI[sha256sum] = "15a583b819c1e758cca72d5e148d59dd3bf7c9d59f19b5e79ab38c743c3e0738" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.14.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.15.1.bb index 1e94c25f7..1aa606b78 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.14.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.15.1.bb @@ -3,8 +3,7 @@ DESCRIPTION = "pytest-asyncio is an Apache2 licensed library, written in Python, LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" -SRC_URI[md5sum] = "b63593bc08f445f6e3f14c34128a68ed" -SRC_URI[sha256sum] = "9882c0c6b24429449f5f969a5158b528f39bde47dc32e85b9f0403965017e700" +SRC_URI[sha256sum] = "2564ceb9612bbd560d19ca4b41347b54e7835c2f792c504f698e05395ed63f6f" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.3.24.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.4.29.bb index 9211ac394..86b66f021 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.3.24.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.4.29.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=440a4cdb311cd7ad181efb4cba06d562" -SRC_URI[sha256sum] = "188df5a7c52390fa27d6cd2f18e74d64a2ef0b9fb6e12f15fdf5a95f4813d25f" +SRC_URI[sha256sum] = "183524e3db4e2a1fea92e0ca3662a624ba44c9f3568da15679d7535ba6838a6a" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_5.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_5.3.1.bb index 35f6c6c0a..fcbd29050 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_5.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_5.3.1.bb @@ -2,7 +2,7 @@ SUMMARY = "Invoke py.test as distutils command with dependency resolution" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" -SRC_URI[sha256sum] = "ca3f58ff4957e8be6c54c55d575b235725cbbcf4dc0d5091c29c6444cfc8a5fe" +SRC_URI[sha256sum] = "0fce5b8dc68760f353979d99fdd6b3ad46330b6b1837e2077a89ebcf204aac91" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.12117.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.12118.bb index 5d9dde9d2..3e799cf62 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.12117.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.12118.bb @@ -3,6 +3,6 @@ HOMEPAGE = "wiki.videolan.org/PythonBinding" LICENSE = "LGPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI[sha256sum] = "dd512f8438c1bba032fe9d22a7f8f98423a537992141ce2d1b28e29aff30381d" +SRC_URI[sha256sum] = "566f2f7c303f6800851cacc016df1c6eeec094ad63e0a49d87db9d698094f1fb" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.4.1.bb deleted file mode 100644 index c3025fdc6..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.4.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Python support for YAML" -DEPENDS += "libyaml ${PYTHON_PN}-cython-native" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6d8242660a8371add5fe547adf083079" - -PYPI_PACKAGE = "PyYAML" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-netclient \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.1.0.bb index dbf8e6446..f213131da 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.1.0.bb @@ -8,7 +8,7 @@ DEPENDS = "zeromq" FILESEXTRAPATHS_prepend := "${THISDIR}/python-pyzmq:" SRC_URI += "file://club-rpath-out.patch" -SRC_URI[sha256sum] = "f7f63ce127980d40f3e6a5fdb87abf17ce1a7c2bd8bf2c7560e1bbce8ab1f92d" +SRC_URI[sha256sum] = "7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d" inherit pypi pkgconfig setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.4.bb index a07a09447..f1064f327 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.4.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a21b13b5a996f08f7e0b088aa38ce9c6" FILESEXTRAPATHS_prepend := "${THISDIR}/python-rfc3339-validator:" -SRC_URI[sha256sum] = "7a578aa0740e9ee2b48356fe1f347139190c4c72e27f303b3617054efd15df32" +SRC_URI[sha256sum] = "138a2abdf93304ad60530167e51d2dfb9549521a836871b88d7f4695d0022f6b" PYPI_PACKAGE = "rfc3339_validator" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_4.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_4.0.3.bb index 3e5d67e0a..d95ab109a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_4.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_4.0.3.bb @@ -13,7 +13,7 @@ inherit pypi setuptools3 PYPI_PACKAGE_EXT = "zip" -SRC_URI[sha256sum] = "9fa609ceb78f67b1476edce8a7011b16bf3ab41c0fb8c211de6c99955eaf9fde" +SRC_URI[sha256sum] = "93c2107f789fd897f234f4b8f1ba8e7b9f4ef326d9bcbfceb71dda8cc197388c" RDEPENDS_${PN} += " \ ${PYTHON_PN}-shell \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.7.bb index 2543269fc..5da0ac3fc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.7.bb @@ -10,7 +10,7 @@ inherit pypi setuptools3 BBCLASSEXTEND = "native nativesdk" -SRC_URI[sha256sum] = "44bc6b54fddd45e4bc0619059196679f9e8b79c027f4131bb072e6a22f4d5e28" +SRC_URI[sha256sum] = "5c3fa739bbedd2f23769656784e671c6335d17a5bf163c3c3901d8663c0af287" do_install_prepend() { export RUAMEL_NO_PIP_INSTALL_CHECK=1 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-scapy_0.26.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-scapy_0.26.bb deleted file mode 100644 index 31c88942d..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-scapy_0.26.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Packet crafting/sending/sniffing, PCAP processing tool,\ -based on scapy with python3 compatibility" -SECTION = "devel/python" -HOMEPAGE = "https://github.com/phaethon/scapy" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=a88f5c4e1c935f295ebeaf51fc8644ef" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "scapy-python3" - -SRC_URI[md5sum] = "513469447735a4a416d495f63e28aa4b" -SRC_URI[sha256sum] = "81e4f5522d38c136fd3f1be4e35ffe4fd1f4c2091db3c021d95f8b9d5978b9eb" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.1.0.bb index 22b9f55dd..89c659dba 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.1.0.bb @@ -5,7 +5,9 @@ HOMEPAGE = "https://github.com/getsentry/sentry-python" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=0c79f8d3c91fc847350efd28bfe0a341" -SRC_URI[sha256sum] = "71de00c9711926816f750bc0f57ef2abbcb1bfbdf5378c601df7ec978f44857a" +RDEPENDS_${PN} += "python3-urllib3" + +SRC_URI[sha256sum] = "c1227d38dca315ba35182373f129c3e2722e8ed999e52584e6aca7d287870739" PYPI_PACKAGE = "sentry-sdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.30.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.40.bb index 64edff76b..305222f76 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.30.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.40.bb @@ -1,9 +1,8 @@ SUMMARY = "Serialization based on ast.literal_eval" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=5271c65b7cf83bd28055e592c2d14667" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d7c28f460fafe7be454fcdcac0b60263" -SRC_URI[md5sum] = "cbef4f9c88f88c38195d11a0363a095f" -SRC_URI[sha256sum] = "72753820246a7d8486e8b385353e3bbf769abfceec2e850fa527a288b084ff7a" +SRC_URI[sha256sum] = "10b34e7f8e3207ee6fb70dcdc9bce473851ee3daf0b47c58aec1b48032ac11ce" inherit pypi ptest setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sh_1.14.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sh_1.14.2.bb index 89d5008e9..5728ccf25 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sh_1.14.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sh_1.14.2.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://github.com/amoffat/sh" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5317094292296f03405f59ae5f6544b6" -SRC_URI[md5sum] = "50fc0a2953930ed8d0f6570835e88abf" -SRC_URI[sha256sum] = "39aa9af22f6558a0c5d132881cf43e34828ca03e4ae11114852ca6a55c7c1d8e" +SRC_URI[sha256sum] = "9d7bd0334d494b2a4609fe521b2107438cdb21c0e469ffeeb191489883d6fe0d" PYPI_PACKAGE = "sh" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.3.0.bb index 8cf6a96ba..4a9d3ebef 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.3.0.bb @@ -9,7 +9,7 @@ inherit pypi setuptools3 PYPI_PACKAGE = "python-socketio" -SRC_URI[sha256sum] = "338cc29abb6f3ca14c88f1f8d05ed27c690df4648f62062b299f92625bbf7093" +SRC_URI[sha256sum] = "3dcc9785aaeef3a9eeb36c3818095662342744bdcdabd050fe697cdb826a1c2b" PACKAGECONFIG ?= "asyncio_client client" PACKAGECONFIG[asyncio_client] = ",,,${PYTHON_PN}-aiohttp ${PYTHON_PN}-websockets" @@ -24,4 +24,5 @@ RDEPENDS_${PN} += "\ ${PYTHON_PN}-threading \ ${PYTHON_PN}-six \ ${PYTHON_PN}-attrs \ + ${PYTHON_PN}-bidict \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.15.bb index 883b2660b..2d7273bb2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.15.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sqlalchemy.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3359ed561ac16aaa25b6c6eff84df595" -SRC_URI[sha256sum] = "84115f97d88c8ccf26db81b7997c5f5de9ae360e0785ef859d0987794495f0a9" +SRC_URI[sha256sum] = "0ff100c75cd175f35f4d24375a0b3d82461f5b1af5fc8d112ef0e5ceea8049e6" PYPI_PACKAGE = "SQLAlchemy" inherit pypi setuptools3 @@ -16,4 +16,6 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-netclient \ ${PYTHON_PN}-numbers \ ${PYTHON_PN}-threading \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-profile \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-supervisor_4.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-supervisor_4.2.2.bb index 0ff4b35d9..6944ecb97 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-supervisor_4.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-supervisor_4.2.2.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/Supervisor/supervisor" LICENSE = "BSD-4-Clause" LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=5b4e3a2172bba4c47cded5885e7e507e" -SRC_URI[sha256sum] = "c479c875853e9c013d1fa73e529fd2165ff1ecaecc7e82810ba57e7362ae984d" +SRC_URI[sha256sum] = "5b2b8882ec8a3c3733cce6965cc098b6d80b417f21229ab90b18fe551d619f90" PYPI_PACKAGE = "supervisor" inherit pypi systemd setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.60.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.61.0.bb index e20ba779a..0c04b676a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.60.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.61.0.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "MIT & MPL-2.0" LIC_FILES_CHKSUM = "file://LICENCE;md5=59e4271a933d33edfe60237db377a14b" -SRC_URI[sha256sum] = "ebdebdb95e3477ceea267decfc0784859aa3df3e27e22d23b83e9b272bf157ae" +SRC_URI[sha256sum] = "cd5791b5d7c3f2f1819efc81d36eb719a38e0906a7380365c556779f585ea042" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typing-extensions_3.7.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-typing-extensions_3.10.0.0.bb index 8ef15fab7..a8e632487 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-typing-extensions_3.7.4.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typing-extensions_3.10.0.0.bb @@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=64fc2b30b67d0a8423c250e0386ed72f" # The name on PyPi is slightly different. PYPI_PACKAGE = "typing_extensions" -SRC_URI[md5sum] = "5fcbfcb22e6f8c9bf23fb9f8e020f6ee" -SRC_URI[sha256sum] = "99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c" +SRC_URI[sha256sum] = "50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/run-ptest index 1b3914647..b1539453a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -python3 tests/tests.py +python3 tests/test_ujson.py diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_4.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_4.0.2.bb index d79206fe6..43f286d16 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_4.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_4.0.2.bb @@ -20,6 +20,8 @@ RDEPENDS_${PN} += "\ " RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-pytest \ ${PYTHON_PN}-pytz \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.5.bb index 0a31fb1e2..f2fb33c6d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.5.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/shazow/urllib3" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c" -SRC_URI[sha256sum] = "e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937" +SRC_URI[sha256sum] = "a7acd0977125325f516bda9735fa7142b909a8d01e8b2e4c8108d0984e6e0098" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.2.bb index c5387dc35..c2bf68a2d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.2.bb @@ -4,7 +4,7 @@ DEPENDS = "${PYTHON_PN}-argh" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "532fedd993e75554671faa36cd04c580ced3fae084254a779afbbd8aaf00566b" +SRC_URI[sha256sum] = "0237db4d9024859bea27d0efb59fe75eef290833fd988b8ead7a879b0308c2db" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_0.58.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.0.1.bb index a5d7d901b..da4e05f30 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_0.58.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.0.1.bb @@ -7,9 +7,7 @@ HOMEPAGE = "https://github.com/websocket-client/websocket-client" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=c96ca6c1de8adc025adfada81d06fba5" -SRC_URI[sha256sum] = "63509b41d158ae5b7f67eb4ad20fecbb4eee99434e73e140354dc3ff8e09716f" - -PYPI_PACKAGE = "websocket_client" +SRC_URI[sha256sum] = "3e2bf58191d4619b161389a95bdce84ce9e0b24eb8107e7e590db682c2d0ca81" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_9.1.bb index b09e978af..8802ee370 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_9.1.bb @@ -2,12 +2,11 @@ SUMMARY = "An implementation of the WebSocket Protocol (RFC 6455)" HOMEPAGE = "https://github.com/aaugustin/websockets" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ad5c6d36b3d0098b2f33a5ab69a9e750" +LIC_FILES_CHKSUM = "file://LICENSE;md5=78c2cc91e172ca96d6f8e4a76c739ec6" inherit pypi setuptools3 -SRC_URI[md5sum] = "f12d7f31fe8d0b3e65c12f845bcd0ad8" -SRC_URI[sha256sum] = "5c65d2da8c6bce0fca2528f69f44b2f977e06954c8512a952222cea50dad430f" +SRC_URI[sha256sum] = "276d2339ebf0df4f45df453923ebd2270b87900eda5dfd4a6b0cfa15f82111c3" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.0.1.bb index 8af0fef60..1653eeabd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_1.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.0.1.bb @@ -12,8 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" PYPI_PACKAGE = "Werkzeug" -SRC_URI[md5sum] = "5d499cfdd30de5d9c946994783772efd" -SRC_URI[sha256sum] = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c" +SRC_URI[sha256sum] = "1de1db30d010ff1af14a009224ec49ab2329ad2cde454c8a708130642d579c42" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.4.3.bb index e89221e5c..e6b196956 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.4.3.bb @@ -8,6 +8,14 @@ inherit pypi setuptools3 PYPI_PACKAGE = "XlsxWriter" -SRC_URI[sha256sum] = "2b7e22b1268c2ed85d73e5629097c9a63357f2429667ada9863cd05ff8ee33aa" +RDEPENDS_${PN} += " \ + python3-crypt \ + python3-datetime \ + python3-compression \ + python3-numbers \ + python3-io \ +" + +SRC_URI[sha256sum] = "641db6e7b4f4982fd407a3f372f45b878766098250d26963e95e50121168cbe2" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.6.2.bb index 91697e39a..acdb39942 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.6.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.6.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/xmlschema" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=47489cb18c469474afeb259ed1d4832f" -SRC_URI[sha256sum] = "d02b82bb4fce3af09495b85e6ada5ce0cfdaa865b09b28ecc0f5ab81fad7e328" +SRC_URI[sha256sum] = "31ddf77a44e4b121de212beeb2cc039e2e8b7a7a4f1678c9b29be1f5341aec52" PYPI_PACKAGE = "xmlschema" inherit pypi setuptools3 @@ -14,6 +14,7 @@ DEPENDS += "\ RDEPENDS_${PN} += "\ ${PYTHON_PN}-elementpath \ + ${PYTHON_PN}-modules \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_2.0.2.bb index c5add103c..965e8107d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_2.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_2.0.2.bb @@ -1,10 +1,9 @@ SUMMARY = "xxhash is a Python binding for the xxHash library by Yann Collet." SECTION = "devel/python" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5a8d76283514a1b7e6a414aba38629b5" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3a9dab7f159514231249aa3e108ab26b" -SRC_URI[md5sum] = "010fda0427b621e5fe6930ad42511d88" -SRC_URI[sha256sum] = "58ca818554c1476fa1456f6cd4b87002e2294f09baf0f81e5a2a4968e62c423c" +SRC_URI[sha256sum] = "b7bead8cf6210eadf9cecf356e17af794f57c0939a3d420a00d87ea652f87b49" SRC_URI += " \ file://run-ptest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_5.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_5.4.0.bb index 5da5a88b9..305e42a61 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_5.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_5.4.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e54fd776274c1b7423 PYPI_PACKAGE = "zope.interface" inherit pypi setuptools3 -SRC_URI[sha256sum] = "b18a855f8504743e0a2d8b75d008c7720d44e4c76687e13f959e35d9a13eb397" +SRC_URI[sha256sum] = "5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e" PACKAGES =. "${PN}-test " diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.1.3.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.2.0.bb index fd7341953..988dae133 100644 --- a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.1.3.bb +++ b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.2.0.bb @@ -16,7 +16,7 @@ HOMEPAGE = "http://pywbem.github.io" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" -SRC_URI[sha256sum] = "2abb6443f4debae56af7abefadb9fa5b8af9b53fc9bcf67f6c01a78db1064300" +SRC_URI[sha256sum] = "8ef48185e0adbaeb9bd5181c4c5de951f6d58d54e2e1d7e87a9834e10eabe957" inherit pypi setuptools3 update-alternatives @@ -24,6 +24,7 @@ DEPENDS += " \ ${PYTHON_PN}-ply-native \ ${PYTHON_PN}-pyyaml-native \ ${PYTHON_PN}-six-native \ + ${PYTHON_PN}-wheel-native \ " RDEPENDS_${PN}_class-target += "\ @@ -37,6 +38,9 @@ RDEPENDS_${PN}_class-target += "\ ${PYTHON_PN}-threading \ ${PYTHON_PN}-unixadmin \ ${PYTHON_PN}-xml \ + ${PYTHON_PN}-nocasedict \ + ${PYTHON_PN}-nocaselist \ + ${PYTHON_PN}-yamlloader \ " ALTERNATIVE_${PN} = "mof_compiler" diff --git a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.8.1.bb b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.9.0.bb index c5cabdb13..b06fee550 100644 --- a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.8.1.bb +++ b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.9.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://pywbemtools.readthedocs.io/en/stable/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" -SRC_URI[sha256sum] = "3cbee091f0a4917394814d7e639ab9fe13ad0859e47288deabf2b09a4382c4ae" +SRC_URI[sha256sum] = "f6f36c96be46c801919fa6cc218a5d051fce381a2d9a0b99c9162d8335e96c36" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb b/meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb index 2fa5bc4a9..ec3334d8f 100644 --- a/meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb +++ b/meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb @@ -26,7 +26,6 @@ RDEPENDS_packagegroup-meta-webserver-http = "\ monkey \ nginx \ nginx \ - nostromo \ sthttpd \ " diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb index 197cb83e6..e84f7eaa2 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb @@ -115,7 +115,7 @@ do_install_append_class-target() { sed -i -e 's,${STAGING_DIR_TARGET},,g' \ -e 's,${DEBUG_PREFIX_MAP},,g' \ - -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ + -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \ -e 's,${HOSTTOOLS_DIR}/,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk @@ -123,7 +123,7 @@ do_install_append_class-target() { sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ -e 's,${DEBUG_PREFIX_MAP},,g' \ -e 's,${RECIPE_SYSROOT},,g' \ - -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ + -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice diff --git a/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.11.bb b/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb index 89910841f..9729fd4a8 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.11.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb @@ -10,8 +10,8 @@ SRC_URI = "http://hiawatha-webserver.org/files/${BP}.tar.gz \ file://hiawatha-init \ file://hiawatha.service " -SRC_URI[md5sum] = "6dcec72e94facbdc69b103006fa5819f" -SRC_URI[sha256sum] = "79d85d165d68dd7043bbd337f5bc7dd10d8632d68ba61d0e557f84bd687c9727" +SRC_URI[md5sum] = "d9e282be06ed456207726b7ac0df9d48" +SRC_URI[sha256sum] = "61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d" INITSCRIPT_NAME = "hiawatha" INITSCRIPT_PARAMS = "defaults 70" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch deleted file mode 100644 index 8cd468235..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 7fa0d31ec5c0be9dca84a03851b2d44f61527ec8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> -Date: Sun, 4 Dec 2011 16:01:04 +0100 -Subject: [PATCH] GNUmakefile: add possibility to override variables -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -this is useful for cross compilation - -Signed-off-by: Eric Bénard <eric@eukrea.com> ---- -Upstream-Status: Inappropriate [embedded specific] - src/libbsd/GNUmakefile | 10 +++++----- - src/libmy/GNUmakefile | 26 +++++++++++++------------- - src/nhttpd/GNUmakefile | 12 ++++++------ - src/tools/GNUmakefile | 8 ++++---- - 4 files changed, 28 insertions(+), 28 deletions(-) - -diff --git a/src/libbsd/GNUmakefile b/src/libbsd/GNUmakefile -index e2d01a3..b034bc6 100644 ---- a/src/libbsd/GNUmakefile -+++ b/src/libbsd/GNUmakefile -@@ -1,12 +1,12 @@ --CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c -+CFLAGS := -O2 -pipe -Wall -Werror -Wstrict-prototypes -c - - libbsd.a: strlcpy.o strlcat.o -- ar -r libbsd.a strlcpy.o strlcat.o -- ranlib libbsd.a -+ $(AR) -r libbsd.a strlcpy.o strlcat.o -+ $(RANLIB) libbsd.a - - strlcpy.o: strlcpy.c -- cc ${CCFLAGS} strlcpy.c -+ $(CC) $(CFLAGS) strlcpy.c - strlcat.o: strlcat.c -- cc ${CCFLAGS} strlcat.c -+ $(CC) $(CFLAGS) strlcat.c - clean: - rm -f libbsd.a *.o -diff --git a/src/libmy/GNUmakefile b/src/libmy/GNUmakefile -index ce90dd9..891ffea 100644 ---- a/src/libmy/GNUmakefile -+++ b/src/libmy/GNUmakefile -@@ -1,30 +1,30 @@ --CCFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -c -+CFLAGS := -O2 -Wall -Werror -Wstrict-prototypes -c - - libmy.a: strcutl.o strcutw.o strcuts.o strcuti.o strcutf.o flog.o flogd.o fparse.o strlower.o strb64d.o -- ar -r libmy.a strcutl.o strcutw.o strcuts.o strcuti.o strcutf.o flog.o flogd.o fparse.o strlower.o strb64d.o -- ranlib libmy.a -+ $(AR) -r libmy.a strcutl.o strcutw.o strcuts.o strcuti.o strcutf.o flog.o flogd.o fparse.o strlower.o strb64d.o -+ $(RANLIB) libmy.a - - strcutl.o: strcutl.c -- cc ${CCFLAGS} strcutl.c -+ $(CC) $(CFLAGS) strcutl.c - strcutw.o: strcutw.c -- cc ${CCFLAGS} strcutw.c -+ $(CC) $(CFLAGS) strcutw.c - strcuts.o: strcuts.c -- cc ${CCFLAGS} strcuts.c -+ $(CC) $(CFLAGS) strcuts.c - strcuti.o: strcuti.c -- cc ${CCFLAGS} strcuti.c -+ $(CC) $(CFLAGS) strcuti.c - strcutf.o: strcutf.c -- cc ${CCFLAGS} strcutf.c -+ $(CC) $(CFLAGS) strcutf.c - strlower.o: strlower.c -- cc ${CCFLAGS} strlower.c -+ $(CC) $(CFLAGS) strlower.c - strb64d.o: strb64d.c -- cc ${CCFLAGS} strb64d.c -+ $(CC) $(CFLAGS) strb64d.c - - flog.o: flog.c -- cc ${CCFLAGS} flog.c -+ $(CC) $(CFLAGS) flog.c - flogd.o: flogd.c -- cc ${CCFLAGS} flogd.c -+ $(CC) $(CFLAGS) flogd.c - fparse.o: fparse.c -- cc ${CCFLAGS} fparse.c -+ $(CC) $(CFLAGS) fparse.c - - clean: - rm -f libmy.a *.o -diff --git a/src/nhttpd/GNUmakefile b/src/nhttpd/GNUmakefile -index f6d12de..9524911 100644 ---- a/src/nhttpd/GNUmakefile -+++ b/src/nhttpd/GNUmakefile -@@ -1,20 +1,20 @@ - # $nostromo: GNUmakefile,v 1.6 2016/04/12 19:02:06 hacki Exp $ - --CCFLAGS = -O2 -pipe -Wall -Wstrict-prototypes -c -+CFLAGS := -O2 -pipe -Wall -Wstrict-prototypes -c - - nhttpd: main.o http.o sys.o -- cc -L../libmy -L../libbsd -o nhttpd main.o http.o sys.o -lmy -lbsd -lssl -lcrypt -- strip nhttpd -+ $(CC) -L../libmy -L../libbsd -o nhttpd main.o http.o sys.o -lmy -lbsd -lssl -lcrypt -+# $(STRIP) nhttpd - nroff -Tascii -c -mandoc nhttpd.8 > nhttpd.cat8 - - main.o: main.c -- cc ${CCFLAGS} main.c -+ $(CC) $(CFLAGS) main.c - - http.o: http.c -- cc ${CCFLAGS} http.c -+ $(CC) $(CFLAGS) http.c - - sys.o: sys.c -- cc ${CCFLAGS} sys.c -+ $(CC) $(CFLAGS) sys.c - - clean: - rm -f nhttpd nhttpd.cat8 *.o -diff --git a/src/tools/GNUmakefile b/src/tools/GNUmakefile -index 15bea61..663ddb5 100644 ---- a/src/tools/GNUmakefile -+++ b/src/tools/GNUmakefile -@@ -1,13 +1,13 @@ - # $nostromo: GNUmakefile,v 1.3 2016/04/12 19:02:58 hacki Exp $ - --CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c -+CFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes - - crypt: crypt.o -- cc -L../libbsd -o crypt crypt.o -lcrypt -lbsd -- strip crypt -+ $(CC) $(CFLAGS) -L../libbsd -o crypt crypt.o -lcrypt -lbsd -+# $(STRIP) crypt - - crypt.o: crypt.c -- cc ${CCFLAGS} crypt.c -+ $(CC) $(CFLAGS) -c crypt.c - - clean: - rm -f crypt *.o --- -1.7.6.4 - diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nhttpd.conf b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nhttpd.conf deleted file mode 100644 index 6674bb696..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nhttpd.conf +++ /dev/null @@ -1,55 +0,0 @@ -# MAIN [MANDATORY] - -servername localhost -#servername www.nazgul.ch:8080 -serverlisten * -#serverlisten 81.221.21.250 127.0.0.1 ::1 -serveradmin webmaster@localhost -serverroot /var/nostromo -servermimes /var/nostromo/conf/mimes -docroot /var/nostromo/htdocs -docindex index.html - -# LOGS [OPTIONAL] - -logpid /var/run/nostromo/nhttpd.pid -#logaccess /var/log/nostromo/access_log - -# SETUID [RECOMMENDED] - -user www-data - -# BASIC AUTHENTICATION [OPTIONAL] - -#htaccess .htaccess -#htpasswd /var/nostromo/conf/.htpasswd -#htpasswd +bsdauth -#htpasswd +bsdauthnossl - -# SSL [OPTIONAL] - -#sslport 443 -#sslcert /etc/ssl/server.crt -#sslcertkey /etc/ssl/server.key - -# CUSTOM RESPONSES [OPTIONAL] -# -# The custom responses are searched in the corresponding document root. - -#custom_401 custom_401.html -#custom_403 custom_403.html -#custom_404 custom_404.html - -# ALIASES [OPTIONAL] - -/icons /var/nostromo/icons - -# VIRTUAL HOSTS [OPTIONAL] - -#www.rahel.ch /var/nostromo/htdocs/www.rahel.ch -#www.rahel.ch:8080 /var/nostromo/htdocs/www.rahel.ch - -# HOMEDIRS [OPTIONAL] - -#homedirs /home -#homedirs_public public_www diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nostromo b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nostromo deleted file mode 100644 index 8a2886882..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nostromo +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=nhttpd -NAME=nhttpd -DESC="Nostromo Web Server" -OPTS="-c /etc/nhttpd.conf" - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon --start -x "$DAEMON" -- $OPTS - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon --stop -x "$DAEMON" - echo "$NAME." - ;; - restart|force-reload) - echo -n "Restarting $DESC: " - start-stop-daemon --stop -x "$DAEMON" - sleep 1 - start-stop-daemon --start -x "$DAEMON" -- $OPTS - echo "$NAME." - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf deleted file mode 100644 index b7a9f4886..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/nostromo - www-data www-data - diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/volatiles b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/volatiles deleted file mode 100644 index 40924960c..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/volatiles +++ /dev/null @@ -1,2 +0,0 @@ -d www-data www-data 0775 /var/run/nostromo none -d www-data www-data 0775 /var/log/nostromo none diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb deleted file mode 100644 index e726c9ac6..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb +++ /dev/null @@ -1,64 +0,0 @@ -SUMMARY = "A simple, fast and secure HTTP server" -HOMEPAGE = "http://www.nazgul.ch/dev_nostromo.html" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://src/nhttpd/main.c;beginline=2;endline=14;md5=0bb3711a867b9704d3bfabcf5529b64e" - -SRC_URI = "http://www.nazgul.ch/dev/${BPN}-${PV}.tar.gz \ - file://0001-GNUmakefile-add-possibility-to-override-variables.patch \ - file://nhttpd.conf \ - file://volatiles \ - file://tmpfiles.conf \ - file://nostromo \ -" - -SRC_URI[md5sum] = "a054eb8e09560082793aaad676e33bd3" -SRC_URI[sha256sum] = "1fad0a28d934835b582cedc98857e12e5adb991b14b87b52b39e6a501f4a9486" - -TARGET_CC_ARCH += "${LDFLAGS}" - -DEPENDS = "openssl groff-native base-passwd virtual/crypt" - -inherit update-rc.d - -INITSCRIPT_NAME = "nostromo" -INITSCRIPT_PARAMS = "defaults 70" - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}/${sbindir} - install -m 0755 src/nhttpd/nhttpd ${D}/${sbindir}/nhttpd - install -m 0755 src/tools/crypt ${D}/${sbindir}/crypt - install -d ${D}/${mandir}/man8 - install -m 0444 src/nhttpd/nhttpd.8 ${D}/${mandir}/man8/nhttpd.8 - install -d ${D}${localstatedir}/nostromo/conf - install -d ${D}${localstatedir}/nostromo/htdocs/cgi-bin - install -d ${D}${localstatedir}/nostromo/icons - install -d ${D}${sysconfdir}/init.d - install -m 0644 conf/mimes ${D}${localstatedir}/nostromo/conf/mimes - install -m 0644 ${WORKDIR}/nhttpd.conf ${D}${sysconfdir} - install -m 0755 ${WORKDIR}/nostromo ${D}${sysconfdir}/init.d - install -D -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/nostromo - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -D -m 0644 ${WORKDIR}/tmpfiles.conf ${D}${sysconfdir}/tmpfiles.d/nostromo.conf - fi - install -m 0644 htdocs/index.html ${D}${localstatedir}/nostromo/htdocs/index.html - install -m 0644 htdocs/nostromo.gif ${D}${localstatedir}/nostromo/htdocs/nostromo.gif - install -m 0644 icons/dir.gif ${D}${localstatedir}/nostromo/icons/dir.gif - install -m 0644 icons/file.gif ${D}${localstatedir}/nostromo/icons/file.gif - chown -R www-data:www-data ${D}/${localstatedir}/nostromo -} - -CONFFILES_${PN} += "/var/nostromo/conf/mimes ${sysconfdir}/nhttpd.conf" - -pkg_postinst_${PN} () { - if [ -z "$D" ]; then - if [ -e /sys/fs/cgroup/systemd ]; then - systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/nostromo.conf - elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then - ${sysconfdir}/init.d/populate-volatile.sh update - fi - fi -} diff --git a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.4.bb b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.5.bb index 7a2f12b1e..830d86b8a 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.4.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.5.bb @@ -7,7 +7,10 @@ DEPENDS = "gtk+3 gtksourceview4 xfconf xfce4-dev-tools-native" inherit xfce-app gsettings mime-xdg -SRC_URI[sha256sum] = "d90f492e5d0cba5f5b3b0c1eb7fd7c1701aef57e3fa244d2c457e7f9b0a42aa1" +SRC_URI[sha256sum] = "40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[spell] = "--enable-plugin-gspell,--disable-plugin-gspell,gspell" FILES_${PN} += " \ ${datadir}/glib-2.0/schemas \ diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.9.bb index dbd7a0b40..722dd2910 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.9.bb @@ -7,7 +7,7 @@ DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+3 glib-2.0 libsoup inherit xfce-app -SRC_URI[sha256sum] = "6f029d614ad3b63fbcf742984dc6c976f3008e7d88fa487d49ed544f56f62c50" +SRC_URI[sha256sum] = "33c8aeb53fbdb82dbd7d40bca77a8affbb4116ba0993cd59474b554558e5daa4" do_compile_prepend() { mkdir -p lib diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.6.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.6.2.bb index f2a145f5c..631702667 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.6.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.6.2.bb @@ -8,10 +8,9 @@ inherit xfce-panel-plugin DEPENDS += "xfconf xorgproto libxtst" -SRC_URI[md5sum] = "c9306940c0ca7abd838a14c9d19b3a7e" -SRC_URI[sha256sum] = "b3e8317796289196fa78c4526626fe061fd35d11e848cf300ca1ace47febceb4" +SRC_URI[sha256sum] = "ab8a5fe6f68fb1789190e498243a1d1385de3f64e984f470cbd3d1eb779399b8" PACKAGECONFIG ??= "" PACKAGECONFIG[qrencode] = "--enable-libqrencode,--disable-libqrencode,qrencode" -FILES_${PN} += "${datadir}/appdata" +FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.3.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.3.1.bb index e6a5ec0b2..151ce3849 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.3.0.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.3.1.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9acb172a93ff6c43cce2aff790a8aef8" inherit xfce-panel-plugin -DEPENDS += "upower" +PACKAGECONFIG ?= "network power" +PACKAGECONFIG[power] = ",,upower" +PACKAGECONFIG[network] = ",,libgtop" -SRC_URI[sha256sum] = "1148f8e90cc53cae9b3aa32e10df4bd9fdc2f06db09d8429f88fbdd874fc171d" +SRC_URI[sha256sum] = "56d1007801d52d7c2b5a13bb54745f6d7f06fda28b49ce936145633068817652" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.6.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.8.bb index 128043d19..bdc357f76 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.6.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.8.bb @@ -8,7 +8,7 @@ inherit xfce gobject-introspection features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "cb531d3fe67196a43ca04979ef271ece7858bbc80c15b0ee4323c1252a1a02b7" +SRC_URI[sha256sum] = "038ca228d220cd0ba1b7b76465d8a51f2433ad1f74648d1d291daa0a24cb3195" PACKAGECONFIG ??= "" PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.2.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb index 7e54022ff..d478e0ffa 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.2.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb @@ -8,7 +8,7 @@ inherit xfce gtk-doc gobject-introspection features_check remove-libtool mime-xd REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "8634166e6f14318daec363f7e2371d49b98986f9bce313a7dd1554f30b48b5cf" +SRC_URI[sha256sum] = "5934eaed8a76da52c29b734ccd79600255420333dd6ebd8fd9f066379af1e092" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ file://0002-use-lxdm-to-replace-dm-tool.patch \ diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.1.bb index 47de8c571..ccd55723a 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.1.bb @@ -9,7 +9,7 @@ inherit xfce features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0001-xsettings.xml-Set-default-themes.patch" -SRC_URI[sha256sum] = "67a1404fc754c675c6431e22a8fe0e5d79644fdfadbfe25a4523d68e1442ddc2" +SRC_URI[sha256sum] = "bb28e1be7aa34d0edb1cfbaacc509a4267db56828b36cd6be312a202973635c6" EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" |