diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2015-08-06 13:10:10 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2015-08-06 13:10:10 +0000 |
| commit | df8a1675026e00c7e59982da4d78d7b4f56cb9a6 (patch) | |
| tree | 1c7d0a61c2e654a45dad154402268451ac414678 /x11-plugins | |
| parent | Fix for format-security, bug #547082 (diff) | |
| download | gentoo-2-df8a1675026e00c7e59982da4d78d7b4f56cb9a6.tar.gz gentoo-2-df8a1675026e00c7e59982da4d78d7b4f56cb9a6.tar.bz2 gentoo-2-df8a1675026e00c7e59982da4d78d7b4f56cb9a6.zip | |
Fix compilation with format-security, bug #542104
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 00F7AB331B0F097F)
Diffstat (limited to 'x11-plugins')
| -rw-r--r-- | x11-plugins/wmping/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-plugins/wmping/files/wmping-0.2.1-format-security.patch | 38 | ||||
| -rw-r--r-- | x11-plugins/wmping/wmping-0.2.1.ebuild | 9 |
3 files changed, 51 insertions, 4 deletions
diff --git a/x11-plugins/wmping/ChangeLog b/x11-plugins/wmping/ChangeLog index d8b1e3d51e32..1e806771aa7e 100644 --- a/x11-plugins/wmping/ChangeLog +++ b/x11-plugins/wmping/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-plugins/wmping -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmping/ChangeLog,v 1.4 2014/08/10 20:08:49 slyfox Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmping/ChangeLog,v 1.5 2015/08/06 13:10:10 voyageur Exp $ + + 06 Aug 2015; Bernard Cafarelli <voyageur@gentoo.org> wmping-0.2.1.ebuild, + +files/wmping-0.2.1-format-security.patch: + Fix compilation with format-security, bug #542104 10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> wmping-0.2.1.ebuild: QA: drop trailing '.' from DESCRIPTION diff --git a/x11-plugins/wmping/files/wmping-0.2.1-format-security.patch b/x11-plugins/wmping/files/wmping-0.2.1-format-security.patch new file mode 100644 index 000000000000..cc9976d04ad2 --- /dev/null +++ b/x11-plugins/wmping/files/wmping-0.2.1-format-security.patch @@ -0,0 +1,38 @@ +--- wmping.c.orig 2015-08-06 15:03:32.407526918 +0200 ++++ wmping.c 2015-08-06 15:03:56.907978079 +0200 +@@ -237,7 +237,7 @@ + if(strcmp(tokens[1],"=")) + { + sprintf(str_err, "Not correct format of configuration file ( %s ): line %u", cfgfile, lineN); +- fprintf(stderr, str_err); ++ fprintf(stderr, "%s", str_err); + exit(-1); + } + +@@ -288,7 +288,7 @@ + else + { + sprintf(str_err, "Not correct format of configuration file ( %s ): line %u", cfgfile, lineN); +- fprintf(stderr, str_err); ++ fprintf(stderr, "%s", str_err); + exit(-1); + + } +@@ -297,7 +297,7 @@ + else + { + sprintf(str_err, "Error open configuration file ( %s ): %s", cfgfile, strerror(errno)); +- fprintf(stderr, str_err); ++ fprintf(stderr, "%s", str_err); + fprintf(stderr, "\n Create default configuration file\n"); + createDefaultCfg(cfgfile); + } +@@ -305,7 +305,7 @@ + else + { + sprintf(str_err, "Error open configuration file ( %s ): %s", cfgfile, strerror(errno)); +- fprintf(stderr, str_err); ++ fprintf(stderr, "%s", str_err); + fprintf(stderr, "\n Create default configuration file\n"); + createDefaultCfg(cfgfile); + } diff --git a/x11-plugins/wmping/wmping-0.2.1.ebuild b/x11-plugins/wmping/wmping-0.2.1.ebuild index 18cc9f6a8375..79b14f46aa8a 100644 --- a/x11-plugins/wmping/wmping-0.2.1.ebuild +++ b/x11-plugins/wmping/wmping-0.2.1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmping/wmping-0.2.1.ebuild,v 1.5 2014/08/10 20:08:49 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmping/wmping-0.2.1.ebuild,v 1.6 2015/08/06 13:10:10 voyageur Exp $ EAPI=5 +inherit eutils DESCRIPTION="a simple host status monitoring dockapp" HOMEPAGE="http://sourceforge.net/projects/wmping" @@ -22,6 +23,10 @@ DEPEND="${RDEPEND} x11-libs/libICE x11-libs/libXt" +src_prepare() { + epatch "${FILESDIR}"/${P}-format-security.patch +} + src_install() { if use suid; then emake DESTDIR="${D}" install |