pyrox.dev / nixpkgs
lol
fork atom

keepass: 2.49 -> 2.52

https://keepass.info/news/n220909_2.52.html

authored by

Kevin Puetz and committed by
obadz dfdaa0ce 64364225

+23 -23
unified split
+2 -2
pkgs/applications/misc/keepass/default.nix
··· 4 4 inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map; 5 5 in buildDotnetPackage rec { 6 6 pname = "keepass"; 7 - version = "2.49"; 7 + version = "2.52"; 8 8 9 9 src = fetchurl { 10 10 url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; 11 - sha256 = "sha256-1hg4bRuQSG+UzEQGeQcSURTmTxt5ITGQqfg0IS7RWt0="; 11 + sha256 = "sha256-6dGCfysen26VGHIHETuNGkqHbPyeWRIEopqJa6AMzXA="; 12 12 }; 13 13 14 14 sourceRoot = ".";
+11 -11
pkgs/applications/misc/keepass/fix-paths.patch
··· 43 43 index af02803..8a32c9d 100644 44 44 --- a/KeePass/Util/AppLocator.cs 45 45 +++ b/KeePass/Util/AppLocator.cs 46 - @@ -429,7 +429,7 @@ namespace KeePass.Util 46 + @@ -468,7 +468,7 @@ namespace KeePass.Util 47 47 if(NativeLib.GetPlatformID() == PlatformID.MacOSX) 48 - strArgPrefix = string.Empty; // FR 3535696 48 + strOpt = string.Empty; // FR 3535696 49 49 50 - - string str = NativeLib.RunConsoleApp("whereis", strArgPrefix + strApp); 51 - + string str = NativeLib.RunConsoleApp("@whereis@", strArgPrefix + strApp); 52 - if(str == null) return null; 50 + - string str = NativeLib.RunConsoleApp("whereis", strOpt + strApp); 51 + + string str = NativeLib.RunConsoleApp("@whereis@", strOpt + strApp); 52 + if(string.IsNullOrEmpty(str)) return null; 53 53 54 - str = str.Trim(); 54 + int iSep = str.IndexOf(':'); 55 55 diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs 56 56 index ab49ee2..7f6c50f 100644 57 57 --- a/KeePass/Util/ClipboardUtil.Unix.cs ··· 108 108 index 2d227a3..243f4ee 100644 109 109 --- a/KeePassLib/Native/NativeLib.cs 110 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) 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 114 { 115 115 - if((RunConsoleApp("uname", null) ?? string.Empty).Trim().Equals( 116 116 + if((RunConsoleApp("@uname@", null) ?? string.Empty).Trim().Equals( 117 117 "Darwin", StrUtil.CaseIgnoreCmp)) 118 - m_platID = PlatformID.MacOSX; 118 + g_platID = PlatformID.MacOSX; 119 119 } 120 120 diff --git a/KeePassLib/Utility/MonoWorkarounds.cs b/KeePassLib/Utility/MonoWorkarounds.cs 121 121 index e20bb3a..4fd875b 100644 ··· 130 130 131 131 private static Dictionary<uint, bool> g_dForceReq = new Dictionary<uint, bool>(); 132 132 private static Thread g_thFixClip = null; 133 - @@ -335,7 +335,7 @@ namespace KeePassLib.Utility 133 + @@ -356,7 +356,7 @@ namespace KeePassLib.Utility 134 134 // } 135 135 // else { Debug.Assert(false); } 136 136
+10 -10
pkgs/applications/misc/keepass/keepass-plugins.patch
··· 9 9 10 10 diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs 11 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(); 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 19 $DO_LOADS$+ 20 - 21 - m_pluginManager.AddMenuItems(PluginMenuType.Main, tsicM, tsiPrevM); 22 - m_pluginManager.AddMenuItems(PluginMenuType.Group, tsicGM, tsiPrevGM); 20 + 21 + m_pluginManager.AddMenuItems(PluginMenuType.Main, tsicM, tsiPrevM); 22 + m_pluginManager.AddMenuItems(PluginMenuType.Group, tsicGM, tsiPrevGM); 23 23 -- 24 24 2.25.4 25 25