Tue Nov 7 07:58:36 2023 UTC ()
swirc: update to 3.4.6.

## [3.4.6] - 2023-11-05 ##
- **Added** adoption of SPDX-tags for the distributed manual pages
- **Added** better detection of server Wallops
- **Added** command-line option `-S` (Force TLS)
- **Added** event 249 (`RPL_STATSDEBUG`)
- **Added** extensive use of the `CPPFLAGS` make macro
- **Added** handling of empty user@host combinations in Wallops messages
- **Added** handling of znc messages. (Made them look like notices and
  appear in the active window.)
- **Added** protection for bad filenames for IRC logs
- **Added** translations
- **Changed** the way of recognizing a user mode versus channel mode
- **Did** code improvements
- **Fixed** occurrences of hardcoded function names in messages
- **Fixed** typos in manual pages
- **Improved** C++ exception handling
- **Limited** notification messages in length

## [3.4.5] - 2023-09-14 ##
- **Added** command-line option `-W`
- **Added** tab completion for:
  - `/cs`, `/chanserv`
  - `/ns`, `/nickserv`
  - `/squery`
- **Added** the following commands:
  - `/admin`
  - `/die`
  - `/gline`
  - `/info`
  - `/ison`
  - `/kline`
  - `/rehash`
  - `/restart`
  - `/servstats`
  - `/wallops`
- **Added** the following events:
  - 211 (`RPL_STATSLINKINFO`)
  - 212 (`RPL_STATSCOMMANDS`)
  - 216 (`RPL_STATSKLINE`)
  - 219 (`RPL_ENDOFSTATS`)
  - 242 (`RPL_STATSUPTIME`)
  - 256 (`RPL_ADMINME`)
  - 257 (`RPL_ADMINLOC1`)
  - 258 (`RPL_ADMINLOC2`)
  - 259 (`RPL_ADMINEMAIL`)
  - 303 (`RPL_ISON`)
  - 371 (`RPL_INFO`)
  - 374 (`RPL_ENDOFINFO`)
- **Added** translations
- **Did** code improvements


(fcambus)
diff -r1.23 -r1.24 pkgsrc/chat/swirc/Makefile
diff -r1.13 -r1.14 pkgsrc/chat/swirc/distinfo
diff -r1.2 -r1.3 pkgsrc/chat/swirc/patches/patch-src_printtext.cpp
cvs diff -r1.23 -r1.24 pkgsrc/chat/swirc/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/swirc/Makefile 2023/10/24 22:08:23 1.23
+++ pkgsrc/chat/swirc/Makefile 2023/11/07 07:58:36 1.24
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.23 2023/10/24 22:08:23 wiz Exp $ 1# $NetBSD: Makefile,v 1.24 2023/11/07 07:58:36 fcambus Exp $
2 2
3DISTNAME= swirc-3.4.4 3DISTNAME= swirc-3.4.6
4PKGREVISION= 1 
5CATEGORIES= chat 4CATEGORIES= chat
6MASTER_SITES= https://www.nifty-networks.net/swirc/releases/ 5MASTER_SITES= https://www.nifty-networks.net/swirc/releases/
7EXTRACT_SUFX= .tgz 6EXTRACT_SUFX= .tgz
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.nifty-networks.net/swirc/ 9HOMEPAGE= https://www.nifty-networks.net/swirc/
11COMMENT= Console based ICB and IRC client 10COMMENT= Console based ICB and IRC client
12LICENSE= modified-bsd 11LICENSE= modified-bsd
13 12
14HAS_CONFIGURE= yes 13HAS_CONFIGURE= yes
15USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
16USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
17 16
cvs diff -r1.13 -r1.14 pkgsrc/chat/swirc/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/swirc/distinfo 2023/07/29 21:15:22 1.13
+++ pkgsrc/chat/swirc/distinfo 2023/11/07 07:58:36 1.14
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.13 2023/07/29 21:15:22 fcambus Exp $ 1$NetBSD: distinfo,v 1.14 2023/11/07 07:58:36 fcambus Exp $
2 2
3BLAKE2s (swirc-3.4.4.tgz) = f8035f262cbc4c73cc12a499316109e3104ed434b0707deb02acd1c05a8f3c32 3BLAKE2s (swirc-3.4.6.tgz) = eb0e9813d4e0ed23af4d8f614630e6b33247f188b086b75e3094669795c16a4e
4SHA512 (swirc-3.4.4.tgz) = 3c687f34156a583679b9500bfc58e6dc51464d1f1fb4898812ac62426a5104f5a59fac5f9cf8c33ba1df1c28fa7a4668be2a42e1ba574dceaf2b0a9faef98ca8 4SHA512 (swirc-3.4.6.tgz) = 6e83b9f831f605371761d335b4260689872a2d9481c6ebda2c4bb5de772bba465740374f73b5e08656732aeb304ed17c64281f52e4e138c1157f0971e341cc78
5Size (swirc-3.4.4.tgz) = 326731 bytes 5Size (swirc-3.4.6.tgz) = 338724 bytes
6SHA1 (patch-src_printtext.cpp) = dfba0f7c83ec72160599f328d76d5527ed5316fd 6SHA1 (patch-src_printtext.cpp) = 4151084851a2fdb7b006ff548da716c2c061d5ab
cvs diff -r1.2 -r1.3 pkgsrc/chat/swirc/patches/patch-src_printtext.cpp (expand / switch to unified diff)

--- pkgsrc/chat/swirc/patches/patch-src_printtext.cpp 2023/01/07 09:37:37 1.2
+++ pkgsrc/chat/swirc/patches/patch-src_printtext.cpp 2023/11/07 07:58:36 1.3
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: patch-src_printtext.cpp,v 1.2 2023/01/07 09:37:37 fcambus Exp $ 1$NetBSD: patch-src_printtext.cpp,v 1.3 2023/11/07 07:58:36 fcambus Exp $
2 2
3Support iconv prototype on NetBSD 9 and earlier. 3Support iconv prototype on NetBSD 9 and earlier.
4 4
5--- src/printtext.cpp.orig 2023-01-07 02:57:47.000000000 +0000 5--- src/printtext.cpp.orig 2023-11-05 13:36:56.000000000 +0000
6+++ src/printtext.cpp 6+++ src/printtext.cpp
7@@ -39,6 +39,15 @@ 7@@ -39,6 +39,15 @@
8 #include <iconv.h> 8 #include <iconv.h>
9 #endif 9 #endif
10  10
11+#if defined(__NetBSD__) 11+#if defined(__NetBSD__)
12+#include <sys/param.h> 12+#include <sys/param.h>
13+#if __NetBSD_Prereq__(9,99,17) 13+#if __NetBSD_Prereq__(9,99,17)
14+#define NETBSD_POSIX_ICONV 1 14+#define NETBSD_POSIX_ICONV 1
15+#else 15+#else
16+#define NETBSD_POSIX_ICONV 0 16+#define NETBSD_POSIX_ICONV 0
17+#endif 17+#endif
18+#endif 18+#endif
19+ 19+
20 #include "assertAPI.h" 20 #include "assertAPI.h"
21 #include "atomicops.h" 21 #include "atomicops.h"
22 #ifdef UNIT_TESTING 22 #ifdef UNIT_TESTING
23@@ -1364,8 +1373,13 @@ get_buffer(const char *orig) 23@@ -1411,8 +1420,13 @@ get_buffer(CSTRING orig)
24 out[outbytes] = '\0'; 24 out[outbytes] = '\0';
25 out_p = addrof(out[0]); 25 out_p = addrof(out[0]);
26 errno = 0; 26 errno = 0;
27+#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun) 27+#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
28+ if (iconv(cd, (const char **)&in, &inbytes, &out_p, &outbytes) == static_cast 28+ if (iconv(cd, (const char **)&in, &inbytes, &out_p, &outbytes) == static_cast
29+ <size_t>(-1)) { 29+ <size_t>(-1)) {
30+#else 30+#else
31 if (iconv(cd, &in, &inbytes, &out_p, &outbytes) == static_cast 31 if (iconv(cd, &in, &inbytes, &out_p, &outbytes) == static_cast
32 <size_t>(-1)) { 32 <size_t>(-1)) {
33+#endif 33+#endif
34 free(orig_copy); 34 free(orig_copy);
35 free(out); 35 free(out);
36 (void) iconv_close(cd); 36 (void) iconv_close(cd);