import bitlbee from pkgsrc

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: import bitlbee from pkgsrc
From: coypu <coypu%sdf.org@localhost>
Date: Sun, 01 May 2016 19:36:30 +0000
Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Sun May 1 22:36:30 2016 +0300
Changeset:	75555e8b1e7c71dbee70bf5e69f0b97cf37de1dd

Added Files:
	bitlbee/DESCR
	bitlbee/MESSAGE
	bitlbee/Makefile
	bitlbee/PLIST
	bitlbee/distinfo
	bitlbee/files/bitlbee.sh
	bitlbee/patches/patch-irc__channel.c

Log Message:
import bitlbee from pkgsrc

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

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

diffstat:
 bitlbee/DESCR                        |  5 ++
 bitlbee/MESSAGE                      | 13 +++++
 bitlbee/Makefile                     | 94 ++++++++++++++++++++++++++++++++++++
 bitlbee/PLIST                        | 13 +++++
 bitlbee/distinfo                     |  7 +++
 bitlbee/files/bitlbee.sh             | 20 ++++++++
 bitlbee/patches/patch-irc__channel.c | 39 +++++++++++++++
 7 files changed, 191 insertions(+)

diffs:
diff --git a/bitlbee/DESCR b/bitlbee/DESCR
new file mode 100644
index 0000000..05e339e
--- /dev/null
+++ b/bitlbee/DESCR
@@ -0,0 +1,5 @@
+bitlbee is an IRC gateway to other chat networks.  It provides an IRC server
+where users connect to and have access to all their contacts in ICQ, MSN,
+Jabber or even IRC itself.  Protocols are implemented using Gaim's code.
+Multiple users are supported too, where each one has its own set of accounts
+and contacts.
diff --git a/bitlbee/MESSAGE b/bitlbee/MESSAGE
new file mode 100644
index 0000000..507b23f
--- /dev/null
+++ b/bitlbee/MESSAGE
@@ -0,0 +1,13 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.2 2009/07/16 19:19:18 tonio Exp $
+
+bitlbee can be to be started from inetd(8).  Add the following line
+to its configuration file (/etc/inetd.conf):
+
+	6667 stream tcp nowait bitlbee ${PREFIX}/sbin/bitlbee bitlbee
+
+bitlbee can act as a system-wide daemon, using the start-up script installed by
+the package.
+
+	${PREFIX}/share/examples/rc.d/bitlbee
+===========================================================================
diff --git a/bitlbee/Makefile b/bitlbee/Makefile
new file mode 100644
index 0000000..f091b76
--- /dev/null
+++ b/bitlbee/Makefile
@@ -0,0 +1,94 @@
+# $NetBSD: Makefile,v 1.70 2015/12/23 12:38:37 joerg Exp $
+
+DISTNAME=		bitlbee-3.4.1
+CATEGORIES=		chat
+MASTER_SITES=		http://get.bitlbee.org/src/
+
+MAINTAINER=		tonio%NetBSD.org@localhost
+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+=		w3m-[0-9]*:../../www/w3m
+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}
+CONFIGURE_ARGS+=	--datadir=${DATADIR}
+CONFIGURE_ARGS+=	--config=${STATEDIR}
+CONFIGURE_ARGS+=	--pidfile=${VARBASE}/run/bitlbee/pid
+CONFIGURE_ARGS+=	--ipcsocket=${VARBASE}/run/bitlbee/sock
+CONFIGURE_ARGS+=	--flood=0
+CONFIGURE_ARGS+=	--ssl=gnutls
+
+PKG_SYSCONFSUBDIR=	bitlbee
+CONF_FILES=		${DATADIR}/motd.txt ${PKG_SYSCONFDIR}/motd.txt
+CONF_FILES+=		${EGDIR}/bitlbee.conf ${PKG_SYSCONFDIR}/bitlbee.conf
+OWN_DIRS+=		${VARBASE}/run/bitlbee
+
+BUILD_DEFS+=		VARBASE
+
+EGDIR=			${PREFIX}/share/examples/bitlbee
+DATADIR=		${PREFIX}/share/bitlbee
+DOCDIR=			${PREFIX}/share/doc/bitlbee
+STATEDIR=		${VARBASE}/db/bitlbee
+
+OWN_DIRS_PERMS=		${STATEDIR} bitlbee nobody 700
+
+PKG_GROUPS=		nobody
+PKG_USERS=		bitlbee:nobody
+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}
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/bitlbee.conf ${DESTDIR}${EGDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/bitlbee ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/doc/user-guide/help.txt ${DESTDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/motd.txt ${DESTDIR}${DATADIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/bitlbee.8 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKSRC}/doc/bitlbee.conf.5 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
+.for f in AUTHORS FAQ README CREDITS user-guide/user-guide.txt user-guide/user-guide.html
+	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DESTDIR}${DOCDIR}
+.endfor
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.bitlbee
+PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--ipv6=1
+.else
+CONFIGURE_ARGS+=	--ipv6=0
+.endif
+
+RCD_SCRIPTS=		bitlbee
+RCD_SCRIPT_SRC.bitlbee=	${FILESDIR}/bitlbee.sh
+
+# see https://savannah.gnu.org/support/index.php?107660
+#BUILDLINK_ABI_DEPENDS.gnutls+= gnutls<2.12.0
+
+.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/bitlbee/PLIST b/bitlbee/PLIST
new file mode 100644
index 0000000..b2e6a18
--- /dev/null
+++ b/bitlbee/PLIST
@@ -0,0 +1,13 @@
+@comment $NetBSD: PLIST,v 1.8 2014/03/11 14:04:58 jperkin Exp $
+man/man5/bitlbee.conf.5
+man/man8/bitlbee.8
+sbin/bitlbee
+share/bitlbee/help.txt
+share/bitlbee/motd.txt
+share/doc/bitlbee/AUTHORS
+share/doc/bitlbee/CREDITS
+share/doc/bitlbee/FAQ
+share/doc/bitlbee/README
+share/doc/bitlbee/user-guide.html
+share/doc/bitlbee/user-guide.txt
+share/examples/bitlbee/bitlbee.conf
diff --git a/bitlbee/distinfo b/bitlbee/distinfo
new file mode 100644
index 0000000..7f4bc38
--- /dev/null
+++ b/bitlbee/distinfo
@@ -0,0 +1,7 @@
+$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
diff --git a/bitlbee/files/bitlbee.sh b/bitlbee/files/bitlbee.sh
new file mode 100755
index 0000000..5c72cac
--- /dev/null
+++ b/bitlbee/files/bitlbee.sh
@@ -0,0 +1,20 @@
+#!@RCD_SCRIPTS_SHELL@
+
+# PROVIDE: bitlbee
+# REQUIRE: DAEMON
+
+. /etc/rc.subr
+
+name="bitlbee"
+rcvar=$name
+command="@PREFIX@/sbin/bitlbee"
+pidfile="@VARBASE@/run/${name}/pid"
+command_args="-D"	# run as a daemon
+
+if [ -f /etc/rc.subr ]; then
+	load_rc_config $name
+	run_rc_command "$1"
+else
+	echo -n "${name}"
+	${command} ${bitlbee_flags} ${command_args}
+fi
diff --git a/bitlbee/patches/patch-irc__channel.c b/bitlbee/patches/patch-irc__channel.c
new file mode 100644
index 0000000..e89bc4d
--- /dev/null
+++ b/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@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';
+ 	}
Prev by Date: bitlbee: update to 3.4.2
Next by Date: bitlbee: don't run daemon as root
Previous by Thread: bitlbee: update to 3.4.2
Next by Thread: bitlbee: don't run daemon as root
Indexes:
Home | Main Index | Thread Index | Old Index