On Tue 2011.09.27 at 11:11 -0400, Okan Demirmen wrote: > On Fri 2011.09.16 at 09:34 +0200, Landry Breuil wrote: > > On Fri, Sep 16, 2011 at 09:13:26AM +0200, LEVAI Daniel wrote: > > > On Thu, Sep 15, 2011 at 22:45:48 +0200, Landry Breuil wrote: > > > > On Thu, Sep 15, 2011 at 11:52:20AM +0200, LEVAI Daniel wrote: > > > > > Hi! > > > > > > > > > > > > > > > Based on jirib@'s and okan@'s work [1], this an update to 3.0.3. Minor > > > > > changes in the DESCR, and I think it should only depend on gcrypt and > > > > > gpg-error when using the OTR flavor. > > > > > This is in the openbsd-wip github repo also. > > > > > > > > Does the libpurple flavor connects fine to oscar ? Iirc, that's why the > > > > 3.0.1 update was not commited back in mid-december. What does maintainer > > > > say ? > > > > > > I've tested it with icq, connecting, chatting seems to work. I don't > > > know exactly what do you mean, so I don't what to look for, though :/ > > > > http://marc.info/?l=openbsd-ports&m=129259700623849&w=2 > > > > And did you send it to maintainer ? > > I'll give it a try... > > Here's a diff with some futher changes: > - applies to -current. > - removes no longer need gnutls patch (included). > - fixes lib depends/wantlib (still links against gcrypt/gpg-error > regardless of otr FLAVOR due to gnutls) > > And still included from my original diff back when: > - no need for groff. > - converted to pkg-readmes and fixed grammer (could still use better > words) as well as not encouraging the use of pid files. > - fixed broken @sample for bitlbee.conf. > - minor cosmetic changes > > Only light testing here so far.
...and with some feedback from ajacoutot@: - apply readme template header. - use TRUEPREFEX. - remove extra in LIB_DEPENDS Index: Makefile =================================================================== RCS file: /home/okan/openbsd/cvs/ports/net/bitlbee/Makefile,v retrieving revision 1.39 diff -u -p -r1.39 Makefile --- Makefile 16 Sep 2011 11:13:37 -0000 1.39 +++ Makefile 27 Sep 2011 15:36:08 -0000 @@ -1,12 +1,10 @@ # $OpenBSD: Makefile,v 1.39 2011/09/16 11:13:37 espie 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 <open...@ajd.net.au> @@ -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-gu DOCDIR= ${PREFIX}/share/doc/bitlbee/ LIB_DEPENDS= devel/glib2 \ - security/gnutls + security/gnutls \ + security/libgcrypt CONFIGURE_STYLE= simple CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec \ @@ -40,11 +40,27 @@ CONFIGURE_ARGS+= --bindir=${PREFIX}/libe --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 Index: distinfo =================================================================== RCS file: /home/okan/openbsd/cvs/ports/net/bitlbee/distinfo,v retrieving revision 1.19 diff -u -p -r1.19 distinfo --- distinfo 16 May 2010 08:31:28 -0000 1.19 +++ distinfo 27 Sep 2011 14:19:02 -0000 @@ -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 Index: patches/patch-lib_ssl_gnutls_c =================================================================== RCS file: patches/patch-lib_ssl_gnutls_c diff -N patches/patch-lib_ssl_gnutls_c --- patches/patch-lib_ssl_gnutls_c 12 Jun 2011 08:09:26 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 ); - Index: pkg/DESCR =================================================================== RCS file: /home/okan/openbsd/cvs/ports/net/bitlbee/pkg/DESCR,v retrieving revision 1.3 diff -u -p -r1.3 DESCR --- pkg/DESCR 20 Jun 2004 16:27:49 -0000 1.3 +++ pkg/DESCR 27 Sep 2011 14:19:02 -0000 @@ -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. Index: pkg/MESSAGE =================================================================== RCS file: pkg/MESSAGE diff -N pkg/MESSAGE --- pkg/MESSAGE 13 Nov 2004 10:24:57 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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` Index: pkg/PLIST =================================================================== RCS file: /home/okan/openbsd/cvs/ports/net/bitlbee/pkg/PLIST,v retrieving revision 1.14 diff -u -p -r1.14 PLIST --- pkg/PLIST 11 May 2011 12:03:19 -0000 1.14 +++ pkg/PLIST 27 Sep 2011 14:19:02 -0000 @@ -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 Index: pkg/README =================================================================== RCS file: pkg/README diff -N pkg/README --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/README 27 Sep 2011 15:33:20 -0000 @@ -0,0 +1,18 @@ +$OpenBSD$ + ++----------------------------------------------------------------------- +| 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}.
