diff options
author | Armin Kuster <akuster808@gmail.com> | 2019-03-27 20:23:21 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2019-03-31 10:36:37 -0700 |
commit | 9553b9a8dd6c8b6f79284aa1694b0def1b074d02 (patch) | |
tree | c98501ac9a775dc0bbc9e5a5fd88450567be66f9 | |
parent | fe0e799624604c5a9c6408aeb0a492d76d58e674 (diff) | |
download | meta-security-9553b9a8dd6c8b6f79284aa1694b0def1b074d02.tar.gz |
sssd: fix a few runtime issues
include a few more RDEPEND packages. remove init script as there really
isn't one yet.
[v2]
Squish build tweeking done in pkg update into this changeset
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-security/sssd/sssd_1.16.3.bb | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/recipes-security/sssd/sssd_1.16.3.bb b/recipes-security/sssd/sssd_1.16.3.bb index 8f7f805..e996a61 100644 --- a/recipes-security/sssd/sssd_1.16.3.bb +++ b/recipes-security/sssd/sssd_1.16.3.bb | |||
@@ -14,10 +14,13 @@ SRC_URI = "https://releases.pagure.org/SSSD/${BPN}/${BP}.tar.gz\ | |||
14 | SRC_URI[md5sum] = "af4288c9d1f9953e3b3b6e0b165a5ece" | 14 | SRC_URI[md5sum] = "af4288c9d1f9953e3b3b6e0b165a5ece" |
15 | SRC_URI[sha256sum] = "ee5d17a0c663c09819cbab9364085b9e57faeca02406cc30efe14cc0cfc04ec4" | 15 | SRC_URI[sha256sum] = "ee5d17a0c663c09819cbab9364085b9e57faeca02406cc30efe14cc0cfc04ec4" |
16 | 16 | ||
17 | inherit autotools pkgconfig gettext update-rc.d python-dir distro_features_check | 17 | inherit autotools pkgconfig gettext python-dir distro_features_check |
18 | 18 | ||
19 | REQUIRED_DISTRO_FEATURES = "pam" | 19 | REQUIRED_DISTRO_FEATURES = "pam" |
20 | 20 | ||
21 | SSSD_UID ?= "root" | ||
22 | SSSD_GID ?= "root" | ||
23 | |||
21 | CACHED_CONFIGUREVARS = "ac_cv_member_struct_ldap_conncb_lc_arg=no \ | 24 | CACHED_CONFIGUREVARS = "ac_cv_member_struct_ldap_conncb_lc_arg=no \ |
22 | ac_cv_path_NSUPDATE=${bindir} \ | 25 | ac_cv_path_NSUPDATE=${bindir} \ |
23 | ac_cv_path_PYTHON2=${PYTHON_DIR} ac_cv_prog_HAVE_PYTHON3=${PYTHON_DIR} \ | 26 | ac_cv_path_PYTHON2=${PYTHON_DIR} ac_cv_prog_HAVE_PYTHON3=${PYTHON_DIR} \ |
@@ -25,6 +28,7 @@ CACHED_CONFIGUREVARS = "ac_cv_member_struct_ldap_conncb_lc_arg=no \ | |||
25 | 28 | ||
26 | PACKAGECONFIG ?="nss nscd" | 29 | PACKAGECONFIG ?="nss nscd" |
27 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" | 30 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" |
31 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | ||
28 | 32 | ||
29 | PACKAGECONFIG[ssh] = "--with-ssh, --with-ssh=no, " | 33 | PACKAGECONFIG[ssh] = "--with-ssh, --with-ssh=no, " |
30 | PACKAGECONFIG[samba] = "--with-samba, --with-samba=no, samba" | 34 | PACKAGECONFIG[samba] = "--with-samba, --with-samba=no, samba" |
@@ -55,6 +59,17 @@ do_install () { | |||
55 | rmdir --ignore-fail-on-non-empty "${D}/${bindir}" | 59 | rmdir --ignore-fail-on-non-empty "${D}/${bindir}" |
56 | install -d ${D}/${sysconfdir}/${BPN} | 60 | install -d ${D}/${sysconfdir}/${BPN} |
57 | install -m 600 ${WORKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN} | 61 | install -m 600 ${WORKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN} |
62 | |||
63 | # Remove /var/run as it is created on startup | ||
64 | rm -rf ${D}${localstatedir}/run | ||
65 | |||
66 | } | ||
67 | |||
68 | pkg_postinst_ontarget_${PN} () { | ||
69 | if [ -e /etc/init.d/populate-volatile.sh ] ; then | ||
70 | ${sysconfdir}/init.d/populate-volatile.sh update | ||
71 | fi | ||
72 | chown ${SSSD_UID}:${SSSD_GID} ${sysconfdir}/${BPN}/${BPN}.conf | ||
58 | } | 73 | } |
59 | 74 | ||
60 | CONFFILES_${PN} = "${sysconfdir}/${BPN}/${BPN}.conf" | 75 | CONFFILES_${PN} = "${sysconfdir}/${BPN}/${BPN}.conf" |
@@ -70,4 +85,4 @@ FILES_${PN}-dev = " ${includedir}/* ${libdir}/*la ${libdir}/*/*la" | |||
70 | # The package contains symlinks that trip up insane | 85 | # The package contains symlinks that trip up insane |
71 | INSANE_SKIP_${PN} = "dev-so" | 86 | INSANE_SKIP_${PN} = "dev-so" |
72 | 87 | ||
73 | RDEPENDS_${PN} += "bind dbus" | 88 | RDEPENDS_${PN} = "bind dbus libldb libpam" |