sudo: upgrade to 1.8.15
1. upgrade to 1.8.15 2. delete patch file due to the bug has been fixed in sudo 1.8.15 (http://bugzilla.sudo.ws/show_bug.cgi?id=708) (From OE-Core rev: 2180280e63aece8fb45686e1b5dd01430ce478fe) Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
5eb0e90e44
commit
2b2774bd00
|
@ -1,31 +0,0 @@
|
|||
The makefile uses top_srcdir to find files that were created by configure, when
|
||||
it should use top_builddir.
|
||||
|
||||
Upstream-Status: Submitted (http://bugzilla.sudo.ws/show_bug.cgi?id=708)
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
---
|
||||
src/Makefile.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||
index f009e10..7acfb2d 100644
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -165,11 +165,11 @@ install-dirs:
|
||||
|
||||
install-rc: install-dirs
|
||||
if [ -n "$(INIT_SCRIPT)" ]; then \
|
||||
- $(INSTALL) $(INSTALL_OWNER) -m 0755 $(top_srcdir)/init.d/$(INIT_SCRIPT) $(DESTDIR)$(INIT_DIR)/sudo; \
|
||||
+ $(INSTALL) $(INSTALL_OWNER) -m 0755 $(top_builddir)/init.d/$(INIT_SCRIPT) $(DESTDIR)$(INIT_DIR)/sudo; \
|
||||
rm -f $(DESTDIR)$(RC_LINK); \
|
||||
ln -s $(INIT_DIR)/sudo $(DESTDIR)$(RC_LINK); \
|
||||
elif test -n "$(tmpfiles_d)"; then \
|
||||
- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(top_srcdir)/init.d/sudo.conf $(DESTDIR)$(tmpfiles_d)/sudo.conf; \
|
||||
+ $(INSTALL) $(INSTALL_OWNER) -m 0644 $(top_builddir)/init.d/sudo.conf $(DESTDIR)$(tmpfiles_d)/sudo.conf; \
|
||||
fi
|
||||
|
||||
install-binaries: install-dirs $(PROGS)
|
||||
--
|
||||
2.1.4
|
||||
|
|
@ -2,14 +2,13 @@ require sudo.inc
|
|||
|
||||
SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
|
||||
file://0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch \
|
||||
file://0001-Include-sys-types.h-for-id_t-definition.patch \
|
||||
"
|
||||
|
||||
PAM_SRC_URI = "file://sudo.pam"
|
||||
|
||||
SRC_URI[md5sum] = "93dbd1e47c136179ff1b01494c1c0e75"
|
||||
SRC_URI[sha256sum] = "a8a697cbb113859058944850d098464618254804cf97961dee926429f00a1237"
|
||||
SRC_URI[md5sum] = "7cf6b9b76d0478a572432bed481dd7b5"
|
||||
SRC_URI[sha256sum] = "4316381708324da8b6cb151f655c1a11855207c7c02244d8ffdea5104d7cc308"
|
||||
|
||||
DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
|
||||
RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
|
Loading…
Reference in New Issue