* [PATCH 1/2] libpwquality: import recipe from meta-oe
2026-09-11 8:51 [PATCH 0/2] epiphany: upgrade to 51.0 and import libpwquality Jaipaul Cheernam
@ 2026-09-11 8:51 ` Jaipaul Cheernam
2026-09-11 9:01 ` Patchtest results for " patchtest
2026-09-13 21:25 ` [OE-core] " Marko, Peter
2026-09-11 8:51 ` [PATCH 2/2] epiphany: upgrade 50.6 -> 51.0 Jaipaul Cheernam
1 sibling, 2 replies; 5+ messages in thread
From: Jaipaul Cheernam @ 2026-09-11 8:51 UTC (permalink / raw)
To: openembedded-core
epiphany 51.0 adds an unconditional dependency on pwquality [1]
Changes from the meta-oe version:
- add SUMMARY (required by recipe QA in OE-Core)
- add maintainer entry
[1] https://github.com/GNOME/epiphany/commit/683e9a076fa3
Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
---
meta/conf/distro/include/maintainers.inc | 1 +
...-Use-setuptools-instead-of-distutils.patch | 78 +++++++++++++++++++
...02-Makefile.am-respect-PYTHONSITEDIR.patch | 26 +++++++
.../libpwquality/libpwquality_1.4.5.bb | 40 ++++++++++
4 files changed, 145 insertions(+)
create mode 100644 meta/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch
create mode 100644 meta/recipes-extended/libpwquality/files/0002-Makefile.am-respect-PYTHONSITEDIR.patch
create mode 100644 meta/recipes-extended/libpwquality/libpwquality_1.4.5.bb
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 40d62042bd..4773df92fd 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -387,6 +387,7 @@ RECIPE_MAINTAINER:pn-libproxy = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-libpsl = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-libpthread-stubs = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-libptytty = "Unassigned <unassigned@yoctoproject.org>"
+RECIPE_MAINTAINER:pn-libpwquality = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-librepo = "Wang Mingyu <wangmy@fujitsu.com>"
RECIPE_MAINTAINER:pn-librsvg = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-libsamplerate0 = "Unassigned <unassigned@yoctoproject.org>"
diff --git a/meta/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch b/meta/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch
new file mode 100644
index 0000000000..7eaca66b5c
--- /dev/null
+++ b/meta/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch
@@ -0,0 +1,78 @@
+From ad95b7684365dea8335c34527d4c1463c1668af0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Fri, 31 Mar 2023 14:52:19 +0200
+Subject: [PATCH] Use setuptools instead of distutils
+
+distutils is removed from Python 3.12+:
+https://peps.python.org/pep-0632/
+
+Upstream-Status: Backport [https://github.com/libpwquality/libpwquality/commit/7b5e0f0097faebdcc6a8b783237bbba7a983147a]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ libpwquality.spec.in | 11 ++---------
+ python/Makefile.am | 2 +-
+ python/setup.py.in | 6 +++---
+ 3 files changed, 6 insertions(+), 13 deletions(-)
+
+diff --git a/libpwquality.spec.in b/libpwquality.spec.in
+index 70a6f53..0809126 100644
+--- a/libpwquality.spec.in
++++ b/libpwquality.spec.in
+@@ -33,9 +33,11 @@ BuildRequires: gettext
+ BuildRequires: pam-devel
+ %if %{with python2}
+ BuildRequires: python2-devel
++BuildRequires: python2-setuptools
+ %endif
+ %if %{with python3}
+ BuildRequires: python3-devel
++BuildRequires: python3-setuptools
+ %endif
+
+ URL: https://github.com/libpwquality/libpwquality/
+@@ -103,15 +105,6 @@ cp -a . %{py3dir}
+ pushd %{py3dir}
+ %endif
+ %if %{with python3}
+-# setuptools >= 60 changes the environment to use its bundled copy of distutils
+-# by default, not the Python-bundled one. To run the Python's standard library
+-# distutils, the environment variable must be set.
+-# Although technically setuptools is not needed for this package, if it's
+-# pulled by another package, it changes the environment and consequently,
+-# the build fails. This was reported in:
+-# https://github.com/pypa/setuptools/issues/3143
+-export SETUPTOOLS_USE_DISTUTILS=stdlib
+-
+ %configure \
+ --with-securedir=%{_moduledir} \
+ --with-pythonsitedir=%{python3_sitearch} \
+diff --git a/python/Makefile.am b/python/Makefile.am
+index 1d00c0c..6e51744 100644
+--- a/python/Makefile.am
++++ b/python/Makefile.am
+@@ -14,7 +14,7 @@ all-local:
+ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV)
+
+ install-exec-local:
+- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix}
++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix}
+
+ clean-local:
+ rm -rf py$(PYTHONREV)
+diff --git a/python/setup.py.in b/python/setup.py.in
+index a741b91..f934c50 100755
+--- a/python/setup.py.in
++++ b/python/setup.py.in
+@@ -6,9 +6,9 @@
+
+ import os
+
+-from distutils.core import setup, Extension
+-from distutils.command.build_ext import build_ext as _build_ext
+-from distutils.command.sdist import sdist as _sdist
++from setuptools import setup, Extension
++from setuptools.command.build_ext import build_ext as _build_ext
++from setuptools.command.sdist import sdist as _sdist
+
+ def genconstants(headerfile, outputfile):
+ hf = open(headerfile, 'r')
diff --git a/meta/recipes-extended/libpwquality/files/0002-Makefile.am-respect-PYTHONSITEDIR.patch b/meta/recipes-extended/libpwquality/files/0002-Makefile.am-respect-PYTHONSITEDIR.patch
new file mode 100644
index 0000000000..cd59a6d887
--- /dev/null
+++ b/meta/recipes-extended/libpwquality/files/0002-Makefile.am-respect-PYTHONSITEDIR.patch
@@ -0,0 +1,26 @@
+From edc51ba1b446913232cdf2945f485392bca72dc7 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Mon, 3 Aug 2015 13:43:14 +0800
+Subject: [PATCH] Makefile.am: respect ${PYTHONSITEDIR}
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+Upstream-Status: Backport [https://github.com/libpwquality/libpwquality/commit/5192eab011ada47b0157f8d0524bf5b18bba3bd0]
+
+ python/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/Makefile.am b/python/Makefile.am
+index 6e51744..0a3bad5 100644
+--- a/python/Makefile.am
++++ b/python/Makefile.am
+@@ -14,7 +14,7 @@ all-local:
+ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV)
+
+ install-exec-local:
+- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix}
++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix} --install-lib=$(pythonsitedir)
+
+ clean-local:
+ rm -rf py$(PYTHONREV)
diff --git a/meta/recipes-extended/libpwquality/libpwquality_1.4.5.bb b/meta/recipes-extended/libpwquality/libpwquality_1.4.5.bb
new file mode 100644
index 0000000000..a303b9e758
--- /dev/null
+++ b/meta/recipes-extended/libpwquality/libpwquality_1.4.5.bb
@@ -0,0 +1,40 @@
+SUMMARY = "Password quality checking and random password generation library"
+DESCRIPTION = "Library for password quality checking and generating random passwords"
+HOMEPAGE = "https://github.com/libpwquality/libpwquality"
+SECTION = "devel/lib"
+
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bd2f1386df813a459a0c34fde676fc2"
+
+DEPENDS = "cracklib"
+
+SRC_URI = "git://github.com/libpwquality/libpwquality;branch=master;protocol=https \
+ file://0001-Use-setuptools-instead-of-distutils.patch \
+ file://0002-Makefile.am-respect-PYTHONSITEDIR.patch \
+"
+SRCREV = "5490e96a3dd6ed7371435ca5b3ccef98bdb48b5a"
+
+
+inherit autotools-brokensep gettext
+inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'setuptools3-base', '', d)}
+
+do_configure:prepend() {
+ cp ${STAGING_DATADIR_NATIVE}/gettext/ABOUT-NLS ${AUTOTOOLS_AUXDIR}/
+}
+
+export PYTHON_DIR
+export BUILD_SYS
+export HOST_SYS
+
+EXTRA_OECONF += "--libdir=${libdir} \
+ --with-securedir=${base_libdir}/security \
+"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} python3"
+PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam"
+PACKAGECONFIG[python3] = "--enable-python-bindings --with-python-rev=${PYTHON_BASEVERSION} --with-python-binary=${STAGING_BINDIR_NATIVE}/python3-native/python3 --with-pythonsitedir=${PYTHON_SITEPACKAGES_DIR},--disable-python-bindings,python3-setuptools-native"
+
+FILES:${PN} += "${base_libdir}/security/pam_pwquality.so"
+FILES:${PN}-dbg += "${base_libdir}/security/.debug"
+FILES:${PN}-staticdev += "${base_libdir}/security/pam_pwquality.a"
+FILES:${PN}-dev += "${base_libdir}/security/pam_pwquality.la"
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] epiphany: upgrade 50.6 -> 51.0
2026-09-11 8:51 [PATCH 0/2] epiphany: upgrade to 51.0 and import libpwquality Jaipaul Cheernam
2026-09-11 8:51 ` [PATCH 1/2] libpwquality: import recipe from meta-oe Jaipaul Cheernam
@ 2026-09-11 8:51 ` Jaipaul Cheernam
1 sibling, 0 replies; 5+ messages in thread
From: Jaipaul Cheernam @ 2026-09-11 8:51 UTC (permalink / raw)
To: openembedded-core
CompareLog: https://github.com/GNOME/epiphany/compare/50.6...51.0
- 51.0 adds a new mandatory dependency on pwquality [1] so add
libpwquality to DEPENDS.
libpwquality was imported into OE-Core in the preceding patch.
[1] https://github.com/GNOME/epiphany/commit/683e9a076fa3
Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
---
.../epiphany/{epiphany_50.6.bb => epiphany_51.0.bb} | 3 ++-
.../0002-help-meson.build-disable-the-use-of-yelp.patch | 2 +-
meta/recipes-gnome/epiphany/files/distributor.patch | 4 ++--
meta/recipes-gnome/epiphany/files/migrator.patch | 6 +++---
4 files changed, 8 insertions(+), 7 deletions(-)
rename meta/recipes-gnome/epiphany/{epiphany_50.6.bb => epiphany_51.0.bb} (92%)
diff --git a/meta/recipes-gnome/epiphany/epiphany_50.6.bb b/meta/recipes-gnome/epiphany/epiphany_51.0.bb
similarity index 92%
rename from meta/recipes-gnome/epiphany/epiphany_50.6.bb
rename to meta/recipes-gnome/epiphany/epiphany_51.0.bb
index ad0fad1a65..63ec9bb100 100644
--- a/meta/recipes-gnome/epiphany/epiphany_50.6.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_51.0.bb
@@ -15,6 +15,7 @@ DEPENDS = " \
libadwaita \
libarchive \
libportal \
+ libpwquality \
libsoup \
glib-2.0-native \
coreutils-native \
@@ -31,7 +32,7 @@ SRC_URI += "\
file://migrator.patch \
file://distributor.patch \
"
-SRC_URI[archive.sha256sum] = "458222a8694cfc914e7a2d6de9879067001a8d65e00a907d96112059c67ad446"
+SRC_URI[archive.sha256sum] = "abaf33576462030c65bb963a56300a7786e7d75834f1c90a9dffda873835c33d"
export GI_TYPELIB_PATH = "${STAGING_LIBDIR}/girepository-1.0/"
diff --git a/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch b/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch
index 12e9d98233..bdb06e407b 100644
--- a/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch
+++ b/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch
@@ -1,4 +1,4 @@
-From 9e51ca47efc74fedb420e6b66436569d56623e2d Mon Sep 17 00:00:00 2001
+From 2bb52be1e80d1f4693a383be8270e80ef1d9586a Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 31 Jan 2018 15:50:38 +0200
Subject: [PATCH] help/meson.build: disable the use of yelp
diff --git a/meta/recipes-gnome/epiphany/files/distributor.patch b/meta/recipes-gnome/epiphany/files/distributor.patch
index b16552bfc6..8677f1558c 100644
--- a/meta/recipes-gnome/epiphany/files/distributor.patch
+++ b/meta/recipes-gnome/epiphany/files/distributor.patch
@@ -1,4 +1,4 @@
-From cc0b9a6904297387068274c802784eea740782a1 Mon Sep 17 00:00:00 2001
+From 2f52672597ab74cb17e41d308f8d9934c25d8fc0 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 26 Feb 2021 10:17:52 +0000
Subject: [PATCH] Don't encode the distro from /etc/os-release into the
@@ -11,7 +11,7 @@ RP 2021/2/26
1 file changed, 1 insertion(+)
diff --git a/meson.build b/meson.build
-index c02b591..8af9fe7 100644
+index 8aec3cf..4a06ab6 100644
--- a/meson.build
+++ b/meson.build
@@ -15,6 +15,7 @@ if r.returncode() == 0
diff --git a/meta/recipes-gnome/epiphany/files/migrator.patch b/meta/recipes-gnome/epiphany/files/migrator.patch
index b20cc3058b..dcc162040a 100644
--- a/meta/recipes-gnome/epiphany/files/migrator.patch
+++ b/meta/recipes-gnome/epiphany/files/migrator.patch
@@ -1,4 +1,4 @@
-From 12ead2afbdab96eeb6bac820c39c1e951a047c8b Mon Sep 17 00:00:00 2001
+From e336c2dd1368aff496a6ba01e2ca9ca7e88860a2 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 25 Feb 2021 14:52:32 +0000
Subject: [PATCH] epiphany: Fix reproducibility issue
@@ -14,10 +14,10 @@ RP 2021/2/25
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/ephy-profile-utils.c b/lib/ephy-profile-utils.c
-index ea2ea99..13c27c8 100644
+index 1966108..24d4364 100644
--- a/lib/ephy-profile-utils.c
+++ b/lib/ephy-profile-utils.c
-@@ -130,10 +130,10 @@ ephy_profile_utils_do_migration (const char *profile_directory,
+@@ -131,10 +131,10 @@ ephy_profile_utils_do_migration (const char *profile_directory,
argv[i++] = NULL;
#if DEVELOPER_MODE
^ permalink raw reply related [flat|nested] 5+ messages in thread