diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2015-07-30 19:05:12 +0000 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2015-07-30 19:05:12 +0000 |
| commit | b1536484a5fad1c36087c6335bafd9bc7b44a3db (patch) | |
| tree | 501921b3cfd74f4674745c6ed613b480855b65bb /app-crypt | |
| parent | ia64 stable wrt bug #536012 (diff) | |
| download | gentoo-2-b1536484a5fad1c36087c6335bafd9bc7b44a3db.tar.gz gentoo-2-b1536484a5fad1c36087c6335bafd9bc7b44a3db.tar.bz2 gentoo-2-b1536484a5fad1c36087c6335bafd9bc7b44a3db.zip | |
Cleanup
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/gpgme/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/gpgme/files/gpgme-1.3.2-CVE-2014-3564.patch | 24 | ||||
| -rw-r--r-- | app-crypt/gpgme/gpgme-1.3.2-r1.ebuild | 46 |
3 files changed, 5 insertions, 71 deletions
diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog index 90f0f20becff..4a0adc87a341 100644 --- a/app-crypt/gpgme/ChangeLog +++ b/app-crypt/gpgme/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/gpgme # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.237 2015/07/30 18:53:07 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.238 2015/07/30 19:05:12 alonbl Exp $ + + 30 Jul 2015; Alon Bar-Lev <alonbl@gentoo.org> + -files/gpgme-1.3.2-CVE-2014-3564.patch, -gpgme-1.3.2-r1.ebuild: + Cleanup 30 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> gpgme-1.5.5.ebuild: ia64 stable wrt bug #533350 diff --git a/app-crypt/gpgme/files/gpgme-1.3.2-CVE-2014-3564.patch b/app-crypt/gpgme/files/gpgme-1.3.2-CVE-2014-3564.patch deleted file mode 100644 index 37e9eb1360a1..000000000000 --- a/app-crypt/gpgme/files/gpgme-1.3.2-CVE-2014-3564.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r 71644dea35c8 src/engine-gpgsm.c ---- a/src/engine-gpgsm.c Thu Jul 31 14:06:58 2014 +0200 -+++ b/src/engine-gpgsm.c Thu Jul 31 14:10:25 2014 +0200 -@@ -834,7 +834,7 @@ - else - { - *aline = newline; -- gpgsm->colon.attic.linesize += linelen + 1; -+ gpgsm->colon.attic.linesize = *alinelen + linelen + 1; - } - } - if (!err) -diff -r 71644dea35c8 src/engine-uiserver.c ---- a/src/engine-uiserver.c Thu Jul 31 14:06:58 2014 +0200 -+++ b/src/engine-uiserver.c Thu Jul 31 14:10:25 2014 +0200 -@@ -699,7 +699,7 @@ - else - { - *aline = newline; -- uiserver->colon.attic.linesize += linelen + 1; -+ uiserver->colon.attic.linesize = *alinelen + linelen + 1; - } - } - if (!err) diff --git a/app-crypt/gpgme/gpgme-1.3.2-r1.ebuild b/app-crypt/gpgme/gpgme-1.3.2-r1.ebuild deleted file mode 100644 index 44665a487f65..000000000000 --- a/app-crypt/gpgme/gpgme-1.3.2-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.3.2-r1.ebuild,v 1.9 2014/08/09 09:35:06 ago Exp $ - -EAPI="4" - -inherit eutils libtool autotools - -DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use" -HOMEPAGE="http://www.gnupg.org/related_software/gpgme" -SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="1" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="common-lisp static-libs" - -DEPEND="app-crypt/gnupg - >=dev-libs/libassuan-2.0.2 - >=dev-libs/libgpg-error-1.4" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.1.8-et_EE.patch" - epatch "${FILESDIR}/${P}-CVE-2014-3564.patch" - - eautoreconf - elibtoolize -} - -src_configure() { - econf \ - --includedir="${EPREFIX}/usr/include/gpgme" \ - --with-gpg="${EPREFIX}/usr/bin/gpg" \ - --with-gpgsm="${EPREFIX}/usr/bin/gpgsm" \ - $(use_enable static-libs static) -} - -src_install() { - default - prune_libtool_files - - if ! use common-lisp; then - rm -fr "${ED}usr/share/common-lisp" - fi -} |