summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-05-10 15:13:35 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-15 10:56:50 +0100
commit9ed25b4eb52cef6167d06892d4b810e76d8a5e5e (patch)
tree2383a9360c70a47350f1e0803b980bc050a3f0bb
parentdbdcadb57ccdb53be1b84217eb8e3146c0a6ff72 (diff)
downloadpoky-9ed25b4eb52cef6167d06892d4b810e76d8a5e5e.tar.gz
sudo: upgrade to 1.8.23
Upgrade sudo to 1.8.23. The license checksum changes but the actual license does not. The /var/run/sudo directory has changed to /run/sudo, change do_install_append according to avoid error. (From OE-Core rev: abd809670ea4048551d20c11da95203536250001) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/sudo/sudo.inc5
-rw-r--r--meta/recipes-extended/sudo/sudo_1.8.23.bb (renamed from meta/recipes-extended/sudo/sudo_1.8.22.bb)8
2 files changed, 7 insertions, 6 deletions
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 362bd3a2ea..6e57669a01 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws"
4BUGTRACKER = "http://www.sudo.ws/bugs/" 4BUGTRACKER = "http://www.sudo.ws/bugs/"
5SECTION = "admin" 5SECTION = "admin"
6LICENSE = "ISC & BSD & Zlib" 6LICENSE = "ISC & BSD & Zlib"
7LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=7765a3d787cb4fed3ccc3c9cee030af9 \ 7LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=cc4bf2366b059c9598e3947f885931ec \
8 file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=805782a8466975716f8376b2be9aedde \ 8 file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=805782a8466975716f8376b2be9aedde \
9 file://lib/util/reallocarray.c;beginline=3;endline=16;md5=85b0905b795d4d58bf2e00635649eec6 \ 9 file://lib/util/reallocarray.c;beginline=3;endline=16;md5=85b0905b795d4d58bf2e00635649eec6 \
10 file://lib/util/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \ 10 file://lib/util/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \
@@ -12,7 +12,8 @@ LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=7765a3d787cb4fed3ccc3c9cee030af9 \
12 file://lib/util/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \ 12 file://lib/util/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \
13 file://lib/util/snprintf.c;beginline=6;endline=34;md5=c82c1b3a5c32e08545c9ec5d71e41e50 \ 13 file://lib/util/snprintf.c;beginline=6;endline=34;md5=c82c1b3a5c32e08545c9ec5d71e41e50 \
14 file://include/sudo_queue.h;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \ 14 file://include/sudo_queue.h;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \
15 file://lib/util/inet_pton.c;beginline=3;endline=17;md5=3970ab0518ab79cbd0bafb697f10b33a" 15 file://lib/util/inet_pton.c;beginline=3;endline=17;md5=3970ab0518ab79cbd0bafb697f10b33a \
16 "
16 17
17inherit autotools 18inherit autotools
18 19
diff --git a/meta/recipes-extended/sudo/sudo_1.8.22.bb b/meta/recipes-extended/sudo/sudo_1.8.23.bb
index 91501781bf..9756fe26d7 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.22.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.23.bb
@@ -7,8 +7,8 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
7 7
8PAM_SRC_URI = "file://sudo.pam" 8PAM_SRC_URI = "file://sudo.pam"
9 9
10SRC_URI[md5sum] = "24abdea48db4c5abcd410167c801cc8c" 10SRC_URI[md5sum] = "ea444d747feb1decfebdffd0b38b0739"
11SRC_URI[sha256sum] = "7256cb27c20883b14360eddbd17f98922073d104b214cf65aeacf1d9c9b9fd02" 11SRC_URI[sha256sum] = "d863d29b6fc87bc784a3223350e2b28a2ff2c4738f0fb8f1c92bb38c3017e679"
12 12
13DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 13DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
14RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" 14RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
@@ -27,8 +27,8 @@ do_install_append () {
27 chmod 4111 ${D}${bindir}/sudo 27 chmod 4111 ${D}${bindir}/sudo
28 chmod 0440 ${D}${sysconfdir}/sudoers 28 chmod 0440 ${D}${sysconfdir}/sudoers
29 29
30 # Explicitly remove the ${localstatedir}/run directory to avoid QA error 30 # Explicitly remove the /run directory to avoid QA error
31 rmdir -p --ignore-fail-on-non-empty ${D}${localstatedir}/run/sudo 31 rmdir -p --ignore-fail-on-non-empty ${D}/run/sudo
32} 32}
33 33
34FILES_${PN} += "${libdir}/tmpfiles.d" 34FILES_${PN} += "${libdir}/tmpfiles.d"