* [Buildroot] [PATCH 1/1] packge/linux-pam: bump to version 1.6.0
@ 2024-01-31 21:27 Fabrice Fontaine
2024-02-05 9:49 ` Thomas Petazzoni via buildroot
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2024-01-31 21:27 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
Drop patches (already in version)
https://github.com/linux-pam/linux-pam/releases/tag/v1.6.0
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...-examples-tty_conv-fix-build-on-musl.patch | 40 -------------------
...Fix-build-if-crypt_r-isn-t-available.patch | 37 -----------------
package/linux-pam/linux-pam.hash | 4 +-
package/linux-pam/linux-pam.mk | 2 +-
4 files changed, 3 insertions(+), 80 deletions(-)
delete mode 100644 package/linux-pam/0001-examples-tty_conv-fix-build-on-musl.patch
delete mode 100644 package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch
diff --git a/package/linux-pam/0001-examples-tty_conv-fix-build-on-musl.patch b/package/linux-pam/0001-examples-tty_conv-fix-build-on-musl.patch
deleted file mode 100644
index c1257d64da..0000000000
--- a/package/linux-pam/0001-examples-tty_conv-fix-build-on-musl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5374f677e4cae669eb9accf2449178b602e8a40a Mon Sep 17 00:00:00 2001
-From: Violet Purcell <vimproved@inventati.org>
-Date: Thu, 11 May 2023 12:50:34 -0400
-Subject: [PATCH] examples/tty_conv: fix build on musl
-
-termio.h is the old System V version of the interface header, and is
-only provided in glibc and dietlibc as far as I can tell.
-This fixes it to use the POSIX termios.h instead.
-
-Upstream: https://github.com/linux-pam/linux-pam/commit/5374f677e4cae669eb9accf2449178b602e8a40a
-
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- examples/tty_conv.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/examples/tty_conv.c b/examples/tty_conv.c
-index 23f0684cc..9a0e1ad99 100644
---- a/examples/tty_conv.c
-+++ b/examples/tty_conv.c
-@@ -6,8 +6,9 @@
- #include <string.h>
- #include <errno.h>
- #include <unistd.h>
--#include <termio.h>
-+#include <termios.h>
- #include <security/pam_appl.h>
-+#include <sys/ioctl.h>
-
- /***************************************
- * @brief echo off/on
-@@ -16,7 +17,7 @@
- ***************************************/
- static void echoOff(int fd, int off)
- {
-- struct termio tty;
-+ struct termios tty;
- if (ioctl(fd, TCGETA, &tty) < 0)
- {
- fprintf(stderr, "TCGETA failed: %s\n", strerror(errno));
diff --git a/package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch b/package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch
deleted file mode 100644
index c7fdd8be36..0000000000
--- a/package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b82acc21f1e2f76d4cb0c75bb4958751562039ab Mon Sep 17 00:00:00 2001
-From: Bernhard Rosenkränzer <bero@lindev.ch>
-Date: Wed, 7 Jun 2023 19:49:01 +0200
-Subject: [PATCH] Fix build if crypt_r isn't available
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-retval was being defined only in #ifdef HAVE_CRYPT_R, but used
-unconditionally.
-
-Signed-off-by: Bernhard Rosenkränzer <bero@lindev.ch>
-Fixes: bcba17939e1b ("modules: make use of secure memory erasure")
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-Upstream: https://github.com/linux-pam/linux-pam/commit/b82acc21f1e2f76d4cb0c75bb4958751562039ab
----
- modules/pam_pwhistory/opasswd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/pam_pwhistory/opasswd.c b/modules/pam_pwhistory/opasswd.c
-index 479e3fc4..fc610e2f 100644
---- a/modules/pam_pwhistory/opasswd.c
-+++ b/modules/pam_pwhistory/opasswd.c
-@@ -128,9 +128,9 @@ static int
- compare_password(const char *newpass, const char *oldpass)
- {
- char *outval;
-+ int retval;
- #ifdef HAVE_CRYPT_R
- struct crypt_data output;
-- int retval;
-
- output.initialized = 0;
-
---
-2.39.2
-
diff --git a/package/linux-pam/linux-pam.hash b/package/linux-pam/linux-pam.hash
index 97acbd7adc..cd882715cb 100644
--- a/package/linux-pam/linux-pam.hash
+++ b/package/linux-pam/linux-pam.hash
@@ -1,6 +1,6 @@
# Locally computed hashes after checking signature at
-# https://github.com/linux-pam/linux-pam/releases/download/v1.5.3/Linux-PAM-1.5.3.tar.xz.asc
+# https://github.com/linux-pam/linux-pam/releases/download/v1.6.0/Linux-PAM-1.6.0.tar.xz.asc
# signed with the key 8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB
-sha256 7ac4b50feee004a9fa88f1dfd2d2fa738a82896763050cd773b3c54b0a818283 Linux-PAM-1.5.3.tar.xz
+sha256 fff4a34e5bbee77e2e8f1992f27631e2329bcbf8a0563ddeb5c3389b4e3169ad Linux-PAM-1.6.0.tar.xz
# Locally computed
sha256 133d98e7a2ab3ffd330b4debb0bfc10fea21e4b2b5a5b09de2e924293be5ff08 Copyright
diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk
index 92d8c952ac..89a46e81df 100644
--- a/package/linux-pam/linux-pam.mk
+++ b/package/linux-pam/linux-pam.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LINUX_PAM_VERSION = 1.5.3
+LINUX_PAM_VERSION = 1.6.0
LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.xz
LINUX_PAM_SITE = https://github.com/linux-pam/linux-pam/releases/download/v$(LINUX_PAM_VERSION)
LINUX_PAM_INSTALL_STAGING = YES
--
2.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] packge/linux-pam: bump to version 1.6.0
2024-01-31 21:27 [Buildroot] [PATCH 1/1] packge/linux-pam: bump to version 1.6.0 Fabrice Fontaine
@ 2024-02-05 9:49 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-02-05 9:49 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: buildroot
On Wed, 31 Jan 2024 22:27:23 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> Drop patches (already in version)
>
> https://github.com/linux-pam/linux-pam/releases/tag/v1.6.0
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> ...-examples-tty_conv-fix-build-on-musl.patch | 40 -------------------
> ...Fix-build-if-crypt_r-isn-t-available.patch | 37 -----------------
> package/linux-pam/linux-pam.hash | 4 +-
> package/linux-pam/linux-pam.mk | 2 +-
> 4 files changed, 3 insertions(+), 80 deletions(-)
> delete mode 100644 package/linux-pam/0001-examples-tty_conv-fix-build-on-musl.patch
> delete mode 100644 package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-02-05 9:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-31 21:27 [Buildroot] [PATCH 1/1] packge/linux-pam: bump to version 1.6.0 Fabrice Fontaine
2024-02-05 9:49 ` Thomas Petazzoni via buildroot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.