diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-01-19 11:40:56 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-01-20 11:57:29 +0000 |
commit | 64e0f14a5663c10e366c0a812c9e57dd7c9abe5d (patch) | |
tree | b1be211ed6207468a59f7c3efe026b6b93a46f35 /meta/recipes-extended | |
parent | 11b1b4b29c6cbec2855b2cfd7a0e28ecdc81ea95 (diff) | |
download | poky-64e0f14a5663c10e366c0a812c9e57dd7c9abe5d.tar.gz |
shadow: upgrade 4.10 -> 4.11.1
License-Update: license clarified to BSD-3-Clause only
(From OE-Core rev: 79201206b5f7867ad7ffd462705f34179b33c0d7)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch | 30 | ||||
-rw-r--r-- | meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch | 6 | ||||
-rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 8 | ||||
-rw-r--r-- | meta/recipes-extended/shadow/shadow_4.11.1.bb (renamed from meta/recipes-extended/shadow/shadow_4.10.bb) | 0 |
4 files changed, 22 insertions, 22 deletions
diff --git a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch index 95728bcd3f..4d6f6d68ec 100644 --- a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch +++ b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 30a3906a0a21120fa6bbc918b6258ab9303fbeaa Mon Sep 17 00:00:00 2001 | 1 | From 531cd5ca6eadef29b4799459f1bcfc002ecbd424 Mon Sep 17 00:00:00 2001 |
2 | From: Scott Garman <scott.a.garman@intel.com> | 2 | From: Scott Garman <scott.a.garman@intel.com> |
3 | Date: Thu, 14 Apr 2016 12:28:57 +0200 | 3 | Date: Thu, 14 Apr 2016 12:28:57 +0200 |
4 | Subject: [PATCH] Disable use of syslog for sysroot | 4 | Subject: [PATCH] Disable use of syslog for sysroot |
@@ -24,10 +24,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
24 | 7 files changed, 22 insertions(+) | 24 | 7 files changed, 22 insertions(+) |
25 | 25 | ||
26 | diff --git a/src/groupadd.c b/src/groupadd.c | 26 | diff --git a/src/groupadd.c b/src/groupadd.c |
27 | index d7f68b1..5fe5f43 100644 | 27 | index 66ccb53..776ea51 100644 |
28 | --- a/src/groupadd.c | 28 | --- a/src/groupadd.c |
29 | +++ b/src/groupadd.c | 29 | +++ b/src/groupadd.c |
30 | @@ -34,6 +34,9 @@ | 30 | @@ -11,6 +11,9 @@ |
31 | 31 | ||
32 | #ident "$Id$" | 32 | #ident "$Id$" |
33 | 33 | ||
@@ -38,10 +38,10 @@ index d7f68b1..5fe5f43 100644 | |||
38 | #include <fcntl.h> | 38 | #include <fcntl.h> |
39 | #include <getopt.h> | 39 | #include <getopt.h> |
40 | diff --git a/src/groupdel.c b/src/groupdel.c | 40 | diff --git a/src/groupdel.c b/src/groupdel.c |
41 | index 5c89312..2aefc5a 100644 | 41 | index c84faa7..1076f4b 100644 |
42 | --- a/src/groupdel.c | 42 | --- a/src/groupdel.c |
43 | +++ b/src/groupdel.c | 43 | +++ b/src/groupdel.c |
44 | @@ -34,6 +34,9 @@ | 44 | @@ -11,6 +11,9 @@ |
45 | 45 | ||
46 | #ident "$Id$" | 46 | #ident "$Id$" |
47 | 47 | ||
@@ -52,10 +52,10 @@ index 5c89312..2aefc5a 100644 | |||
52 | #include <fcntl.h> | 52 | #include <fcntl.h> |
53 | #include <grp.h> | 53 | #include <grp.h> |
54 | diff --git a/src/groupmems.c b/src/groupmems.c | 54 | diff --git a/src/groupmems.c b/src/groupmems.c |
55 | index 654a8f3..6b2026b 100644 | 55 | index a0e3266..6540cb1 100644 |
56 | --- a/src/groupmems.c | 56 | --- a/src/groupmems.c |
57 | +++ b/src/groupmems.c | 57 | +++ b/src/groupmems.c |
58 | @@ -32,6 +32,9 @@ | 58 | @@ -9,6 +9,9 @@ |
59 | 59 | ||
60 | #include <config.h> | 60 | #include <config.h> |
61 | 61 | ||
@@ -66,10 +66,10 @@ index 654a8f3..6b2026b 100644 | |||
66 | #include <getopt.h> | 66 | #include <getopt.h> |
67 | #include <grp.h> | 67 | #include <grp.h> |
68 | diff --git a/src/groupmod.c b/src/groupmod.c | 68 | diff --git a/src/groupmod.c b/src/groupmod.c |
69 | index acd6f35..a2c5247 100644 | 69 | index 006eca1..78b1ad6 100644 |
70 | --- a/src/groupmod.c | 70 | --- a/src/groupmod.c |
71 | +++ b/src/groupmod.c | 71 | +++ b/src/groupmod.c |
72 | @@ -34,6 +34,9 @@ | 72 | @@ -11,6 +11,9 @@ |
73 | 73 | ||
74 | #ident "$Id$" | 74 | #ident "$Id$" |
75 | 75 | ||
@@ -80,10 +80,10 @@ index acd6f35..a2c5247 100644 | |||
80 | #include <fcntl.h> | 80 | #include <fcntl.h> |
81 | #include <getopt.h> | 81 | #include <getopt.h> |
82 | diff --git a/src/useradd.c b/src/useradd.c | 82 | diff --git a/src/useradd.c b/src/useradd.c |
83 | index 127177e..b80e505 100644 | 83 | index 456b9de..2b0d703 100644 |
84 | --- a/src/useradd.c | 84 | --- a/src/useradd.c |
85 | +++ b/src/useradd.c | 85 | +++ b/src/useradd.c |
86 | @@ -34,6 +34,9 @@ | 86 | @@ -11,6 +11,9 @@ |
87 | 87 | ||
88 | #ident "$Id$" | 88 | #ident "$Id$" |
89 | 89 | ||
@@ -94,10 +94,10 @@ index 127177e..b80e505 100644 | |||
94 | #include <ctype.h> | 94 | #include <ctype.h> |
95 | #include <errno.h> | 95 | #include <errno.h> |
96 | diff --git a/src/userdel.c b/src/userdel.c | 96 | diff --git a/src/userdel.c b/src/userdel.c |
97 | index 79a7c89..c1e010a 100644 | 97 | index 7012b0e..08bb5d1 100644 |
98 | --- a/src/userdel.c | 98 | --- a/src/userdel.c |
99 | +++ b/src/userdel.c | 99 | +++ b/src/userdel.c |
100 | @@ -31,6 +31,10 @@ | 100 | @@ -8,6 +8,10 @@ |
101 | */ | 101 | */ |
102 | 102 | ||
103 | #include <config.h> | 103 | #include <config.h> |
@@ -109,10 +109,10 @@ index 79a7c89..c1e010a 100644 | |||
109 | #include <dirent.h> | 109 | #include <dirent.h> |
110 | #include <errno.h> | 110 | #include <errno.h> |
111 | diff --git a/src/usermod.c b/src/usermod.c | 111 | diff --git a/src/usermod.c b/src/usermod.c |
112 | index 03bb9b9..e15fdd4 100644 | 112 | index 9473a7d..7d4f7b5 100644 |
113 | --- a/src/usermod.c | 113 | --- a/src/usermod.c |
114 | +++ b/src/usermod.c | 114 | +++ b/src/usermod.c |
115 | @@ -34,6 +34,9 @@ | 115 | @@ -11,6 +11,9 @@ |
116 | 116 | ||
117 | #ident "$Id$" | 117 | #ident "$Id$" |
118 | 118 | ||
diff --git a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch index bd24626a26..173e8a937d 100644 --- a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch +++ b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1422c24f7266b553c82100e3d18a10c55cd91063 Mon Sep 17 00:00:00 2001 | 1 | From d767f776e631f1493fd7b266f2026d630ecf70fe Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Thu, 17 Jul 2014 15:53:34 +0800 | 3 | Date: Thu, 17 Jul 2014 15:53:34 +0800 |
4 | Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env | 4 | Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env |
@@ -21,10 +21,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
21 | 1 file changed, 12 insertions(+), 4 deletions(-) | 21 | 1 file changed, 12 insertions(+), 4 deletions(-) |
22 | 22 | ||
23 | diff --git a/lib/commonio.c b/lib/commonio.c | 23 | diff --git a/lib/commonio.c b/lib/commonio.c |
24 | index cef404b..66908fb 100644 | 24 | index 9e0fde6..7c3a1da 100644 |
25 | --- a/lib/commonio.c | 25 | --- a/lib/commonio.c |
26 | +++ b/lib/commonio.c | 26 | +++ b/lib/commonio.c |
27 | @@ -646,10 +646,18 @@ int commonio_open (struct commonio_db *db, int mode) | 27 | @@ -624,10 +624,18 @@ int commonio_open (struct commonio_db *db, int mode) |
28 | db->cursor = NULL; | 28 | db->cursor = NULL; |
29 | db->changed = false; | 29 | db->changed = false; |
30 | 30 | ||
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 6d4a77caed..f5fdf436f7 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc | |||
@@ -3,9 +3,9 @@ HOMEPAGE = "http://github.com/shadow-maint/shadow" | |||
3 | DESCRIPTION = "${SUMMARY}" | 3 | DESCRIPTION = "${SUMMARY}" |
4 | BUGTRACKER = "http://github.com/shadow-maint/shadow/issues" | 4 | BUGTRACKER = "http://github.com/shadow-maint/shadow/issues" |
5 | SECTION = "base/utils" | 5 | SECTION = "base/utils" |
6 | LICENSE = "BSD-3-Clause | Artistic-1.0" | 6 | LICENSE = "BSD-3-Clause" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=24f172951acb1904c9273a6a016b0b36 \ | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=c9a450b7be84eac23e6353efecb60b5b \ |
8 | file://src/passwd.c;beginline=2;endline=30;md5=5720ff729a6ff39ecc9f64555d75f4af \ | 8 | file://src/passwd.c;beginline=2;endline=30;md5=758c26751513b6795395275969dd3be1 \ |
9 | " | 9 | " |
10 | 10 | ||
11 | DEPENDS = "virtual/crypt" | 11 | DEPENDS = "virtual/crypt" |
@@ -31,7 +31,7 @@ SRC_URI:append:class-nativesdk = " \ | |||
31 | file://0001-Disable-use-of-syslog-for-sysroot.patch \ | 31 | file://0001-Disable-use-of-syslog-for-sysroot.patch \ |
32 | " | 32 | " |
33 | 33 | ||
34 | SRC_URI[sha256sum] = "efa9b89b5901644890dbf230b8e9e3dbcdb51ffb6be145afc57f3012861aeddf" | 34 | SRC_URI[sha256sum] = "f262089be6a1011d50ec7849e14571b7b2e788334368f3dccb718513f17935ed" |
35 | 35 | ||
36 | # Additional Policy files for PAM | 36 | # Additional Policy files for PAM |
37 | PAM_SRC_URI = "file://pam.d/chfn \ | 37 | PAM_SRC_URI = "file://pam.d/chfn \ |
diff --git a/meta/recipes-extended/shadow/shadow_4.10.bb b/meta/recipes-extended/shadow/shadow_4.11.1.bb index 2fbd81bf72..2fbd81bf72 100644 --- a/meta/recipes-extended/shadow/shadow_4.10.bb +++ b/meta/recipes-extended/shadow/shadow_4.11.1.bb | |||