diff --git a/qubes-db-vm/0001-create_pidfile.patch b/qubes-db-vm/0001-create_pidfile.patch index 947f45c..0603ee1 100644 --- a/qubes-db-vm/0001-create_pidfile.patch +++ b/qubes-db-vm/0001-create_pidfile.patch @@ -1,17 +1,17 @@ -From d20a9db122608e0992c9ab6f675920d4bb1ee88f Mon Sep 17 00:00:00 2001 -From: "build@apk-groulx" -Date: Fri, 4 Mar 2022 22:50:19 +0000 -Subject: [PATCH 1/1] create_pidfile - ---- - daemon/db-daemon.c | 11 +++-------- - 1 file changed, 3 insertions(+), 8 deletions(-) - -diff --git a/daemon/db-daemon.c b/daemon/db-daemon.c -index 9934d16..2b28995 100644 ---- a/daemon/db-daemon.c +diff --git a/daemon/db-daemon.c.orig b/daemon/db-daemon.c +index bcf77df..c7b1a50 100644 +--- a/daemon/db-daemon.c.orig +++ b/daemon/db-daemon.c -@@ -618,11 +618,8 @@ int create_pidfile(struct db_daemon_data *d) { +@@ -156,7 +156,7 @@ int mainloop(struct db_daemon_data *d) { + return 0; + } + d->multiread_requested = 1; +- /* wait for complete response */ ++ /* wait for complete rsponse */ + while (d->multiread_requested) { + AcquireSRWLockExclusive(&d->lock); + if (!handle_vchan_data(d)) { +@@ -627,11 +627,8 @@ static int create_pidfile(struct db_daemon_data *d) { mode_t old_umask; struct stat stat_buf; @@ -24,7 +24,7 @@ index 9934d16..2b28995 100644 old_umask = umask(0002); pidfile = fopen(pidfile_name, "w"); -@@ -643,10 +640,8 @@ void remove_pidfile(struct db_daemon_data *d) { +@@ -652,10 +649,8 @@ static void remove_pidfile(struct db_daemon_data *d) { struct stat stat_buf; /* no pidfile for VM daemon - service is managed by systemd */ @@ -36,15 +36,12 @@ index 9934d16..2b28995 100644 if (stat(pidfile_name, &stat_buf) == 0) { /* remove pidfile only if it's the one created this process */ -@@ -754,7 +749,7 @@ int fuzz_main(int argc, char **argv) { +@@ -763,7 +758,7 @@ int fuzz_main(int argc, char **argv) { exit(1); case 0: close(ready_pipe[0]); -- snprintf(log_path, sizeof(log_path), "/var/log/qubes/qubesdb.%s.log", d.remote_name); +- snprintf(log_path, sizeof(log_path), "/var/log/qubes/qubesdb.%s.log", d.remote_name ? d.remote_name : "dom0"); + snprintf(log_path, sizeof(log_path), "/var/log/qubes/qubes-db.log"); close(0); old_umask = umask(0); --- -2.34.1 - diff --git a/qubes-db-vm/APKBUILD b/qubes-db-vm/APKBUILD index 8796368..2c83c5a 100644 --- a/qubes-db-vm/APKBUILD +++ b/qubes-db-vm/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-db-vm subpackages="$pkgname-openrc" -pkgver=4.1.17 +pkgver=4.2.4 pkgrel=0 _gittag="v$pkgver" pkgdesc="QubesDB libs and daemon service." @@ -25,7 +25,7 @@ source=" qubes-db.openrc " builddir="$srcdir"/qubes-core-qubesdb-$pkgver -subpackages="$pkgname-dev" +subpackages="$pkgname-dev $pkgname-openrc" build() { # Build all with python bindings @@ -44,8 +44,8 @@ package() { install -Dm 755 "$srcdir"/qubes-db.openrc "$pkgdir"/etc/init.d/qubes-db } sha512sums=" -dad1580afa7d152551b7292051b624090ce57c006174d7c0f5273f4d9cecadcb70d46547263dcf23131d5f5df921519c9d8ca739acd9f0e9be303b20e73083bb qubes-db-vm-v4.1.17.tar.gz +c252772c53b3cb6727f6d7c1ea13d54fc0a55e6dd558244da12e17b8a9ab80c338281f6123dc1f08965d310cab5ef8684266bfd4f47ac344c4f35851ce5f7f9f qubes-db-vm-v4.2.4.tar.gz af86268c264c843b94f9cefb735b9d078dc58819c890fc0a31dd79fa2761d3c2fa87aed73752bca1db07948ba86ecfe16a745b19672ccc10dfb9461df24aa207 0001-musl-build.patch -ffe9ea8f65b4e164c3a0d1c8762d1e3b39de3799ae3e63f825457d52de49c6522820950e6262deaa9235ad97cd7c60bf1c9a077fff716c4ca9dbd688e9a73c91 0001-create_pidfile.patch +892eb29b9bab4d9e662678d13a5607df04cdb024c2f28332f40fa4b7c644476a4b26a9fc038dfcdac1e0b8d328165d21d50d894d2c1e27f792287dd57449e7eb 0001-create_pidfile.patch 3d87f82d3637cf10bf1a3058ebbd2590ab17f65d1b49058f62d892f126635497abd5045f6797bc8069e5de08bb6e08fc6146deb6422090ad02122764cc6d72f0 qubes-db.openrc "