commit:     c7e3269c2bd2d9e206f4d1378d4b0a5fd4007a7f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 17:17:07 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 17:23:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7e3269c

x11-plugins/pidgin-otr: Security cleanup (bug #576916).

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 x11-plugins/pidgin-otr/Manifest                    |  2 --
 ...pidgin-otr-4.0.1-bug-88-auth-dialog-crash.patch | 27 ------------------
 x11-plugins/pidgin-otr/pidgin-otr-3.2.1.ebuild     | 22 ---------------
 x11-plugins/pidgin-otr/pidgin-otr-4.0.1-r1.ebuild  | 32 ----------------------
 x11-plugins/pidgin-otr/pidgin-otr-4.0.1.ebuild     | 24 ----------------
 5 files changed, 107 deletions(-)

diff --git a/x11-plugins/pidgin-otr/Manifest b/x11-plugins/pidgin-otr/Manifest
index b4091d4..3c25611 100644
--- a/x11-plugins/pidgin-otr/Manifest
+++ b/x11-plugins/pidgin-otr/Manifest
@@ -1,3 +1 @@
-DIST pidgin-otr-3.2.1.tar.gz 409238 SHA256 
ce17e9769e3853076d80645adafaa866e7d7188f988d28a9793afc32c85cb979 SHA512 
97ae7362c153fecaf838b5aade2ed57cceb7b6204049e851c07b7d9460c8dcf3a3955efc33821deaf3435103f874a285e9868204bbed64e793f0edaecabe37fa
 WHIRLPOOL 
063f5768c6fd35b50656a7540be110f064ae7c01c1838b74a9481700aade78131497ffe10606f01ba803f07d5c1a73de3b53e943091bec44a09f69b8f3789017
-DIST pidgin-otr-4.0.1.tar.gz 496879 SHA256 
1b781f48c27bcc9de3136c0674810df23f7d6b44c727dbf4dfb24067909bf30a SHA512 
359cde727a92964eadb4d795cf6442634c6b35471c68eeadd6b70d9da0ece7440b03a593d7b509d1ca99f50a06777c1e11557af3a55c1660d38cccf9dccbc259
 WHIRLPOOL 
389c7857aeedc0d0646c3298e2ec38204a2738601d82364493a917994c045bd25b64079e0afa19422089d4ef511306f3b76f42baf5c027bdc49f434ec064f38e
 DIST pidgin-otr-4.0.2.tar.gz 515627 SHA256 
f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4 SHA512 
6815f1d2be5786726602a924ae6ead5371543a53bd36231dc3239fa580f73a6136836df0c1beb64d83b76e6bd0d80ffe6750ca6e9ddd2a6a94841a9a678925ad
 WHIRLPOOL 
a1a009388c467cb543f160cf0e662ab2e82d94d13e87e00f86a66feb5756a1ee6da2809baca784f3acaab456f436fc083d9bf44b1287c680f76ec5eba2503007

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
deleted file mode 100644
index 51ed447..0000000
--- 
a/x11-plugins/pidgin-otr/files/pidgin-otr-4.0.1-bug-88-auth-dialog-crash.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 256ad0239728dad500018d3d5a5d8d38191a0116 Mon Sep 17 00:00:00 2001
-From: Stefan Sperling <[email protected]>
-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-3.2.1.ebuild 
b/x11-plugins/pidgin-otr/pidgin-otr-3.2.1.ebuild
deleted file mode 100644
index 4a5256e..0000000
--- a/x11-plugins/pidgin-otr/pidgin-otr-3.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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 x86"
-IUSE=""
-
-RDEPEND="<net-libs/libotr-4.0.0
-       x11-libs/gtk+:2
-       net-im/pidgin[gtk]"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig"
-
-DOCS=( ChangeLog README )

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
deleted file mode 100644
index da78b2d..0000000
--- a/x11-plugins/pidgin-otr/pidgin-otr-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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
-}

diff --git a/x11-plugins/pidgin-otr/pidgin-otr-4.0.1.ebuild 
b/x11-plugins/pidgin-otr/pidgin-otr-4.0.1.ebuild
deleted file mode 100644
index fb808c2..0000000
--- a/x11-plugins/pidgin-otr/pidgin-otr-4.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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 )

Reply via email to