pkg/50181: Bitlbee package is outdated

[frederic%fauberteau.org@localhost]

>Number:         50181
>Category:       pkg
>Synopsis:       Bitlbee package is outdated
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Aug 27 21:40:00 +0000 2015
>Originator:     Frédéric Fauberteau
>Release:        chat/bitlbee update to 3.4.1
>Organization:
>Environment:
NetBSD trashware 6.1_STABLE NetBSD 6.1_STABLE (TRASHWARE) #0: Tue Jul  7 09:13:34 CEST 2015  triaxx@trashware:/home/triaxx/dev/nbsd/netbsd-6/obj/sys/arch/amd64/compile/TRASHWARE amd64
>Description:
Bitlbee package is outdated. The following patch updates it to the 3.4.1 release. Some reviews are welcomed.

Thanks to dx from #bitlbee for the bugfix.
>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/bitlbee/Makefile,v
retrieving revision 1.66
diff -u -u -r1.66 Makefile
--- Makefile    20 Nov 2014 08:38:59 -0000      1.66
+++ Makefile    27 Aug 2015 21:25:04 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.66 2014/11/20 08:38:59 mef Exp $
 #
 
-DISTNAME=              bitlbee-3.2.2
+DISTNAME=              bitlbee-3.4.1
 CATEGORIES=            chat
 MASTER_SITES=          http://get.bitlbee.org/src/
 
@@ -13,6 +13,7 @@
 HAS_CONFIGURE=         yes
 USE_TOOLS+=            gmake pkg-config
 
+REPLACE_PYTHON+=       configure
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --bindir=${PREFIX}/sbin
 CONFIGURE_ARGS+=       --etcdir=${PKG_SYSCONFDIR}
@@ -29,6 +30,8 @@
 OWN_DIRS+=             ${VARBASE}/run/bitlbee
 
 BUILD_DEFS+=           VARBASE
+BUILD_DEPENDS+=        xmlto-[0-9]*:../../textproc/xmlto
+BUILD_DEPENDS+=        links-[0-9]*:../../www/links
 
 EGDIR=                 ${PREFIX}/share/examples/bitlbee
 DATADIR=               ${PREFIX}/share/bitlbee
@@ -43,6 +46,10 @@
 
 INSTALLATION_DIRS=     ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin
 
+post-build:
+       cd ${WRKSRC}/doc/user-guide && \
+       ${BUILD_MAKE_CMD} user-guide.txt user-guide.html
+
 do-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${DATADIR}
        ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
@@ -79,6 +86,8 @@
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+PYTHON_FOR_BUILD_ONLY= yes
+.include "../../lang/python/application.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/chat/bitlbee/distinfo,v
retrieving revision 1.31
diff -u -u -r1.31 distinfo
--- distinfo    20 Nov 2014 08:38:59 -0000      1.31
+++ distinfo    27 Aug 2015 21:25:04 -0000
@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.31 2014/11/20 08:38:59 mef Exp $
 
-SHA1 (bitlbee-3.2.2.tar.gz) = 7e3cfe2b6bf4e8e603c74e7587307a6f5d267e9c
-RMD160 (bitlbee-3.2.2.tar.gz) = 7d5ce23f05b7ff7bac1c0a8af7e38f821176939a
-Size (bitlbee-3.2.2.tar.gz) = 661757 bytes
+SHA1 (bitlbee-3.4.1.tar.gz) = b77311b538ec1c584694784f119b99fb6b3f4859
+RMD160 (bitlbee-3.4.1.tar.gz) = 32e0faf3b0a23f812f46752c1d0e96e30aaaf649
+Size (bitlbee-3.4.1.tar.gz) = 688072 bytes
+SHA1 (patch-irc__channel.c) = 78c9a601314bd82ff5d92cd1c9939b49e3e63af4
Index: patches/patch-irc__channel.c
===================================================================
RCS file: patches/patch-irc__channel.c
diff -N patches/patch-irc__channel.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-irc__channel.c        27 Aug 2015 21:25:04 -0000
@@ -0,0 +1,37 @@
+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
++++ irc_channel.c
+@@ -592,6 +592,16 @@ char *irc_channel_name_gen(irc_t *irc, const char *hint)
+       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';
+       }