[Pkg-cli-libs-commits] [SCM] mono-addins branch, master, updated. debian/0.6.1-1-3-gceebcda
Iain Lane
laney at debian.org
Tue Aug 2 16:34:08 UTC 2011
The following commit has been merged in the master branch:
commit 30fe70df244e1e86c714887928db6b338f8d61d1
Author: Iain Lane <laney at debian.org>
Date: Tue Aug 2 17:05:43 2011 +0100
Cherry-pick patch to fix crash when looking for addin description
Thanks: Andrés G. Aragoneses <knocte at gmail.com>
Closes: #630590
diff --git a/debian/patches/configurable_compiler.patch b/debian/patches/0001-configurable_compiler.patch.patch
similarity index 50%
rename from debian/patches/configurable_compiler.patch
rename to debian/patches/0001-configurable_compiler.patch.patch
index c1b361d..222bf99 100644
--- a/debian/patches/configurable_compiler.patch
+++ b/debian/patches/0001-configurable_compiler.patch.patch
@@ -1,7 +1,21 @@
-Index: mono-addins.git/Mono.Addins.Gui/Makefile.am
+From: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
+Date: Tue, 2 Aug 2011 14:31:49 +0100
+Subject: configurable_compiler.patch
+
===================================================================
---- mono-addins.git.orig/Mono.Addins.Gui/Makefile.am 2011-02-26 14:41:07.000000000 +0000
-+++ mono-addins.git/Mono.Addins.Gui/Makefile.am 2011-02-26 15:08:17.673251475 +0000
+---
+ Mono.Addins.Gui/Makefile.am | 2 +-
+ Mono.Addins.MSBuild/Makefile.am | 2 +-
+ Mono.Addins.Setup/Makefile.am | 2 +-
+ Mono.Addins/Makefile.am | 2 +-
+ Test/SystemInfoExtension/Makefile.am | 2 +-
+ mautil/Makefile.am | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Mono.Addins.Gui/Makefile.am b/Mono.Addins.Gui/Makefile.am
+index 0705ae4..1f21cd2 100644
+--- a/Mono.Addins.Gui/Makefile.am
++++ b/Mono.Addins.Gui/Makefile.am
@@ -1,6 +1,6 @@
KEY_FILE=$(top_srcdir)/mono-addins.snk
@@ -10,10 +24,22 @@ Index: mono-addins.git/Mono.Addins.Gui/Makefile.am
ASSEMBLY_COMPILER_FLAGS = -unsafe -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
ASSEMBLY = ../bin/Mono.Addins.Gui.dll
ASSEMBLY_NAME=Mono.Addins.Gui
-Index: mono-addins.git/Mono.Addins.Setup/Makefile.am
-===================================================================
---- mono-addins.git.orig/Mono.Addins.Setup/Makefile.am 2011-02-26 14:41:07.000000000 +0000
-+++ mono-addins.git/Mono.Addins.Setup/Makefile.am 2011-02-26 15:09:45.124721987 +0000
+diff --git a/Mono.Addins.MSBuild/Makefile.am b/Mono.Addins.MSBuild/Makefile.am
+index 6b74000..bc8bc07 100644
+--- a/Mono.Addins.MSBuild/Makefile.am
++++ b/Mono.Addins.MSBuild/Makefile.am
+@@ -1,6 +1,6 @@
+
+ KEY_FILE=$(top_srcdir)/mono-addins.snk
+-ASSEMBLY_COMPILER_COMMAND = gmcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/Mono.Addins.MSBuild.dll
+ ASSEMBLY_NAME=Mono.Addins.MSBuild
+diff --git a/Mono.Addins.Setup/Makefile.am b/Mono.Addins.Setup/Makefile.am
+index 598f62f..f77b391 100644
+--- a/Mono.Addins.Setup/Makefile.am
++++ b/Mono.Addins.Setup/Makefile.am
@@ -1,6 +1,6 @@
KEY_FILE=$(top_srcdir)/mono-addins.snk
@@ -22,10 +48,10 @@ Index: mono-addins.git/Mono.Addins.Setup/Makefile.am
ASSEMBLY_COMPILER_FLAGS = -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
ASSEMBLY = ../bin/Mono.Addins.Setup.dll
ASSEMBLY_NAME=Mono.Addins.Setup
-Index: mono-addins.git/Mono.Addins/Makefile.am
-===================================================================
---- mono-addins.git.orig/Mono.Addins/Makefile.am 2011-02-26 14:41:07.000000000 +0000
-+++ mono-addins.git/Mono.Addins/Makefile.am 2011-02-26 15:08:00.570282500 +0000
+diff --git a/Mono.Addins/Makefile.am b/Mono.Addins/Makefile.am
+index d5c1442..13ebaa8 100644
+--- a/Mono.Addins/Makefile.am
++++ b/Mono.Addins/Makefile.am
@@ -1,6 +1,6 @@
KEY_FILE=$(top_srcdir)/mono-addins.snk
@@ -34,20 +60,20 @@ Index: mono-addins.git/Mono.Addins/Makefile.am
ASSEMBLY_COMPILER_FLAGS = -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
ASSEMBLY = ../bin/Mono.Addins.dll
ASSEMBLY_NAME=Mono.Addins
-Index: mono-addins.git/Test/SystemInfoExtension/Makefile.am
-===================================================================
---- mono-addins.git.orig/Test/SystemInfoExtension/Makefile.am 2011-02-26 14:41:07.000000000 +0000
-+++ mono-addins.git/Test/SystemInfoExtension/Makefile.am 2011-02-26 15:09:05.040171802 +0000
+diff --git a/Test/SystemInfoExtension/Makefile.am b/Test/SystemInfoExtension/Makefile.am
+index 41aa6a7..f20e289 100644
+--- a/Test/SystemInfoExtension/Makefile.am
++++ b/Test/SystemInfoExtension/Makefile.am
@@ -1,4 +1,4 @@
-ASSEMBLY_COMPILER_COMMAND = gmcs
+ASSEMBLY_COMPILER_COMMAND = @MCS@
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
ASSEMBLY = ../lib/SystemInfoExtension.dll
COMPILE_TARGET = library
-Index: mono-addins.git/mautil/Makefile.am
-===================================================================
---- mono-addins.git.orig/mautil/Makefile.am 2011-02-26 14:41:07.000000000 +0000
-+++ mono-addins.git/mautil/Makefile.am 2011-02-26 15:08:29.495151101 +0000
+diff --git a/mautil/Makefile.am b/mautil/Makefile.am
+index 89c7df6..0e92ef0 100644
+--- a/mautil/Makefile.am
++++ b/mautil/Makefile.am
@@ -1,5 +1,5 @@
-ASSEMBLY_COMPILER_COMMAND = gmcs
@@ -55,15 +81,4 @@ Index: mono-addins.git/mautil/Makefile.am
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
ASSEMBLY = ../bin/mautil.exe
COMPILE_TARGET = exe
-Index: mono-addins.git/Mono.Addins.MSBuild/Makefile.am
-===================================================================
---- mono-addins.git.orig/Mono.Addins.MSBuild/Makefile.am 2011-02-26 15:09:53.815569439 +0000
-+++ mono-addins.git/Mono.Addins.MSBuild/Makefile.am 2011-02-26 15:09:58.766031523 +0000
-@@ -1,6 +1,6 @@
-
- KEY_FILE=$(top_srcdir)/mono-addins.snk
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = @MCS@
- ASSEMBLY_COMPILER_FLAGS = -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
- ASSEMBLY = ../bin/Mono.Addins.MSBuild.dll
- ASSEMBLY_NAME=Mono.Addins.MSBuild
+--
diff --git a/debian/patches/fix_mono-addins.pc.patch b/debian/patches/0002-fix_mono-addins.pc.patch.patch
similarity index 56%
rename from debian/patches/fix_mono-addins.pc.patch
rename to debian/patches/0002-fix_mono-addins.pc.patch.patch
index db3cff9..809b789 100644
--- a/debian/patches/fix_mono-addins.pc.patch
+++ b/debian/patches/0002-fix_mono-addins.pc.patch.patch
@@ -1,3 +1,7 @@
+From: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
+Date: Tue, 2 Aug 2011 14:31:49 +0100
+Subject: fix_mono-addins.pc.patch
+
#! /bin/sh /usr/share/dpatch/dpatch-run
## fix_mono-addins-gui.pc.dpatch by Mirco Bauer <meebey at debian.org>
##
@@ -5,10 +9,14 @@
## DP: No description.
@DPATCH@
-Index: mono-addins.git/Mono.Addins/mono-addins.pc.in
-===================================================================
---- mono-addins.git.orig/Mono.Addins/mono-addins.pc.in 2011-02-26 14:41:07.000000000 +0000
-+++ mono-addins.git/Mono.Addins/mono-addins.pc.in 2011-02-26 15:13:04.414898391 +0000
+---
+ Mono.Addins/mono-addins.pc.in | 4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/Mono.Addins/mono-addins.pc.in b/Mono.Addins/mono-addins.pc.in
+index 2d098ca..11f4f73 100644
+--- a/Mono.Addins/mono-addins.pc.in
++++ b/Mono.Addins/mono-addins.pc.in
@@ -1,12 +1,10 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
@@ -23,3 +31,4 @@ Index: mono-addins.git/Mono.Addins/mono-addins.pc.in
-Requires:
Libs: -r:${pkglibdir}/@MONO_ADDINS_DEFAULT_LIB@
+--
diff --git a/debian/patches/fix_mono-addins-gui.pc.patch b/debian/patches/0003-fix_mono-addins-gui.pc.patch.patch
similarity index 56%
rename from debian/patches/fix_mono-addins-gui.pc.patch
rename to debian/patches/0003-fix_mono-addins-gui.pc.patch.patch
index b906846..fde80ff 100644
--- a/debian/patches/fix_mono-addins-gui.pc.patch
+++ b/debian/patches/0003-fix_mono-addins-gui.pc.patch.patch
@@ -1,3 +1,7 @@
+From: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
+Date: Tue, 2 Aug 2011 14:31:49 +0100
+Subject: fix_mono-addins-gui.pc.patch
+
#! /bin/sh /usr/share/dpatch/dpatch-run
## fix_mono-addins-gui.pc.dpatch by Mirco Bauer <meebey at debian.org>
##
@@ -5,10 +9,14 @@
## DP: No description.
@DPATCH@
-Index: mono-addins.git/Mono.Addins.Gui/mono-addins-gui.pc.in
-===================================================================
---- mono-addins.git.orig/Mono.Addins.Gui/mono-addins-gui.pc.in 2011-02-26 14:41:07.000000000 +0000
-+++ mono-addins.git/Mono.Addins.Gui/mono-addins-gui.pc.in 2011-02-26 15:15:57.083686738 +0000
+---
+ Mono.Addins.Gui/mono-addins-gui.pc.in | 5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/Mono.Addins.Gui/mono-addins-gui.pc.in b/Mono.Addins.Gui/mono-addins-gui.pc.in
+index e2857ec..b0a9300 100644
+--- a/Mono.Addins.Gui/mono-addins-gui.pc.in
++++ b/Mono.Addins.Gui/mono-addins-gui.pc.in
@@ -1,12 +1,11 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
@@ -24,3 +32,4 @@ Index: mono-addins.git/Mono.Addins.Gui/mono-addins-gui.pc.in
-Requires: mono-addins
+Requires: gtk-sharp-2.0 mono-addins
Libs: -r:${pkglibdir}/@MONO_ADDINS_GUI_DEFAULT_LIB@
+--
diff --git a/debian/patches/fix_mono-addins-setup.pc.patch b/debian/patches/0004-fix_mono-addins-setup.pc.patch.patch
similarity index 50%
rename from debian/patches/fix_mono-addins-setup.pc.patch
rename to debian/patches/0004-fix_mono-addins-setup.pc.patch.patch
index cb64284..588319b 100644
--- a/debian/patches/fix_mono-addins-setup.pc.patch
+++ b/debian/patches/0004-fix_mono-addins-setup.pc.patch.patch
@@ -1,3 +1,7 @@
+From: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
+Date: Tue, 2 Aug 2011 14:31:49 +0100
+Subject: fix_mono-addins-setup.pc.patch
+
#! /bin/sh /usr/share/dpatch/dpatch-run
## fix_mono-addins-setup.pc.dpatch by Mirco Bauer <meebey at debian.org>
##
@@ -5,10 +9,14 @@
## DP: No description.
@DPATCH@
-Index: mono-addins.git/Mono.Addins.Setup/mono-addins-setup.pc.in
-===================================================================
---- mono-addins.git.orig/Mono.Addins.Setup/mono-addins-setup.pc.in 2011-02-26 14:41:07.000000000 +0000
-+++ mono-addins.git/Mono.Addins.Setup/mono-addins-setup.pc.in 2011-02-26 15:17:31.850912488 +0000
+---
+ Mono.Addins.Setup/mono-addins-setup.pc.in | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/Mono.Addins.Setup/mono-addins-setup.pc.in b/Mono.Addins.Setup/mono-addins-setup.pc.in
+index ec6cb95..5a2e61f 100644
+--- a/Mono.Addins.Setup/mono-addins-setup.pc.in
++++ b/Mono.Addins.Setup/mono-addins-setup.pc.in
@@ -1,8 +1,7 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
@@ -19,3 +27,4 @@ Index: mono-addins.git/Mono.Addins.Setup/mono-addins-setup.pc.in
Name: Mono.Addins.Setup
Description:
+--
diff --git a/debian/patches/0005-fix_mono-addins-msbuild.pc.patch.patch b/debian/patches/0005-fix_mono-addins-msbuild.pc.patch.patch
new file mode 100644
index 0000000..58936e0
--- /dev/null
+++ b/debian/patches/0005-fix_mono-addins-msbuild.pc.patch.patch
@@ -0,0 +1,24 @@
+From: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
+Date: Tue, 2 Aug 2011 14:31:49 +0100
+Subject: fix_mono-addins-msbuild.pc.patch
+
+===================================================================
+---
+ Mono.Addins.MSBuild/mono-addins-msbuild.pc.in | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/Mono.Addins.MSBuild/mono-addins-msbuild.pc.in b/Mono.Addins.MSBuild/mono-addins-msbuild.pc.in
+index c6e146a..f1f1e5d 100644
+--- a/Mono.Addins.MSBuild/mono-addins-msbuild.pc.in
++++ b/Mono.Addins.MSBuild/mono-addins-msbuild.pc.in
+@@ -1,8 +1,7 @@
+ prefix=${pcfiledir}/../..
+ exec_prefix=${prefix}
+-pkglibdir=${prefix}/lib/mono/@PACKAGE@
++pkglibdir=${prefix}/lib/cli/Mono.Addins.MSBuild-#PACKAGE_ABI_VERSION#
+
+-Libraries=${pkglibdir}/@MONO_ADDINS_MSBUILD_DEFAULT_LIB@
+
+ Name: Mono.Addins.MSBuild
+ Description:
+--
diff --git a/debian/patches/0006-Fix-Repair-to-prevent-crashing-when-looking-for-addi.patch b/debian/patches/0006-Fix-Repair-to-prevent-crashing-when-looking-for-addi.patch
new file mode 100644
index 0000000..75ad7b7
--- /dev/null
+++ b/debian/patches/0006-Fix-Repair-to-prevent-crashing-when-looking-for-addi.patch
@@ -0,0 +1,66 @@
+From: =?UTF-8?q?"Andr=C3=A9s=20G.=20Aragoneses"?= <knocte at gmail.com>
+Date: Fri, 22 Jul 2011 00:11:12 +0100
+Subject: Fix Repair() to prevent crashing when looking for addin descriptions
+
+This modification fixes a bug in the Repair method. The bug was very
+hard to catch, as a very low rate of banshee users could hit it.
+However, since the LatestVersion-checking feature was committed (which
+was implemented by commit in
+https://github.com/mono/mono-addins/commit/a4f3b3c46e5e798b1378941a2f99bcce1492c903
+and bisected by Iain Lane in
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630590), the
+bug was exposed as 100% reproducible in debug mode ('banshee --debug').
+
+This LatestVersion-feature introduced the possibility that addins could
+query the addins collections when asked for their Enabled property (to
+find other sibling-addins with different versions), which made the
+Repair() method crash, as it firstly removes the AddinCache folders, and
+after that it tries to update the database by looking at their content
+(and the content was removed by itself). Before the
+LatestVersion-feature was introduced, this bug would not be hit so often
+because it was less likely to find a non-empty "allSetupInfos"
+cache-variable combined with an empty "addinSetupInfos" cache-variable.
+Both circumstances happening at the same time would cause an
+Addin.ReadFromDescription() call, while iterating over the cached addins
+to find if each addin is not root.
+
+Fixes http://monoaddins.codeplex.com/workitem/6901 .
+(cherry picked from commit 2bf0f4b5c56c56473e0a055f0f987309f3dd366a)
+---
+ Mono.Addins/Mono.Addins.Database/AddinDatabase.cs | 11 +++++++++--
+ 1 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs b/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
+index 91dd779..2ce6e85 100644
+--- a/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
++++ b/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
+@@ -940,12 +940,17 @@ namespace Mono.Addins.Database
+ }
+ return lastDomainId.ToString ();
+ }
+-
+- internal void ResetCachedData ()
++
++ internal void ResetBasicCachedData ()
+ {
+ allSetupInfos = null;
+ addinSetupInfos = null;
+ rootSetupInfos = null;
++ }
++
++ internal void ResetCachedData ()
++ {
++ ResetBasicCachedData ();
+ hostIndex = null;
+ cachedAddinSetupInfos.Clear ();
+ if (addinEngine != null)
+@@ -1001,6 +1006,8 @@ namespace Mono.Addins.Database
+ monitor.ReportError ("The add-in registry could not be rebuilt. It may be due to lack of write permissions to the directory: " + AddinDbDir, ex);
+ }
+ }
++ ResetBasicCachedData ();
++
+ Update (monitor, domain);
+ }
+
+--
diff --git a/debian/patches/fix_mono-addins-msbuild.pc.patch b/debian/patches/fix_mono-addins-msbuild.pc.patch
deleted file mode 100644
index 225728f..0000000
--- a/debian/patches/fix_mono-addins-msbuild.pc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: mono-addins.git/Mono.Addins.MSBuild/mono-addins-msbuild.pc.in
-===================================================================
---- mono-addins.git.orig/Mono.Addins.MSBuild/mono-addins-msbuild.pc.in 2011-02-26 16:41:18.557412889 +0000
-+++ mono-addins.git/Mono.Addins.MSBuild/mono-addins-msbuild.pc.in 2011-02-26 16:42:51.000000000 +0000
-@@ -1,8 +1,7 @@
- prefix=${pcfiledir}/../..
- exec_prefix=${prefix}
--pkglibdir=${prefix}/lib/mono/@PACKAGE@
-+pkglibdir=${prefix}/lib/cli/Mono.Addins.MSBuild-#PACKAGE_ABI_VERSION#
-
--Libraries=${pkglibdir}/@MONO_ADDINS_MSBUILD_DEFAULT_LIB@
-
- Name: Mono.Addins.MSBuild
- Description:
diff --git a/debian/patches/series b/debian/patches/series
index 62a6720..8d404ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
-configurable_compiler.patch
-fix_mono-addins.pc.patch
-fix_mono-addins-gui.pc.patch
-fix_mono-addins-setup.pc.patch
-fix_mono-addins-msbuild.pc.patch
+0001-configurable_compiler.patch.patch
+0002-fix_mono-addins.pc.patch.patch
+0003-fix_mono-addins-gui.pc.patch.patch
+0004-fix_mono-addins-setup.pc.patch.patch
+0005-fix_mono-addins-msbuild.pc.patch.patch
+0006-Fix-Repair-to-prevent-crashing-when-looking-for-addi.patch
--
mono-addins
More information about the Pkg-cli-libs-commits
mailing list