[gentoo-commits] repo/gentoo:master commit in: sci-visualization/ggobi/, sci-visualization/ggobi/files/

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/ggobi/, sci-visualization/ggobi/files/

[David Seifert]

commit:     5ab7a2ef03d55a4fec4409b301cc11b88f9c1b61
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 08:28:46 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 08:29:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ab7a2ef

sci-visualization/ggobi: Fix -Werror=format-security errors

Gentoo-Bug: 577430

Package-Manager: portage-2.2.28

 .../files/ggobi-2.1.11-Wformat-security.patch      | 36 ++++++++++++++++++++++
 sci-visualization/ggobi/ggobi-2.1.11.ebuild        |  5 +--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/ggobi/files/ggobi-2.1.11-Wformat-security.patch b/sci-visualization/ggobi/files/ggobi-2.1.11-Wformat-security.patch
new file mode 100644
index 0000000..960d940
--- /dev/null
+++ b/sci-visualization/ggobi/files/ggobi-2.1.11-Wformat-security.patch
@@ -0,0 +1,36 @@
+Fix -Wformat -Werror=format-security errors caused by wrong fprintf calls
+See also: https://bugs.gentoo.org/show_bug.cgi?id=577430
+* utils_ui.c: In function ‘quick_message’:
+* utils_ui.c:192:29: error: format not a string literal and no format arguments [-Werror=format-security]
+*                              message);
+
+--- ggobi-2.1.11/src/utils_ui.c
++++ ggobi-2.1.11/src/utils_ui.c
+@@ -189,7 +189,7 @@
+ 
+   dialog =
+     gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
+-                            message);
++                            "%s", message);
+ 
+   if (modal)
+     gtk_window_set_modal (GTK_WINDOW (dialog), true);
+--- ggobi-2.1.11/src/write_xml.c
++++ ggobi-2.1.11/src/write_xml.c
+@@ -37,14 +37,14 @@
+ write_xml_string(FILE *f, gchar *str)
+ {
+   gchar *fmtstr = g_markup_printf_escaped("%s", str);
+-  fprintf(f, fmtstr);
++  fprintf(f, "%s", fmtstr);
+   g_free(fmtstr);
+ }
+ static void
+ write_xml_string_fmt(FILE *f, gchar *fmt, gchar *str)
+ {
+   gchar *fmtstr = g_markup_printf_escaped(fmt, str);
+-  fprintf(f, fmtstr);
++  fprintf(f, "%s", fmtstr);
+   g_free(fmtstr);
+ }
+ 

diff --git a/sci-visualization/ggobi/ggobi-2.1.11.ebuild b/sci-visualization/ggobi/ggobi-2.1.11.ebuild
index 7f25d29..ef6aea6 100644
--- a/sci-visualization/ggobi/ggobi-2.1.11.ebuild
+++ b/sci-visualization/ggobi/ggobi-2.1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -31,7 +31,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-2.1.8-plugindir.patch \
 		"${FILESDIR}"/${PN}-2.1.9-as-needed.patch \
-		"${FILESDIR}"/${PN}-2.1.10-desktop.patch
+		"${FILESDIR}"/${PN}-2.1.10-desktop.patch \
+		"${FILESDIR}"/${PN}-2.1.11-Wformat-security.patch
 	# need the ${S} for recursivity lookup
 	AT_M4DIR="${S}"/m4 eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/ggobi/, sci-visualization/ggobi/files/

[David Seifert]

commit:     7a51956d0362e90324fc22a514a2ee9364416fd2
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Wed Jan 20 10:16:18 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 10:16:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a51956d

sci-visualization/ggobi: Remove old

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-visualization/ggobi/Manifest                   |  1 -
 .../ggobi/files/ggobi-2.1.10-hardened.patch        | 66 ----------------------
 sci-visualization/ggobi/ggobi-2.1.10.ebuild        | 56 ------------------
 3 files changed, 123 deletions(-)

diff --git a/sci-visualization/ggobi/Manifest b/sci-visualization/ggobi/Manifest
index 42f809f42b1..b6808716cc8 100644
--- a/sci-visualization/ggobi/Manifest
+++ b/sci-visualization/ggobi/Manifest
@@ -1,2 +1 @@
-DIST ggobi_2.1.10.orig.tar.bz2 2776784 BLAKE2B 6e5f5bfcb3b10af425a552da1f0d9eb4ba445d0eced0e5b5a20d3ea88da782f9e333005b929408baeb895a1e62d5e1500a86de5c7353b60ee8fbf950521b00c0 SHA512 40bc4a7fae992bf327d6b36c5aea7802279a3b6229242f31386e771636b4561260914a7fefb6a6337c1e1ab5a0682fbdd626389b83d9b57d0c2d050fac3723e5
 DIST ggobi_2.1.11.orig.tar.bz2 2787709 BLAKE2B e4b853f3212abda00150e6a3b3a344638225bdc564c109632c7ca2f9cb8cc41d35af9df1ee153d2ede3bd3191d9219e2bdd6bd6bc9c64f42447dfe17562361f1 SHA512 d34c6569d05d1e680101b62745012940c1e18c1588cd37b89b26b89e9eed9bab8fc53e0585a595b6cb4c9f2bb7d603ca4252cb6a6ba344bbc24e5cc5fd8a6dc1

diff --git a/sci-visualization/ggobi/files/ggobi-2.1.10-hardened.patch b/sci-visualization/ggobi/files/ggobi-2.1.10-hardened.patch
deleted file mode 100644
index 63681a0a03e..00000000000
--- a/sci-visualization/ggobi/files/ggobi-2.1.10-hardened.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Upstream changes introduced in version 2.1.10-4
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- ggobi (2.1.10-4) unstable; urgency=low
- .
-   * src/ggobi.c: Applied patch kindly supplied by Michael Lawrence to
-     address issues found under hardened compiler flags (Closes: #646260)
- .
- The person named in the Author field signed this changelog entry.
-Author: Dirk Eddelbuettel <edd@debian.org>
-Bug-Debian: http://bugs.debian.org/646260
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- ggobi-2.1.10.orig/src/ggobi.c
-+++ ggobi-2.1.10/src/ggobi.c
-@@ -698,10 +698,10 @@ ValidateGGobiRef (ggobid * gg, gboolean
-   }
- 
-   if (fatal) {
--    g_error (error_msg);
-+    g_error ("%s", error_msg);
-   }
-   else
--    g_critical (error_msg);
-+    g_critical ("%s", error_msg);
- 
-   return (NULL);
- }
-@@ -718,9 +718,9 @@ ValidateDatadRef (GGobiData * d, ggobid
-   }
- 
-   if (fatal)
--    g_error (error_msg);
-+    g_error ("%s", error_msg);
-   else
--    g_critical (error_msg);
-+    g_critical ("%s", error_msg);
- 
-   return (NULL);
- }
-@@ -739,9 +739,9 @@ ValidateDisplayRef (displayd * d, ggobid
-   }
- 
-   if (fatal)
--    g_error (error_msg);
-+    g_error ("%s", error_msg);
-   else
--    g_critical (error_msg);
-+    g_critical ("%s", error_msg);
- 
-   return (NULL);
- }

diff --git a/sci-visualization/ggobi/ggobi-2.1.10.ebuild b/sci-visualization/ggobi/ggobi-2.1.10.ebuild
deleted file mode 100644
index 1ed254c14c8..00000000000
--- a/sci-visualization/ggobi/ggobi-2.1.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools xdg
-
-DESCRIPTION="Visualization program for exploring high-dimensional data"
-HOMEPAGE="http://www.ggobi.org/"
-# source code release is not well published
-#SRC_URI="http://www.ggobi.org/downloads/${P}.tar.bz2"
-SRC_URI="mirror://debian/pool/main/g/${PN}/${PN}_${PV}.orig.tar.bz2"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc minimal nls"
-
-RDEPEND="
-	dev-libs/libxml2:2
-	media-gfx/graphviz
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e 's|ND_coord_i|ND_coord|' \
-		plugins/GraphLayout/graphviz.c || die
-	rm m4/libtool.m4 m4/lt*m4 plugins/*/aclocal.m4 || die
-	epatch \
-		"${FILESDIR}"/${PN}-2.1.8-plugindir.patch \
-		"${FILESDIR}"/${PN}-2.1.9-as-needed.patch \
-		"${FILESDIR}"/${PN}-2.1.10-hardened.patch \
-		"${FILESDIR}"/${PN}-2.1.10-desktop.patch
-	# need the ${S} for recursivity lookup
-	AT_M4DIR="${S}"/m4 eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-rpath \
-		$(use_enable nls) \
-		$(use_with !minimal all-plugins)
-}
-
-src_compile() {
-	emake all ggobirc
-}
-
-src_install() {
-	default
-	insinto /etc/xdg/ggobi
-	doins ggobirc
-	use doc || rm "${ED}"/usr/share/doc/${PF}/*.pdf
-}