libotr/patches/libotr3-3.2.1-soname-2.patch

diff -Naur libotr-3.2.1/Makefile.am libotr-3.2.1-magellan/Makefile.am
--- libotr-3.2.1/Makefile.am	2012-08-14 14:15:56.000000000 +0200
+++ libotr-3.2.1-magellan/Makefile.am	2012-12-21 16:19:03.804279602 +0100
@@ -1,9 +1,9 @@
 SUBDIRS = src toolkit
 
-EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr.m4 libotr.pc.in
+EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr3.m4 libotr3.pc.in
 
 aclocaldir = $(datadir)/aclocal
-aclocal_DATA = libotr.m4
+aclocal_DATA = libotr3.m4
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libotr.pc
+pkgconfig_DATA = libotr3.pc
diff -Naur libotr-3.2.1/Makefile.in libotr-3.2.1-magellan/Makefile.in
--- libotr-3.2.1/Makefile.in	2012-08-14 15:02:04.000000000 +0200
+++ libotr-3.2.1-magellan/Makefile.in	2012-12-21 16:19:29.701287006 +0100
@@ -37,7 +37,7 @@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/libotr.pc.in $(top_srcdir)/configure AUTHORS COPYING \
+	$(srcdir)/libotr3.pc.in $(top_srcdir)/configure AUTHORS COPYING \
 	COPYING.LIB ChangeLog INSTALL NEWS config.guess config.sub \
 	depcomp install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -48,7 +48,7 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = libotr.pc
+CONFIG_CLEAN_FILES = libotr3.pc
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
@@ -162,7 +162,7 @@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
 LIBOBJS = @LIBOBJS@
-LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@
+LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -243,11 +243,11 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = src toolkit
-EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr.m4 libotr.pc.in
+EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr3.m4 libotr3.pc.in
 aclocaldir = $(datadir)/aclocal
-aclocal_DATA = libotr.m4
+aclocal_DATA = libotr3.m4
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libotr.pc
+pkgconfig_DATA = libotr3.pc
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -303,7 +303,7 @@
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-libotr.pc: $(top_builddir)/config.status $(srcdir)/libotr.pc.in
+libotr3.pc: $(top_builddir)/config.status $(srcdir)/libotr3.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
diff -Naur libotr-3.2.1/configure.ac libotr-3.2.1-magellan/configure.ac
--- libotr-3.2.1/configure.ac	2012-08-14 15:01:57.000000000 +0200
+++ libotr-3.2.1-magellan/configure.ac	2012-12-21 16:00:28.734986985 +0100
@@ -6,20 +6,20 @@
 
 dnl Notes on version numbering:
 dnl   For an implementation-only change:
-dnl     Change the libotr package version from a.b.c to a.b.(c+1)
-dnl     Change the libotr libtool version from x:y:z to x:(y+1):z
+dnl     Change the libotr3 package version from a.b.c to a.b.(c+1)
+dnl     Change the libotr3 libtool version from x:y:z to x:(y+1):z
 dnl   For a backwards-compatible API change (e.g. adding functions):
-dnl     Change the libotr package version from a.b.c to a.(b+1).0
-dnl     Change the libotr libtool version from x:y:z to (x+1):0:(z+1)
+dnl     Change the libotr3 package version from a.b.c to a.(b+1).0
+dnl     Change the libotr3 libtool version from x:y:z to (x+1):0:(z+1)
 dnl       [Note that this does *not* change the major number of the .so.]
 dnl   For a backwards-incompatible API change (e.g. changing data structures):
-dnl     Change the libotr package version from a.b.c to (a+1).0.0
-dnl     Change the libotr libtool version from x:y:z to (x+1):0:0
+dnl     Change the libotr3 package version from a.b.c to (a+1).0.0
+dnl     Change the libotr3 libtool version from x:y:z to (x+1):0:0
 
-AM_INIT_AUTOMAKE(libotr, 3.2.1)
-LIBOTR_LIBTOOL_VERSION="4:1:2"
+AM_INIT_AUTOMAKE(libotr3, 3.2.1)
+LIBOTR3_LIBTOOL_VERSION="4:1:2"
 
-AC_SUBST(LIBOTR_LIBTOOL_VERSION)
+AC_SUBST(LIBOTR3_LIBTOOL_VERSION)
 
 AC_PROG_CC
 
@@ -27,5 +27,5 @@
 
 AM_PATH_LIBGCRYPT(1:1.2.0,,AC_MSG_ERROR(libgcrypt 1.2.0 or newer is required.))
 
-AC_OUTPUT([Makefile src/Makefile toolkit/Makefile libotr.pc])
+AC_OUTPUT([Makefile src/Makefile toolkit/Makefile libotr3.pc])
 
diff -Naur libotr-3.2.1/libotr.m4 libotr-3.2.1-magellan/libotr.m4
--- libotr-3.2.1/libotr.m4	2012-08-14 14:15:56.000000000 +0200
+++ libotr-3.2.1-magellan/libotr.m4	2012-12-21 16:17:42.821253768 +0100
@@ -17,10 +17,10 @@
 dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 dnl
 
-dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate.
-dnl enables arguments --with-libotr-prefix=
-dnl                   --with-libotr-inc-prefix=
+dnl AM_PATH_LIBOTR3([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for libotr3, and define LIBOTR3_CFLAGS and LIBOTR3_LIBS as appropriate.
+dnl enables arguments --with-libotr3-prefix=
+dnl                   --with-libotr3-inc-prefix=
 dnl
 dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT
 dnl
@@ -29,73 +29,73 @@
 dnl      Christopher Lansdown <lansdoct@cs.alfred.edu>
 dnl      Jaroslav Kysela <perex@suse.cz>
 
-AC_DEFUN([AM_PATH_LIBOTR],
+AC_DEFUN([AM_PATH_LIBOTR3],
 [dnl Save the original CFLAGS, LDFLAGS, and LIBS
-libotr_save_CFLAGS="$CFLAGS"
-libotr_save_LDFLAGS="$LDFLAGS"
-libotr_save_LIBS="$LIBS"
-libotr_found=yes
+libotr3_save_CFLAGS="$CFLAGS"
+libotr3_save_LDFLAGS="$LDFLAGS"
+libotr3_save_LIBS="$LIBS"
+libotr3_found=yes
 
 dnl
-dnl Get the cflags and libraries for libotr
+dnl Get the cflags and libraries for libotr3
 dnl
-AC_ARG_WITH(libotr-prefix,
-[  --with-libotr-prefix=PFX  Prefix where libotr is installed(optional)],
-[libotr_prefix="$withval"], [libotr_prefix=""])
-
-AC_ARG_WITH(libotr-inc-prefix,
-[  --with-libotr-inc-prefix=PFX  Prefix where libotr includes are (optional)],
-[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""])
+AC_ARG_WITH(libotr3-prefix,
+[  --with-libotr3-prefix=PFX  Prefix where libotr3 is installed(optional)],
+[libotr3_prefix="$withval"], [libotr3_prefix=""])
+
+AC_ARG_WITH(libotr3-inc-prefix,
+[  --with-libotr3-inc-prefix=PFX  Prefix where libotr3 includes are (optional)],
+[libotr3_inc_prefix="$withval"], [libotr3_inc_prefix=""])
 
 dnl Add any special include directories
-AC_MSG_CHECKING(for libotr CFLAGS)
-if test "$libotr_inc_prefix" != "" ; then
-	LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix"
-	CFLAGS="$CFLAGS $LIBOTR_CFLAGS"
+AC_MSG_CHECKING(for libotr3 CFLAGS)
+if test "$libotr3_inc_prefix" != "" ; then
+	LIBOTR3_CFLAGS="$LIBOTR3_CFLAGS -I$libotr3_inc_prefix"
+	CFLAGS="$CFLAGS $LIBOTR3_CFLAGS"
 fi
-AC_MSG_RESULT($LIBOTR_CFLAGS)
+AC_MSG_RESULT($LIBOTR3_CFLAGS)
 
 dnl add any special lib dirs
-AC_MSG_CHECKING(for libotr LIBS)
-if test "$libotr_prefix" != "" ; then
-	LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix"
-	LDFLAGS="$LDFLAGS $LIBOTR_LIBS"
+AC_MSG_CHECKING(for libotr3 LIBS)
+if test "$libotr3_prefix" != "" ; then
+	LIBOTR3_LIBS="$LIBOTR3_LIBS -L$libotr3_prefix"
+	LDFLAGS="$LDFLAGS $LIBOTR3_LIBS"
 fi
 
-dnl add the libotr library
-LIBOTR_LIBS="$LIBOTR_LIBS -lotr"
-LIBS="$LIBOTR_LIBS $LIBS"
-AC_MSG_RESULT($LIBOTR_LIBS)
-
-dnl Check for a working version of libotr that is of the right version.
-min_libotr_version=ifelse([$1], ,3.0.0,$1)
-no_libotr=""
-    libotr_min_major_version=`echo $min_libotr_version | \
+dnl add the libotr3 library
+LIBOTR3_LIBS="$LIBOTR3_LIBS -lotr3"
+LIBS="$LIBOTR3_LIBS $LIBS"
+AC_MSG_RESULT($LIBOTR3_LIBS)
+
+dnl Check for a working version of libotr3 that is of the right version.
+min_libotr3_version=ifelse([$1], ,3.0.0,$1)
+no_libotr3=""
+    libotr3_min_major_version=`echo $min_libotr3_version | \
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    libotr_min_minor_version=`echo $min_libotr_version | \
+    libotr3_min_minor_version=`echo $min_libotr3_version | \
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    libotr_min_sub_version=`echo $min_libotr_version | \
+    libotr3_min_sub_version=`echo $min_libotr3_version | \
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version)
+AC_MSG_CHECKING(for libotr3 headers version $libotr3_min_major_version.x >= $min_libotr3_version)
 
 AC_LANG_SAVE
 AC_LANG_C
 AC_TRY_COMPILE([
 #include <stdlib.h>
-#include <libotr/version.h>
+#include <libotr3/version.h>
 ], [
-#  if(OTRL_VERSION_MAJOR != $libotr_min_major_version)
+#  if(OTRL_VERSION_MAJOR != $libotr3_min_major_version)
 #    error not present
 #  else
 
-#    if(OTRL_VERSION_MINOR > $libotr_min_minor_version)
+#    if(OTRL_VERSION_MINOR > $libotr3_min_minor_version)
        exit(0);
 #    else
-#      if(OTRL_VERSION_MINOR < $libotr_min_minor_version)
+#      if(OTRL_VERSION_MINOR < $libotr3_min_minor_version)
 #        error not present
 #      endif
 
-#      if(OTRL_VERSION_SUB < $libotr_min_sub_version)
+#      if(OTRL_VERSION_SUB < $libotr3_min_sub_version)
 #        error not present
 #      endif
 #    endif
@@ -104,31 +104,31 @@
 ],
   [AC_MSG_RESULT(found.)],
   [AC_MSG_RESULT(not present.)
-   ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)])
-   libotr_found=no]
+   ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr3 not found.)])
+   libotr3_found=no]
 )
 AC_LANG_RESTORE
 
 dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
-AC_CHECK_LIB([otr], [otrl_message_receiving],,
-	[ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)])
-	 libotr_found=no],
+AC_CHECK_LIB([otr3], [otrl_message_receiving],,
+	[ifelse([$3], , [AC_MSG_ERROR(No linkable libotr3 was found.)])
+	 libotr3_found=no],
 	 $LIBGCRYPT_LIBS
 )
 
-LDFLAGS="$libotr_save_LDFLAGS"
-LIBS="$libotr_save_LIBS"
+LDFLAGS="$libotr3_save_LDFLAGS"
+LIBS="$libotr3_save_LIBS"
 
-if test "x$libotr_found" = "xyes" ; then
+if test "x$libotr3_found" = "xyes" ; then
    ifelse([$2], , :, [$2])
 else
-   LIBOTR_CFLAGS=""
-   LIBOTR_LIBS=""
+   LIBOTR3_CFLAGS=""
+   LIBOTR3_LIBS=""
    ifelse([$3], , :, [$3])
 fi
 
 dnl That should be it.  Now just export our symbols:
-AC_SUBST(LIBOTR_CFLAGS)
-AC_SUBST(LIBOTR_LIBS)
+AC_SUBST(LIBOTR3_CFLAGS)
+AC_SUBST(LIBOTR3_LIBS)
 ])
 
diff -Naur libotr-3.2.1/libotr.pc.in libotr-3.2.1-magellan/libotr.pc.in
--- libotr-3.2.1/libotr.pc.in	2012-08-14 14:15:56.000000000 +0200
+++ libotr-3.2.1-magellan/libotr.pc.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libotr
-Description: Off-the-Record Messaging Library
-Version: 3.1.0
-URL: http://otr.cypherpunks.ca/
-Libs: -L${libdir} -lotr
-Cflags: -I${includedir}
diff -Naur libotr-3.2.1/libotr3.pc.in libotr-3.2.1-magellan/libotr3.pc.in
--- libotr-3.2.1/libotr3.pc.in	1970-01-01 01:00:00.000000000 +0100
+++ libotr-3.2.1-magellan/libotr3.pc.in	2012-12-21 16:01:02.654995318 +0100
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libotr3
+Description: Off-the-Record Messaging Library
+Version: 3.1.0
+URL: http://otr.cypherpunks.ca/
+Libs: -L${libdir} -lotr3
+Cflags: -I${includedir}
diff -Naur libotr-3.2.1/src/Makefile.am libotr-3.2.1-magellan/src/Makefile.am
--- libotr-3.2.1/src/Makefile.am	2012-08-14 14:15:56.000000000 +0200
+++ libotr-3.2.1-magellan/src/Makefile.am	2012-12-21 16:20:24.685302839 +0100
@@ -1,13 +1,13 @@
 INCLUDES = @LIBGCRYPT_CFLAGS@
 
-lib_LTLIBRARIES = libotr.la
+lib_LTLIBRARIES = libotr3.la
 
-libotr_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \
+libotr3_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \
 		    userstate.c tlv.c auth.c sm.c
 
-libotr_la_LDFLAGS = -version-info @LIBOTR_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@
+libotr3_la_LDFLAGS = -version-info @LIBOTR3_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@
 
-otrincdir = $(includedir)/libotr
+otrincdir = $(includedir)/libotr3
 
 otrinc_HEADERS = b64.h context.h dh.h mem.h message.h privkey.h proto.h \
 		 version.h userstate.h tlv.h serial.h auth.h sm.h privkey-t.h
diff -Naur libotr-3.2.1/src/Makefile.in libotr-3.2.1-magellan/src/Makefile.in
--- libotr-3.2.1/src/Makefile.in	2012-08-14 15:02:04.000000000 +0200
+++ libotr-3.2.1-magellan/src/Makefile.in	2012-12-21 16:22:19.721334893 +0100
@@ -69,13 +69,13 @@
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(otrincdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libotr_la_LIBADD =
-am_libotr_la_OBJECTS = privkey.lo context.lo proto.lo b64.lo dh.lo \
+libotr3_la_LIBADD =
+am_libotr3_la_OBJECTS = privkey.lo context.lo proto.lo b64.lo dh.lo \
 	mem.lo message.lo userstate.lo tlv.lo auth.lo sm.lo
-libotr_la_OBJECTS = $(am_libotr_la_OBJECTS)
-libotr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+libotr3_la_OBJECTS = $(am_libotr3_la_OBJECTS)
+libotr3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libotr_la_LDFLAGS) $(LDFLAGS) -o $@
+	$(libotr3_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -89,8 +89,8 @@
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(libotr_la_SOURCES)
-DIST_SOURCES = $(libotr_la_SOURCES)
+SOURCES = $(libotr3_la_SOURCES)
+DIST_SOURCES = $(libotr3_la_SOURCES)
 HEADERS = $(otrinc_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -130,7 +130,7 @@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
 LIBOBJS = @LIBOBJS@
-LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@
+LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -211,12 +211,12 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INCLUDES = @LIBGCRYPT_CFLAGS@
-lib_LTLIBRARIES = libotr.la
-libotr_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \
+lib_LTLIBRARIES = libotr3.la
+libotr3_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \
 		    userstate.c tlv.c auth.c sm.c
 
-libotr_la_LDFLAGS = -version-info @LIBOTR_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@
-otrincdir = $(includedir)/libotr
+libotr3_la_LDFLAGS = -version-info @LIBOTR3_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@
+otrincdir = $(includedir)/libotr3
 otrinc_HEADERS = b64.h context.h dh.h mem.h message.h privkey.h proto.h \
 		 version.h userstate.h tlv.h serial.h auth.h sm.h privkey-t.h
 
@@ -285,8 +285,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libotr.la: $(libotr_la_OBJECTS) $(libotr_la_DEPENDENCIES) 
-	$(libotr_la_LINK) -rpath $(libdir) $(libotr_la_OBJECTS) $(libotr_la_LIBADD) $(LIBS)
+libotr3.la: $(libotr3_la_OBJECTS) $(libotr3_la_DEPENDENCIES) 
+	$(libotr3_la_LINK) -rpath $(libdir) $(libotr3_la_OBJECTS) $(libotr3_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
diff -Naur libotr-3.2.1/toolkit/Makefile.am libotr-3.2.1-magellan/toolkit/Makefile.am
--- libotr-3.2.1/toolkit/Makefile.am	2012-05-03 15:52:22.000000000 +0200
+++ libotr-3.2.1-magellan/toolkit/Makefile.am	2012-12-21 16:23:21.561353776 +0100
@@ -6,7 +6,7 @@
 	otr_modify otr_remac
 
 COMMON_S = parse.c sha1hmac.c
-COMMON_LD = ../src/libotr.la @LIBS@ @LIBGCRYPT_LIBS@
+COMMON_LD = ../src/libotr3.la @LIBS@ @LIBGCRYPT_LIBS@
 
 otr_parse_SOURCES = otr_parse.c readotr.c $(COMMON_S)
 otr_parse_LDADD = $(COMMON_LD)
diff -Naur libotr-3.2.1/toolkit/Makefile.in libotr-3.2.1-magellan/toolkit/Makefile.in
--- libotr-3.2.1/toolkit/Makefile.in	2012-08-14 15:02:04.000000000 +0200
+++ libotr-3.2.1-magellan/toolkit/Makefile.in	2012-12-21 16:25:16.011383871 +0100
@@ -55,7 +55,7 @@
 am_otr_mackey_OBJECTS = otr_mackey.$(OBJEXT) sesskeys.$(OBJEXT) \
 	$(am__objects_1)
 otr_mackey_OBJECTS = $(am_otr_mackey_OBJECTS)
-am__DEPENDENCIES_1 = ../src/libotr.la
+am__DEPENDENCIES_1 = ../src/libotr3.la
 otr_mackey_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_otr_modify_OBJECTS = otr_modify.$(OBJEXT) readotr.$(OBJEXT) \
 	$(am__objects_1)
@@ -159,7 +159,7 @@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
 LIBOBJS = @LIBOBJS@
-LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@
+LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -242,7 +242,7 @@
 INCLUDES = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@
 noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h
 COMMON_S = parse.c sha1hmac.c
-COMMON_LD = ../src/libotr.la @LIBS@ @LIBGCRYPT_LIBS@
+COMMON_LD = ../src/libotr3.la @LIBS@ @LIBGCRYPT_LIBS@
 otr_parse_SOURCES = otr_parse.c readotr.c $(COMMON_S)
 otr_parse_LDADD = $(COMMON_LD)
 otr_sesskeys_SOURCES = otr_sesskeys.c sesskeys.c $(COMMON_S)
1	niro	1999	diff -Naur libotr-3.2.1/Makefile.am libotr-3.2.1-magellan/Makefile.am
2			--- libotr-3.2.1/Makefile.am 2012-08-14 14:15:56.000000000 +0200
3			+++ libotr-3.2.1-magellan/Makefile.am 2012-12-21 16:19:03.804279602 +0100
4			@@ -1,9 +1,9 @@
5			SUBDIRS = src toolkit
6
7			-EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr.m4 libotr.pc.in
8			+EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr3.m4 libotr3.pc.in
9
10			aclocaldir = $(datadir)/aclocal
11			-aclocal_DATA = libotr.m4
12			+aclocal_DATA = libotr3.m4
13
14			pkgconfigdir = $(libdir)/pkgconfig
15			-pkgconfig_DATA = libotr.pc
16			+pkgconfig_DATA = libotr3.pc
17			diff -Naur libotr-3.2.1/Makefile.in libotr-3.2.1-magellan/Makefile.in
18			--- libotr-3.2.1/Makefile.in 2012-08-14 15:02:04.000000000 +0200
19			+++ libotr-3.2.1-magellan/Makefile.in 2012-12-21 16:19:29.701287006 +0100
20			@@ -37,7 +37,7 @@
21			subdir = .
22			DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
23			$(srcdir)/Makefile.in $(srcdir)/config.h.in \
24			- $(srcdir)/libotr.pc.in $(top_srcdir)/configure AUTHORS COPYING \
25			+ $(srcdir)/libotr3.pc.in $(top_srcdir)/configure AUTHORS COPYING \
26			COPYING.LIB ChangeLog INSTALL NEWS config.guess config.sub \
27			depcomp install-sh ltmain.sh missing
28			ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
29			@@ -48,7 +48,7 @@
30			configure.lineno config.status.lineno
31			mkinstalldirs = $(install_sh) -d
32			CONFIG_HEADER = config.h
33			-CONFIG_CLEAN_FILES = libotr.pc
34			+CONFIG_CLEAN_FILES = libotr3.pc
35			CONFIG_CLEAN_VPATH_FILES =
36			SOURCES =
37			DIST_SOURCES =
38			@@ -162,7 +162,7 @@
39			LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
40			LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
41			LIBOBJS = @LIBOBJS@
42			-LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@
43			+LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@
44			LIBS = @LIBS@
45			LIBTOOL = @LIBTOOL@
46			LIPO = @LIPO@
47			@@ -243,11 +243,11 @@
48			top_builddir = @top_builddir@
49			top_srcdir = @top_srcdir@
50			SUBDIRS = src toolkit
51			-EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr.m4 libotr.pc.in
52			+EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr3.m4 libotr3.pc.in
53			aclocaldir = $(datadir)/aclocal
54			-aclocal_DATA = libotr.m4
55			+aclocal_DATA = libotr3.m4
56			pkgconfigdir = $(libdir)/pkgconfig
57			-pkgconfig_DATA = libotr.pc
58			+pkgconfig_DATA = libotr3.pc
59			all: config.h
60			$(MAKE) $(AM_MAKEFLAGS) all-recursive
61
62			@@ -303,7 +303,7 @@
63
64			distclean-hdr:
65			-rm -f config.h stamp-h1
66			-libotr.pc: $(top_builddir)/config.status $(srcdir)/libotr.pc.in
67			+libotr3.pc: $(top_builddir)/config.status $(srcdir)/libotr3.pc.in
68			cd $(top_builddir) && $(SHELL) ./config.status $@
69
70			mostlyclean-libtool:
71			diff -Naur libotr-3.2.1/configure.ac libotr-3.2.1-magellan/configure.ac
72			--- libotr-3.2.1/configure.ac 2012-08-14 15:01:57.000000000 +0200
73			+++ libotr-3.2.1-magellan/configure.ac 2012-12-21 16:00:28.734986985 +0100
74			@@ -6,20 +6,20 @@
75
76			dnl Notes on version numbering:
77			dnl For an implementation-only change:
78			-dnl Change the libotr package version from a.b.c to a.b.(c+1)
79			-dnl Change the libotr libtool version from x:y:z to x:(y+1):z
80			+dnl Change the libotr3 package version from a.b.c to a.b.(c+1)
81			+dnl Change the libotr3 libtool version from x:y:z to x:(y+1):z
82			dnl For a backwards-compatible API change (e.g. adding functions):
83			-dnl Change the libotr package version from a.b.c to a.(b+1).0
84			-dnl Change the libotr libtool version from x:y:z to (x+1):0:(z+1)
85			+dnl Change the libotr3 package version from a.b.c to a.(b+1).0
86			+dnl Change the libotr3 libtool version from x:y:z to (x+1):0:(z+1)
87			dnl [Note that this does not change the major number of the .so.]
88			dnl For a backwards-incompatible API change (e.g. changing data structures):
89			-dnl Change the libotr package version from a.b.c to (a+1).0.0
90			-dnl Change the libotr libtool version from x:y:z to (x+1):0:0
91			+dnl Change the libotr3 package version from a.b.c to (a+1).0.0
92			+dnl Change the libotr3 libtool version from x:y:z to (x+1):0:0
93
94			-AM_INIT_AUTOMAKE(libotr, 3.2.1)
95			-LIBOTR_LIBTOOL_VERSION="4:1:2"
96			+AM_INIT_AUTOMAKE(libotr3, 3.2.1)
97			+LIBOTR3_LIBTOOL_VERSION="4:1:2"
98
99			-AC_SUBST(LIBOTR_LIBTOOL_VERSION)
100			+AC_SUBST(LIBOTR3_LIBTOOL_VERSION)
101
102			AC_PROG_CC
103
104			@@ -27,5 +27,5 @@
105
106			AM_PATH_LIBGCRYPT(1:1.2.0,,AC_MSG_ERROR(libgcrypt 1.2.0 or newer is required.))
107
108			-AC_OUTPUT([Makefile src/Makefile toolkit/Makefile libotr.pc])
109			+AC_OUTPUT([Makefile src/Makefile toolkit/Makefile libotr3.pc])
110
111			diff -Naur libotr-3.2.1/libotr.m4 libotr-3.2.1-magellan/libotr.m4
112			--- libotr-3.2.1/libotr.m4 2012-08-14 14:15:56.000000000 +0200
113			+++ libotr-3.2.1-magellan/libotr.m4 2012-12-21 16:17:42.821253768 +0100
114			@@ -17,10 +17,10 @@
115			dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
116			dnl
117
118			-dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
119			-dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate.
120			-dnl enables arguments --with-libotr-prefix=
121			-dnl --with-libotr-inc-prefix=
122			+dnl AM_PATH_LIBOTR3([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
123			+dnl Test for libotr3, and define LIBOTR3_CFLAGS and LIBOTR3_LIBS as appropriate.
124			+dnl enables arguments --with-libotr3-prefix=
125			+dnl --with-libotr3-inc-prefix=
126			dnl
127			dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT
128			dnl
129			@@ -29,73 +29,73 @@
130			dnl Christopher Lansdown <lansdoct@cs.alfred.edu>
131			dnl Jaroslav Kysela <perex@suse.cz>
132
133			-AC_DEFUN([AM_PATH_LIBOTR],
134			+AC_DEFUN([AM_PATH_LIBOTR3],
135			[dnl Save the original CFLAGS, LDFLAGS, and LIBS
136			-libotr_save_CFLAGS="$CFLAGS"
137			-libotr_save_LDFLAGS="$LDFLAGS"
138			-libotr_save_LIBS="$LIBS"
139			-libotr_found=yes
140			+libotr3_save_CFLAGS="$CFLAGS"
141			+libotr3_save_LDFLAGS="$LDFLAGS"
142			+libotr3_save_LIBS="$LIBS"
143			+libotr3_found=yes
144
145			dnl
146			-dnl Get the cflags and libraries for libotr
147			+dnl Get the cflags and libraries for libotr3
148			dnl
149			-AC_ARG_WITH(libotr-prefix,
150			-[ --with-libotr-prefix=PFX Prefix where libotr is installed(optional)],
151			-[libotr_prefix="$withval"], [libotr_prefix=""])
152			-
153			-AC_ARG_WITH(libotr-inc-prefix,
154			-[ --with-libotr-inc-prefix=PFX Prefix where libotr includes are (optional)],
155			-[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""])
156			+AC_ARG_WITH(libotr3-prefix,
157			+[ --with-libotr3-prefix=PFX Prefix where libotr3 is installed(optional)],
158			+[libotr3_prefix="$withval"], [libotr3_prefix=""])
159			+
160			+AC_ARG_WITH(libotr3-inc-prefix,
161			+[ --with-libotr3-inc-prefix=PFX Prefix where libotr3 includes are (optional)],
162			+[libotr3_inc_prefix="$withval"], [libotr3_inc_prefix=""])
163
164			dnl Add any special include directories
165			-AC_MSG_CHECKING(for libotr CFLAGS)
166			-if test "$libotr_inc_prefix" != "" ; then
167			- LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix"
168			- CFLAGS="$CFLAGS $LIBOTR_CFLAGS"
169			+AC_MSG_CHECKING(for libotr3 CFLAGS)
170			+if test "$libotr3_inc_prefix" != "" ; then
171			+ LIBOTR3_CFLAGS="$LIBOTR3_CFLAGS -I$libotr3_inc_prefix"
172			+ CFLAGS="$CFLAGS $LIBOTR3_CFLAGS"
173			fi
174			-AC_MSG_RESULT($LIBOTR_CFLAGS)
175			+AC_MSG_RESULT($LIBOTR3_CFLAGS)
176
177			dnl add any special lib dirs
178			-AC_MSG_CHECKING(for libotr LIBS)
179			-if test "$libotr_prefix" != "" ; then
180			- LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix"
181			- LDFLAGS="$LDFLAGS $LIBOTR_LIBS"
182			+AC_MSG_CHECKING(for libotr3 LIBS)
183			+if test "$libotr3_prefix" != "" ; then
184			+ LIBOTR3_LIBS="$LIBOTR3_LIBS -L$libotr3_prefix"
185			+ LDFLAGS="$LDFLAGS $LIBOTR3_LIBS"
186			fi
187
188			-dnl add the libotr library
189			-LIBOTR_LIBS="$LIBOTR_LIBS -lotr"
190			-LIBS="$LIBOTR_LIBS $LIBS"
191			-AC_MSG_RESULT($LIBOTR_LIBS)
192			-
193			-dnl Check for a working version of libotr that is of the right version.
194			-min_libotr_version=ifelse([$1], ,3.0.0,$1)
195			-no_libotr=""
196			- libotr_min_major_version=`echo $min_libotr_version \| \
197			+dnl add the libotr3 library
198			+LIBOTR3_LIBS="$LIBOTR3_LIBS -lotr3"
199			+LIBS="$LIBOTR3_LIBS $LIBS"
200			+AC_MSG_RESULT($LIBOTR3_LIBS)
201			+
202			+dnl Check for a working version of libotr3 that is of the right version.
203			+min_libotr3_version=ifelse([$1], ,3.0.0,$1)
204			+no_libotr3=""
205			+ libotr3_min_major_version=`echo $min_libotr3_version \| \
206			sed 's/\([[0-9]]\).\([[0-9]]\).\([[0-9]]*\)/\1/'`
207			- libotr_min_minor_version=`echo $min_libotr_version \| \
208			+ libotr3_min_minor_version=`echo $min_libotr3_version \| \
209			sed 's/\([[0-9]]\).\([[0-9]]\).\([[0-9]]*\)/\2/'`
210			- libotr_min_sub_version=`echo $min_libotr_version \| \
211			+ libotr3_min_sub_version=`echo $min_libotr3_version \| \
212			sed 's/\([[0-9]]\).\([[0-9]]\).\([[0-9]]*\)/\3/'`
213			-AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version)
214			+AC_MSG_CHECKING(for libotr3 headers version $libotr3_min_major_version.x >= $min_libotr3_version)
215
216			AC_LANG_SAVE
217			AC_LANG_C
218			AC_TRY_COMPILE([
219			#include <stdlib.h>
220			-#include <libotr/version.h>
221			+#include <libotr3/version.h>
222			], [
223			-# if(OTRL_VERSION_MAJOR != $libotr_min_major_version)
224			+# if(OTRL_VERSION_MAJOR != $libotr3_min_major_version)
225			# error not present
226			# else
227
228			-# if(OTRL_VERSION_MINOR > $libotr_min_minor_version)
229			+# if(OTRL_VERSION_MINOR > $libotr3_min_minor_version)
230			exit(0);
231			# else
232			-# if(OTRL_VERSION_MINOR < $libotr_min_minor_version)
233			+# if(OTRL_VERSION_MINOR < $libotr3_min_minor_version)
234			# error not present
235			# endif
236
237			-# if(OTRL_VERSION_SUB < $libotr_min_sub_version)
238			+# if(OTRL_VERSION_SUB < $libotr3_min_sub_version)
239			# error not present
240			# endif
241			# endif
242			@@ -104,31 +104,31 @@
243			],
244			[AC_MSG_RESULT(found.)],
245			[AC_MSG_RESULT(not present.)
246			- ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)])
247			- libotr_found=no]
248			+ ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr3 not found.)])
249			+ libotr3_found=no]
250			)
251			AC_LANG_RESTORE
252
253			dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
254			-AC_CHECK_LIB([otr], [otrl_message_receiving],,
255			- [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)])
256			- libotr_found=no],
257			+AC_CHECK_LIB([otr3], [otrl_message_receiving],,
258			+ [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr3 was found.)])
259			+ libotr3_found=no],
260			$LIBGCRYPT_LIBS
261			)
262
263			-LDFLAGS="$libotr_save_LDFLAGS"
264			-LIBS="$libotr_save_LIBS"
265			+LDFLAGS="$libotr3_save_LDFLAGS"
266			+LIBS="$libotr3_save_LIBS"
267
268			-if test "x$libotr_found" = "xyes" ; then
269			+if test "x$libotr3_found" = "xyes" ; then
270			ifelse([$2], , :, [$2])
271			else
272			- LIBOTR_CFLAGS=""
273			- LIBOTR_LIBS=""
274			+ LIBOTR3_CFLAGS=""
275			+ LIBOTR3_LIBS=""
276			ifelse([$3], , :, [$3])
277			fi
278
279			dnl That should be it. Now just export our symbols:
280			-AC_SUBST(LIBOTR_CFLAGS)
281			-AC_SUBST(LIBOTR_LIBS)
282			+AC_SUBST(LIBOTR3_CFLAGS)
283			+AC_SUBST(LIBOTR3_LIBS)
284			])
285
286			diff -Naur libotr-3.2.1/libotr.pc.in libotr-3.2.1-magellan/libotr.pc.in
287			--- libotr-3.2.1/libotr.pc.in 2012-08-14 14:15:56.000000000 +0200
288			+++ libotr-3.2.1-magellan/libotr.pc.in 1970-01-01 01:00:00.000000000 +0100
289			@@ -1,11 +0,0 @@
290			-prefix=@prefix@
291			-exec_prefix=@exec_prefix@
292			-libdir=@libdir@
293			-includedir=@includedir@
294			-
295			-Name: libotr
296			-Description: Off-the-Record Messaging Library
297			-Version: 3.1.0
298			-URL: http://otr.cypherpunks.ca/
299			-Libs: -L${libdir} -lotr
300			-Cflags: -I${includedir}
301			diff -Naur libotr-3.2.1/libotr3.pc.in libotr-3.2.1-magellan/libotr3.pc.in
302			--- libotr-3.2.1/libotr3.pc.in 1970-01-01 01:00:00.000000000 +0100
303			+++ libotr-3.2.1-magellan/libotr3.pc.in 2012-12-21 16:01:02.654995318 +0100
304			@@ -0,0 +1,11 @@
305			+prefix=@prefix@
306			+exec_prefix=@exec_prefix@
307			+libdir=@libdir@
308			+includedir=@includedir@
309			+
310			+Name: libotr3
311			+Description: Off-the-Record Messaging Library
312			+Version: 3.1.0
313			+URL: http://otr.cypherpunks.ca/
314			+Libs: -L${libdir} -lotr3
315			+Cflags: -I${includedir}
316			diff -Naur libotr-3.2.1/src/Makefile.am libotr-3.2.1-magellan/src/Makefile.am
317			--- libotr-3.2.1/src/Makefile.am 2012-08-14 14:15:56.000000000 +0200
318			+++ libotr-3.2.1-magellan/src/Makefile.am 2012-12-21 16:20:24.685302839 +0100
319			@@ -1,13 +1,13 @@
320			INCLUDES = @LIBGCRYPT_CFLAGS@
321
322			-lib_LTLIBRARIES = libotr.la
323			+lib_LTLIBRARIES = libotr3.la
324
325			-libotr_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \
326			+libotr3_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \
327			userstate.c tlv.c auth.c sm.c
328
329			-libotr_la_LDFLAGS = -version-info @LIBOTR_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@
330			+libotr3_la_LDFLAGS = -version-info @LIBOTR3_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@
331
332			-otrincdir = $(includedir)/libotr
333			+otrincdir = $(includedir)/libotr3
334
335			otrinc_HEADERS = b64.h context.h dh.h mem.h message.h privkey.h proto.h \
336			version.h userstate.h tlv.h serial.h auth.h sm.h privkey-t.h
337			diff -Naur libotr-3.2.1/src/Makefile.in libotr-3.2.1-magellan/src/Makefile.in
338			--- libotr-3.2.1/src/Makefile.in 2012-08-14 15:02:04.000000000 +0200
339			+++ libotr-3.2.1-magellan/src/Makefile.in 2012-12-21 16:22:19.721334893 +0100
340			@@ -69,13 +69,13 @@
341			sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
342			am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(otrincdir)"
343			LTLIBRARIES = $(lib_LTLIBRARIES)
344			-libotr_la_LIBADD =
345			-am_libotr_la_OBJECTS = privkey.lo context.lo proto.lo b64.lo dh.lo \
346			+libotr3_la_LIBADD =
347			+am_libotr3_la_OBJECTS = privkey.lo context.lo proto.lo b64.lo dh.lo \
348			mem.lo message.lo userstate.lo tlv.lo auth.lo sm.lo
349			-libotr_la_OBJECTS = $(am_libotr_la_OBJECTS)
350			-libotr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
351			+libotr3_la_OBJECTS = $(am_libotr3_la_OBJECTS)
352			+libotr3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
353			$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
354			- $(libotr_la_LDFLAGS) $(LDFLAGS) -o $@
355			+ $(libotr3_la_LDFLAGS) $(LDFLAGS) -o $@
356			DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
357			depcomp = $(SHELL) $(top_srcdir)/depcomp
358			am__depfiles_maybe = depfiles
359			@@ -89,8 +89,8 @@
360			LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
361			--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
362			$(LDFLAGS) -o $@
363			-SOURCES = $(libotr_la_SOURCES)
364			-DIST_SOURCES = $(libotr_la_SOURCES)
365			+SOURCES = $(libotr3_la_SOURCES)
366			+DIST_SOURCES = $(libotr3_la_SOURCES)
367			HEADERS = $(otrinc_HEADERS)
368			ETAGS = etags
369			CTAGS = ctags
370			@@ -130,7 +130,7 @@
371			LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
372			LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
373			LIBOBJS = @LIBOBJS@
374			-LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@
375			+LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@
376			LIBS = @LIBS@
377			LIBTOOL = @LIBTOOL@
378			LIPO = @LIPO@
379			@@ -211,12 +211,12 @@
380			top_builddir = @top_builddir@
381			top_srcdir = @top_srcdir@
382			INCLUDES = @LIBGCRYPT_CFLAGS@
383			-lib_LTLIBRARIES = libotr.la
384			-libotr_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \
385			+lib_LTLIBRARIES = libotr3.la
386			+libotr3_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \
387			userstate.c tlv.c auth.c sm.c
388
389			-libotr_la_LDFLAGS = -version-info @LIBOTR_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@
390			-otrincdir = $(includedir)/libotr
391			+libotr3_la_LDFLAGS = -version-info @LIBOTR3_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@
392			+otrincdir = $(includedir)/libotr3
393			otrinc_HEADERS = b64.h context.h dh.h mem.h message.h privkey.h proto.h \
394			version.h userstate.h tlv.h serial.h auth.h sm.h privkey-t.h
395
396			@@ -285,8 +285,8 @@
397			echo "rm -f \"$${dir}/so_locations\""; \
398			rm -f "$${dir}/so_locations"; \
399			done
400			-libotr.la: $(libotr_la_OBJECTS) $(libotr_la_DEPENDENCIES)
401			- $(libotr_la_LINK) -rpath $(libdir) $(libotr_la_OBJECTS) $(libotr_la_LIBADD) $(LIBS)
402			+libotr3.la: $(libotr3_la_OBJECTS) $(libotr3_la_DEPENDENCIES)
403			+ $(libotr3_la_LINK) -rpath $(libdir) $(libotr3_la_OBJECTS) $(libotr3_la_LIBADD) $(LIBS)
404
405			mostlyclean-compile:
406			-rm -f *.$(OBJEXT)
407			diff -Naur libotr-3.2.1/toolkit/Makefile.am libotr-3.2.1-magellan/toolkit/Makefile.am
408			--- libotr-3.2.1/toolkit/Makefile.am 2012-05-03 15:52:22.000000000 +0200
409			+++ libotr-3.2.1-magellan/toolkit/Makefile.am 2012-12-21 16:23:21.561353776 +0100
410			@@ -6,7 +6,7 @@
411			otr_modify otr_remac
412
413			COMMON_S = parse.c sha1hmac.c
414			-COMMON_LD = ../src/libotr.la @LIBS@ @LIBGCRYPT_LIBS@
415			+COMMON_LD = ../src/libotr3.la @LIBS@ @LIBGCRYPT_LIBS@
416
417			otr_parse_SOURCES = otr_parse.c readotr.c $(COMMON_S)
418			otr_parse_LDADD = $(COMMON_LD)
419			diff -Naur libotr-3.2.1/toolkit/Makefile.in libotr-3.2.1-magellan/toolkit/Makefile.in
420			--- libotr-3.2.1/toolkit/Makefile.in 2012-08-14 15:02:04.000000000 +0200
421			+++ libotr-3.2.1-magellan/toolkit/Makefile.in 2012-12-21 16:25:16.011383871 +0100
422			@@ -55,7 +55,7 @@
423			am_otr_mackey_OBJECTS = otr_mackey.$(OBJEXT) sesskeys.$(OBJEXT) \
424			$(am__objects_1)
425			otr_mackey_OBJECTS = $(am_otr_mackey_OBJECTS)
426			-am__DEPENDENCIES_1 = ../src/libotr.la
427			+am__DEPENDENCIES_1 = ../src/libotr3.la
428			otr_mackey_DEPENDENCIES = $(am__DEPENDENCIES_1)
429			am_otr_modify_OBJECTS = otr_modify.$(OBJEXT) readotr.$(OBJEXT) \
430			$(am__objects_1)
431			@@ -159,7 +159,7 @@
432			LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
433			LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
434			LIBOBJS = @LIBOBJS@
435			-LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@
436			+LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@
437			LIBS = @LIBS@
438			LIBTOOL = @LIBTOOL@
439			LIPO = @LIPO@
440			@@ -242,7 +242,7 @@
441			INCLUDES = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@
442			noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h
443			COMMON_S = parse.c sha1hmac.c
444			-COMMON_LD = ../src/libotr.la @LIBS@ @LIBGCRYPT_LIBS@
445			+COMMON_LD = ../src/libotr3.la @LIBS@ @LIBGCRYPT_LIBS@
446			otr_parse_SOURCES = otr_parse.c readotr.c $(COMMON_S)
447			otr_parse_LDADD = $(COMMON_LD)
448			otr_sesskeys_SOURCES = otr_sesskeys.c sesskeys.c $(COMMON_S)