diff options
author | Alexander Kanavin <alex@linutronix.de> | 2024-11-25 13:01:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-11-27 14:58:48 +0000 |
commit | 60f6f90443aa4498c2b0627713fced65939fce6e (patch) | |
tree | 74ae9d9c2295795817a1c46f81af42b3882afa6b | |
parent | 1de56ab333fb6b71a3a0bcfd2a4c976eefd35056 (diff) | |
download | poky-60f6f90443aa4498c2b0627713fced65939fce6e.tar.gz |
sudo: upgrade 1.9.15p5 -> 1.9.16p1
License-Update: copyright years
(From OE-Core rev: 5d4ff3b14771bbb2a7653c92b80806bc9aa3fa64)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch | 3 | ||||
-rw-r--r-- | meta/recipes-extended/sudo/sudo.inc | 2 | ||||
-rw-r--r-- | meta/recipes-extended/sudo/sudo_1.9.16p1.bb (renamed from meta/recipes-extended/sudo/sudo_1.9.15p5.bb) | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch index 041c717e00..ec0384e257 100644 --- a/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch +++ b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6e835350b7413210c410d3578cfab804186b7a4f Mon Sep 17 00:00:00 2001 | 1 | From 61ae82a2ba502492b6a78f248258abb71daeb227 Mon Sep 17 00:00:00 2001 |
2 | From: Kai Kang <kai.kang@windriver.com> | 2 | From: Kai Kang <kai.kang@windriver.com> |
3 | Date: Tue, 17 Nov 2020 11:13:40 +0800 | 3 | Date: Tue, 17 Nov 2020 11:13:40 +0800 |
4 | Subject: [PATCH] sudo.conf.in: fix conflict with multilib | 4 | Subject: [PATCH] sudo.conf.in: fix conflict with multilib |
@@ -15,7 +15,6 @@ Update the comments in sudo.conf.in to avoid the conflict. | |||
15 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 15 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
16 | 16 | ||
17 | Upstream-Status: Inappropriate [OE configuration specific] | 17 | Upstream-Status: Inappropriate [OE configuration specific] |
18 | |||
19 | --- | 18 | --- |
20 | examples/sudo.conf.in | 8 ++++---- | 19 | examples/sudo.conf.in | 8 ++++---- |
21 | 1 file changed, 4 insertions(+), 4 deletions(-) | 20 | 1 file changed, 4 insertions(+), 4 deletions(-) |
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index feb1cf35a7..0afbf669f0 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws" | |||
4 | BUGTRACKER = "http://www.sudo.ws/bugs/" | 4 | BUGTRACKER = "http://www.sudo.ws/bugs/" |
5 | SECTION = "admin" | 5 | SECTION = "admin" |
6 | LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib" | 6 | LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib" |
7 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5100e20d35f9015f9eef6bdb27ba194f \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=0a6876cbeb2aa51837935ba3fd82ee87 \ |
8 | file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ | 8 | file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ |
9 | file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ | 9 | file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ |
10 | file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ | 10 | file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ |
diff --git a/meta/recipes-extended/sudo/sudo_1.9.15p5.bb b/meta/recipes-extended/sudo/sudo_1.9.16p1.bb index 2fd2ae6d05..5907b0556d 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.15p5.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.16p1.bb | |||
@@ -7,7 +7,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ | |||
7 | 7 | ||
8 | PAM_SRC_URI = "file://sudo.pam" | 8 | PAM_SRC_URI = "file://sudo.pam" |
9 | 9 | ||
10 | SRC_URI[sha256sum] = "558d10b9a1991fb3b9fa7fa7b07ec4405b7aefb5b3cb0b0871dbc81e3a88e558" | 10 | SRC_URI[sha256sum] = "404994e23ae8bcf4be59ed6fd3759ad70a8cefa9bcf71640b33f176afec243b0" |
11 | 11 | ||
12 | DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 12 | DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
13 | RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" | 13 | RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" |