From 377066dabd5eb8545645195ee231eb1017517fe4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 4 Dec 2024 07:49:14 +0100 Subject: libpam: update 1.6.1 -> 1.7.0 Change from autotools to meson. ptest support is removed for now, as pam-ptest isn't executed on the autobuilder. Adjust packaging as pam now installs everything into /usr rather than /. (From OE-Core rev: 00eb730291f9630eb70480d37ed48fbadecc547a) Signed-off-by: Alexander Kanavin Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- ...-correct-check-for-existence-of-two-prepr.patch | 40 +++++++++++++++++++ .../pam/libpam/libpam-xtests.patch | 45 ---------------------- 2 files changed, 40 insertions(+), 45 deletions(-) create mode 100644 meta/recipes-extended/pam/libpam/0001-meson.build-correct-check-for-existence-of-two-prepr.patch delete mode 100644 meta/recipes-extended/pam/libpam/libpam-xtests.patch (limited to 'meta/recipes-extended/pam/libpam') diff --git a/meta/recipes-extended/pam/libpam/0001-meson.build-correct-check-for-existence-of-two-prepr.patch b/meta/recipes-extended/pam/libpam/0001-meson.build-correct-check-for-existence-of-two-prepr.patch new file mode 100644 index 0000000000..ef087ffc06 --- /dev/null +++ b/meta/recipes-extended/pam/libpam/0001-meson.build-correct-check-for-existence-of-two-prepr.patch @@ -0,0 +1,40 @@ +From 9b5182d4781bcd6fb37a4030faf325965fde3e93 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 28 Nov 2024 20:32:17 +0100 +Subject: [PATCH] meson: correct check for existence of two preprocessor + defines + +sizeof is meant for *types*, and in case of cross compiling +the test program produced by it has incorrect syntax + __NR_keyctl something; +and will always fail to compile. + +* meson.build: Use cc.get_define() instead of cc.sizeof() to check for +preprocessor symbols. + +Co-authored-by: Dmitry V. Levin +Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/pull/861] +Signed-off-by: Alexander Kanavin +--- + meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index f6a7dafe9..307fed0aa 100644 +--- a/meson.build ++++ b/meson.build +@@ -198,12 +198,12 @@ foreach ident: check_functions + endif + endforeach + +-enable_pam_keyinit = cc.sizeof('__NR_keyctl', prefix: '#include ') > 0 ++enable_pam_keyinit = cc.get_define('__NR_keyctl', prefix: '#include ') != '' + + if get_option('mailspool') != '' + cdata.set_quoted('PAM_PATH_MAILDIR', get_option('mailspool')) + else +- have = cc.sizeof('_PATH_MAILDIR', prefix: '#include ') > 0 ++ have = cc.get_define('_PATH_MAILDIR', prefix: '#include ') != '' + cdata.set('PAM_PATH_MAILDIR', have ? '_PATH_MAILDIR' : '"/var/spool/mail"') + endif + diff --git a/meta/recipes-extended/pam/libpam/libpam-xtests.patch b/meta/recipes-extended/pam/libpam/libpam-xtests.patch deleted file mode 100644 index f2dafa72a5..0000000000 --- a/meta/recipes-extended/pam/libpam/libpam-xtests.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 060726f7e60c8ecb5bf50fd776910b290d9a0a69 Mon Sep 17 00:00:00 2001 -From: Kang Kai -Date: Tue, 19 Jul 2011 17:08:31 +0800 -Subject: [PATCH] This patch is used to create a new sub package libpam-xtests - to do more checks. - -Upstream-Status: Pending - -Signed-off-by: Kang Kai ---- - xtests/Makefile.am | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/xtests/Makefile.am b/xtests/Makefile.am -index acf9746..9826c9f 100644 ---- a/xtests/Makefile.am -+++ b/xtests/Makefile.am -@@ -8,7 +8,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_srcdir)/libpam/include \ - LDADD = $(top_builddir)/libpam/libpam.la \ - $(top_builddir)/libpam_misc/libpam_misc.la - --CLEANFILES = *~ $(XTESTS) -+CLEANFILES = *~ - - EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \ - tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \ -@@ -55,3 +55,18 @@ EXTRA_PROGRAMS = $(XTESTS) - - xtests: $(XTESTS) run-xtests.sh - "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS} -+ -+all: $(XTESTS) -+ -+install: install_xtests -+ -+install_xtests: -+ $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/xtests -+ for file in $(EXTRA_DIST) ; do \ -+ $(INSTALL) $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/xtests ; \ -+ done -+ for file in $(XTESTS); do \ -+ $(INSTALL) .libs/$$file $(DESTDIR)$(pkgdatadir)/xtests ; \ -+ done -+ -+.PHONY: all install_xtests -- cgit v1.2.3-54-g00ecf