From patchwork Fri Jan 3 10:45:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 54932 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FE96E77188 for ; Fri, 3 Jan 2025 10:45:35 +0000 (UTC) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.groups.io with SMTP id smtpd.web10.28157.1735901130853080466 for ; Fri, 03 Jan 2025 02:45:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ONj1PW6h; spf=pass (domain: gmail.com, ip: 209.85.221.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-38633b5dbcfso11693002f8f.2 for ; Fri, 03 Jan 2025 02:45:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735901129; x=1736505929; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=gvrmXaG5X7I862q7psx6l0jxOxxsRl2hK2JU6/p8LK0=; b=ONj1PW6h4h9f8RvKboMEagcUYnXmGei7zrvZ9fWVq/aOH3TJ3Vn/InCubQRy6T6tpb o92vtdY7hIFJ1lStO9hA/yUwvhfDFKWv+lX18zR3cbsD208dUKgoVlSIR9ew/ae9bton 1HIBzmdI1A+JVvqxB3t6HcRfYcMia+EVrwbRFRCIs6BzgXENU2U3b06s6OpfSdOEUJtt zMFSKnOA8KVq3Yf2HpSgvKc8hYrp+ZS+oacIy7nmkpkgOj6WyQ4/o6tJugib+lMoSX72 7KH5aAr5VDj4aOnhLVEtzJ4XFNi16fXjq5PTzJZ0l+/24kJUVdBMU2ThPqMuasrbuoZl iEWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735901129; x=1736505929; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gvrmXaG5X7I862q7psx6l0jxOxxsRl2hK2JU6/p8LK0=; b=aqDYS3txKU7u2TU0L91vEt1YCqzXbHLmV5IigvH1iqiiktBQUppx9vPZkI7b0GP6sV Be9ya+5V7dga4jEu+ehW27qYFjwLTHD9/KQAew/QpNqJ8Y8oC2LagJCvQ1GIKrxxkKVR cW300i6FtRVm+xjzyM/LEvvjYVUE1ZApbsg672Bgp/0kdz22haUPDx3iDK+51f67QV26 geJNwr9nZ8Y0kEQMKTLFUSAS8OhcJNx0QHZW6IszfafStafFw2NfWw5Q2BI8Ou7aySbU sZVEK2JERmsEJXcKjb8HYMZ60abQh7VRFFwaxni8Sr/8MUiHNWWWTisqm+n15wgU4LKO Rg2g== X-Gm-Message-State: AOJu0Yy9Kseel8aOwI0t0nqruiqCR/K7rK2AHcjXvZeHcdNoOvD6/LPw a7yowJqayfEQ0sv0F6/wenAhJ2e2mbaHF3LotnYjRW3xNtecPaU+tZR1Ig== X-Gm-Gg: ASbGncv6teiVzK2l+AQvgvFhAtT9szjgf7mhP71OwQzDTpzsAkUjXlR43z1Wk2gOh+l 0QBKb3AhYiYcdjPuJflOQbqeXIA8iBz38d1aeu7lgMYsabh8Hdn5/bPRdgF7EESlcc8nVAn9h7i 52LHaMMSl85GgEZjFvEmQBJnCykRkUQZ92AO5UoJA3gHx8bf1tyTNTl86FgnpuMvYQK/y/0/1/1 etpz1cduDXd/qQG9F43OtrKOr/6529ZU/xOaXlSvtidc+2/tV1x7jteSHmkHKGYImJH2FxiyhDd Lz/Pbvl/jLDrnkJtdg== X-Google-Smtp-Source: AGHT+IGcnRXCF1IfM3msJZ02W9FA4xi69kMcX3cIyeq/GdWH43sy4PQpU0ubJPiGXPa96kv2rzUqsw== X-Received: by 2002:a05:6000:4715:b0:385:f560:7916 with SMTP id ffacd0b85a97d-38a221fae73mr45473195f8f.35.1735901128779; Fri, 03 Jan 2025 02:45:28 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43661289995sm476935865e9.36.2025.01.03.02.45.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 02:45:28 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/11] gettext: update 0.22.5 -> 0.23.1 Date: Fri, 3 Jan 2025 11:45:14 +0100 Message-Id: <20250103104524.4053846-1-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 03 Jan 2025 10:45:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209332 From: Alexander Kanavin Drop patches: parallel.patch (obsolete as no .a files are installed) 0001-intl-Fix-build-failure-with-make-j.patch (backport) Gettext no longer installs anything into $libdir/gettext by default but still creates the directory and so it should be packaged. Signed-off-by: Alexander Kanavin --- meta/classes-recipe/autotools.bbclass | 4 +-- ....5.bb => gettext-minimal-native_0.23.1.bb} | 2 +- meta/recipes-core/gettext/gettext-sources.inc | 2 +- ...t-env.in-do-not-add-C-CXX-parameters.patch | 8 ++--- ...1-intl-Fix-build-failure-with-make-j.patch | 35 ------------------- ...01-tests-autopoint-3-unset-MAKEFLAGS.patch | 8 ++--- .../gettext/gettext/parallel.patch | 31 ---------------- .../gettext/gettext/serial-tests-config.patch | 8 ++--- .../gettext/gettext/use-pkgconfig.patch | 16 ++++----- .../{gettext_0.22.5.bb => gettext_0.23.1.bb} | 9 +++-- 10 files changed, 28 insertions(+), 95 deletions(-) rename meta/recipes-core/gettext/{gettext-minimal-native_0.22.5.bb => gettext-minimal-native_0.23.1.bb} (96%) delete mode 100644 meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch delete mode 100644 meta/recipes-core/gettext/gettext/parallel.patch rename meta/recipes-core/gettext/{gettext_0.22.5.bb => gettext_0.23.1.bb} (97%) diff --git a/meta/classes-recipe/autotools.bbclass b/meta/classes-recipe/autotools.bbclass index 9ebdca47680..a1d8e4b3603 100644 --- a/meta/classes-recipe/autotools.bbclass +++ b/meta/classes-recipe/autotools.bbclass @@ -212,8 +212,8 @@ autotools_do_configure() { cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/ if [ -d ${S}/po/ ]; then cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po/ - if [ ! -e ${S}/po/remove-potcdate.sin ]; then - cp ${STAGING_DATADIR_NATIVE}/gettext/po/remove-potcdate.sin ${S}/po/ + if [ ! -e ${S}/po/remove-potcdate.sed ]; then + cp ${STAGING_DATADIR_NATIVE}/gettext/po/remove-potcdate.sed ${S}/po/ fi fi PRUNE_M4="$PRUNE_M4 gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4" diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.22.5.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.23.1.bb similarity index 96% rename from meta/recipes-core/gettext/gettext-minimal-native_0.22.5.bb rename to meta/recipes-core/gettext/gettext-minimal-native_0.23.1.bb index 96acf9bb9fc..e443b6b34fa 100644 --- a/meta/recipes-core/gettext/gettext-minimal-native_0.22.5.bb +++ b/meta/recipes-core/gettext/gettext-minimal-native_0.23.1.bb @@ -42,5 +42,5 @@ do_install () { install -d ${D}${datadir}/gettext/po/ cp ${S}/build-aux/config.rpath ${D}${datadir}/gettext/ cp ${S}/gettext-runtime/po/Makefile.in.in ${D}${datadir}/gettext/po/ - cp ${S}/gettext-runtime/po/remove-potcdate.sin ${D}${datadir}/gettext/po/ + cp ${S}/gettext-runtime/po/remove-potcdate.sed ${D}${datadir}/gettext/po/ } diff --git a/meta/recipes-core/gettext/gettext-sources.inc b/meta/recipes-core/gettext/gettext-sources.inc index fd05837528c..5d90d81b58d 100644 --- a/meta/recipes-core/gettext/gettext-sources.inc +++ b/meta/recipes-core/gettext/gettext-sources.inc @@ -1,4 +1,4 @@ HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "ec1705b1e969b83a9f073144ec806151db88127f5e40fe5a94cb6c8fa48996a0" +SRC_URI[sha256sum] = "52a578960fe308742367d75cd1dff8552c5797bd0beba7639e12bdcda28c0e49" diff --git a/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch b/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch index 33d45a038cf..e59c73fb7d8 100644 --- a/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch +++ b/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch @@ -1,4 +1,4 @@ -From c58c503c532d20883a93ef778327c86dd6de24f6 Mon Sep 17 00:00:00 2001 +From 9d36ff90d3a488caa8cd7b3351e5a3bdc4229b1b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 6 Mar 2020 21:04:05 +0000 Subject: [PATCH] init-env.in: do not add C/CXX parameters @@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 4 deletions(-) diff --git a/gettext-tools/tests/init-env.in b/gettext-tools/tests/init-env.in -index cc84ffd..b69c990 100644 +index 0968388..3d9a8a5 100644 --- a/gettext-tools/tests/init-env.in +++ b/gettext-tools/tests/init-env.in @@ -3,10 +3,6 @@ top_builddir=../.. @@ -24,6 +24,6 @@ index cc84ffd..b69c990 100644 -CFLAGS="@CFLAGS@" -CXX="@CXX@" -CXXFLAGS="@CXXFLAGS@" + OBJC="@OBJC@" + OBJCFLAGS="@OBJCFLAGS@" CPPFLAGS="@CPPFLAGS@" - LDFLAGS="@LDFLAGS@" - LTLIBINTL="@LTLIBINTL@" diff --git a/meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch b/meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch deleted file mode 100644 index 144259dd3f2..00000000000 --- a/meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 97a6a63ad61949663283f5fad68c9d5fb9be1f15 Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Tue, 12 Sep 2023 11:33:41 +0200 -Subject: [PATCH] intl: Fix build failure with "make -j". - -Reported by Christian Weisgerber at -. - -* gettext-runtime/intl/Makefile.am (langprefs.lo, log.lo): Depend on gettextP.h -and its subordinate includes. - -Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=97a6a63ad61949663283f5fad68c9d5fb9be1f15] -Signed-off-by: Changqing Li ---- - gettext-runtime/intl/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am -index da7abb758..9e56978bc 100644 ---- a/gettext-runtime/intl/Makefile.am -+++ b/gettext-runtime/intl/Makefile.am -@@ -387,8 +387,8 @@ dngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo - ngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h - plural.lo: ../config.h $(srcdir)/plural-exp.h $(PLURAL_DEPS) - plural-exp.lo: ../config.h $(srcdir)/plural-exp.h --langprefs.lo: ../config.h --log.lo: ../config.h -+langprefs.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h -+log.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h - printf.lo: ../config.h - setlocale.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h - version.lo: ../config.h libgnuintl.h --- -2.25.1 - diff --git a/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch b/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch index 94afb255c38..a8f6684bd70 100644 --- a/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch +++ b/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch @@ -1,4 +1,4 @@ -From 7006142d199af13628edc687847a9a5bac48b45d Mon Sep 17 00:00:00 2001 +From 4e9ea45803fe8dfc41ec5c51a65048addd985765 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 7 Jan 2020 16:44:38 +0100 Subject: [PATCH] tests/autopoint-3: unset MAKEFLAGS @@ -13,13 +13,13 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+) diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3 -index bd3fbf3..380eaac 100755 +index af2e17f..46cf3f7 100755 --- a/gettext-tools/tests/autopoint-3 +++ b/gettext-tools/tests/autopoint-3 -@@ -131,6 +131,7 @@ test $? = 0 || { cat autopoint.err; Exit 1; } - ${CONFIG_SHELL} ./configure >/dev/null 2>autpoint.err +@@ -137,6 +137,7 @@ ${CONFIG_SHELL} ./configure >/dev/null 2>autopoint.err test $? = 0 || { cat autopoint.err; Exit 1; } + : ${MAKE=make} +unset MAKEFLAGS ${MAKE} >/dev/null 2>autopoint.err test $? = 0 || { cat autopoint.err; Exit 1; } diff --git a/meta/recipes-core/gettext/gettext/parallel.patch b/meta/recipes-core/gettext/gettext/parallel.patch deleted file mode 100644 index 8ecba46fd0a..00000000000 --- a/meta/recipes-core/gettext/gettext/parallel.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 83333bc873c2655ff1de161f6b7db930f22f1cea Mon Sep 17 00:00:00 2001 -From: Joe Slater -Date: Thu, 7 Jun 2012 16:37:01 -0700 -Subject: [PATCH] instal libgettextlib.a before removing it - -In a multiple job build, Makefile can simultaneously -be installing and removing libgettextlib.a. We serialize -the operations. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater ---- - gettext-tools/gnulib-lib/Makefile.am | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am -index ab729cd..a0d713e 100644 ---- a/gettext-tools/gnulib-lib/Makefile.am -+++ b/gettext-tools/gnulib-lib/Makefile.am -@@ -58,6 +58,10 @@ AM_CFLAGS = @WARN_CFLAGS@ - # Rules generated and collected by gnulib-tool. - include Makefile.gnulib - -+# defined in Makefile.gnulib but missing this dependency -+# -+install-exec-clean: install-libLTLIBRARIES -+ - # OS/2 does not support a DLL name longer than 8 characters. - if OS2 - libgettextlib_la_LDFLAGS += -os2dllname gtlib diff --git a/meta/recipes-core/gettext/gettext/serial-tests-config.patch b/meta/recipes-core/gettext/gettext/serial-tests-config.patch index 7d39d6086ab..3baf5497952 100644 --- a/meta/recipes-core/gettext/gettext/serial-tests-config.patch +++ b/meta/recipes-core/gettext/gettext/serial-tests-config.patch @@ -1,4 +1,4 @@ -From aa8dfe0aafd0b53a6c5bac61b356ca92e1430a36 Mon Sep 17 00:00:00 2001 +From 33fd16b0b2c69ec1118bb605384e7e3b1a94eee0 Mon Sep 17 00:00:00 2001 From: "Hongjun.Yang" Date: Thu, 28 Jul 2016 12:36:15 +0800 Subject: [PATCH] fix for ptest @@ -15,7 +15,7 @@ Signed-off-by: Changqing Li 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index f4e54ea..a47ff14 100644 +index 5106676..3114998 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_INIT([gettext], @@ -28,7 +28,7 @@ index f4e54ea..a47ff14 100644 dnl Override automake's tar command used for creating distributions. am__tar='${AMTAR} chf - --format=ustar --owner=root --group=root "$$tardir"' diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac -index 126d069..aa23232 100644 +index e128f5b..9f7447c 100644 --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac @@ -22,7 +22,7 @@ AC_INIT([gettext-runtime], @@ -41,7 +41,7 @@ index 126d069..aa23232 100644 dnl Installation directories. diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac -index 3610ee3..6f56a23 100644 +index 3b1f461..14510a9 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -22,7 +22,7 @@ AC_INIT([gettext-tools], diff --git a/meta/recipes-core/gettext/gettext/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext/use-pkgconfig.patch index ceb1856118a..9774c4cce00 100644 --- a/meta/recipes-core/gettext/gettext/use-pkgconfig.patch +++ b/meta/recipes-core/gettext/gettext/use-pkgconfig.patch @@ -1,4 +1,4 @@ -From 6aa1338b916fe72c200b6f160b934be15b6ff590 Mon Sep 17 00:00:00 2001 +From 7302a77e08e62fc3b00f75d8aa143c5565c3f680 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 23 Jan 2018 00:54:13 +0000 Subject: [PATCH] gettext: beat library detection into shape @@ -19,10 +19,10 @@ Signed-off-by: Ross Burton 3 files changed, 31 insertions(+), 286 deletions(-) diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4 -index 0340490..0355388 100644 +index c7160d7..8e46cc7 100644 --- a/gettext-tools/gnulib-m4/libxml.m4 +++ b/gettext-tools/gnulib-m4/libxml.m4 -@@ -13,6 +13,7 @@ dnl gl_LIBXML(FORCE-INCLUDED) +@@ -14,6 +14,7 @@ dnl gl_LIBXML(FORCE-INCLUDED) dnl forces the use of the included or an external libxml. AC_DEFUN([gl_LIBXML], [ @@ -30,7 +30,7 @@ index 0340490..0355388 100644 AC_REQUIRE([AM_ICONV_LINK]) ifelse([$1], , [ -@@ -30,106 +31,10 @@ AC_DEFUN([gl_LIBXML], +@@ -31,106 +32,10 @@ AC_DEFUN([gl_LIBXML], INCXML= ifelse([$1], [yes], , [ if test "$gl_cv_libxml_use_included" != yes; then @@ -142,10 +142,10 @@ index 0340490..0355388 100644 ]) AC_SUBST([LIBXML]) diff --git a/libtextstyle/gnulib-local/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4 -index dbc9eb8..136e512 100644 +index baa2cf4..b287c5b 100644 --- a/libtextstyle/gnulib-local/m4/libglib.m4 +++ b/libtextstyle/gnulib-local/m4/libglib.m4 -@@ -6,106 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. +@@ -7,106 +7,26 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. @@ -266,10 +266,10 @@ index dbc9eb8..136e512 100644 AC_SUBST([LTLIBGLIB]) AC_SUBST([INCGLIB]) diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4 -index dbc9eb8..136e512 100644 +index baa2cf4..b287c5b 100644 --- a/libtextstyle/gnulib-m4/libglib.m4 +++ b/libtextstyle/gnulib-m4/libglib.m4 -@@ -6,106 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. +@@ -7,106 +7,26 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. diff --git a/meta/recipes-core/gettext/gettext_0.22.5.bb b/meta/recipes-core/gettext/gettext_0.23.1.bb similarity index 97% rename from meta/recipes-core/gettext/gettext_0.22.5.bb rename to meta/recipes-core/gettext/gettext_0.23.1.bb index 0bf2a56e5fc..da4e6c68500 100644 --- a/meta/recipes-core/gettext/gettext_0.22.5.bb +++ b/meta/recipes-core/gettext/gettext_0.23.1.bb @@ -22,13 +22,11 @@ RCONFLICTS:${PN} = "proxy-libintl" require gettext-sources.inc SRC_URI += " \ - file://parallel.patch \ file://use-pkgconfig.patch \ file://run-ptest \ file://serial-tests-config.patch \ file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ - file://0001-intl-Fix-build-failure-with-make-j.patch \ " inherit autotools texinfo pkgconfig ptest @@ -90,7 +88,7 @@ FILES:libgettextsrc = "${libdir}/libgettextsrc-*.so*" PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc" -FILES:${PN} += "${libdir}/${BPN}/*" +FILES:${PN} += "${libdir}/${BPN}/" # The its/Makefile.am has defined: # itsdir = $(pkgdatadir)$(PACKAGE_SUFFIX)/its @@ -130,7 +128,7 @@ do_install:append:class-native () { rm ${D}${datadir}/aclocal/* rm ${D}${datadir}/gettext/config.rpath rm ${D}${datadir}/gettext/po/Makefile.in.in - rm ${D}${datadir}/gettext/po/remove-potcdate.sin + rm ${D}${datadir}/gettext/po/remove-potcdate.sed create_wrapper ${D}${bindir}/msgfmt \ GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-${PV}/" @@ -175,7 +173,8 @@ do_install_ptest() { install ${B}/gettext-tools/misc/* ${D}${PTEST_PATH}/misc find ${D}${PTEST_PATH}/ -name "*.o" -exec rm {} \; chmod 0755 ${D}${PTEST_PATH}/tests/lang-vala ${D}${PTEST_PATH}/tests/plural-1 ${D}${PTEST_PATH}/tests/xgettext-tcl-4 \ - ${D}${PTEST_PATH}/tests/xgettext-vala-1 ${D}${PTEST_PATH}/tests/xgettext-po-2 ${D}${PTEST_PATH}/tests/xgettext-vala-6 + ${D}${PTEST_PATH}/tests/xgettext-vala-1 ${D}${PTEST_PATH}/tests/xgettext-po-2 ${D}${PTEST_PATH}/tests/xgettext-vala-6 \ + ${D}${PTEST_PATH}/tests/plural-3 ${D}${PTEST_PATH}/tests/plural-4 ${D}${PTEST_PATH}/tests/xgettext-java-8 ${D}${PTEST_PATH}/tests/xgettext-java-9 sed -i -e 's|${DEBUG_PREFIX_MAP}||g' ${D}${PTEST_PATH}/tests/init-env } From patchwork Fri Jan 3 10:45:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 54934 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90AB3E7718F for ; Fri, 3 Jan 2025 10:45:35 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web11.27854.1735901132323203599 for ; Fri, 03 Jan 2025 02:45:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=FlFq6Lpn; spf=pass (domain: gmail.com, ip: 209.85.128.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-436281c8a38so86913655e9.3 for ; Fri, 03 Jan 2025 02:45:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735901131; x=1736505931; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T77+XNGIb6wZwH0pDsFatImhY1q2f1iyj3KDw4eBPLE=; b=FlFq6Lpn4mXuBgBrlhimnn8chY1WzWjvuQYYrHo3XxMsrEDydEKjA6faOsmFDmIQBG xe666nXLh0tOWRW7s1UjzFVG1Vzy9OagidBg9zXWWyBlb4S1uDBlwtxoqdcr+yOwnjlb a2SBTgWhyNbnPK02nqLYonOIzzSFCWwMV/dYuBXQc+q/6BJrtAieY9IqEMpd4hoHkAcX jr5sU5E9KkWKVpxcljzClI/3UjpTt0TH+861uqfRIxOnNv5PUXpfwmMu4T8grkJSI76H EtXMvglD4KRMqXwDA41T5yJ8okEOAVbw+B5ZfBP0aRdew0j6qL9EINXjN8+DMzlB/lYy UqKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735901131; x=1736505931; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T77+XNGIb6wZwH0pDsFatImhY1q2f1iyj3KDw4eBPLE=; b=YbPgmWGsAgmSEo7tN149jHsxsZKB2A1IOCaBRCVCFufhpdpa0+YJtpN6WYJgfW6kqM k2WMUxMZZYTsagasIQRjDWIcp4GgoHXevtFzferncscmVLpd2isD5RWPlYaGCljfK0mW bObzUyBAGaOxnr5tMPkO7zdZ0XNed0bfsFuwAYEmrnIFQH1DJxmQ6hxYG/TTQEImn3EA zd7Gs5NX7G70l37uWOlbI3W8e0T94+ZgblfqC49/Sm4mahLEvZXYGrQ1TVm321SJ/nIc wUB89vdZTS61dTQ+3Aa+G8qEbmh8avgooNVdbnLO95MhKeJ5X62rbu3KptgdamSF+6KB 5WOA== X-Gm-Message-State: AOJu0Yy6IxvlXQseKWS04AVOPCldZUvcYZ4dDt0x9oL0ifhq7R4Ojiqr CDij69MdHtcSrEf6WJYMeosXo8Q1bQmM4Fa++kak3gdBGO9YV1gPKNtIGw== X-Gm-Gg: ASbGncviEgnVM7Ud1H4yTyBT2yFeZPbthcKLD3IEETPrin5yQ1wmyUASKt3IwayR12U 1KxUsX1aJHhk8kIdx2AjXWn1KNVFmCbpoyXjcoUerET3h6x5PSHhOsadYTMRoJc7Xn5IRMeRw2v p0KkV4+IMaLu3AJ+rSRSCICPSBoVKLWNALIoPTb4Pi/kcZkqkbRk7/yMuUNPGhj9tVdQth5ZvNY 15TLsjXcznKIvAGUewEgpRYd+paSwip/48jxKXeSAUNYS7a/GiJX2xnzSoleTfB7mnbjLyAnZ1F 7kfh7CsWsB2bo4dmPw== X-Google-Smtp-Source: AGHT+IHqYxLzAoHoYyUmBCGdsn5jW6pvrhC0CIFmrz4ViqtE/MnIq8IH5w8C+sz7me/Mn7PLiMsVug== X-Received: by 2002:a05:600c:350c:b0:434:a91e:c709 with SMTP id 5b1f17b1804b1-43668b78c11mr328958065e9.28.1735901130314; Fri, 03 Jan 2025 02:45:30 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43661289995sm476935865e9.36.2025.01.03.02.45.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 02:45:29 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 02/11] libxt: update 1.3.0 -> 1.3.1 Date: Fri, 3 Jan 2025 11:45:15 +0100 Message-Id: <20250103104524.4053846-2-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250103104524.4053846-1-alex.kanavin@gmail.com> References: <20250103104524.4053846-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 03 Jan 2025 10:45:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209333 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../xorg-lib/libxt/libxt_fix_for_x32.patch | 13 ++++++------- .../xorg-lib/{libxt_1.3.0.bb => libxt_1.3.1.bb} | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) rename meta/recipes-graphics/xorg-lib/{libxt_1.3.0.bb => libxt_1.3.1.bb} (92%) diff --git a/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch b/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch index ff8c675dbdb..79ae929d08f 100644 --- a/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch +++ b/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch @@ -1,4 +1,4 @@ -From f069b0a430fe96f3ece2106d34375008833599d3 Mon Sep 17 00:00:00 2001 +From c2916117aa09b7110ab1883e4295330ca7675e88 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Fri, 2 Dec 2011 12:20:05 -0800 Subject: [PATCH] libxt: fix compilatoin with x32 toolchain @@ -9,21 +9,20 @@ This fixes compilation with x32 toolchain. Received this patch from H.J. Lu Signed-off-by: Nitin A Kamble 2011/12/1 - --- include/X11/Xtos.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h -index 64b2da8..44f52c2 100644 +index 599dbe2..1686063 100644 --- a/include/X11/Xtos.h +++ b/include/X11/Xtos.h -@@ -59,7 +59,7 @@ SOFTWARE. +@@ -63,7 +63,7 @@ SOFTWARE. defined(__sparc64__) || \ defined(__s390x__) || \ (defined(__hppa__) && defined(__LP64__)) || \ - defined(__amd64__) || defined(amd64) || \ -+ ((defined(__amd64__) || defined(amd64)) && defined(__LP64__)) || \ - defined(__powerpc64__) || \ - (defined(sgi) && (_MIPS_SZLONG == 64)) ++ defined(__amd64__) || defined(amd64) && defined(__LP64__)) || \ + defined(__powerpc64__)) #define LONG64 + #endif diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.3.0.bb b/meta/recipes-graphics/xorg-lib/libxt_1.3.1.bb similarity index 92% rename from meta/recipes-graphics/xorg-lib/libxt_1.3.0.bb rename to meta/recipes-graphics/xorg-lib/libxt_1.3.1.bb index 1805dae7722..97323ad282c 100644 --- a/meta/recipes-graphics/xorg-lib/libxt_1.3.0.bb +++ b/meta/recipes-graphics/xorg-lib/libxt_1.3.1.bb @@ -25,7 +25,7 @@ XORG_EXT = "tar.xz" SRC_URI += "file://libxt_fix_for_x32.patch" -SRC_URI[sha256sum] = "52820b3cdb827d08dc90bdfd1b0022a3ad8919b57a39808b12591973b331bf91" +SRC_URI[sha256sum] = "e0a774b33324f4d4c05b199ea45050f87206586d81655f8bef4dba434d931288" BBCLASSEXTEND = "native nativesdk" From patchwork Fri Jan 3 10:45:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 54931 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9144AC3DA4A for ; Fri, 3 Jan 2025 10:45:35 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web10.28158.1735901133268159240 for ; Fri, 03 Jan 2025 02:45:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DG+cfcJ3; spf=pass (domain: gmail.com, ip: 209.85.128.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-43675b1155bso109701315e9.2 for ; Fri, 03 Jan 2025 02:45:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735901131; x=1736505931; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vpVg6HRwJ8o0CyY81c5pFmcx7B9dIrdslTlct4kS8QM=; b=DG+cfcJ3wcxsysmMEslzqfpPba6RcWLMhfn7v9DIzgeRcoIf+BvY9So3gVViwlNm/O yh/Ocs+ZKorAtq4JfezjOZoHfxo4FAOsIlU1VVnnhtDJf7mOgo+89AU/Zlo1IXwT/zyW /QH46QuRATLB99mSlMFPGX7+4cbIS+I2VlRAMNXrl7oyewiX1chqZm+EN/9Ueq5Ky0fu KVMn8Lu4AzNgcenpgbw7m2VUiR9k4kBo0t5kDBiSpJ/n9VAEXPFKzHs0Jql03zfjt8iV 7T1Rv5tTHk50RMG3X7ugKeREuWISyiWwAIiCJThlG1EzBApepZJFdYGVLCQoVtKK4JbL Eexg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735901131; x=1736505931; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vpVg6HRwJ8o0CyY81c5pFmcx7B9dIrdslTlct4kS8QM=; b=RWlSP9HgNfWY2SldulctQ9tYUuEmLGmZslSdzd2X0UTPzvjbThyRgdu5O/P8IQ0mSE ZrXHEPumbJE4PvS8uk0byjWd230ihGUsF53AG3QtPlRPyW+lPYWaFLwj8RyLwN+FLFM2 e53mdrfleiFhUzQvcqpIUnONXnWWrb03uGmi2oiHBKKMVUpMHN5GAnzVM1jo/vM4ZopQ 1x280I2aHjvVjmOnuLq8AMPHhdOi+LrOZHOva87sDfaU7KoWj5MQfVg7flu66M6jRiwb 15akyIUErELEJlwfDQxqMA4sW4Q3cQtDxdJqc+4Fo7Phozm3zaYFcDG/ijUBS6MlvFNP 6gVw== X-Gm-Message-State: AOJu0YyQuZ+9WKYoG3UboxXn19piS6h/sMZmXuUa1/lyS9SRlUTKKfNi cTVpz2AJRzuscvC6j98Q2T9ULrB55O0YmFgLwcV/yO5I2pSYV6juua8Ehw== X-Gm-Gg: ASbGnctNdj3HjUV98C6/SkBnu1O4Bl0cXWa4DOPyBdM6Frot7OpFLkkElEvuLAMXyUX Gnu8iJOkP/zw/j2UUuP+YlNryLdA5aRJns1PVo6wKfsMUirqJ1GCUydg+vSaBmcKj6HBOja+3a3 fqajkrL0ROQtgLyuIEYd/nbIi0iqYOKFszUd5oZkyz4lFZfd4dxfdy5sOqhylX5ul/qYMz40B8V HPtTdtE3HK42Z/7/kZraQCX6FYwotsPBUKYC+a9spM5FDk2t4bwYPBIqUBmh5+6LTMn7BsnPJya ZBe3Tw77sL9mymPkcQ== X-Google-Smtp-Source: AGHT+IEawJcn6SX0Yp17QyN/VtWkQ0uAI8s3PyYvH3jW77aV8SOAiXSiQHY2UniA7/aPy2zvuISHag== X-Received: by 2002:a05:600c:35ca:b0:434:e9ee:c3d with SMTP id 5b1f17b1804b1-43668b7860fmr365051025e9.20.1735901131248; Fri, 03 Jan 2025 02:45:31 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43661289995sm476935865e9.36.2025.01.03.02.45.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 02:45:30 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 03/11] libxshmfence: update 1.3.2 -> 1.3.3 Date: Fri, 3 Jan 2025 11:45:16 +0100 Message-Id: <20250103104524.4053846-3-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250103104524.4053846-1-alex.kanavin@gmail.com> References: <20250103104524.4053846-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 03 Jan 2025 10:45:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209334 From: Alexander Kanavin Drop patch as issue solved upstream. Signed-off-by: Alexander Kanavin --- ...h-Define-SYS_futex-if-it-does-not-ex.patch | 39 ------------------- ...hmfence_1.3.2.bb => libxshmfence_1.3.3.bb} | 4 +- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch rename meta/recipes-graphics/xorg-lib/{libxshmfence_1.3.2.bb => libxshmfence_1.3.3.bb} (73%) diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch b/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch deleted file mode 100644 index 3e87794d20d..00000000000 --- a/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5827f6389a227157958d14a687fb29223cb3a03a Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Wed, 7 Apr 2021 07:48:42 +0000 -Subject: [PATCH] xshmfence_futex.h: Define SYS_futex if it does not exist - -_NR_futex is not defines by newer architectures e.g. riscv32 as -they only have 64bit variant of time_t. Glibc defines SYS_futex -interface based on __NR_futex, since this is used in applications, -such applications start to fail to build for these newer architectures. -This patch defines a fallback to alias __NR_futex to __NR_futex_time64 -to make SYS_futex keep working. - -Reference: https://git.openembedded.org/openembedded-core/commit/?id=7a218adf9990f5e18d0b6a33eb34091969f979c7 - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu ---- - src/xshmfence_futex.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/xshmfence_futex.h b/src/xshmfence_futex.h -index 673ac0e..a71efa5 100644 ---- a/src/xshmfence_futex.h -+++ b/src/xshmfence_futex.h -@@ -53,6 +53,10 @@ static inline int futex_wait(int32_t *addr, int32_t value) { - #include - #include - -+#if !defined(SYS_futex) && defined(SYS_futex_time64) -+#define SYS_futex SYS_futex_time64 -+#endif -+ - static inline long sys_futex(void *addr1, int op, int val1, struct timespec *timeout, void *addr2, int val3) - { - return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); --- -2.29.2 - diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.2.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.3.bb similarity index 73% rename from meta/recipes-graphics/xorg-lib/libxshmfence_1.3.2.bb rename to meta/recipes-graphics/xorg-lib/libxshmfence_1.3.3.bb index 0a7da938e1f..5b5ecd5778a 100644 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.2.bb +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.3.bb @@ -13,8 +13,6 @@ DEPENDS += "virtual/libx11" EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm" -SRC_URI += "file://0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch" - -SRC_URI[sha256sum] = "870df257bc40b126d91b5a8f1da6ca8a524555268c50b59c0acd1a27f361606f" +SRC_URI[sha256sum] = "d4a4df096aba96fea02c029ee3a44e11a47eb7f7213c1a729be83e85ec3fde10" BBCLASSEXTEND = "native nativesdk" From patchwork Fri Jan 3 10:45:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 54933 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F219E77198 for ; Fri, 3 Jan 2025 10:45:35 +0000 (UTC) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.groups.io with SMTP id smtpd.web11.27855.1735901133728282225 for ; Fri, 03 Jan 2025 02:45:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=aI8f5NGj; spf=pass (domain: gmail.com, ip: 209.85.128.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-43624b2d453so125558265e9.2 for ; Fri, 03 Jan 2025 02:45:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735901132; x=1736505932; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PlK0XM3nUYNgax3hWy922OjMf60Lp6YgCpshVwnMuAM=; b=aI8f5NGjqpJlXinTbAG8rctAc0/7iTS+zYOc6cOIb9iVqAAH6csvJn7aSASA6PjV/C OYoK7Xbt3iYrILPXC1qWDKUTnKygJfBtNvfPSBuduFhss8Im2JMkFxenqhKN7vQjgrYD V76CpTPDytvGl89VlOoT4Q0y19Ve3Fixq/RhtpKWiQQXYSncKn2iIMJWeSX6AxMPBlN4 2LDZt+Q/KFseLb/Cd2k+UA+dNC+6s3UwJWvh/4V4RcxnZcEPgCrC4f9ijrCmoh+VhZnU rxokQ30zT7lXMxvDyfQmsSFvj7sT2O/GTkskPXLgMdzszl6WFeXDmn81FvsMGXKZ1Tbq bGMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735901132; x=1736505932; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PlK0XM3nUYNgax3hWy922OjMf60Lp6YgCpshVwnMuAM=; b=h5hKxW3w2S9xPVPnFMA6CAa5FwKJtznmNgXZHXaU0Ia2s8u7NodTgG0RftbRVsA7Qe qvybvYbLaUGN/ThGRHYMw2Dt82rpmKeHob30JZ0XJLibL1y7urX2RyPpRMMIT6pA578o U/qRlB1GG4pu/R5gTl/zImTre6/Ileb/IOK/qYTI0n8MQTEToRRng5n3ZH+FR6VwkpYU 39PsoRNgZ36NEH6thAUgIMAmOLB4m6sfE7AJGGzXFhS7t0BOuyelzgHAzF6BZzjWsHAe srxVedT/KEoMaDel4kdR47wI2sARU/dOkWV9CtoCkUKa74WMvm3P2ZGpVOIsaS4VOdjr owhw== X-Gm-Message-State: AOJu0Yx3JbvGSkI+o3RQDLwHrHd+6BodMFcdPFTFQH+bOZ0+N19M+z0d l0c9kZ6J0krI8K78rd80AdSi5OEE3km5MT8h/csbZrV9SI5xcVgugXDMdQ== X-Gm-Gg: ASbGncvqFPaulfGhj0XAfUQe6bDIHj0fMeT925gOoqeDySbzikUDHsG00bvvw8Ac4Nw 4uXH790CMruZC/E74mswddaJJQhaz7BvmekAeIMNPQmJ/HJSR8VfE/YmYYzMm6tZgrV+zNXBMym 99hwVaG5QHVAed25XDPV8WIERpUQqFczNSZi756z4pRoq0cHl6pCKul7rhSeoa5gNAt+oVZeVvv CrAEnhRS3sBy6XvAEtJTuGWw45qI+CEHFDR+bLP4fY4z9L73ObkR4R4XqWmEnxWsyj4xYHvPTUW KqHHiAwO0wyVFYK5MA== X-Google-Smtp-Source: AGHT+IEnYfJyi7fPENBMJ2azHBpFfR4r3QywgCBBNnz8to5iR0ESblol2LHClYqeSZA91Fv3A1OFSg== X-Received: by 2002:a05:600c:a0a:b0:434:a04d:1670 with SMTP id 5b1f17b1804b1-436678f5775mr470515215e9.0.1735901131971; Fri, 03 Jan 2025 02:45:31 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43661289995sm476935865e9.36.2025.01.03.02.45.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 02:45:31 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 04/11] rt-tests: update 2.7 -> 2.8 Date: Fri, 3 Jan 2025 11:45:17 +0100 Message-Id: <20250103104524.4053846-4-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250103104524.4053846-1-alex.kanavin@gmail.com> References: <20250103104524.4053846-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 03 Jan 2025 10:45:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209335 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch | 2 +- meta/recipes-rt/rt-tests/rt-tests.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch index d5bd7fe523b..fface76731c 100644 --- a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch +++ b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch @@ -19,7 +19,7 @@ index 223a839..a735584 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,6 @@ - VERSION = 2.7 + VERSION = 2.8 -CC = $(CROSS_COMPILE)gcc -AR = $(CROSS_COMPILE)ar +CC ?= $(CROSS_COMPILE)gcc diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc index 3fbdfa20381..f28258ef58e 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc @@ -1,5 +1,5 @@ -SRCREV = "5bd94923ffda2ab326d081926dbfc6775fb5050b" -PV = "2.7" +SRCREV = "f5b910a90b6f5ab0ef6df392e009ffe1429d53af" +PV = "2.8" PE = "1" SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main;protocol=https" From patchwork Fri Jan 3 10:45:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 54938 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 839AEE7718F for ; Fri, 3 Jan 2025 10:45:45 +0000 (UTC) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.groups.io with SMTP id smtpd.web10.28159.1735901135812185240 for ; Fri, 03 Jan 2025 02:45:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=BgIGraZ0; spf=pass (domain: gmail.com, ip: 209.85.128.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-43626213fffso76756955e9.1 for ; Fri, 03 Jan 2025 02:45:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735901134; x=1736505934; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4iS5z+rbGoSZdXoLRQGUPPkgXwWEEWGEjn5ZgBJjzUU=; b=BgIGraZ0EF5EHGu/dc/Flo/KDN7Kr+v7xt+pQPyl5U7hR+Ph2Xt54/GbwKPT4GrhMz UHRBji5oqY8Va1X8uSoJfVJ4KPuiiGfaR8W0kzWCuIbsL8zJaqGqlRXdf0ldKkcgjBFr pejVN5QpSEVptqjaBGSsxLiPK9EeWWYVVxNogsZxM1ztLdiDNSSJv6vcRq1Np/OkmTRg P4WQN0r8Kr7nNC0s8lN4Sn5BhpBTLn8GBTGnJWIAkQvkyJSdia49Rf9T+DeUNg1XvSMV hT++9/v3qBOsPL+juqhVgr0d4dirvbjcN2aaFyfZXgAJrNH6GjmqTMvfeNX+cnfGy2TV MtVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735901134; x=1736505934; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4iS5z+rbGoSZdXoLRQGUPPkgXwWEEWGEjn5ZgBJjzUU=; b=M/DjAnknIgrwU/quDWz2TYhLoesAqecKvYWe8DouglgXg9Q9ESqM4/7QcK8nZsVScR Bqnfp1UKf+SM70RmC4hAfFh6QdWC6BOF23nRswGnnyyjSEy1IymWW5K9SGCckC3vz2SN oBSCm1XNZAgGAn44VnPivfib88ysUBsGNgcxyvbCBf7owUtPrr6nTXAhuVpfVBDYEezs 7Yhk1qbgOJlk6F9rxyTJkVLOtwI6JA82q1XIgQy+oa+Vh2dCKstWnNVnnyhPJqR7qsWT dz7S8pkBCHmOLLp6Dib4tFmThHloMc86IyZ4CTXONTHPLa+/dGoIY+uCKceEn9DJLxjY 1oHg== X-Gm-Message-State: AOJu0Yy6DrYr5YLr1EKaf2FWDzSkzyun0V68ES5EnMdu+oVkkYbd2LHY tayTwjLMBJ6syBGoroFOJd1FBAEfbfdA7dqRbKMW7Iu7PhqsNvnzcGLCNg== X-Gm-Gg: ASbGncuV9rr2mcW0LPu6zarDoITIjmXz9j7BWkpcfv3Srs6++xgjmwgRnrldjUFquOj Y7FvEg1vwW+zIbkV7ZPsIWo+lhw8GhmTvXUT7/Y0rfJo016t86b8ggMlFDey8ATqjo61uiNsVGP UNzXGQOr9/CIJIQcP4XN7sY8q2l9vtgijZUGcjpUErvspWKriF0Mr1bNMPsMPaASdg0Wwmiidw3 7t9TvROMBADi1cJDNSFnd8GYVylsp6gqx+iG948BWFexNEINaKWH4/KRVPAMVO/yh+4xbOSPb76 MG1RiOzspUp072eWFg== X-Google-Smtp-Source: AGHT+IE35bJU/Dnc8hlVbYHnR31TEMCQ2b/hyLWQCShODiYkz3rlTxlA/71Yf9LPBTiAvf2953l3ug== X-Received: by 2002:a05:600c:3147:b0:436:1b86:f05 with SMTP id 5b1f17b1804b1-43669a22df3mr397387595e9.11.1735901134011; Fri, 03 Jan 2025 02:45:34 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43661289995sm476935865e9.36.2025.01.03.02.45.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 02:45:32 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 05/11] iproute2: update 6.11.0 -> 6.12.0 Date: Fri, 3 Jan 2025 11:45:18 +0100 Message-Id: <20250103104524.4053846-5-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250103104524.4053846-1-alex.kanavin@gmail.com> References: <20250103104524.4053846-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 03 Jan 2025 10:45:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209336 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- ...nk.h-add-missing-include-for-htobe64.patch | 2 +- ...-ip-rearrange-and-prune-header-files.patch | 90 +++++++++++++++++++ ...02-bridge-mst-fix-a-musl-build-issue.patch | 76 ---------------- ...e-mst-fix-a-further-musl-build-issue.patch | 59 ------------ ...{iproute2_6.11.0.bb => iproute2_6.12.0.bb} | 8 +- 5 files changed, 93 insertions(+), 142 deletions(-) create mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-ip-rearrange-and-prune-header-files.patch delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0002-bridge-mst-fix-a-musl-build-issue.patch delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0003-bridge-mst-fix-a-further-musl-build-issue.patch rename meta/recipes-connectivity/iproute2/{iproute2_6.11.0.bb => iproute2_6.12.0.bb} (92%) diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch index 555d63b2403..03af400ecd2 100644 --- a/meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch +++ b/meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch @@ -1,4 +1,4 @@ -From f3c574b27000fd887cee84ab47adf23f767cbea1 Mon Sep 17 00:00:00 2001 +From 4dc0613e229f6b4a57beb00dde14ef319a2dcad8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sat, 24 Aug 2024 15:32:25 +0200 Subject: [PATCH] include/libnetlink.h: add missing include for htobe64 diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-ip-rearrange-and-prune-header-files.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-rearrange-and-prune-header-files.patch new file mode 100644 index 00000000000..2f779106142 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-rearrange-and-prune-header-files.patch @@ -0,0 +1,90 @@ +From 714291a63246cb3e6b86eb2a78fa84216d768a4b Mon Sep 17 00:00:00 2001 +From: Stephen Hemminger +Date: Tue, 10 Dec 2024 13:38:08 -0800 +Subject: [PATCH] ip: rearrange and prune header files + +The recent report of issues with missing limits.h impacting musl +suggested looking at what files are and are not included in ip code. + +The standard practice is to put standard headers first, then system, +then local headers. Used iwyu to get suggestions about missing +and extraneous headers. + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=7e23da91fca6e5dedeb32a7d308cf20982e897c3] +Signed-off-by: Stephen Hemminger +Signed-off-by: Alexander Kanavin +--- + ip/iplink.c | 13 +++++-------- + ip/ipnetns.c | 19 +++++++++---------- + 2 files changed, 14 insertions(+), 18 deletions(-) + +diff --git a/ip/iplink.c b/ip/iplink.c +index e650a5c2..8df367ed 100644 +--- a/ip/iplink.c ++++ b/ip/iplink.c +@@ -11,17 +11,14 @@ + #include + #include + #include ++#include ++#include ++#include ++ + #include ++#include + #include +-#include + #include +-#include +-#include +-#include +-#include +-#include +-#include +-#include + + #include "rt_names.h" + #include "utils.h" +diff --git a/ip/ipnetns.c b/ip/ipnetns.c +index 5c943400..a20cd8bc 100644 +--- a/ip/ipnetns.c ++++ b/ip/ipnetns.c +@@ -1,21 +1,21 @@ + /* SPDX-License-Identifier: GPL-2.0 */ + #define _ATFILE_SOURCE +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++ + #include ++#include + #include +-#include + #include + #include + #include + #include + #include +-#include ++#include ++ ++#include ++#include ++#include ++#include ++#include + + #include + +@@ -23,7 +23,6 @@ + #include "list.h" + #include "ip_common.h" + #include "namespace.h" +-#include "json_print.h" + + static int usage(void) + { diff --git a/meta/recipes-connectivity/iproute2/iproute2/0002-bridge-mst-fix-a-musl-build-issue.patch b/meta/recipes-connectivity/iproute2/iproute2/0002-bridge-mst-fix-a-musl-build-issue.patch deleted file mode 100644 index 3e266b9298d..00000000000 --- a/meta/recipes-connectivity/iproute2/iproute2/0002-bridge-mst-fix-a-musl-build-issue.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 6a77abab92516e65f07f8657fc4e384c4541ce0e Mon Sep 17 00:00:00 2001 -From: Dario Binacchi -Date: Sun, 22 Sep 2024 16:50:10 +0200 -Subject: [PATCH] bridge: mst: fix a musl build issue - -This patch fixes a compilation error raised by the bump to version 6.11.0 -in Buildroot using musl as the C library for the cross-compilation -toolchain. - -After setting the CFLGAS - -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -IPROUTE2_CFLAGS += -D__UAPI_DEF_IN6_ADDR=0 -D__UAPI_DEF_SOCKADDR_IN6=0 \ - -D__UAPI_DEF_IPV6_MREQ=0 -endif - -to fix the following errors: - -In file included from ../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/arpa/inet.h:9, - from ../include/libnetlink.h:14, - from mst.c:10: -../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:23:8: error: redefinition of 'struct in6_addr' - 23 | struct in6_addr { - | ^~~~~~~~ -In file included from ../include/uapi/linux/if_bridge.h:19, - from mst.c:7: -../include/uapi/linux/in6.h:33:8: note: originally defined here - 33 | struct in6_addr { - | ^~~~~~~~ -../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:34:8: error: redefinition of 'struct sockaddr_in6' - 34 | struct sockaddr_in6 { - | ^~~~~~~~~~~~ -../include/uapi/linux/in6.h:50:8: note: originally defined here - 50 | struct sockaddr_in6 { - | ^~~~~~~~~~~~ -../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:42:8: error: redefinition of 'struct ipv6_mreq' - 42 | struct ipv6_mreq { - | ^~~~~~~~~ -../include/uapi/linux/in6.h:60:8: note: originally defined here - 60 | struct ipv6_mreq { - -I got this further errors - -../include/uapi/linux/in6.h:72:25: error: field 'flr_dst' has incomplete type - 72 | struct in6_addr flr_dst; - | ^~~~~~~ -../include/uapi/linux/if_bridge.h:711:41: error: field 'ip6' has incomplete type - 711 | struct in6_addr ip6; - | ^~~ - -fixed by including the netinet/in.h header. - -Upstream-Status: Backport -[https://kernel.googlesource.com/pub/scm/network/iproute2/iproute2/+/6a77abab92516e65f07f8657fc4e384c4541ce0e] - -Signed-off-by: Dario Binacchi -Signed-off-by: Stephen Hemminger ---- - bridge/mst.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/bridge/mst.c b/bridge/mst.c -index 873ca536..c8f7e660 100644 ---- a/bridge/mst.c -+++ b/bridge/mst.c -@@ -4,6 +4,7 @@ - */ - - #include -+#include - #include - #include - --- -2.39.5 (Apple Git-154) - diff --git a/meta/recipes-connectivity/iproute2/iproute2/0003-bridge-mst-fix-a-further-musl-build-issue.patch b/meta/recipes-connectivity/iproute2/iproute2/0003-bridge-mst-fix-a-further-musl-build-issue.patch deleted file mode 100644 index 6a30f6dcf84..00000000000 --- a/meta/recipes-connectivity/iproute2/iproute2/0003-bridge-mst-fix-a-further-musl-build-issue.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 043ef90e2fa94397eb5c85330889ca4146a6d58a Mon Sep 17 00:00:00 2001 -From: Dario Binacchi -Date: Sun, 22 Sep 2024 16:50:11 +0200 -Subject: [PATCH] bridge: mst: fix a further musl build issue - -This patch fixes the following build errors: - -In file included from mst.c:11: -../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration - 80 | _PRINT_FUNC(tv, const struct timeval *) - | ^~~~~~~ -../include/json_print.h:50:37: note: in definition of macro '_PRINT_FUNC' - 50 | type value); \ - | ^~~~ -../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration - 80 | _PRINT_FUNC(tv, const struct timeval *) - | ^~~~~~~ -../include/json_print.h:55:45: note: in definition of macro '_PRINT_FUNC' - 55 | type value) \ - | ^~~~ -../include/json_print.h: In function 'print_tv': -../include/json_print.h:58:48: error: passing argument 5 of 'print_color_tv' from incompatible pointer type [-Wincompatible-pointer-types] - 58 | value); \ - | ^~~~~ - | | - | const struct timeval * -../include/json_print.h:80:1: note: in expansion of macro '_PRINT_FUNC' - 80 | _PRINT_FUNC(tv, const struct timeval *) - | ^~~~~~~~~~~ -../include/json_print.h:50:42: note: expected 'const struct timeval *' but argument is of type 'const struct timeval *' - 50 | type value); \ - | ^ -../include/json_print.h:80:1: note: in expansion of macro '_PRINT_FUNC' - 80 | _PRINT_FUNC(tv, const struct timeval *) - -Upstream-Status: Backport -[https://kernel.googlesource.com/pub/scm/network/iproute2/iproute2/+/043ef90e2fa94397eb5c85330889ca4146a6d58a] - -Signed-off-by: Dario Binacchi -Signed-off-by: Stephen Hemminger ---- - bridge/mst.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/bridge/mst.c b/bridge/mst.c -index c8f7e660..fccb7fd6 100644 ---- a/bridge/mst.c -+++ b/bridge/mst.c -@@ -4,6 +4,7 @@ - */ - - #include -+#include - #include - #include - #include --- -2.39.5 (Apple Git-154) - diff --git a/meta/recipes-connectivity/iproute2/iproute2_6.11.0.bb b/meta/recipes-connectivity/iproute2/iproute2_6.12.0.bb similarity index 92% rename from meta/recipes-connectivity/iproute2/iproute2_6.11.0.bb rename to meta/recipes-connectivity/iproute2/iproute2_6.12.0.bb index 652484a94d1..741d54799d5 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_6.11.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_6.12.0.bb @@ -13,14 +13,10 @@ DEPENDS = "flex-native bison-native iptables libcap" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-include-libnetlink.h-add-missing-include-for-htobe64.patch \ + file://0001-ip-rearrange-and-prune-header-files.patch \ " -SRC_URI:append:libc-musl = "\ - file://0002-bridge-mst-fix-a-musl-build-issue.patch \ - file://0003-bridge-mst-fix-a-further-musl-build-issue.patch \ - " - -SRC_URI[sha256sum] = "1f795398a04aeaacd06a8f6ace2cfd913c33fa5953ca99daae83bb5c534611c3" +SRC_URI[sha256sum] = "bbd141ef7b5d0127cc2152843ba61f274dc32814fa3e0f13e7d07a080bef53d9" inherit update-alternatives bash-completion pkgconfig From patchwork Fri Jan 3 10:45:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 54936 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 839D8C3DA4A for ; Fri, 3 Jan 2025 10:45:45 +0000 (UTC) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.groups.io with SMTP id smtpd.web10.28160.1735901136654706771 for ; Fri, 03 Jan 2025 02:45:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=a/PXEaxp; spf=pass (domain: gmail.com, ip: 209.85.221.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-3862b40a6e0so6725888f8f.0 for ; Fri, 03 Jan 2025 02:45:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735901135; x=1736505935; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RbcjbTY+Qr7PdplF0hkSPc40Rb8o6CRy0HuIEW/Mb7o=; b=a/PXEaxpeg7w0/rSuLmUUFQ4gmlyjJQXa6ijlxupClsgs5I/u/jHAakFr5vRyhh32q J80b1b7rQfj9chgNdbIUqEQAWr5d47ZMtFYFnTHNVJW4bE+5/ajMJ9XGLdW1QZ0GQ39i 7TpFOdQqsVPW9ysBkE0BAEcBGQB5/++7zTmur+mEuXYMXX7K6uqy+Wp5TqpKCjsxvLfW sI3X2wP/FlB5kPhT84OnQS+lARNtAd1ikbRqL6lWev0h7l7britMGlFtWiMkedsnKR76 3emqWZV7aGyio+5id542tNwulq/nzseQjTdrGK2ZvbMDp4HRbAH78mBs6u4H7gj+flTI Fm9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735901135; x=1736505935; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RbcjbTY+Qr7PdplF0hkSPc40Rb8o6CRy0HuIEW/Mb7o=; b=WMdRc5P2JDv0Gb+bXXqyH9kjxoNFIfcGNnGCwPEwmemmVukmvGtNsfiM5TeqB4qSJC WDXrwU0gejugDb/FraINbxdyCiVcuxwHTbAN93nWNy4K1B4BoSGpNWIn8xo6qVG1Ain4 OZQoyYPN90La9HBpyDQYkZgKseukh5qW5WqCSI0D5rsCtggMkg18X12/n8aXX6pxFDsW 6k+NvC6qlCo1JDzDc9c+3HHpp0EKz1v2ZXdPMh0VFUPXCmyJyL7DV1LKNjrOMBC41Kq5 S+uJrLPy1fhz1F9y4wUJD53kU82FKzydeMEiK1Ti6pWF2ILXsCzcLndtVzlCnwAP94FV tTBA== X-Gm-Message-State: AOJu0YzWaw2rkbjkGEmXn6x839rLWX5AAIz1ji62wKddGlaLz9Nomw3Z idHBRM0kaRDT0kJT2gJ29/5MuIth5QsVnzonSJD04nF4RQ5KrBQfbtJ1aw== X-Gm-Gg: ASbGncvT2vg1LVGWyE2pRX9FDal4IB2Ap3S0AFZ03h8ca/WlFP61wBbLlyrm6FTgxcs H6d4GNdWOIKuO1drGKRsELZGviVUxXg4XL4VQq3spD8r5jS3HctwhOMP5ZIx2qYclcFPqudfI7f TVphgqT9kovfEQ1WDzE+L0lJ9foGWOKXxMIiEfy2XtwRFgBdqFqhJTvceTwuA7oDZ8mzUyAFyWn 5U1aVJggvlCGNdVuVZxI1OpGdYGZwBUoZQxiG6JaPJcfPzCHfYtjG8UcgLtmPQP7aElpaOffhqI MmrswPM5L5QXPDlYKg== X-Google-Smtp-Source: AGHT+IH3PWnNcOe+6zkRcoEWwSEAsrI1Mzs/pyYj/0tjGBlGFqLvfrZ3yoVphsP7leltNy4WHPwC0w== X-Received: by 2002:a5d:5986:0:b0:385:f47b:1501 with SMTP id ffacd0b85a97d-38a221fa8fbmr38114333f8f.32.1735901134758; Fri, 03 Jan 2025 02:45:34 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43661289995sm476935865e9.36.2025.01.03.02.45.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 02:45:34 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 06/11] kbd: update 2.6.4 -> 2.7.1 Date: Fri, 3 Jan 2025 11:45:19 +0100 Message-Id: <20250103104524.4053846-6-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250103104524.4053846-1-alex.kanavin@gmail.com> References: <20250103104524.4053846-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 03 Jan 2025 10:45:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209337 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../0001-Remove-non-free-Agafari-fonts.patch | 73 ------------------- .../kbd/{kbd_2.6.4.bb => kbd_2.7.1.bb} | 12 +-- 2 files changed, 3 insertions(+), 82 deletions(-) delete mode 100644 meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch rename meta/recipes-core/kbd/{kbd_2.6.4.bb => kbd_2.7.1.bb} (84%) diff --git a/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch b/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch deleted file mode 100644 index de279b55f9e..00000000000 --- a/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch +++ /dev/null @@ -1,73 +0,0 @@ -From b757e6842f9631757f0d1a6b3833aabffa9ffeee Mon Sep 17 00:00:00 2001 -From: Alexey Gladkov -Date: Thu, 29 Feb 2024 17:38:37 +0100 -Subject: [PATCH] Remove non-free Agafari fonts - -Based on legal analysis, we are removing non-free fonts for now. If we -can change the license of these fonts, we will return them back. - -From: Stanislav Brabec -Date: Wed, 28 Feb 2024 16:47:54 +0100 -Subject: kbd: Legal problems of Agafari fonts - - The data/consolefonts/README.Ethiopic contains a notice: - Agafari: - Donated by the Ethiopian Science and Technology Commission - or and may be redistributed - for non-commercial use under Unix environments only. - - According to our legal review, it makes impossible to distribute these - fonts as part of any commercial products, and even makes it impossible to - distribute kbd sources as part of any commercial product services. - - Additionally, it makes the whole kbd package incompatible with GPL, so the - COPYING file (created during build of the tarball) cannot declare GPL - version 2. It also violates section 6 of GPL (no further restrictions). - - That is why several GNU/Linux distributions exclude Agafari from the - release. To be on a safe side, SUSE even decided to repack any source - tarballs before putting it to their servers. - - This was probably reported to the former kbd maintainer about 20 years ago, - but nothing changed over years. - - That is why I recommend removing Agafari fonts and removing the reference - to them from README.Ethiopic. Alternatively, you can ask the Ethiopian - Science and Technology Commission for re-licensing. - -Signed-off-by: Alexey Gladkov - -Upstream-Status: Backport [https://github.com/legionus/kbd/commit/b757e6842f9631757f0d1a6b3833aabffa9ffeee] - -[do_configure prepend added to remove binary files] - -Signed-off-by: Peter Marko ---- - data/consolefonts/Agafari-12.psfu | Bin 7989 -> 0 bytes - data/consolefonts/Agafari-14.psfu | Bin 9013 -> 0 bytes - data/consolefonts/Agafari-16.psfu | Bin 10037 -> 0 bytes - data/consolefonts/README.Ethiopic | 5 ----- - 4 files changed, 5 deletions(-) - delete mode 100644 data/consolefonts/Agafari-12.psfu - delete mode 100644 data/consolefonts/Agafari-14.psfu - delete mode 100644 data/consolefonts/Agafari-16.psfu - -diff --git a/data/consolefonts/README.Ethiopic b/data/consolefonts/README.Ethiopic -index 7502722..2810797 100644 ---- a/data/consolefonts/README.Ethiopic -+++ b/data/consolefonts/README.Ethiopic -@@ -14,11 +14,6 @@ Ethiopic fonts: - restrictions below: - - --Agafari: -- Donated by the Ethiopian Science and Technology Commission -- or and may be redistributed -- for non-commercial use under Unix environments only. -- - Goha and GohaClassic: - Donated by Yitna Firdyiwek of GohaTibeb Associates - and may be redistributed without restriction under the GNU GPL 2.0. --- -2.30.2 - diff --git a/meta/recipes-core/kbd/kbd_2.6.4.bb b/meta/recipes-core/kbd/kbd_2.7.1.bb similarity index 84% rename from meta/recipes-core/kbd/kbd_2.6.4.bb rename to meta/recipes-core/kbd/kbd_2.7.1.bb index 2331b51e595..9cff855b28c 100644 --- a/meta/recipes-core/kbd/kbd_2.6.4.bb +++ b/meta/recipes-core/kbd/kbd_2.7.1.bb @@ -24,12 +24,12 @@ RPROVIDES:${PN} = "console-tools" RCONFLICTS:${PN} = "console-tools" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ - file://0001-Remove-non-free-Agafari-fonts.patch \ " -SRC_URI[sha256sum] = "519f8d087aecca7e0a33cd084bef92c066eb19731666653dcc70c9d71aa40926" +SRC_URI[sha256sum] = "f167d899d92b56ccf12f6f49355173f93870a95f15d8aeebf5fdcd28a621aca8" -EXTRA_OECONF = "--disable-tests" +# 'gzip -n' is set due to https://github.com/legionus/kbd/issues/124 +EXTRA_OECONF = "--disable-tests --enable-compress='gzip -n'" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ " @@ -45,12 +45,6 @@ FILES:${PN}-unimaps = "${datadir}/unimaps" RRECOMMENDS:${PN}-keymaps = "${PN}-keymaps-pine" -# remove this when upgrading to newer version which has integrated -# https://github.com/legionus/kbd/commit/b757e6842f9631757f0d1a6b3833aabffa9ffeee -do_configure:prepend() { - rm -rf ${S}/data/consolefonts/Agafari-1* -} - do_install:append () { if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)}" = "yes" ] \ && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then From patchwork Fri Jan 3 10:45:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 54939 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EE69E7719B for ; Fri, 3 Jan 2025 10:45:45 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.groups.io with SMTP id smtpd.web11.27856.1735901137499722724 for ; Fri, 03 Jan 2025 02:45:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GuzfPvOl; spf=pass (domain: gmail.com, ip: 209.85.128.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-4361e89b6daso82660035e9.3 for ; Fri, 03 Jan 2025 02:45:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735901136; x=1736505936; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kWFNDLVMfDacxHB6aq1t9qYYfb75lTaU+ozAlk/ema8=; b=GuzfPvOlKdKv09Bek8sbjemcAEkg4n/iqb/gJkTO1bmZOLSN/1JvD0UHnBEvGzAoBF ovrqYWUR0xaxQaLNuMnN8h1q50EIIRhOA1BnT5tJPRiFVNiGBJqscQQn4HAy2D+gA1N1 t80m/QGNyvAr9FxD3a5FXgXwNw0wtU/6zcNDUi4KdjaS0KrraZ6ZMi+UTBActFBMdq+s lChHSDghdgcKxeQaTOCGqETQw2DVYsS1TBoVo865ekSkLMKXNshK82x65WLqgogHmC5p +DNQoFMK+HvcpDQrchoVsYKTbrv+ljVqZu5C9/dEnPqfOrnWiTQvAP47rBkHd/wVf9/B Rp6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735901136; x=1736505936; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kWFNDLVMfDacxHB6aq1t9qYYfb75lTaU+ozAlk/ema8=; b=QqiPBamNdtcrdHeEnoY7tE4UjS4t6STRoXAaDQTr9gWrODGSPyBB6mX03aLO2x/1qx zho+/RTG9shrEd5r+LGBpQVbfgKDidMHrgusJIATvoPBuZs+lcs5ynSoYCGGdSM2iwro kDOxv8pOkXVX1Dn/behAEzuFrRYuNN/Dx2mwuKBFBjHV7vzPpDcxW44DMjdVkae8kL7T QM48hVa3iKWC8NjsKp3IUFl+bW/Jt6WcsflxkNaIWlffTFnMYZStAyG2o8/KNZIYP5ne D4hwZawrE0fPxCIoH/xDC/OymqfVzRujUSETdjVGAs5kw+vMP7BpPmzcxHYZ6l9oFJXv xJqQ== X-Gm-Message-State: AOJu0YyzgKl5POHYNi7C36VVOLNgAQWSpjkbsAxWtMVIcGnhWBWBK7bB +CPkhrDYLaBNo2tIzQOcEjYeXBQ+NxyPaPlwB584ZHBzbft34DV1VTzFyg== X-Gm-Gg: ASbGncsfKpxcLmbe2khtPMLQ32F/D6M0Gu0z+ORe/+AguT50IDh3QccOd+Nix/McYQQ /SW2XS5qiMryzDeaXzd8ABi8iFa4VqZtSAGjjcuXL1KDfNgKdxxRWRa9bv36FdrSilV2s1LkqBi aRHghXuphy+nt+8Yb7o9Z+CFPEjA8BoTi6YP4oniHQsdG08sqFpLKQ5wJahkNPU0PAccVThOlL8 WUWVnBotUmTh6e24VKcdoip70FnLn74sR+2rVOPH9H3cDNSwjlePesWcRXXgPuNzsKfe4YTgwqG YQxK7Q+vxPAqJgWtLg== X-Google-Smtp-Source: AGHT+IHgqXD3v0LP5fYmmSlqFY/sqFPR9UnIqDeJbCPSoXY72VunQ1gvEigBS/mZppr265yZRqF5Yg== X-Received: by 2002:a05:6000:4715:b0:385:e2c4:1f8d with SMTP id ffacd0b85a97d-38a221f0f40mr41672767f8f.19.1735901135523; Fri, 03 Jan 2025 02:45:35 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43661289995sm476935865e9.36.2025.01.03.02.45.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 02:45:35 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 07/11] libdnf: backport a python 3.13.1 compatibility patch Date: Fri, 3 Jan 2025 11:45:20 +0100 Message-Id: <20250103104524.4053846-7-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250103104524.4053846-1-alex.kanavin@gmail.com> References: <20250103104524.4053846-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 03 Jan 2025 10:45:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209338 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- ...n-iterator-of-a-ConfigParser-section.patch | 76 +++++++++++++++++++ meta/recipes-devtools/libdnf/libdnf_0.73.4.bb | 1 + 2 files changed, 77 insertions(+) create mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-Fix-a-segfault-in-iterator-of-a-ConfigParser-section.patch diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Fix-a-segfault-in-iterator-of-a-ConfigParser-section.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Fix-a-segfault-in-iterator-of-a-ConfigParser-section.patch new file mode 100644 index 00000000000..64334e08fda --- /dev/null +++ b/meta/recipes-devtools/libdnf/libdnf/0001-Fix-a-segfault-in-iterator-of-a-ConfigParser-section.patch @@ -0,0 +1,76 @@ +From 18e69ca69a6a401922275d1e18bbaf96b84ca795 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Fri, 6 Dec 2024 18:01:16 +0100 +Subject: [PATCH] Fix a segfault in iterator of a ConfigParser section + +An iterator should return self on __iter__. + +So that this works: + + >>> it1 = iter(sectObj) + >>> it2 = iter(it1) + >>> it1 is it2 + True + +Previously, this iterator did not return self on __iter__, it was like this: + + class PreserveOrderMapStringStringIterator(object): + ... + def __iter__(self): + return _common_types.PreserveOrderMapStringStringIterator___iter__(self) + +And that returned a new Python object. + +This fixes https://bugzilla.redhat.com/2330562 by avoiding a second iterator object. + +My SWIG skills are close to zero, +perhaps this is not the best way to return self, but it seems to work. + +Upstream-Status: Backport [https://github.com/rpm-software-management/libdnf/commit/f3302a865b230e021e9defbcea978ed1290a9b2f] +Signed-off-by: Alexander Kanavin +--- + bindings/swig/common_types.i | 11 +++++++---- + bindings/swig/conf.i | 4 ---- + 2 files changed, 7 insertions(+), 8 deletions(-) + +diff --git a/bindings/swig/common_types.i b/bindings/swig/common_types.i +index c9ae798a..a1f90d9e 100644 +--- a/bindings/swig/common_types.i ++++ b/bindings/swig/common_types.i +@@ -63,10 +63,6 @@ template + class Iterator { + public: + Iterator(typename T::iterator _cur, typename T::iterator _end) : cur(_cur), end(_end) {} +- Iterator* __iter__() +- { +- return this; +- } + + typename T::iterator cur; + typename T::iterator end; +@@ -165,3 +161,10 @@ EXTEND_TEMPLATE_PreserveOrderMapIterator(std::string, std::string) + EXTEND_TEMPLATE_PreserveOrderMapIterator(std::string, libdnf::PreserveOrderMap) + + %exception; // beware this resets all exception handlers if you import this file after defining any ++ ++%pythoncode %{ ++def PreserveOrderMapStringStringIterator___iter__(self): ++ return self ++PreserveOrderMapStringStringIterator.__iter__ = PreserveOrderMapStringStringIterator___iter__ ++del PreserveOrderMapStringStringIterator___iter__ ++%} +diff --git a/bindings/swig/conf.i b/bindings/swig/conf.i +index b6a0ce88..2f77003f 100644 +--- a/bindings/swig/conf.i ++++ b/bindings/swig/conf.i +@@ -71,10 +71,6 @@ template + class Iterator { + public: + Iterator(typename T::iterator _cur, typename T::iterator _end) : cur(_cur), end(_end) {} +- Iterator* __iter__() +- { +- return this; +- } + + typename T::iterator cur; + typename T::iterator end; diff --git a/meta/recipes-devtools/libdnf/libdnf_0.73.4.bb b/meta/recipes-devtools/libdnf/libdnf_0.73.4.bb index 0817da7ca69..5b9e734e82d 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.73.4.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.73.4.bb @@ -11,6 +11,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p file://enable_test_data_dir_set.patch \ file://0001-drop-FindPythonInstDir.cmake.patch \ file://armarch.patch \ + file://0001-Fix-a-segfault-in-iterator-of-a-ConfigParser-section.patch \ " SRCREV = "79ed383cd5a822e6d8d9d549835383f5c5106204" From patchwork Fri Jan 3 10:45:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 54941 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99FF6E77199 for ; Fri, 3 Jan 2025 10:45:45 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.groups.io with SMTP id smtpd.web11.27858.1735901138616413175 for ; Fri, 03 Jan 2025 02:45:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=dBv9+VtY; spf=pass (domain: gmail.com, ip: 209.85.128.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-4363ae65100so125745765e9.0 for ; Fri, 03 Jan 2025 02:45:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735901137; x=1736505937; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BNLlLXn0BOixRX3k2ztrmOFHxpt+VD8T3+WeSBqgmVE=; b=dBv9+VtYIH0hJnoGhkguodUb6GhmdJaQydmAv/vfyVHXLqT3PntwZxqms6bbzzXDrK mk4o+5Q8CGXARTvhS1Hd1oKg+vU5osHpSXYmuwsFM8nNW/SdW2V02Dqqdct+enl+6u8T d37AC+ykwrLilQ3y01pyuEEWSygSOOcD3sKi6TlrSiwInQaMX5VunXrtbdjF+YDVlwII KhlUCPkFuKC3zKwPCrEZkXqFhwIjuuDrwCUmAKyxrc30eR3CwwZ3TPnxqJ9k0QHmm63g d9xartDhledCl7UUbfsKYl9IFWwdZEKI7OlDtBIiGUbNVGrCoOtl2BIm7Z5xJjR0WREC PqCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735901137; x=1736505937; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BNLlLXn0BOixRX3k2ztrmOFHxpt+VD8T3+WeSBqgmVE=; b=trtpw5ZIC8TxMXJNEvCja806vBDZFHrNJQ5MRz9+ru0zet1NSAiCYrZceX/bdXF4wq dMeiINqh1lewI0cYAzmEfwG1z5gj9r4PzOX5BME0n9IeZftIW+pZRV/wzl10s8k7OilZ rzCiuTCgKuGUjVkqZVGIH/AcBNQQe68CxHNr89eHp7n2Pdiu2NERgF6ChGVVvlvtcBJa dTQcmhSGMPeLNboj2xTysYjCyfELvF0apM/lG9NsFA7cpHQ2o/B/5TpPQ87xtxoVnO2T oHzUGWD30WY/B5eCSrlFI0ZYxDwsNGRvmWkZnk8AC+0CTv2tsfeZsqCUFwSz5c54E44p qA3Q== X-Gm-Message-State: AOJu0YxGhGUIgJnyEUSIkfrapR5c+jds8jnfhLq9yoCOzZnu4g4y1irH HC2ScwcKa3BjbPtpz2BUIG/VXYysHiOs+NWvAOS+wp7FTLhhOC/2T6uM9Q== X-Gm-Gg: ASbGncsORc5eaq22kxvMJS0u0m6gLFe4NYCf7ucQ9lVZzObbZN47mHt44RwcGPakbsw j145D7CZafZ0r6XG1ad/ml0iBPmzTXdX+csBhPmlPb4auDsaqkgL7NA5XvQCKOlQ+2yz6792G+E 81a9xPUNLqBjZ26ar6d9M4cDf5uCQsFZaKZ0oPJVYQwzxC4dTDGbZTQ1XpFtVtMUD6qpiGizUHL 0fR/8cAfsWmn9fm5nKoGREJPqb/LALrU5nZnvMjAM1s8Zdt0+9iFc7XKJQgJj3Q1Y4qkp26xTon qRI7c7I+NJROWN1DFw== X-Google-Smtp-Source: AGHT+IGdex7Y+s2RWYV5p5cKeetWKRkPvdtDnhS3ye36PrVYAlfNdI+ae4sifiTxoFx0VSh/utXsBg== X-Received: by 2002:a05:600c:35cb:b0:436:1baa:de1c with SMTP id 5b1f17b1804b1-4366854c186mr409817365e9.13.1735901136513; Fri, 03 Jan 2025 02:45:36 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43661289995sm476935865e9.36.2025.01.03.02.45.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 02:45:36 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 08/11] python3: update 3.13.0 -> 3.13.1 Date: Fri, 3 Jan 2025 11:45:21 +0100 Message-Id: <20250103104524.4053846-8-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250103104524.4053846-1-alex.kanavin@gmail.com> References: <20250103104524.4053846-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 03 Jan 2025 10:45:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209339 From: Alexander Kanavin Drop fix-armv5.patch as issue resolved upstream. Signed-off-by: Alexander Kanavin --- ...shebang-overflow-on-python-config.py.patch | 6 +- ...r-OpenSSL-3.4-and-add-it-to-multissl.patch | 110 +++++++++--------- ...e-stdin-I-O-errors-same-way-as-maste.patch | 2 +- ...-use-prefix-value-from-build-configu.patch | 6 +- ...-qemu-wrapper-when-gathering-profile.patch | 4 +- ...sts-due-to-load-variability-on-YP-AB.patch | 16 +-- ...est_sysconfig-for-posix_user-purelib.patch | 6 +- ..._fileno-test-due-to-load-variability.patch | 4 +- ...01-ssl-Raise-OSError-for-ERR_LIB_SYS.patch | 11 +- ...g.py-use-platlibdir-also-for-purelib.patch | 4 +- ...ctive_children-skip-problematic-test.patch | 6 +- ...pes.test_find-skip-without-tools-sdk.patch | 2 +- ...-test_deadlock-skip-problematic-test.patch | 4 +- ...le.py-correct-the-test-output-format.patch | 6 +- ...t_readline-skip-limited-history-test.patch | 2 +- ...-test_shutdown-skip-problematic-test.patch | 2 +- ...orlines-skip-due-to-load-variability.patch | 2 +- .../python/python3/crosspythonpath.patch | 8 +- .../python3/deterministic_imports.patch | 2 +- .../python/python3/fix-armv5.patch | 65 ----------- .../python/python3/makerace.patch | 6 +- .../{python3_3.13.0.bb => python3_3.13.1.bb} | 5 +- 22 files changed, 106 insertions(+), 173 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3/fix-armv5.patch rename meta/recipes-devtools/python/{python3_3.13.0.bb => python3_3.13.1.bb} (99%) diff --git a/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch b/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch index d2246327f21..c9ddb1cdbe4 100644 --- a/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch +++ b/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch @@ -1,4 +1,4 @@ -From 6b111a328c1c57b1580d63894b2b5d337316f6d4 Mon Sep 17 00:00:00 2001 +From f2e5221042a30008af1c005114fd1ba462ee0b7a Mon Sep 17 00:00:00 2001 From: Paulo Neves Date: Tue, 7 Jun 2022 16:16:41 +0200 Subject: [PATCH] Avoid shebang overflow on python-config.py @@ -16,10 +16,10 @@ Upstream-Status: Denied [distribution] 1 file changed, 2 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 9ec3a71..f7d5382 100644 +index 98991cd..b94374b 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2606,6 +2606,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh +@@ -2596,6 +2596,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh @ # Substitution happens here, as the completely-expanded BINDIR @ # is not available in configure sed -e "s,@EXENAME@,$(EXENAME)," < $(srcdir)/Misc/python-config.in >python-config.py diff --git a/meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch b/meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch index d8ad803d50e..53560c1910b 100644 --- a/meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch +++ b/meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch @@ -1,4 +1,4 @@ -From db5c5763f3e3172f1dd011355b41469770dafc0f Mon Sep 17 00:00:00 2001 +From 7d2a358ca19320bef6e7ebce8b17183ba45ac005 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Thu, 28 Nov 2024 13:29:27 +0100 Subject: [PATCH] gh-127330: Update for OpenSSL 3.4 & document+improve the @@ -31,10 +31,10 @@ Signed-off-by: Peter Marko rename Modules/{_ssl_data_31.h => _ssl_data_34.h} (92%) diff --git a/Modules/_ssl.c b/Modules/_ssl.c -index b6b5ebf094c..e5b8bf21002 100644 +index a7a278d..c988643 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c -@@ -122,7 +122,7 @@ static void _PySSLFixErrno(void) { +@@ -121,7 +121,7 @@ static void _PySSLFixErrno(void) { /* Include generated data (error codes) */ #if (OPENSSL_VERSION_NUMBER >= 0x30100000L) @@ -44,7 +44,7 @@ index b6b5ebf094c..e5b8bf21002 100644 #include "_ssl_data_300.h" #elif (OPENSSL_VERSION_NUMBER >= 0x10101000L) diff --git a/Modules/_ssl_data_111.h b/Modules/_ssl_data_111.h -index 093c786e6a2..061fac2bd58 100644 +index 093c786..061fac2 100644 --- a/Modules/_ssl_data_111.h +++ b/Modules/_ssl_data_111.h @@ -1,4 +1,6 @@ @@ -56,7 +56,7 @@ index 093c786e6a2..061fac2bd58 100644 #ifdef ERR_LIB_ASN1 {"ASN1", ERR_LIB_ASN1}, diff --git a/Modules/_ssl_data_300.h b/Modules/_ssl_data_300.h -index dc66731f6b6..b687ce43c77 100644 +index dc66731..b687ce4 100644 --- a/Modules/_ssl_data_300.h +++ b/Modules/_ssl_data_300.h @@ -1,4 +1,7 @@ @@ -72,7 +72,7 @@ diff --git a/Modules/_ssl_data_31.h b/Modules/_ssl_data_34.h similarity index 92% rename from Modules/_ssl_data_31.h rename to Modules/_ssl_data_34.h -index c589c501f4e..d4af3e1c1fa 100644 +index c589c50..d4af3e1 100644 --- a/Modules/_ssl_data_31.h +++ b/Modules/_ssl_data_34.h @@ -1,4 +1,6 @@ @@ -1078,7 +1078,7 @@ index c589c501f4e..d4af3e1c1fa 100644 #ifdef SSL_R_TLSV1_ALERT_ACCESS_DENIED {"TLSV1_ALERT_ACCESS_DENIED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_ACCESS_DENIED}, #else -@@ -7470,6 +7982,16 @@ static struct py_ssl_error_code error_codes[] = { +@@ -7470,11 +7982,26 @@ static struct py_ssl_error_code error_codes[] = { #else {"TLSV1_ALERT_DECODE_ERROR", 20, 1050}, #endif @@ -1087,57 +1087,60 @@ index c589c501f4e..d4af3e1c1fa 100644 + #else + {"TLSV1_ALERT_DECODE_ERROR", 20, 1050}, + #endif + #ifdef SSL_R_TLSV1_ALERT_DECRYPTION_FAILED + {"TLSV1_ALERT_DECRYPTION_FAILED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_DECRYPTION_FAILED}, + #else + {"TLSV1_ALERT_DECRYPTION_FAILED", 20, 1021}, + #endif + #ifdef SSL_R_TLSV1_ALERT_DECRYPTION_FAILED + {"TLSV1_ALERT_DECRYPTION_FAILED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_DECRYPTION_FAILED}, + #else + {"TLSV1_ALERT_DECRYPTION_FAILED", 20, 1021}, + #endif - #ifdef SSL_R_TLSV1_ALERT_DECRYPTION_FAILED - {"TLSV1_ALERT_DECRYPTION_FAILED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_DECRYPTION_FAILED}, - #else -@@ -7480,6 +8002,16 @@ static struct py_ssl_error_code error_codes[] = { - #else - {"TLSV1_ALERT_DECRYPT_ERROR", 20, 1051}, - #endif + #ifdef SSL_R_TLSV1_ALERT_DECRYPT_ERROR + {"TLSV1_ALERT_DECRYPT_ERROR", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_DECRYPT_ERROR}, + #else + {"TLSV1_ALERT_DECRYPT_ERROR", 20, 1051}, + #endif + #ifdef SSL_R_TLSV1_ALERT_DECRYPT_ERROR + {"TLSV1_ALERT_DECRYPT_ERROR", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_DECRYPT_ERROR}, + #else +@@ -7485,6 +8012,16 @@ static struct py_ssl_error_code error_codes[] = { + #else + {"TLSV1_ALERT_EXPORT_RESTRICTION", 20, 1060}, + #endif + #ifdef SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION + {"TLSV1_ALERT_EXPORT_RESTRICTION", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION}, + #else + {"TLSV1_ALERT_EXPORT_RESTRICTION", 20, 1060}, + #endif - #ifdef SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION - {"TLSV1_ALERT_EXPORT_RESTRICTION", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION}, - #else -@@ -7490,6 +8022,16 @@ static struct py_ssl_error_code error_codes[] = { - #else - {"TLSV1_ALERT_INAPPROPRIATE_FALLBACK", 20, 1086}, - #endif + #ifdef SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK + {"TLSV1_ALERT_INAPPROPRIATE_FALLBACK", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK}, + #else + {"TLSV1_ALERT_INAPPROPRIATE_FALLBACK", 20, 1086}, + #endif + #ifdef SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK + {"TLSV1_ALERT_INAPPROPRIATE_FALLBACK", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK}, + #else +@@ -7495,11 +8032,36 @@ static struct py_ssl_error_code error_codes[] = { + #else + {"TLSV1_ALERT_INSUFFICIENT_SECURITY", 20, 1071}, + #endif + #ifdef SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY + {"TLSV1_ALERT_INSUFFICIENT_SECURITY", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY}, + #else + {"TLSV1_ALERT_INSUFFICIENT_SECURITY", 20, 1071}, + #endif - #ifdef SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY - {"TLSV1_ALERT_INSUFFICIENT_SECURITY", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY}, - #else -@@ -7500,6 +8042,26 @@ static struct py_ssl_error_code error_codes[] = { - #else - {"TLSV1_ALERT_INTERNAL_ERROR", 20, 1080}, - #endif + #ifdef SSL_R_TLSV1_ALERT_INTERNAL_ERROR + {"TLSV1_ALERT_INTERNAL_ERROR", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_INTERNAL_ERROR}, + #else + {"TLSV1_ALERT_INTERNAL_ERROR", 20, 1080}, + #endif + #ifdef SSL_R_TLSV1_ALERT_INTERNAL_ERROR + {"TLSV1_ALERT_INTERNAL_ERROR", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_INTERNAL_ERROR}, + #else + {"TLSV1_ALERT_INTERNAL_ERROR", 20, 1080}, + #endif + #ifdef SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL + {"TLSV1_ALERT_NO_APPLICATION_PROTOCOL", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL}, + #else @@ -1156,7 +1159,7 @@ index c589c501f4e..d4af3e1c1fa 100644 #ifdef SSL_R_TLSV1_ALERT_NO_RENEGOTIATION {"TLSV1_ALERT_NO_RENEGOTIATION", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_NO_RENEGOTIATION}, #else -@@ -7510,21 +8072,56 @@ static struct py_ssl_error_code error_codes[] = { +@@ -7510,6 +8072,16 @@ static struct py_ssl_error_code error_codes[] = { #else {"TLSV1_ALERT_PROTOCOL_VERSION", 20, 1070}, #endif @@ -1165,26 +1168,23 @@ index c589c501f4e..d4af3e1c1fa 100644 + #else + {"TLSV1_ALERT_PROTOCOL_VERSION", 20, 1070}, + #endif - #ifdef SSL_R_TLSV1_ALERT_RECORD_OVERFLOW - {"TLSV1_ALERT_RECORD_OVERFLOW", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_RECORD_OVERFLOW}, - #else - {"TLSV1_ALERT_RECORD_OVERFLOW", 20, 1022}, - #endif + #ifdef SSL_R_TLSV1_ALERT_RECORD_OVERFLOW + {"TLSV1_ALERT_RECORD_OVERFLOW", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_RECORD_OVERFLOW}, + #else + {"TLSV1_ALERT_RECORD_OVERFLOW", 20, 1022}, + #endif + #ifdef SSL_R_TLSV1_ALERT_RECORD_OVERFLOW + {"TLSV1_ALERT_RECORD_OVERFLOW", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_RECORD_OVERFLOW}, + #else +@@ -7520,11 +8092,36 @@ static struct py_ssl_error_code error_codes[] = { + #else + {"TLSV1_ALERT_UNKNOWN_CA", 20, 1048}, + #endif + #ifdef SSL_R_TLSV1_ALERT_UNKNOWN_CA + {"TLSV1_ALERT_UNKNOWN_CA", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_UNKNOWN_CA}, + #else + {"TLSV1_ALERT_UNKNOWN_CA", 20, 1048}, + #endif - #ifdef SSL_R_TLSV1_ALERT_UNKNOWN_CA - {"TLSV1_ALERT_UNKNOWN_CA", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_UNKNOWN_CA}, - #else - {"TLSV1_ALERT_UNKNOWN_CA", 20, 1048}, - #endif + #ifdef SSL_R_TLSV1_ALERT_UNKNOWN_PSK_IDENTITY + {"TLSV1_ALERT_UNKNOWN_PSK_IDENTITY", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_UNKNOWN_PSK_IDENTITY}, + #else @@ -1213,7 +1213,7 @@ index c589c501f4e..d4af3e1c1fa 100644 #ifdef SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE {"TLSV1_BAD_CERTIFICATE_HASH_VALUE", ERR_LIB_SSL, SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE}, #else -@@ -7535,6 +8132,16 @@ static struct py_ssl_error_code error_codes[] = { +@@ -7535,11 +8132,26 @@ static struct py_ssl_error_code error_codes[] = { #else {"TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE", 20, 1113}, #endif @@ -1222,30 +1222,35 @@ index c589c501f4e..d4af3e1c1fa 100644 + #else + {"TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE", 20, 1113}, + #endif + #ifdef SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE + {"TLSV1_CERTIFICATE_UNOBTAINABLE", ERR_LIB_SSL, SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE}, + #else + {"TLSV1_CERTIFICATE_UNOBTAINABLE", 20, 1111}, + #endif + #ifdef SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE + {"TLSV1_CERTIFICATE_UNOBTAINABLE", ERR_LIB_SSL, SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE}, + #else + {"TLSV1_CERTIFICATE_UNOBTAINABLE", 20, 1111}, + #endif - #ifdef SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE - {"TLSV1_CERTIFICATE_UNOBTAINABLE", ERR_LIB_SSL, SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE}, - #else -@@ -7545,6 +8152,16 @@ static struct py_ssl_error_code error_codes[] = { - #else - {"TLSV1_UNRECOGNIZED_NAME", 20, 1112}, - #endif + #ifdef SSL_R_TLSV1_UNRECOGNIZED_NAME + {"TLSV1_UNRECOGNIZED_NAME", ERR_LIB_SSL, SSL_R_TLSV1_UNRECOGNIZED_NAME}, + #else + {"TLSV1_UNRECOGNIZED_NAME", 20, 1112}, + #endif + #ifdef SSL_R_TLSV1_UNRECOGNIZED_NAME + {"TLSV1_UNRECOGNIZED_NAME", ERR_LIB_SSL, SSL_R_TLSV1_UNRECOGNIZED_NAME}, + #else +@@ -7550,6 +8162,11 @@ static struct py_ssl_error_code error_codes[] = { + #else + {"TLSV1_UNSUPPORTED_EXTENSION", 20, 1110}, + #endif + #ifdef SSL_R_TLSV1_UNSUPPORTED_EXTENSION + {"TLSV1_UNSUPPORTED_EXTENSION", ERR_LIB_SSL, SSL_R_TLSV1_UNSUPPORTED_EXTENSION}, + #else + {"TLSV1_UNSUPPORTED_EXTENSION", 20, 1110}, + #endif - #ifdef SSL_R_TLSV1_UNSUPPORTED_EXTENSION - {"TLSV1_UNSUPPORTED_EXTENSION", ERR_LIB_SSL, SSL_R_TLSV1_UNSUPPORTED_EXTENSION}, + #ifdef SSL_R_TLS_ILLEGAL_EXPORTER_LABEL + {"TLS_ILLEGAL_EXPORTER_LABEL", ERR_LIB_SSL, SSL_R_TLS_ILLEGAL_EXPORTER_LABEL}, #else @@ -7665,6 +8282,11 @@ static struct py_ssl_error_code error_codes[] = { #else @@ -1359,7 +1364,7 @@ index c589c501f4e..d4af3e1c1fa 100644 {"WRONG_LOOKUP_TYPE", ERR_LIB_X509, X509_R_WRONG_LOOKUP_TYPE}, #else diff --git a/Tools/c-analyzer/cpython/_parser.py b/Tools/c-analyzer/cpython/_parser.py -index 21be53e7884..a08b32fa45d 100644 +index 12010f0..104cf22 100644 --- a/Tools/c-analyzer/cpython/_parser.py +++ b/Tools/c-analyzer/cpython/_parser.py @@ -70,9 +70,7 @@ Python/thread_pthread.h @@ -1374,7 +1379,7 @@ index 21be53e7884..a08b32fa45d 100644 Modules/unicodedata_db.h Modules/unicodename_db.h diff --git a/Tools/ssl/make_ssl_data.py b/Tools/ssl/make_ssl_data.py -index 9860871..0cd05c7 100755 +index 9860871..982d05a 100755 --- a/Tools/ssl/make_ssl_data.py +++ b/Tools/ssl/make_ssl_data.py @@ -5,9 +5,28 @@ This script should be called *manually* when we want to upgrade SSLError @@ -1447,6 +1452,3 @@ index eae0e0c..fb06f63 100755 ] LIBRESSL_OLD_VERSIONS = [ --- -2.30.2 - diff --git a/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch b/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch index 84ad2abb0bc..05a313da83f 100644 --- a/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch +++ b/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch @@ -1,4 +1,4 @@ -From 129ee75863081d9e3418acca3df1e47667f671ad Mon Sep 17 00:00:00 2001 +From a92faf6b65f4d463f15c43270712e57f14868adc Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 16 Sep 2021 16:35:37 +0200 Subject: [PATCH] Lib/pty.py: handle stdin I/O errors same way as master I/O diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch index 45094481a8f..674bec0a8b6 100644 --- a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch +++ b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch @@ -1,4 +1,4 @@ -From 3f4f3e917950e286d5729ea949ca342995eb3c3e Mon Sep 17 00:00:00 2001 +From 623c4fa3b21851345d50f52a4199075a27b2049e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 17 Nov 2023 14:26:32 +0100 Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 5 insertions(+) diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index f8e1c7d..0882526 100644 +index 03dc4e8..fde0423 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py -@@ -481,6 +481,11 @@ def _init_config_vars(): +@@ -494,6 +494,11 @@ def _init_config_vars(): _CONFIG_VARS['VPATH'] = sys._vpath if os.name == 'posix': _init_posix(_CONFIG_VARS) diff --git a/meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch b/meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch index 508754286fd..64305e4ebbd 100644 --- a/meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch +++ b/meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch @@ -1,4 +1,4 @@ -From 701720a5bab5b42fd7520fd9dd95fd2c7e42c186 Mon Sep 17 00:00:00 2001 +From 20eecb53df3eadf06870b2af7bbd3d8c133cec65 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 30 Jan 2019 12:41:04 +0100 Subject: [PATCH] Makefile.pre: use qemu wrapper when gathering profile data @@ -10,7 +10,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index f9932dd..be1b9ea 100644 +index 03ca4cb..c90d31c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -751,8 +751,7 @@ profile-run-stamp: diff --git a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch b/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch index 230e847d2bf..41310b52603 100644 --- a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch +++ b/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch @@ -1,4 +1,4 @@ -From 8828a52ebace98199569404f01174398bcc64a00 Mon Sep 17 00:00:00 2001 +From 73135b415fd4da5c1c034af8ad91bf1b9f50e3ae Mon Sep 17 00:00:00 2001 From: Yi Fan Yu Date: Thu, 1 Apr 2021 13:08:37 -0700 Subject: [PATCH] Skip failing tests due to load variability on YP AB @@ -23,10 +23,10 @@ Signed-off-by: Trevor Gamblin 2 files changed, 5 insertions(+) diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py -index 5dae370..23eb971 100644 +index ce93d94..76e1c50 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py -@@ -682,6 +682,7 @@ class _TestProcess(BaseTestCase): +@@ -688,6 +688,7 @@ class _TestProcess(BaseTestCase): close_queue(q) @support.requires_resource('walltime') @@ -34,7 +34,7 @@ index 5dae370..23eb971 100644 def test_many_processes(self): if self.TYPE == 'threads': self.skipTest('test not appropriate for {}'.format(self.TYPE)) -@@ -2083,6 +2084,7 @@ class _TestBarrier(BaseTestCase): +@@ -2211,6 +2212,7 @@ class _TestBarrier(BaseTestCase): except threading.BrokenBarrierError: results.append(True) @@ -42,7 +42,7 @@ index 5dae370..23eb971 100644 def test_timeout(self): """ Test wait(timeout) -@@ -5171,6 +5173,7 @@ class TestWait(unittest.TestCase): +@@ -5299,6 +5301,7 @@ class TestWait(unittest.TestCase): time.sleep(period) @support.requires_resource('walltime') @@ -51,10 +51,10 @@ index 5dae370..23eb971 100644 from multiprocessing.connection import wait diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py -index 293799f..1dbb623 100644 +index d368f08..4a26c22 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py -@@ -504,6 +504,7 @@ class TimeTestCase(unittest.TestCase): +@@ -539,6 +539,7 @@ class TimeTestCase(unittest.TestCase): @unittest.skipIf( support.is_wasi, "process_time not available on WASI" ) @@ -62,7 +62,7 @@ index 293799f..1dbb623 100644 def test_process_time(self): # process_time() should not include time spend during a sleep start = time.process_time() -@@ -517,6 +518,7 @@ class TimeTestCase(unittest.TestCase): +@@ -552,6 +553,7 @@ class TimeTestCase(unittest.TestCase): self.assertTrue(info.monotonic) self.assertFalse(info.adjustable) diff --git a/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch b/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch index b967a36e491..917981dcf8e 100644 --- a/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch +++ b/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch @@ -1,4 +1,4 @@ -From 5bf5aa6eae1fa3eed66893e51a1858ab481426b4 Mon Sep 17 00:00:00 2001 +From e90044e2c40f52b97b5f4e07503bf3229d7ad94c Mon Sep 17 00:00:00 2001 From: Wentao Zhang Date: Mon, 20 Mar 2023 13:39:52 +0800 Subject: [PATCH] Update test_sysconfig for posix_user purelib @@ -22,10 +22,10 @@ Signed-off-by: Wentao Zhang 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py -index 1ade492..4e94889 100644 +index bf53413..0c76388 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py -@@ -414,7 +414,7 @@ class TestSysConfig(unittest.TestCase): +@@ -423,7 +423,7 @@ class TestSysConfig(unittest.TestCase): expected = os.path.normpath(global_path.replace(base, user, 1)) # bpo-44860: platlib of posix_user doesn't use sys.platlibdir, # whereas posix_prefix does. diff --git a/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch b/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch index ea103bc8341..a27a3bafc82 100644 --- a/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch +++ b/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch @@ -1,4 +1,4 @@ -From c5bdd39f8ebc4e6c58a47d7e424eac028eddb4ff Mon Sep 17 00:00:00 2001 +From 05f73d0fb156a64aa941bbe47fdcfe28a4858a77 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Fri, 15 Sep 2023 08:48:33 -0400 Subject: [PATCH] skip no_stdout_fileno test due to load variability @@ -16,7 +16,7 @@ Signed-off-by: Trevor Gamblin 1 file changed, 1 insertion(+) diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py -index c5394de..ed17fb6 100644 +index 3a55319..31094e5 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -2435,6 +2435,7 @@ class PtyTests(unittest.TestCase): diff --git a/meta/recipes-devtools/python/python3/0001-ssl-Raise-OSError-for-ERR_LIB_SYS.patch b/meta/recipes-devtools/python/python3/0001-ssl-Raise-OSError-for-ERR_LIB_SYS.patch index 18e0f208c7c..8ed419aec26 100644 --- a/meta/recipes-devtools/python/python3/0001-ssl-Raise-OSError-for-ERR_LIB_SYS.patch +++ b/meta/recipes-devtools/python/python3/0001-ssl-Raise-OSError-for-ERR_LIB_SYS.patch @@ -1,4 +1,4 @@ -From 11e0523eb363b7def4bc64d24a04e88d8670a691 Mon Sep 17 00:00:00 2001 +From a3931b183859623fe1b752ac99c846ea87d41e16 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Thu, 28 Nov 2024 13:32:30 +0100 Subject: [PATCH] ssl: Raise OSError for ERR_LIB_SYS @@ -19,10 +19,10 @@ Signed-off-by: Peter Marko 1 file changed, 10 insertions(+) diff --git a/Modules/_ssl.c b/Modules/_ssl.c -index e5b8bf21002..a243ba4b9bc 100644 +index c988643..0d41a31 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c -@@ -667,6 +667,11 @@ PySSL_SetError(PySSLSocket *sslsock, const char *filename, int lineno) +@@ -661,6 +661,11 @@ PySSL_SetError(PySSLSocket *sslsock, const char *filename, int lineno) ERR_GET_REASON(e) == SSL_R_CERTIFICATE_VERIFY_FAILED) { type = state->PySSLCertVerificationErrorObject; } @@ -34,7 +34,7 @@ index e5b8bf21002..a243ba4b9bc 100644 p = PY_SSL_ERROR_SYSCALL; } break; -@@ -692,6 +697,11 @@ PySSL_SetError(PySSLSocket *sslsock, const char *filename, int lineno) +@@ -686,6 +691,11 @@ PySSL_SetError(PySSLSocket *sslsock, const char *filename, int lineno) errstr = "EOF occurred in violation of protocol"; } #endif @@ -46,6 +46,3 @@ index e5b8bf21002..a243ba4b9bc 100644 break; } default: --- -2.30.2 - diff --git a/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch b/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch index b9c68a98d70..a66edecd815 100644 --- a/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch +++ b/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch @@ -1,4 +1,4 @@ -From bbcb17dc1ed283f41c8cd94d39f70898f0c45583 Mon Sep 17 00:00:00 2001 +From 8d100d159964f5a256bcb4c3d87b405efdb5e8c6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 12 Sep 2021 21:44:36 +0200 Subject: [PATCH] sysconfig.py: use platlibdir also for purelib @@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index 80aef34..f8e1c7d 100644 +index ec3b638..03dc4e8 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py @@ -29,7 +29,7 @@ _INSTALL_SCHEMES = { diff --git a/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch index 7749fcbe7df..9bdb9b35535 100644 --- a/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch +++ b/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch @@ -1,4 +1,4 @@ -From 540765b148d942a2339affa6c0d11445e9d0f26c Mon Sep 17 00:00:00 2001 +From fef728d8fdc9f4255eeb6814682964c38197ac7e Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Thu, 13 Jun 2024 10:54:31 -0400 Subject: [PATCH] test_active_children: skip problematic test @@ -14,10 +14,10 @@ Signed-off-by: Trevor Gamblin 1 file changed, 1 insertion(+) diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py -index 23eb971..b1295b2 100644 +index 76e1c50..831cd3d 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py -@@ -579,6 +579,7 @@ class _TestProcess(BaseTestCase): +@@ -585,6 +585,7 @@ class _TestProcess(BaseTestCase): self.assertTrue(type(cpus) is int) self.assertTrue(cpus >= 1) diff --git a/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch b/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch index 68e277d662e..cdff81d03a3 100644 --- a/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch +++ b/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch @@ -1,4 +1,4 @@ -From 0e9d0c58e77ef540d9601ce84a1aa79d9ce6ee9b Mon Sep 17 00:00:00 2001 +From 796e70ec13825fc6a7f1a8fbe2f75f4e0962f387 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Fri, 18 Jun 2021 11:56:50 -0700 Subject: [PATCH] test_ctypes.test_find: skip without tools-sdk diff --git a/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch index 3336e2913a1..373e882d799 100644 --- a/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch +++ b/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch @@ -1,4 +1,4 @@ -From 5a44f74549b32395109342e9299510c32db71068 Mon Sep 17 00:00:00 2001 +From 41ad1218909f2292b2b1f88fc6140377a7b1277c Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Wed, 12 Jun 2024 10:29:03 -0400 Subject: [PATCH] test_deadlock: skip problematic test @@ -14,7 +14,7 @@ Signed-off-by: Trevor Gamblin 1 file changed, 1 insertion(+) diff --git a/Lib/test/test_concurrent_futures/test_deadlock.py b/Lib/test/test_concurrent_futures/test_deadlock.py -index 3c30c45..008d6c0 100644 +index dcc1d68..35261c0 100644 --- a/Lib/test/test_concurrent_futures/test_deadlock.py +++ b/Lib/test/test_concurrent_futures/test_deadlock.py @@ -90,6 +90,7 @@ class ErrorAtUnpickle(object): diff --git a/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch b/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch index 7f03cf105f4..53f70b77eaa 100644 --- a/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch +++ b/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch @@ -1,4 +1,4 @@ -From c1f3cf625c0f011060ddaa2a4096f6aa13dd1ee6 Mon Sep 17 00:00:00 2001 +From fbc4796a9684c7adfdf450bfa71f046d23876f8c Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Mon, 5 Aug 2019 15:57:39 +0800 Subject: [PATCH] test_locale.py: correct the test output format @@ -31,10 +31,10 @@ Signed-off-by: Mingli Yu 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py -index da4bd79..fd9e67d 100644 +index 00e93d8..97cf4c2 100644 --- a/Lib/test/test_locale.py +++ b/Lib/test/test_locale.py -@@ -568,7 +568,7 @@ class TestMiscellaneous(unittest.TestCase): +@@ -572,7 +572,7 @@ class TestMiscellaneous(unittest.TestCase): self.skipTest('test needs Turkish locale') loc = locale.getlocale(locale.LC_CTYPE) if verbose: diff --git a/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch b/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch index d63c73e3340..b7d4dce2e7d 100644 --- a/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch +++ b/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch @@ -1,4 +1,4 @@ -From 1a0a145261ba4f97aaff3c0c656ac2e0ad9695a8 Mon Sep 17 00:00:00 2001 +From 6e1ffac835f9fca3a3d4db65eb66b0669a906596 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Tue, 13 Aug 2024 11:07:05 -0400 Subject: [PATCH] test_readline: skip limited history test diff --git a/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch index 4e284de6137..ded23117b22 100644 --- a/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch +++ b/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch @@ -1,4 +1,4 @@ -From b678363156b5d40e09c1d138840180e3ddc7d20b Mon Sep 17 00:00:00 2001 +From a2d80a1d57eea318158c2dbc42acfebb8fe1b1e3 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Wed, 8 May 2024 11:58:09 -0400 Subject: [PATCH] test_shutdown: skip problematic test diff --git a/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch b/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch index b4f873fd721..6cfe85c38ca 100644 --- a/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch +++ b/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch @@ -1,4 +1,4 @@ -From 9f252a691cd335341938489da32d6e2d4620d8ca Mon Sep 17 00:00:00 2001 +From 5f459b34dc249a375c8bc4ce3c9f47dc1f360b9c Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Fri, 6 Oct 2023 10:59:44 -0400 Subject: [PATCH] test_storlines: skip due to load variability diff --git a/meta/recipes-devtools/python/python3/crosspythonpath.patch b/meta/recipes-devtools/python/python3/crosspythonpath.patch index f18898e4c4f..f81235e3bc0 100644 --- a/meta/recipes-devtools/python/python3/crosspythonpath.patch +++ b/meta/recipes-devtools/python/python3/crosspythonpath.patch @@ -1,4 +1,4 @@ -From 8840438e73e43b99bc9c83896a5f950e4259738f Mon Sep 17 00:00:00 2001 +From d2c040f712d4cdb6327dcacb38a2f024e175a30d Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Date: Tue, 18 Nov 2014 03:35:33 -0500 Subject: [PATCH] configure.ac: add CROSSPYTHONPATH into PYTHONPATH for @@ -19,15 +19,15 @@ Signed-off-by: Ricardo Ribalda 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 58f5407..5101806 100644 +index a764028..9506859 100644 --- a/configure.ac +++ b/configure.ac @@ -164,7 +164,7 @@ AC_ARG_WITH([build-python], dnl Build Python interpreter is used for regeneration and freezing. ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python PYTHON_FOR_FREEZE="$with_build_python" -- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python -+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python +- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) _PYTHON_SYSCONFIGDATA_PATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`) '$with_build_python ++ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) _PYTHON_SYSCONFIGDATA_PATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`) '$with_build_python AC_MSG_RESULT([$with_build_python]) ], [ AS_VAR_IF([cross_compiling], [yes], diff --git a/meta/recipes-devtools/python/python3/deterministic_imports.patch b/meta/recipes-devtools/python/python3/deterministic_imports.patch index 61f136ef42a..53c0ac7c55d 100644 --- a/meta/recipes-devtools/python/python3/deterministic_imports.patch +++ b/meta/recipes-devtools/python/python3/deterministic_imports.patch @@ -1,4 +1,4 @@ -From 0a02e3b85176a5ce4dd98830bb65dac8596142e9 Mon Sep 17 00:00:00 2001 +From e21757dd4bd4fff03184e95c9cd8ed5b34c00b9e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 27 May 2022 17:05:44 +0100 Subject: [PATCH] python3: Ensure stale empty python module directories don't diff --git a/meta/recipes-devtools/python/python3/fix-armv5.patch b/meta/recipes-devtools/python/python3/fix-armv5.patch deleted file mode 100644 index 961404b24fc..00000000000 --- a/meta/recipes-devtools/python/python3/fix-armv5.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 18b9079ddbc149d6b99c922630c246812e4d8ae7 Mon Sep 17 00:00:00 2001 -From: "Miss Islington (bot)" - <31488909+miss-islington@users.noreply.github.com> -Date: Wed, 16 Oct 2024 16:48:40 +0200 -Subject: [PATCH] [3.13] gh-125444: Fix illegal instruction for older Arm - architectures (GH-125574) (GH-125595) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On Arm v5 it is not possible to get the thread ID via c13 register -hence the illegal instruction. The c13 register started to provide -thread ID since Arm v6K architecture variant. Other variants of -Arm v6 (T2, Z and base) don’t provide the thread ID via c13. -For the sake of simplicity we group v5 and v6 together and -consider that instructions for Arm v7 only. -(cherry picked from commit feda9aa73ab95d17a291db22c416146f8e70edeb) - -Co-authored-by: Diego Russo - -Upstream-Status: Backport [https://github.com/python/cpython/commit/18b9079ddbc149d6b99c922630c246812e4d8ae7] -Signed-off-by: Alexander Kanavin ---- - Include/internal/mimalloc/mimalloc/prim.h | 4 ++-- - Include/object.h | 2 +- - .../2024-10-16-12-12-39.gh-issue-125444.9tG2X6.rst | 1 + - 3 files changed, 4 insertions(+), 3 deletions(-) - create mode 100644 Misc/NEWS.d/next/Core_and_Builtins/2024-10-16-12-12-39.gh-issue-125444.9tG2X6.rst - -diff --git a/Include/internal/mimalloc/mimalloc/prim.h b/Include/internal/mimalloc/mimalloc/prim.h -index 8a60d528458e6c..322ab29e6b41c2 100644 ---- a/Include/internal/mimalloc/mimalloc/prim.h -+++ b/Include/internal/mimalloc/mimalloc/prim.h -@@ -151,9 +151,9 @@ static inline mi_threadid_t _mi_prim_thread_id(void) mi_attr_noexcept { - // If you test on another platform and it works please send a PR :-) - // see also https://akkadia.org/drepper/tls.pdf for more info on the TLS register. - #elif defined(__GNUC__) && ( \ -- (defined(__GLIBC__) && (defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__))) \ -+ (defined(__GLIBC__) && (defined(__x86_64__) || defined(__i386__) || (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__))) \ - || (defined(__APPLE__) && (defined(__x86_64__) || defined(__aarch64__))) \ -- || (defined(__BIONIC__) && (defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__))) \ -+ || (defined(__BIONIC__) && (defined(__x86_64__) || defined(__i386__) || (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__))) \ - || (defined(__FreeBSD__) && (defined(__x86_64__) || defined(__i386__) || defined(__aarch64__))) \ - || (defined(__OpenBSD__) && (defined(__x86_64__) || defined(__i386__) || defined(__aarch64__))) \ - ) -diff --git a/Include/object.h b/Include/object.h -index 78aa7ad0f459ff..b53f9acfebdb0c 100644 ---- a/Include/object.h -+++ b/Include/object.h -@@ -259,7 +259,7 @@ _Py_ThreadId(void) - __asm__("movq %%gs:0, %0" : "=r" (tid)); // x86_64 macOSX uses GS - #elif defined(__x86_64__) - __asm__("movq %%fs:0, %0" : "=r" (tid)); // x86_64 Linux, BSD uses FS --#elif defined(__arm__) -+#elif defined(__arm__) && __ARM_ARCH >= 7 - __asm__ ("mrc p15, 0, %0, c13, c0, 3\nbic %0, %0, #3" : "=r" (tid)); - #elif defined(__aarch64__) && defined(__APPLE__) - __asm__ ("mrs %0, tpidrro_el0" : "=r" (tid)); -diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2024-10-16-12-12-39.gh-issue-125444.9tG2X6.rst b/Misc/NEWS.d/next/Core_and_Builtins/2024-10-16-12-12-39.gh-issue-125444.9tG2X6.rst -new file mode 100644 -index 00000000000000..13c1e745edf8d5 ---- /dev/null -+++ b/Misc/NEWS.d/next/Core_and_Builtins/2024-10-16-12-12-39.gh-issue-125444.9tG2X6.rst -@@ -0,0 +1 @@ -+Fix illegal instruction for older Arm architectures. Patch by Diego Russo, testing by Ross Burton. diff --git a/meta/recipes-devtools/python/python3/makerace.patch b/meta/recipes-devtools/python/python3/makerace.patch index f63c2307477..229270b5a3e 100644 --- a/meta/recipes-devtools/python/python3/makerace.patch +++ b/meta/recipes-devtools/python/python3/makerace.patch @@ -1,4 +1,4 @@ -From 2b458b4e1bcd57e3f135d3f0e715f64b98b27906 Mon Sep 17 00:00:00 2001 +From 3b72bd62675519113afea13d3ab1738d9e5a1750 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 13 Jul 2021 23:19:29 +0100 Subject: [PATCH] python3: Fix make race @@ -17,10 +17,10 @@ Signed-off-by: Richard Purdie 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index be1b9ea..9ec3a71 100644 +index c90d31c..98991cd 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2513,7 +2513,7 @@ COMPILEALL_OPTS=-j0 +@@ -2503,7 +2503,7 @@ COMPILEALL_OPTS=-j0 TEST_MODULES=@TEST_MODULES@ .PHONY: libinstall diff --git a/meta/recipes-devtools/python/python3_3.13.0.bb b/meta/recipes-devtools/python/python3_3.13.1.bb similarity index 99% rename from meta/recipes-devtools/python/python3_3.13.0.bb rename to meta/recipes-devtools/python/python3_3.13.1.bb index b3170879b95..71044ff39c8 100644 --- a/meta/recipes-devtools/python/python3_3.13.0.bb +++ b/meta/recipes-devtools/python/python3_3.13.1.bb @@ -30,7 +30,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-test_deadlock-skip-problematic-test.patch \ file://0001-test_active_children-skip-problematic-test.patch \ file://0001-test_readline-skip-limited-history-test.patch \ - file://fix-armv5.patch \ file://0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch \ file://0001-ssl-Raise-OSError-for-ERR_LIB_SYS.patch \ " @@ -39,7 +38,7 @@ SRC_URI:append:class-native = " \ file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \ " -SRC_URI[sha256sum] = "086de5882e3cb310d4dca48457522e2e48018ecd43da9cdf827f6a0759efb07d" +SRC_URI[sha256sum] = "9cf9427bee9e2242e3877dd0f6b641c1853ca461f39d6503ce260a59c80bf0d9" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P\d+(\.\d+)+).tar" @@ -466,7 +465,7 @@ RDEPENDS:libpython3:append:libc-glibc = " libgcc" RDEPENDS:${PN}-ctypes:append:libc-glibc = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)} \ " -RDEPENDS:${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev ${PN}-zipapp unzip bzip2 libgcc tzdata coreutils sed gcc g++ binutils \ +RDEPENDS:${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev ${PN}-zipapp unzip bzip2 libgcc tzdata coreutils sed gcc-symlinks gcc g++ binutils \ locale-base-fr-fr locale-base-en-us locale-base-de-de" RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-tr-tr" RDEPENDS:${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${MLPREFIX}tk ${MLPREFIX}tk-lib', '', d)}" From patchwork Fri Jan 3 10:45:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 54940 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90C18E7719A for ; Fri, 3 Jan 2025 10:45:45 +0000 (UTC) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.groups.io with SMTP id smtpd.web11.27859.1735901139216538930 for ; Fri, 03 Jan 2025 02:45:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=f/BevpKG; spf=pass (domain: gmail.com, ip: 209.85.128.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-436341f575fso125651475e9.1 for ; Fri, 03 Jan 2025 02:45:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735901137; x=1736505937; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=08RK1pw8+I0YbIWuyix+LIz9NT9fsAlRZUJ4aqWj85I=; b=f/BevpKGWejvdKI2VpQLFxaLnUTYxofGBEc3wJd2cnU42fnwDSYUmMAtIo1qjgY+Rp veZlRIW8iDo4Thd70chRduyhsGP+Cy2NR2kGoP3JiALmexVljvikKnHLC0mrZdq9X198 dxg4n47XA3iYu8owy+JaPE56Q3SCJ8JPQ0YmpgRp/2ieFfOQKFOhAxwwdjldoSm1MKD2 lPsaIVET2oROknV+U+zLHQI7u8tRKlNwaDFwHB6+rHqZChfqUe1k0eh2qfsr+Y2bBaP/ 5SILkfOCkzhrPqgdITj877s64Etk0WZ/tlwyES2h5V3MSdmTzQCefBqpvCsOgwUUAfwV pkXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735901137; x=1736505937; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=08RK1pw8+I0YbIWuyix+LIz9NT9fsAlRZUJ4aqWj85I=; b=QFUGboaBd2XLs2h3UZnfwHJyCo2+sqJV4WEx74o+WBnIprrW2Ed0yrifAHO0Em1eQY oskjTDlQeLsu718BDwaXlu9uZxWGEgCHMbxWwQygEFhLIyzCOKnX2E/vDEZkbZ/STIY4 Um9T5NPJZGt/lvsoIsZXaAjooO+mCOQutVB34a25gG8uhREn+QwWNcv7tmrJET7s7ESd Cot/eUQdPKUwaJUXBK+Qv3JroYrzRupQBkIhOAF4C10KOJASevvpwYzqC7MvDNy2Lc6s i5we/S1a/y3IJJiuWwDaZjvT7gk8T7giHkHyYW+docyq9WmwARfxnpGbw4NqOS/s27O6 D/Yg== X-Gm-Message-State: AOJu0YwptvAgEjrhrABEfq1oM84DpvKmf+JNmZA0r/tUmh4JGbufDwQU 3GSJ47CZK6s8nRxb+l/M5y7+Eysn0Xw7Z27PeLtrgZ6adUVBJkFcGVtIPA== X-Gm-Gg: ASbGnctzT6s3YCfYxO3zHA7NGD55lxJvUsTrv4vnLLn44qXioPs+O6tvfszIgZyfX9R ETjxgddUxvhksdYEdbpM8XyQccq6kxcrHWxhXUPV4y+tz1hdm9VYoCKUvUdIVKOYK1jLipEp2TQ hy58+dudwWnTtn8O6dU9KpG8NY3VmMrciCUBn9GLsJD1d3CgwK4bLXm+eb8DsHFpQnuIn3oemT5 qT14G6tuf38lQcrg1zn3OYqguuiQoWvAqa0bgFVug1CHyTdNLjXgNrtle2KclMt5lt8slWK7qAb Xi+j11TfJpeXA9txnw== X-Google-Smtp-Source: AGHT+IGK1hyeqSgHc9cVvIL+NF/G47bcLX1eE/bwp31VKB1qgU/thP6t8T7wHVgZLvdPHgWSPE8q3w== X-Received: by 2002:a05:600c:3b18:b0:434:a26c:8291 with SMTP id 5b1f17b1804b1-43668a3a329mr383059765e9.24.1735901137335; Fri, 03 Jan 2025 02:45:37 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43661289995sm476935865e9.36.2025.01.03.02.45.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 02:45:36 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 09/11] shadow: merge .inc into .bb Date: Fri, 3 Jan 2025 11:45:22 +0100 Message-Id: <20250103104524.4053846-9-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250103104524.4053846-1-alex.kanavin@gmail.com> References: <20250103104524.4053846-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 03 Jan 2025 10:45:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209340 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- meta/recipes-extended/shadow/shadow.inc | 224 ----------------- meta/recipes-extended/shadow/shadow_4.16.0.bb | 225 +++++++++++++++++- 2 files changed, 224 insertions(+), 225 deletions(-) delete mode 100644 meta/recipes-extended/shadow/shadow.inc diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc deleted file mode 100644 index 6ba5a9c7f1c..00000000000 --- a/meta/recipes-extended/shadow/shadow.inc +++ /dev/null @@ -1,224 +0,0 @@ -SUMMARY = "Tools to change and administer password and group data" -HOMEPAGE = "http://github.com/shadow-maint/shadow" -DESCRIPTION = "${SUMMARY}" -BUGTRACKER = "http://github.com/shadow-maint/shadow/issues" -SECTION = "base/utils" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=c9a450b7be84eac23e6353efecb60b5b \ - file://src/passwd.c;beginline=2;endline=7;md5=67bcf314687820b2f010d4863fce3fc5 \ - " - -DEPENDS = "virtual/crypt" - -GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases" -SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ - ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ - file://useradd \ - " - -SRC_URI:append:class-target = " \ - file://login_defs_pam.sed \ - file://shadow-update-pam-conf.patch \ - " - -SRC_URI:append:class-native = " \ - file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ - " -SRC_URI[sha256sum] = "1744f339e07a2b41056347ddd612839762ff565d7e9494fb049428002fa2e7e0" - -# Additional Policy files for PAM -PAM_SRC_URI = "file://pam.d/chfn \ - file://pam.d/chpasswd \ - file://pam.d/chsh \ - file://pam.d/login \ - file://pam.d/newusers \ - file://pam.d/passwd \ - file://pam.d/su" - -inherit autotools gettext github-releases pkgconfig - -export CONFIG_SHELL="/bin/sh" - -EXTRA_OECONF += " \ - --with-group-name-max-length=24 \ - --enable-subordinate-ids=yes \ - --without-sssd \ - ${NSCDOPT}" - -CFLAGS:append:libc-musl = " -DLIBBSD_OVERLAY" - -NSCDOPT = "" -NSCDOPT:class-native = "--without-nscd" -NSCDOPT:class-nativesdk = "--without-nscd" -NSCDOPT:libc-glibc = "--with-nscd" - -PAM_PLUGINS = "libpam-runtime \ - pam-plugin-faildelay \ - pam-plugin-securetty \ - pam-plugin-nologin \ - pam-plugin-env \ - pam-plugin-group \ - pam-plugin-limits \ - pam-plugin-motd \ - pam-plugin-mail \ - pam-plugin-shells \ - pam-plugin-rootok" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" -PACKAGECONFIG:class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} libbsd" -PACKAGECONFIG:class-nativesdk = "" -PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam,${PAM_PLUGINS}" -PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" -PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit" -PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux libsemanage" -PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" -PACKAGECONFIG[logind] = "--enable-logind,--disable-logind,systemd" - -RDEPENDS:${PN} = "shadow-securetty \ - base-passwd \ - util-linux-sulogin" -RDEPENDS:${PN}:class-native = "" -RDEPENDS:${PN}:class-nativesdk = "" - -do_install() { - oe_runmake DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install - - # Info dir listing isn't interesting at this point so remove it if it exists. - if [ -e "${D}${infodir}/dir" ]; then - rm -f ${D}${infodir}/dir - fi - - # Enable CREATE_HOME by default. - sed -i 's/#CREATE_HOME/CREATE_HOME/g' ${D}${sysconfdir}/login.defs - - # As we are on an embedded system, ensure the users mailbox is in - # ~/ not /var/spool/mail by default, as who knows where or how big - # /var is. The system MDA will set this later anyway. - sed -i 's/MAIL_DIR/#MAIL_DIR/g' ${D}${sysconfdir}/login.defs - sed -i 's/#MAIL_FILE/MAIL_FILE/g' ${D}${sysconfdir}/login.defs - - # Disable checking emails. - sed -i 's/MAIL_CHECK_ENAB/#MAIL_CHECK_ENAB/g' ${D}${sysconfdir}/login.defs - - # Comment out SU_NAME to work correctly with busybox - # See Bug#5359 and Bug#7173 - sed -i 's:^SU_NAME:#SU_NAME:g' ${D}${sysconfdir}/login.defs - - # Use proper encryption for passwords - sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs - - install -d ${D}${sysconfdir}/default - install -m 0644 ${UNPACKDIR}/useradd ${D}${sysconfdir}/default -} - -do_install:append() { - # Ensure that the image has as a /var/spool/mail dir so shadow can - # put mailboxes there if the user reconfigures shadow to its - # defaults (see sed below). - install -m 0775 -d ${D}${localstatedir}/spool/mail - chown root:mail ${D}${localstatedir}/spool/mail - - if [ -e ${UNPACKDIR}/pam.d ]; then - install -d ${D}${sysconfdir}/pam.d/ - install -m 0644 ${UNPACKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ - # Remove defaults that are not used when supporting PAM. - sed -i -f ${UNPACKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs - fi - - install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} - - # Move binaries to the locations we want - rm ${D}${sbindir}/vigr - ln -sf vipw.${BPN} ${D}${base_sbindir}/vigr - if [ "${sbindir}" != "${base_sbindir}" ]; then - mv ${D}${sbindir}/vipw ${D}${base_sbindir}/vipw - fi - if [ "${bindir}" != "${base_bindir}" ]; then - mv ${D}${bindir}/login ${D}${base_bindir}/login - mv ${D}${bindir}/su ${D}${base_bindir}/su - fi - - # Handle link properly after rename, otherwise missing files would - # lead rpm failed dependencies. - ln -sf newgrp.${BPN} ${D}${bindir}/sg - - # usermod requires the subuid/subgid files to be in place before being - # able to use the -v/-V flags otherwise it fails: - # usermod: /etc/subuid does not exist, you cannot use the flags -v or -V - install -d ${D}${sysconfdir} - touch ${D}${sysconfdir}/subuid - touch ${D}${sysconfdir}/subgid -} - -# Make executables look for dynamically linked libraries in a custom location, and install -# the needed libraries there. That way we can use them from sstate -# in setscene tasks without worrying about the dependency libraries being available. -do_install:append:class-native() { - binaries=$(find ${D}${base_bindir}/ ${D}${base_sbindir}/ ${D}${bindir}/ ${D}${sbindir}/ -executable -type f) - chrpath -k -r ${STAGING_DIR_NATIVE}/lib-shadow-deps $binaries - mkdir -p ${D}${STAGING_DIR_NATIVE}/lib-shadow-deps/ - libattr=${@bb.utils.contains('DISTRO_FEATURES', 'xattr', "${STAGING_LIBDIR_NATIVE}/libattr.so.*", '', d)} - install $libattr ${STAGING_LIBDIR_NATIVE}/libbsd.so.* ${STAGING_LIBDIR_NATIVE}/libmd.so.* ${D}${STAGING_DIR_NATIVE}/lib-shadow-deps/ - install ${D}${libdir}/*.so.* ${D}${STAGING_DIR_NATIVE}/lib-shadow-deps/ -} - -SYSROOT_DIRS:append:class-native = " ${STAGING_DIR_NATIVE}/lib-shadow-deps/" -INSANE_SKIP:${PN}:class-native = "already-stripped" - -do_install:append:class-nativesdk() { - oe_runmake -C ${B}/man DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install-man -} - -do_install:append:class-target() { - oe_runmake -C ${B}/man DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install-man -} - -PACKAGES =+ "${PN}-base" -FILES:${PN}-base = "\ - ${base_bindir}/login.shadow \ - ${base_bindir}/su.shadow \ - ${bindir}/sg \ - ${bindir}/newgrp.shadow \ - ${bindir}/groups.shadow \ - ${sysconfdir}/pam.d/login \ - ${sysconfdir}/pam.d/su \ - ${sysconfdir}/login.defs \ -" -RDEPENDS:${PN} += "${PN}-base" - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "200" - -ALTERNATIVE:${PN} = "passwd chfn chsh chpasswd vipw vigr nologin" -ALTERNATIVE_LINK_NAME[chfn] = "${bindir}/chfn" -ALTERNATIVE_LINK_NAME[chsh] = "${bindir}/chsh" -ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd" -ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" -ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" -ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" - -ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1 groups.1 su.1 nologin.8" -ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1" -ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1" -ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1" -ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" -ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" - -ALTERNATIVE:${PN}-base = "newgrp groups login su" -ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" -ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" - -PACKAGE_WRITE_DEPS += "shadow-native" -pkg_postinst:${PN}:class-target () { - if [ "x$D" != "x" ]; then - rootarg="--root $D" - else - rootarg="" - fi - - pwconv $rootarg || exit 1 - grpconv $rootarg || exit 1 -} diff --git a/meta/recipes-extended/shadow/shadow_4.16.0.bb b/meta/recipes-extended/shadow/shadow_4.16.0.bb index e57676c1da3..1fcf82bb01d 100644 --- a/meta/recipes-extended/shadow/shadow_4.16.0.bb +++ b/meta/recipes-extended/shadow/shadow_4.16.0.bb @@ -1,4 +1,227 @@ -require shadow.inc +SUMMARY = "Tools to change and administer password and group data" +HOMEPAGE = "http://github.com/shadow-maint/shadow" +DESCRIPTION = "${SUMMARY}" +BUGTRACKER = "http://github.com/shadow-maint/shadow/issues" +SECTION = "base/utils" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=c9a450b7be84eac23e6353efecb60b5b \ + file://src/passwd.c;beginline=2;endline=7;md5=67bcf314687820b2f010d4863fce3fc5 \ + " + +DEPENDS = "virtual/crypt" + +GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases" +SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ + ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ + file://useradd \ + " + +SRC_URI:append:class-target = " \ + file://login_defs_pam.sed \ + file://shadow-update-pam-conf.patch \ + " + +SRC_URI:append:class-native = " \ + file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ + " +SRC_URI[sha256sum] = "1744f339e07a2b41056347ddd612839762ff565d7e9494fb049428002fa2e7e0" + +# Additional Policy files for PAM +PAM_SRC_URI = "file://pam.d/chfn \ + file://pam.d/chpasswd \ + file://pam.d/chsh \ + file://pam.d/login \ + file://pam.d/newusers \ + file://pam.d/passwd \ + file://pam.d/su" + +inherit autotools gettext github-releases pkgconfig + +export CONFIG_SHELL="/bin/sh" + +EXTRA_OECONF += " \ + --with-group-name-max-length=24 \ + --enable-subordinate-ids=yes \ + --without-sssd \ + ${NSCDOPT}" + +CFLAGS:append:libc-musl = " -DLIBBSD_OVERLAY" + +NSCDOPT = "" +NSCDOPT:class-native = "--without-nscd" +NSCDOPT:class-nativesdk = "--without-nscd" +NSCDOPT:libc-glibc = "--with-nscd" + +PAM_PLUGINS = "libpam-runtime \ + pam-plugin-faildelay \ + pam-plugin-securetty \ + pam-plugin-nologin \ + pam-plugin-env \ + pam-plugin-group \ + pam-plugin-limits \ + pam-plugin-motd \ + pam-plugin-mail \ + pam-plugin-shells \ + pam-plugin-rootok" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" +PACKAGECONFIG:class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} libbsd" +PACKAGECONFIG:class-nativesdk = "" +PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam,${PAM_PLUGINS}" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" +PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit" +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux libsemanage" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[logind] = "--enable-logind,--disable-logind,systemd" + +RDEPENDS:${PN} = "shadow-securetty \ + base-passwd \ + util-linux-sulogin" +RDEPENDS:${PN}:class-native = "" +RDEPENDS:${PN}:class-nativesdk = "" + +do_install() { + oe_runmake DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install + + # Info dir listing isn't interesting at this point so remove it if it exists. + if [ -e "${D}${infodir}/dir" ]; then + rm -f ${D}${infodir}/dir + fi + + # Enable CREATE_HOME by default. + sed -i 's/#CREATE_HOME/CREATE_HOME/g' ${D}${sysconfdir}/login.defs + + # As we are on an embedded system, ensure the users mailbox is in + # ~/ not /var/spool/mail by default, as who knows where or how big + # /var is. The system MDA will set this later anyway. + sed -i 's/MAIL_DIR/#MAIL_DIR/g' ${D}${sysconfdir}/login.defs + sed -i 's/#MAIL_FILE/MAIL_FILE/g' ${D}${sysconfdir}/login.defs + + # Disable checking emails. + sed -i 's/MAIL_CHECK_ENAB/#MAIL_CHECK_ENAB/g' ${D}${sysconfdir}/login.defs + + # Comment out SU_NAME to work correctly with busybox + # See Bug#5359 and Bug#7173 + sed -i 's:^SU_NAME:#SU_NAME:g' ${D}${sysconfdir}/login.defs + + # Use proper encryption for passwords + sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs + + install -d ${D}${sysconfdir}/default + install -m 0644 ${UNPACKDIR}/useradd ${D}${sysconfdir}/default +} + +do_install:append() { + # Ensure that the image has as a /var/spool/mail dir so shadow can + # put mailboxes there if the user reconfigures shadow to its + # defaults (see sed below). + install -m 0775 -d ${D}${localstatedir}/spool/mail + chown root:mail ${D}${localstatedir}/spool/mail + + if [ -e ${UNPACKDIR}/pam.d ]; then + install -d ${D}${sysconfdir}/pam.d/ + install -m 0644 ${UNPACKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ + # Remove defaults that are not used when supporting PAM. + sed -i -f ${UNPACKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs + fi + + install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} + + # Move binaries to the locations we want + rm ${D}${sbindir}/vigr + ln -sf vipw.${BPN} ${D}${base_sbindir}/vigr + if [ "${sbindir}" != "${base_sbindir}" ]; then + mv ${D}${sbindir}/vipw ${D}${base_sbindir}/vipw + fi + if [ "${bindir}" != "${base_bindir}" ]; then + mv ${D}${bindir}/login ${D}${base_bindir}/login + mv ${D}${bindir}/su ${D}${base_bindir}/su + fi + + # Handle link properly after rename, otherwise missing files would + # lead rpm failed dependencies. + ln -sf newgrp.${BPN} ${D}${bindir}/sg + + # usermod requires the subuid/subgid files to be in place before being + # able to use the -v/-V flags otherwise it fails: + # usermod: /etc/subuid does not exist, you cannot use the flags -v or -V + install -d ${D}${sysconfdir} + touch ${D}${sysconfdir}/subuid + touch ${D}${sysconfdir}/subgid +} + +# Make executables look for dynamically linked libraries in a custom location, and install +# the needed libraries there. That way we can use them from sstate +# in setscene tasks without worrying about the dependency libraries being available. +do_install:append:class-native() { + binaries=$(find ${D}${base_bindir}/ ${D}${base_sbindir}/ ${D}${bindir}/ ${D}${sbindir}/ -executable -type f) + chrpath -k -r ${STAGING_DIR_NATIVE}/lib-shadow-deps $binaries + mkdir -p ${D}${STAGING_DIR_NATIVE}/lib-shadow-deps/ + libattr=${@bb.utils.contains('DISTRO_FEATURES', 'xattr', "${STAGING_LIBDIR_NATIVE}/libattr.so.*", '', d)} + install $libattr ${STAGING_LIBDIR_NATIVE}/libbsd.so.* ${STAGING_LIBDIR_NATIVE}/libmd.so.* ${D}${STAGING_DIR_NATIVE}/lib-shadow-deps/ + install ${D}${libdir}/*.so.* ${D}${STAGING_DIR_NATIVE}/lib-shadow-deps/ +} + +SYSROOT_DIRS:append:class-native = " ${STAGING_DIR_NATIVE}/lib-shadow-deps/" +INSANE_SKIP:${PN}:class-native = "already-stripped" + +do_install:append:class-nativesdk() { + oe_runmake -C ${B}/man DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install-man +} + +do_install:append:class-target() { + oe_runmake -C ${B}/man DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install-man +} + +PACKAGES =+ "${PN}-base" +FILES:${PN}-base = "\ + ${base_bindir}/login.shadow \ + ${base_bindir}/su.shadow \ + ${bindir}/sg \ + ${bindir}/newgrp.shadow \ + ${bindir}/groups.shadow \ + ${sysconfdir}/pam.d/login \ + ${sysconfdir}/pam.d/su \ + ${sysconfdir}/login.defs \ +" +RDEPENDS:${PN} += "${PN}-base" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "200" + +ALTERNATIVE:${PN} = "passwd chfn chsh chpasswd vipw vigr nologin" +ALTERNATIVE_LINK_NAME[chfn] = "${bindir}/chfn" +ALTERNATIVE_LINK_NAME[chsh] = "${bindir}/chsh" +ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd" +ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" +ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" +ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" + +ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1 groups.1 su.1 nologin.8" +ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1" +ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1" +ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1" +ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" +ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" + +ALTERNATIVE:${PN}-base = "newgrp groups login su" +ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" +ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" + +PACKAGE_WRITE_DEPS += "shadow-native" +pkg_postinst:${PN}:class-target () { + if [ "x$D" != "x" ]; then + rootarg="--root $D" + else + rootarg="" + fi + + pwconv $rootarg || exit 1 + grpconv $rootarg || exit 1 +} # Build falsely assumes that if --enable-libpam is set, we don't need to link against # libcrypt. This breaks chsh. From patchwork Fri Jan 3 10:45:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 54937 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90203E77198 for ; Fri, 3 Jan 2025 10:45:45 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web10.28163.1735901140378528315 for ; Fri, 03 Jan 2025 02:45:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Sn7CyUmL; spf=pass (domain: gmail.com, ip: 209.85.128.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-436202dd7f6so137353025e9.0 for ; Fri, 03 Jan 2025 02:45:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735901139; x=1736505939; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BSqfxfOzlfMUTTd/beVOBnXSy6wrZ29r3pWYvsTV2Ww=; b=Sn7CyUmLxnia9Z73TploG4Sy2BUo17BvqW6eCxTG7BY6tIyIKeoKlp+WPYMEfB/rOp 20ph0tJDos0EF74s5nKVC9bRkytX2sNkNTWvB+Z5tQkGTiILMuWfo4rbZZdjb8mdUs8n VOOOfGDkLkqH1g6VbgbiyQ0hV7/q9pH0KrsukjWco4+ylVGCbuwoYt5l4bsI4B6VIGxy aDDPZ3j6D/4S1pbIu6Yy7yM1fMyOoGHt1F9TejoOKxTUYck9OqpWl8K/WPA4rRBBSTLC 3CA722/FTpdxdVgYlyNmY/vkQCCZHxOqRGLRjvRPwKDec5QSZfGd+bdGF8FZpwz2Poc3 0CLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735901139; x=1736505939; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BSqfxfOzlfMUTTd/beVOBnXSy6wrZ29r3pWYvsTV2Ww=; b=RKwpU2T6rmujvNVtH7hXjg/ghGEfWCy2XZtcuD0DL5lZ+3Nd+00OgX8VYHi09taWqk iu/tGifTeh2TG4D8pqBI2VW2os71wJNvXbQHoUZRcdKICac206YXbFvKz4GffSfhvv5N bUSW/yGgBPlm8YPlIUjMmw0jkLNS4bxFsBf3vClVvNisouHoU7QL8xSofGmJz37+4zJh YZSrQanbFxbgE85zXa1OGIWe7g+lmEmrEJaIWhvzwtS8mwFymWAfq4tAy6PFXYDdXXUq TCx6h8QI+CjnlLluDexqG4LhOCHLD96ishmxTwKIHByOyBMCWdKAvimpS8rvZLTmfwXN crIg== X-Gm-Message-State: AOJu0YzFTOBeZn2XHRXt/fT5C3+RKAhYqblip13XHbzlupE0jBsVJvm2 hWEdSQLHZEMpys9qxUkzC7Kf8wPPErKoGFsK44Ptxz6YawQlQzlR/IaAJQ== X-Gm-Gg: ASbGncukxDXXeH2zoFZwtPJ9i/bHDxW3o0pgtsIvq5bYifeyaLIQl8m5fHvAKl/SIw5 wdJ+zB1/SwbtDf00gk12laRXoEB08ZKu9lCYB80wlyP4wUIHsFf/jO4Re9Tpr3fArnCA4zvKevA aUV2NXuo7V9zsOHHae2qf3McD4XFtaHzBfdxewOR+TYQWHfOUnaSf+Rm/+j7rW8VjW3Yda2vEi2 yJZDCDSRPzbeYEVwHYBEwukRTYT0M+geZfRPOY28elEyCNrScWkAx8hY5TCseKlgGkBxmByNzjZ wmYXUU5NJOIA4m1BTQ== X-Google-Smtp-Source: AGHT+IGc/5JI/Z1HJ9h0TyCbvXtuIIHEb+jdm0AFleB7R2fTPY696bOi6AdMA/cmO9d6iZz58HcG1g== X-Received: by 2002:a05:600c:468a:b0:436:1b96:7072 with SMTP id 5b1f17b1804b1-4366854c062mr412637355e9.5.1735901138668; Fri, 03 Jan 2025 02:45:38 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43661289995sm476935865e9.36.2025.01.03.02.45.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 02:45:38 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 10/11] shadow: exclude pre-releases from version checks Date: Fri, 3 Jan 2025 11:45:23 +0100 Message-Id: <20250103104524.4053846-10-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250103104524.4053846-1-alex.kanavin@gmail.com> References: <20250103104524.4053846-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 03 Jan 2025 10:45:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209341 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- meta/recipes-extended/shadow/shadow_4.16.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/shadow/shadow_4.16.0.bb b/meta/recipes-extended/shadow/shadow_4.16.0.bb index 1fcf82bb01d..b7282d7933f 100644 --- a/meta/recipes-extended/shadow/shadow_4.16.0.bb +++ b/meta/recipes-extended/shadow/shadow_4.16.0.bb @@ -25,6 +25,7 @@ SRC_URI:append:class-native = " \ file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ " SRC_URI[sha256sum] = "1744f339e07a2b41056347ddd612839762ff565d7e9494fb049428002fa2e7e0" +UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P\d+(\.\d+)+)$" # Additional Policy files for PAM PAM_SRC_URI = "file://pam.d/chfn \ From patchwork Fri Jan 3 10:45:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 54935 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F594E77188 for ; Fri, 3 Jan 2025 10:45:45 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web10.28166.1735901141092687565 for ; Fri, 03 Jan 2025 02:45:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GMRdWBQk; spf=pass (domain: gmail.com, ip: 209.85.128.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4361b0ec57aso120743485e9.0 for ; Fri, 03 Jan 2025 02:45:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735901139; x=1736505939; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GzbU6BTATjxalP8XwIJuy3Y78fCF4kuURLQS5ICwEvU=; b=GMRdWBQkILT53yJPZhcY2OxHvVDSN5vii3yApmKOWJa3hUup3H3beY6vBvRO0CZ1X3 3yOy18gC+ZPW3zIiGfXY521JAaYcYEWGwZEEi/3ByqXF61a8GlpOSafxTzK1hAlB+IrJ /NxFe3SiwNxz7e7YeczMRoNXIK1kjPZLt+p+w6Tf9+AU4tJRpWd95nbSjvXVK/Dl3+nT AhQbRB1J8P0K6ybEMHgkngNQ+X0mIWqBC1eB3V7L404eSXlTOhvKpgJ0SAeCJsqh6IL7 yyVAv5lUHPcv6eARVxuVXY3heqhvvDzGU07axwjIUx2zDwrIBHqx/iV4Os5CHHfOnwgr 3UHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735901139; x=1736505939; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GzbU6BTATjxalP8XwIJuy3Y78fCF4kuURLQS5ICwEvU=; b=Z1t8bHFpRxmmP1E62dRC2onl+qXM4NYya6dosPzGYl9saGXzo2F3e6MrJKo10Mz3kR zmETCaswuOMW6U9q702smWN7IMT9+J2G9rY/FEvsEpBpE2q/YQSBuI/0oMcsOaZady5+ HYqAPq7QZFu5C7gL0qjZ5ztIAww42DKr2dJSoYoyGgHFTmaPIQJB2sOsWUC4l9EpVFd0 if5EPPlFWkZKpIjEFwJ+6L+nUY2LZX85SCoI0n5pICbba8pssWm5zyweOrHmiIQuKxlp Tx3OeQk/dULr3GQ7b89jiALHRDNzsjCobBE+yX3+CgOJPVPnPGzacQ4dtZF3mLzTjwv+ DiXg== X-Gm-Message-State: AOJu0YwvgZyiXx7xGaim7mtRxE40p+1K2pegkLOsGgWB5pQgzp+WHRQ8 Xn3RkNnvBYugXE3V9w0X6ECdSRgq7X37KsZroBrCmL3zXR9GHPBvJHqfYg== X-Gm-Gg: ASbGncsvXy5CQg60U3cC0W63CS00PIQNQHC/96t2PuLMjModWk3Z45tppfMosb1B+Lm uXLF6t/32qYR+cCeSAo3uJ/7fYEZmS4w/yJse4hsAfqt2gGWKb6pMrHsnG7Eu0EipleQroqI1Eh +nE9lKvXM/yMeYddOya0AdB5v1IxoAQ9Qsk6PTuy9LQawOhsjkORHAoY/4UJ+c2hzMKfZEKCbkp lNARKx0SM8dCUeccUNGXPkzWpklQxGB+eB6+0GyRdvm34+EDB+Q9RKitXKh833EjLs0z47zlelW DsrLSIgvHDMaUmV0XQ== X-Google-Smtp-Source: AGHT+IE4Gj+feChXDbqiubwyX03CUbjgaSZTt7/x5vQfPHAc4X9mTEgSjtysBN5MDgwC7lGJFA3IYA== X-Received: by 2002:a7b:cd98:0:b0:42c:b9c8:2bb0 with SMTP id 5b1f17b1804b1-4366b2f95c5mr406720675e9.4.1735901139310; Fri, 03 Jan 2025 02:45:39 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43661289995sm476935865e9.36.2025.01.03.02.45.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 02:45:39 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 11/11] file: upgrade 5.45 -> 5.46 Date: Fri, 3 Jan 2025 11:45:24 +0100 Message-Id: <20250103104524.4053846-11-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250103104524.4053846-1-alex.kanavin@gmail.com> References: <20250103104524.4053846-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 03 Jan 2025 10:45:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209342 From: Alexander Kanavin Drop patch merged upstream. Signed-off-by: Alexander Kanavin --- .../file/{file_5.45.bb => file_5.46.bb} | 7 +- ...0001-PR-579-net147-Fix-stack-overrun.patch | 33 +++++++ ...-reset-previous-negative-offset-in-m.patch | 93 +++++++++++++++++++ .../recipes-devtools/file/files/print_c.patch | 27 ------ 4 files changed, 130 insertions(+), 30 deletions(-) rename meta/recipes-devtools/file/{file_5.45.bb => file_5.46.bb} (90%) create mode 100644 meta/recipes-devtools/file/files/0001-PR-579-net147-Fix-stack-overrun.patch create mode 100644 meta/recipes-devtools/file/files/0001-Use-4-in-default-reset-previous-negative-offset-in-m.patch delete mode 100644 meta/recipes-devtools/file/files/print_c.patch diff --git a/meta/recipes-devtools/file/file_5.45.bb b/meta/recipes-devtools/file/file_5.46.bb similarity index 90% rename from meta/recipes-devtools/file/file_5.45.bb rename to meta/recipes-devtools/file/file_5.46.bb index fa8dc576dcc..e97fac99f21 100644 --- a/meta/recipes-devtools/file/file_5.45.bb +++ b/meta/recipes-devtools/file/file_5.46.bb @@ -12,10 +12,11 @@ DEPENDS = "file-replacement-native" DEPENDS:class-native = "bzip2-replacement-native" SRC_URI = "git://github.com/file/file.git;branch=master;protocol=https \ - file://print_c.patch \ - " + file://0001-Use-4-in-default-reset-previous-negative-offset-in-m.patch \ + file://0001-PR-579-net147-Fix-stack-overrun.patch \ + " -SRCREV = "4cbd5c8f0851201d203755b76cb66ba991ffd8be" +SRCREV = "c5aa4f7f8d5063fb3c37ad57bf54bb67ec641a09" S = "${WORKDIR}/git" inherit autotools update-alternatives diff --git a/meta/recipes-devtools/file/files/0001-PR-579-net147-Fix-stack-overrun.patch b/meta/recipes-devtools/file/files/0001-PR-579-net147-Fix-stack-overrun.patch new file mode 100644 index 00000000000..57725b1c5f5 --- /dev/null +++ b/meta/recipes-devtools/file/files/0001-PR-579-net147-Fix-stack-overrun.patch @@ -0,0 +1,33 @@ +From fc6b51aa67a11806c95363e1bec925d15b3a98a5 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Thu, 5 Dec 2024 18:35:40 +0000 +Subject: [PATCH] PR/579: net147: Fix stack overrun. + +Upstream-Status: Backport [https://github.com/file/file/commit/b3384a1fbfa1fee99986e5750ab8e700de4f24ad] +Signed-off-by: Alexander Kanavin +--- + src/readelf.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/readelf.c b/src/readelf.c +index fe4cf541..d209d86d 100644 +--- a/src/readelf.c ++++ b/src/readelf.c +@@ -27,7 +27,7 @@ + #include "file.h" + + #ifndef lint +-FILE_RCSID("@(#)$File: readelf.c,v 1.196 2024/11/11 15:49:11 christos Exp $") ++FILE_RCSID("@(#)$File: readelf.c,v 1.197 2024/12/05 18:35:40 christos Exp $") + #endif + + #ifdef BUILTIN_ELF +@@ -1726,7 +1726,7 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off, + Elf64_Phdr ph64; + const char *linking_style; + unsigned char nbuf[NBUFSIZE]; +- char interp[128]; ++ char interp[NBUFSIZE]; + ssize_t bufsize; + size_t offset, align, need = 0; + int pie = 0, dynamic = 0; diff --git a/meta/recipes-devtools/file/files/0001-Use-4-in-default-reset-previous-negative-offset-in-m.patch b/meta/recipes-devtools/file/files/0001-Use-4-in-default-reset-previous-negative-offset-in-m.patch new file mode 100644 index 00000000000..7601e6dead0 --- /dev/null +++ b/meta/recipes-devtools/file/files/0001-Use-4-in-default-reset-previous-negative-offset-in-m.patch @@ -0,0 +1,93 @@ +From b310a0c2d3e4a1c12d579ad5c0266f1092a91340 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Wed, 27 Nov 2024 15:37:46 +0000 +Subject: [PATCH] Use +4 in default reset previous negative offset in magic in + zip entry + +Upstream-Status: Backport [https://github.com/file/file/commit/b310a0c2d3e4a1c12d579ad5c0266f1092a91340] +Signed-off-by: Alexander Kanavin +--- + magic/Magdir/archive | 50 +++++++++++++++++++++++--------------------- + 1 file changed, 26 insertions(+), 24 deletions(-) + +diff --git a/magic/Magdir/archive b/magic/Magdir/archive +index c8f440dc..b920f993 100644 +--- a/magic/Magdir/archive ++++ b/magic/Magdir/archive +@@ -1,5 +1,5 @@ + #------------------------------------------------------------------------------ +-# $File: archive,v 1.206 2024/11/26 19:39:14 christos Exp $ ++# $File: archive,v 1.207 2024/11/27 15:37:46 christos Exp $ + # archive: file(1) magic for archive formats (see also "msdos" for self- + # extracting compressed archives) + # +@@ -1875,15 +1875,6 @@ + >>>>>-22 string PK\005\006 + >>>>>>(-6.l-16) string APK\x20Sig\x20Block\x2042 \b, with APK Signing Block + +-# Keyman Compiled Package File (keyman.com) +-# https://help.keyman.com/developer/current-version/reference/file-types/kmp +-# Find start of central directory +->>>(-6.l) string PK\001\002 +-# Scan central directory for string 'kmp.json', will suffice for a +-# package containing about 150 files +->>>>(-6.l) search/9000 kmp.json Keyman Compiled Package File +-!:mime application/vnd.keyman.kmp+zip +-!:ext kmp + + # Specialised zip formats which start with a member named 'mimetype' + # (stored uncompressed, with no 'extra field') containing the file's MIME type. +@@ -2123,25 +2114,36 @@ + #>30 search/100/b application/epub+zip EPUB document + #!:mime application/epub+zip + +-# Generic zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu) +-# Next line excludes specialized formats: ++# APK Signing Block + >(26.s+30) leshort !0xcafe + >>30 search/100/b !application/epub+zip +->>>26 string !\x8\0\0\0mimetype Zip archive data +-!:mime application/zip +->>>>4 beshort x \b, at least +->>>>4 use zipversion +->>>>4 beshort x to extract +->>>>8 beshort x \b, compression method= +->>>>8 use zipcompression +->>>>0x161 string WINZIP \b, WinZIP self-extracting +-# APK Signing Block +->0 default x +->>-22 string PK\005\006 +->>>(-6.l-16) string APK\x20Sig\x20Block\x2042 Android package (APK), with APK Signing Block ++>>>26 string !\x8\0\0\0mimetype ++>>>>-22 string PK\005\006 ++>>>>>(-6.l-16) string APK\x20Sig\x20Block\x2042 Android package (APK), with APK Signing Block + !:mime application/vnd.android.package-archive + !:ext apk + ++# Keyman Compiled Package File (keyman.com) ++# https://help.keyman.com/developer/current-version/reference/file-types/kmp ++# Find start of central directory ++>>>>>(-6.l) string PK\001\002 ++# Scan central directory for string 'kmp.json', will suffice for a ++# package containing about 150 files ++>>>>>>(-6.l) search/9000 kmp.json Keyman Compiled Package File ++!:mime application/vnd.keyman.kmp+zip ++!:ext kmp ++ ++# Generic zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu) ++# Next line excludes specialized formats: ++>>>>+4 default x ++>>>>>4 beshort x Zip archive data, at least ++!:mime application/zip ++>>>>>4 use zipversion ++>>>>>4 beshort x to extract ++>>>>>8 beshort x \b, compression method= ++>>>>>8 use zipcompression ++>>>>>0x161 string WINZIP \b, WinZIP self-extracting ++ + # Zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu) + 0 string PK\005\006 Zip archive data (empty) + !:mime application/zip +-- +2.39.5 + diff --git a/meta/recipes-devtools/file/files/print_c.patch b/meta/recipes-devtools/file/files/print_c.patch deleted file mode 100644 index 760813f9c28..00000000000 --- a/meta/recipes-devtools/file/files/print_c.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e329257b8e22362b62e6c930447ef6feadd63f32 Mon Sep 17 00:00:00 2001 -From: Joe Slater -Date: Mon, 7 Aug 2023 22:37:19 +0000 -Subject: [PATCH] print.c: initialize timezone data for localtime_r() - -The man page for localtime() points out that while it acts -like tzset() has been called, localtime_r() might not. We -have a local version of localtime_r() that avoids this, but -we do not compile it. - -Upstream-Status: Submitted [file@astron.com] - -Signed-off-by: Joe Slater ---- - src/print.c | 1 + - 1 file changed, 1 insertion(+) - ---- git.orig/src/print.c -+++ git/src/print.c -@@ -289,6 +289,7 @@ file_fmtdatetime(char *buf, size_t bsize - goto out; - - if (flags & FILE_T_LOCAL) { -+ tzset(); - tm = localtime_r(&t, &tmz); - } else { - tm = gmtime_r(&t, &tmz);