Merge pull request #264059 from mattmelling/direwolf-1.7
direwolf: 1.6 -> 1.7
This commit is contained in:
commit
638b369d9a
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "direwolf";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wb2osz";
|
||||
repo = "direwolf";
|
||||
rev = version;
|
||||
sha256 = "0xmz64m02knbrpasfij4rrq53ksxna5idxwgabcw4n2b1ig7pyx5";
|
||||
hash = "sha256-Vbxc6a6CK+wrBfs15dtjfRa1LJDKKyHMrg8tqsF7EX4=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-strlcpy-usage.patch ];
|
||||
|
@ -75,15 +75,15 @@ index ff18800..b1cb443 100644
|
||||
-}
|
||||
-
|
||||
diff --git a/src/direwolf.h b/src/direwolf.h
|
||||
index efc329b..22eb748 100644
|
||||
index 69b0952..6f9ec1a 100644
|
||||
--- a/src/direwolf.h
|
||||
+++ b/src/direwolf.h
|
||||
@@ -294,7 +294,7 @@ char *strcasestr(const char *S, const char *FIND);
|
||||
#define HAVE_STRLCPY 1
|
||||
@@ -328,7 +328,7 @@ char *strcasestr(const char *S, const char *FIND);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
-#define DEBUG_STRL 1 // Extra Debug version when using our own strlcpy, strlcat.
|
||||
+#define DEBUG_STRL 0 // Extra Debug version when using our own strlcpy, strlcat.
|
||||
// Should be ignored if not supplying our own.
|
||||
|
||||
-#define DEBUG_STRL 1
|
||||
+#define DEBUG_STRL 0
|
||||
|
||||
#if DEBUG_STRL
|
||||
|
||||
#ifndef HAVE_STRLCPY // Need to supply our own.
|
||||
|
Loading…
Reference in New Issue
Block a user