From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 02C7F1388BF for ; Wed, 6 Jan 2016 21:41:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77E1421C008; Wed, 6 Jan 2016 21:41:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0EB5721C008 for ; Wed, 6 Jan 2016 21:41:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B69D534092E for ; Wed, 6 Jan 2016 21:41:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3462612C for ; Wed, 6 Jan 2016 21:41:27 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1452116474.4fd7f3c35078d7ea0afd780d7fbdecbc27814319.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-otr/, x11-plugins/pidgin-otr/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-plugins/pidgin-otr/files/pidgin-otr-4.0.1-bug-88-auth-dialog-crash.patch x11-plugins/pidgin-otr/pidgin-otr-4.0.1-r1.ebuild X-VCS-Directories: x11-plugins/pidgin-otr/files/ x11-plugins/pidgin-otr/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 4fd7f3c35078d7ea0afd780d7fbdecbc27814319 X-VCS-Branch: master Date: Wed, 6 Jan 2016 21:41:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 513ca826-9eac-442a-9cac-4d71d384e4f6 X-Archives-Hash: 831a1b11a4f272a98fb1abf1623b4e2f commit: 4fd7f3c35078d7ea0afd780d7fbdecbc27814319 Author: Sebastian Pipping gentoo org> AuthorDate: Wed Jan 6 21:37:57 2016 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Wed Jan 6 21:41:14 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd7f3c3 x11-plugins/pidgin-otr: Apply crash-fix patch Upstream: https://bugs.otr.im/issues/88 https://bugs.otr.im/issues/128 Package-Manager: portage-2.2.26 ...pidgin-otr-4.0.1-bug-88-auth-dialog-crash.patch | 27 ++++++++++++++++++ x11-plugins/pidgin-otr/pidgin-otr-4.0.1-r1.ebuild | 32 ++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/x11-plugins/pidgin-otr/files/pidgin-otr-4.0.1-bug-88-auth-dialog-crash.patch b/x11-plugins/pidgin-otr/files/pidgin-otr-4.0.1-bug-88-auth-dialog-crash.patch new file mode 100644 index 0000000..51ed447 --- /dev/null +++ b/x11-plugins/pidgin-otr/files/pidgin-otr-4.0.1-bug-88-auth-dialog-crash.patch @@ -0,0 +1,27 @@ +From 256ad0239728dad500018d3d5a5d8d38191a0116 Mon Sep 17 00:00:00 2001 +From: Stefan Sperling +Date: Fri, 3 Apr 2015 12:47:36 +0100 +Subject: [PATCH] Fix use after free in create_smp_dialog(). + +After replacing smp_data update the local pointer variable to avoid +use-after-free memory access. Found on OpenBSD where the socialist +millionaires dialog never opened because of this. +--- + gtk-dialog.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gtk-dialog.c b/gtk-dialog.c +index 09ec12e..2021626 100644 +--- a/gtk-dialog.c ++++ b/gtk-dialog.c +@@ -778,6 +778,7 @@ static GtkWidget *create_smp_dialog(const char *title, const char *primary, + if (smp_data->their_instance != context->their_instance) { + otrg_gtk_dialog_free_smp_data(conv); + otrg_gtk_dialog_add_smp_data(conv); ++ smp_data = purple_conversation_get_data(conv, "otr-smpdata"); + } + + if (!(smp_data->smp_secret_dialog)) { +-- +2.3.4 + diff --git a/x11-plugins/pidgin-otr/pidgin-otr-4.0.1-r1.ebuild b/x11-plugins/pidgin-otr/pidgin-otr-4.0.1-r1.ebuild new file mode 100644 index 0000000..da78b2d --- /dev/null +++ b/x11-plugins/pidgin-otr/pidgin-otr-4.0.1-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils + +DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging" +HOMEPAGE="http://www.cypherpunks.ca/otr/" +SRC_URI="http://www.cypherpunks.ca/otr/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND="dev-libs/libgcrypt:0 + net-im/pidgin[gtk] + >=net-libs/libotr-4.0.0 + x11-libs/gtk+:2" +DEPEND="${RDEPEND} + dev-util/intltool + virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog NEWS README ) + +src_prepare() { + # https://bugs.otr.im/issues/88 + # (and https://bugs.otr.im/issues/128) + epatch "${FILESDIR}"/${P}-bug-88-auth-dialog-crash.patch +}