summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-extended/pam/libpam/libpam-xtests.patch14
-rw-r--r--meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch23
2 files changed, 21 insertions, 16 deletions
diff --git a/meta/recipes-extended/pam/libpam/libpam-xtests.patch b/meta/recipes-extended/pam/libpam/libpam-xtests.patch
index be687457f8..7edf66f915 100644
--- a/meta/recipes-extended/pam/libpam/libpam-xtests.patch
+++ b/meta/recipes-extended/pam/libpam/libpam-xtests.patch
@@ -3,18 +3,20 @@ This patch is used to create a new sub package libpam-xtests to do more checks.
3Upstream-Status: Pending 3Upstream-Status: Pending
4 4
5Signed-off-by: Kang Kai <kai.kang@windriver.com> 5Signed-off-by: Kang Kai <kai.kang@windriver.com>
6--- Linux-PAM-1.1.4/xtests/Makefile.am.orig 2011-07-19 17:00:09.619980001 +0800 6Index: Linux-PAM-1.3.0/xtests/Makefile.am
7+++ Linux-PAM-1.1.4/xtests/Makefile.am 2011-07-19 16:54:00.229979998 +0800 7===================================================================
8@@ -7,7 +7,7 @@ 8--- Linux-PAM-1.3.0.orig/xtests/Makefile.am
9 AM_LDFLAGS = -L$(top_builddir)/libpam -lpam \ 9+++ Linux-PAM-1.3.0/xtests/Makefile.am
10 -L$(top_builddir)/libpam_misc -lpam_misc 10@@ -7,7 +7,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_src
11 LDADD = $(top_builddir)/libpam/libpam.la \
12 $(top_builddir)/libpam_misc/libpam_misc.la
11 13
12-CLEANFILES = *~ $(XTESTS) 14-CLEANFILES = *~ $(XTESTS)
13+CLEANFILES = *~ 15+CLEANFILES = *~
14 16
15 EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \ 17 EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \
16 tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \ 18 tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \
17@@ -51,3 +51,18 @@ 19@@ -51,3 +51,18 @@ EXTRA_PROGRAMS = $(XTESTS)
18 20
19 xtests: $(XTESTS) run-xtests.sh 21 xtests: $(XTESTS) run-xtests.sh
20 "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS} 22 "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS}
diff --git a/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch b/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch
index f1834f6ce3..9b8d4c2975 100644
--- a/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch
+++ b/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch
@@ -5,12 +5,13 @@ Upstream-Status: Pending
5 5
6Signed-off-by: Ming Liu <ming.liu@windriver.com> 6Signed-off-by: Ming Liu <ming.liu@windriver.com>
7=================================================================== 7===================================================================
8diff -urpN a/modules/pam_securetty/Makefile.am b/modules/pam_securetty/Makefile.am 8Index: Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am
9--- a/modules/pam_securetty/Makefile.am 2013-07-05 11:08:23.224483237 +0800 9===================================================================
10+++ b/modules/pam_securetty/Makefile.am 2013-07-05 11:15:21.304486456 +0800 10--- Linux-PAM-1.3.0.orig/modules/pam_securetty/Makefile.am
11+++ Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am
11@@ -24,6 +24,10 @@ endif 12@@ -24,6 +24,10 @@ endif
12 securelib_LTLIBRARIES = pam_securetty.la 13 securelib_LTLIBRARIES = pam_securetty.la
13 pam_securetty_la_LIBADD = -L$(top_builddir)/libpam -lpam 14 pam_securetty_la_LIBADD = $(top_builddir)/libpam/libpam.la
14 15
15+pam_securetty_la_SOURCES = \ 16+pam_securetty_la_SOURCES = \
16+ pam_securetty.c \ 17+ pam_securetty.c \
@@ -19,9 +20,10 @@ diff -urpN a/modules/pam_securetty/Makefile.am b/modules/pam_securetty/Makefile.
19 if ENABLE_REGENERATE_MAN 20 if ENABLE_REGENERATE_MAN
20 noinst_DATA = README 21 noinst_DATA = README
21 README: pam_securetty.8.xml 22 README: pam_securetty.8.xml
22diff -urpN a/modules/pam_securetty/pam_securetty.c b/modules/pam_securetty/pam_securetty.c 23Index: Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c
23--- a/modules/pam_securetty/pam_securetty.c 2013-07-05 11:07:50.064483568 +0800 24===================================================================
24+++ b/modules/pam_securetty/pam_securetty.c 2013-07-05 11:12:23.994483344 +0800 25--- Linux-PAM-1.3.0.orig/modules/pam_securetty/pam_securetty.c
26+++ Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c
25@@ -1,7 +1,5 @@ 27@@ -1,7 +1,5 @@
26 /* pam_securetty module */ 28 /* pam_securetty module */
27 29
@@ -104,9 +106,10 @@ diff -urpN a/modules/pam_securetty/pam_securetty.c b/modules/pam_securetty/pam_s
104 106
105 if (retval && !(ctrl & PAM_NOCONSOLE_ARG)) { 107 if (retval && !(ctrl & PAM_NOCONSOLE_ARG)) {
106 FILE *cmdlinefile; 108 FILE *cmdlinefile;
107diff -urpN a/modules/pam_securetty/tty_secure.c b/modules/pam_securetty/tty_secure.c 109Index: Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c
108--- a/modules/pam_securetty/tty_secure.c 1970-01-01 08:30:00.000000000 +0830 110===================================================================
109+++ b/modules/pam_securetty/tty_secure.c 2013-07-05 11:14:21.534482900 +0800 111--- /dev/null
112+++ Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c
110@@ -0,0 +1,90 @@ 113@@ -0,0 +1,90 @@
111+/* 114+/*
112+ * A function to determine if a particular line is in /etc/securetty 115+ * A function to determine if a particular line is in /etc/securetty
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-07-16 19:10:00 +0000