powwow: Update to 1.2.23

[nikita <nikita%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Thu May 19 17:37:20 2022 +0200
Changeset:	55c6d8f6eb6a2aa8ac463bd0eace36547252aed3

Modified Files:
	powwow/Makefile
	powwow/distinfo
	powwow/patches/patch-main_c
	powwow/patches/patch-ptr_c
	powwow/patches/patch-ptr_h
	powwow/patches/patch-tcp_c
	powwow/patches/patch-tty_c

Log Message:
powwow: Update to 1.2.23

still fails to build, needs more debugging.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=55c6d8f6eb6a2aa8ac463bd0eace36547252aed3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 powwow/Makefile             |  4 +--
 powwow/distinfo             | 16 ++++-----
 powwow/patches/patch-main_c | 13 +++----
 powwow/patches/patch-ptr_c  | 11 ++----
 powwow/patches/patch-ptr_h  | 11 ++----
 powwow/patches/patch-tcp_c  | 11 ++----
 powwow/patches/patch-tty_c  | 84 ++++++++++++++++++++++++++++++++++++++-------
 7 files changed, 95 insertions(+), 55 deletions(-)

diffs:
diff --git a/powwow/Makefile b/powwow/Makefile
index 20539d7949..95021a2631 100644
--- a/powwow/Makefile
+++ b/powwow/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.16 2012/10/06 11:54:50 asau Exp $
 
-DISTNAME=	powwow-1.2.20
+DISTNAME=	powwow-1.2.23
 CATEGORIES=	games
-MASTER_SITES=	http://hoopajoo.net/static/projects/
+MASTER_SITES=	https://www.hoopajoo.net/static/projects/
 
 MAINTAINER=	nikita%NetBSD.org@localhost
 HOMEPAGE=	http://hoopajoo.net/projects/powwow.html
diff --git a/powwow/distinfo b/powwow/distinfo
index 0d734a143f..359e4e6673 100644
--- a/powwow/distinfo
+++ b/powwow/distinfo
@@ -1,10 +1,10 @@
 $NetBSD: distinfo,v 1.10 2015/11/03 20:57:01 agc Exp $
 
-RMD160 (powwow-1.2.20.tar.gz) = c6393efaecc492ca4df1b0ed5b7ad5fb93b22ce4
-SHA512 (powwow-1.2.20.tar.gz) = bca3075201acb23f9fe0ea5c00b510efae1d00fd049104134396aae34cb5a5336ee6634ca72886554f4684add325f723c3f02503c307652a99929fca066d1720
-Size (powwow-1.2.20.tar.gz) = 313463 bytes
-SHA1 (patch-main_c) = 0be38d2e4a1c7c8a7cb9cc341d7df99dcbfc36b2
-SHA1 (patch-ptr_c) = 0042037fa939751477c480060f1506b176805f48
-SHA1 (patch-ptr_h) = 8aaf1438c296b7813a23f2c71f839d492b1f42b4
-SHA1 (patch-tcp_c) = 919bdefdebc3896c8a7d6a6ba884f47d0b10a372
-SHA1 (patch-tty_c) = c736524e71fa39d1b72aa31b4f2ce736bcd8f9f5
+BLAKE2s (powwow-1.2.23.tar.gz) = 36739c34b24752e5efb7ccf7e0f3b8b9fc4153a3d2973714a98423699f2feff9
+SHA512 (powwow-1.2.23.tar.gz) = 591ff9ca9dfc3bb624cfbb7f47785af977250cf9f6858b5149cf0fa30c6e1173f03f0cbabb8a55eb6ceb7622509f6c3fb11c36b154edc243824ecb8513c110a4
+Size (powwow-1.2.23.tar.gz) = 338893 bytes
+SHA1 (patch-main_c) = bd3cd4355e0be5f1f8b9aabd61e9a870c9e20deb
+SHA1 (patch-ptr_c) = 2ad9764c3a3925960b511247cec5ce0a1394d9c8
+SHA1 (patch-ptr_h) = 0ba84e818b6ecb56d96db4ee0ad9db5581898eb8
+SHA1 (patch-tcp_c) = ffd6a7cc1f38887f662639b4c5d2e6d1680434d2
+SHA1 (patch-tty_c) = 84393c6050992c409d301622b720e9b68d08a811
diff --git a/powwow/patches/patch-main_c b/powwow/patches/patch-main_c
index b3ccf3e37a..56fdf8273a 100644
--- a/powwow/patches/patch-main_c
+++ b/powwow/patches/patch-main_c
@@ -1,15 +1,10 @@
 $NetBSD$
-# HG changeset patch
-# User ng0%n0.is@localhost
-# Date 1561112947 0
-#      Fri Jun 21 10:29:07 2019 +0000
-# Node ID aaf73ded1091bceebe83aece7c80390c58ebdd63
-# Parent  c8b10f57c09660162b34ad143ee294f5ecc5aa0f
+
 main.c: Remove unnecessary variable declaration of errno.
 
 diff -r c8b10f57c096 -r aaf73ded1091 main.c
---- main.c~	Fri Jun 21 10:26:10 2019 +0000
-+++ main.c	Fri Jun 21 10:29:07 2019 +0000
+--- src/main.c~	Fri Jun 21 10:26:10 2019 +0000
++++ src/main.c	Fri Jun 21 10:29:07 2019 +0000
 @@ -72,7 +72,6 @@
  #endif
  
@@ -17,4 +12,4 @@ diff -r c8b10f57c096 -r aaf73ded1091 main.c
 -extern int errno;
  extern int select();
  
- #ifdef USE_REGEXP
+ #include "defines.h"
diff --git a/powwow/patches/patch-ptr_c b/powwow/patches/patch-ptr_c
index 9a2d0d9de9..e8ddab4b03 100644
--- a/powwow/patches/patch-ptr_c
+++ b/powwow/patches/patch-ptr_c
@@ -1,18 +1,13 @@
 $NetBSD$
-# HG changeset patch
-# User ng0%n0.is@localhost
-# Date 1561112770 0
-#      Fri Jun 21 10:26:10 2019 +0000
-# Node ID c8b10f57c09660162b34ad143ee294f5ecc5aa0f
-# Parent  d8cbf1749395e6cd7a5901a88ba253bc14a338ae
+
 Avoid conflict with libc memrchr. Appears to have the same intent,
 but this is the path of least resistance.
 
 Authored by dholland@ in revision 1.1 2011/10/03
 
 diff -r d8cbf1749395 -r c8b10f57c096 ptr.c
---- ptr.c~	Fri Jun 21 10:22:03 2019 +0000
-+++ ptr.c	Fri Jun 21 10:26:10 2019 +0000
+--- src/ptr.c~	Fri Jun 21 10:22:03 2019 +0000
++++ src/ptr.c	Fri Jun 21 10:26:10 2019 +0000
 @@ -419,7 +419,7 @@
   * find last occurrence of c in p
   * return NULL if none found.
diff --git a/powwow/patches/patch-ptr_h b/powwow/patches/patch-ptr_h
index 0cd206d2aa..128ab917e1 100644
--- a/powwow/patches/patch-ptr_h
+++ b/powwow/patches/patch-ptr_h
@@ -1,18 +1,13 @@
 $NetBSD$
-# HG changeset patch
-# User ng0%n0.is@localhost
-# Date 1561112523 0
-#      Fri Jun 21 10:22:03 2019 +0000
-# Node ID d8cbf1749395e6cd7a5901a88ba253bc14a338ae
-# Parent  bbd2f93df3a0cce27293a911c5ea52a1cbbf7637
+
 Avoid conflict with libc memrchr. Appears to have the same intent,
 but this is the path of least resistance.
 
 Authored by dholland@ on 2011/10/03 in patch revision 1.1
 
 diff -r bbd2f93df3a0 -r d8cbf1749395 ptr.h
---- ptr.h~	Fri Jun 21 10:19:28 2019 +0000
-+++ ptr.h	Fri Jun 21 10:22:03 2019 +0000
+--- src/ptr.h~	Fri Jun 21 10:19:28 2019 +0000
++++ src/ptr.h	Fri Jun 21 10:22:03 2019 +0000
 @@ -69,7 +69,7 @@
  /* TODO: watch memrchr, it is defined differently here than under _GNU_SOURCE,
   * so it could cause bizarre results if a module makes use of a library that
diff --git a/powwow/patches/patch-tcp_c b/powwow/patches/patch-tcp_c
index 5da6134e5b..ffa35f9e0a 100644
--- a/powwow/patches/patch-tcp_c
+++ b/powwow/patches/patch-tcp_c
@@ -1,16 +1,11 @@
 $NetBSD$
-# HG changeset patch
-# User ng0%n0.is@localhost
-# Date 1561115895 0
-#      Fri Jun 21 11:18:15 2019 +0000
-# Node ID 15ce679827e86b9d994e5aff0c364f3bba33ffc4
-# Parent  aaf73ded1091bceebe83aece7c80390c58ebdd63
+
 AI_V4MAPPED may not be defined on some platforms.
 Define to 0 in such cases, so the flag won't be affected.
 
 diff -r aaf73ded1091 -r 15ce679827e8 tcp.c
---- tcp.c~	Fri Jun 21 10:29:07 2019 +0000
-+++ tcp.c	Fri Jun 21 11:18:15 2019 +0000
+--- src/tcp.c~	Fri Jun 21 10:29:07 2019 +0000
++++ src/tcp.c	Fri Jun 21 11:18:15 2019 +0000
 @@ -49,6 +49,14 @@
  # define TELOPTSTR(n) ((n) > NTELOPTS ? "unknown" : telopts[n])
  #endif
diff --git a/powwow/patches/patch-tty_c b/powwow/patches/patch-tty_c
index 83ed7b6374..8d9f3ec2cb 100644
--- a/powwow/patches/patch-tty_c
+++ b/powwow/patches/patch-tty_c
@@ -1,17 +1,9 @@
 $NetBSD$
-# HG changeset patch
-# User ng0%n0.is@localhost
-# Date 1561116677 0
-#      Fri Jun 21 11:31:17 2019 +0000
-# Node ID e208602bebbca226bfec03c91b3c8dc23baac0bb
-# Parent  f6aa85dbb7139b735086034c216a0c689dc6784d
-Remove unnecessary alloca.h include.
-https://linux.die.net/man/3/alloca:
-By default the glibc version of <stdlib.h> includes <alloca.h>
 
-diff -r f6aa85dbb713 -r e208602bebbc tty.c
---- tty.c~	Fri Jun 21 11:20:57 2019 +0000
-+++ tty.c	Fri Jun 21 11:31:17 2019 +0000
+Adapt patch from FreeBSD ports patch-src_tty.c
+
+--- src/tty.c.orig	2019-11-06 06:25:17.000000000 +0100
++++ src/tty.c	2022-05-19 16:26:22.465610588 +0200
 @@ -9,7 +9,6 @@
   *  (at your option) any later version.
   *
@@ -20,3 +12,71 @@ diff -r f6aa85dbb713 -r e208602bebbc tty.c
  #include <assert.h>
  #include <errno.h>
  #include <fcntl.h>
+@@ -847,31 +846,29 @@
+ 
+ int tty_printf(const char *format, ...)
+ {
+-    char buf[1024], *bufp = buf;
++    char *bufp;
++    char *old_locale;
+     va_list va;
+     int res;
+ 
+-    char *old_locale = strdup(setlocale(LC_ALL, NULL));
++    if ((old_locale = strdup(setlocale(LC_ALL, NULL))) == NULL)
++           return -1;
+ 
+     setlocale(LC_ALL, "C");
+ 
+     va_start(va, format);
+-    res = vsnprintf(buf, sizeof buf, format, va);
++    res = vasprintf(&bufp, format, va);
+     va_end(va);
+ 
+-    if (res >= sizeof buf) {
+-	bufp = alloca(res + 1);
+-	va_start(va, format);
+-	vsprintf(bufp, format, va);
+-        assert(strlen(bufp) == res);
+-	va_end(va);
+-    }
++    if (res < 0)
++           goto out;
+ 
+     setlocale(LC_ALL, old_locale);
+-    free(old_locale);
+ 
+     tty_puts(bufp);
+-
++    free(bufp);
++out:
++    free(old_locale);
+     return res;
+ }
+ 
+@@ -968,16 +965,23 @@
+ 
+ void tty_gets(char *s, int size)
+ {
+-    wchar_t *ws = alloca(size * sizeof *ws);
++    wchar_t *ws = NULL;
++
++    if ((ws = malloc(size * sizeof *ws)) == NULL)
++           goto out;
+ 
+     if (!fgetws(ws, size, stdin))
+-	return;
++	   goto out;
+ 
+     while (*ws) {
+ 	if (!(*ws & ~0xff))
+ 	    *s++ = (unsigned char)*ws;
+ 	++ws;
+     }
++out:
++    if (ws != NULL)
++           free(ws);
++    return;
+ }
+ 
+ void tty_flush(void)