push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,25 @@
diff --git a/vncauth.c b/vncauth.c
index 79c4448..6348007 100644
--- a/vncauth.c
+++ b/vncauth.c
@@ -26,6 +26,7 @@
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <time.h>
#include <unistd.h>
#include "vncauth.h"
diff --git a/vncauth.h b/vncauth.h
index 86dc455..7fdb8d4 100644
--- a/vncauth.h
+++ b/vncauth.h
@@ -25,6 +25,8 @@
#define CHALLENGESIZE 16
extern int vncEncryptAndStorePasswd(char *passwd, char *fname);
+extern int vncEncryptAndStorePasswd2(char *passwd, char *passwdViewOnly, char *fname);
extern char *vncDecryptPasswdFromFile(char *fname);
+extern int vncDecryptPasswdFromFile2(char *fname, char *passwdFullControl, char *passwdViewOnly);
extern void vncRandomBytes(unsigned char *bytes);
extern void vncEncryptBytes(unsigned char *bytes, char *passwd);

View File

@@ -0,0 +1,45 @@
{
lib,
stdenv,
fetchFromGitHub,
}:
stdenv.mkDerivation {
pname = "fbvnc";
version = "1.0.2";
src = fetchFromGitHub {
owner = "zohead";
repo = "fbvnc";
rev = "783204ff6c92afec33d6d36f7e74f1fcf2b1b601";
hash = "sha256-oT7+6kIeFDgU6GbcHYQ6k0jCU84p8fTEVgUozYMkeVI=";
};
patches = [
# GCC 14 errors on missing function definitions
# https://github.com/zohead/fbvnc/pull/3
./gcc14-fix.patch
];
makeFlags = [
"CC:=$(CC)"
];
installPhase = ''
runHook preInstall
install -Dm555 fbvnc -t "$out/bin"
install -Dm444 README.md -t "$out/share/doc/fbvnc"
runHook postInstall
'';
meta = {
description = "Framebuffer VNC client";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.raskin ];
platforms = lib.platforms.linux;
homepage = "https://github.com/zohead/fbvnc/";
mainProgram = "fbvnc";
};
}