[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-307-gc9143f69b

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  c9143f69b10154acaa9fbb48d740fa99076eb40f (commit)
      from  b2882469b5f1614f2d05e407c295a1567651084c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c9143f69b10154acaa9fbb48d740fa99076eb40f
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Mon Jan 17 10:32:26 2022 +0100

    [BUILDROOT] 2021.02: patches for socat
    
    Fix socat downloading

-----------------------------------------------------------------------

Summary of changes:
 ...415-package-socat-bump-to-version-1.7.4.2.patch | 59 +++++++++++++
 ...416-package-socat-bump-to-version-1.7.4.3.patch | 99 ++++++++++++++++++++++
 patches/buildroot/2021.02/cleanup_buildroot.sh     |  3 +
 3 files changed, 161 insertions(+)
 create mode 100644 patches/buildroot/2021.02/415-package-socat-bump-to-version-1.7.4.2.patch
 create mode 100644 patches/buildroot/2021.02/416-package-socat-bump-to-version-1.7.4.3.patch

diff --git a/patches/buildroot/2021.02/415-package-socat-bump-to-version-1.7.4.2.patch b/patches/buildroot/2021.02/415-package-socat-bump-to-version-1.7.4.2.patch
new file mode 100644
index 000000000..476aeb85d
--- /dev/null
+++ b/patches/buildroot/2021.02/415-package-socat-bump-to-version-1.7.4.2.patch
@@ -0,0 +1,59 @@
+From c2c15af2b840c41d7bee34c1f244551eefce6ba5 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <ba...@tk...>
+Date: Mon, 8 Nov 2021 20:51:36 +0200
+Subject: [PATCH 415/416] package/socat: bump to version 1.7.4.2
+
+Bug fixes release.
+
+Update README hash for version update.
+
+Update comment; we do not patch configure.in.
+
+Signed-off-by: Baruch Siach <ba...@tk...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/socat/socat.hash | 6 +++---
+ package/socat/socat.mk   | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/package/socat/socat.hash b/package/socat/socat.hash
+index 5a4c520455..0d9d0ba76c 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  36cad050ecf4981ab044c3fbd75c643f  socat-1.7.4.1.tar.bz2
++md5  003686f80d820072649660b85f80c58f  socat-1.7.4.2.tar.bz2
+ # From http://www.dest-unreach.org/socat/download.sha256sum
+-sha256  3faca25614e89123dff5045680549ecef519d02e331aaf3c4f5a8f6837c675e9  socat-1.7.4.1.tar.bz2
++sha256  6690a9f9990457b505097a272bbf2cbf4cc35576176f76646e3524b0e91c1763  socat-1.7.4.2.tar.bz2
+ # Locally calculated
+-sha256  b1ebebbce145027f4268211f36d121b083aeeabdc1736eb144b8afd8e86ce8da  README
++sha256  062e425b43da6b3df6d8657639b5e2c781781572b5d8867444fd6d2487ac7644  README
+ sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
+ sha256  fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761  COPYING.OpenSSL
+diff --git a/package/socat/socat.mk b/package/socat/socat.mk
+index 61c9852565..cf2a31b096 100644
+--- a/package/socat/socat.mk
++++ b/package/socat/socat.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-SOCAT_VERSION = 1.7.4.1
++SOCAT_VERSION = 1.7.4.2
+ SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2
+ SOCAT_SITE = http://www.dest-unreach.org/socat/download
+ SOCAT_LICENSE = GPL-2.0 with OpenSSL exception
+@@ -24,7 +24,7 @@ SOCAT_CONF_ENV += \
+ endif
+ 
+ # We need to run autoconf to regenerate the configure script, since we patch
+-# configure.in and Makefile.in. However, the package only uses autoconf and not
++# Makefile.in. However, the package only uses autoconf and not
+ # automake, so we can't use the normal autoreconf logic.
+ 
+ SOCAT_DEPENDENCIES = host-autoconf
+-- 
+2.34.1
+
diff --git a/patches/buildroot/2021.02/416-package-socat-bump-to-version-1.7.4.3.patch b/patches/buildroot/2021.02/416-package-socat-bump-to-version-1.7.4.3.patch
new file mode 100644
index 000000000..3dc2e079c
--- /dev/null
+++ b/patches/buildroot/2021.02/416-package-socat-bump-to-version-1.7.4.3.patch
@@ -0,0 +1,99 @@
+From 4b7ea7a67a3b693cb42c5a981b163f6dfa9e24b4 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <ba...@tk...>
+Date: Thu, 13 Jan 2022 18:36:58 +0200
+Subject: [PATCH 416/416] package/socat: bump to version 1.7.4.3
+
+Update README hash for version number change.
+
+Add a patch fixing build with musl.
+
+Signed-off-by: Baruch Siach <ba...@tk...>
+Signed-off-by: Yann E. MORIN <yan...@fr...>
+---
+ ...-correct-the-getprotobynumber_r-test.patch | 43 +++++++++++++++++++
+ package/socat/socat.hash                      |  6 +--
+ package/socat/socat.mk                        |  2 +-
+ 3 files changed, 47 insertions(+), 4 deletions(-)
+ create 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
+new file mode 100644
+index 0000000000..de95405531
+--- /dev/null
++++ b/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch
+@@ -0,0 +1,43 @@
++From d56a11beb9b181fd91a70a6d703dfbdfe887122a Mon Sep 17 00:00:00 2001
++From: Baruch Siach <ba...@tk...>
++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 <ba...@tk...>
++---
++Upstream status: sent to so...@de...
++
++ 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 0d9d0ba76c..4f7ff5328e 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  003686f80d820072649660b85f80c58f  socat-1.7.4.2.tar.bz2
++md5  5c28dd258ba928326d0716fcb4895cc2  socat-1.7.4.3.tar.bz2
+ # From http://www.dest-unreach.org/socat/download.sha256sum
+-sha256  6690a9f9990457b505097a272bbf2cbf4cc35576176f76646e3524b0e91c1763  socat-1.7.4.2.tar.bz2
++sha256  d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007  socat-1.7.4.3.tar.bz2
+ # Locally calculated
+-sha256  062e425b43da6b3df6d8657639b5e2c781781572b5d8867444fd6d2487ac7644  README
++sha256  432aebfec164bedcaada7cdf2849e1f003fa00a91a0a1ed34d7cf4abe980f5fb  README
+ sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
+ sha256  fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761  COPYING.OpenSSL
+diff --git a/package/socat/socat.mk b/package/socat/socat.mk
+index cf2a31b096..e20577492d 100644
+--- a/package/socat/socat.mk
++++ b/package/socat/socat.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-SOCAT_VERSION = 1.7.4.2
++SOCAT_VERSION = 1.7.4.3
+ 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.34.1
+
diff --git a/patches/buildroot/2021.02/cleanup_buildroot.sh b/patches/buildroot/2021.02/cleanup_buildroot.sh
index fc843260c..af9686886 100755
--- a/patches/buildroot/2021.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2021.02/cleanup_buildroot.sh
@@ -134,6 +134,9 @@ rm -rf buildroot/package/slideshow/slideshow.mk
 rm -rf buildroot/package/snes9x/Config.in
 rm -rf buildroot/package/snes9x/snes9x-1.39-compile.patch
 rm -rf buildroot/package/snes9x/snes9x.mk
+rm -rf buildroot/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch
+rm -rf buildroot/package/socat/socat.hash
+rm -rf buildroot/package/socat/socat.mk
 rm -rf buildroot/package/stress-ng/stress-ng.hash
 rm -rf buildroot/package/stress-ng/stress-ng.mk
 rm -rf buildroot/package/thingerio/Config.in


hooks/post-receive
-- 
armadeus


