any interest in reviews/tests/oks?
On Tue 2010.12.28 at 18:22 -0500, Okan Demirmen wrote:
> On Wed 2010.12.29 at 00:01 +0100, Jiri B. wrote:
> > On Tue, Dec 28, 2010 at 05:38:23PM -0500, Okan Demirmen wrote:
> > >On Sat 2010.12.11 at 20:18 +0100, Jiri B. wrote:
> > >> Hi,
> > >>
> > >> patch to update bitlbee to latest version. It also adds flavors for
> > >> libpurple backend (tested with Sametime protocol) and OTR (tested
> > >> successfully).
> >
> > Well,
> >
> > I think OTR should not be default at all. What about if one wants to
> > use OTR in his client? Also OTR start somehow automatically,
> > I lightly tested that but I haven't seen an option to disabled it,
> > other thing is that if you have this bitlbee for other users they
> > have to trust you, your server because OTR key is saved on the server.
> >
> > I'm paranoid I would not trust this. So flavor is only for people
> > who run it for themselves for for those who trust the service such
> > server offer.
>
> Uhm, the use-case I've really understood for bitlbee has always been as
> a proxy for *the* local user, not as a public service. I suppose if
> bitlbee is now meant to be used in this way, clearly OTR shouldn't be
> here. OK, so a lot has changed in bitlbee since it started, so I can
> see it being used in this way.
>
> Thanks and updated diff with the otr flavor back :)
>
> Index: Makefile
> ===================================================================
> RCS file: /home/open/anoncvs/cvs/ports/net/bitlbee/Makefile,v
> retrieving revision 1.35
> diff -u -p -r1.35 Makefile
> --- Makefile 22 Nov 2010 10:16:08 -0000 1.35
> +++ Makefile 28 Dec 2010 23:16:23 -0000
> @@ -1,8 +1,8 @@
> # $OpenBSD: Makefile,v 1.35 2010/11/22 10:16:08 espie Exp $
>
> -COMMENT= IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
> +COMMENT= IRC proxy to connect to various chat networks
>
> -DISTNAME= bitlbee-1.2.7
> +DISTNAME= bitlbee-3.0.1
> CATEGORIES= net
>
> HOMEPAGE= http://bitlbee.org/
> @@ -15,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
> +WANTLIB= c pthread glib-2.0 gmodule-2.0 gnutls>=13 \
> + gcrypt gpg-error
>
> MASTER_SITES= http://get.bitlbee.org/src/
>
> @@ -38,11 +39,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/open/anoncvs/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 28 Dec 2010 19:53:09 -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.1.tar.gz) = TQDG4JhZtlP5VbFrmI2wrA==
> +RMD160 (bitlbee-3.0.1.tar.gz) = zGIXnoB+8XXbDCNR2TY/EY4o85Q=
> +SHA1 (bitlbee-3.0.1.tar.gz) = 86BlHXI7cbCPDa07XLKENgjVwmU=
> +SHA256 (bitlbee-3.0.1.tar.gz) = QIpzezXbS5xAfj2wmy0ue1KINqaOLXgzcyVLeIEr9gg=
> +SIZE (bitlbee-3.0.1.tar.gz) = 668353
> Index: pkg/DESCR
> ===================================================================
> RCS file: /home/open/anoncvs/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 28 Dec 2010 23:16:45 -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
> +
> +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/open/anoncvs/cvs/ports/net/bitlbee/pkg/PLIST,v
> retrieving revision 1.13
> diff -u -p -r1.13 PLIST
> --- pkg/PLIST 11 Jul 2008 01:13:05 -0000 1.13
> +++ pkg/PLIST 28 Dec 2010 22:27:57 -0000
> @@ -9,9 +9,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 28 Dec 2010 20:04:58 -0000
> @@ -0,0 +1,17 @@
> +$OpenBSD$
> +
> +Running BITLBEE on OpenBSD
> +==========================
> +
> +To enable bitlbee, add a line such as:
> +
> +127.0.0.1:6667 stream tcp nowait _bitlbee ${PREFIX}/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}.
>
