diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-13 18:33:24 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-16 08:07:01 +0100 |
commit | c11f334af513145bdcb501fef942177c4b7c839f (patch) | |
tree | b400560dd3ff3e924e760936db131ae836144b7b /meta/recipes-extended/pam/libpam | |
parent | 69c1a73268d4bd3616447f543b785000462e11fb (diff) | |
download | poky-c11f334af513145bdcb501fef942177c4b7c839f.tar.gz |
libpam: update 1.5.3 -> 1.6.0
(From OE-Core rev: 2a194d5dd1d82f233fa28a44412aea1ba4ccd434)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/pam/libpam')
-rw-r--r-- | meta/recipes-extended/pam/libpam/0001-examples-Replace-use-of-termio.h-with-termios.h.patch | 39 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam/libpam-xtests.patch | 22 |
2 files changed, 15 insertions, 46 deletions
diff --git a/meta/recipes-extended/pam/libpam/0001-examples-Replace-use-of-termio.h-with-termios.h.patch b/meta/recipes-extended/pam/libpam/0001-examples-Replace-use-of-termio.h-with-termios.h.patch deleted file mode 100644 index 95c437df4f..0000000000 --- a/meta/recipes-extended/pam/libpam/0001-examples-Replace-use-of-termio.h-with-termios.h.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From 9b96fcfa5748934b8b6a4db4ee25a5e3165905c0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 1 Jul 2023 07:48:17 -0700 | ||
4 | Subject: [PATCH] examples: Replace use of termio.h with termios.h | ||
5 | |||
6 | Fixes build with musl and makes it portable | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/commit/5374f677e4cae669eb9accf2449178b602e8a40a] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | examples/tty_conv.c | 5 +++-- | ||
12 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/examples/tty_conv.c b/examples/tty_conv.c | ||
15 | index 23f0684..db22500 100644 | ||
16 | --- a/examples/tty_conv.c | ||
17 | +++ b/examples/tty_conv.c | ||
18 | @@ -6,7 +6,8 @@ | ||
19 | #include <string.h> | ||
20 | #include <errno.h> | ||
21 | #include <unistd.h> | ||
22 | -#include <termio.h> | ||
23 | +#include <termios.h> | ||
24 | +#include <sys/ioctl.h> | ||
25 | #include <security/pam_appl.h> | ||
26 | |||
27 | /*************************************** | ||
28 | @@ -16,7 +17,7 @@ | ||
29 | ***************************************/ | ||
30 | static void echoOff(int fd, int off) | ||
31 | { | ||
32 | - struct termio tty; | ||
33 | + struct termios tty; | ||
34 | if (ioctl(fd, TCGETA, &tty) < 0) | ||
35 | { | ||
36 | fprintf(stderr, "TCGETA failed: %s\n", strerror(errno)); | ||
37 | -- | ||
38 | 2.41.0 | ||
39 | |||
diff --git a/meta/recipes-extended/pam/libpam/libpam-xtests.patch b/meta/recipes-extended/pam/libpam/libpam-xtests.patch index ea145899b4..f2dafa72a5 100644 --- a/meta/recipes-extended/pam/libpam/libpam-xtests.patch +++ b/meta/recipes-extended/pam/libpam/libpam-xtests.patch | |||
@@ -1,13 +1,21 @@ | |||
1 | This patch is used to create a new sub package libpam-xtests to do more checks. | 1 | From 060726f7e60c8ecb5bf50fd776910b290d9a0a69 Mon Sep 17 00:00:00 2001 |
2 | From: Kang Kai <kai.kang@windriver.com> | ||
3 | Date: Tue, 19 Jul 2011 17:08:31 +0800 | ||
4 | Subject: [PATCH] This patch is used to create a new sub package libpam-xtests | ||
5 | to do more checks. | ||
2 | 6 | ||
3 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
4 | 8 | ||
5 | Signed-off-by: Kang Kai <kai.kang@windriver.com> | 9 | Signed-off-by: Kang Kai <kai.kang@windriver.com> |
6 | Index: Linux-PAM-1.3.0/xtests/Makefile.am | 10 | --- |
7 | =================================================================== | 11 | xtests/Makefile.am | 17 ++++++++++++++++- |
8 | --- Linux-PAM-1.3.0.orig/xtests/Makefile.am | 12 | 1 file changed, 16 insertions(+), 1 deletion(-) |
9 | +++ Linux-PAM-1.3.0/xtests/Makefile.am | 13 | |
10 | @@ -7,7 +7,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_src | 14 | diff --git a/xtests/Makefile.am b/xtests/Makefile.am |
15 | index acf9746..9826c9f 100644 | ||
16 | --- a/xtests/Makefile.am | ||
17 | +++ b/xtests/Makefile.am | ||
18 | @@ -8,7 +8,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_srcdir)/libpam/include \ | ||
11 | LDADD = $(top_builddir)/libpam/libpam.la \ | 19 | LDADD = $(top_builddir)/libpam/libpam.la \ |
12 | $(top_builddir)/libpam_misc/libpam_misc.la | 20 | $(top_builddir)/libpam_misc/libpam_misc.la |
13 | 21 | ||
@@ -16,7 +24,7 @@ Index: Linux-PAM-1.3.0/xtests/Makefile.am | |||
16 | 24 | ||
17 | EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \ | 25 | EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \ |
18 | tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \ | 26 | tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \ |
19 | @@ -51,3 +51,18 @@ EXTRA_PROGRAMS = $(XTESTS) | 27 | @@ -55,3 +55,18 @@ EXTRA_PROGRAMS = $(XTESTS) |
20 | 28 | ||
21 | xtests: $(XTESTS) run-xtests.sh | 29 | xtests: $(XTESTS) run-xtests.sh |
22 | "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS} | 30 | "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS} |