[oe-core][PATCH] libsecret: add pam support depending on DISTRO_FEATURES

[oe-core][PATCH] libsecret: add pam support depending on DISTRO_FEATURES

[Markus Volk]

pam module has been ported from gnome-keyring to libsecret
[https://gitlab.gnome.org/GNOME/libsecret/-/commit/9a37dc839a9be1670afeb647d9f82b6ef1cd0893]

Add a PACKAGECONFIG for pam and enable it if pam is in
DISTRO_FEATURES

Add a patch that disables the pam test, because it would require
pam_wrapper recipe

[https://gitlab.com/cwrap/pam_wrapper]

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../libsecret/0001-pam-disable-tests.patch    | 71 +++++++++++++++++++
 .../libsecret/libsecret_0.21.4.bb             |  3 +
 2 files changed, 74 insertions(+)
 create mode 100644 meta/recipes-gnome/libsecret/libsecret/0001-pam-disable-tests.patch

diff --git a/meta/recipes-gnome/libsecret/libsecret/0001-pam-disable-tests.patch b/meta/recipes-gnome/libsecret/libsecret/0001-pam-disable-tests.patch
new file mode 100644
index 0000000000..28cf7c3651
--- /dev/null
+++ b/meta/recipes-gnome/libsecret/libsecret/0001-pam-disable-tests.patch
@@ -0,0 +1,71 @@
+From a028d36dc7b8d0bc33e674d2a0427b171aef2d32 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Wed, 20 Nov 2024 16:30:07 +0100
+Subject: [PATCH] pam/meson.build: disable tests
+
+Otherwise a recipe for pam_wrapper would be required:
+https://gitlab.com/cwrap/pam_wrapper
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+
+Upstream-Status Inappropriate [oe-specific]
+---
+ pam/meson.build | 42 +++++++++++++++++++++---------------------
+ 1 file changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/pam/meson.build b/pam/meson.build
+index 8413b58..06d41c4 100644
+--- a/pam/meson.build
++++ b/pam/meson.build
+@@ -19,27 +19,27 @@ pam_gnome_keyring = shared_library('pam_gnome_keyring',
+ )
+ 
+ # pam tests
+-pam_wrapper = dependency('pam_wrapper', required: true)
+-libpamtest = dependency('libpamtest', required: true)
++#pam_wrapper = dependency('pam_wrapper', required: true)
++#libpamtest = dependency('libpamtest', required: true)
+ 
+-subdir('servicedir')
++#subdir('servicedir')
+ 
+-test_bin = executable('pam_test',
+-  sources: [
+-    'test-pam.c',
+-  ],
+-  dependencies: [
+-    libpamtest,
+-    glib_deps,
+-  ],
+-)
++#test_bin = executable('pam_test',
++#  sources: [
++#    'test-pam.c',
++#  ],
++#  dependencies: [
++#    libpamtest,
++#    glib_deps,
++#  ],
++#)
+ 
+-test('pam-test',
+-  test_bin,
+-  env: {
+-    'LD_PRELOAD': 'libpam_wrapper.so',
+-    'PAM_WRAPPER': '1',
+-    'PAM_WRAPPER_DEBUGLEVEL': '5',
+-    'PAM_WRAPPER_SERVICE_DIR': meson.current_build_dir() + '/servicedir',
+-  },
+-)
++#test('pam-test',
++#  test_bin,
++#  env: {
++#    'LD_PRELOAD': 'libpam_wrapper.so',
++#    'PAM_WRAPPER': '1',
++#    'PAM_WRAPPER_DEBUGLEVEL': '5',
++#    'PAM_WRAPPER_SERVICE_DIR': meson.current_build_dir() + '/servicedir',
++#  },
++#)
+-- 
+2.47.0
+
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.21.4.bb b/meta/recipes-gnome/libsecret/libsecret_0.21.4.bb
index 88c3c73510..1bdd26d500 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.21.4.bb
+++ b/meta/recipes-gnome/libsecret/libsecret_0.21.4.bb
@@ -13,11 +13,14 @@ inherit gnomebase gi-docgen vala gobject-introspection manpages
 
 DEPENDS += "glib-2.0 libgcrypt gettext-native"
 
+SRC_URI += "file://0001-pam-disable-tests.patch"
 SRC_URI[archive.sha256sum] = "163d08d783be6d4ab9a979ceb5a4fecbc1d9660d3c34168c581301cd53912b20"
 
 GTKDOC_MESON_OPTION = 'gtk_doc'
 
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
 PACKAGECONFIG[manpages] = "-Dmanpage=true,-Dmanpage=false,libxslt-native xmlto-native"
+PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam"
 
 # http://errors.yoctoproject.org/Errors/Details/20228/
 ARM_INSTRUCTION_SET:armv4 = "arm"
-- 
2.47.0

Patchtest results for [oe-core][PATCH] libsecret: add pam support depending on DISTRO_FEATURES

[patchtest]

[-- Attachment #1: Type: text/plain, Size: 2913 bytes --]

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/libsecret-add-pam-support-depending-on-DISTRO_FEATURES.patch

FAIL: test Upstream-Status presence: Upstream-Status is Inappropriate, but no reason was provided (test_patch.TestPatch.test_upstream_status_presence_format)

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 CVE tag format (test_patch.TestPatch.test_cve_tag_format)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Signed-off-by presence (test_patch.TestPatch.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 lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
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 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!

Re: Patchtest results for [oe-core][PATCH] libsecret: add pam support depending on DISTRO_FEATURES

[Trevor Gamblin]

On 2024-11-20 13:46, Patchtest via lists.openembedded.org wrote:
> 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/libsecret-add-pam-support-depending-on-DISTRO_FEATURES.patch
>
> FAIL: test Upstream-Status presence: Upstream-Status is Inappropriate, but no reason was provided (test_patch.TestPatch.test_upstream_status_presence_format)
Seems like another false positive. Will file a bug.
>
> 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 CVE tag format (test_patch.TestPatch.test_cve_tag_format)
> PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
> PASS: test Signed-off-by presence (test_patch.TestPatch.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 lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
> 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 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!
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#207474): https://lists.openembedded.org/g/openembedded-core/message/207474
> Mute This Topic: https://lists.openembedded.org/mt/109689984/7611679
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [tgamblin@baylibre.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [oe-core][PATCH] libsecret: add pam support depending on DISTRO_FEATURES

[Mathieu Dubois-Briand]

On Wed, Nov 20, 2024 at 07:35:28PM +0100, Markus Volk wrote:
> pam module has been ported from gnome-keyring to libsecret
> [https://gitlab.gnome.org/GNOME/libsecret/-/commit/9a37dc839a9be1670afeb647d9f82b6ef1cd0893]
> 
> Add a PACKAGECONFIG for pam and enable it if pam is in
> DISTRO_FEATURES
> 
> Add a patch that disables the pam test, because it would require
> pam_wrapper recipe
> 
> [https://gitlab.com/cwrap/pam_wrapper]
> 
> Signed-off-by: Markus Volk <f_l_k@t-online.de>

Hi Markus,

> +Upstream-Status Inappropriate [oe-specific]

Still speaking of this Upstream-Status, I do get some error on the
autobuilder:

ERROR: libsecret-0.21.4-r0 do_patch: QA Issue: Malformed Upstream-Status in patch
/srv/pokybuild/yocto-worker/no-x11/build/meta/recipes-gnome/libsecret/libsecret/0001-pam-disable-tests.patch
Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status :
Upstream-Status Inappropriate [oe-specific] [patch-status]
ERROR: libsecret-0.21.4-r0 do_patch: Fatal QA errors were found, failing task.

https://valkyrie.yoctoproject.org/#/builders/25/builds/497/steps/11/logs/stdio

Can you check this, please ?

-- 
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [oe-core][PATCH] libsecret: add pam support depending on DISTRO_FEATURES

[Martin Jansa]

On Fri, Nov 22, 2024 at 8:35 AM Mathieu Dubois-Briand via
lists.openembedded.org
<mathieu.dubois-briand=bootlin.com@lists.openembedded.org> wrote:
>
> On Wed, Nov 20, 2024 at 07:35:28PM +0100, Markus Volk wrote:
> > pam module has been ported from gnome-keyring to libsecret
> > [https://gitlab.gnome.org/GNOME/libsecret/-/commit/9a37dc839a9be1670afeb647d9f82b6ef1cd0893]
> >
> > Add a PACKAGECONFIG for pam and enable it if pam is in
> > DISTRO_FEATURES
> >
> > Add a patch that disables the pam test, because it would require
> > pam_wrapper recipe
> >
> > [https://gitlab.com/cwrap/pam_wrapper]
> >
> > Signed-off-by: Markus Volk <f_l_k@t-online.de>
>
> Hi Markus,
>
> > +Upstream-Status Inappropriate [oe-specific]

It's the missing colon after Upstream-Status.

> Still speaking of this Upstream-Status, I do get some error on the
> autobuilder:
>
> ERROR: libsecret-0.21.4-r0 do_patch: QA Issue: Malformed Upstream-Status in patch
> /srv/pokybuild/yocto-worker/no-x11/build/meta/recipes-gnome/libsecret/libsecret/0001-pam-disable-tests.patch
> Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status :
> Upstream-Status Inappropriate [oe-specific] [patch-status]
> ERROR: libsecret-0.21.4-r0 do_patch: Fatal QA errors were found, failing task.
>
> https://valkyrie.yoctoproject.org/#/builders/25/builds/497/steps/11/logs/stdio
>
> Can you check this, please ?
>
> --
> Mathieu Dubois-Briand, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#207591): https://lists.openembedded.org/g/openembedded-core/message/207591
> Mute This Topic: https://lists.openembedded.org/mt/109689748/3617156
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [oe-core][PATCH] libsecret: add pam support depending on DISTRO_FEATURES

[Markus Volk]

[-- Attachment #1: Type: text/plain, Size: 200 bytes --]

On Fri, Nov 22 2024 at 08:53:57 AM +01:00:00, Martin Jansa 
<martin.jansa@gmail.com> wrote:
> It's the missing colon after Upstream-Status.

Oops, sorry. I completely overlooked that. Will send a v2


[-- Attachment #2: Type: text/html, Size: 367 bytes --]