diff options
| -rw-r--r-- | chat/bitlbee/Makefile | 5 | ||||
| -rw-r--r-- | chat/bitlbee/distinfo | 11 | ||||
| -rw-r--r-- | chat/bitlbee/patches/patch-irc__channel.c | 39 |
3 files changed, 7 insertions, 48 deletions
diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile index ff7b9fc76d3..dd1d684c8df 100644 --- a/chat/bitlbee/Makefile +++ b/chat/bitlbee/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.71 2016/09/19 13:04:19 wiz Exp $ +# $NetBSD: Makefile,v 1.72 2017/05/14 11:39:32 leot Exp $ -DISTNAME= bitlbee-3.4.1 -PKGREVISION= 1 +DISTNAME= bitlbee-3.5.1 CATEGORIES= chat MASTER_SITES= http://get.bitlbee.org/src/ diff --git a/chat/bitlbee/distinfo b/chat/bitlbee/distinfo index 7f4bc38c220..645a92e9900 100644 --- a/chat/bitlbee/distinfo +++ b/chat/bitlbee/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.33 2015/11/03 01:20:17 agc Exp $ +$NetBSD: distinfo,v 1.34 2017/05/14 11:39:32 leot 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.5.1.tar.gz) = de0767facdb7729253ae4d6ef6e3637ebd54939a +RMD160 (bitlbee-3.5.1.tar.gz) = f7c3c6154d3c28cb1e48ccb5f86dbb9141795cea +SHA512 (bitlbee-3.5.1.tar.gz) = 4eb3b0d3a92910c8dd789cd23338cc6296bf40212c5244fcb27a88ede10e86424ea59c78e719841863701a7fdd8c61819f2775f7b58833e287d9110e49d036f3 +Size (bitlbee-3.5.1.tar.gz) = 680351 bytes diff --git a/chat/bitlbee/patches/patch-irc__channel.c b/chat/bitlbee/patches/patch-irc__channel.c deleted file mode 100644 index e89bc4d8eed..00000000000 --- a/chat/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> -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'; - } |