summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-07-24 15:58:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-27 12:28:00 +0100
commit53caeebc716ae9caf6ca08fd46dc58232571cd38 (patch)
tree586efca2ab475789afc11c963c29c0af4c33beca /meta
parent898fd07d7754f96432338e7a2989b0de17db8be3 (diff)
downloadpoky-53caeebc716ae9caf6ca08fd46dc58232571cd38.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> (From OE-Core rev: ef2a842d06b3a9ee6036af06247c7c022f8c720d) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/sudo/sudo.inc3
-rw-r--r--meta/recipes-extended/sudo/sudo/0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch31
-rw-r--r--meta/recipes-extended/sudo/sudo_1.8.14p3.bb (renamed from meta/recipes-extended/sudo/sudo_1.8.13.bb)13
3 files changed, 42 insertions, 5 deletions
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index cdee6bb85f..a25876b7fc 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -4,8 +4,9 @@ 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=346ce81ebf0f7f89fd379b40b6a4233b \ 7LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=c16e542408abda013d672be8eb88d174 \
8 file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=cfe41112f96c19a074934d128f45c693 \ 8 file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=cfe41112f96c19a074934d128f45c693 \
9 file://lib/util/reallocarray.c;beginline=3;endline=16;md5=85b0905b795d4d58bf2e00635649eec6 \
9 file://lib/util/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \ 10 file://lib/util/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \
10 file://lib/util/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \ 11 file://lib/util/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \
11 file://lib/util/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \ 12 file://lib/util/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \
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 @@
1The makefile uses top_srcdir to find files that were created by configure, when
2it should use top_builddir.
3
4Upstream-Status: Submitted (http://bugzilla.sudo.ws/show_bug.cgi?id=708)
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7---
8 src/Makefile.in | 4 ++--
9 1 file changed, 2 insertions(+), 2 deletions(-)
10
11diff --git a/src/Makefile.in b/src/Makefile.in
12index f009e10..7acfb2d 100644
13--- a/src/Makefile.in
14+++ b/src/Makefile.in
15@@ -165,11 +165,11 @@ install-dirs:
16
17 install-rc: install-dirs
18 if [ -n "$(INIT_SCRIPT)" ]; then \
19- $(INSTALL) $(INSTALL_OWNER) -m 0755 $(top_srcdir)/init.d/$(INIT_SCRIPT) $(DESTDIR)$(INIT_DIR)/sudo; \
20+ $(INSTALL) $(INSTALL_OWNER) -m 0755 $(top_builddir)/init.d/$(INIT_SCRIPT) $(DESTDIR)$(INIT_DIR)/sudo; \
21 rm -f $(DESTDIR)$(RC_LINK); \
22 ln -s $(INIT_DIR)/sudo $(DESTDIR)$(RC_LINK); \
23 elif test -n "$(tmpfiles_d)"; then \
24- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(top_srcdir)/init.d/sudo.conf $(DESTDIR)$(tmpfiles_d)/sudo.conf; \
25+ $(INSTALL) $(INSTALL_OWNER) -m 0644 $(top_builddir)/init.d/sudo.conf $(DESTDIR)$(tmpfiles_d)/sudo.conf; \
26 fi
27
28 install-binaries: install-dirs $(PROGS)
29--
302.1.4
31
diff --git a/meta/recipes-extended/sudo/sudo_1.8.13.bb b/meta/recipes-extended/sudo/sudo_1.8.14p3.bb
index 449417097e..ea37aafc34 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.13.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.14p3.bb
@@ -2,17 +2,21 @@ require sudo.inc
2 2
3SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ 3SRC_URI = "http://ftp.sudo.ws/sudo/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 " 5 file://0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch \
6 "
6 7
7PAM_SRC_URI = "file://sudo.pam" 8PAM_SRC_URI = "file://sudo.pam"
8 9
9SRC_URI[md5sum] = "f61577ec330ad1bd504c0e2eec6ea2d8" 10SRC_URI[md5sum] = "93dbd1e47c136179ff1b01494c1c0e75"
10SRC_URI[sha256sum] = "e374e5edf2c11c00d6916a9f51cb0ad15e51c7b028370fa15169b07e61e05a25" 11SRC_URI[sha256sum] = "a8a697cbb113859058944850d098464618254804cf97961dee926429f00a1237"
11 12
12DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 13DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
13RDEPENDS_${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)}"
14 15
15EXTRA_OECONF += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}" 16EXTRA_OECONF += " \
17 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \
18 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \
19 "
16 20
17do_install_append () { 21do_install_append () {
18 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then 22 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
@@ -26,4 +30,5 @@ do_install_append () {
26 rmdir -p --ignore-fail-on-non-empty ${D}${localstatedir}/run/sudo 30 rmdir -p --ignore-fail-on-non-empty ${D}${localstatedir}/run/sudo
27} 31}
28 32
33FILES_${PN} += "${libdir}/tmpfiles.d"
29FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la" 34FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la"