Merge pull request #264466 from raphaelr/update/librist

librist: 0.2.8 -> 0.2.10
This commit is contained in:
Weijia Wang 2024-01-18 10:12:03 +01:00 committed by GitHub
commit 1e0e75ae75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions

View File

@ -1,3 +1,5 @@
diff --git a/tools/srp_shared.c b/tools/srp_shared.c
index f782126..23e82a5 100644
--- a/tools/srp_shared.c
+++ b/tools/srp_shared.c
@@ -173,7 +173,11 @@ void user_verifier_lookup(char * username,
@ -5,9 +7,9 @@
return;
+#if defined(__APPLE__)
+ *generation = (buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec;
+ *generation = ((uint64_t)buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec;
+#else
*generation = (buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec;
*generation = ((uint64_t)buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec;
+#endif
#endif

View File

@ -11,14 +11,14 @@
stdenv.mkDerivation rec {
pname = "librist";
version = "0.2.8";
version = "0.2.10";
src = fetchFromGitLab {
domain = "code.videolan.org";
owner = "rist";
repo = "librist";
rev = "v${version}";
hash = "sha256-E12TS+N47UQapkF6oO0Lx66Z3lHAyP0R4tVnx/uKBwQ=";
hash = "sha256-8N4wQXxjNZuNGx/c7WVAV5QS48Bff5G3t11UkihT+K0=";
};
patches = [