All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/libmodsecurity: needs dynamic library with libcurl and mbedtls
@ 2022-06-13 20:06 Fabrice Fontaine
  2022-06-19 15:53 ` Arnout Vandecappelle
  0 siblings, 1 reply; 4+ messages in thread
From: Fabrice Fontaine @ 2022-06-13 20:06 UTC (permalink / raw)
  To: buildroot; +Cc: Frank Vanbever, Fabrice Fontaine

libmodsecurity embeds several mbedtls source files since version 3.0.0
and
https://github.com/SpiderLabs/ModSecurity/commit/a3ae686f2555bdacbfc9e1889ad05065711a165d
resulting in the following static build failure if curl is built with
mbedtls support:

/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: /home/buildroot/autobuild/instance-0/output-1/host/bin/../m68k-buildroot-uclinux-uclibc/sysroot/usr/lib/libmbedcrypto.a(md5.c.o): in function `mbedtls_md5_free':
md5.c:(.text+0x16): multiple definition of `mbedtls_md5_free'; ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x16): first defined here

Fixes:
 - http://autobuild.buildroot.org/results/98472a3a41cdbcb3d02289a437074a267f4b2e8e

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/libmodsecurity/Config.in    | 5 +++++
 package/nginx-modsecurity/Config.in | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in
index 87f7a9c103..f65ab3de93 100644
--- a/package/libmodsecurity/Config.in
+++ b/package/libmodsecurity/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_LIBMODSECURITY
 	bool "libmodsecurity"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	# libmodsecurity embeds several mbedtls source files
+	depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS)
 	select BR2_PACKAGE_PCRE
 	help
 	  Libmodsecurity is one component of the ModSecurity
@@ -17,3 +19,6 @@ config BR2_PACKAGE_LIBMODSECURITY
 
 comment "libmodsecurity needs a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+
+comment "libmodsecurity needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS
diff --git a/package/nginx-modsecurity/Config.in b/package/nginx-modsecurity/Config.in
index b1fcbadd7a..5cbe57a866 100644
--- a/package/nginx-modsecurity/Config.in
+++ b/package/nginx-modsecurity/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY
 	depends on BR2_PACKAGE_NGINX_HTTP
 	depends on BR2_INSTALL_LIBSTDCPP # libmodsecurity
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity
+	depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) # libmodsecurity
 	select BR2_PACKAGE_LIBMODSECURITY
 	help
 	  The ModSecurity-nginx connector is the connection
@@ -14,3 +15,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY
 comment "nginx-modsecurity needs a toolchain w/ C++, threads"
 	depends on BR2_PACKAGE_NGINX_HTTP
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+
+comment "nginx-modsecurity needs a toolchain w/ dynamic library"
+	depends on BR2_PACKAGE_NGINX_HTTP
+	depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/libmodsecurity: needs dynamic library with libcurl and mbedtls
  2022-06-13 20:06 [Buildroot] [PATCH 1/1] package/libmodsecurity: needs dynamic library with libcurl and mbedtls Fabrice Fontaine
@ 2022-06-19 15:53 ` Arnout Vandecappelle
  2022-06-19 15:54   ` Arnout Vandecappelle
  2022-07-19 16:36   ` Peter Korsgaard
  0 siblings, 2 replies; 4+ messages in thread
From: Arnout Vandecappelle @ 2022-06-19 15:53 UTC (permalink / raw)
  To: Fabrice Fontaine, buildroot; +Cc: Frank Vanbever



On 13/06/2022 22:06, Fabrice Fontaine wrote:
> libmodsecurity embeds several mbedtls source files since version 3.0.0
> and
> https://github.com/SpiderLabs/ModSecurity/commit/a3ae686f2555bdacbfc9e1889ad05065711a165d
> resulting in the following static build failure if curl is built with
> mbedtls support:
> 
> /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: /home/buildroot/autobuild/instance-0/output-1/host/bin/../m68k-buildroot-uclinux-uclibc/sysroot/usr/lib/libmbedcrypto.a(md5.c.o): in function `mbedtls_md5_free':
> md5.c:(.text+0x16): multiple definition of `mbedtls_md5_free'; ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x16): first defined here
> 
> Fixes:
>   - http://autobuild.buildroot.org/results/98472a3a41cdbcb3d02289a437074a267f4b2e8e
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

  Applied to master, thanks.

  Since upstream seemed to risk not accepting the package, I added a comment 
that hopefully will tickle them.

  Regards,
  Arnout

> ---
>   package/libmodsecurity/Config.in    | 5 +++++
>   package/nginx-modsecurity/Config.in | 5 +++++
>   2 files changed, 10 insertions(+)
> 
> diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in
> index 87f7a9c103..f65ab3de93 100644
> --- a/package/libmodsecurity/Config.in
> +++ b/package/libmodsecurity/Config.in
> @@ -2,6 +2,8 @@ config BR2_PACKAGE_LIBMODSECURITY
>   	bool "libmodsecurity"
>   	depends on BR2_INSTALL_LIBSTDCPP
>   	depends on BR2_TOOLCHAIN_HAS_THREADS
> +	# libmodsecurity embeds several mbedtls source files
> +	depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS)
>   	select BR2_PACKAGE_PCRE
>   	help
>   	  Libmodsecurity is one component of the ModSecurity
> @@ -17,3 +19,6 @@ config BR2_PACKAGE_LIBMODSECURITY
>   
>   comment "libmodsecurity needs a toolchain w/ C++, threads"
>   	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
> +
> +comment "libmodsecurity needs a toolchain w/ dynamic library"
> +	depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS
> diff --git a/package/nginx-modsecurity/Config.in b/package/nginx-modsecurity/Config.in
> index b1fcbadd7a..5cbe57a866 100644
> --- a/package/nginx-modsecurity/Config.in
> +++ b/package/nginx-modsecurity/Config.in
> @@ -3,6 +3,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY
>   	depends on BR2_PACKAGE_NGINX_HTTP
>   	depends on BR2_INSTALL_LIBSTDCPP # libmodsecurity
>   	depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity
> +	depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) # libmodsecurity
>   	select BR2_PACKAGE_LIBMODSECURITY
>   	help
>   	  The ModSecurity-nginx connector is the connection
> @@ -14,3 +15,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY
>   comment "nginx-modsecurity needs a toolchain w/ C++, threads"
>   	depends on BR2_PACKAGE_NGINX_HTTP
>   	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
> +
> +comment "nginx-modsecurity needs a toolchain w/ dynamic library"
> +	depends on BR2_PACKAGE_NGINX_HTTP
> +	depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/libmodsecurity: needs dynamic library with libcurl and mbedtls
  2022-06-19 15:53 ` Arnout Vandecappelle
@ 2022-06-19 15:54   ` Arnout Vandecappelle
  2022-07-19 16:36   ` Peter Korsgaard
  1 sibling, 0 replies; 4+ messages in thread
From: Arnout Vandecappelle @ 2022-06-19 15:54 UTC (permalink / raw)
  To: Fabrice Fontaine, buildroot; +Cc: Frank Vanbever


On 19/06/2022 17:53, Arnout Vandecappelle wrote:
>
>
> On 13/06/2022 22:06, Fabrice Fontaine wrote:
>> libmodsecurity embeds several mbedtls source files since version 3.0.0
>> and
>> https://github.com/SpiderLabs/ModSecurity/commit/a3ae686f2555bdacbfc9e1889ad05065711a165d 
>>
>> resulting in the following static build failure if curl is built with
>> mbedtls support:
>>
>> /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: 
>> /home/buildroot/autobuild/instance-0/output-1/host/bin/../m68k-buildroot-uclinux-uclibc/sysroot/usr/lib/libmbedcrypto.a(md5.c.o): 
>> in function `mbedtls_md5_free':
>> md5.c:(.text+0x16): multiple definition of `mbedtls_md5_free'; 
>> ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x16): 
>> first defined here
>>
>> Fixes:
>>   - 
>> http://autobuild.buildroot.org/results/98472a3a41cdbcb3d02289a437074a267f4b2e8e
>>
>> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>
>  Applied to master, thanks.
>
>  Since upstream seemed to risk not accepting the package, I added a comment 
> that hopefully will tickle them.

  Gah, this was for another patch.


  Regards,
  Arnout


>
>  Regards,
>  Arnout
>
>> ---
>>   package/libmodsecurity/Config.in    | 5 +++++
>>   package/nginx-modsecurity/Config.in | 5 +++++
>>   2 files changed, 10 insertions(+)
>>
>> diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in
>> index 87f7a9c103..f65ab3de93 100644
>> --- a/package/libmodsecurity/Config.in
>> +++ b/package/libmodsecurity/Config.in
>> @@ -2,6 +2,8 @@ config BR2_PACKAGE_LIBMODSECURITY
>>       bool "libmodsecurity"
>>       depends on BR2_INSTALL_LIBSTDCPP
>>       depends on BR2_TOOLCHAIN_HAS_THREADS
>> +    # libmodsecurity embeds several mbedtls source files
>> +    depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS)
>>       select BR2_PACKAGE_PCRE
>>       help
>>         Libmodsecurity is one component of the ModSecurity
>> @@ -17,3 +19,6 @@ config BR2_PACKAGE_LIBMODSECURITY
>>     comment "libmodsecurity needs a toolchain w/ C++, threads"
>>       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
>> +
>> +comment "libmodsecurity needs a toolchain w/ dynamic library"
>> +    depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS
>> diff --git a/package/nginx-modsecurity/Config.in 
>> b/package/nginx-modsecurity/Config.in
>> index b1fcbadd7a..5cbe57a866 100644
>> --- a/package/nginx-modsecurity/Config.in
>> +++ b/package/nginx-modsecurity/Config.in
>> @@ -3,6 +3,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY
>>       depends on BR2_PACKAGE_NGINX_HTTP
>>       depends on BR2_INSTALL_LIBSTDCPP # libmodsecurity
>>       depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity
>> +    depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) # 
>> libmodsecurity
>>       select BR2_PACKAGE_LIBMODSECURITY
>>       help
>>         The ModSecurity-nginx connector is the connection
>> @@ -14,3 +15,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY
>>   comment "nginx-modsecurity needs a toolchain w/ C++, threads"
>>       depends on BR2_PACKAGE_NGINX_HTTP
>>       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
>> +
>> +comment "nginx-modsecurity needs a toolchain w/ dynamic library"
>> +    depends on BR2_PACKAGE_NGINX_HTTP
>> +    depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/libmodsecurity: needs dynamic library with libcurl and mbedtls
  2022-06-19 15:53 ` Arnout Vandecappelle
  2022-06-19 15:54   ` Arnout Vandecappelle
@ 2022-07-19 16:36   ` Peter Korsgaard
  1 sibling, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2022-07-19 16:36 UTC (permalink / raw)
  To: Arnout Vandecappelle; +Cc: Frank Vanbever, Fabrice Fontaine, buildroot

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

 > On 13/06/2022 22:06, Fabrice Fontaine wrote:
 >> libmodsecurity embeds several mbedtls source files since version 3.0.0
 >> and
 >> https://github.com/SpiderLabs/ModSecurity/commit/a3ae686f2555bdacbfc9e1889ad05065711a165d
 >> resulting in the following static build failure if curl is built with
 >> mbedtls support:
 >> /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real:
 >> /home/buildroot/autobuild/instance-0/output-1/host/bin/../m68k-buildroot-uclinux-uclibc/sysroot/usr/lib/libmbedcrypto.a(md5.c.o):
 >> in function `mbedtls_md5_free':
 >> md5.c:(.text+0x16): multiple definition of `mbedtls_md5_free';
 >> ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x16):
 >> first defined here
 >> Fixes:
 >> - http://autobuild.buildroot.org/results/98472a3a41cdbcb3d02289a437074a267f4b2e8e
 >> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

 >  Applied to master, thanks.

Committed to 2022.05.x and 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-07-19 16:36 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-13 20:06 [Buildroot] [PATCH 1/1] package/libmodsecurity: needs dynamic library with libcurl and mbedtls Fabrice Fontaine
2022-06-19 15:53 ` Arnout Vandecappelle
2022-06-19 15:54   ` Arnout Vandecappelle
2022-07-19 16:36   ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.