update to 3.0.3

- new libpurple and otr flavors
 - remove groff requirement
 - convert to pkg-readmes with corrections
 - fix broken @sample
 - gnutls patch no longer required

started by jirib@live.com and again later by leva@ecentrum.hu, previous
MAINTAINER relinquishing maintainership - thanks.

feedback from ajacoutot@ and landry@
This commit is contained in:
okan 2011-10-03 14:33:14 +00:00
parent 3c6680c24e
commit 1e715d6680
7 changed files with 64 additions and 43 deletions

View File

@ -1,15 +1,13 @@
# $OpenBSD: Makefile,v 1.39 2011/09/16 11:13:37 espie Exp $
# $OpenBSD: Makefile,v 1.40 2011/10/03 14:33:14 okan Exp $
COMMENT= IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
COMMENT= IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
DISTNAME= bitlbee-1.2.7
DISTNAME= bitlbee-3.0.3
CATEGORIES= net
REVISION= 3
HOMEPAGE= http://bitlbee.org/
MAINTAINER= Andrew Dalgleish <openbsd@ajd.net.au>
MAINTAINER= Okan Demirmen <okan@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -17,7 +15,8 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c pthread glib-2.0 gmodule-2.0 gnutls>=13 tasn1
WANTLIB += c pthread glib-2.0 gmodule-2.0 gnutls>=13
WANTLIB += gcrypt gpg-error
MASTER_SITES= http://get.bitlbee.org/src/
@ -30,7 +29,8 @@ DOCS= ${WRKSRC}/doc/user-guide/user-guide.html
DOCDIR= ${PREFIX}/share/doc/bitlbee/
LIB_DEPENDS= devel/glib2 \
security/gnutls
security/gnutls \
security/libgcrypt
CONFIGURE_STYLE= simple
CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec \
@ -40,12 +40,28 @@ CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec \
--ssl=gnutls
USE_GMAKE= Yes
USE_GROFF = Yes
MAKE_ENV= "CC=${CC}" "CFLAGS=${CFLAGS}"
FAKE_FLAGS= ETCDIR=${EXAMPLEDIR}
FAKE_TARGET= install install-etc
SUBST_VARS= DB_DIR
FLAVORS = libpurple otr
FLAVOR ?=
.if ${FLAVOR:L:Mlibpurple}
CONFIGURE_ARGS += --purple=1
LIB_DEPENDS += net/pidgin,-libpurple \
devel/silc-toolkit \
net/meanwhile \
net/libgadu
WANTLIB += purple
.endif
.if ${FLAVOR:L:Motr}
CONFIGURE_ARGS += --otr=1
LIB_DEPENDS += security/libotr
WANTLIB += otr
.endif
NO_REGRESS= Yes
# don't hide compile command lines

View File

@ -1,5 +1,5 @@
MD5 (bitlbee-1.2.7.tar.gz) = RsuMCpMJcMzNCdzksxVcrg==
RMD160 (bitlbee-1.2.7.tar.gz) = Xux//2it6RTT4dpbDhSayWNEaCc=
SHA1 (bitlbee-1.2.7.tar.gz) = 0e0Epf8Y3mfZa6UdihG72ObXjvM=
SHA256 (bitlbee-1.2.7.tar.gz) = OwQrLxrqwyPPXvCLMgPn5aGZuwtN49AJI2zSKPrmvzo=
SIZE (bitlbee-1.2.7.tar.gz) = 510458
MD5 (bitlbee-3.0.3.tar.gz) = T+aI46gO/gEXQ/TJJlwDEA==
RMD160 (bitlbee-3.0.3.tar.gz) = S1N4ce7xu1toORBbx7yfJWfluOE=
SHA1 (bitlbee-3.0.3.tar.gz) = QUDreqosajn6BZ0Z+PuuwNeh6/8=
SHA256 (bitlbee-3.0.3.tar.gz) = gsp1iTfOe+2qtJ7ex19K1FoxAqw76qkytkw0+7HjryU=
SIZE (bitlbee-3.0.3.tar.gz) = 676417

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-lib_ssl_gnutls_c,v 1.1 2011/06/12 08:09:26 ajacoutot Exp $
http://bugs.bitlbee.org/bitlbee/ticket/779
--- lib/ssl_gnutls.c.orig Sat May 15 16:52:23 2010
+++ lib/ssl_gnutls.c Fri Jun 10 16:33:58 2011
@@ -128,6 +128,7 @@ static gboolean ssl_connected( gpointer data, gint sou
gnutls_certificate_allocate_credentials( &conn->xcred );
gnutls_init( &conn->session, GNUTLS_CLIENT );
+ gnutls_transport_set_lowat ( conn->session, 1 );
gnutls_set_default_priority( conn->session );
gnutls_credentials_set( conn->session, GNUTLS_CRD_CERTIFICATE, conn->xcred );

View File

@ -1,9 +1,16 @@
Bitlbee is a proxy which accepts connections from any irc-client
and allows you to communicate using following instant messaging
protocols.
protocols:
- AIM
- ICQ
- Jabber
- MSN
- Yahoo
- AIM/ICQ (oscar)
- XMPP/Jabber
- MSN Messenger
- Yahoo! Messenger
- Twitter (and API compatible services like identi.ca)
Flavors:
* libpurple - Enables a backend using purple library allowing
to communicate with even more chat networks like Gadu-Gadu,
MySpaceIM, Groupwise, Sametime, SILC etc.
* otr - Enables Off-the-Record (OTR) Messaging to have private
conversations.

View File

@ -1,7 +0,0 @@
To enable bitlbee you have to add a line like:
127.0.0.1:6667 stream tcp nowait _bitlbee ${PREFIX}/libexec/bitlbee bitlbee
to your /etc/inetd.conf and restart inetd with
# kill -HUP `cat /var/run/inetd.pid`

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.14 2011/05/11 12:03:19 jasper Exp $
@comment $OpenBSD: PLIST,v 1.15 2011/10/03 14:33:14 okan Exp $
@pkgpath net/bitlbee,no_ssl
@newgroup _bitlbee:509
@newuser _bitlbee:509:_bitlbee:daemon:Bitlbee Account:/nonexistent:/sbin/nologin
@ -10,9 +10,10 @@ share/bitlbee/
share/bitlbee/help.txt
share/doc/bitlbee/
share/doc/bitlbee/user-guide.html
share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/bitlbee/
share/examples/bitlbee/bitlbee.conf
@sample ${SYSCONFDIR}/bitlbee/
share/examples/bitlbee/bitlbee.conf
@sample ${SYSCONFDIR}/bitlbee/bitlbee.conf
share/examples/bitlbee/motd.txt
@sample ${SYSCONFDIR}/bitlbee/motd.txt

18
net/bitlbee/pkg/README Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: README,v 1.1 2011/10/03 14:33:14 okan Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
+-----------------------------------------------------------------------
To enable bitlbee, add a line such as:
127.0.0.1:6667 stream tcp nowait _bitlbee ${TRUEPREFIX}/libexec/bitlbee bitlbee
to your /etc/inetd.conf and restart inetd:
# pkill -HUP inetd
If a libpurple flavored bitlbee port was previously used, be aware that
"classic" bitlbee cannot support all protocols supported with purple
library. Remove lines for all protocol accounts unsupported by
"classic" bitlbee in users' xml configuration files in ${DB_DIR}.