diff options
| -rw-r--r-- | chat/bitlbee/Makefile | 17 | ||||
| -rw-r--r-- | chat/bitlbee/distinfo | 9 | ||||
| -rw-r--r-- | chat/bitlbee/patches/patch-irc__channel.c | 39 |
3 files changed, 57 insertions, 8 deletions
diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile index 423127e0899..f74c19d94f6 100644 --- a/chat/bitlbee/Makefile +++ b/chat/bitlbee/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.67 2015/08/23 14:30:36 wiz Exp $ -# +# $NetBSD: Makefile,v 1.68 2015/08/27 21:58:42 wiz Exp $ -DISTNAME= bitlbee-3.2.2 -PKGREVISION= 1 +DISTNAME= bitlbee-3.4.1 CATEGORIES= chat MASTER_SITES= http://get.bitlbee.org/src/ @@ -11,9 +9,14 @@ HOMEPAGE= http://www.bitlbee.org/ COMMENT= IRC to other chat networks gateway LICENSE= gnu-gpl-v2 +BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto +BUILD_DEPENDS+= links-[0-9]*:../../www/links +BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat + 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} @@ -44,6 +47,10 @@ PKG_HOME.bitlbee= ${VARBASE}/db/bitlbee 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} @@ -80,6 +87,8 @@ RCD_SCRIPT_SRC.bitlbee= ${FILESDIR}/bitlbee.sh .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" diff --git a/chat/bitlbee/distinfo b/chat/bitlbee/distinfo index 0f40b25ccfc..ae7028975ee 100644 --- a/chat/bitlbee/distinfo +++ b/chat/bitlbee/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.31 2014/11/20 08:38:59 mef Exp $ +$NetBSD: distinfo,v 1.32 2015/08/27 21:58:42 wiz 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) = 332126961c675c173fd3634fcb26877a3317acd0 diff --git a/chat/bitlbee/patches/patch-irc__channel.c b/chat/bitlbee/patches/patch-irc__channel.c new file mode 100644 index 00000000000..e89bc4d8eed --- /dev/null +++ b/chat/bitlbee/patches/patch-irc__channel.c @@ -0,0 +1,39 @@ +$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'; + } |