summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-06-22 13:35:33 +0000
committerJustin Lecher <jlec@gentoo.org>2015-06-22 13:35:33 +0000
commit14d39695dd7652dfa22a28f73a9f5b5ac15d2500 (patch)
treedbb5f6f784d698026002e1d0633a09498db78c0f /dev-tcltk
parentVersion bump. (diff)
downloadgentoo-2-14d39695dd7652dfa22a28f73a9f5b5ac15d2500.tar.gz
gentoo-2-14d39695dd7652dfa22a28f73a9f5b5ac15d2500.tar.bz2
gentoo-2-14d39695dd7652dfa22a28f73a9f5b5ac15d2500.zip
Add fix for format-security, bug #520588
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Diffstat (limited to 'dev-tcltk')
-rw-r--r--dev-tcltk/expect/ChangeLog6
-rw-r--r--dev-tcltk/expect/expect-5.45.ebuild5
-rw-r--r--dev-tcltk/expect/files/expect-5.45-format-security.patch18
3 files changed, 27 insertions, 2 deletions
diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index 78b64df5e910..3b780284ce83 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-tcltk/expect
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.95 2015/06/09 17:45:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.96 2015/06/22 13:35:33 jlec Exp $
+
+ 22 Jun 2015; Justin Lecher <jlec@gentoo.org>
+ +files/expect-5.45-format-security.patch, expect-5.45.ebuild:
+ Add fix for format-security, bug #520588
09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
Updating remote-id in metadata.xml
diff --git a/dev-tcltk/expect/expect-5.45.ebuild b/dev-tcltk/expect/expect-5.45.ebuild
index 778b77bd41e9..abef40db37f2 100644
--- a/dev-tcltk/expect/expect-5.45.ebuild
+++ b/dev-tcltk/expect/expect-5.45.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.45.ebuild,v 1.7 2015/03/20 10:22:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.45.ebuild,v 1.8 2015/06/22 13:35:33 jlec Exp $
EAPI="3"
@@ -35,12 +35,15 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-5.45-gfbsd.patch
epatch "${FILESDIR}"/${PN}-5.44.1.15-ldflags.patch
epatch "${FILESDIR}"/${PN}-5.45-headers.patch #337943
+ epatch "${FILESDIR}"/${PN}-5.45-format-security.patch
sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
# fix install_name on darwin
[[ ${CHOST} == *-darwin* ]] && \
epatch "${FILESDIR}"/${P}-darwin-install_name.patch
+ mv configure.{in,ac} || die
+
eautoconf
}
diff --git a/dev-tcltk/expect/files/expect-5.45-format-security.patch b/dev-tcltk/expect/files/expect-5.45-format-security.patch
new file mode 100644
index 000000000000..c623264be27a
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.45-format-security.patch
@@ -0,0 +1,18 @@
+ exp_clib.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/exp_clib.c b/exp_clib.c
+index 172c05e..c86dda4 100644
+--- a/exp_clib.c
++++ b/exp_clib.c
+@@ -1476,8 +1476,8 @@ expDiagLogU(str)
+ char *str;
+ {
+ if (exp_is_debugging) {
+- fprintf(stderr,str);
+- if (exp_logfile) fprintf(exp_logfile,str);
++ fprintf(stderr,"%s", str);
++ if (exp_logfile) fprintf(exp_logfile,"%s", str);
+ }
+ }
+