Fix bug #288552, /viewer-type key did not exist key, it caused gconf_client to returned a NULL GConfEntry which was stored in a Gnome::GConf::Entry object as gobject_ field, then Gnome::GConf::Entry::set_value() segfaulted (gobj() == NULL)

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

4 files changed, 78 insertions, 2 deletions

diff --git a/gnome-extra/hardware-monitor/ChangeLog b/gnome-extra/hardware-monitor/ChangeLog
index e2146c2a69d0..6265ac01f62e 100644
--- a/gnome-extra/hardware-monitor/ChangeLog
+++ b/gnome-extra/hardware-monitor/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/hardware-monitor
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/ChangeLog,v 1.26 2009/07/21 20:17:09 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/ChangeLog,v 1.27 2009/11/04 13:14:23 mrpouet Exp $
+
+*hardware-monitor-1.4.2-r1 (04 Nov 2009)
+
+  04 Nov 2009; Romain Perier <mrpouet@gentoo.org>
+  +hardware-monitor-1.4.2-r1.ebuild,
+  +files/hardware-monitor-1.4.2-create-viewer-type-key.patch:
+  Fix bug #288552, /viewer-type key did not exist key, it caused
+  gconf_client to returned a NULL GConfEntry which was stored in a
+  Gnome::GConf::Entry object as gobject_ field, then
+  Gnome::GConf::Entry::set_value() segfaulted (gobj() == NULL).
 
   22 Jul 2009; Romain Perier <mrpouet@gentoo.org> hardware-monitor-1.4.2.ebuild:
   Changed sys-apps/lm_sensors to >=sys-apps/lm_sensors-3 into RDEPEND
diff --git a/gnome-extra/hardware-monitor/Manifest b/gnome-extra/hardware-monitor/Manifest
index bc10f01455b0..591d2d1cfd60 100644
--- a/gnome-extra/hardware-monitor/Manifest
+++ b/gnome-extra/hardware-monitor/Manifest
@@ -1,11 +1,13 @@
 AUX hardware-monitor-1.4-libgnomeui.patch 1012 RMD160 832bb751ac22c291b1e1ee25931b69adc9dc1067 SHA1 85339ef4091fc9d134860cc3b60924ac3945f5c8 SHA256 022b42666888407991620eda006d9f242aa8e0ed1222166820f8c010da4e5282
+AUX hardware-monitor-1.4.2-create-viewer-type-key.patch 728 RMD160 211c8ef2ff33e63c508c2c8231bedfdeefe93c37 SHA1 e7cb62d3eacd66b05d65cefa947d5005445f376e SHA256 db0eab01ff86fc2eec85778938abfda3384845f7f89999439792abaf50df704b
 DIST hardware-monitor-1.2.1.tar.bz2 297674 RMD160 40256f45bd918a444d15be37aff6e39333424b41 SHA1 6e46d85e1495c27b36c552f2352d36c0b3fcfa12 SHA256 d25e98819cce8fa2fe708a9423941a7cabcc6910142f5494d2ec830c70b1a0e7
 DIST hardware-monitor-1.3.tar.bz2 309565 RMD160 f564991c1479890077e4d4f4bcf4bee1d96f92dc SHA1 177c8ca641ac5641737707a0997f7605f9a7c835 SHA256 0604b39711a291159a97b41809071381d0ed9add2562c55704dee38b4510a280
 DIST hardware-monitor-1.4.2.tar.bz2 219872 RMD160 58ecffc6fc2d2425cf1c5cb376c4a104a970b15b SHA1 8e4ce4b5c5b5809c8e4ec8757715fb40977d413f SHA256 1ea4f25b1c15e4f97db1ff91beda1b2a9ceb70cf3c91e329298ca2771e50f3a9
 DIST hardware-monitor-1.4.tar.bz2 245652 RMD160 1719cb3afb8debbd6e8b7203cdd383c3d9d765d9 SHA1 2c94503455fff65f84c8906a504339881716c7ed SHA256 1cf1b0e0f45fbf634aeb0442c65f11abab231885537daa45d2b9c29380d7e998
 EBUILD hardware-monitor-1.2.1.ebuild 808 RMD160 2b06941982b6ad656d43da63c73082137b5d2f05 SHA1 e8231243bbc8d21f766d2cddda36916a283a15aa SHA256 2b3f9a1e01b2f8137feda2125e425aa53e291efdfcf1e7a941646f348549d266
 EBUILD hardware-monitor-1.3.ebuild 768 RMD160 b561372a1f6748c9b4a611159903db54a396d945 SHA1 5751cce99be60019e927b455934cb49cbe5de8c4 SHA256 d67f0f011e02a1dc5190fa41c21164aa24c3ab1a524e73a66909982f3528ab09
+EBUILD hardware-monitor-1.4.2-r1.ebuild 1203 RMD160 ab7f5aa1851286a4fc192f6ee96bb5632c96d8b8 SHA1 16fb537e675b801f6fe09596bf6bff6389aab64e SHA256 57257c6edd6ab4cb0f4c72308907296cb0ab4e6deaf1923d1b318028544c8dad
 EBUILD hardware-monitor-1.4.2.ebuild 962 RMD160 43dc40ad013aef8ac7439b10df720d778f60aded SHA1 f2086cae858edd9050f3cf87ddea80446abc8ac0 SHA256 bf133398e3aa0db912d667e09786bf713eb6b2295361f2b6bce2f68fc601c072
 EBUILD hardware-monitor-1.4.ebuild 1134 RMD160 e23bb4e68f187b9264813aa9e791b3221ae5ea1f SHA1 f2ce1e24e57ec647ee659bdd3119aa1904694438 SHA256 a57d2805114c9c1aea77cb9ce1b966e29cac171b07570dc0093673699439f81e
-MISC ChangeLog 4188 RMD160 11164152352b9edec4005c26e02c556bc3826bca SHA1 d560255aebb98eeba84fe8bb8c7196a19a70a75b SHA256 68b5d926b42a152d241bf268cdc0f7f5efd3b86bced497b359f5ac7999357852
+MISC ChangeLog 4629 RMD160 d6af39a8d1cc954d0d4f0ca77737255d7df5a01e SHA1 165985443fcb0c11f1df5961ed99671a6dea2dbf SHA256 792debc371c100064f367583eb83b54466e8ce81033f7bacaaa5b8420fa1dcbb
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/gnome-extra/hardware-monitor/files/hardware-monitor-1.4.2-create-viewer-type-key.patch b/gnome-extra/hardware-monitor/files/hardware-monitor-1.4.2-create-viewer-type-key.patch
new file mode 100644
index 000000000000..101f8f3e55d1
--- /dev/null
+++ b/gnome-extra/hardware-monitor/files/hardware-monitor-1.4.2-create-viewer-type-key.patch
@@ -0,0 +1,19 @@
+From: Romain Perier <mrpouet@gentoo.org>
+Date: Wed, 4 Nov 2009 13:01:01 +0100
+Subject: Set and create /viewer_type key to avoid to have a NULL GConfEntry stored in a Gnome::Gconf::Entry object retourned by gconf_client->get_entry(), when this key does not exist yet.
+
+---
+ src/applet.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+--- a/src/applet.cpp
++++ b/src/applet.cpp
+@@ -81,6 +81,7 @@ Applet::Applet(PanelApplet *a)
+   // circumvent GConf bug (FIXME: report it)
+   gconf_client->set(gconf_dir + "/dummy", 0);
+   gconf_client->set(gconf_dir + "/monitors/dummy", 0);
++  gconf_client->set(gconf_dir + "/viewer_type", "curve");
+   
+   // connect GConf
+   gconf_client->notify_add(gconf_dir + "/viewer_type",
+
diff --git a/gnome-extra/hardware-monitor/hardware-monitor-1.4.2-r1.ebuild b/gnome-extra/hardware-monitor/hardware-monitor-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..9aa0e55af0da
--- /dev/null
+++ b/gnome-extra/hardware-monitor/hardware-monitor-1.4.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/hardware-monitor-1.4.2-r1.ebuild,v 1.1 2009/11/04 13:14:23 mrpouet Exp $
+
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils
+
+DESCRIPTION="Gnome2 Hardware Monitor Applet"
+HOMEPAGE="http://people.iola.dk/olau/hardware-monitor/"
+SRC_URI="http://people.iola.dk/olau/hardware-monitor/source/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="lm_sensors"
+
+RDEPEND=">=dev-cpp/gconfmm-2.6.0
+		>=dev-cpp/gtkmm-2.6.0
+		>=dev-cpp/libgnomecanvasmm-2.6.0
+		>=dev-cpp/libglademm-2.6.0
+		>=gnome-base/gnome-panel-2
+		>=gnome-base/libgnomeui-2.20.1
+		>=gnome-base/libgtop-2.6.0
+		lm_sensors? ( >=sys-apps/lm_sensors-3 )"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		>=dev-util/intltool-0.29"
+
+DOCS="AUTHORS ChangeLog NEWS"
+
+pkg_setup() {
+	G2CONF="${G2CONF} \
+			$(use_with lm_sensors libsensors)"
+
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Set and create "/viewer-type" key which does not exist yet
+	# when the applet is loaded, in order to avoid a segfault,
+	# bug 288552.
+	epatch "${FILESDIR}/${P}-create-viewer-type-key.patch"
+}