···

       
4
       
 
       
  inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map;

     

       
5
       
 
       
in buildDotnetPackage rec {

     

       
6
       
 
       
  pname = "keepass";

     

       
7
       
-
       
  version = "2.49";

     

       
8
       
 
       


     

       
9
       
 
       
  src = fetchurl {

     

       
10
       
 
       
    url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";

     

       
11
       
-
       
    sha256 = "sha256-1hg4bRuQSG+UzEQGeQcSURTmTxt5ITGQqfg0IS7RWt0=";

     

       
12
       
 
       
  };

     

       
13
       
 
       


     

       
14
       
 
       
  sourceRoot = ".";

     

···

       
4
       
 
       
  inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map;

     

       
5
       
 
       
in buildDotnetPackage rec {

     

       
6
       
 
       
  pname = "keepass";

     

       
7
       
+
       
  version = "2.52";

     

       
8
       
 
       


     

       
9
       
 
       
  src = fetchurl {

     

       
10
       
 
       
    url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";

     

       
11
       
+
       
    sha256 = "sha256-6dGCfysen26VGHIHETuNGkqHbPyeWRIEopqJa6AMzXA=";

     

       
12
       
 
       
  };

     

       
13
       
 
       


     

       
14
       
 
       
  sourceRoot = ".";

     

···

       
43
       
 
       
index af02803..8a32c9d 100644

     

       
44
       
 
       
--- a/KeePass/Util/AppLocator.cs

     

       
45
       
 
       
+++ b/KeePass/Util/AppLocator.cs

     

       
46
       
-
       
@@ -429,7 +429,7 @@ namespace KeePass.Util

     

       
47
       
 
       
 			if(NativeLib.GetPlatformID() == PlatformID.MacOSX)

     

       
48
       
-
       
 				strArgPrefix = string.Empty; // FR 3535696

     

       
49
       
 
       
 

     

       
50
       
-
       
-			string str = NativeLib.RunConsoleApp("whereis", strArgPrefix + strApp);

     

       
51
       
-
       
+			string str = NativeLib.RunConsoleApp("@whereis@", strArgPrefix + strApp);

     

       
52
       
-
       
 			if(str == null) return null;

     

       
53
       
 
       
 

     

       
54
       
-
       
 			str = str.Trim();

     

       
55
       
 
       
diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs

     

       
56
       
 
       
index ab49ee2..7f6c50f 100644

     

       
57
       
 
       
--- a/KeePass/Util/ClipboardUtil.Unix.cs

     
···

       
108
       
 
       
index 2d227a3..243f4ee 100644

     

       
109
       
 
       
--- a/KeePassLib/Native/NativeLib.cs

     

       
110
       
 
       
+++ b/KeePassLib/Native/NativeLib.cs

     

       
111
       
-
       
@@ -145,7 +145,7 @@ namespace KeePassLib.Native

     

       
112
       
-
       
 			// Mono returns PlatformID.Unix on Mac OS X, workaround this

     

       
113
       
-
       
 			if(m_platID.Value == PlatformID.Unix)

     

       
114
       
 
       
 			{

     

       
115
       
 
       
-				if((RunConsoleApp("uname", null) ?? string.Empty).Trim().Equals(

     

       
116
       
 
       
+				if((RunConsoleApp("@uname@", null) ?? string.Empty).Trim().Equals(

     

       
117
       
 
       
 					"Darwin", StrUtil.CaseIgnoreCmp))

     

       
118
       
-
       
 					m_platID = PlatformID.MacOSX;

     

       
119
       
 
       
 			}

     

       
120
       
 
       
diff --git a/KeePassLib/Utility/MonoWorkarounds.cs b/KeePassLib/Utility/MonoWorkarounds.cs

     

       
121
       
 
       
index e20bb3a..4fd875b 100644

     
···

       
130
       
 
       
 

     

       
131
       
 
       
 		private static Dictionary<uint, bool> g_dForceReq = new Dictionary<uint, bool>();

     

       
132
       
 
       
 		private static Thread g_thFixClip = null;

     

       
133
       
-
       
@@ -335,7 +335,7 @@ namespace KeePassLib.Utility

     

       
134
       
 
       
 				// }

     

       
135
       
 
       
 				// else { Debug.Assert(false); }

     

       
136
       
 
       
 

     

···

       
43
       
 
       
index af02803..8a32c9d 100644

     

       
44
       
 
       
--- a/KeePass/Util/AppLocator.cs

     

       
45
       
 
       
+++ b/KeePass/Util/AppLocator.cs

     

       
46
       
+
       
@@ -468,7 +468,7 @@ namespace KeePass.Util

     

       
47
       
 
       
 			if(NativeLib.GetPlatformID() == PlatformID.MacOSX)

     

       
48
       
+
       
 				strOpt = string.Empty; // FR 3535696

     

       
49
       
 
       
 

     

       
50
       
+
       
-			string str = NativeLib.RunConsoleApp("whereis", strOpt + strApp);

     

       
51
       
+
       
+			string str = NativeLib.RunConsoleApp("@whereis@", strOpt + strApp);

     

       
52
       
+
       
 			if(string.IsNullOrEmpty(str)) return null;

     

       
53
       
 
       
 

     

       
54
       
+
       
 			int iSep = str.IndexOf(':');

     

       
55
       
 
       
diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs

     

       
56
       
 
       
index ab49ee2..7f6c50f 100644

     

       
57
       
 
       
--- a/KeePass/Util/ClipboardUtil.Unix.cs

     
···

       
108
       
 
       
index 2d227a3..243f4ee 100644

     

       
109
       
 
       
--- a/KeePassLib/Native/NativeLib.cs

     

       
110
       
 
       
+++ b/KeePassLib/Native/NativeLib.cs

     

       
111
       
+
       
@@ -143,7 +143,7 @@ namespace KeePassLib.Native

     

       
112
       
+
       
 			// Mono returns PlatformID.Unix on MacOS, workaround this

     

       
113
       
+
       
 			if(g_platID.Value == PlatformID.Unix)

     

       
114
       
 
       
 			{

     

       
115
       
 
       
-				if((RunConsoleApp("uname", null) ?? string.Empty).Trim().Equals(

     

       
116
       
 
       
+				if((RunConsoleApp("@uname@", null) ?? string.Empty).Trim().Equals(

     

       
117
       
 
       
 					"Darwin", StrUtil.CaseIgnoreCmp))

     

       
118
       
+
       
 					g_platID = PlatformID.MacOSX;

     

       
119
       
 
       
 			}

     

       
120
       
 
       
diff --git a/KeePassLib/Utility/MonoWorkarounds.cs b/KeePassLib/Utility/MonoWorkarounds.cs

     

       
121
       
 
       
index e20bb3a..4fd875b 100644

     
···

       
130
       
 
       
 

     

       
131
       
 
       
 		private static Dictionary<uint, bool> g_dForceReq = new Dictionary<uint, bool>();

     

       
132
       
 
       
 		private static Thread g_thFixClip = null;

     

       
133
       
+
       
@@ -356,7 +356,7 @@ namespace KeePassLib.Utility

     

       
134
       
 
       
 				// }

     

       
135
       
 
       
 				// else { Debug.Assert(false); }

     

       
136
       
 
       
 

     

···

       
9
       
 
       


     

       
10
       
 
       
diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs

     

       
11
       
 
       
index 347eaf5..b92e1e2 100644

     

       
12
       
-
       
--- a/KeePass/Forms/MainForm.cs

     

       
13
       
-
       
+++ b/KeePass/Forms/MainForm.cs

     

       
14
       
-
       
@@ -440,7 +440,$OUTPUT_LC$ @@ namespace KeePass.Forms

     

       
15
       
-
       
 				ToolStripItemCollection tsicT = m_ctxTray.Items;

     

       
16
       
-
       
 				ToolStripItem tsiPrevT = m_ctxTrayOptions;

     

       
17
       
-
       
 

     

       
18
       
-
       
-				m_pluginManager.LoadAllPlugins();

     

       
19
       
 
       
$DO_LOADS$+

     

       
20
       
-
       
 

     

       
21
       
-
       
 				m_pluginManager.AddMenuItems(PluginMenuType.Main, tsicM, tsiPrevM);

     

       
22
       
-
       
 				m_pluginManager.AddMenuItems(PluginMenuType.Group, tsicGM, tsiPrevGM);

     

       
23
       
 
       
-- 

     

       
24
       
 
       
2.25.4

     

       
25
       
 
       


     

···

       
9
       
 
       


     

       
10
       
 
       
diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs

     

       
11
       
 
       
index 347eaf5..b92e1e2 100644

     

       
12
       
+
       
--- a/KeePass/Forms/MainForm_Functions.cs

     

       
13
       
+
       
+++ b/KeePass/Forms/MainForm_Functions.cs

     

       
14
       
+
       
@@ -312,7 +312,$OUTPUT_LC$ @@ namespace KeePass.Forms

     

       
15
       
+
       
 				ToolStripItemCollection tsicT = m_ctxTray.Items;

     

       
16
       
+
       
 				ToolStripItem tsiPrevT = m_ctxTrayOptions;

     

       
17
       
+
       
 

     

       
18
       
+
       
-				m_pluginManager.LoadAllPlugins();

     

       
19
       
 
       
$DO_LOADS$+

     

       
20
       
+
       
 

     

       
21
       
+
       
 				m_pluginManager.AddMenuItems(PluginMenuType.Main, tsicM, tsiPrevM);

     

       
22
       
+
       
 				m_pluginManager.AddMenuItems(PluginMenuType.Group, tsicGM, tsiPrevGM);

     

       
23
       
 
       
-- 

     

       
24
       
 
       
2.25.4

     

       
25