summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
Diffstat (limited to 'chat')
-rw-r--r--chat/libotr/Makefile22
-rw-r--r--chat/libotr/PLIST4
-rw-r--r--chat/libotr/buildlink3.mk7
-rw-r--r--chat/libotr/distinfo8
4 files changed, 31 insertions, 10 deletions
diff --git a/chat/libotr/Makefile b/chat/libotr/Makefile
index 4f6ec80bf2f..b2b4c888203 100644
--- a/chat/libotr/Makefile
+++ b/chat/libotr/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2012/08/14 22:08:09 gdt Exp $
+# $NetBSD: Makefile,v 1.13 2012/09/06 00:23:18 gdt Exp $
-VERSION= 3.2.1
+VERSION= 4.0.0
DISTNAME= libotr-${VERSION}
CATEGORIES= chat security
MASTER_SITES= http://www.cypherpunks.ca/otr/
@@ -18,6 +18,24 @@ CONFIGURE_ARGS+= --with-pic
USE_LIBTOOL= yes
+# There's an apparent bug in gcc 4.1.3 on i386 (as shipped in
+# netbsd-5). With -O2 and the stack protector (SSP) feature, the
+# function otrl_auth_handle_revealsig is badly miscompiled.
+# Therefore, we turn down optimization, since that seems better than
+# turning off the stack protector.
+
+#Not apparently relevant, but makes -S output easier to follow.
+#CFLAGS+= -ggdb
+#A way to avoid the bug.
+#CFLAGS+= -O1
+
+# Avoid optimization/SSP bug.
+CONFIGURE_ARGS+= --disable-gcc-hardening
+
+# This seems irrelevant, but was on the list to check, and thus is
+# left as a hint to others.
+#CONFIGURE_ARGS+= --disable-linker-hardening
+
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../security/libgcrypt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/libotr/PLIST b/chat/libotr/PLIST
index f1c1b8fc388..de485e174d4 100644
--- a/chat/libotr/PLIST
+++ b/chat/libotr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:37:47 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/09/06 00:23:18 gdt Exp $
bin/otr_mackey
bin/otr_modify
bin/otr_parse
@@ -8,7 +8,9 @@ bin/otr_sesskeys
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
diff --git a/chat/libotr/buildlink3.mk b/chat/libotr/buildlink3.mk
index d8d5450e44f..85e2f4b5f9c 100644
--- a/chat/libotr/buildlink3.mk
+++ b/chat/libotr/buildlink3.mk
@@ -1,12 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.13 2012/05/07 01:53:17 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2012/09/06 00:23:18 gdt Exp $
BUILDLINK_TREE+= libotr
.if !defined(LIBOTR_BUILDLINK3_MK)
LIBOTR_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.libotr+= libotr>=3.0.0
-BUILDLINK_ABI_DEPENDS.libotr+= libotr>=3.2.0nb1
+# libotr 4 has backwards-incompatible API and ABI changes.
+BUILDLINK_API_DEPENDS.libotr+= libotr>=4.0.0
+BUILDLINK_ABI_DEPENDS.libotr+= libotr>=4.0.0
BUILDLINK_PKGSRCDIR.libotr?= ../../chat/libotr
.include "../../security/libgcrypt/buildlink3.mk"
diff --git a/chat/libotr/distinfo b/chat/libotr/distinfo
index b3f581e1b6c..185271ea140 100644
--- a/chat/libotr/distinfo
+++ b/chat/libotr/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2012/08/14 22:08:09 gdt Exp $
+$NetBSD: distinfo,v 1.9 2012/09/06 00:23:18 gdt Exp $
-SHA1 (libotr-3.2.1.tar.gz) = 898bf00d019f49ca34cd0116dd2e22685c67c394
-RMD160 (libotr-3.2.1.tar.gz) = 07deab0a7f63680e44c3a631666b9b4a21bd66cf
-Size (libotr-3.2.1.tar.gz) = 414684 bytes
+SHA1 (libotr-4.0.0.tar.gz) = 8865e9011b8674290837afcf7caf90c492ae09cc
+RMD160 (libotr-4.0.0.tar.gz) = 802147fa58437b7c971f0c62ea7781e783672e97
+Size (libotr-4.0.0.tar.gz) = 441441 bytes