bitlbee: update to 3.4.2

[coypu <coypu%sdf.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Mon May 2 18:28:00 2016 +0300
Changeset:	15a1f4902f1bce4bc75fa1e20181706098215e24

Modified Files:
	bitlbee/Makefile
	bitlbee/distinfo
Removed Files:
	bitlbee/patches/patch-irc__channel.c

Log Message:
bitlbee: update to 3.4.2

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

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

diffstat:
 bitlbee/Makefile                     |  2 +-
 bitlbee/distinfo                     |  9 ++++-----
 bitlbee/patches/patch-irc__channel.c | 39 ------------------------------------
 3 files changed, 5 insertions(+), 45 deletions(-)

diffs:
diff --git a/bitlbee/Makefile b/bitlbee/Makefile
index a4d21a6..02e8a0d 100644
--- a/bitlbee/Makefile
+++ b/bitlbee/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.70 2015/12/23 12:38:37 joerg Exp $
 
-DISTNAME=		bitlbee-3.4.1
+DISTNAME=		bitlbee-3.4.2
 CATEGORIES=		chat
 MASTER_SITES=		http://get.bitlbee.org/src/
 
diff --git a/bitlbee/distinfo b/bitlbee/distinfo
index 7f4bc38..399e825 100644
--- a/bitlbee/distinfo
+++ b/bitlbee/distinfo
@@ -1,7 +1,6 @@
 $NetBSD: distinfo,v 1.33 2015/11/03 01:20:17 agc Exp $
 
-SHA1 (bitlbee-3.4.1.tar.gz) = b77311b538ec1c584694784f119b99fb6b3f4859
-RMD160 (bitlbee-3.4.1.tar.gz) = 32e0faf3b0a23f812f46752c1d0e96e30aaaf649
-SHA512 (bitlbee-3.4.1.tar.gz) = fad297c7a792c932ba74daf7dc894883037842ae5d39a4c831c6615100580073001806c1af60555aa1c775399e8a484d99a4e601e96c6a075e12546e5d153532
-Size (bitlbee-3.4.1.tar.gz) = 688072 bytes
-SHA1 (patch-irc__channel.c) = 332126961c675c173fd3634fcb26877a3317acd0
+SHA1 (bitlbee-3.4.2.tar.gz) = c93eab4161754235a2bc04ba3dc0fc66ce2d34f2
+RMD160 (bitlbee-3.4.2.tar.gz) = 5dcffbf030409e5fd8cc53e7a519a82107d25dea
+SHA512 (bitlbee-3.4.2.tar.gz) = 2b839c014cfad037d815aa0e0867dda1b4628ff076d8de6fec1e80ab1499bca565d9afbe104929d492ff68c86b745cc3f76acbeba102766d656f2d359b70302e
+Size (bitlbee-3.4.2.tar.gz) = 719456 bytes
diff --git a/bitlbee/patches/patch-irc__channel.c b/bitlbee/patches/patch-irc__channel.c
deleted file mode 100644
index e89bc4d..0000000
--- a/bitlbee/patches/patch-irc__channel.c
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-irc__channel.c,v 1.1 2015/08/27 21:58:42 wiz Exp $
-
-From b6a3fbf3b94d1e7e7aee82375661fc0934fec48b Mon Sep 17 00:00:00 2001
-From: dequis <dx%dxzone.com.ar@localhost>
-Date: Thu, 27 Aug 2015 04:25:07 -0300
-Subject: [PATCH] irc_channel_name_gen: handle g_convert_with_fallback failures
-
-First fallback to ASCII without TRANSLIT, and if that fails too, just
-give up by returning NULL.
-
-Basically the same thing as 3a27896 (a netbsd specific fix), but for
-channel names. This wasn't needed before because the older version of
-this code caught the NULL from the ASCII//TRANSLIT attempt and gave up
-immediately, while the refactored version lacked null checking.
----
- irc_channel.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/irc_channel.c b/irc_channel.c
-index 3de68e3..cbd306a 100644
---- irc_channel.c.orig	2015-06-16 22:30:40.000000000 +0000
-+++ irc_channel.c
-@@ -592,6 +592,16 @@ char *irc_channel_name_gen(irc_t *irc, c
- 	gsize bytes_written;
- 
- 	translit_name = g_convert_with_fallback(hint, -1, "ASCII//TRANSLIT", "UTF-8", "", NULL, &bytes_written, NULL);
-+
-+      if (!translit_name) {
-+              /* Same thing as in nick_gen() in nick.c, try again without //TRANSLIT */
-+              translit_name = g_convert_with_fallback(hint, -1, "ASCII", "UTF-8", "", NULL, &bytes_written, NULL);
-+      }
-+
-+      if (!translit_name) {
-+              return NULL;
-+      }
-+
- 	if (bytes_written > MAX_NICK_LENGTH) {
- 		translit_name[MAX_NICK_LENGTH] = '\0';
- 	}