Apply freebsd patch to fix segmentation fault on hardened platforms. Bug #335736. Thanks to Constantine D. Kardaris <ckardaris@gmail.com> for reporting

Package-Manager: portage-2.2_rc75/cvs/Linux x86_64

4 files changed, 75 insertions, 2 deletions

diff --git a/x11-misc/obconf/ChangeLog b/x11-misc/obconf/ChangeLog
index 35559fedb62f..0a3449e0ae2e 100644
--- a/x11-misc/obconf/ChangeLog
+++ b/x11-misc/obconf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/obconf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/ChangeLog,v 1.67 2010/06/22 09:17:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/ChangeLog,v 1.68 2010/09/07 11:25:39 hwoarang Exp $
+
+*obconf-2.0.3-r1 (07 Sep 2010)
+
+  07 Sep 2010; Markos Chandras <hwoarang@gentoo.org>
+  +obconf-2.0.3-r1.ebuild, +files/obconf-2.0.3-hardened.patch:
+  Apply freebsd patch to fix segmentation fault on hardened platforms. Bug
+  #335736. Thanks to Constantine D. Kardaris <ckardaris@gmail.com> for
+  reporting
 
   22 Jun 2010; Markos Chandras <hwoarang@gentoo.org> +obconf-9999.ebuild:
   Moved live ebuild from lxde-overlay
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index 7c100f1cfda9..b1535ac08954 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX obconf-2.0.3-hardened.patch 273 RMD160 d86bbce7a76b89f8c73e7618aa423cb8ac92dc86 SHA1 455ac0d2e54f48b0d684f13db8940e542bd058d2 SHA256 00e6bba8e2f4409f7480757107266f679b71729870a9ecd9b0fb4fefcfd2ec4f
 DIST obconf-2.0.3.tar.gz 267589 RMD160 6d6d48c16e78bc8ac48382719e692505845c6286 SHA1 40c22a2b0e884016592558b9119afcafcac674ec SHA256 f6c1cdac2667fc8b49513b7f21ef935851b594b9d8577aa86da105cce8fc3c1c
+EBUILD obconf-2.0.3-r1.ebuild 1102 RMD160 4a6d88e931efd04ba46cf00932d6c7ab8656249d SHA1 bba1b4ff599cf3bf214f1cdcc41f088279d21676 SHA256 d85e2e5e22fbfaf1df430e91a9c71716caa4ad162b1e0da342cba829e2a2c90c
 EBUILD obconf-2.0.3.ebuild 972 RMD160 f1d3140a90593e657261251fa74796b907650f6c SHA1 da91e6265b143d8488b07da69ae037cbf7e37f09 SHA256 801c49f24a1e87fc4221f1230102ec9e8b5c8b57c121d39ee8281ea37ca1ccd3
 EBUILD obconf-9999.ebuild 1062 RMD160 12b047754d3913dec34da6a26038613e485d5f9a SHA1 7bd46610de5074fae3217e64b78640889b33870a SHA256 16fb28b81676b6fae2536e1283e49b39fe27a34c27c4de4a2e3de74c7d0ec4fa
-MISC ChangeLog 7392 RMD160 c4959e23a165814fcca6731f3ea9f2c429aebed0 SHA1 267621678d030d4077ecb531c50d40dc67e2a83e SHA256 999be79bb968b1d68064fc2820813c599ee6d76dafd40f70d0c9247aae3745e6
+MISC ChangeLog 7699 RMD160 17b6e04d6d41ebd0df518d9a32b041e8ddf6d009 SHA1 6590c9e70c0d329a18f48761077b5f3b4bac9c8c SHA256 e45f071ddb5638ff20cc1a6e631c8f35278004526bb8c1f5db49b9245318ccaa
 MISC metadata.xml 264 RMD160 92eb765340aae0bcbece64a41a2d40deb25830ac SHA1 a971dcfe83de5a7ff2b35a4c2f086bdd37e36461 SHA256 073600319f379a7cfb95014eae81fa6a8bcf0e95263994791756030be3338e8d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyGIRgACgkQ9/cejkQaxBCaNwCfaFiY5BGHQ5O/KaCGU1r4cOf8
+bnUAn1Gs6UPqoSchVEDpvkysxalntzwe
+=4Fag
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/obconf/files/obconf-2.0.3-hardened.patch b/x11-misc/obconf/files/obconf-2.0.3-hardened.patch
new file mode 100644
index 000000000000..31621f9c323b
--- /dev/null
+++ b/x11-misc/obconf/files/obconf-2.0.3-hardened.patch
@@ -0,0 +1,8 @@
+--- ./src/preview_update.c.orig	2010-05-12 20:09:07.177608591 +0400
++++ ./src/preview_update.c	2010-05-12 20:09:21.638774481 +0400
+@@ -1,4 +1,5 @@
+ #include "preview_update.h"
++#include "preview.h"
+ #include "main.h"
+ 
+ static gboolean restart_theme_preview_update = TRUE;
diff --git a/x11-misc/obconf/obconf-2.0.3-r1.ebuild b/x11-misc/obconf/obconf-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..9f3bd15ea39b
--- /dev/null
+++ b/x11-misc/obconf/obconf-2.0.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-2.0.3-r1.ebuild,v 1.1 2010/09/07 11:25:39 hwoarang Exp $
+
+EAPI="2"
+
+inherit eutils fdo-mime
+
+DESCRIPTION="ObConf is a tool for configuring the Openbox window manager."
+HOMEPAGE="http://icculus.org/openbox/index.php/ObConf:About"
+SRC_URI="http://icculus.org/openbox/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="nls"
+
+RDEPEND=">=gnome-base/libglade-2
+	>=x11-libs/gtk+-2
+	x11-libs/startup-notification
+	>=x11-wm/openbox-3.4.2
+	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	# fix segfault on hardened. Bug #335736
+	epatch "${FILESDIR}/${P}-hardened.patch"
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}