[meta-oe] openldap: pass correct URANDOM_DEVICE to CPPFLAGS

Message ID 20220611132312.4070200-1-yi.zhao@windriver.com
State New
Headers show
Series [meta-oe] openldap: pass correct URANDOM_DEVICE to CPPFLAGS | expand

Commit Message

Yi Zhao June 11, 2022, 1:23 p.m. UTC
We encountered a runtime error with slappasswd:
$ slappasswd -s foo
Password generation failed for scheme {SSHA}:

This is because the URANDOM_DEVICE is not passed to CPPFLAGS correctly,
then the program can not open /dev/urandom.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-support/openldap/openldap_2.5.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

akuster808 June 11, 2022, 6:54 p.m. UTC | #1
On 6/11/22 06:23, Yi Zhao wrote:
> We encountered a runtime error with slappasswd:
> $ slappasswd -s foo
> Password generation failed for scheme {SSHA}:
>
> This is because the URANDOM_DEVICE is not passed to CPPFLAGS correctly,
> then the program can not open /dev/urandom.
>
> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>

backport to kirkstone?

-armin
> ---
>   meta-oe/recipes-support/openldap/openldap_2.5.12.bb | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-support/openldap/openldap_2.5.12.bb b/meta-oe/recipes-support/openldap/openldap_2.5.12.bb
> index a0ca2b5d3..c01db08e4 100644
> --- a/meta-oe/recipes-support/openldap/openldap_2.5.12.bb
> +++ b/meta-oe/recipes-support/openldap/openldap_2.5.12.bb
> @@ -131,7 +131,7 @@ PACKAGES += "${PN}-overlay-proxycache"
>   # Append URANDOM_DEVICE='/dev/urandom' to CPPFLAGS:
>   # This allows tls to obtain random bits from /dev/urandom, by default
>   # it was disabled for cross-compiling.
> -CPPFLAGS:append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\'/dev/urandom\' -fPIC"
> +CPPFLAGS:append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\\"/dev/urandom\\" -fPIC"
>   
>   LDFLAGS:append = " -pthread"
>   
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#97472): https://lists.openembedded.org/g/openembedded-devel/message/97472
> Mute This Topic: https://lists.openembedded.org/mt/91688155/3616698
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [akuster808@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Yi Zhao June 13, 2022, 6:49 a.m. UTC | #2
On 6/12/22 02:54, Armin Kuster wrote:
>
>
> On 6/11/22 06:23, Yi Zhao wrote:
>> We encountered a runtime error with slappasswd:
>> $ slappasswd -s foo
>> Password generation failed for scheme {SSHA}:
>>
>> This is because the URANDOM_DEVICE is not passed to CPPFLAGS correctly,
>> then the program can not open /dev/urandom.
>>
>> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
>
> backport to kirkstone?


The issue is introduced by commit 
b2261dbb956b1124ccef8ae22fbcb6375071fffd which is not included in kirkstone.


//Yi


>
> -armin
>> ---
>>   meta-oe/recipes-support/openldap/openldap_2.5.12.bb | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta-oe/recipes-support/openldap/openldap_2.5.12.bb 
>> b/meta-oe/recipes-support/openldap/openldap_2.5.12.bb
>> index a0ca2b5d3..c01db08e4 100644
>> --- a/meta-oe/recipes-support/openldap/openldap_2.5.12.bb
>> +++ b/meta-oe/recipes-support/openldap/openldap_2.5.12.bb
>> @@ -131,7 +131,7 @@ PACKAGES += "${PN}-overlay-proxycache"
>>   # Append URANDOM_DEVICE='/dev/urandom' to CPPFLAGS:
>>   # This allows tls to obtain random bits from /dev/urandom, by default
>>   # it was disabled for cross-compiling.
>> -CPPFLAGS:append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\'/dev/urandom\' 
>> -fPIC"
>> +CPPFLAGS:append = " -D_GNU_SOURCE 
>> -DURANDOM_DEVICE=\\"/dev/urandom\\" -fPIC"
>>     LDFLAGS:append = " -pthread"
>>
>>
>>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#97473): https://lists.openembedded.org/g/openembedded-devel/message/97473
> Mute This Topic: https://lists.openembedded.org/mt/91688155/3616783
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [yi.zhao@windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Patch

diff --git a/meta-oe/recipes-support/openldap/openldap_2.5.12.bb b/meta-oe/recipes-support/openldap/openldap_2.5.12.bb
index a0ca2b5d3..c01db08e4 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.5.12.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.5.12.bb
@@ -131,7 +131,7 @@  PACKAGES += "${PN}-overlay-proxycache"
 # Append URANDOM_DEVICE='/dev/urandom' to CPPFLAGS:
 # This allows tls to obtain random bits from /dev/urandom, by default
 # it was disabled for cross-compiling.
-CPPFLAGS:append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\'/dev/urandom\' -fPIC"
+CPPFLAGS:append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\\"/dev/urandom\\" -fPIC"
 
 LDFLAGS:append = " -pthread"