NetBSD Problem Report #50181
From www@NetBSD.org Thu Aug 27 21:37:47 2015
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK))
by mollari.NetBSD.org (Postfix) with ESMTPS id 8F95FA5864
for <gnats-bugs@gnats.NetBSD.org>; Thu, 27 Aug 2015 21:37:47 +0000 (UTC)
Message-Id: <20150827213746.04C2DA6553@mollari.NetBSD.org>
Date: Thu, 27 Aug 2015 21:37:46 +0000 (UTC)
From: frederic@fauberteau.org
Reply-To: frederic@fauberteau.org
To: gnats-bugs@NetBSD.org
Subject: Bitlbee package is outdated
X-Send-Pr-Version: www-1.0
>Number: 50181
>Category: pkg
>Synopsis: Bitlbee package is outdated
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: closed
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Thu Aug 27 21:40:00 +0000 2015
>Closed-Date: Thu Aug 27 21:59:14 +0000 2015
>Last-Modified: Thu Aug 27 22:00:01 +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>
+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';
+ }
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Thu, 27 Aug 2015 21:59:14 +0000
State-Changed-Why:
Committed, thank you!
(The whitespace got mangled on the way.)
From: "Thomas Klausner" <wiz@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/50181 CVS commit: pkgsrc/chat/bitlbee
Date: Thu, 27 Aug 2015 21:58:42 +0000
Module Name: pkgsrc
Committed By: wiz
Date: Thu Aug 27 21:58:42 UTC 2015
Modified Files:
pkgsrc/chat/bitlbee: Makefile distinfo
Added Files:
pkgsrc/chat/bitlbee/patches: patch-irc__channel.c
Log Message:
Update to 3.4.1, provided by Frédéric Fauberteau in PR 50181:
Version 3.4.1:
- msn:
* Upgraded protocol to MSNP21, works again (dx)
* Contact list management, groupchats and skype username logins won't work.
Next release!
- jabber:
* Add "hipchat" protocol, for smoother login. Takes the same username as
the official client. Note that unlike the 'hip-cat' branch, this doesn't
preload channels. https://wiki.bitlbee.org/HowtoHipchat for details (dx)
* Fixed a bug when receiving topics set by people who left the channel (dx)
* Create fake users instead of showing "unknown participant" errors (dx)
* Gmail mail notifications support (Artem Savkov)
* Lowering xmpp presence priority on away (Artem Savkov)
- twitter:
* Show quoted tweets/RTs with comment inline (wilmer)
* Added "url" command, can be used to quote tweets (wilmer)
* Make replies to self work (wilmer)
- Building documentation is now done with a python script (both 2.x/3.x work)
Asciidoc/xsltproc/xmlto are no longer build dependencies (dx)
Finished 16 Jun 2015
Version 3.4:
- First release pretty much fully prepared by dx instead of Wilmer. Just look
at the tightly structured changelog!
- Main repository migrated from bzr to git
- Some API/ABI changes. Recompiling third party plugins is required!
- Important bugfixes:
* Fix memory leak when calling word_wrap() on groupchat messages (dx)
* Fix segfault after a file transfer is complete (dx)
* Fix bug where NSS would refuse to work in forkdaemon mode (dx)
* Fix several bugs with UTF8 nicks (dx)
* Fix some nasty deadlocks that appared mostly with libpurple (dx)
- General changes:
* Add a 'pattern' parameter to the blist command, to filter it (tribut)
* Implemented /kick support, only supported by purple for now (jgeboski)
* Add a "special" state to show_users (mapped to the % prefix) (jgeboski)
* Improved support for cygwin, openbsd and darwin (jcopenha)
* Create temporary users instead of showing "Message from unknown
participant" (jgeboski)
- purple:
* Local contact lists for gadugadu and whatsapp (dx)
* Add topic and name_hint to groupchats (seirl)
* Support for 'input' requests (such as telegram auth codes) (seirl)
Note that telegram-purple itself is rather unstable ATM, it may crash.
- jabber:
* Handle compressed DNS responses in SRV lookup (jcopenha)
* Fix case sensitivity issues with JIDs (GRMrGecko, dx)
* Implement XEP-0203 style message timestamps (dx)
* Fix "Server claims your JID is X instead of Y" warnings (dx)
* Account-wide display_name setting, mostly for hipchat (dx)
- twitter:
* Filter channels. Search by keyword/hashtag or a list of users (jgeboski)
* Fix bug in "reply" command which removed the first quote character (dx)
* Add "rawreply" command, like reply but bitlbee won't add @mention (WillP)
* Add support for The United States of America (favorite/fav aliases) (dx)
* Default show_old_mentions to 0 (dx)
* Start stream from last tweet on connect/reconnect (roger)
- msn:
* Disabled module by default. The protocol we used (MSNP18) stopped working
last week. This is being worked on, but it's far from ready for release.
- And lots of small bugfixes, too many to list here.
Finished 25 Mar 2015
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/chat/bitlbee/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/chat/bitlbee/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/bitlbee/patches/patch-irc__channel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.