version 3.2.5

(cherry picked from commit e9b8e5a4d1)

.travis.yml

@@ -7,5 +7,7 @@ env:
  - DIST_DOM0=fc23 USE_QUBES_REPO_VERSION=3.2 USE_QUBES_REPO_TESTING=1
  - DISTS_VM=fc23 USE_QUBES_REPO_VERSION=3.2 USE_QUBES_REPO_TESTING=1
  - DISTS_VM=fc24 USE_QUBES_REPO_VERSION=3.2 USE_QUBES_REPO_TESTING=1
+ - DISTS_VM=fc25 USE_QUBES_REPO_VERSION=3.2 USE_QUBES_REPO_TESTING=1
+ - DISTS_VM=fc26 USE_QUBES_REPO_VERSION=3.2 USE_QUBES_REPO_TESTING=1
  - DISTS_VM=jessie USE_QUBES_REPO_VERSION=3.2 USE_QUBES_REPO_TESTING=1
  - DISTS_VM=stretch USE_QUBES_REPO_VERSION=3.2 USE_QUBES_REPO_TESTING=1

debian/changelog

@@ -1,3 +1,29 @@
+qubes-utils (3.2.5) unstable; urgency=medium
+
+  [ unman ]
+  * Improve error message when file exists
+
+  [ Marek Marczykowski-Górecki ]
+  * rpm: add missing build requires
+
+  [ Rusty Bird ]
+  * Fall back to sync() if syncfs() is unavailable
+
+  [ Olivier MEDOC ]
+  * Fix gcc Werror because of a typo in a switch/case explicit
+    fallthrough comment
+
+  [ Marek Marczykowski-Górecki ]
+  * initramfs: move qubes_cow_setup hook to pre-trigger
+
+  [ Paras Chetal ]
+  * Fix include header syntax
+
+  [ Marek Marczykowski-Górecki ]
+  * travis: add fc25 and fc26 build targets
+
+ -- Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>  Sun, 24 Sep 2017 21:54:29 +0200
+
 qubes-utils (3.2.4) unstable; urgency=medium
 
   [ Johanna A ]

dracut/full-dmroot/module-setup.sh

@@ -14,7 +14,7 @@ depends() {
 }
 
 install() {
-    inst_hook pre-udev 90 $moddir/qubes_cow_setup.sh
+    inst_hook pre-trigger 90 $moddir/qubes_cow_setup.sh
     inst_multiple \
         sfdisk \
         mkswap

dracut/full-dmroot/qubes_cow_setup.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# This file should be placed in pre-mount directory in dracut's initramfs, or
+# This file should be placed in pre-trigger directory in dracut's initramfs, or
 # scripts/local-top in case of initramfs-tools
 #
 

dracut/simple/init.sh

@@ -83,7 +83,6 @@ if ! [ -d "$NEWROOT/lib/modules/$kver/kernel" ]; then
     rmdir /tmp/modules
 fi
 
-
 umount /dev /sys /proc
 
 exec switch_root $NEWROOT /sbin/init

qrexec-lib/copy-file.c

@@ -1,5 +1,5 @@
 #include <unistd.h>
-#include <ioall.h>
+#include "ioall.h"
 #include "libqubes-rpc-filecopy.h"
 #include "crc32.h"
 

qrexec-lib/pack.c

@@ -89,7 +89,7 @@ void wait_for_result(void)
     if (hdr.error_code != 0) {
         switch (hdr.error_code) {
             case EEXIST:
-                call_error_handler("File copy: not overwriting existing file. Clean QubesIncoming dir, and retry copy%s%s", last_filename_prefix, last_filename);
+                call_error_handler("A file named %s already exists in QubesIncoming dir", last_filename);
                 break;
             case EINVAL:
                 call_error_handler("File copy: Corrupted data from packer%s%s", last_filename_prefix, last_filename);
@@ -100,7 +100,7 @@ void wait_for_result(void)
                      * desynchronized in this case */
                     return;
                 }
-                /* fall though */
+		/* fallthrough */
             default:
                 call_error_handler("File copy: %s%s%s",
                         strerror(hdr.error_code), last_filename_prefix, last_filename);

qrexec-lib/unpack.c

@@ -1,6 +1,5 @@
 #define _GNU_SOURCE /* For O_NOFOLLOW. */
 #include <errno.h>
-#include <ioall.h>
 #include <fcntl.h>
 #include <sys/time.h>
 #include <sys/stat.h>
@@ -10,6 +9,7 @@
 #include <stdio.h>
 #include <limits.h>
 #include "libqubes-rpc-filecopy.h"
+#include "ioall.h"
 #include "crc32.h"
 
 char untrusted_namebuf[MAX_PATH_LENGTH];
@@ -237,6 +237,8 @@ int do_unpack(void)
     cwd_fd = open(".", O_RDONLY);
     if (cwd_fd >= 0 && syncfs(cwd_fd) == 0 && close(cwd_fd) == 0)
         errno = saved_errno;
+#else
+    sync();
 #endif
 
     send_status_and_crc(errno, untrusted_namebuf);

rpm_spec/qubes-utils.spec

@@ -19,6 +19,8 @@ Requires:	%{name}-libs
 Requires:	ImageMagick
 Requires:	pycairo
 BuildRequires:  qubes-libvchan-devel
+# for meminfo-writer
+BuildRequires:  xen-devel
 
 %description
 Common Linux files for Qubes Dom0 and VM

version

@@ -1 +1 @@
-3.2.4
+3.2.5