ports/126208: [PATCH] Added OTR support and protocol options to irc/bitlbee

[Ashish Shukla]

>Number:         126208
>Category:       ports
>Synopsis:       [PATCH] Added OTR support and protocol options to irc/bitlbee
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 03 13:10:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Ashish Shukla
>Release:        FreeBSD 7.0-RELEASE-p3 amd64
>Organization:
N/A
>Environment:
System: FreeBSD chateau.d.lf 7.0-RELEASE-p3 FreeBSD 7.0-RELEASE-p3 #3: Tue Jul 15 10:16:13 IST 2008 root at chateau.d.lf:/usr/obj/usr/src/sys/ULE amd64


>Description:
This patch adds support for OTR in bitlbee from the bitlbee-otr branch[1].
This patch also adds protocol options to build more accurately, like a
excluding protocol support from being compiled. With OTR, a user can have
an encrypted conversation.

ATM, I'm hosting the bitlbee-otr diff on my pages.google.com account. If this diff
can get be hosted on a freebsd.org or any other mirror, cool.

References:
[1] - http://khjk.org/bitlbee-otr/

>How-To-Repeat:
>Fix:
diff -urN /usr/ports/irc/bitlbee/Makefile bitlbee/Makefile
--- /usr/ports/irc/bitlbee/Makefile	2008-06-29 03:02:48.000000000 +0530
+++ bitlbee/Makefile	2008-08-03 18:31:10.000000000 +0530
@@ -30,7 +30,11 @@
 OPTIONS=	MSN "Enable MSN protocol support" On \
 		DEBUG "Create debuggable binary" Off \
 		OPENSSL "Use openssl rather than gnutls" Off \
-		IPV6 "Compile IPV6 support" On
+		IPV6 "Compile IPV6 support" On \
+		OTR "Enable OTR support" Off \
+		XMPP "Enable XMPP protocol support" On \
+		OSCAR "Enable OSCAR (ICQ,AIM) protocol support" On \
+		YAHOO "Enable Yahoo protocol support" On
 
 CONFIGURE_ARGS=	--config=/var/db/bitlbee --strip=0
 
@@ -60,6 +64,24 @@
 CONFIGURE_ARGS+=--msn=0 --ssl=bogus
 .endif
 
+.if !defined(WITHOUT_XMPP)
+CONFIGURE_ARGS+=--jabber=1
+.else
+CONFIGURE_ARGS+=--jabber=0
+.endif
+
+.if !defined(WITHOUT_OSCAR)
+CONFIGURE_ARGS+=--oscar=1
+.else
+CONFIGURE_ARGS+=--oscar=0
+.endif
+
+.if !defined(WITHOUT_YAHOO)
+CONFIGURE_ARGS+=--yahoo=1
+.else
+CONFIGURE_ARGS+=--yahoo=0
+.endif
+
 .if defined(WITH_OPENSSL)
 CONFIGURE_ARGS+=--ssl=openssl
 .else
@@ -75,6 +97,25 @@
 CONFIGURE_ARGS+=--ipv6=0
 .endif
 
+.if defined(WITH_OTR)
+PATCHFILES+=	bitlbee-otr-1.2.1.diff
+PATCH_SITES=	http://wahjava.googlepages.com/
+PATCH_DIST_STRIP=	-p1
+PATCH=	${LOCALBASE}/bin/gpatch
+BUILD_DEPENDS+=	${LOCALBASE}/bin/gpatch:${PORTSDIR}/devel/patch
+LIB_DEPENDS+=	otr.4:${PORTSDIR}/security/libotr
+CONFIGURE_ARGS+=--otr=1
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS+=	${LOCALBASE}/bin/xmlto:${PORTSDIR}/textproc/xmlto \
+	${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
+post-build:
+	${MKDIR} -p ${WRKSRC}/.bzr
+	${GMAKE} -C ${WRKSRC}/doc/user-guide
+.endif
+.else
+PLIST_SUB+=	OTR="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "s|^EFLAGS=|EFLAGS=${LDFLAGS}|" \
diff -urN /usr/ports/irc/bitlbee/distinfo bitlbee/distinfo
--- /usr/ports/irc/bitlbee/distinfo	2008-06-29 03:02:48.000000000 +0530
+++ bitlbee/distinfo	2008-08-03 16:50:51.000000000 +0530
@@ -1,3 +1,6 @@
 MD5 (bitlbee-1.2.1.tar.gz) = ca00f65aea89903ba78321eac00f7849
 SHA256 (bitlbee-1.2.1.tar.gz) = 4654e8824eea2ba787b4751782ee3ca704b756d3c4f623cda409cde212198d06
 SIZE (bitlbee-1.2.1.tar.gz) = 471454
+MD5 (bitlbee-otr-1.2.1.diff) = b4f235b6d3e9b474b76249ace88f9d36
+SHA256 (bitlbee-otr-1.2.1.diff) = c162518d4e0b766142337ac282c6ddfece184f42628e03e68fe5d48aa846f835
+SIZE (bitlbee-otr-1.2.1.diff) = 287308
>Release-Note:
>Audit-Trail:
>Unformatted: