librist: 0.2.10 -> 0.2.11 (#357091)
This commit is contained in:
@@ -1,16 +0,0 @@
|
||||
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,
|
||||
if (stat(srpfile, &buf) != 0)
|
||||
return;
|
||||
|
||||
+#if defined(__APPLE__)
|
||||
+ *generation = ((uint64_t)buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec;
|
||||
+#else
|
||||
*generation = ((uint64_t)buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec;
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
if (!lookup_data || !hashversion)
|
||||
@@ -1,16 +0,0 @@
|
||||
diff --git a/test/rist/unit/srp_examples.c b/test/rist/unit/srp_examples.c
|
||||
index 1c5193d..6f835b5 100644
|
||||
--- a/test/rist/unit/srp_examples.c
|
||||
+++ b/test/rist/unit/srp_examples.c
|
||||
@@ -16,6 +16,11 @@
|
||||
#define DEBUG_USE_EXAMPLE_CONSTANTS 1
|
||||
|
||||
#if HAVE_MBEDTLS
|
||||
+// musl's sched.h includes a prototype for calloc, so we need to make
|
||||
+// sure it's already been included before we redefine it to something
|
||||
+// that won't expand to a valid prototype.
|
||||
+#include <sched.h>
|
||||
+
|
||||
#define malloc(size) _test_malloc(size, __FILE__, __LINE__)
|
||||
#define calloc(num, size) _test_calloc(num, size, __FILE__, __LINE__)
|
||||
#define free(obj) _test_free(obj, __FILE__, __LINE__)
|
||||
@@ -11,23 +11,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librist";
|
||||
version = "0.2.10";
|
||||
version = "0.2.11";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "code.videolan.org";
|
||||
owner = "rist";
|
||||
repo = "librist";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8N4wQXxjNZuNGx/c7WVAV5QS48Bff5G3t11UkihT+K0=";
|
||||
hash = "sha256-xWqyQl3peB/ENReMcDHzIdKXXCYOJYbhhG8tcSh36dY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/NixOS/nixpkgs/pull/257020
|
||||
./darwin.patch
|
||||
# https://code.videolan.org/rist/librist/-/merge_requests/257
|
||||
./musl.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
||||
Reference in New Issue
Block a user