Fix segfault, bug 196230.

Package-Manager: portage-2.2.0_alpha96/cvs/Linux x86_64

4 files changed, 123 insertions, 3 deletions

diff --git a/app-text/opensp/ChangeLog b/app-text/opensp/ChangeLog
index ec8c66eb9422..d85ac1eefc2d 100644
--- a/app-text/opensp/ChangeLog
+++ b/app-text/opensp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/opensp
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/opensp/ChangeLog,v 1.54 2011/07/24 08:47:44 pva Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/opensp/ChangeLog,v 1.55 2012/03/30 22:03:01 floppym Exp $
+
+*opensp-1.5.2-r3 (30 Mar 2012)
+
+  30 Mar 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/opensp-1.5.2-fix-segfault.patch, +opensp-1.5.2-r3.ebuild:
+  Fix segfault, bug 196230.
 
   24 Jul 2011; Peter Volkov <pva@gentoo.org> opensp-1.5.2-r2.ebuild:
   Add app-text/sgml-common as a test dependency, thank Jakub Januszkiewicz and
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index bb788b89ca33..993fbd923f6d 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX opensp-1.5-gcc34.patch 263 RMD160 4c22af53f8b28df8244cf6bb3831900fe6408358 SHA1 d6ce11b77a5a903005dedd67b679f69d387b9a39 SHA256 679aa70752d48a6bd0d2ff32c8e4c7153f2ce6e50a43cdffe9a3f4bf23e68264
+AUX opensp-1.5.2-fix-segfault.patch 747 RMD160 d83bcaf967976add572c29c26df4b730bb4052fd SHA1 77db5ef6fc859c9f735d81f8756a76bc9437e305 SHA256 d60915133b0d00ccd5453864af4e389e50825071f70bb2c7f88e53d9fd81246b
 DIST OpenSP-1.5.2.tar.gz 1521390 RMD160 6e671a267562c5b9283e7e6504e8339cb1d86850 SHA1 b4e903e980f8a8b3887396a24e067bef126e97d5 SHA256 57f4898498a368918b0d49c826aa434bb5b703d2c3b169beb348016ab25617ce
 EBUILD opensp-1.5.2-r2.ebuild 2196 RMD160 b8f488bc396158c7a6ce714111bf0d6af97bcb66 SHA1 4011b44b946ba24f0431f7a373690a017fc13cfa SHA256 5cf8fedc7e0425eff219c53ff358baede87a8286b8d19e9c3994451cad42120e
-MISC ChangeLog 6618 RMD160 324bf893c61f022f5aac9daf1d0fb87e5fe1daa9 SHA1 e7671c95692cd7c47f6d24f60f0c5d7bccf4b581 SHA256 0a98ee553e7ee8bcde3ab6fcf061c48df9d81ccade4e22cc0780d8d8786d5da8
+EBUILD opensp-1.5.2-r3.ebuild 2258 RMD160 639842899e30cfd8ee85ecc71eefe0d04c60e98c SHA1 49b7101b344af83ac0d408e2d0f9705d374d1223 SHA256 26cea705f00fa260ced5544435b5bc6ef767958f4f5805da838d46c0f39af1ce
+MISC ChangeLog 6799 RMD160 bda92f9e171bb0851ead61ab99a0380c0bf9730f SHA1 6aca0cb878b5017987367289aebdbe157fb7bfd3 SHA256 aee02b89481a76dafe7c0e71cb3b8bd1438ab58cb4e3ee1d0dcbcf06f8ce2e1d
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk92LZsACgkQC77qH+pIQ6QjDwEAq2FOAjnlHgfnqAFXWBpwVddm
+gT4VmrbDKxie23jXZvsA/3+2qQSaAruBMnRhsrXRzWxrbXIQBp8urcqNjub0FRVG
+=QxIl
+-----END PGP SIGNATURE-----
diff --git a/app-text/opensp/files/opensp-1.5.2-fix-segfault.patch b/app-text/opensp/files/opensp-1.5.2-fix-segfault.patch
new file mode 100644
index 000000000000..5a9d328da915
--- /dev/null
+++ b/app-text/opensp/files/opensp-1.5.2-fix-segfault.patch
@@ -0,0 +1,23 @@
+Resolve segfault in OpenSP::ParsedSystemId::unparse.
+Patch taken from Debian.
+https://bugs.gentoo.org/show_bug.cgi?id=196230
+--- a/lib/ExtendEntityManager.cxx
++++ b/lib/ExtendEntityManager.cxx
+@@ -1238,7 +1238,8 @@
+ }
+ 
+ StorageObjectSpec::StorageObjectSpec(const StorageObjectSpec& x)
+-: codingSystemName(x.codingSystemName),
++: storageManager(x.storageManager),
++  codingSystemName(x.codingSystemName),
+   codingSystem(x.codingSystem),
+   specId(x.specId),
+   baseId(x.baseId),
+@@ -1253,6 +1254,7 @@
+ StorageObjectSpec& StorageObjectSpec::operator=(const StorageObjectSpec& x)
+ {
+   if (this != &x) {
++    storageManager = x.storageManager;
+     codingSystemName = x.codingSystemName;
+     codingSystem = x.codingSystem;
+     specId = x.specId;
diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r3.ebuild
new file mode 100644
index 000000000000..af2e9e529aa3
--- /dev/null
+++ b/app-text/opensp/opensp-1.5.2-r3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/opensp/opensp-1.5.2-r3.ebuild,v 1.1 2012/03/30 22:03:01 floppym Exp $
+
+EAPI=2
+inherit eutils flag-o-matic
+
+MY_P=${P/opensp/OpenSP}
+DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management"
+HOMEPAGE="http://openjade.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
+
+LICENSE="JamesClark"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="doc nls static-libs test"
+
+DEPEND="nls? ( >=sys-devel/gettext-0.14.5 )
+	doc? (
+		app-text/xmlto
+		~app-text/docbook-xml-dtd-4.1.2
+	)
+	test? ( app-text/sgml-common )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.5-gcc34.patch
+	epatch "${FILESDIR}"/${P}-fix-segfault.patch
+}
+
+src_configure() {
+	#
+	# The following filters are taken from openjade's ebuild. See bug #100828.
+	#
+
+	# Please note!  Opts are disabled.  If you know what you're doing
+	# feel free to remove this line.  It may cause problems with
+	# docbook-sgml-utils among other things.
+	ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
+	strip-flags
+
+	econf \
+		--disable-dependency-tracking \
+		--enable-http \
+		--enable-default-catalog=/etc/sgml/catalog   \
+		--enable-default-search-path=/usr/share/sgml \
+		--datadir=/usr/share/sgml/${P}               \
+		$(use_enable nls) \
+		$(use_enable doc doc-build) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake pkgdocdir=/usr/share/doc/${PF} || die "Compilation failed"
+}
+
+src_test() {
+	echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	einfo "Skipping tests known not to work"
+	make SHOWSTOPPERS= check || die "Make test failed"
+	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		pkgdocdir=/usr/share/doc/${PF} install || die "Installation failed"
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	ewarn "Please note that the soname of the library changed."
+	ewarn "If you are upgrading from a previous version you need"
+	ewarn "to fix dynamic linking inconsistencies by executing:"
+	ewarn
+	ewarn "    revdep-rebuild --library='libosp.so.*'"
+}