[Buildroot] [PATCH 1/2] package/gensio: bump to version 2.2.0

[Buildroot] [PATCH 1/2] package/gensio: bump to version 2.2.0

[James Hilliard]

Add patch backported from upstream to fix:
sctp: Fix a compile problem when disabled

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 ...-Fix-a-compile-problem-when-disabled.patch | 31 +++++++++++++++++++
 package/gensio/gensio.hash                    |  6 ++--
 package/gensio/gensio.mk                      |  2 +-
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 package/gensio/0001-sctp-Fix-a-compile-problem-when-disabled.patch

diff --git a/package/gensio/0001-sctp-Fix-a-compile-problem-when-disabled.patch b/package/gensio/0001-sctp-Fix-a-compile-problem-when-disabled.patch
new file mode 100644
index 0000000000..086093a79b
--- /dev/null
+++ b/package/gensio/0001-sctp-Fix-a-compile-problem-when-disabled.patch
@@ -0,0 +1,31 @@
+From 28e869876525479b98d0c473b47b176b98fc27be Mon Sep 17 00:00:00 2001
+From: Corey Minyard <cminyard@mvista.com>
+Date: Sat, 31 Oct 2020 13:32:23 -0500
+Subject: [PATCH] sctp: Fix a compile problem when disabled
+
+Changing the disabled code was missed :(.
+
+Signed-off-by: Corey Minyard <cminyard@mvista.com>
+Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
+[james.hilliard1 at gmail.com: backport from upstream commit
+28e869876525479b98d0c473b47b176b98fc27be]
+---
+ lib/gensio_sctp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/gensio_sctp.c b/lib/gensio_sctp.c
+index bd9437f..4278ff8 100644
+--- a/lib/gensio_sctp.c
++++ b/lib/gensio_sctp.c
+@@ -1092,7 +1092,7 @@ str_to_sctp_gensio_accepter(const char *str, const char * const args[],
+ #else
+ 
+ int
+-sctp_gensio_alloc(struct gensio_addr *iai, const char * const args[],
++sctp_gensio_alloc(const struct gensio_addr *iai, const char * const args[],
+ 		  struct gensio_os_funcs *o,
+ 		  gensio_event cb, void *user_data,
+ 		  struct gensio **new_gensio)
+-- 
+2.25.1
+
diff --git a/package/gensio/gensio.hash b/package/gensio/gensio.hash
index ecf9d5e159..7389cd1c9c 100644
--- a/package/gensio/gensio.hash
+++ b/package/gensio/gensio.hash
@@ -1,7 +1,7 @@
 # From https://sourceforge.net/projects/ser2net/files/ser2net/
-md5  bef0312c68ef541f85893c6bc85930ed  gensio-2.1.5.tar.gz
-sha1  f23b4017aba5a6f9066f734ffb600fa36b1399c0  gensio-2.1.5.tar.gz
+md5  580c969c150effa9e53be70544b7ae9e  gensio-2.2.0.tar.gz
+sha1  23f9211b9b91325ac6ba64d038c978d483fb93cb  gensio-2.2.0.tar.gz
 # Locally computed:
-sha256  e497043a0415177652bfb2b1d045e4605cd5726bbcfe790ef6f555ac25825c12  gensio-2.1.5.tar.gz
+sha256  006ce4e1fa0786b1abfa18f675cd92f98558f612e6fde6fac8bd5a1e61b5e1c9  gensio-2.2.0.tar.gz
 sha256  501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1  COPYING
 sha256  dcac7d447dd81ab96d28dce00a07a6486e623f7ded94e2a2a8e83312405cdf89  COPYING.LIB
diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk
index 1170ec00f4..74aa827324 100644
--- a/package/gensio/gensio.mk
+++ b/package/gensio/gensio.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GENSIO_VERSION = 2.1.5
+GENSIO_VERSION = 2.2.0
 GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net
 GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
 GENSIO_LICENSE_FILES = COPYING.LIB COPYING
-- 
2.25.1

[Buildroot] [PATCH 2/2] package/ser2net: bump to version 4.3.0

[James Hilliard]

Drop patch that is now upstream.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 .../0001-port.h-include-sys-time.h.patch      | 39 -------------------
 package/ser2net/ser2net.hash                  |  6 +--
 package/ser2net/ser2net.mk                    |  4 +-
 3 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 package/ser2net/0001-port.h-include-sys-time.h.patch

diff --git a/package/ser2net/0001-port.h-include-sys-time.h.patch b/package/ser2net/0001-port.h-include-sys-time.h.patch
deleted file mode 100644
index daf5372437..0000000000
--- a/package/ser2net/0001-port.h-include-sys-time.h.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 021543b02b6fdb78c9217757736eabac90a647eb Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sat, 26 Sep 2020 12:37:38 +0200
-Subject: [PATCH] port.h: include <sys/time.h>
-
-Include <sys/time.h> to avoid the following build failure on musl:
-
-port.h:361:29: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration
-     const char *str, struct timeval *tv,
-                             ^~~~~~~
-portconfig.c: In function 'myconfig':
-portconfig.c:586:9: error: variable 'tv' has initializer but incomplete type
-  struct timeval tv = { 0, 0 };
-         ^~~~~~~
-
-Fixes:
- - http://autobuild.buildroot.org/results/4c0b238186cb2fb2d81807ce006945594f92b2cd
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/cminyard/ser2net/pull/34]
----
- port.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/port.h b/port.h
-index 048c5bd..86c3b1d 100644
---- a/port.h
-+++ b/port.h
-@@ -9,6 +9,7 @@
- #define PORT
- 
- #include <netdb.h>
-+#include <sys/time.h>
- #include "gbuf.h"
- #include "absout.h"
- 
--- 
-2.28.0
-
diff --git a/package/ser2net/ser2net.hash b/package/ser2net/ser2net.hash
index fd2761075b..2e67a860b1 100644
--- a/package/ser2net/ser2net.hash
+++ b/package/ser2net/ser2net.hash
@@ -1,6 +1,6 @@
 # From https://sourceforge.net/projects/ser2net/files/ser2net/
-md5  7c0a47bd9b405aedac136c4e290ebfeb  ser2net-4.2.2.tar.gz
-sha1  64e77d3194bbbac6e7e9d5810d06b6ade7bfdcf4  ser2net-4.2.2.tar.gz
+md5  19e9819e8c4e91ea56c455a3f0f7d2d5  ser2net-4.3.0.tar.gz
+sha1  dc84a43c4a96d021a6d4fc64fba1f1ba86732018  ser2net-4.3.0.tar.gz
 # Locally computed:
-sha256  60e2aab04c4a346447a7e58e308a830fb74bac208a021229c113fc8ccc7bdfe6  ser2net-4.2.2.tar.gz
+sha256  5e407d684d0aa0919ddd15af368f890c5940cddd6034b7efc363823f38f6ff0c  ser2net-4.3.0.tar.gz
 sha256  501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1  COPYING
diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk
index 868d7f3a1d..5dd64f5a4f 100644
--- a/package/ser2net/ser2net.mk
+++ b/package/ser2net/ser2net.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-SER2NET_VERSION = 4.2.2
-SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net
+SER2NET_VERSION = 4.3.0
+SER2NET_SITE = https://downloads.sourceforge.net/project/ser2net/ser2net
 SER2NET_LICENSE = GPL-2.0+
 SER2NET_LICENSE_FILES = COPYING
 SER2NET_DEPENDENCIES = gensio libyaml
-- 
2.25.1

[Buildroot] [PATCH 1/2] package/gensio: bump to version 2.2.0

[Thomas Petazzoni]

On Sun, 22 Nov 2020 21:04:04 -0700
James Hilliard <james.hilliard1@gmail.com> wrote:

> Add patch backported from upstream to fix:
> sctp: Fix a compile problem when disabled
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  ...-Fix-a-compile-problem-when-disabled.patch | 31 +++++++++++++++++++
>  package/gensio/gensio.hash                    |  6 ++--
>  package/gensio/gensio.mk                      |  2 +-
>  3 files changed, 35 insertions(+), 4 deletions(-)
>  create mode 100644 package/gensio/0001-sctp-Fix-a-compile-problem-when-disabled.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 2/2] package/ser2net: bump to version 4.3.0

[Thomas Petazzoni]

On Sun, 22 Nov 2020 21:04:05 -0700
James Hilliard <james.hilliard1@gmail.com> wrote:

> Drop patch that is now upstream.
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  .../0001-port.h-include-sys-time.h.patch      | 39 -------------------
>  package/ser2net/ser2net.hash                  |  6 +--
>  package/ser2net/ser2net.mk                    |  4 +-
>  3 files changed, 5 insertions(+), 44 deletions(-)
>  delete mode 100644 package/ser2net/0001-port.h-include-sys-time.h.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com