On Wed, 3 Jul 2013 14:55:57 -0400, David Hill wrote: > Hello - > > So here is an attempt to update libotr to 4.0.0. It wouldn't link on > my i386 unless I used USE_LIBTOOL=gnu, but I am sure there is a better > way... > > test with pidgin-otr 4.0.0 (separate email)
This changes libotr's API and breaks applications other than pidgin-otr (which *needs* the update simultaneously to work), namely climm and probably mcabber and bitlbee--otr. I've got to dive into the API and fix things first before doing this update. It's on my to-do list. > Index: Makefile > =================================================================== > RCS file: /cvs/ports/security/libotr/Makefile,v > retrieving revision 1.18 > diff -u -p -r1.18 Makefile > --- Makefile 21 Mar 2013 08:48:53 -0000 1.18 > +++ Makefile 3 Jul 2013 18:06:40 -0000 > @@ -2,10 +2,10 @@ > > COMMENT= portable OTR messaging library and toolkit > > -DISTNAME= libotr-3.2.1 > +DISTNAME= libotr-4.0.0 > CATEGORIES= security > > -SHARED_LIBS += otr 3.2 # 4.0 > +SHARED_LIBS += otr 4.0 # 4.0 > > HOMEPAGE= http://www.cypherpunks.ca/otr/ > > @@ -22,8 +22,7 @@ MODULES= devel/gettext > > LIB_DEPENDS= security/libgcrypt > > -USE_GROFF = Yes > - > +USE_LIBTOOL= gnu > CONFIGURE_STYLE= gnu > CONFIGURE_ARGS= ${CONFIGURE_SHARED} > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/security/libotr/distinfo,v > retrieving revision 1.7 > diff -u -p -r1.7 distinfo > --- distinfo 25 Sep 2012 19:40:33 -0000 1.7 > +++ distinfo 3 Jul 2013 18:06:40 -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: pkg/PFRAG.shared > =================================================================== > RCS file: pkg/PFRAG.shared > diff -N pkg/PFRAG.shared > --- pkg/PFRAG.shared 25 Dec 2005 15:52:38 -0000 1.4 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,2 +0,0 @@ > -@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/25 15:52:38 sturm Exp $ > -@lib lib/libotr.so.${LIBotr_VERSION} > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/security/libotr/pkg/PLIST,v > retrieving revision 1.5 > diff -u -p -r1.5 PLIST > --- pkg/PLIST 18 Jul 2008 13:21:22 -0000 1.5 > +++ pkg/PLIST 3 Jul 2013 18:06:40 -0000 > @@ -1,5 +1,4 @@ > @comment $OpenBSD: PLIST,v 1.5 2008/07/18 13:21:22 dhill Exp $ > -%%SHARED%% > @bin bin/otr_mackey > @bin bin/otr_modify > @bin bin/otr_parse > @@ -10,7 +9,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 > @@ -23,6 +24,7 @@ include/libotr/userstate.h > include/libotr/version.h > lib/libotr.a > lib/libotr.la > +@lib lib/libotr.so.${LIBotr_VERSION} > lib/pkgconfig/ > lib/pkgconfig/libotr.pc > @man man/man1/otr_mackey.1 > >
