commit: 9163e59ab6e1a1ce4b2a8edca956eca3c43fbceb
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 18:49:55 2016 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 18:50:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9163e59a
x11-misc/wmakerconf: fix compilation with format-security
Bug #579442 by ago
Update ebuild for EAPI 6
Package-Manager: portage-2.2.28
.../wmakerconf/files/wmakerconf-2.12-desktop.patch | 4 +-
.../files/wmakerconf-2.12-format-security.patch | 12 +++++
x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild | 60 ++++++++++++++++++++++
3 files changed, 74 insertions(+), 2 deletions(-)
diff --git a/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch
b/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch
index 2277c6c..184fa55 100644
--- a/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch
+++ b/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch
@@ -1,5 +1,5 @@
---- wmakerconf.desktop.in.orig 2015-08-23 23:14:56.272180470 +0200
-+++ wmakerconf.desktop.in 2015-08-23 23:15:05.446195859 +0200
+--- wmakerconf-2.12.orig/wmakerconf.desktop.in 2015-08-23 23:14:56.272180470
+0200
++++ wmakerconf-2.12/wmakerconf.desktop.in 2015-08-23 23:15:05.446195859
+0200
@@ -10,4 +10,4 @@
Icon=@prefix@/share/wmakerconf/wmakerconf.xpm
Terminal=false
diff --git a/x11-misc/wmakerconf/files/wmakerconf-2.12-format-security.patch
b/x11-misc/wmakerconf/files/wmakerconf-2.12-format-security.patch
new file mode 100644
index 0000000..91b6109
--- /dev/null
+++ b/x11-misc/wmakerconf/files/wmakerconf-2.12-format-security.patch
@@ -0,0 +1,12 @@
+diff -Naur wmakerconf-2.12.orig/src/error.c wmakerconf-2.12/src/error.c
+--- wmakerconf-2.12.orig/src/error.c 2004-12-05 02:44:37.000000000 +0100
++++ wmakerconf-2.12/src/error.c 2016-04-11 20:42:32.810590888 +0200
+@@ -109,7 +109,7 @@
+ GtkTextIter iter;
+ GtkTextBuffer *buffer;
+
+- g_log ("Wmakerconf", G_LOG_LEVEL_WARNING, message);
++ g_log ("Wmakerconf", G_LOG_LEVEL_WARNING, "%s", message);
+ Free (text);
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (log_text));
+ gtk_text_buffer_get_iter_at_offset (buffer, &iter, -1);
diff --git a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
new file mode 100644
index 0000000..de12699
--- /dev/null
+++ b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="X based config tool for the windowmaker X windowmanager"
+HOMEPAGE="http://wmakerconf.sourceforge.net/";
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="imlib nls perl"
+
+RDEPEND="x11-libs/gtk+:2
+ >=x11-wm/windowmaker-0.95.2
+ imlib? ( media-libs/imlib )
+ perl? ( dev-lang/perl
+ dev-perl/HTML-Parser
+ || ( dev-perl/libwww-perl
+ www-client/lynx
+ net-misc/wget ) )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-desktop.patch
+ "${FILESDIR}"/${P}-format-security.patch
+ "${FILESDIR}"/${P}-wmaker-0.95_support.patch
+)
+
+src_prepare() {
+ sed -e "/^LIBS =/s/$/ -lX11/" -i src/Makefile.in || die
+ default
+}
+
+src_configure() {
+ local myconf
+ use imlib || myconf="--disable-imlibtest"
+
+ econf \
+ $(use_enable perl upgrade) \
+ $(use_enable nls) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" gnulocaledir="${ED}/usr/share/locale" install
+ dodoc AUTHORS ChangeLog MANUAL NEWS README TODO
+ doman man/*.1
+
+ rm -f
"${ED}"/usr/share/${PN}/{AUTHORS,README,COPYING,NEWS,MANUAL,ABOUT-NLS,NLS-TEAM1,ChangeLog}
+}
+
+pkg_postinst() {
+ elog "New features added with WindowMaker >= 0.95 will not be available
in wmakerconf"
+ elog "WPrefs is the recommended configuration tool"
+}
