summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-06-26 09:18:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-28 08:36:00 +0100
commitddaa85812a432d5ec7958f5c7acf229447e18f6c (patch)
tree5fbfa8caf3d347155c23ec21c03cc1199214059e /meta
parent17d50354bf55874d359d47ecdeed803afa5136bf (diff)
downloadpoky-ddaa85812a432d5ec7958f5c7acf229447e18f6c.tar.gz
sudo: upgrade 1.9.0 -> 1.9.1
Drop the patch as it is merged upstream. (From OE-Core rev: 000577afd815fa8399c595d1aef81f4327204327) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch34
-rw-r--r--meta/recipes-extended/sudo/sudo_1.9.1.bb (renamed from meta/recipes-extended/sudo/sudo_1.9.0.bb)8
2 files changed, 3 insertions, 39 deletions
diff --git a/meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch b/meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch
deleted file mode 100644
index eb36cd49bb..0000000000
--- a/meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 386e2c2fa2ab2e02ef71c268a57205139be329ab Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 31 Aug 2015 07:07:49 +0000
4Subject: [PATCH] Include sys/types.h for id_t definition
5
6/sudo_util.h:219:14: error: unknown type name 'id_t'
7 __dso_public id_t sudo_strtoid_v1(const char *str, const char *sep,
8 char **endp, const char **errstr);
9 ^
10 make[1]: *** [preserve_fds.o] Error 1
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14Upstream-Status: Pending
15
16 include/sudo_util.h | 2 ++
17 1 file changed, 2 insertions(+)
18
19diff --git a/include/sudo_util.h b/include/sudo_util.h
20index 89c9f89..ac0855a 100644
21--- a/include/sudo_util.h
22+++ b/include/sudo_util.h
23@@ -17,6 +17,8 @@
24 #ifndef SUDO_UTIL_H
25 #define SUDO_UTIL_H
26
27+#include <sys/types.h>
28+
29 #ifdef HAVE_STDBOOL_H
30 # include <stdbool.h>
31 #else
32--
332.5.1
34
diff --git a/meta/recipes-extended/sudo/sudo_1.9.0.bb b/meta/recipes-extended/sudo/sudo_1.9.1.bb
index 76266537b6..aac505af60 100644
--- a/meta/recipes-extended/sudo/sudo_1.9.0.bb
+++ b/meta/recipes-extended/sudo/sudo_1.9.1.bb
@@ -2,13 +2,11 @@ require sudo.inc
2 2
3SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ 3SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \
4 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ 4 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
5 file://0001-Include-sys-types.h-for-id_t-definition.patch \
6 " 5 "
7 6
8PAM_SRC_URI = "file://sudo.pam" 7PAM_SRC_URI = "file://sudo.pam"
9 8
10SRC_URI[md5sum] = "060b91a6b171cb7ce587222664549b2c" 9SRC_URI[sha256sum] = "294116cefe10a02773917fc7440d8384b925955bc96a6e0eaa1977c83b34adff"
11SRC_URI[sha256sum] = "ab231439c5dfdf4ecbef74f10d5f7e9686c2255c2f3887085b5c5e13281bf95c"
12 10
13DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 11DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
14RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" 12RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
@@ -39,8 +37,8 @@ do_install_append () {
39 chmod 4111 ${D}${bindir}/sudo 37 chmod 4111 ${D}${bindir}/sudo
40 chmod 0440 ${D}${sysconfdir}/sudoers 38 chmod 0440 ${D}${sysconfdir}/sudoers
41 39
42 # Explicitly remove the /run directory to avoid QA error 40 # Explicitly remove the /sudo directory to avoid QA error
43 rmdir -p --ignore-fail-on-non-empty ${D}/run/sudo 41 rmdir -p --ignore-fail-on-non-empty ${D}/sudo
44} 42}
45 43
46FILES_${PN} += "${nonarch_libdir}/tmpfiles.d" 44FILES_${PN} += "${nonarch_libdir}/tmpfiles.d"