On Wed, 14 Aug 2013 15:06:32 +0200, Stefan Sperling wrote: > This updates libotr and pidgin-otr to the latest releases. > > For some reason I had to force use of GNU libtool. > Else, libotr doesn't build and the piding-otr plugin won't load properly. > Not sure what the issue is, but it works using GNU libtool. > > libotr insists on running automake during the build now, so I've > changed CONFIGURE_STYLE accordingly. > > Unfortuntely, some other ports are affected by this update: > > - breaks compilation of net/bitlbee,otr and net/mcabber
I have a patch for mcabber, see: http://www.isbear.org.ua/hg/isbear/mcabber-patches/file/tip/use-otr-v4.diff There's ongoing work for bitlbee: http://bugs.bitlbee.org/bitlbee/ticket/1004 > - net/climm still packages, but I don't know if it works It does not detect libotr at configure time, so OTR doesn't work. That's pretty much an essential feature for me. I haven't yet figured out the transition to the libotrv4 API, so the update must wait (but feel free to give it a try; docs are available at http://www.cypherpunks.ca/otr/UPGRADING-libotr-4.0.0.txt > Should we hold back this update until bitlbee and mcabber provide > patches for OTR-4? Or leave them broken until then? Or should I > add a new libotr4 port instead that conflicts with otr3? > > Index: libotr/Makefile > =================================================================== > RCS file: /cvs/ports/security/libotr/Makefile,v > retrieving revision 1.21 > diff -u -p -r1.21 Makefile > --- libotr/Makefile 8 Jul 2013 10:29:37 -0000 1.21 > +++ libotr/Makefile 14 Aug 2013 11:59:50 -0000 > @@ -2,11 +2,10 @@ > > COMMENT= portable OTR messaging library and toolkit > > -DISTNAME= libotr-3.2.1 > +DISTNAME= libotr-4.0.0 > CATEGORIES= security > -REVISION = 0 > > -SHARED_LIBS += otr 3.2 # 4.0 > +SHARED_LIBS += otr 4.0 # 5.0 > > HOMEPAGE= http://www.cypherpunks.ca/otr/ > > @@ -27,8 +26,11 @@ LIB_DEPENDS= security/libgcrypt > LIB_DEPENDS += security/libgpg-error > > USE_GROFF = Yes > +USE_LIBTOOL = gnu > > -CONFIGURE_STYLE= gnu > +AUTOCONF_VERSION = 2.65 > +AUTOMAKE_VERSION = 1.11 > +CONFIGURE_STYLE= autoconf automake > CONFIGURE_ARGS= ${CONFIGURE_SHARED} > > .include <bsd.port.mk> > Index: libotr/distinfo > =================================================================== > RCS file: /cvs/ports/security/libotr/distinfo,v > retrieving revision 1.7 > diff -u -p -r1.7 distinfo > --- libotr/distinfo 25 Sep 2012 19:40:33 -0000 1.7 > +++ libotr/distinfo 14 Aug 2013 11:24:45 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (libotr-3.2.1.tar.gz) = 1CjqpYSYS6oJRQzKB3QuCsj8YkAfOhxVbjAlAjNpzfQ= > -SIZE (libotr-3.2.1.tar.gz) = 414684 > +SHA256 (libotr-4.0.0.tar.gz) = P5EZlECYmOdFJ3MHRe817XXDUsaVoYIqZ3o0ss8Ck7Q= > +SIZE (libotr-4.0.0.tar.gz) = 441441 > Index: libotr/pkg/PLIST > =================================================================== > RCS file: /cvs/ports/security/libotr/pkg/PLIST,v > retrieving revision 1.5 > diff -u -p -r1.5 PLIST > --- libotr/pkg/PLIST 18 Jul 2008 13:21:22 -0000 1.5 > +++ libotr/pkg/PLIST 14 Aug 2013 12:02:04 -0000 > @@ -10,7 +10,9 @@ include/libotr/ > include/libotr/auth.h > include/libotr/b64.h > include/libotr/context.h > +include/libotr/context_priv.h > include/libotr/dh.h > +include/libotr/instag.h > include/libotr/mem.h > include/libotr/message.h > include/libotr/privkey-t.h > Index: pidgin-otr/Makefile > =================================================================== > RCS file: /cvs/ports/security/pidgin-otr/Makefile,v > retrieving revision 1.19 > diff -u -p -r1.19 Makefile > --- pidgin-otr/Makefile 21 Mar 2013 08:48:53 -0000 1.19 > +++ pidgin-otr/Makefile 14 Aug 2013 12:25:38 -0000 > @@ -2,7 +2,7 @@ > > COMMENT = allows deniable private conversations using Pidgin > > -DISTNAME = pidgin-otr-3.2.1 > +DISTNAME = pidgin-otr-4.0.0 > CATEGORIES = security net > EPOCH = 0 > > @@ -16,12 +16,13 @@ PERMIT_PACKAGE_CDROM = Yes > RUN_DEPENDS = net/pidgin>=2.0.0 > BUILD_DEPENDS = ${RUN_DEPENDS} \ > devel/libtool > -LIB_DEPENDS = security/libotr>=3.2.0 > +LIB_DEPENDS = security/libotr>=4.0.0 > > MODULES = devel/gettext \ > textproc/intltool > -WANTLIB = gpg-error gcrypt otr>=3.2 > +WANTLIB = c gpg-error gcrypt otr>=4.0 pthread > > +USE_LIBTOOL = gnu > LIBTOOL_FLAGS += --tag=disable-static > > SHARED_ONLY = Yes > @@ -30,7 +31,7 @@ CONFIGURE_STYLE = gnu > CONFIGURE_ENV = CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ > LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib " > > -AUTOCONF_VERSION = 2.60 > +AUTOCONF_VERSION = 2.65 > AUTOMAKE_VERSION = 1.9 > BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \ > ${MODGNU_AUTOMAKE_DEPENDS} > Index: pidgin-otr/distinfo > =================================================================== > RCS file: /cvs/ports/security/pidgin-otr/distinfo,v > retrieving revision 1.4 > diff -u -p -r1.4 distinfo > --- pidgin-otr/distinfo 16 May 2012 12:18:29 -0000 1.4 > +++ pidgin-otr/distinfo 14 Aug 2013 11:21:33 -0000 > @@ -1,5 +1,2 @@ > -MD5 (pidgin-otr-3.2.1.tar.gz) = TD9zzKcpVV/0bAnnie9olg== > -RMD160 (pidgin-otr-3.2.1.tar.gz) = wxGbqU88KJ+yBR6Qh5eoW5/tCr0= > -SHA1 (pidgin-otr-3.2.1.tar.gz) = /y/8mi0a8UjKf8oj0PHdbQHXGOk= > -SHA256 (pidgin-otr-3.2.1.tar.gz) = > zhfpdp44UwdtgGRa2vqoZufXGI+YjSipeTr8MshcuXk= > -SIZE (pidgin-otr-3.2.1.tar.gz) = 409238 > +SHA256 (pidgin-otr-4.0.0.tar.gz) = > 1Ws/CS2+nuZZdkHH0t0pSITcBLpHqvTsVxzVSXffRpE= > +SIZE (pidgin-otr-4.0.0.tar.gz) = 459591 > Index: pidgin-otr/pkg/PLIST > =================================================================== > RCS file: /cvs/ports/security/pidgin-otr/pkg/PLIST,v > retrieving revision 1.2 > diff -u -p -r1.2 PLIST > --- pidgin-otr/pkg/PLIST 29 Nov 2007 14:07:42 -0000 1.2 > +++ pidgin-otr/pkg/PLIST 14 Aug 2013 12:08:53 -0000 > @@ -1,4 +1,4 @@ > @comment $OpenBSD: PLIST,v 1.2 2007/11/29 14:07:42 okan Exp $ > -lib/pidgin/pidgin-otr.la > +@comment lib/pidgin/pidgin-otr.la > lib/pidgin/pidgin-otr.so > share/doc/pidgin/otr-plugin.txt > >
