Skip to contentSkip to conversation

keyutils: fix pulling in glibc when musl enabled

PATCH In review Armin Kuster 2 participants 6 messages Mar 25, 2019 – Mar 29, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 keyutils: fix pulling in glibc when musl enabled

---
 recipes-security/keyutils/keyutils_1.6.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
recipes-security/keyutils/keyutils_1.6.bb +3 -1
index 054e0c1..c961fa2 100644
@@ -46,4 +46,6 @@ do_install_ptest () {
 
 FILES_${PN}-dev += "${nonarch_base_libdir}/pkgconfig/libkeyutils.pc"
 
-RDEPENDS_${PN}-ptest += "glibc-utils lsb"
+RDEPENDS_${PN}-ptest += "lsb"
+RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils"
+RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils"
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 sssd: fix libcrypto version used

---
 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
index 8f7f805..d39fa23 100644
@@ -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, , libcrypto"
+PACKAGECONFIG[cyrpto] = "--with-crypto=libcrypto, , libcrypto10"
 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
#2 lore raw

Re: [meta-security][PATCH 2/2] sssd: fix libcrypto version used

Quoted 10 lines · Armin Kuster
---
 recipes-security/sssd/sssd_1.16.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-security/sssd/sssd_1.16.3.bb +0 -0
index 8f7f805..d39fa23 100644

recipes-security/sssd/sssd_1.16.3.bb PACKAGECONFIG[manpages] = "--with-manpages, --with-manpages=no" · line 36

Quoted 6 lines
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, , libcrypto"
+PACKAGECONFIG[cyrpto] = "--with-crypto=libcrypto, , libcrypto10"
...

This looks wrong for multiple reasons, and it still gave the same error when I tried it.

How has this change been tested?

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 Seed
author
#3 lore raw

Re: [meta-security][PATCH 2/2] sssd: fix libcrypto version used

Quoted 6 lines · Adrian Bunk
Quoted 5 lines · Armin Kuster
---
 recipes-security/sssd/sssd_1.16.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines

recipes-security/sssd/sssd_1.16.3.bb PACKAGECONFIG[manpages] = "--with-manpages, --with-manpages=no" · line 36

Quoted 11 lines
recipes-security/sssd/sssd_1.16.3.bb +1 -1
index 8f7f805..d39fa23 100644
@@ -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, , libcrypto"
+PACKAGECONFIG[cyrpto] = "--with-crypto=libcrypto, , libcrypto10"
...

This looks wrong for multiple reasons, and it still gave the same error when I tried it.

That is troubling. I don't see any errors here. Thanks for the feed back. I will have to dig at this a bit more.

Can you provide some build detail so that I can reproduce it?

Quoted 2 lines

How has this change been tested?

Not for this change.

Which reminds me I should automate some testing for this package.

regards,
Armin

Quoted 4 lines

cu
Adrian

#4 lore raw

Re: [meta-security][PATCH 2/2] sssd: fix libcrypto version used

Quoted 22 lines · On Tue, Mar 26, 2019 at 03:52:39PM -0700, akuster808 wrote:
Quoted 6 lines · Adrian Bunk
Quoted 5 lines · Armin Kuster
---
 recipes-security/sssd/sssd_1.16.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines

recipes-security/sssd/sssd_1.16.3.bb PACKAGECONFIG[manpages] = "--with-manpages, --with-manpages=no" · line 36

Quoted 11 lines
recipes-security/sssd/sssd_1.16.3.bb +1 -1
index 8f7f805..d39fa23 100644
@@ -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, , libcrypto"
+PACKAGECONFIG[cyrpto] = "--with-crypto=libcrypto, , libcrypto10"
...

This looks wrong for multiple reasons, and it still gave the same error when I tried it.

Quoted 4 lines

That is troubling. I don't see any errors here. Thanks for the feed back. I will have to dig at this a bit more.

Can you provide some build detail so that I can reproduce it?

Try building the package without nss but with cyrpto (sic) in PACKAGECONFIG.

Quoted 4 lines
Quoted 1 line

How has this change been tested?

Not for this change.

Which reminds me I should automate some testing for this package.

This is not about automating testing.

This is about first reproducing the problem you are trying to fix, and then verifying that your fix actually fixes this problem.

Which is the fundamental way to do any kind of bugfixing.[1]

This one line already contained two bugs,[2] and the commit added a third problem (usage of OpenSSL 1.0) without fixing any of these bugs.

The commit message not stating any reason why this change was done only adds to the confusion.
I thought originally this was a workaround for code not building with OpenSSL 1.1, which would then also be required for thud.

Quoted 2 lines

regards,
Armin

cu
Adrian

[1] this is not one of the harder cases where reproducing the problem would be a problem
[2] "cyrpto", and "libcrypto" instead of "openssl p11-kit"

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 Seed
author
#5 lore raw

Re: [meta-security][PATCH 2/2] sssd: fix libcrypto version used

Quoted 22 lines · Adrian Bunk
Quoted 21 lines · On Tue, Mar 26, 2019 at 03:52:39PM -0700, akuster808 wrote:
Quoted 19 lines · Adrian Bunk
Quoted 10 lines · Armin Kuster
---
 recipes-security/sssd/sssd_1.16.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-security/sssd/sssd_1.16.3.bb +0 -0
index 8f7f805..d39fa23 100644

recipes-security/sssd/sssd_1.16.3.bb PACKAGECONFIG[manpages] = "--with-manpages, --with-manpages=no" · line 36

Quoted 6 lines
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, , libcrypto"
+PACKAGECONFIG[cyrpto] = "--with-crypto=libcrypto, , libcrypto10"
...

This looks wrong for multiple reasons, and it still gave the same error when I tried it.

Quoted 5 lines
Quoted 4 lines

That is troubling. I don't see any errors here. Thanks for the feed back. I will have to dig at this a bit more.

Can you provide some build detail so that I can reproduce it?

Try building the package without nss but with cyrpto (sic) in PACKAGECONFIG.

Ok. I see it now.

Quoted 9 lines
Quoted 5 lines
Quoted 2 lines

How has this change been tested?

Not for this change.

Which reminds me I should automate some testing for this package.

This is not about automating testing.

This is about first reproducing the problem you are trying to fix, and then verifying that your fix actually fixes this problem.

And that is what i thought I was doing.

Quoted 2 lines

Which is the fundamental way to do any kind of bugfixing.[1]

Thanks for the reminder.

Quoted 8 lines

This one line already contained two bugs,[2] and the commit added a third problem (usage of OpenSSL 1.0) without fixing any of these bugs.

The commit message not stating any reason why this change was done only adds to the confusion.
I thought originally this was a workaround for code not building with OpenSSL 1.1, which would then also be required for thud.

I will keep that in mind.

thanks,
Armin

Quoted 10 lines
Quoted 3 lines

regards,
Armin

cu
Adrian

[1] this is not one of the harder cases where reproducing the problem would be a problem
[2] "cyrpto", and "libcrypto" instead of "openssl p11-kit"