From 892e9d9dd49ba413b3b00c637410c9fadf0dc9df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Sat, 27 Dec 2014 15:12:27 +0000 Subject: [PATCH] Version bump by Andreas Sturmlechner, bug 533478 Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x84AD142F --- app-text/libabw/ChangeLog | 9 +++- app-text/libabw/Manifest | 22 +++++++-- ...-0.1.1-dereference-before-null-check.patch | 27 +++++++++++ ...1-do-not-let-AbiDocument_parse-throw.patch | 35 ++++++++++++++ app-text/libabw/libabw-0.1.1.ebuild | 47 +++++++++++++++++++ 5 files changed, 135 insertions(+), 5 deletions(-) create mode 100644 app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch create mode 100644 app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch create mode 100644 app-text/libabw/libabw-0.1.1.ebuild diff --git a/app-text/libabw/ChangeLog b/app-text/libabw/ChangeLog index 7cda53afdb8f..69a4abe08b4b 100644 --- a/app-text/libabw/ChangeLog +++ b/app-text/libabw/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-text/libabw # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/libabw/ChangeLog,v 1.6 2014/10/10 20:15:47 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/libabw/ChangeLog,v 1.7 2014/12/27 15:12:21 dilfridge Exp $ + +*libabw-0.1.1 (27 Dec 2014) + + 27 Dec 2014; Andreas K. Huettel +libabw-0.1.1.ebuild, + +files/libabw-0.1.1-dereference-before-null-check.patch, + +files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch: + Version bump by Andreas Sturmlechner, bug 533478 10 Oct 2014; Markus Meier libabw-0.1.0.ebuild: add ~arm, bug #520692 diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest index b31cc1388758..c7b4b4c44ecd 100644 --- a/app-text/libabw/Manifest +++ b/app-text/libabw/Manifest @@ -1,16 +1,30 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX libabw-0.1.1-dereference-before-null-check.patch 989 SHA256 bb584ed1b90f96d12e4d7b65405e7b5fdbe8920e79d05fb83d96bbb991e205a4 SHA512 a9b3e07d4ca41579a44c0953e2934f9e8e4abbc5c42c50a71f64c5a665f6b2b35e93facd4822546342f349b78f19d9203598818fce3f19833c9c6bd4e3c5b694 WHIRLPOOL 33e9f4b6782838500400b6afc55edcc85eb2a46bd320d813419e5b047acd87c23366166dce6c931b1e44888eb7874d6c87aa325eef7315d08b28f12c87e81d41 +AUX libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch 1308 SHA256 e576a9e8e9071be0cb2b203ca92f4fcf8c0a82c4c0ed7a59225c8e647ace86a8 SHA512 1bd8c97e171b489e4c183a73452a0fb33e98bb3dfb184dc9abc4989ab9f43ee43ee09ee319f6f1291b4141f759f2495b7a5b65c86b8d0f9bdcb0fc50a23fd242 WHIRLPOOL 7f27b0f776479ded9c84ad95157f9b10abebb02a620756d83f50329889060e6aeaa0b5e18e878b565cebb9ddaa21cf297994d754fcdd81b479d76636520d2a7c DIST libabw-0.0.2.tar.xz 307432 SHA256 d5cec855722e3c9caf451db2557aa8c81b279a562e67593477c58b02e948b594 SHA512 3c656fb7d3e2b4388ea33fbc380ffd01d03abefffa6089f21708b78da75cce71f95a067f05b389823ca3857b2ec14aae9371978062571aa74bf854c6948fcd82 WHIRLPOOL fb112e1a94b8983518ac3911215ea6f31091d922dfe4c3b80efbba747a71b100aa37aeb75753085d5cab15bb6b15541d401c0b55d29c85f716c972b1f3ff49fd DIST libabw-0.1.0.tar.xz 282268 SHA256 ee99b280b7af226a48fd9afd395cc10bef2d8e4f844151277e90793706dfc0c1 SHA512 209965359e1446862039c88c4199815583bbc4f63f3f0549f4261d3cb54ab0fb483480068d68a9bf9fe65fe6e3f9b0e05efe4cf8b9163efeadba129a70f93fd2 WHIRLPOOL 801eda0667c80b09f60e47c68fe759c3d245dd82d17b8d8dafe359c9bc96639dce44f18ab88dac92b338ca459dd8b69859aa795286c4fac4aab7a290213dfb22 +DIST libabw-0.1.1.tar.xz 287628 SHA256 cfc698c2dd4ab592138a941ae26e2e18c3dac69bc196b5167df7f5eb88fc217e SHA512 853dd86ecc79e8590d3163e05e145ad66240ae3cf12d206d021775a94bfb33d70aa5acdcdd193ac747baeae1ba0eed18099ea6f4515be23bdd70b431e96c4b1a WHIRLPOOL 4672c825279b20b1df92d52950eba6344d4ca99711f050069e35503b995f05fafe597706f6587d08409af3f59a64717da365e2e6101ce23665819f25ce4da9f7 EBUILD libabw-0.0.2.ebuild 880 SHA256 7c6ee598ccc3d26bcf247d98a252bf777dfa668be2fcccd50219033e07e21dba SHA512 48a5a291e28ed8512d5261b5f492b048225c610e3a477cb90baa0f8e1df1d3b49a83c708b19e7c51f88c2883c7e83bd99fe79db74b8af5898dd30d3eeb2de9c6 WHIRLPOOL 9a6bba7d45c87d823243f2ea7ccff2f090ed11c508e984ca604cc868585df47b42792f20caaf0332fb22d6326426a31a523dfcc1c36de8582ca3950c82d7d283 EBUILD libabw-0.1.0.ebuild 884 SHA256 231676ce58d9b70034aa23777ef6f26a1c1578310cf27e29c365208e564c7d2d SHA512 9b797efcbdef0710d1f149b1e3d09749316a8b0ca7e71c965c48a2a522f042e02d3ef364efc0933222d297e016944ccb7d975dfc96bfac84a25c58df520fbfe1 WHIRLPOOL 313239a0e166f9173fe218d29a8629e364da5ad2002728425fdea98c5dd160700ad9f9123428b5817885dcdea105556c45b08c1ab81dc239d88494d6b1977720 -MISC ChangeLog 1071 SHA256 e79749c5e1bf8a2d5c40d112ee10da2ce79f8bf551f53f5bf18779ad842a193b SHA512 34be9f204c52dcd1ab8cb5d1848381bf5aec58ba3434fe5d403ecb8c496aedc9f00ad054fd9c45ffd6889ef9337d02a5b1983da3343745ef208cebbb06eb22bb WHIRLPOOL 1b6d79cfcd33f332d6b764080b319cefa65ecba84f396b2e648e9b3bf8f15134a8734708d58397156361caf73086abe9af644e6118982da85b27a366e6bbff89 +EBUILD libabw-0.1.1.ebuild 1057 SHA256 fee361f9ab8125cfe5694e4c24ea9b4bd8467e0b34afde3bbf8571cd1a2b7b01 SHA512 64d52f7d7d2287114091572d633269b1c70010a2439e6fc96407082a41702be8b9ea90a63e3d43085f52b6b0a548eb48d8ceb872bcf63a8d1e9480e2d479606c WHIRLPOOL 3766d51388b0be5d1c68e475be70da9caedea12652c50d236d92d3e250b39097a3c88ff0a1021e5716156bc5dcd78fc971a3772c7ececeb21defbab8e14195ab +MISC ChangeLog 1357 SHA256 cb24d8837e10914d8632b947f54d8369506e45026efcfc1478bec263358216b3 SHA512 1c831f895cb635d10aa3b3509dd1b5ec863cb63cf4f7b9f505b4d9243d04815f64fb58278810caa604f64a92c524b4f955e756895857fcd3dc207cb27271cb85 WHIRLPOOL 66e29cda000ea6404dccc9c80621c7ead51812f6b783458a936f4eec8f0b0cf44dee82758b605ec7571a254fbc1b71bc8e4bc5ce681ddd09edc60f61e717575e MISC metadata.xml 164 SHA256 6dd077e0a4bddf8cac0a6d7fb01d5f992a81c85d77d55787d19c6d4ae4c5aeeb SHA512 acd8ec5158c34fd738af175dda4c270a884c80e76dd10d9252e2513846ae1cb69ed8b1afe328a69ced10974ca3c60366394990b98a0d9b9815527f262afd9937 WHIRLPOOL 43b43d99d3c96c6da7006df219d57a4ff853353940dbd597bbbd2be00af7b38f0e6c3e33024b1e964ef1fedb12f788ea78693b7e3527011d8bbb9757ec0b88a2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQ4PnUACgkQkKaRLQcq0GKfkQCgp/Fqvp6lNlvvsKUyHztEGjGj -EbMAoJKwl3USm34X3NOb86lEMX89OTEM -=4WWW +iQIcBAEBCAAGBQJUnsywAAoJEJS/30SErRQvaAIP/03X5g5lSyciP55ZV3SSpcDc +m3Se13QzfR6RIk01WT2/AXSwivQ5mRWSkdIeqynl1v5cYyh3raDPkIbRmbLbAien +AAmz59N/LsoZ0efWdCcS2JXUuAeaj/y4BrJTAUCubj8GvhajUXWXBszB0/rdEYRD +SvLCeoC6ftpjsdMhz0YM6u+bltRt2DwTlu+vSKCulDNKWxKbx0rIqgHA8sBRDixS +RYYYs+eH62K15Lb0C5y3iBd4UaUfoqBEu9mtWzOmEXuJNYAdpRA1XG4D9oOgEMlq +bb3Ju8pNK7knU1y1TbSYfBFa1PTuYmab24gCZ76wnafwA/Afp/Z4o4TZrLqod/Lk +7bmL0H9lciF+QukduIk93nS9p4XHcWjmLd8SH/Pjm/1v2PmacUdmUrw0RF3eFveT +mCl7CenaoRSXjpjZWnCCuqjfKS2UOzhiJr9lud6Uy41KV4r503Nk42DG0LoTs4wS +A2tKPsF7jUsOq8L8r81UqkbPDUvQARenT4YwZZRGDKSeSnKHS9Ub9ezFi7DqBfjh +MpbgZU0wsDEHHPfSX/OpM2l8OH4vIbuQZiHJwq0xtuHqXEyS9tL8bI+ZUXpW06ZW +6aHHmnBt4zfXnFg3P2P4w23/DaWoNOAnX9pbeCVRq5SNUrcZEA3z8bYy+l7RJBYE +dHtiI0GTTcEP7HDB7JyQ +=MC+N -----END PGP SIGNATURE----- diff --git a/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch b/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch new file mode 100644 index 000000000000..1df274afbe8f --- /dev/null +++ b/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch @@ -0,0 +1,27 @@ +From: David Tardon +Date: Sat, 20 Dec 2014 17:35:36 +0000 (+0100) +Subject: coverity#1259904 dereference before null check +X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=a65eb81c5e9d9da0548eb9066f9dde77a7328cc3 + +coverity#1259904 dereference before null check + +Change-Id: If53074b31a821b0764acc9e9f1b0f9d7894e2e5e +--- + +diff --git a/src/lib/ABWParser.cpp b/src/lib/ABWParser.cpp +index cf914bf..426ab54 100644 +--- a/src/lib/ABWParser.cpp ++++ b/src/lib/ABWParser.cpp +@@ -338,9 +338,11 @@ void libabw::ABWParser::readAbiword(xmlTextReaderPtr reader) + void libabw::ABWParser::readM(xmlTextReaderPtr reader) + { + xmlChar *const key = xmlTextReaderGetAttribute(reader, BAD_CAST("key")); +- m_state->m_currentMetadataKey = reinterpret_cast(key); + if (key) ++ { ++ m_state->m_currentMetadataKey = reinterpret_cast(key); + xmlFree(key); ++ } + } + + void libabw::ABWParser::readHistory(xmlTextReaderPtr reader) diff --git a/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch b/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch new file mode 100644 index 000000000000..4854072bc8a0 --- /dev/null +++ b/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch @@ -0,0 +1,35 @@ +From: David Tardon +Date: Sat, 20 Dec 2014 17:40:45 +0000 (+0100) +Subject: coverity#1259905 do not let AbiDocument::parse throw +X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=2f372e8adf8e6b1f8cf70f08adddcf66be54d94a + +coverity#1259905 do not let AbiDocument::parse throw + +This also fixes coverity#1259906 and coverity#1259907 . + +Change-Id: I55d892517ac93ca43478d51d8e4a20c704ff6790 +--- + +diff --git a/src/lib/AbiDocument.cpp b/src/lib/AbiDocument.cpp +index b8ab661..23ff750 100644 +--- a/src/lib/AbiDocument.cpp ++++ b/src/lib/AbiDocument.cpp +@@ -110,7 +110,7 @@ is not protected + \return A value that indicates whether the conversion was successful and in case it + was not, it indicates the reason of the error + */ +-ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface) ++ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface) try + { + ABW_DEBUG_MSG(("AbiDocument::parse\n")); + if (!input) +@@ -122,4 +122,9 @@ ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, libre + return true; + return false; + } ++catch (...) ++{ ++ return false; ++} ++ + /* vim:set shiftwidth=2 softtabstop=2 expandtab: */ diff --git a/app-text/libabw/libabw-0.1.1.ebuild b/app-text/libabw/libabw-0.1.1.ebuild new file mode 100644 index 000000000000..916f0ddcf042 --- /dev/null +++ b/app-text/libabw/libabw-0.1.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/libabw/libabw-0.1.1.ebuild,v 1.1 2014/12/27 15:12:21 dilfridge Exp $ + +EAPI=5 + +inherit base eutils + +DESCRIPTION="Library parsing abiword documents" +HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}" +SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="doc static-libs" + +RDEPEND=" + dev-libs/librevenge + dev-libs/libxml2 + sys-libs/zlib +" +DEPEND="${RDEPEND} + >=dev-libs/boost-1.46 + sys-devel/libtool + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +PATCHES=( + # from git master + "${FILESDIR}/${PN}-0.1.1-dereference-before-null-check.patch" + "${FILESDIR}/${PN}-0.1.1-do-not-let-AbiDocument_parse-throw.patch" +) + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --disable-werror \ + $(use_enable static-libs static) \ + $(use_with doc docs) +} + +src_install() { + default + prune_libtool_files --all +} -- 2.26.2