Skip to contentSkip to conversation

gettext: update 0.22.5 -> 0.23.1

PATCH In review Alexander Kanavin 2 participants 12 messages Jan 3, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/11 gettext: update 0.22.5 -> 0.23.1

From: Alexander Kanavin <[email protected]>

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.

---
 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%)
meta/classes-recipe/autotools.bbclass +2 -2
index 9ebdca47680..a1d8e4b3603 100644
@@ -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"
meta/recipes-core/gettext/gettext-minimal-native_0.23.1.bb renamed from meta/recipes-core/gettext/gettext-minimal-native_0.22.5.bb +1 -1
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
@@ -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/
 }
meta/recipes-core/gettext/gettext-sources.inc +1 -1
index fd05837528c..5d90d81b58d 100644
@@ -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"
meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch +4 -4
index 33d45a038cf..e59c73fb7d8 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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@"
meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch deleted +0 -35
deleted file mode 100644
index 144259dd3f2..00000000000
@@ -1,35 +0,0 @@
-From 97a6a63ad61949663283f5fad68c9d5fb9be1f15 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <[email protected]>
-Date: Tue, 12 Sep 2023 11:33:41 +0200
-Subject: [PATCH] intl: Fix build failure with "make -j".
-
-Reported by Christian Weisgerber <[email protected]> at
-<https://lists.gnu.org/archive/html/bug-gettext/2023-09/msg00005.html>.
-
-* 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 <[email protected]>
----
- 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
-
meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch +4 -4
index 94afb255c38..a8f6684bd70 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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; }
meta/recipes-core/gettext/gettext/parallel.patch deleted +0 -31
deleted file mode 100644
index 8ecba46fd0a..00000000000
@@ -1,31 +0,0 @@
-From 83333bc873c2655ff1de161f6b7db930f22f1cea Mon Sep 17 00:00:00 2001
-From: Joe Slater <[email protected]>
-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 <[email protected]>
----
- 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
meta/recipes-core/gettext/gettext/serial-tests-config.patch +4 -4
index 7d39d6086ab..3baf5497952 100644
@@ -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" <[email protected]>
 Date: Thu, 28 Jul 2016 12:36:15 +0800
 Subject: [PATCH] fix for ptest
@@ -15,7 +15,7 @@ Signed-off-by: Changqing Li <[email protected]>
  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],
meta/recipes-core/gettext/gettext/use-pkgconfig.patch +8 -8
index ceb1856118a..9774c4cce00 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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.
  
meta/recipes-core/gettext/gettext_0.23.1.bb renamed from meta/recipes-core/gettext/gettext_0.22.5.bb +4 -5
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
@@ -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
 }
 
Signature · 1 line
2.39.5
#1 lore raw

PATCH 2/11 libxt: update 1.3.0 -> 1.3.1

From: Alexander Kanavin <[email protected]>

---
 .../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%)
meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch +6 -7
index ff8c675dbdb..79ae929d08f 100644
@@ -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 <[email protected]>
 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 <[email protected]>
 Signed-off-by: Nitin A Kamble <[email protected]> 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
meta/recipes-graphics/xorg-lib/libxt_1.3.1.bb renamed from meta/recipes-graphics/xorg-lib/libxt_1.3.0.bb +1 -1
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
@@ -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"
 
Signature · 1 line
2.39.5
#2 lore raw

PATCH 3/11 libxshmfence: update 1.3.2 -> 1.3.3

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

Drop patch as issue solved upstream.

---
 ...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%)
meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch deleted +0 -39
deleted file mode 100644
index 3e87794d20d..00000000000
@@ -1,39 +0,0 @@
-From 5827f6389a227157958d14a687fb29223cb3a03a Mon Sep 17 00:00:00 2001
-From: Mingli Yu <[email protected]>
-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 <[email protected]>
----
- 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 <sys/time.h>
- #include <sys/syscall.h>
- 
-+#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
-
meta/recipes-graphics/xorg-lib/libxshmfence_1.3.3.bb renamed from meta/recipes-graphics/xorg-lib/libxshmfence_1.3.2.bb +1 -3
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
@@ -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"
Signature · 1 line
2.39.5
#3 lore raw

PATCH 4/11 rt-tests: update 2.7 -> 2.8

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../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(-)
meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch +1 -1
index d5bd7fe523b..fface76731c 100644
@@ -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
meta/recipes-rt/rt-tests/rt-tests.inc +2 -2
index 3fbdfa20381..f28258ef58e 100644
@@ -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"
Signature · 1 line
2.39.5
#4 lore raw

PATCH 5/11 iproute2: update 6.11.0 -> 6.12.0

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 ...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%)
meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch +1 -1
index 555d63b2403..03af400ecd2 100644
@@ -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 <[email protected]>
 Date: Sat, 24 Aug 2024 15:32:25 +0200
 Subject: [PATCH] include/libnetlink.h: add missing include for htobe64
meta/recipes-connectivity/iproute2/iproute2/0001-ip-rearrange-and-prune-header-files.patch new file +90 -0

90 lines not on this page · raw message

meta/recipes-connectivity/iproute2/iproute2/0002-bridge-mst-fix-a-musl-build-issue.patch deleted +0 -76

76 lines not on this page · raw message

meta/recipes-connectivity/iproute2/iproute2/0003-bridge-mst-fix-a-further-musl-build-issue.patch deleted +0 -59

59 lines not on this page · raw message

meta/recipes-connectivity/iproute2/iproute2_6.12.0.bb renamed from meta/recipes-connectivity/iproute2/iproute2_6.11.0.bb +2 -6
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
@@ -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
 
Signature · 1 line
2.39.5
#5 lore raw

PATCH 6/11 kbd: update 2.6.4 -> 2.7.1

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../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%)
meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch deleted +0 -73
deleted file mode 100644
index de279b55f9e..00000000000
@@ -1,73 +0,0 @@
-From b757e6842f9631757f0d1a6b3833aabffa9ffeee Mon Sep 17 00:00:00 2001
-From: Alexey Gladkov <[email protected]>
-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 <[email protected]>
-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
-      <[email protected]> or <[email protected]> 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 <[email protected]>
-
-Upstream-Status: Backport [https://github.com/legionus/kbd/commit/b757e6842f9631757f0d1a6b3833aabffa9ffeee]
-
-[do_configure prepend added to remove binary files]
-
-Signed-off-by: Peter Marko <[email protected]>
----
- 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 
--  <[email protected]> or <[email protected]> and may be redistributed
--  for non-commercial use under Unix environments only.
--
- Goha and GohaClassic:
-   Donated by Yitna Firdyiwek <[email protected]> of GohaTibeb Associates
-   and may be redistributed without restriction under the GNU GPL 2.0.
--- 
-2.30.2
-
meta/recipes-core/kbd/kbd_2.7.1.bb renamed from meta/recipes-core/kbd/kbd_2.6.4.bb +3 -9
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
@@ -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
Signature · 1 line
2.39.5
#6 lore raw

PATCH 7/11 libdnf: backport a python 3.13.1 compatibility patch

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 ...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
meta/recipes-devtools/libdnf/libdnf/0001-Fix-a-segfault-in-iterator-of-a-ConfigParser-section.patch new file +76 -0
new file mode 100644
index 00000000000..64334e08fda
@@ -0,0 +1,76 @@
+From 18e69ca69a6a401922275d1e18bbaf96b84ca795 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <[email protected]>
+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 <[email protected]>
+---
+ 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 T>
+ 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<std::string, std::string>)
+ 
+ %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 T>
+ 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;
meta/recipes-devtools/libdnf/libdnf_0.73.4.bb +1 -0
index 0817da7ca69..5b9e734e82d 100644
@@ -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"
Signature · 1 line
2.39.5
#7 lore raw

PATCH 8/11 python3: update 3.13.0 -> 3.13.1

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

Drop fix-armv5.patch as issue resolved upstream.

---
 ...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%)
meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch +3 -3
index d2246327f21..c9ddb1cdbe4 100644
@@ -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 <[email protected]>
 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
meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch +56 -54

245 lines not on this page · raw message

meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch +1 -1
index 84ad2abb0bc..05a313da83f 100644
@@ -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 <[email protected]>
 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
meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch +3 -3
index 45094481a8f..674bec0a8b6 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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)
meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch +2 -2
index 508754286fd..64305e4ebbd 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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:
meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch +8 -8
index 230e847d2bf..41310b52603 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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)
  
meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch +3 -3
index b967a36e491..917981dcf8e 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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.
meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch +2 -2
index ea103bc8341..a27a3bafc82 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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):
meta/recipes-devtools/python/python3/0001-ssl-Raise-OSError-for-ERR_LIB_SYS.patch +4 -7
index 18e0f208c7c..8ed419aec26 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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
-
meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch +2 -2
index b9c68a98d70..a66edecd815 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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 = {
meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch +3 -3
index 7749fcbe7df..9bdb9b35535 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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)
  
meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch +1 -1
index 68e277d662e..cdff81d03a3 100644
@@ -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 <[email protected]>
 Date: Fri, 18 Jun 2021 11:56:50 -0700
 Subject: [PATCH] test_ctypes.test_find: skip without tools-sdk
meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch +2 -2
index 3336e2913a1..373e882d799 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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):
meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch +3 -3
index 7f03cf105f4..53f70b77eaa 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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:
meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch +1 -1
index d63c73e3340..b7d4dce2e7d 100644
@@ -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 <[email protected]>
 Date: Tue, 13 Aug 2024 11:07:05 -0400
 Subject: [PATCH] test_readline: skip limited history test
meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch +1 -1
index 4e284de6137..ded23117b22 100644
@@ -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 <[email protected]>
 Date: Wed, 8 May 2024 11:58:09 -0400
 Subject: [PATCH] test_shutdown: skip problematic test
meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch +1 -1
index b4f873fd721..6cfe85c38ca 100644
@@ -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 <[email protected]>
 Date: Fri, 6 Oct 2023 10:59:44 -0400
 Subject: [PATCH] test_storlines: skip due to load variability
meta/recipes-devtools/python/python3/crosspythonpath.patch +4 -4
index f18898e4c4f..f81235e3bc0 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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],
meta/recipes-devtools/python/python3/deterministic_imports.patch +1 -1
index 61f136ef42a..53c0ac7c55d 100644
@@ -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 <[email protected]>
 Date: Fri, 27 May 2022 17:05:44 +0100
 Subject: [PATCH] python3: Ensure stale empty python module directories don't
meta/recipes-devtools/python/python3/fix-armv5.patch deleted +0 -65

65 lines not on this page · raw message

meta/recipes-devtools/python/python3/makerace.patch +3 -3
index f63c2307477..229270b5a3e 100644
@@ -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 <[email protected]>
 Date: Tue, 13 Jul 2021 23:19:29 +0100
 Subject: [PATCH] python3: Fix make race
@@ -17,10 +17,10 @@ Signed-off-by: Richard Purdie <[email protected]>
  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
meta/recipes-devtools/python/python3_3.13.1.bb renamed from meta/recipes-devtools/python/python3_3.13.0.bb +2 -3
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
@@ -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<pver>\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)}"
Signature · 1 line
2.39.5
#8 lore raw

PATCH 9/11 shadow: merge .inc into .bb

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 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
meta/recipes-extended/shadow/shadow.inc deleted +0 -224
deleted file mode 100644
index 6ba5a9c7f1c..00000000000
@@ -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
-}
meta/recipes-extended/shadow/shadow_4.16.0.bb +224 -1

228 lines not on this page · raw message

Signature · 1 line
2.39.5
#9 lore raw

Patchtest results for [PATCH 09/11] shadow: merge .inc into .bb

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/09-11-shadow-merge-.inc-into-.bb.patch

FAIL: test lic files chksum modified not mentioned: LIC_FILES_CHKSUM changed without "License-Update:" tag and description in commit message (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)

PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!

#10 lore raw

PATCH 10/11 shadow: exclude pre-releases from version checks

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 meta/recipes-extended/shadow/shadow_4.16.0.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-extended/shadow/shadow_4.16.0.bb +1 -0
index 1fcf82bb01d..b7282d7933f 100644
@@ -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<pver>\d+(\.\d+)+)$"
 
 # Additional Policy files for PAM
 PAM_SRC_URI = "file://pam.d/chfn \
Signature · 1 line
2.39.5
#11 lore raw

PATCH 11/11 file: upgrade 5.45 -> 5.46

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

Drop patch merged upstream.

---
 .../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
meta/recipes-devtools/file/file_5.46.bb renamed from meta/recipes-devtools/file/file_5.45.bb +4 -3
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
@@ -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
meta/recipes-devtools/file/files/0001-PR-579-net147-Fix-stack-overrun.patch new file +33 -0
new file mode 100644
index 00000000000..57725b1c5f5
@@ -0,0 +1,33 @@
+From fc6b51aa67a11806c95363e1bec925d15b3a98a5 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <[email protected]>
+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 <[email protected]>
+---
+ 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;
meta/recipes-devtools/file/files/0001-Use-4-in-default-reset-previous-negative-offset-in-m.patch new file +93 -0

93 lines not on this page · raw message

meta/recipes-devtools/file/files/print_c.patch deleted +0 -27
deleted file mode 100644
index 760813f9c28..00000000000
@@ -1,27 +0,0 @@
-From e329257b8e22362b62e6c930447ef6feadd63f32 Mon Sep 17 00:00:00 2001
-From: Joe Slater <[email protected]>
-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 [[email protected]]
-
-Signed-off-by: Joe Slater <[email protected]>
----
- 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);
Signature · 1 line
2.39.5