diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2014-10-20 12:26:24 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2014-10-20 12:26:24 +0000 |
| commit | 1275d4f7cf2ec1aa117853caff14dbea8fab73d7 (patch) | |
| tree | ef9417dcfd126962717dc38850a5d4bb2ecff992 | |
| parent | Bump to EAPI=5 (diff) | |
| download | gentoo-2-1275d4f7cf2ec1aa117853caff14dbea8fab73d7.tar.gz gentoo-2-1275d4f7cf2ec1aa117853caff14dbea8fab73d7.tar.bz2 gentoo-2-1275d4f7cf2ec1aa117853caff14dbea8fab73d7.zip | |
Fix compile with format-security. Bug #520470
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0145142D)
| -rw-r--r-- | games-rpg/adonthell/ChangeLog | 6 | ||||
| -rw-r--r-- | games-rpg/adonthell/adonthell-0.3.5-r1.ebuild | 3 | ||||
| -rw-r--r-- | games-rpg/adonthell/files/adonthell-0.3.5-format.patch | 11 |
3 files changed, 18 insertions, 2 deletions
diff --git a/games-rpg/adonthell/ChangeLog b/games-rpg/adonthell/ChangeLog index 8b128f22b499..bd44e839fbb9 100644 --- a/games-rpg/adonthell/ChangeLog +++ b/games-rpg/adonthell/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-rpg/adonthell # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.30 2014/07/29 07:19:16 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.31 2014/10/20 12:26:24 tupone Exp $ + + 20 Oct 2014; Alfredo Tupone <tupone@gentoo.org> adonthell-0.3.5-r1.ebuild, + +files/adonthell-0.3.5-format.patch: + Fix compile with format-security. Bug #520470 by Agostino Sarubbo 29 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org> -adonthell-0.3.5.ebuild: old diff --git a/games-rpg/adonthell/adonthell-0.3.5-r1.ebuild b/games-rpg/adonthell/adonthell-0.3.5-r1.ebuild index 571d4e685398..4422bf5c991d 100644 --- a/games-rpg/adonthell/adonthell-0.3.5-r1.ebuild +++ b/games-rpg/adonthell/adonthell-0.3.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.5-r1.ebuild,v 1.7 2014/05/15 16:57:07 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.5-r1.ebuild,v 1.8 2014/10/20 12:26:24 tupone Exp $ EAPI=5 PYTHON_COMPAT=( python2_6 python2_7 ) @@ -44,6 +44,7 @@ src_prepare() { epatch \ "${FILESDIR}"/${P}-configure.in.patch \ "${FILESDIR}"/${P}-glibc-2.10.patch \ + "${FILESDIR}"/${P}-format.patch \ "${FILESDIR}"/${P}-gcc46.patch sed -i \ -e "/AC_PATH_PROGS/s:python:${EPYTHON}:" \ diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-format.patch b/games-rpg/adonthell/files/adonthell-0.3.5-format.patch new file mode 100644 index 000000000000..f66cc50e16db --- /dev/null +++ b/games-rpg/adonthell/files/adonthell-0.3.5-format.patch @@ -0,0 +1,11 @@ +--- src/py_adonthell_wrap.cc.old 2014-10-20 14:21:57.495642785 +0200 ++++ src/py_adonthell_wrap.cc 2014-10-20 14:22:35.019293237 +0200 +@@ -867,7 +867,7 @@ + Py_DECREF(old_str); + Py_DECREF(value); + } else { +- PyErr_Format(PyExc_RuntimeError, mesg); ++ PyErr_Format(PyExc_RuntimeError, "%s", mesg); + } + } + |