Revert "sssd: fix libcrypto version used"
PATCH 1/5 Revert "sssd: fix libcrypto version used"
This reverts commit 2488c965d6b1b440734f43326fb33ac642ac7b82.
This corrects an incorrect fix as pointed out by Adrian Bunk.
--- recipes-security/sssd/sssd_1.16.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-security/sssd/sssd_1.16.3.bb +1 -1
@@ -33,7 +33,7 @@ PACKAGECONFIG[manpages] = "--with-manpages, --with-manpages=no" PACKAGECONFIG[python2] = "--with-python2-bindings, --without-python2-bindings" PACKAGECONFIG[python3] = "--with-python3-bindings, --without-python3-bindings" PACKAGECONFIG[nss] = "--with-crypto=nss, ,nss," -PACKAGECONFIG[cyrpto] = "--with-crypto=libcrypto, , libcrypto10" +PACKAGECONFIG[cyrpto] = "--with-crypto=libcrypto, , libcrypto" PACKAGECONFIG[nscd] = "--with-nscd=${sbindir}, --with-nscd=no " PACKAGECONFIG[nl] = "--with-libnl, --with-libnl=no, libnl" PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/, --with-systemdunitdir="
Signature · 1 line
2.17.1
PATCH 2/5 libldb: work around samba libldb packaging issues
Samba and libldb overlap in a few places. This is the simplest fix for now.
--- recipes-support/libldb/libldb_%.bbappend | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 recipes-support/libldb/libldb_%.bbappend
recipes-support/libldb/libldb_%.bbappend new file +22 -0
@@ -0,0 +1,22 @@ +# This fixes this issue: +#ERROR: sssd-1.16.3-r0 do_prepare_recipe_sysroot: The file /usr/lib/python2.7/site-packages/_ldb_text.py is installed by both libldb and samba, aborting + +EXTRA_OECONF += "--disable-python" + +#Error: Transaction check error: +# file /usr/bin/ldbadd conflicts between attempted installs of samba-4.8.4-r0.cortexa15t2hf_neon_vfpv4 and libldb-1.4.1-r0.cortexa15t2hf_neon_vfpv4 +# file /usr/bin/ldbdel conflicts between attempted installs of samba-4.8.4-r0.cortexa15t2hf_neon_vfpv4 and libldb-1.4.1-r0.cortexa15t2hf_neon_vfpv4 +# file /usr/bin/ldbedit conflicts between attempted installs of samba-4.8.4-r0.cortexa15t2hf_neon_vfpv4 and libldb-1.4.1-r0.cortexa15t2hf_neon_vfpv4 +# file /usr/bin/ldbmodify conflicts between attempted installs of samba-4.8.4-r0.cortexa15t2hf_neon_vfpv4 and libldb-1.4.1-r0.cortexa15t2hf_neon_vfpv4 +# file /usr/bin/ldbrename conflicts between attempted installs of samba-4.8.4-r0.cortexa15t2hf_neon_vfpv4 and libldb-1.4.1-r0.cortexa15t2hf_neon_vfpv4 +# file /usr/bin/ldbsearch conflicts between attempted installs of samba-4.8.4-r0.cortexa15t2hf_neon_vfpv4 and libldb-1.4.1-r0.cortexa15t2hf_neon_vfpv4 + +do_install_append() { + rm -f ${D}${bindir}/ldbadd + rm -f ${D}${bindir}/ldbdel + rm -f ${D}${bindir}/ldbedit + rm -f ${D}${bindir}/ldbmodify + rm -f ${D}${bindir}/ldbrename + rm -f ${D}${bindir}/ldbsearch + rmdir ${D}${bindir} +}
Signature · 1 line
2.17.1
Re: [meta-security][PATCH 2/5] libldb: work around samba libldb packaging issues
Quoted 2 lines · Armin Kuster
Samba and libldb overlap in a few places. This is the simplest fix for now.
Adding a quick hack for interaction problems between two packages that are both in meta-openembedded by adding a .bbappend in meta-security creates a technical debt while not even helping users who are not using meta-security.
The proper solution is likely to make samba use the external libldb instead of an internal copy.
Quoted 12 lines
Signed-off-by Armin Kuster <[email protected]>--- recipes-support/libldb/libldb_%.bbappend | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 recipes-support/libldb/libldb_%.bbappendrecipes-support/libldb/libldb_%.bbappend new file +0
-0
recipes-support/libldb/libldb_%.bbappend line 4
Quoted 5 lines
recipes-support/libldb/libldb_%.bbappend new file +4
-0@@ -0,0 +1,22 @@ +# This fixes this issue: +#ERROR: sssd-1.16.3-r0 do_prepare_recipe_sysroot: The file /usr/lib/python2.7/site-packages/_ldb_text.py is installed by both libldb and samba, aborting + +EXTRA_OECONF += "--disable-python"
So just adding the meta-security layer will turn the pyldb* packages into empty packages?
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedRe: [meta-security][PATCH 2/5] libldb: work around samba libldb packaging issues
Quoted 4 lines · Adrian Bunk
Quoted 2 lines · Armin Kuster
Samba and libldb overlap in a few places. This is the simplest fix for now.
Quoted 8 lines
Adding a quick hack for interaction problems between two packages that are both in meta-openembedded by adding a .bbappend in meta-security creates a technical debt while not even helping users who are not using meta-security.
The proper solution is likely to make samba use the external libldb instead of an internal copy.
...
commit a001e465293b36c03d4ca4500857fe0a67d13e20
Date: Fri Jul 27 14:09:10 2018 -0700
samba: Update to 4.8.3
LDB 1.4.0 breaks Samba < 4.9 therefore use internal version
So the root cause is that last summer LDB in meta-openembedded was updated to a version not compatible with with the Samba version in meta-openembedded.
As workaround Samba was changed to use the internal version of the library.
What is now proposed is a workaround to fix a regression caused by the first workaround.
The best way forward would be to upgrade Samba to 4.9 or 4.10 and use the external LDB again.
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedRe: [meta-security][PATCH 2/5] libldb: work around samba libldb packaging issues
In reply to Adrian BunkQuoted 17 lines · Adrian Bunk
Quoted 2 lines · Armin Kuster
Samba and libldb overlap in a few places. This is the simplest fix for now.
Adding a quick hack for interaction problems between two packages that are both in meta-openembedded by adding a .bbappend in meta-security creates a technical debt while not even helping users who are not using meta-security.
The proper solution is likely to make samba use the external libldb instead of an internal copy.
Quoted 6 lines
Signed-off-by Armin Kuster <[email protected]>--- recipes-support/libldb/libldb_%.bbappend | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 recipes-support/libldb/libldb_%.bbappend
Quoted 13 lines
recipes-support/libldb/libldb_%.bbappend line 4
Quoted 11 lines
recipes-support/libldb/libldb_%.bbappend new file +4
-0@@ -0,0 +1,22 @@ +# This fixes this issue: +#ERROR: sssd-1.16.3-r0 do_prepare_recipe_sysroot: The file /usr/lib/python2.7/site-packages/_ldb_text.py is installed by both libldb and samba, aborting + +EXTRA_OECONF += "--disable-python"So just adding the meta-security layer will turn the pyldb* packages into empty packages?
I think I have a possible solution in libldb. patch out shortly.
- armin
Quoted 4 lines
cu
Adrian
PATCH 3/5 sssd: fix a few runtime issues
In reply to Armin Kusterinclude a few more RDEPEND packages. remove init script as there really isn't one yet.
--- recipes-security/sssd/sssd_1.16.3.bb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
recipes-security/sssd/sssd_1.16.3.bb +12 -2
@@ -14,7 +14,7 @@ SRC_URI = "https://releases.pagure.org/SSSD/${BPN}/${BP}.tar.gz\ SRC_URI[md5sum] = "af4288c9d1f9953e3b3b6e0b165a5ece" SRC_URI[sha256sum] = "ee5d17a0c663c09819cbab9364085b9e57faeca02406cc30efe14cc0cfc04ec4" -inherit autotools pkgconfig gettext update-rc.d python-dir distro_features_check +inherit autotools pkgconfig gettext python-dir distro_features_check REQUIRED_DISTRO_FEATURES = "pam"
@@ -55,6 +55,16 @@ do_install () { rmdir --ignore-fail-on-non-empty "${D}/${bindir}" install -d ${D}/${sysconfdir}/${BPN} install -m 600 ${WORKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN} + + # Remove /var/run as it is created on startup + rm -rf ${D}${localstatedir}/run +} + +pkg_postinst_ontarget_${PN} () { +if [ -e /etc/init.d/populate-volatile.sh ] ; then + ${sysconfdir}/init.d/populate-volatile.sh update +fi + } CONFFILES_${PN} = "${sysconfdir}/${BPN}/${BPN}.conf"
@@ -70,4 +80,4 @@ FILES_${PN}-dev = " ${includedir}/* ${libdir}/*la ${libdir}/*/*la" # The package contains symlinks that trip up insane INSANE_SKIP_${PN} = "dev-so" -RDEPENDS_${PN} += "bind dbus" +RDEPENDS_${PN} = "bind dbus samba libldb"
Signature · 1 line
2.17.1
Re: [meta-security][PATCH 3/5] sssd: fix a few runtime issues
Quoted 12 lines · Armin Kuster
include a few more RDEPEND packages. remove init script as there really isn't one yet.
Signed-off-by Armin Kuster <[email protected]>--- recipes-security/sssd/sssd_1.16.3.bb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)recipes-security/sssd/sssd_1.16.3.bb +0
-0
recipes-security/sssd/sssd_1.16.3.bb FILES_${PN}-dev = " ${includedir}/* ${libdir}/*la ${libdir}/*/*la" · line 83
Quoted 6 lines
recipes-security/sssd/sssd_1.16.3.bb +1
-1# The package contains symlinks that trip up insane INSANE_SKIP_${PN} = "dev-so" -RDEPENDS_${PN} += "bind dbus" +RDEPENDS_${PN} = "bind dbus samba libldb"
Even when samba support is not enabled?
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedRe: [meta-security][PATCH 3/5] sssd: fix a few runtime issues
Quoted 17 lines · Adrian Bunk
Quoted 16 lines · Armin Kuster
include a few more RDEPEND packages. remove init script as there really isn't one yet.
Signed-off-by Armin Kuster <[email protected]>--- recipes-security/sssd/sssd_1.16.3.bb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)recipes-security/sssd/sssd_1.16.3.bb +0
-0# The package contains symlinks that trip up insane INSANE_SKIP_${PN} = "dev-so"
Quoted 3 lines
recipes-security/sssd/sssd_1.16.3.bb FILES_${PN}-dev = " ${includedir}/* ${libdir}/*la ${libdir}/*/*la" · line 83
Quoted 2 lines
recipes-security/sssd/sssd_1.16.3.bb +1
-1-RDEPENDS_${PN} += "bind dbus" +RDEPENDS_${PN} = "bind dbus samba libldb"Even when samba support is not enabled?
Yeah, that isn't right.
thanks,
Armin
Quoted 4 lines
cu
Adrian
PATCH 4/5 sssd: update to 1.16.4
In reply to Armin KusterAdd systemd pkgconf via DISTRO_FEATURE
Fix uid/gid of sssd.conf
---
.../sssd/{sssd_1.16.3.bb => sssd_1.16.4.bb} | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
rename recipes-security/sssd/{sssd_1.16.3.bb => sssd_1.16.4.bb} (88%)recipes-security/sssd/sssd_1.16.4.bb renamed from recipes-security/sssd/sssd_1.16.3.bb +8 -4
@@ -11,13 +11,16 @@ DEPENDS += "libldb dbus libtalloc libpcre glib-2.0 popt e2fsprogs libtevent" SRC_URI = "https://releases.pagure.org/SSSD/${BPN}/${BP}.tar.gz\ file://sssd.conf " -SRC_URI[md5sum] = "af4288c9d1f9953e3b3b6e0b165a5ece" -SRC_URI[sha256sum] = "ee5d17a0c663c09819cbab9364085b9e57faeca02406cc30efe14cc0cfc04ec4" +SRC_URI[md5sum] = "757bbb6f15409d8d075f4f06cb678d50" +SRC_URI[sha256sum] = "6bb212cd6b75b918e945c24e7c3f95a486fb54d7f7d489a9334cfa1a1f3bf959" inherit autotools pkgconfig gettext python-dir distro_features_check REQUIRED_DISTRO_FEATURES = "pam" +SSSD_UID ?= "root" +SSSD_GID ?= "root" + CACHED_CONFIGUREVARS = "ac_cv_member_struct_ldap_conncb_lc_arg=no \ ac_cv_path_NSUPDATE=${bindir} \ 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 \ PACKAGECONFIG ?="nss nscd" PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" +PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" PACKAGECONFIG[ssh] = "--with-ssh, --with-ssh=no, " PACKAGECONFIG[samba] = "--with-samba, --with-samba=no, samba"
@@ -64,7 +68,7 @@ pkg_postinst_ontarget_${PN} () { if [ -e /etc/init.d/populate-volatile.sh ] ; then ${sysconfdir}/init.d/populate-volatile.sh update fi - + chown ${SSSD_UID}:${SSSD_GID} ${sysconfdir}/${BPN}/${BPN}.conf } CONFFILES_${PN} = "${sysconfdir}/${BPN}/${BPN}.conf"
@@ -80,4 +84,4 @@ FILES_${PN}-dev = " ${includedir}/* ${libdir}/*la ${libdir}/*/*la" # The package contains symlinks that trip up insane INSANE_SKIP_${PN} = "dev-so" -RDEPENDS_${PN} = "bind dbus samba libldb" +RDEPENDS_${PN} = "bind dbus samba libldb libpam"
Signature · 1 line
2.17.1
Re: [meta-security][PATCH 4/5] sssd: update to 1.16.4
recipes-security/sssd/sssd_1.16.4.bb FILES_${PN}-dev = " ${includedir}/* ${libdir}/*la ${libdir}/*/*la" · line 87
Quoted 8 lines · Armin Kuster
Add systemd pkgconf via
DISTRO_FEATUREFix uid/gid of sssd.conf
Signed-off-by Armin Kuster <[email protected]>...
recipes-security/sssd/sssd_1.16.4.bb renamed from recipes-security/sssd/sssd_1.16.3.bb +1
-1-RDEPENDS_${PN} = "bind dbus samba libldb" +RDEPENDS_${PN} = "bind dbus samba libldb libpam"
Why is this required?
And the way this commit mixes unrelated changes, it is no even clear whether this is for the new upstream version or supposed to fix some older issue.
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedRe: [meta-security][PATCH 4/5] sssd: update to 1.16.4
Quoted 11 lines · Adrian Bunk
recipes-security/sssd/sssd_1.16.4.bb FILES_${PN}-dev = " ${includedir}/* ${libdir}/*la ${libdir}/*/*la" · line 87
Quoted 8 lines · Armin Kuster
Add systemd pkgconf via
DISTRO_FEATUREFix uid/gid of sssd.conf
Signed-off-by Armin Kuster <[email protected]>...
recipes-security/sssd/sssd_1.16.4.bb renamed from recipes-security/sssd/sssd_1.16.3.bb +1
-1-RDEPENDS_${PN} = "bind dbus samba libldb" +RDEPENDS_${PN} = "bind dbus samba libldb libpam"Why is this required?
Quoted 3 lines
And the way this commit mixes unrelated changes, it is no even clear whether this is for the new upstream version or supposed to fix some older issue.
I will be squish those extra changes into the clean up patch and just have the update separate.
thanks,
Armin
Quoted 3 lines
cu
Adrian
PATCH 5/5 sssd: Add basic runtime test
In reply to Armin KusterThis does some basic testing and checks.
--- lib/oeqa/runtime/cases/sssd.py | 37 ++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 lib/oeqa/runtime/cases/sssd.py
lib/oeqa/runtime/cases/sssd.py new file +37 -0
@@ -0,0 +1,37 @@ +# Copyright (C) 2019 Armin Kuster <[email protected]> +# +import re + +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends +from oeqa.runtime.decorator.package import OEHasPackage + + +class SSSDTest(OERuntimeTestCase): + + @OEHasPackage(['sssd']) + @OETestDepends(['ssh.SSHTest.test_ssh']) + def test_sssd_help(self): + status, output = self.target.run('sssctl --help') + msg = ('sssctl command does not work as expected. ' + 'Status and output:%s and %s' % (status, output)) + self.assertEqual(status, 1, msg = msg) + + @OETestDepends(['sssd.SSSDTest.test_sssd_help']) + def test_sssd_sssctl_conf_perms_chk(self): + status, output = self.target.run('sssctl domain-status') + match = re.search('ConfDB initialization has failed', output) + if match: + msg = ('sssctl domain-status failed, check sssd.conf perms. ' + 'Status and output:%s and %s' % (status, output)) + self.assertEqual(status, 0, msg = msg) + + @OETestDepends(['sssd.SSSDTest.test_sssd_sssctl_conf_perms_chk']) + def test_sssd_sssctl_deamon(self): + status, output = self.target.run('sssctl domain-status') + match = re.search('No domains configured, fatal error!', output) + if match: + msg = ('sssctl domain-status failed, sssd.conf not setup correctly. ' + 'Status and output:%s and %s' % (status, output)) + self.assertEqual(status, 0, msg = msg) +
Signature · 1 line
2.17.1