[Buildroot] [PATCH 1/3] package/socat: fix printf feature detection

[Buildroot] [PATCH 1/3] package/socat: fix printf feature detection

[Baruch Siach via buildroot]

socal configure uses AC_TRY_RUN to detect printf features. This does not
work for cross compilation.

All C libraries we use support C99 snprintf. Only glibc and uClibc
support the deprecated Z modifier.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/socat/socat.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index e20577492d86..c1bf4d260f61 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -11,6 +11,14 @@ SOCAT_LICENSE = GPL-2.0 with OpenSSL exception
 SOCAT_LICENSE_FILES = README COPYING COPYING.OpenSSL
 SOCAT_CPE_ID_VENDOR = dest-unreach
 
+SOCAT_CONF_ENV = ac_cv_have_c99_snprintf=yes
+
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC)$(BR2_TOOLCHAIN_USES_UCLIBC),y)
+SOCAT_CONF_ENV += ac_cv_have_z_modifier=yes
+else
+SOCAT_CONF_ENV += ac_cv_have_z_modifier=no
+endif
+
 ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y)
 SOCAT_CONF_ENV += \
 	sc_cv_sys_crdly_shift=12 \
-- 
2.35.1

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

[Buildroot] [PATCH 2/3] package/socat: disable openssl for static build

[Baruch Siach via buildroot]

socal configure script does not take the zlib dependency into account
when linking with libssl. This break static link. There is not easy way
to add zlib dependency, so just disable openssl for static builds.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/socat/socat.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index c1bf4d260f61..bfccd020312d 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -39,7 +39,7 @@ SOCAT_DEPENDENCIES = host-autoconf
 # incompatibile license (GPL-3.0+)
 SOCAT_CONF_OPTS = --disable-readline
 
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
+ifeq ($(BR2_PACKAGE_OPENSSL):$(BR2_STATIC_LIBS),y:)
 SOCAT_DEPENDENCIES += openssl
 else
 SOCAT_CONF_OPTS += --disable-openssl
-- 
2.35.1

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

[Buildroot] [PATCH 3/3] package/socat: bump to version 1.7.4.4

[Baruch Siach via buildroot]

Drop upstream patch.

Update README hash for changes not related to licensing.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 ...-correct-the-getprotobynumber_r-test.patch | 43 -------------------
 package/socat/socat.hash                      |  6 +--
 package/socat/socat.mk                        |  2 +-
 3 files changed, 4 insertions(+), 47 deletions(-)
 delete mode 100644 package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch

diff --git a/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch b/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch
deleted file mode 100644
index de9540553191..000000000000
--- a/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d56a11beb9b181fd91a70a6d703dfbdfe887122a Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Thu, 13 Jan 2022 17:56:10 +0200
-Subject: [PATCH] configure.ac: correct the getprotobynumber_r test
-
-The AC_TRY_COMPILE test succeeds even when libc does not provide the
-tested symbol. The compiler produces a warning, but exits successfully.
-Use AC_TRY_LINK that will only succeeds if libc provides the symbol.
-
-This fixes build with musl libc that does not support
-getprotobynumber_r().
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: sent to socat@dest-unreach.org
-
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d4acc9e7e6f5..973a7f2218c9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -137,13 +137,13 @@ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror)
- # getprotobynumber_r() is not standardized
- AC_MSG_CHECKING(for getprotobynumber_r() variant)
- AC_CACHE_VAL(sc_cv_getprotobynumber_r,
--[AC_TRY_COMPILE([#include <stddef.h>
-+[AC_TRY_LINK([#include <stddef.h>
- #include <netdb.h>],[getprotobynumber_r(1,NULL,NULL,1024,NULL);],
- [sc_cv_getprotobynumber_r=1; tmp_bynum_variant=Linux],
-- [AC_TRY_COMPILE([#include <stddef.h>
-+ [AC_TRY_LINK([#include <stddef.h>
-  #include <netdb.h>],[getprotobynumber_r(1,NULL,NULL,1024);],
-  [sc_cv_getprotobynumber_r=2; tmp_bynum_variant=Solaris],
--  [AC_TRY_COMPILE([#include <stddef.h>
-+  [AC_TRY_LINK([#include <stddef.h>
-   #include <netdb.h>],[getprotobynumber_r(1,NULL,NULL);],
-   [sc_cv_getprotobynumber_r=3; tmp_bynum_variant=AIX],
- 
--- 
-2.34.1
-
diff --git a/package/socat/socat.hash b/package/socat/socat.hash
index 4f7ff5328e28..2113e1b3a485 100644
--- a/package/socat/socat.hash
+++ b/package/socat/socat.hash
@@ -1,8 +1,8 @@
 # From http://www.dest-unreach.org/socat/download.md5sum
-md5  5c28dd258ba928326d0716fcb4895cc2  socat-1.7.4.3.tar.bz2
+md5  a605d3779465f42c07fc507cfbfb08f9  socat-1.7.4.4.tar.bz2
 # From http://www.dest-unreach.org/socat/download.sha256sum
-sha256  d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007  socat-1.7.4.3.tar.bz2
+sha256  fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac  socat-1.7.4.4.tar.bz2
 # Locally calculated
-sha256  432aebfec164bedcaada7cdf2849e1f003fa00a91a0a1ed34d7cf4abe980f5fb  README
+sha256  3555c6bc2779ff0f9a7145d1e3cd1d8fde59548bcd3364a23b907de21eec5aa8  README
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
 sha256  fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761  COPYING.OpenSSL
diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index bfccd020312d..1e378ab0691e 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SOCAT_VERSION = 1.7.4.3
+SOCAT_VERSION = 1.7.4.4
 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2
 SOCAT_SITE = http://www.dest-unreach.org/socat/download
 SOCAT_LICENSE = GPL-2.0 with OpenSSL exception
-- 
2.35.1

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

Re: [Buildroot] [PATCH 1/3] package/socat: fix printf feature detection

[Thomas Petazzoni via buildroot]

On Tue,  1 Nov 2022 09:41:54 +0200
Baruch Siach via buildroot <buildroot@buildroot.org> wrote:

> socal configure uses AC_TRY_RUN to detect printf features. This does not
> work for cross compilation.
> 
> All C libraries we use support C99 snprintf. Only glibc and uClibc
> support the deprecated Z modifier.
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  package/socat/socat.mk | 8 ++++++++
>  1 file changed, 8 insertions(+)

How did you notice this issue? I see no autobuilder failure. If it
wasn't working for cross-compilation, we should have build failures, no?

Or are bad results of these ./configure tests only causing runtime
issues? Could you elaborate a bit?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/3] package/socat: disable openssl for static build

[Thomas Petazzoni via buildroot]

Hello Baruch,

On Tue,  1 Nov 2022 09:41:55 +0200
Baruch Siach via buildroot <buildroot@buildroot.org> wrote:

> socal configure script does not take the zlib dependency into account
> when linking with libssl. This break static link. There is not easy way
> to add zlib dependency, so just disable openssl for static builds.

Even:

SOCAT_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`

does not work?

Also, do you have an autobuilder failure for this issue? Or you just
encountered it locally?

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/3] package/socat: fix printf feature detection

[Baruch Siach via buildroot]

Hi Thomas,

On Tue, Nov 01 2022, Thomas Petazzoni wrote:
> On Tue,  1 Nov 2022 09:41:54 +0200
> Baruch Siach via buildroot <buildroot@buildroot.org> wrote:
>
>> socal configure uses AC_TRY_RUN to detect printf features. This does not
>> work for cross compilation.
>> 
>> All C libraries we use support C99 snprintf. Only glibc and uClibc
>> support the deprecated Z modifier.
>> 
>> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
>> ---
>>  package/socat/socat.mk | 8 ++++++++
>>  1 file changed, 8 insertions(+)
>
> How did you notice this issue? I see no autobuilder failure. If it
> wasn't working for cross-compilation, we should have build failures, no?
>
> Or are bad results of these ./configure tests only causing runtime
> issues? Could you elaborate a bit?

We are just getting wrong result that leads to sub-optimal code. The
build does not break though. I noticed the issue by looking for
AC_TRY_RUN in configure.ac.

baruch

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/3] package/socat: disable openssl for static build

[Baruch Siach via buildroot]

Hi Thomas,

On Tue, Nov 01 2022, Thomas Petazzoni wrote:
> On Tue,  1 Nov 2022 09:41:55 +0200
> Baruch Siach via buildroot <buildroot@buildroot.org> wrote:
>
>> socal configure script does not take the zlib dependency into account
>> when linking with libssl. This break static link. There is not easy way
>> to add zlib dependency, so just disable openssl for static builds.
>
> Even:
>
> SOCAT_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
>
> does not work?

It does not work because configure.ac puts $LIBS before -lssl in the
tested command line.

> Also, do you have an autobuilder failure for this issue? Or you just
> encountered it locally?

We don't pass an explicit --with-openssl because socan configure does
not support it. So the configure script just behaves as if openssl is
not there, which is normal.

baruch

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/3] package/socat: disable openssl for static build

[Thomas Petazzoni via buildroot]

On Tue, 01 Nov 2022 22:47:10 +0200
Baruch Siach <baruch@tkos.co.il> wrote:

> > SOCAT_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
> >
> > does not work?  
> 
> It does not work because configure.ac puts $LIBS before -lssl in the
> tested command line.

ACK.

> > Also, do you have an autobuilder failure for this issue? Or you just
> > encountered it locally?  
> 
> We don't pass an explicit --with-openssl because socan configure does
> not support it. So the configure script just behaves as if openssl is
> not there, which is normal.

Hm, OK, but that does not really answer my question :-)

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/3] package/socat: disable openssl for static build

[Baruch Siach via buildroot]

Hi Thomas,

On Tue, Nov 01 2022, Thomas Petazzoni wrote:
> On Tue, 01 Nov 2022 22:47:10 +0200
> Baruch Siach <baruch@tkos.co.il> wrote:
>
>> > SOCAT_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
>> >
>> > does not work?  
>> 
>> It does not work because configure.ac puts $LIBS before -lssl in the
>> tested command line.
>
> ACK.
>
>> > Also, do you have an autobuilder failure for this issue? Or you just
>> > encountered it locally?  
>> 
>> We don't pass an explicit --with-openssl because socan configure does
>> not support it. So the configure script just behaves as if openssl is
>> not there, which is normal.
>
> Hm, OK, but that does not really answer my question :-)

There is no build failure so the autobuilders can't catch it. So yes, I
have seen the issue in local build tests of static linking.

This patch does not actually change the current behavior. Statically
linked socan lacks OpenSSL support either way. But this patch makes it
explicit.

baruch

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/3] package/socat: fix printf feature detection

[Thomas Petazzoni via buildroot]

On Tue,  1 Nov 2022 09:41:54 +0200
Baruch Siach via buildroot <buildroot@buildroot.org> wrote:

> socal configure uses AC_TRY_RUN to detect printf features. This does not
> work for cross compilation.
> 
> All C libraries we use support C99 snprintf. Only glibc and uClibc
> support the deprecated Z modifier.
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  package/socat/socat.mk | 8 ++++++++
>  1 file changed, 8 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/3] package/socat: disable openssl for static build

[Thomas Petazzoni via buildroot]

On Tue,  1 Nov 2022 09:41:55 +0200
Baruch Siach via buildroot <buildroot@buildroot.org> wrote:

> socal configure script does not take the zlib dependency into account
> when linking with libssl. This break static link. There is not easy way
> to add zlib dependency, so just disable openssl for static builds.
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  package/socat/socat.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master with an improved commit log. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 3/3] package/socat: bump to version 1.7.4.4

[Thomas Petazzoni via buildroot]

On Tue,  1 Nov 2022 09:41:56 +0200
Baruch Siach via buildroot <buildroot@buildroot.org> wrote:

> Drop upstream patch.
> 
> Update README hash for changes not related to licensing.
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  ...-correct-the-getprotobynumber_r-test.patch | 43 -------------------
>  package/socat/socat.hash                      |  6 +--
>  package/socat/socat.mk                        |  2 +-
>  3 files changed, 4 insertions(+), 47 deletions(-)
>  delete mode 100644 package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/3] package/socat: fix printf feature detection

[Peter Korsgaard]

>>>>> "Baruch" == Baruch Siach via buildroot <buildroot@buildroot.org> writes:

 > socal configure uses AC_TRY_RUN to detect printf features. This does not
 > work for cross compilation.

 > All C libraries we use support C99 snprintf. Only glibc and uClibc
 > support the deprecated Z modifier.

 > Signed-off-by: Baruch Siach <baruch@tkos.co.il>

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

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

Re: [Buildroot] [PATCH 2/3] package/socat: disable openssl for static build

[Peter Korsgaard]

>>>>> "Baruch" == Baruch Siach via buildroot <buildroot@buildroot.org> writes:

 > socal configure script does not take the zlib dependency into account
 > when linking with libssl. This break static link. There is not easy way
 > to add zlib dependency, so just disable openssl for static builds.

 > Signed-off-by: Baruch Siach <baruch@tkos.co.il>

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

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