mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: pounce: Add patch improving diagnostics.
* gnu/packages/patches/pounce-readable-checks.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/messaging.scm (pounce): Use it. Change-Id: Ibfe10d4a6c99f86a0c925ad1bed2bcc14fb4c95c
This commit is contained in:
parent
2c80648f8a
commit
57768a7566
3 changed files with 51 additions and 1 deletions
|
@ -1998,6 +1998,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/plasp-include-iostream.patch \
|
||||
%D%/packages/patches/pocketfft-cpp-prefer-preprocessor-if.patch \
|
||||
%D%/packages/patches/pokerth-boost.patch \
|
||||
%D%/packages/patches/pounce-readable-checks.patch \
|
||||
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
|
||||
%D%/packages/patches/procps-strtod-test.patch \
|
||||
%D%/packages/patches/prusa-slicer-fix-tests.patch \
|
||||
|
|
|
@ -3461,7 +3461,8 @@ notifications.")
|
|||
(uri (string-append "https://git.causal.agency/pounce/snapshot/pounce-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0kk0jrfiwfaybr0i5xih3b0yd4i6v3bz866a7xal1j8wddalbwlp"))))
|
||||
(base32 "0kk0jrfiwfaybr0i5xih3b0yd4i6v3bz866a7xal1j8wddalbwlp"))
|
||||
(patches (search-patches "pounce-readable-checks.patch"))))
|
||||
(outputs '("out" "debug"))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
|
48
gnu/packages/patches/pounce-readable-checks.patch
Normal file
48
gnu/packages/patches/pounce-readable-checks.patch
Normal file
|
@ -0,0 +1,48 @@
|
|||
Print a warning when a configuration file cannot not be opened due to read
|
||||
access.
|
||||
|
||||
Upstream-status: Forwarded to the author of Pounce via email.
|
||||
|
||||
diff --git a/local.c b/local.c
|
||||
index fcd670a..d4603c4 100644
|
||||
--- a/local.c
|
||||
+++ b/local.c
|
||||
@@ -43,6 +43,15 @@
|
||||
|
||||
static struct tls *server;
|
||||
|
||||
+void checkReadable(const char* file) {
|
||||
+ FILE* f = fopen(file, "r");
|
||||
+ if (f == NULL) {
|
||||
+ if (errno == EACCES) warnx("failed to read file '%s'", file);
|
||||
+ } else {
|
||||
+ fclose(f);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
int localConfig(
|
||||
const char *cert, const char *priv, const char *ca, bool require
|
||||
) {
|
||||
@@ -55,12 +64,14 @@ int localConfig(
|
||||
int error;
|
||||
char buf[PATH_MAX];
|
||||
for (int i = 0; configPath(buf, sizeof(buf), cert, i); ++i) {
|
||||
+ checkReadable(buf);
|
||||
error = tls_config_set_cert_file(config, buf);
|
||||
if (!error) break;
|
||||
}
|
||||
if (error) goto fail;
|
||||
|
||||
for (int i = 0; configPath(buf, sizeof(buf), priv, i); ++i) {
|
||||
+ checkReadable(buf);
|
||||
error = tls_config_set_key_file(config, buf);
|
||||
if (!error) break;
|
||||
}
|
||||
@@ -68,6 +79,7 @@ int localConfig(
|
||||
|
||||
if (ca) {
|
||||
for (int i = 0; configPath(buf, sizeof(buf), ca, i); ++i) {
|
||||
+ checkReadable(buf);
|
||||
error = tls_config_set_ca_file(config, buf);
|
||||
if (!error) break;
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue