package/linux-pam: backport upstream patch to fix build issue
PATCH 1/3 package/linux-pam: backport upstream patch to fix build issue
We are seeing build issues with linux-pam in the autobuilders such as:
md5_crypt.c: In function 'Goodcrypt_md5':
md5_crypt.c:145:13: error: implicit declaration of function 'asprintf'; did you mean 'vsprintf'? [-Wimplicit-function-declaration]
145 | if (asprintf(&passwd, "%s%.*s$%s", magic, sl, sp, buf) < 0)
| ^~~~~~~~
| vsprintfThis is due to the fact that <stdio.h> gets included without _GNU_SOURCE being defined, and so the prototype of asprintf() is not accessible, at least with uclibc-ng.
The _GNU_SOURCE definition is properly in linux-pam's config.h, but config.h doesn't get properly included first everywhere. This issue has been fixed upstream in the mean time, so we simply backport the upstream patch.
Fixes:
http://autobuild.buildroot.net/results/49b190b3fbae3cdca4c7a08b3ab5100a937ede9e/
--- ...-consistently-include-config.h-first.patch | 180 ++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 package/linux-pam/0001-build-consistently-include-config.h-first.patch
package/linux-pam/0001-build-consistently-include-config.h-first.patch new file +180 -0
@@ -0,0 +1,180 @@ +From cdba2c8cdba9b3500595624fb375c0dda266631b Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" <[email protected]> +Date: Fri, 30 Aug 2024 08:00:00 +0000 +Subject: [PATCH] build: consistently include config.h first + +Make sure that config.h is included before any system header. + +Upstream: https://github.com/linux-pam/linux-pam/commit/5d7eefb1883c557c7a027f68e966e2fae294a9b6 +Signed-off-by: Thomas Petazzoni <[email protected]> +--- + libpam/pam_prelude.c | 8 ++++---- + modules/pam_namespace/argv_parse.c | 2 ++ + modules/pam_setquota/pam_setquota.c | 3 ++- + modules/pam_timestamp/sha1.c | 2 +- + modules/pam_unix/audit.c | 3 +-- + modules/pam_unix/bigcrypt_main.c | 2 ++ + modules/pam_unix/md5.c | 4 ++-- + modules/pam_unix/md5_crypt.c | 2 +- + modules/pam_unix/yppasswd.h | 2 ++ + 9 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/libpam/pam_prelude.c b/libpam/pam_prelude.c +index 6c73bf5d..c62e2f2c 100644 +--- a/libpam/pam_prelude.c ++++ b/libpam/pam_prelude.c +@@ -5,17 +5,17 @@ + * (C) Sebastien Tricaud 2005 <[email protected]> + */ + +-#include <stdio.h> +-#include <syslog.h> +- + #ifdef PRELUDE + ++#include "pam_private.h" ++ ++#include <stdio.h> ++#include <syslog.h> + #include <libprelude/prelude.h> + #include <libprelude/prelude-log.h> + #include <libprelude/idmef-message-print.h> + + #include "pam_prelude.h" +-#include "pam_private.h" + + + #define ANALYZER_CLASS "pam" +diff --git a/modules/pam_namespace/argv_parse.c b/modules/pam_namespace/argv_parse.c +index ac7c9ae0..cbae7831 100644 +--- a/modules/pam_namespace/argv_parse.c ++++ b/modules/pam_namespace/argv_parse.c +@@ -28,6 +28,8 @@ + * Version 1.1, modified 2/27/1999 + */ + ++#include "config.h" ++ + #include <limits.h> + #include <stdlib.h> + #include <ctype.h> +diff --git a/modules/pam_setquota/pam_setquota.c b/modules/pam_setquota/pam_setquota.c +index c15fc669..73445e29 100644 +--- a/modules/pam_setquota/pam_setquota.c ++++ b/modules/pam_setquota/pam_setquota.c +@@ -8,6 +8,8 @@ + Copyright © 2016 Keller Fuchs <[email protected]> + */ + ++#include "pam_inline.h" ++ + #include <sys/types.h> + #include <sys/quota.h> + #include <linux/quota.h> +@@ -22,7 +24,6 @@ + #include <security/_pam_macros.h> + #include <security/pam_ext.h> + #include <security/pam_modutil.h> +-#include "pam_inline.h" + + #ifndef PATH_LOGIN_DEFS + # define PATH_LOGIN_DEFS "/etc/login.defs" +diff --git a/modules/pam_timestamp/sha1.c b/modules/pam_timestamp/sha1.c +index dff454cf..f21b2870 100644 +--- a/modules/pam_timestamp/sha1.c ++++ b/modules/pam_timestamp/sha1.c +@@ -37,6 +37,7 @@ + */ + /* See http://www.itl.nist.gov/fipspubs/fip180-1.htm for descriptions. */ + ++#include "pam_inline.h" + #include <sys/types.h> + #include <sys/stat.h> + #include <netinet/in.h> +@@ -47,7 +48,6 @@ + #include <endian.h> + #include <unistd.h> + #include "sha1.h" +-#include "pam_inline.h" + + static const unsigned char + padding[SHA1_BLOCK_SIZE] = { +diff --git a/modules/pam_unix/audit.c b/modules/pam_unix/audit.c +index 1547a652..9513aaa9 100644 +--- a/modules/pam_unix/audit.c ++++ b/modules/pam_unix/audit.c +@@ -1,5 +1,3 @@ +-#include "audit.h" +- + #include "config.h" + + #ifdef HAVE_LIBAUDIT +@@ -11,6 +9,7 @@ + + #include <security/_pam_types.h> + ++#include "audit.h" + #include "passverify.h" + + int audit_log(int type, const char *uname, int retval) +diff --git a/modules/pam_unix/bigcrypt_main.c b/modules/pam_unix/bigcrypt_main.c +index fab212d9..22d325da 100644 +--- a/modules/pam_unix/bigcrypt_main.c ++++ b/modules/pam_unix/bigcrypt_main.c +@@ -1,3 +1,5 @@ ++#include "config.h" ++ + #include <stdio.h> + #include <string.h> + +diff --git a/modules/pam_unix/md5.c b/modules/pam_unix/md5.c +index 95b8de4c..78e9af27 100644 +--- a/modules/pam_unix/md5.c ++++ b/modules/pam_unix/md5.c +@@ -18,11 +18,11 @@ + * + */ + ++#include "pam_inline.h" ++ + #include <string.h> + #include "md5.h" + +-#include "pam_inline.h" +- + #ifndef HIGHFIRST + #define byteReverse(buf, len) /* Nothing */ + #else +diff --git a/modules/pam_unix/md5_crypt.c b/modules/pam_unix/md5_crypt.c +index 9a6bd4f9..9451f376 100644 +--- a/modules/pam_unix/md5_crypt.c ++++ b/modules/pam_unix/md5_crypt.c +@@ -12,11 +12,11 @@ + * + */ + ++#include "pam_inline.h" + #include <string.h> + #include <stdio.h> + #include <stdlib.h> + #include "md5.h" +-#include "pam_inline.h" + + static const unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ + "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; +diff --git a/modules/pam_unix/yppasswd.h b/modules/pam_unix/yppasswd.h +index dc686cd7..3a40c3ea 100644 +--- a/modules/pam_unix/yppasswd.h ++++ b/modules/pam_unix/yppasswd.h +@@ -6,6 +6,8 @@ + #ifndef _YPPASSWD_H_RPCGEN + #define _YPPASSWD_H_RPCGEN + ++#include "config.h" ++ + #include <rpc/rpc.h> + + +-- +2.47.1 +
Signature · 6 lines
2.47.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 2/3 package/libxcrypt: make available only with glibc
libxcrypt has been added as a replacement for the libcrypt implementation that was part of glibc, but dropped from glibc starting from version 2.39.
However, libxcrypt was made available for all C libraries, and this is unfortunately causing some problems as it can clash with the libcrypt implementation provided by the C library.
In particular, linux-pam has been consistently failing with uclibc, in BR2_PER_PACKAGE_DIRECTORIES=y builds, with the following build failure:
opasswd.c: In function 'compare_password':
opasswd.c:133:27: error: invalid application of 'sizeof' to incomplete type 'struct crypt_data'
What happens is relatively tricky, but let's try to break it down:
- uclibc-ng install a stub libcrypt.a (no shared variant, as for shared libraries, everything is in libc.so), and crypt.h
- libxcrypt installs libcrypt.so.* and crypt.h
So there is no "clash" on the library itself, but there is a clash on the header file.
Since we're using BR2_PER_PACKAGE_DIRECTORIES=y, when building linux-pam, we are creating the per-package STAGING_DIR by copying the STAGING_DIR of linux-pam dependencies, i.e both the libxcrypt STAGING_DIR and the uclibc-ng STAGING_DIR. But the latter ends up being copied last, which means that at the end of the day, we have in the per-package STAGING_DIR of linux-pam:
- The libcrypt.so from libxcrypt
- The crypt.h header from uclibc-ng
- The libcrypt.a from uclibc-ng
When the ./configure script of linux-pam tests whether the library has crypt_r(), it concludes that yes it's available: and indeed libcrypt.so from libxcrypt has it.
So it tries to use 'struct crypt_data' and 'crypt_r()', but those are not supported in uClibc-ng, and so cannot be found in the <crypt.h> header. So even if the ./configure script and the linux-pam code has some logic to fallback to crypt() if crypt_r() isn't available, this fallback doesn't trigger because the installed libcrypt.so does have crypt_r().
Basically what happens is that uclibc-ng + libxcrypt is a combo that violates a golden rule of our BR2_PER_PACKAGE_DIRECTORIES=y
implementation: packages shouldn't overwrite files from each other.
To avoid this situation, we make libxcrypt only installable on glibc. This isn't a problem because as of today, BR2_PACKAGE_LIBXCRYPT is always selected "if BR2_TOOLCHAIN_USES_GLIBC".
It should be noted though that the case of an older glibc (which still had its own internal libcrypt) + libxcrypt continues to exist. It's less likely to cause trouble though, as the libcrypt implementations are much more similar.
Fixes:
http://autobuild.buildroot.net/results/560f66b0311d02dc884732221d6870ae3c38067c/
Note: we do not add a Config.in comment for this glibc dependency, because libxcrypt really is a "replacement" library to fill in the void left by libcrypt's removal from glibc. There isn't realy a point showing "libxcrypt needs a toolchain w/ glibc", because with musl or uclibc-ng, the libcrypt functionality is directly part of the C library.
--- package/libxcrypt/Config.in | 1 + 1 file changed, 1 insertion(+)
package/libxcrypt/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBXCRYPT bool "libxcrypt" + depends on BR2_TOOLCHAIN_USES_GLIBC help libxcrypt is a modern library for one-way hashing of passwords. It supports a wide variety of both
Signature · 6 lines
2.47.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH 2/3] package/libxcrypt: make available only with glibc
Quoted 65 lines · Thomas Petazzoni via buildroot
libxcrypt has been added as a replacement for the libcrypt implementation that was part of glibc, but dropped from glibc starting from version 2.39.
However, libxcrypt was made available for all C libraries, and this is unfortunately causing some problems as it can clash with the libcrypt implementation provided by the C library.
In particular, linux-pam has been consistently failing with uclibc, in BR2_PER_PACKAGE_DIRECTORIES=y builds, with the following build failure:
opasswd.c: In function 'compare_password':
opasswd.c:133:27: error: invalid application of 'sizeof' to incomplete type 'structcrypt_data'What happens is relatively tricky, but let's try to break it down:
- uclibc-ng install a stub libcrypt.a (no shared variant, as for shared libraries, everything is in libc.so), and
crypt.h- libxcrypt installs libcrypt.so.* and
crypt.hSo there is no "clash" on the library itself, but there is a clash on the header file.
Since we're using BR2_PER_PACKAGE_DIRECTORIES=y, when building linux-pam, we are creating the per-package
STAGING_DIRby copying theSTAGING_DIRof linux-pam dependencies, i.e both the libxcryptSTAGING_DIRand the uclibc-ngSTAGING_DIR. But the latter ends up being copied last, which means that at the end of the day, we have in the per-packageSTAGING_DIRof linux-pam:- The libcrypt.so from libxcrypt
- Thecrypt.hheader from uclibc-ng
- The libcrypt.a from uclibc-ngWhen the ./configure script of linux-pam tests whether the library has
crypt_r(), it concludes that yes it's available: and indeed libcrypt.so from libxcrypt has it.So it tries to use 'struct
crypt_data' and 'crypt_r()', but those are not supported in uClibc-ng, and so cannot be found in the <crypt.h> header. So even if the ./configure script and the linux-pam code has some logic to fallback tocrypt()ifcrypt_r()isn't available, this fallback doesn't trigger because the installed libcrypt.so does havecrypt_r().Basically what happens is that uclibc-ng + libxcrypt is a combo that violates a golden rule of our BR2_PER_PACKAGE_DIRECTORIES=y
implementation: packages shouldn't overwrite files from each other.To avoid this situation, we make libxcrypt only installable on glibc. This isn't a problem because as of today,
BR2_PACKAGE_LIBXCRYPTis always selected "ifBR2_TOOLCHAIN_USES_GLIBC".It should be noted though that the case of an older glibc (which still had its own internal libcrypt) + libxcrypt continues to exist. It's less likely to cause trouble though, as the libcrypt implementations are much more similar.
Fixes:
http://autobuild.buildroot.net/results/560f66b0311d02dc884732221d6870ae3c38067c/
Quoted 8 lines
Note: we do not add a Config.in comment for this glibc dependency, because libxcrypt really is a "replacement" library to fill in the void left by libcrypt's removal from glibc. There isn't realy a point showing "libxcrypt needs a toolchain w/ glibc", because with musl or uclibc-ng, the libcrypt functionality is directly part of the C library.
Signed-off-by Thomas Petazzoni <[email protected]>
Applied to master, thanks.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH 2/3] package/libxcrypt: make available only with glibc
In reply to Thomas Petazzoni via buildrootQuoted 64 lines · Thomas Petazzoni via buildroot
libxcrypt has been added as a replacement for the libcrypt implementation that was part of glibc, but dropped from glibc starting from version 2.39.
However, libxcrypt was made available for all C libraries, and this is unfortunately causing some problems as it can clash with the libcrypt implementation provided by the C library.
In particular, linux-pam has been consistently failing with uclibc, in BR2_PER_PACKAGE_DIRECTORIES=y builds, with the following build failure:
opasswd.c: In function 'compare_password':
opasswd.c:133:27: error: invalid application of 'sizeof' to incomplete type 'structcrypt_data'What happens is relatively tricky, but let's try to break it down:
- uclibc-ng install a stub libcrypt.a (no shared variant, as for shared libraries, everything is in libc.so), and
crypt.h- libxcrypt installs libcrypt.so.* and
crypt.hSo there is no "clash" on the library itself, but there is a clash on the header file.
Since we're using BR2_PER_PACKAGE_DIRECTORIES=y, when building linux-pam, we are creating the per-package
STAGING_DIRby copying theSTAGING_DIRof linux-pam dependencies, i.e both the libxcryptSTAGING_DIRand the uclibc-ngSTAGING_DIR. But the latter ends up being copied last, which means that at the end of the day, we have in the per-packageSTAGING_DIRof linux-pam:- The libcrypt.so from libxcrypt
- Thecrypt.hheader from uclibc-ng
- The libcrypt.a from uclibc-ngWhen the ./configure script of linux-pam tests whether the library has
crypt_r(), it concludes that yes it's available: and indeed libcrypt.so from libxcrypt has it.So it tries to use 'struct
crypt_data' and 'crypt_r()', but those are not supported in uClibc-ng, and so cannot be found in the <crypt.h> header. So even if the ./configure script and the linux-pam code has some logic to fallback tocrypt()ifcrypt_r()isn't available, this fallback doesn't trigger because the installed libcrypt.so does havecrypt_r().Basically what happens is that uclibc-ng + libxcrypt is a combo that violates a golden rule of our BR2_PER_PACKAGE_DIRECTORIES=y
implementation: packages shouldn't overwrite files from each other.To avoid this situation, we make libxcrypt only installable on glibc. This isn't a problem because as of today,
BR2_PACKAGE_LIBXCRYPTis always selected "ifBR2_TOOLCHAIN_USES_GLIBC".It should be noted though that the case of an older glibc (which still had its own internal libcrypt) + libxcrypt continues to exist. It's less likely to cause trouble though, as the libcrypt implementations are much more similar.
Fixes:
http://autobuild.buildroot.net/results/560f66b0311d02dc884732221d6870ae3c38067c/
Quoted 8 lines
Note: we do not add a Config.in comment for this glibc dependency, because libxcrypt really is a "replacement" library to fill in the void left by libcrypt's removal from glibc. There isn't realy a point showing "libxcrypt needs a toolchain w/ glibc", because with musl or uclibc-ng, the libcrypt functionality is directly part of the C library.
Signed-off-by Thomas Petazzoni <[email protected]>
Committed to 2024.02.x and 2024.11.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 3/3 package/linux-pam: bump to version 1.7.0
In reply to Thomas Petazzoni via buildrootChanges from 1.6.1 to 1.7.0:
build: changed build system from autotools to meson.
libpam_misc: use ECHOCTL in the terminal input
pam_access: support UID and GID in access.conf
pam_env: install environment file in vendordir if vendordir is enabled
pam_issue: only count class user if logind support is enabled
pam_limits: use systemd-logind instead of utmp if logind support is enabled
pam_unix: compare password hashes in constant time
Multiple minor bug fixes, build fixes, portability fixes, documentation improvements, and translation updates.
Clearly from a Buildroot standpoint, the most significant change is the migration from autotools (no longer supported) to meson.
This deserves a few explanations:
* --disable-prelude option no longer exists
* --disable-isadir but is documented as Arch-specific PAM modules directory, relative to SECUREDIR, which seems odd to use. It has been set since the package was introduced in 04be7f0f8ca100afaf06b264332bc2cd61fbb3d0, with no specific explanation.
* --disable-nis is preserved
* --disable-db doesn't exist, it can only take a number of values, including "auto"
* --disable-regenerate-docu doesn't exist, but -Ddocs=disabled is passed
* -Di18n is now handled, and LINUX_PAM_LDFLAGS is used to pass TARGET_NLS_LIBS
* We continue to use --libdir and not -Dlibdir because meson-package already passes "--libdir=lib" and we can't override that with -Dlibdir (it fails at configure time), so we have to override with --libdir.
Also: existing patch 0001 is dropped as it's upstream, part of 1.7.0, but another upstream backport is added to fix -Di18n=disabled builds.
--- ...-consistently-include-config.h-first.patch | 180 ------------------ ...-meson-fix-build-with-Di18n-disabled.patch | 30 +++ package/linux-pam/linux-pam.hash | 6 +- package/linux-pam/linux-pam.mk | 46 +++-- 4 files changed, 60 insertions(+), 202 deletions(-) delete mode 100644 package/linux-pam/0001-build-consistently-include-config.h-first.patch create mode 100644 package/linux-pam/0001-meson-fix-build-with-Di18n-disabled.patch
package/linux-pam/0001-build-consistently-include-config.h-first.patch deleted +0 -180
@@ -1,180 +0,0 @@ -From cdba2c8cdba9b3500595624fb375c0dda266631b Mon Sep 17 00:00:00 2001 -From: "Dmitry V. Levin" <[email protected]> -Date: Fri, 30 Aug 2024 08:00:00 +0000 -Subject: [PATCH] build: consistently include config.h first - -Make sure that config.h is included before any system header. - -Upstream: https://github.com/linux-pam/linux-pam/commit/5d7eefb1883c557c7a027f68e966e2fae294a9b6 -Signed-off-by: Thomas Petazzoni <[email protected]> ---- - libpam/pam_prelude.c | 8 ++++---- - modules/pam_namespace/argv_parse.c | 2 ++ - modules/pam_setquota/pam_setquota.c | 3 ++- - modules/pam_timestamp/sha1.c | 2 +- - modules/pam_unix/audit.c | 3 +-- - modules/pam_unix/bigcrypt_main.c | 2 ++ - modules/pam_unix/md5.c | 4 ++-- - modules/pam_unix/md5_crypt.c | 2 +- - modules/pam_unix/yppasswd.h | 2 ++ - 9 files changed, 17 insertions(+), 11 deletions(-) - -diff --git a/libpam/pam_prelude.c b/libpam/pam_prelude.c -index 6c73bf5d..c62e2f2c 100644 ---- a/libpam/pam_prelude.c -+++ b/libpam/pam_prelude.c -@@ -5,17 +5,17 @@ - * (C) Sebastien Tricaud 2005 <[email protected]> - */ - --#include <stdio.h> --#include <syslog.h> -- - #ifdef PRELUDE - -+#include "pam_private.h" -+ -+#include <stdio.h> -+#include <syslog.h> - #include <libprelude/prelude.h> - #include <libprelude/prelude-log.h> - #include <libprelude/idmef-message-print.h> - - #include "pam_prelude.h" --#include "pam_private.h" - - - #define ANALYZER_CLASS "pam" -diff --git a/modules/pam_namespace/argv_parse.c b/modules/pam_namespace/argv_parse.c -index ac7c9ae0..cbae7831 100644 ---- a/modules/pam_namespace/argv_parse.c -+++ b/modules/pam_namespace/argv_parse.c -@@ -28,6 +28,8 @@ - * Version 1.1, modified 2/27/1999 - */ - -+#include "config.h" -+ - #include <limits.h> - #include <stdlib.h> - #include <ctype.h> -diff --git a/modules/pam_setquota/pam_setquota.c b/modules/pam_setquota/pam_setquota.c -index c15fc669..73445e29 100644 ---- a/modules/pam_setquota/pam_setquota.c -+++ b/modules/pam_setquota/pam_setquota.c -@@ -8,6 +8,8 @@ - Copyright © 2016 Keller Fuchs <[email protected]> - */ - -+#include "pam_inline.h" -+ - #include <sys/types.h> - #include <sys/quota.h> - #include <linux/quota.h> -@@ -22,7 +24,6 @@ - #include <security/_pam_macros.h> - #include <security/pam_ext.h> - #include <security/pam_modutil.h> --#include "pam_inline.h" - - #ifndef PATH_LOGIN_DEFS - # define PATH_LOGIN_DEFS "/etc/login.defs" -diff --git a/modules/pam_timestamp/sha1.c b/modules/pam_timestamp/sha1.c -index dff454cf..f21b2870 100644 ---- a/modules/pam_timestamp/sha1.c -+++ b/modules/pam_timestamp/sha1.c -@@ -37,6 +37,7 @@ - */ - /* See http://www.itl.nist.gov/fipspubs/fip180-1.htm for descriptions. */ - -+#include "pam_inline.h" - #include <sys/types.h> - #include <sys/stat.h> - #include <netinet/in.h> -@@ -47,7 +48,6 @@ - #include <endian.h> - #include <unistd.h> - #include "sha1.h" --#include "pam_inline.h" - - static const unsigned char - padding[SHA1_BLOCK_SIZE] = { -diff --git a/modules/pam_unix/audit.c b/modules/pam_unix/audit.c -index 1547a652..9513aaa9 100644 ---- a/modules/pam_unix/audit.c -+++ b/modules/pam_unix/audit.c -@@ -1,5 +1,3 @@ --#include "audit.h" -- - #include "config.h" - - #ifdef HAVE_LIBAUDIT -@@ -11,6 +9,7 @@ - - #include <security/_pam_types.h> - -+#include "audit.h" - #include "passverify.h" - - int audit_log(int type, const char *uname, int retval) -diff --git a/modules/pam_unix/bigcrypt_main.c b/modules/pam_unix/bigcrypt_main.c -index fab212d9..22d325da 100644 ---- a/modules/pam_unix/bigcrypt_main.c -+++ b/modules/pam_unix/bigcrypt_main.c -@@ -1,3 +1,5 @@ -+#include "config.h" -+ - #include <stdio.h> - #include <string.h> - -diff --git a/modules/pam_unix/md5.c b/modules/pam_unix/md5.c -index 95b8de4c..78e9af27 100644 ---- a/modules/pam_unix/md5.c -+++ b/modules/pam_unix/md5.c -@@ -18,11 +18,11 @@ - * - */ - -+#include "pam_inline.h" -+ - #include <string.h> - #include "md5.h" - --#include "pam_inline.h" -- - #ifndef HIGHFIRST - #define byteReverse(buf, len) /* Nothing */ - #else -diff --git a/modules/pam_unix/md5_crypt.c b/modules/pam_unix/md5_crypt.c -index 9a6bd4f9..9451f376 100644 ---- a/modules/pam_unix/md5_crypt.c -+++ b/modules/pam_unix/md5_crypt.c -@@ -12,11 +12,11 @@ - * - */ - -+#include "pam_inline.h" - #include <string.h> - #include <stdio.h> - #include <stdlib.h> - #include "md5.h" --#include "pam_inline.h" - - static const unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ - "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -diff --git a/modules/pam_unix/yppasswd.h b/modules/pam_unix/yppasswd.h -index dc686cd7..3a40c3ea 100644 ---- a/modules/pam_unix/yppasswd.h -+++ b/modules/pam_unix/yppasswd.h -@@ -6,6 +6,8 @@ - #ifndef _YPPASSWD_H_RPCGEN - #define _YPPASSWD_H_RPCGEN - -+#include "config.h" -+ - #include <rpc/rpc.h> - - --- -2.47.1 -
package/linux-pam/0001-meson-fix-build-with-Di18n-disabled.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 900c9c82e0c703fee1f5c55fb4a0913a7fc95306 Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" <[email protected]> +Date: Sun, 27 Oct 2024 15:00:00 +0000 +Subject: [PATCH] meson: fix build with -Di18n=disabled + +Resolves: https://github.com/linux-pam/linux-pam/issues/847 +Upstream: https://github.com/linux-pam/linux-pam/commit/900c9c82e0c703fee1f5c55fb4a0913a7fc95306 +Signed-off-by: Thomas Petazzoni <[email protected]> +--- + meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 2be21282..e3d8cc2a 100644 +--- a/meson.build ++++ b/meson.build +@@ -211,7 +211,9 @@ endif + libdl = dependency('dl') + + +-if not get_option('i18n').disabled() ++if get_option('i18n').disabled() ++ libintl = null_dep ++else + libintl = dependency('intl', required: get_option('i18n')) + if libintl.found() + cdata.set('ENABLE_NLS', 1) +-- +2.47.1 +
package/linux-pam/linux-pam.hash +3 -3
@@ -1,6 +1,6 @@ # Locally computed hashes after checking signature at -# https://github.com/linux-pam/linux-pam/releases/download/v1.6.1/Linux-PAM-1.6.1.tar.xz.asc -# signed with the key 8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB -sha256 f8923c740159052d719dbfc2a2f81942d68dd34fcaf61c706a02c9b80feeef8e Linux-PAM-1.6.1.tar.xz +# https://github.com/linux-pam/linux-pam/releases/download/v1.7.0/Linux-PAM-1.7.0.tar.xz.asc +# signed with the key A8041FA839E16E36 +sha256 57dcd7a6b966ecd5bbd95e1d11173734691e16b68692fa59661cdae9b13b1697 Linux-PAM-1.7.0.tar.xz # Locally computed sha256 133d98e7a2ab3ffd330b4debb0bfc10fea21e4b2b5a5b09de2e924293be5ff08 Copyright
package/linux-pam/linux-pam.mk +27 -19
95 lines not on this page · raw message
Signature · 6 lines
2.47.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH 3/3] package/linux-pam: bump to version 1.7.0
Hi Thomas,
Quoted 43 lines · Thomas Petazzoni via buildroot
Changes from 1.6.1 to 1.7.0:
build: changed build system from autotools to meson.
libpam_misc: use ECHOCTL in the terminal input
pam_access: support UID and GID in access.conf
pam_env: install environment file in vendordir if vendordir is
enabled
pam_issue: only count class user if logind support is enabled
pam_limits: use systemd-logind instead of utmp if logind support is
enabled
pam_unix: compare password hashes in constant time Multiple minor bug fixes, build fixes, portability fixes, documentation improvements, and translation updates.Clearly from a Buildroot standpoint, the most significant change is the migration from autotools (no longer supported) to meson.
This deserves a few explanations:
* --disable-prelude option no longer exists
* --disable-isadir but is documented as Arch-specific PAM modules directory, relative to SECUREDIR, which seems odd to use. It has been set since the package was introduced in
04be7f0f8ca100afaf06b264332bc2cd61fbb3d0, with no specific explanation.* --disable-nis is preserved
* --disable-db doesn't exist, it can only take a number of values, including "auto"
* --disable-regenerate-docu doesn't exist, but -Ddocs=disabled is passed
* -Di18n is now handled, and
LINUX_PAM_LDFLAGSis used to passTARGET_NLS_LIBS* We continue to use --libdir and not -Dlibdir because meson-package already passes "--libdir=lib" and we can't override that with -Dlibdir (it fails at configure time), so we have to override with --libdir.
Quoted 4 lines
Also: existing patch 0001 is dropped as it's upstream, part of 1.7.0, but another upstream backport is added to fix -Di18n=disabled builds.
Signed-off-by Thomas Petazzoni <[email protected]>
This bump (and change to meson) is introducing build failures. So I did not merged this patch. See my test-pkg run:
https://gitlab.com/jolivain/buildroot/-/pipelines/1616985492
Most failures seems to be related to my test config having:
BR2_PACKAGE_LINUX_PAM_LASTLOG=y
Could you have a look please?
Best regards,
Julien.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 18 lines · Thomas Petazzoni via buildroot
We are seeing build issues with linux-pam in the autobuilders such as:
md5_crypt.c: In function 'Goodcrypt_md5':
md5_crypt.c:145:13: error: implicit declaration of function 'asprintf'; did you mean 'vsprintf'? [-Wimplicit-function-declaration]
145 | if (asprintf(&passwd, "%s%.*s$%s", magic, sl, sp, buf)
< 0)| ^~~~~~~~ | vsprintfThis is due to the fact that <
stdio.h> gets included without_GNU_SOURCEbeing defined, and so the prototype ofasprintf()is not accessible, at least with uclibc-ng.The
_GNU_SOURCEdefinition is properly in linux-pam'sconfig.h, butconfig.hdoesn't get properly included first everywhere. This issue has been fixed upstream in the mean time, so we simply backport the upstream patch.
Quoted 6 lines
Fixes:
http://autobuild.buildroot.net/results/49b190b3fbae3cdca4c7a08b3ab5100a937ede9e/
Signed-off-by Thomas Petazzoni <[email protected]>
Applied to master, thanks.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 17 lines · Thomas Petazzoni via buildroot
We are seeing build issues with linux-pam in the autobuilders such as:
md5_crypt.c: In function 'Goodcrypt_md5':
md5_crypt.c:145:13: error: implicit declaration of function 'asprintf'; did you mean 'vsprintf'? [-Wimplicit-function-declaration]145 | if (asprintf(&passwd, "%s%.*s$%s", magic, sl, sp, buf) < 0) | ^~~~~~~~ | vsprintfThis is due to the fact that <
stdio.h> gets included without_GNU_SOURCEbeing defined, and so the prototype ofasprintf()is not accessible, at least with uclibc-ng.The
_GNU_SOURCEdefinition is properly in linux-pam'sconfig.h, butconfig.hdoesn't get properly included first everywhere. This issue has been fixed upstream in the mean time, so we simply backport the upstream patch.
Quoted 5 lines
Fixes:
http://autobuild.buildroot.net/results/49b190b3fbae3cdca4c7a08b3ab5100a937ede9e/Signed-off-by Thomas Petazzoni <[email protected]>
Committed to 2024.02.x and 2024.11.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot