.travis.yml

@@ -1,5 +1,5 @@
 sudo: required
-dist: bionic
+dist: xenial
 language: python
 python:
   - '2.7'
@@ -10,7 +10,7 @@ script:
  - test -z "$TESTS_ONLY" || python -m unittest discover -v imgconverter -p test.py
  - test -n "$TESTS_ONLY" || ~/qubes-builder/scripts/travis-build
 env:
- - DIST_DOM0=fc31 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
+ - DIST_DOM0=fc29 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
  - DISTS_VM=fc29 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
  - DISTS_VM=fc30 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
  - DISTS_VM=stretch USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
@@ -21,15 +21,13 @@ jobs:
   include:
    - env: TESTS_ONLY=1
      python: 2.7
+   - env: TESTS_ONLY=1
+     python: 3.4
    - env: TESTS_ONLY=1
      python: 3.5
-   - env: TESTS_ONLY=1
-     python: 3.6
-   - env: TESTS_ONLY=1
-     python: 3.7
    - stage: deploy
-     python: 3.6
+     python: 3.5
-     env: DIST_DOM0=fc31 TESTS_ONLY=
+     env: DIST_DOM0=fc29 TESTS_ONLY=
      script: ~/qubes-builder/scripts/travis-deploy
 
 # don't build tags which are meant for code signing only

debian/changelog

@@ -1,40 +1,3 @@
-qubes-utils (4.1.3) unstable; urgency=medium
-
-  [ xaki23 ]
-  * partition full volatile for non-COW setups too
-
-  [ Frédéric Pierret (fepitre) ]
-  * travis: switch to bionic
-
-  [ Marek Marczykowski-Górecki ]
-  * travis: update python versions
-
-  [ Patrick Schleizer ]
-  * qubes-kernel-vm-support.preinst create folder /boot/grub
-  * qubes-kernel-vm-support.postinst run update-grub
-
-  [ Marek Marczykowski-Górecki ]
-  * debian: fix dependencies of qubes-kernel-vm-support pkg
-
- -- Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>  Sat, 07 Dec 2019 05:50:26 +0100
-
-qubes-utils (4.1.2) unstable; urgency=medium
-
-  [ xaki23 ]
-  * align volatile swap partition to 1Mb instead of 512b
-
-  [ Marek Marczykowski-Górecki ]
-  * rpm: update python2 deps
-  * Disable BLS config style in grub
-
- -- Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>  Sun, 22 Sep 2019 05:10:19 +0200
-
-qubes-utils (4.1.1) unstable; urgency=medium
-
-  * initrd: mount / rw for the overlayfs setup time
-
- -- Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>  Mon, 10 Jun 2019 00:48:40 +0200
-
 qubes-utils (4.1.0) unstable; urgency=medium
 
   * Remove qrexec related files

debian/control

@@ -24,11 +24,8 @@ Description: Qubes Linux utilities
 
 Package: qubes-kernel-vm-support
 Architecture: any
-Depends:
+Recommends: initramfs-tools
- busybox,
+Depends: ${misc:Depends}
- initramfs-tools | dracut,
- grub2-common,
- ${misc:Depends}
 Description: Qubes VM kernel and initramfs modules
  This package contains:
  1. mkinitramfs module required to setup Qubes VM root filesystem. This package

debian/qubes-kernel-vm-support.postinst

@@ -46,19 +46,6 @@ esac
 
 #DEBHELPER#
 
-## https://phabricator.whonix.org/T377
-## Debian has no update-grub trigger yet:
-## https://bugs.debian.org/481542
-
-if command -v update-grub >/dev/null 2>&1; then
-   update-grub || \
-      echo "$DPKG_MAINTSCRIPT_PACKAGE $DPKG_MAINTSCRIPT_NAME ERROR: Running \
-'update-grub' failed with exit code $?. $DPKG_MAINTSCRIPT_PACKAGE is most \
-likely only the trigger, not the cause. Unless you know this is not an issue, \
-you should fix running 'update-grub', otherwise your system might no longer \
-boot." >&2
-fi
-
 exit 0
 
 # vim: set ts=4 sw=4 sts=4 et :

debian/qubes-kernel-vm-support.preinst

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-mkdir --parents /boot/grub || true
-
-#DEBHELPER#
-
-exit 0

dracut/full-dmroot/qubes_cow_setup.sh

@@ -79,8 +79,8 @@ if [ `cat /sys/class/block/$ROOT_DEV/ro` = 1 ] ; then
         die "volatile.img smaller than 1GB, cannot continue"
     fi
     sfdisk -q --unit S /dev/xvdc >/dev/null <<EOF
-xvdc1: type=82,start=2048,size=$SWAP_SIZE
+1,$SWAP_SIZE,S
-xvdc2: type=83
+,,L
 EOF
     if [ $? -ne 0 ]; then
         die "Qubes: failed to setup partitions on volatile device"
@@ -97,8 +97,7 @@ else
     log_begin "Qubes: Doing R/W setup for TemplateVM..."
     while ! [ -e /dev/xvdc ]; do sleep 0.1; done
     sfdisk -q --unit S /dev/xvdc >/dev/null <<EOF
-xvdc1: type=82,start=2048,size=$SWAP_SIZE
+1,$SWAP_SIZE,S
-xvdc3: type=83
 EOF
     if [ $? -ne 0 ]; then
         die "Qubes: failed to setup partitions on volatile device"

dracut/simple/init.sh

@@ -53,8 +53,8 @@ if [ `cat /sys/class/block/$ROOT_DEV/ro` = 1 ] ; then
         die "volatile.img smaller than 1GB, cannot continue"
     fi
     /sbin/sfdisk -q --unit S /dev/xvdc >/dev/null <<EOF
-xvdc1: type=82,start=2048,size=$SWAP_SIZE
+1,$SWAP_SIZE,S
-xvdc2: type=83
+,,L
 EOF
     if [ $? -ne 0 ]; then
         echo "Qubes: failed to setup partitions on volatile device"
@@ -72,8 +72,7 @@ else
     echo "Qubes: Doing R/W setup for TemplateVM..."
     while ! [ -e /dev/xvdc ]; do sleep 0.1; done
     /sbin/sfdisk -q --unit S /dev/xvdc >/dev/null <<EOF
-xvdc1: type=82,start=2048,size=$SWAP_SIZE
+1,$SWAP_SIZE,S
-xvdc3: type=83
 EOF
     if [ $? -ne 0 ]; then
         die "Qubes: failed to setup partitions on volatile device"

grub/grub.qubes-kernel-vm-support

@@ -5,4 +5,4 @@ if [ -r /usr/share/qubes/marker-vm ] &&
         [ "$(cat /var/lib/qubes/initramfs-updated 2>/dev/null || echo 0)" -ge 1 ]; then
     GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX xen_scrub_pages=0"
 fi
-GRUB_ENABLE_BLSCFG=false
+

qrexec-lib/unpack.c

@@ -33,6 +33,10 @@ void send_status_and_crc(int code, const char *last_filename);
 #define O_TMPFILE_MASK (__O_TMPFILE | O_DIRECTORY | O_CREAT)
 #endif
 
+#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 14)
+#define HAVE_SYNCFS
+#endif
+
 void do_exit(int code, const char *last_filename)
 {
     close(0);
@@ -209,8 +213,10 @@ void process_one_file(struct file_header *untrusted_hdr)
 int do_unpack(void)
 {
     struct file_header untrusted_hdr;
+#ifdef HAVE_SYNCFS
     int cwd_fd;
     int saved_errno;
+#endif
 
     total_bytes = total_files = 0;
     /* initialize checksum */
@@ -227,10 +233,14 @@ int do_unpack(void)
         process_one_file(&untrusted_hdr);
     }
 
+#ifdef HAVE_SYNCFS
     saved_errno = errno;
     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);
     return errno;

rpm_spec/qubes-utils.spec.in

@@ -14,7 +14,7 @@ Requires:	ImageMagick
 Requires:	python%{python3_pkgversion}-qubesimgconverter
 %{?systemd_requires}
 BuildRequires:  systemd
-BuildRequires:  python2-setuptools
+BuildRequires:  python-setuptools
 BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  python2-rpm-macros
 BuildRequires:  python3-rpm-macros
@@ -27,7 +27,7 @@ Common Linux files for Qubes Dom0 and VM
 
 %package -n python2-qubesimgconverter
 Summary:    Python package qubesimgconverter
-Requires:   python2
+Requires:   python
 Requires:   pycairo
 %if 0%{?rhel} >= 7
 Requires:   python-pillow

version

@@ -1 +1 @@
-4.1.3
+4.1.0