netcat-openbsd: update to 1.228HEADmaster

A version newer than 1.195 is required for certain features of newer
versions of cloud-init.  May as well bump to the version in Debian
Testing.

I also noticed it appears the licence was incorrectly specified, and is
indeed BSD-3-Clause.

License-update: Added copyright holders and clarified man page licence
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 11 insertions, 11 deletions

diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch
index 929f63f4a9..7e665d777f 100644
--- a/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch
+++ b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch
@@ -14,7 +14,7 @@ Update to version 1.190-2
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
 ---
  Makefile |   4 +-
- base64.c | 313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ base64.c | 313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
  netcat.c |   3 +
  socks.c  |   3 +
  4 files changed, 321 insertions(+), 2 deletions(-)
@@ -360,8 +360,8 @@ diff --git a/netcat.c b/netcat.c
 index a0fb51b..9c4ed23 100644
 --- a/netcat.c
 +++ b/netcat.c
-@@ -240,6 +240,9 @@ static int connect_with_timeout(int fd, const struct sockaddr *sa,
- 
+@@ -239,6 +239,9 @@ char *proto_name(int, int);
+ static int connect_with_timeout(int, const struct sockaddr *, socklen_t, int);
  static void quit();
  
 +int    b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize);
@@ -378,10 +378,10 @@ index 9068f39..c576f6b 100644
  #define SOCKS_DOMAIN   3
  #define SOCKS_IPV6     4
  
-+int    b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize);
-+int    b64_pton(char const *src, u_char *target, size_t targsize);
++int    b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize);
++int    b64_pton(char const *src, u_char *target, size_t targsize);
 +
- int    remote_connect(const char *, const char *, struct addrinfo);
+ int    remote_connect(const char *, const char *, struct addrinfo, char *);
  int    socks_connect(const char *, const char *, struct addrinfo,
             const char *, const char *, struct addrinfo, int,
 -- 
diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd/0001-fix-netcat-openbsd-ftbfs-with-GCC-15.patch b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-fix-netcat-openbsd-ftbfs-with-GCC-15.patch
index c1757d39ad..d574ee0b67 100644
--- a/meta-networking/recipes-support/netcat/netcat-openbsd/0001-fix-netcat-openbsd-ftbfs-with-GCC-15.patch
+++ b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-fix-netcat-openbsd-ftbfs-with-GCC-15.patch
@@ -28,19 +28,19 @@ Signed-off-by: mark.yang <mark.yang@lge.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/netcat.c b/netcat.c
-index d70598a..b8ba959 100644
+index 62d01d8..7367f47 100644
 --- a/netcat.c
 +++ b/netcat.c
-@@ -238,7 +238,7 @@ char *proto_name(int uflag, int dccpflag);
- static int connect_with_timeout(int fd, const struct sockaddr *sa,
-         socklen_t salen, int ctimeout);
+@@ -237,7 +237,7 @@ ssize_t fillbuf(int, unsigned char *, size_t *);
  
+ char *proto_name(int, int);
+ static int connect_with_timeout(int, const struct sockaddr *, socklen_t, int);
 -static void quit();
 +static void quit(int sig);
  
  int    b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize);
  int    b64_pton(char const *src, u_char *target, size_t targsize);
-@@ -2235,7 +2235,7 @@ usage(int ret)
+@@ -2347,7 +2347,7 @@ usage(int ret)
   * quit()
   * handler for a "-q" timeout (exit 0 instead of 1)
   */