mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

libpam: refresh patches

Browse Source 
The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

(From OE-Core rev: 994e43acc67efeb33d859be071609daa844e9b77)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2018-03-08 20:17:48 +02:00
committed by Richard Purdie
parent 12190f1779
commit b65741860f
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
meta/recipes-extended/pam/libpam/libpam-xtests.patch
View File

@@ -3,18 +3,20 @@ This patch is used to create a new sub package libpam-xtests to do more checks.
Upstream-Status: Pending
Signed-off-by: Kang Kai <kai.kang@windriver.com>
--- Linux-PAM-1.1.4/xtests/Makefile.am.orig 2011-07-19 17:00:09.619980001 +0800
+++ Linux-PAM-1.1.4/xtests/Makefile.am 2011-07-19 16:54:00.229979998 +0800
@@ -7,7 +7,7 @@
AM_LDFLAGS = -L$(top_builddir)/libpam -lpam \
-L$(top_builddir)/libpam_misc -lpam_misc
Index: Linux-PAM-1.3.0/xtests/Makefile.am
===================================================================
--- Linux-PAM-1.3.0.orig/xtests/Makefile.am
+++ Linux-PAM-1.3.0/xtests/Makefile.am
@@ -7,7 +7,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_src
LDADD = $(top_builddir)/libpam/libpam.la \
$(top_builddir)/libpam_misc/libpam_misc.la
-CLEANFILES = *~ $(XTESTS)
+CLEANFILES = *~
EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \
tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \
@@ -51,3 +51,18 @@
@@ -51,3 +51,18 @@ EXTRA_PROGRAMS = $(XTESTS)
xtests: $(XTESTS) run-xtests.sh
"$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS}

23
meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch
View File

@@ -5,12 +5,13 @@ Upstream-Status: Pending
Signed-off-by: Ming Liu <ming.liu@windriver.com>
===================================================================
diff -urpN a/modules/pam_securetty/Makefile.am b/modules/pam_securetty/Makefile.am
--- a/modules/pam_securetty/Makefile.am 2013-07-05 11:08:23.224483237 +0800
+++ b/modules/pam_securetty/Makefile.am 2013-07-05 11:15:21.304486456 +0800
Index: Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am
===================================================================
--- Linux-PAM-1.3.0.orig/modules/pam_securetty/Makefile.am
+++ Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am
@@ -24,6 +24,10 @@ endif
securelib_LTLIBRARIES = pam_securetty.la
pam_securetty_la_LIBADD = -L$(top_builddir)/libpam -lpam
pam_securetty_la_LIBADD = $(top_builddir)/libpam/libpam.la
+pam_securetty_la_SOURCES = \
+ pam_securetty.c \
@@ -19,9 +20,10 @@ diff -urpN a/modules/pam_securetty/Makefile.am b/modules/pam_securetty/Makefile.
if ENABLE_REGENERATE_MAN
noinst_DATA = README
README: pam_securetty.8.xml
diff -urpN a/modules/pam_securetty/pam_securetty.c b/modules/pam_securetty/pam_securetty.c
--- a/modules/pam_securetty/pam_securetty.c 2013-07-05 11:07:50.064483568 +0800
+++ b/modules/pam_securetty/pam_securetty.c 2013-07-05 11:12:23.994483344 +0800
Index: Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c
===================================================================
--- Linux-PAM-1.3.0.orig/modules/pam_securetty/pam_securetty.c
+++ Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c
@@ -1,7 +1,5 @@
/* pam_securetty module */
@@ -104,9 +106,10 @@ diff -urpN a/modules/pam_securetty/pam_securetty.c b/modules/pam_securetty/pam_s
if (retval && !(ctrl & PAM_NOCONSOLE_ARG)) {
FILE *cmdlinefile;
diff -urpN a/modules/pam_securetty/tty_secure.c b/modules/pam_securetty/tty_secure.c
--- a/modules/pam_securetty/tty_secure.c 1970-01-01 08:30:00.000000000 +0830
+++ b/modules/pam_securetty/tty_secure.c 2013-07-05 11:14:21.534482900 +0800
Index: Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c
===================================================================
--- /dev/null
+++ Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c
@@ -0,0 +1,90 @@
+/*
+ * A function to determine if a particular line is in /etc/securetty