From b4b33185a0a948b1fc5e5dc13dd6e212926fc11b Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 26 Dec 2014 11:28:11 +0000 Subject: [PATCH] media-libs/qhull: Fix format-security problems, #528110 Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- media-libs/qhull/ChangeLog | 8 ++- media-libs/qhull/Manifest | 26 ++++++--- .../files/qhull-2012.1-format-security.patch | 16 ++++++ media-libs/qhull/qhull-2012.1-r4.ebuild | 53 +++++++++++++++++++ 4 files changed, 96 insertions(+), 7 deletions(-) create mode 100644 media-libs/qhull/files/qhull-2012.1-format-security.patch create mode 100644 media-libs/qhull/qhull-2012.1-r4.ebuild diff --git a/media-libs/qhull/ChangeLog b/media-libs/qhull/ChangeLog index 8851cd4b5075..31e05fc99a22 100644 --- a/media-libs/qhull/ChangeLog +++ b/media-libs/qhull/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/qhull # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/ChangeLog,v 1.59 2014/09/26 11:18:39 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/ChangeLog,v 1.60 2014/12/26 11:28:07 jlec Exp $ + +*qhull-2012.1-r4 (26 Dec 2014) + + 26 Dec 2014; Justin Lecher +qhull-2012.1-r4.ebuild, + +files/qhull-2012.1-format-security.patch: + Fix format-security problems, #528110 26 Sep 2014; Fabian Groffen qhull-2012.1-r3.ebuild: Fix out of Prefix rm, bug #523422 diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest index dda6ede783a4..750ad8312827 100644 --- a/media-libs/qhull/Manifest +++ b/media-libs/qhull/Manifest @@ -1,19 +1,33 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX qhull-2010.1-cmake-install.patch 3343 SHA256 865b27a10d878d7ded45446e7dffc9369fdafa021e49bafe5575a32fbed1e200 SHA512 20c1805287884f3a8de0924c4cb370110355c2c4804ecd8dfe58985a9751d7eddbcb911c4ea1104b3ab6aef17e5817381d679491ce1954dea8941f2200f16032 WHIRLPOOL ae3b2c5e8c998382dfee9a82f802eb2809ce0dc618b86092e344da2ce5880d517d304a71182837572f8cfabff41e6c90f407fd9ed8d3f7695fad29b85325efe3 AUX qhull-2010.1-overflows.patch 1884 SHA256 8f49ad703f47467fd74d88614e1bbf7927b57c9c2af3c492fc2848f27a5f3181 SHA512 4246397abba98ea5163bca70ccf30575611d25c86d17172687b9adb7e5a6faeba2075f7e6a59ed86cb6d4b7507c694a4f6f4d4608e7bf13f93374f582a7abff1 WHIRLPOOL 1828f2b523090f309a1591fe16e70ddeb69cb8de5cd9f2af80d19779d1cc3a7485d158b8117c31590e756f2554383e1860b0afb7ed80cbfb27a06f0913cf8740 AUX qhull-2012.1-64bit.patch 1509 SHA256 bafca6d2928ce2f057fb48e32b46131aacd1a1deb0f99e5ee70b758414e7fc88 SHA512 e23c7bb4d6fb64a77647980e045b36df4f596eb64a32b27d7d6462cb2f5f7a35e0fa9985e885ed58222ec1741b2a2d1806bba155f1042bd470dcd5c721ac48c5 WHIRLPOOL 5e3b1cef55885744d5991dc045ed900bed93f985d16aab271df5deb5e23a3fa3b4d588d1c5f7b268cb07b5d6114d5a357a5e16c351b4433863742accaf6a1adf +AUX qhull-2012.1-format-security.patch 495 SHA256 2e7461a498276e23f5f2231ae82fbc5ccee8d9c639f3bfb4433722a496591d28 SHA512 91df8963c8d90210281b1546a76a815c59d4343657f4771d4aa13ffa29d1935b10437441b39b85ef791da0eda8f76c381d7548b3152a0c2535ff6ff87997babd WHIRLPOOL eb5d3f7c28f1fdf6f7ee7618cab9091d1869e8e4e376dacda02d6831d4bacfe013f4d2f4d68f6b813f5af70a871c236ffd6ef6ae851270081d561db3e1e3681f AUX qhull-3.1-makefile.patch 2516 SHA256 5685cad5fb45b05444ebb6c2867974aad3391a9936070f976a5b58aeb52c27a7 SHA512 9ca6be4d35deae3a77a18dd78c881f2e41886ef345207a46a2888fb503ee6e1c27da7146254ccc35bfa626e14e878cdbd9854e8da4e213a641266f54a6ed370a WHIRLPOOL dc555ee9ebc50a8db7a2524d1bfeb6e9088ee8beb2fe93ed06a35c1632de20f47c2cfe1f687c70f19b0f06598c42a1508fb034cc1f4f7e918afa0b458a1ac9a8 DIST qhull-2012.1-src.tgz 716665 SHA256 a35ecaa610550b7f05c3ce373d89c30cf74b059a69880f03080c556daebcff88 SHA512 e35ea2cb73ef32b23b64a6594a8b5ea22ed8e2ea7535cfd72dca44331602368dfcb681600a0d2b090e80e67e6be7b32272244b9083d4805f2fbcf5897eb73240 WHIRLPOOL 37704b3f94b6d20c02886598cc2e862f47feb910e0d3259d686b1356242206b77640871509818c56530161720954214d41c295dfe740faa4ed575379b05259f6 EBUILD qhull-2012.1-r1.ebuild 1266 SHA256 995bb24b1c1faaff57e96e3fd0b367000d06f0d5746adc9d8484be20436b0a82 SHA512 358ace58eb4e3811e3b8583c3b412dfd9faff01914144de01221fdea76c98e0029f8db68b9815be11414199f47a4e6f9df605b07b00ae2e8e1a96cf29df1e044 WHIRLPOOL 0f45c9b8266997d496c26f7a82807424ccdb2ef8449bc5ce28a8ef1dde35c0ed916068f0bada7340b53d65e4445cda1ffdf9cd71e30627f059b7ad9dbae8e1eb EBUILD qhull-2012.1-r3.ebuild 1363 SHA256 9342cd6cde50a4d705d9cb09b9f4687b61f37a3ac42ba72d07c2b11753e51ff2 SHA512 c6f5ec79de681e6dfc5c898e974f45e745a662ebefe28ccad47898df4d5154bf4554a79455a75057b37f1df3e093c4dcc52245df7be6c79feceee3c7bff81ffe WHIRLPOOL 46516ec7a1dba26f7086c73a543a4e3414d851646248ee18db6ee9f94caa4efdfe5a605a94145e248e5c58ead983ca57f07dcd7f491cc49145a9b1ac10d16e36 -MISC ChangeLog 8724 SHA256 6bd70cab72e63dc3f58842bf58a2c1c1488694c11e4ee33b6ef1682d930bd1a4 SHA512 0a6855f8fc3eb928b3b9b36474bfa176f3b11cd7e4f9bcee398755211e499b1e2a5d1dbcc692b408c4b637efb3bcc5ff343a537b730658a03b189534acb61413 WHIRLPOOL e66eb2281bb2b3370a69837e784d83ea4702b2c682e9a0035ee7100f59c1038d38c674b9783cabfffee37518592e0bfa7c7c68956b7eb2a53b5d18cf7169105d +EBUILD qhull-2012.1-r4.ebuild 1404 SHA256 f58a8cc569104d8bad97fb97e860d3e4044d0f28192ae2435bd85f2254fa3950 SHA512 8a39095de80360a695f306f2763905aaf4bef3e19080a076408a8805db95af49ccc72f714dd81edc7a75d55bc91344d5d4b8ffe160edeaa9d2149142bbe81e20 WHIRLPOOL f1229de3dca30dacf192db97fe5b46bfa8d1039002e9872263890f13446ba42a620b4f5705ae2d7a2720bd8a26958134d087a54d55acb74519e5c50609c711d7 +MISC ChangeLog 8911 SHA256 5cf501cb2a3a5f35fe32eb891356f08574198789ff0847df062eb4b000e4c10a SHA512 d8b58949421e6604e3298e1a3e4f201e6b955ca086f59f5b7593e7d1daa03f6a62c5683504fb6f71f720c2847501e57b682bc6146df014ce6547d36cab06071b WHIRLPOOL 77e620c2afe70ed3c597248eb572964b38bcd3e2f2c9a0e6ba885bc467543ea78884dc8627f8f106a332150dda849e3bee45f8665017ea98e2f5d260d9761369 MISC metadata.xml 872 SHA256 7a1e40294785164f8a50596502300b2d1dfb11c0e5a1193d06153fe63036c7d9 SHA512 eab5b032478f15c0b7611dbed0237694e43ef875a14681bae48ddd3a1e6d05e196f76d2120d66e40225a8e3d4b7a8ca3572ca1372c2c851b86aff075a2a93574 WHIRLPOOL eadfed324da921a89f182304a523f992f66c07aa18e0b4bbcb8bc8fdd8806f517bea4e1cd0260e5b24d7e2444f2832a780f4bb5362bd7c56446bf957abbbb10c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iEYEAREIAAYFAlQlS5AACgkQX3X2B8XHTolS8gCgmEHZ+15Q6zRamUP7sbBPdAuR -QcAAoIJ3gFNcPADwA0WQ6Bdo0iXt+TT1 -=OlbD +iQJ8BAEBCgBmBQJUnUZ8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir194P/AuZVbqwiTQAfe3qP5yWhMb3 +itwOYXeuWHiJ6wmTuQQsOQXhyMMAT8VnRkM9L/1Ly+xaKSuYjlBOMVmIUfVWfjS7 +nJ/0L0G6BtnEj0bpl74sMost42Op90G3wypBxlPOWBRcAqHKkhE8o8kRDjmga4vD +1CwKikLsU27agWgSfUMYUijeNkEh239npxmDKiDQ+44k6ArMJcILsLU51rVYoPCT +kFisXsiVrx7tJWns6Njl/j9bfBS2gyrdSyYkzTP+A+qg7g/LZTLPapL4WXq9FFtM +OEv2Pp+IVQ4zVLZmKq6FYdYQWP7dMRUiC1C9RBhW4CdQ35iVwUPOq5/qSKex8cl7 +gZSZ4fgcOxsT5Z/Z/zpwYVHoLnOxaBWJ4CvKXbGu1IluDCsGrqRBMLGwHaOCdZBv +Ltn9rwJeXJzXPuuKOVRoICoUViBQEZx5GHI298mzXNfJNkLa7TJ/8cRkr9QZFrx7 +N2p3gVOivvxt1rqtYRu2EbBF2kcbkz6bbYIu5SuDQBMd7dYgZzvudAweW0JI71ve +YLHtcGVQSg3XZQ7AMWcK+6hBxgmeqBn3wrEmfezBvRKfccOERClUTLSZleVmsqbj +SE/bwCRExkIaJkqVJSfaKVSLYuDfS06nGxptV9tneajr0Rj0LB04yce/7d6AxN0p +16RDjbZqRKyTcu0sSfEP +=zPpW -----END PGP SIGNATURE----- diff --git a/media-libs/qhull/files/qhull-2012.1-format-security.patch b/media-libs/qhull/files/qhull-2012.1-format-security.patch new file mode 100644 index 000000000000..14bce2baa75c --- /dev/null +++ b/media-libs/qhull/files/qhull-2012.1-format-security.patch @@ -0,0 +1,16 @@ + src/libqhull/io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libqhull/io.c b/src/libqhull/io.c +index 09a0079..2bd066e 100644 +--- a/src/libqhull/io.c ++++ b/src/libqhull/io.c +@@ -2238,7 +2238,7 @@ void qh_printfacet3math(FILE *fp, facetT *facet, qh_PRINT format, int notfirst) + qh_memfree(point, qh normal_size); + qh_settempfree(&points); + qh_settempfree(&vertices); +- qh_fprintf(fp, 9110, endfmt); ++ fprintf(fp, "%s", endfmt); + } /* printfacet3math */ + + diff --git a/media-libs/qhull/qhull-2012.1-r4.ebuild b/media-libs/qhull/qhull-2012.1-r4.ebuild new file mode 100644 index 000000000000..a62d17a3047f --- /dev/null +++ b/media-libs/qhull/qhull-2012.1-r4.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2012.1-r4.ebuild,v 1.1 2014/12/26 11:28:07 jlec Exp $ + +EAPI=5 + +inherit cmake-utils flag-o-matic + +MY_P="${PN}${PV}" + +DESCRIPTION="Geometry library" +HOMEPAGE="http://www.qhull.org/" +SRC_URI="${HOMEPAGE}/download/${P}-src.tgz" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="doc static-libs" + +DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt ) + +PATCHES=( + "${FILESDIR}"/${P}-64bit.patch + "${FILESDIR}"/${P}-format-security.patch + ) + +src_configure() { + append-flags -fno-strict-aliasing + mycmakeargs+=( + -DLIB_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir) + -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}/html + ) + cmake-utils_src_configure +} + +pkg_preinst() { + # See https://bugs.gentoo.org/show_bug.cgi?id=435006 + # If qhull-2010 is installed we need to remove its include dir so + # that it can be replaced with a symlink in this version. + rm -rf "${EROOT}"usr/include/qhull || die +} + +src_install() { + cmake-utils_src_install + # compatibility with previous installs + dosym libqhull /usr/include/qhull + if ! use doc; then + rm -rf "${ED}"/usr/share/doc/${PF}/html || die + fi + if ! use static-libs; then + rm -f "${ED}"/usr/$(get_libdir)/lib*.a || die + fi +} -- 2.26.2