From: Peter Volkov Date: Mon, 5 Jun 2006 14:00:20 +0000 (+0000) Subject: Fix for another crash reported in bug 135493. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=67d3f3a0423a3b230e40317ae3e0f94fbbf09d6f;p=gentoo.git Fix for another crash reported in bug 135493. Package-Manager: portage-2.0.54-r2 --- diff --git a/net-analyzer/sussen/ChangeLog b/net-analyzer/sussen/ChangeLog index d03563a89a3f..66ebcc47b63b 100644 --- a/net-analyzer/sussen/ChangeLog +++ b/net-analyzer/sussen/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/sussen # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/ChangeLog,v 1.17 2006/06/04 18:11:15 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/ChangeLog,v 1.18 2006/06/05 14:00:20 pva Exp $ + +*sussen-0.22-r2 (05 Jun 2006) + + 05 Jun 2006; Peter Volkov + +files/sussen-0.22-panel-applet-crash.patch, -sussen-0.22.ebuild, + -sussen-0.22-r1.ebuild, +sussen-0.22-r2.ebuild: + Fix for another crash reported in bug 135493. *sussen-0.22-r1 (04 Jun 2006) diff --git a/net-analyzer/sussen/Manifest b/net-analyzer/sussen/Manifest index 597b6a7ca1aa..236ecdeb3ecf 100644 --- a/net-analyzer/sussen/Manifest +++ b/net-analyzer/sussen/Manifest @@ -1,19 +1,18 @@ -MD5 62efc3fc33696f3fe0e1d6d467fc9827 ChangeLog 2328 +MD5 d30cca113e244512f4293081d2a4ed51 ChangeLog 2571 MD5 913a9112332add1b07f8e13567ef78c6 files/digest-sussen-0.10 63 MD5 6bbd8221dae260aa294014e79587f74d files/digest-sussen-0.12 63 MD5 034a05b578eae1d70b56349b853e5d92 files/digest-sussen-0.15 63 MD5 7909b6528ae1de89d5682b72b3dca83d files/digest-sussen-0.19 63 MD5 e3343da7f441c043bcebf6e0b1a08e3a files/digest-sussen-0.21 63 -MD5 2155275b1249ccfcc99963dd9546ca5e files/digest-sussen-0.22 63 -MD5 2155275b1249ccfcc99963dd9546ca5e files/digest-sussen-0.22-r1 63 +MD5 2155275b1249ccfcc99963dd9546ca5e files/digest-sussen-0.22-r2 63 MD5 5dd20ca6159958efc7303bd449ea592e files/digest-sussen-0.5.3 64 MD5 06d36be407bde33246cc4cea8ded89b9 files/sussen-0.22-applet-cancel-scan-crash.patch 752 +MD5 4a32ed3facb737fe788b06ce6301e3cd files/sussen-0.22-panel-applet-crash.patch 1116 MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160 MD5 284a33f91290e58dc976067ff9438ae5 sussen-0.10.ebuild 745 MD5 eb4b0f734206dfbff9990d9a1edb216f sussen-0.12.ebuild 745 MD5 b1481061b30678b085039bd5c9952ef8 sussen-0.15.ebuild 855 MD5 60d350134a4ad2790feccb71a4e472a9 sussen-0.19.ebuild 1139 MD5 7d6ed18daf3a7e934469d3cbe9d78e97 sussen-0.21.ebuild 1478 -MD5 3b79157a50e345d77209f4e75c60d5d4 sussen-0.22-r1.ebuild 1541 -MD5 97aee108b0a5f075ad5c0c59a3ba3fd4 sussen-0.22.ebuild 1436 +MD5 6da7776089b27b1564508db3c010e459 sussen-0.22-r2.ebuild 1591 MD5 606a391d68a2efbd6f306c20cd73fdbe sussen-0.5.3.ebuild 1118 diff --git a/net-analyzer/sussen/files/digest-sussen-0.22-r1 b/net-analyzer/sussen/files/digest-sussen-0.22-r1 deleted file mode 100644 index 1f0c4bb7b5ef..000000000000 --- a/net-analyzer/sussen/files/digest-sussen-0.22-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 e4176264bf3f14e6badb726e18a14c4d sussen-0.22.tar.gz 765383 diff --git a/net-analyzer/sussen/files/digest-sussen-0.22 b/net-analyzer/sussen/files/digest-sussen-0.22-r2 similarity index 100% rename from net-analyzer/sussen/files/digest-sussen-0.22 rename to net-analyzer/sussen/files/digest-sussen-0.22-r2 diff --git a/net-analyzer/sussen/files/sussen-0.22-panel-applet-crash.patch b/net-analyzer/sussen/files/sussen-0.22-panel-applet-crash.patch new file mode 100644 index 000000000000..e44766568264 --- /dev/null +++ b/net-analyzer/sussen/files/sussen-0.22-panel-applet-crash.patch @@ -0,0 +1,41 @@ +diff -Naur sussen-0.22.orig/applet/ActionDialog.cs sussen-0.22/applet/ActionDialog.cs +--- sussen-0.22.orig/applet/ActionDialog.cs 2006-06-05 17:42:51.000000000 +0400 ++++ sussen-0.22/applet/ActionDialog.cs 2006-06-05 17:41:20.000000000 +0400 +@@ -269,6 +269,14 @@ + + return retVal; + } ++ ++ static string GetTempFileName () ++ { ++ string tmpFile = Path.GetTempFileName (); ++ File.Delete (tmpFile); ++ ++ return tmpFile; ++ } + + public void OnExecuteClicked (object o, EventArgs args) + { +@@ -307,6 +315,8 @@ + + return; + } ++ } else { ++ config.DataFileName = GetTempFileName (); + } + + if (saveResultsCheckButton.Active) { +diff -Naur sussen-0.22.orig/applet/Applet.cs sussen-0.22/applet/Applet.cs +--- sussen-0.22.orig/applet/Applet.cs 2006-05-13 19:38:50.000000000 +0400 ++++ sussen-0.22/applet/Applet.cs 2006-06-05 17:42:27.000000000 +0400 +@@ -152,7 +152,9 @@ + tips.Enable (); + tips.Sink (); + +- Console.WriteLine ("{0} created.", Defines.PACKAGE); ++ Console.WriteLine ("{0} created.", Defines.PACKAGE); ++ ++ program.Run (); + } + + void ShowScanSystemDialog () diff --git a/net-analyzer/sussen/sussen-0.22-r1.ebuild b/net-analyzer/sussen/sussen-0.22-r2.ebuild similarity index 93% rename from net-analyzer/sussen/sussen-0.22-r1.ebuild rename to net-analyzer/sussen/sussen-0.22-r2.ebuild index ebc6c37b0130..e26cb1d751c5 100644 --- a/net-analyzer/sussen/sussen-0.22-r1.ebuild +++ b/net-analyzer/sussen/sussen-0.22-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/sussen-0.22-r1.ebuild,v 1.1 2006/06/04 18:11:15 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/sussen-0.22-r2.ebuild,v 1.1 2006/06/05 14:00:20 pva Exp $ inherit gnome2 mono autotools @@ -32,6 +32,7 @@ src_unpack() { pwd epatch ${FILESDIR}/${P}-applet-cancel-scan-crash.patch + epatch ${FILESDIR}/${P}-panel-applet-crash.patch } src_compile () { diff --git a/net-analyzer/sussen/sussen-0.22.ebuild b/net-analyzer/sussen/sussen-0.22.ebuild deleted file mode 100644 index 417f3d34dbae..000000000000 --- a/net-analyzer/sussen/sussen-0.22.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/sussen-0.22.ebuild,v 1.1 2006/05/29 17:07:47 pva Exp $ - -inherit gnome2 mono autotools - -DESCRIPTION="Sussen is a tool that checks for vulnerabilities and configuration issues on computer systems" -HOMEPAGE="http://dev.mmgsecurity.com/projects/sussen/" -SRC_URI="http://dev.mmgsecurity.com/downloads//${PN}/${P}.tar.gz" -LICENSE="GPL-2" -IUSE="doc" -SLOT="0" -KEYWORDS="~x86 ~amd64" - -RDEPEND="=dev-lang/mono-1.1* - >=dev-dotnet/gtk-sharp-2.4 - >=dev-dotnet/gnome-sharp-2.4 - >=dev-dotnet/gconf-sharp-2.4 - >=dev-dotnet/glade-sharp-2.4 - gnome-base/gnome-panel" - -DEPEND="${RDEPEND} - doc? ( >=dev-util/monodoc-1.1.8 ) - app-arch/rpm - >=dev-util/intltool-0.34.2" - -DOCS="AUTHORS ChangeLog NEWS README TODO" - -src_compile () { - econf ${myconf} || die "./configure failed" - LANG=C emake -j1 || die -} - -src_install () { - make GACUTIL_FLAGS="/root ${D}/usr/$(get_libdir) /gacdir /usr/$(get_libdir) /package ${PN}" \ - DESTDIR=${D} install || die - - dodoc ${DOCS} - - einfo "sussen-applet is a GNOME applet. You can not run it directly from" - einfo "the command line. Use GNOME panel to invoke it." - einfo "You can also run it as the tray icon: sussen-applet --tray-icon" - echo - ewarn "sussen-editor is still work in progress. Just basic functionality is" - ewarn "working (New, Save, Execute)." - echo -}