Update to version 3.0.0

From Jason White, via PR pkg/32451

Changes:

- Support for OTR protocol version 2; will still interoperate with version 1
  clients (though with a warning to the user), fixes identity-binding flaw
  http://www.cypherpunks.ca/otr/Protocol-v2-3.0.0.html

5 files changed, 12 insertions, 63 deletions

diff --git a/chat/libotr/Makefile b/chat/libotr/Makefile
index 3cc056b36a4..8ff23131a53 100644
--- a/chat/libotr/Makefile
+++ b/chat/libotr/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:08:25 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/13 14:44:31 salo Exp $
 
-DISTNAME=	libotr-2.0.2
-PKGREVISION=	1
+DISTNAME=	libotr-3.0.0
 CATEGORIES=	chat security
 MASTER_SITES=	http://www.cypherpunks.ca/otr/
 
diff --git a/chat/libotr/PLIST b/chat/libotr/PLIST
index b9ee140b525..174d42bf47a 100644
--- a/chat/libotr/PLIST
+++ b/chat/libotr/PLIST
@@ -1,17 +1,20 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/03/24 21:24:13 nathanw Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/13 14:44:31 salo Exp $
 bin/otr_mackey
 bin/otr_modify
 bin/otr_parse
 bin/otr_readforge
 bin/otr_remac
 bin/otr_sesskeys
+include/libotr/auth.h
 include/libotr/b64.h
 include/libotr/context.h
 include/libotr/dh.h
 include/libotr/mem.h
 include/libotr/message.h
+include/libotr/privkey-t.h
 include/libotr/privkey.h
 include/libotr/proto.h
+include/libotr/serial.h
 include/libotr/tlv.h
 include/libotr/userstate.h
 include/libotr/version.h
diff --git a/chat/libotr/buildlink3.mk b/chat/libotr/buildlink3.mk
index 31d60a2ffb6..2825c07cb7d 100644
--- a/chat/libotr/buildlink3.mk
+++ b/chat/libotr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:25 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/02/13 14:44:31 salo Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBOTR_BUILDLINK3_MK:=	${LIBOTR_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibotr}
 BUILDLINK_PACKAGES+=	libotr
 
 .if !empty(LIBOTR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libotr+=	libotr>=2.0.1
-BUILDLINK_RECOMMENDED.libotr?=	libotr>=2.0.2nb1
+BUILDLINK_DEPENDS.libotr+=	libotr>=3.0.0
 BUILDLINK_PKGSRCDIR.libotr?=	../../chat/libotr
 .endif	# LIBOTR_BUILDLINK3_MK
 
diff --git a/chat/libotr/distinfo b/chat/libotr/distinfo
index f3af828ebf9..c08f78c425b 100644
--- a/chat/libotr/distinfo
+++ b/chat/libotr/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/07/30 21:30:53 rillig Exp $
+$NetBSD: distinfo,v 1.4 2006/02/13 14:44:31 salo Exp $
 
-SHA1 (libotr-2.0.2.tar.gz) = da8c0ce6bf23e65c094f003b8654f96be9c81b1b
-RMD160 (libotr-2.0.2.tar.gz) = 8f35c5ac0ce5743bca075eb517119a85fce5351d
-Size (libotr-2.0.2.tar.gz) = 368896 bytes
-SHA1 (patch-aa) = 5bd53e9eb7eeec29940debf63a0851c9197a5687
+SHA1 (libotr-3.0.0.tar.gz) = 5835acdf80549d1895a842245f99c559b5b9d6cd
+RMD160 (libotr-3.0.0.tar.gz) = 04574a468d096b23ad63ee026498ebe6b2a23ca1
+Size (libotr-3.0.0.tar.gz) = 392431 bytes
diff --git a/chat/libotr/patches/patch-aa b/chat/libotr/patches/patch-aa
deleted file mode 100644
index fff640cbfb9..00000000000
--- a/chat/libotr/patches/patch-aa
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/07/30 21:30:53 rillig Exp $
-
-Don't do arithmetic with void pointers.
-
---- src/mem.c.orig	Fri Jan 21 16:02:03 2005
-+++ src/mem.c	Sat Jul 30 23:28:10 2005
-@@ -63,7 +63,7 @@ static void *otrl_mem_malloc(size_t n)
-     ((size_t *)p)[1] = OTRL_MEM_MAGIC;
- #endif
- 
--    return (p + header_size);
-+    return (void *)((char *)p + header_size);
- }
- 
- static int otrl_mem_is_secure(const void *p)
-@@ -73,7 +73,7 @@ static int otrl_mem_is_secure(const void
- 
- static void otrl_mem_free(void *p)
- {
--    void *real_p = p - header_size;
-+    void *real_p = (void *)((char *)p - header_size);
-     size_t n = ((size_t *)real_p)[0];
- #ifdef OTRL_MEM_MAGIC
-     if (((size_t *)real_p)[1] != OTRL_MEM_MAGIC) {
-@@ -100,7 +100,7 @@ static void *otrl_mem_realloc(void *p, s
- 	otrl_mem_free(p);
- 	return NULL;
-     } else {
--	void *real_p = p - header_size;
-+	void *real_p = (void *)((char *)p - header_size);
- 	void *new_p;
- 	size_t old_n = ((size_t *)real_p)[0];
- #ifdef OTRL_MEM_MAGIC
-@@ -121,7 +121,7 @@ static void *otrl_mem_realloc(void *p, s
- 
- 	if (new_n < old_n) {
- 	    /* Overwrite the space we're about to stop using */
--	    void *p = real_p + new_n;
-+	    void *p = (void *)((char *)real_p + new_n);
- 	    size_t excess = old_n - new_n;
- 	    memset(p, 0xff, excess);
- 	    memset(p, 0xaa, excess);
-@@ -136,7 +136,7 @@ static void *otrl_mem_realloc(void *p, s
- 	}
- 
- 	((size_t *)new_p)[0] = new_n;  /* Includes header size */
--	return (new_p + header_size);
-+	return (void *)((char *)new_p + header_size);
-     }
- }
-