From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: "Sven Püschel" <s.pueschel@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] pam: version bump 1.5.2 -> 1.7.1
Date: Thu, 23 Oct 2025 15:13:40 +0200 [thread overview]
Message-ID: <20251023131340.1212201-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20251021091750.1548881-1-s.pueschel@pengutronix.de>
Thanks, applied as 4e65c5f1631a2b93847507609cab223fedaf42f4.
Michael
[sent from post-receive hook]
On Thu, 23 Oct 2025 15:13:40 +0200, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> pam switched over to meson. Therefore adjust the options accordingly.
> As the release download were only necessary for autoconfig, switch to
> the automatically generated GitHub release archives.
>
> With the switch to meson the libnsl dependency is now required when
> enabling the NIS feature [1]. The library seemed to be optional in the
> autoconf build [2]. Therefore mark the feature as BROKEN for now.
>
> https://github.com/linux-pam/linux-pam/releases/tag/v1.5.3
> https://github.com/linux-pam/linux-pam/releases/tag/v1.6.0
> https://github.com/linux-pam/linux-pam/releases/tag/v1.6.1
> https://github.com/linux-pam/linux-pam/releases/tag/v1.7.0
> https://github.com/linux-pam/linux-pam/releases/tag/v1.7.1
>
> [1] https://github.com/linux-pam/linux-pam/blob/c4a53492e1b7aebcf7a65a778d9e3a78f196d117/meson.build#L465
> [2] https://github.com/linux-pam/linux-pam/blob/40f7d85f3736d058c26de1dafa4fed46de7d75ef/configure.ac#L441
>
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20251021091750.1548881-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/pam.in b/rules/pam.in
> index 4bf4cac100b4..efc6d95ef437 100644
> --- a/rules/pam.in
> +++ b/rules/pam.in
> @@ -4,6 +4,7 @@ menuconfig PAM
> tristate
> prompt "PAM "
> select DB if PAM_DB
> + select HOST_MESON
> select LIBC_CRYPT
> select LIBTIRPC if PAM_NIS
> help
> @@ -19,6 +20,8 @@ config PAM_DB
>
> config PAM_NIS
> bool
> + # requires libnsl after the meson migration (with autoconf it was an optional dependency)
> + depends on BROKEN
> prompt "enable NIS/YP support in pam_unix"
>
> endif
> diff --git a/rules/pam.make b/rules/pam.make
> index df86c8da0bc0..9c1f94a0b51f 100644
> --- a/rules/pam.make
> +++ b/rules/pam.make
> @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_PAM) += pam
> #
> # Paths and names
> #
> -PAM_VERSION := 1.5.2
> -PAM_MD5 := 895e8adfa14af334f679bbeb28503f66
> +PAM_VERSION := 1.7.1
> +PAM_MD5 := dacf0f92ca7f647f9f4e54397b417e0b
> PAM := Linux-PAM-$(PAM_VERSION)
> -PAM_SUFFIX := tar.xz
> -PAM_URL := https://github.com/linux-pam/linux-pam/releases/download/v$(PAM_VERSION)/$(PAM).$(PAM_SUFFIX)
> +PAM_SUFFIX := tar.gz
> +PAM_URL := https://github.com/linux-pam/linux-pam/archive/refs/tags/v$(PAM_VERSION).$(PAM_SUFFIX)
> PAM_SOURCE := $(SRCDIR)/$(PAM).$(PAM_SUFFIX)
> PAM_DIR := $(BUILDDIR)/$(PAM)
> PAM_LICENSE := BSD-3-Clause OR (GPL-2.0-or-later AND LGPL-2.0-or-later)
> @@ -30,31 +30,29 @@ PAM_LICENSE_FILES := \
> # Prepare
> # ----------------------------------------------------------------------------
>
> -PAM_CONF_ENV := \
> - $(CROSS_ENV) \
> - ac_cv_lib_nsl_yp_match=no
> -
> -#
> -# autoconf
> -#
> -PAM_CONF_TOOL := autoconf
> +PAM_CONF_TOOL := meson
> PAM_CONF_OPT := \
> - $(CROSS_AUTOCONF_USR) \
> - $(GLOBAL_LARGE_FILE_OPTION) \
> - --disable-Werror \
> - --disable-doc \
> - --disable-lckpwdf \
> - --disable-audit \
> - --$(call ptx/endis, PTXCONF_PAM_DB)-db \
> - --$(call ptx/endis, PTXCONF_PAM_NIS)-nis \
> - --disable-usergroups \
> - --disable-selinux \
> - --disable-econf \
> - --disable-openssl \
> - --disable-regenerate-docu \
> - --disable-nls \
> - --disable-rpath \
> - --enable-unix
> + $(CROSS_MESON_USR) \
> + -Di18n=disabled \
> + -Ddocs=disabled \
> + -Daudit=disabled \
> + -Deconf=disabled \
> + -Dlogind=disabled \
> + -Delogind=disabled \
> + -Dopenssl=disabled \
> + -Dselinux=disabled \
> + -Dnis=$(call ptx/endis, PTXCONF_PAM_NIS)d \
> + -Dexamples=false \
> + -Dlckpwdf=false \
> + -Dpam-debug=false \
> + -Dpamlocking=false \
> + -Dread-both-confs=false \
> + -Dusergroups=false \
> + -Dxtests=false \
> + -Duidmin=1000 \
> + -Dpam_userdb=$(call ptx/endis, PTXCONF_PAM_DB)d \
> + -Dpam_lastlog=disabled \
> + -Dpam_unix=enabled
>
> # ----------------------------------------------------------------------------
> # Target-Install
> @@ -84,7 +82,7 @@ $(STATEDIR)/pam.targetinstall:
> @$(call install_alternative, pam, 0, 0, 0644, /etc/security/pam_env.conf)
> @$(call install_alternative, pam, 0, 0, 0644, /etc/security/time.conf)
>
> - @$(call install_alternative, pam, 0, 0, 0755, /sbin/mkhomedir_helper)
> + @$(call install_alternative, pam, 0, 0, 0755, /usr/sbin/mkhomedir_helper)
>
> @$(call install_finish, pam)
>
prev parent reply other threads:[~2025-10-23 13:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-21 9:17 [ptxdist] [PATCH v2] " Sven Püschel
2025-10-23 13:13 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251023131340.1212201-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
--cc=s.pueschel@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox