Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/plotutils/files/, media-libs/plotutils/
Date: Thu, 16 Feb 2017 00:13:55
Message-Id: 1487204023.55072a2e6eb94c4300dfb3bc56fb190013b13d8c.dilfridge@gentoo
1 commit: 55072a2e6eb94c4300dfb3bc56fb190013b13d8c
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 16 00:12:05 2017 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 16 00:13:43 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55072a2e
7
8 media-libs/plotutils: Add debian/redhat patch for format-security, bug 556568
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 .../files/plotutils-2.6-format-security.patch | 18 ++++++++++++++++++
13 media-libs/plotutils/plotutils-2.6-r1.ebuild | 3 ++-
14 2 files changed, 20 insertions(+), 1 deletion(-)
15
16 diff --git a/media-libs/plotutils/files/plotutils-2.6-format-security.patch b/media-libs/plotutils/files/plotutils-2.6-format-security.patch
17 new file mode 100644
18 index 0000000000..c1cbecfc79
19 --- /dev/null
20 +++ b/media-libs/plotutils/files/plotutils-2.6-format-security.patch
21 @@ -0,0 +1,18 @@
22 +Description: Fix build error with -Werror=format-security.
23 +Forwarded: https://lists.gnu.org/archive/html/bug-plotutils/2016-01/msg00000.html
24 +Author: Stanislav Ochotnicky <sochotnicky@××××××.com>
25 +Origin: http://pkgs.fedoraproject.org/cgit/plotutils.git
26 +
27 +diff --git a/pic2plot/gram.yy b/pic2plot/gram.yy
28 +index d11320b..1bcce46 100644
29 +--- a/pic2plot/gram.yy
30 ++++ b/pic2plot/gram.yy
31 +@@ -1833,7 +1833,7 @@ do_sprintf(const char *form, const double *v, int nv)
32 + {
33 + one_format += *form++;
34 + one_format += '\0';
35 +- sprintf(sprintf_buf, one_format.contents());
36 ++ sprintf(sprintf_buf, "%s", one_format.contents());
37 + }
38 + else
39 + {
40
41 diff --git a/media-libs/plotutils/plotutils-2.6-r1.ebuild b/media-libs/plotutils/plotutils-2.6-r1.ebuild
42 index 13eeaf32b8..3153d134c0 100644
43 --- a/media-libs/plotutils/plotutils-2.6-r1.ebuild
44 +++ b/media-libs/plotutils/plotutils-2.6-r1.ebuild
45 @@ -35,7 +35,8 @@ src_prepare() {
46 "${FILESDIR}"/${PN}-2.5.1-rangecheck.patch \
47 "${FILESDIR}"/${P}-makefile.patch \
48 "${FILESDIR}"/${P}-libpng-1.5.patch \
49 - "${FILESDIR}"/${P}-libxmi.patch
50 + "${FILESDIR}"/${P}-libxmi.patch \
51 + "${FILESDIR}"/${P}-format-security.patch
52 eautoreconf
53 elibtoolize
54 }