Fix KSysguard crashes, e.g. KDE bugs #100298, #103022.

Package-Manager: portage-2.0.54

5 files changed, 78 insertions, 46 deletions

diff --git a/kde-base/ksysguard/ChangeLog b/kde-base/ksysguard/ChangeLog
index 5846b7f76a60..39c4e7cfd296 100644
--- a/kde-base/ksysguard/ChangeLog
+++ b/kde-base/ksysguard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksysguard
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.45 2006/04/01 17:25:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.46 2006/04/03 14:23:34 carlo Exp $
+
+*ksysguard-3.5.2-r1 (03 Apr 2006)
+
+  03 Apr 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/ksysguard-3.5.2-crash-fix.diff, +ksysguard-3.5.2-r1.ebuild:
+  Fix KSysguard crashes, e.g. KDE bugs #100298, #103022.
 
   01 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> ksysguard-3.5.2.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/kde-base/ksysguard/Manifest b/kde-base/ksysguard/Manifest
index 758c24125831..67df39285331 100644
--- a/kde-base/ksysguard/Manifest
+++ b/kde-base/ksysguard/Manifest
@@ -1,61 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 850d37116d3fe4162ddfa2f7dbadaabf ChangeLog 6010
-RMD160 021ae04da522a2c0ac6c86187cd630a898d6e562 ChangeLog 6010
-SHA256 58488868bce002f0a2af43384a300a73e939c85a5fd2d1cf41578fbe380c0883 ChangeLog 6010
+MD5 d9dc23b52b1e4835510eea5fb560cdf4 ChangeLog 6217
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-ksysguard-3.4.1 212
-RMD160 507b5780112807385327a808ffffb5c897cbf1f4 files/digest-ksysguard-3.4.1 212
-SHA256 a64c99717e47d1f6143f531b9767e3e022d6c789e8d5a14aaf174814cb51a21d files/digest-ksysguard-3.4.1 212
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-ksysguard-3.4.1-r1 212
-RMD160 507b5780112807385327a808ffffb5c897cbf1f4 files/digest-ksysguard-3.4.1-r1 212
-SHA256 a64c99717e47d1f6143f531b9767e3e022d6c789e8d5a14aaf174814cb51a21d files/digest-ksysguard-3.4.1-r1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-ksysguard-3.4.2 287
-RMD160 db88376c4259165535f83f3529f0834fb2209612 files/digest-ksysguard-3.4.2 287
-SHA256 3f1b77c90587a110ffb3a1402c6f10a87ef93bfdbc1345bb2138188a52c9cb8b files/digest-ksysguard-3.4.2 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-ksysguard-3.4.3 68
-RMD160 fe4b253b0a7c2e30a2aa1d0d796dfcb11e30590a files/digest-ksysguard-3.4.3 68
-SHA256 2c163305cf238b4283a2263d089f3a5cdacfe053018c1fa5d8a5879593baf1a8 files/digest-ksysguard-3.4.3 68
 MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-ksysguard-3.5.0 68
-RMD160 d3d51e71028cc50fa4ab0cf69fd7863d21fa7841 files/digest-ksysguard-3.5.0 68
-SHA256 9d6bcd0fd5636da20d1bf023e31013fd753533b9290b40b67f3f89a3275b59cb files/digest-ksysguard-3.5.0 68
 MD5 358c22d072b322d89bd54d98403c5eb6 files/digest-ksysguard-3.5.1 68
-RMD160 e8de4cf825e2775377e7f125b1429912ad1e826e files/digest-ksysguard-3.5.1 68
-SHA256 10f133d38f99c77b6ed8c236ac66bdcfb0451b0e213dc5ec626d6adff17382b5 files/digest-ksysguard-3.5.1 68
 MD5 612323f8728d639ddab8f055f88070ff files/digest-ksysguard-3.5.2 250
-RMD160 b6e5ff095263b6bdb0f28016a100b78ce0d038ae files/digest-ksysguard-3.5.2 250
-SHA256 e5c44a3cade03e986c8babd8c9302549943c3d0da8bcd264d957ef079c4d68d0 files/digest-ksysguard-3.5.2 250
+MD5 5efe75301bc0d47d1f2af0ce2feb2603 files/digest-ksysguard-3.5.2-r1 68
 MD5 430a0cdfc39b2da16bcf5cd41b65b1d6 files/kdebase-3.4.1-configure.patch 1248
-RMD160 5542d96773b37094366695802bad0420a948dcea files/kdebase-3.4.1-configure.patch 1248
-SHA256 df2f86ecb787a28b4b7eb936d39eb20a1541f5383bb32b9c8a31c7ccf918264d files/kdebase-3.4.1-configure.patch 1248
+MD5 47c75c73f23c83e62d38658401b4c20b files/ksysguard-3.5.2-crash-fix.diff 1043
 MD5 4d73618fea5e571d8486e8d253f6915e ksysguard-3.4.1-r1.ebuild 582
-RMD160 3aa4122e900def0ae247bdf75fd51d531853f744 ksysguard-3.4.1-r1.ebuild 582
-SHA256 66eb3a41c8cb637b38cc8c9a5c686b4f4f1ea5bb6cec61a9003767431fc69ae5 ksysguard-3.4.1-r1.ebuild 582
 MD5 9fe1b72a5365ccbc9e7b788ddbc4f6b7 ksysguard-3.4.1.ebuild 446
-RMD160 384085686a08a40225ca282b1c92341e7c3e5e27 ksysguard-3.4.1.ebuild 446
-SHA256 1ac60212b1d2f9937aac017e53583e7daf6c757618056d0fac0a995e0f797ef3 ksysguard-3.4.1.ebuild 446
 MD5 ae2847a5d3a13f0813b8aefef185e54a ksysguard-3.4.2.ebuild 592
-RMD160 0e9cb3be749f4b4dc9cde7c46165c0c7bff2c74f ksysguard-3.4.2.ebuild 592
-SHA256 9bf3834b009f5a814683ddb0fee56f74597a91be6c60d3e8f46d7744849d59b9 ksysguard-3.4.2.ebuild 592
 MD5 c388907b22169601ee853aeca2f63763 ksysguard-3.4.3.ebuild 593
-RMD160 9b5ec44c12469c0536ea1a4e89880f65988fb20a ksysguard-3.4.3.ebuild 593
-SHA256 f1e29df04b6c53e47837096e462bf20d98b2693fd227a6959e947b5dd02f4328 ksysguard-3.4.3.ebuild 593
 MD5 2335ca0162c30fe77790b930e7fe6384 ksysguard-3.5.0.ebuild 638
-RMD160 b37f21b42fa3949b5b79c6339c90bc9f509ee1ae ksysguard-3.5.0.ebuild 638
-SHA256 7e5ff76dcb65254ae736983e8ffca6ca97ecad0c581693792a19126b71922d86 ksysguard-3.5.0.ebuild 638
 MD5 54090526df7269f0290ea146f811bf41 ksysguard-3.5.1.ebuild 638
-RMD160 fa3a3c25907e025f0a210cc1d3605812f7b4d1e8 ksysguard-3.5.1.ebuild 638
-SHA256 d1add65e339e53773af632f6cdfd42c2a4b3d7c7effd97ba2f40e00026775760 ksysguard-3.5.1.ebuild 638
+MD5 a82cddf483331a5b97d0e811d52a171c ksysguard-3.5.2-r1.ebuild 701
 MD5 e458b828bffc8bfe55363f5c83cc15ce ksysguard-3.5.2.ebuild 649
-RMD160 076a0cbbfb30632cc9315548bb128d54c32bef0c ksysguard-3.5.2.ebuild 649
-SHA256 31ce0bc1212321ee3f612ed1bd0db519061ce72d73014344de4150071f7dab83 ksysguard-3.5.2.ebuild 649
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
-SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFELreDAiZjviIA2XgRAgSGAKCPlBR5r6rv8MobxsO8gQnYk+yWYgCgjU5b
-yF+qOEtEaf6fvQx4kyzvUco=
-=Bfbi
------END PGP SIGNATURE-----
diff --git a/kde-base/ksysguard/files/digest-ksysguard-3.5.2-r1 b/kde-base/ksysguard/files/digest-ksysguard-3.5.2-r1
new file mode 100644
index 000000000000..9c5d5e23a110
--- /dev/null
+++ b/kde-base/ksysguard/files/digest-ksysguard-3.5.2-r1
@@ -0,0 +1 @@
+MD5 c5685e1be34e033286aa1f37002a0552 kdebase-3.5.2.tar.bz2 23590820
diff --git a/kde-base/ksysguard/files/ksysguard-3.5.2-crash-fix.diff b/kde-base/ksysguard/files/ksysguard-3.5.2-crash-fix.diff
new file mode 100644
index 000000000000..789c0c26da45
--- /dev/null
+++ b/kde-base/ksysguard/files/ksysguard-3.5.2-crash-fix.diff
@@ -0,0 +1,43 @@
+--- branches/KDE/3.5/kdebase/ksysguard/gui/ksgrd/SensorShellAgent.cc	2005/09/29 13:24:25	465343
++++ branches/KDE/3.5/kdebase/ksysguard/gui/ksgrd/SensorShellAgent.cc	2006/03/27 09:04:59	523046
+@@ -41,7 +41,7 @@
+   if ( mDaemon ) {
+     mDaemon->writeStdin( "quit\n", strlen( "quit\n" ) );
+     delete (KShellProcess*)mDaemon;
+-		mDaemon = 0;
++    mDaemon = 0;
+   }
+ }
+ 	
+@@ -50,9 +50,9 @@
+ {
+   mDaemon = new KShellProcess;
+ 
+-	setHostName( host );
+-	mShell = shell;
+-	mCommand = command;
++  setHostName( host );
++  mShell = shell;
++  mCommand = command;
+ 
+   connect( mDaemon, SIGNAL( processExited( KProcess* ) ),
+            SLOT( daemonExited( KProcess* ) ) );
+@@ -84,7 +84,7 @@
+ {
+   shell = mShell;
+   command = mCommand;
+-	port = -1;
++  port = -1;
+ }
+ 
+ void SensorShellAgent::msgSent( KProcess* )
+@@ -122,7 +122,8 @@
+   sensorManager()->hostLost( this );
+   sensorManager()->disengage( this );
+ 
+-  process->deleteLater();
++  if ( mDaemon )
++    mDaemon->deleteLater();
+ }
+ 
+ bool SensorShellAgent::writeMsg( const char *msg, int len )
diff --git a/kde-base/ksysguard/ksysguard-3.5.2-r1.ebuild b/kde-base/ksysguard/ksysguard-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..d7208d2c2f93
--- /dev/null
+++ b/kde-base/ksysguard/ksysguard-3.5.2-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-3.5.2-r1.ebuild,v 1.1 2006/04/03 14:23:34 carlo Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KDE System Guard"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="lm_sensors zeroconf"
+DEPEND="lm_sensors? ( sys-apps/lm_sensors )
+	zeroconf? ( net-misc/mDNSResponder )"
+
+src_compile() {
+	local myconf="$(use_with lm_sensors sensors)
+	              $(use_enable zeroconf dnssd)"
+
+	kde-meta_src_compile
+}
+
+PATCHES="${FILESDIR}/ksysguard-3.5.2-crash-fix.diff"
\ No newline at end of file