diff options
| author |   Ross Burton <ross.burton@intel.com> | 2015-07-24 15:58:11 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-27 10:36:28 +0100 |
| commit | ef2a842d06b3a9ee6036af06247c7c022f8c720d (patch) | |
| tree | f88822f217135729ce9c2178bd1bd7d0330c6973 /meta/recipes-extended/sudo/sudo | |
| parent | 359b756b87abc3fed1d2ef4840ba01bb0c23f368 (diff) | |
| download | openembedded-core-contrib-ef2a842d06b3a9ee6036af06247c7c022f8c720d.tar.gz | |
sudo: upgrade to 1.8.14p3
The licence checksum is modified according to the change of doc/LICENCE.
In specific, file://lib/util/reallocarray.c is added to LIC_FILES_CHECKSUM.
Fix out of tree builds, and explicitly enable/disable tmpfiles.d support based
on the systemd DISTRO_FEATURE to avoid non-deterministic packaging.
Based on a patch 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>
Diffstat (limited to 'meta/recipes-extended/sudo/sudo')
| -rw-r--r-- | meta/recipes-extended/sudo/sudo/0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-extended/sudo/sudo/0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch b/meta/recipes-extended/sudo/sudo/0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch new file mode 100644 index 0000000000..2418689dac --- /dev/null +++ b/meta/recipes-extended/sudo/sudo/0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch @@ -0,0 +1,31 @@ +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 + |