debian/changelog

+schroot (1.6.10-7) unstable; urgency=medium
+
+  * QA upload.
+  * debian/patches/zfs-snapshot-support.patch: add support for a zfs-
+    snapshot backend.  Closes: #947919.
+  * Suggest btrfs-progs instead of obsolete btrfs-tools.
+    Closes: #857470.
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: (Closes: #909445)
+    + Let dh_auto_configure pass cross flags to cmake.
+    + cross.patch: Avoid check_cxx_source_runs.
+    + Support DEB_BUILD_OPTIONS=nocheck.
+
+ -- Steve Langasek <vorlon@debian.org>  Fri, 03 Jan 2020 21:13:37 +0000
+
 schroot (1.6.10-6) unstable; urgency=medium
 
   * QA upload, fixing documentation / l10n issues.

debian/control

@@ -54,7 +54,7 @@ Breaks:
  sbuild (<< 0.62.6),
 # We need the --find option of update-binfmts
  binfmt-support (<< 2.0.1)
-Suggests: debootstrap, lvm2, btrfs-tools, aufs-tools | unionfs-fuse, qemu-user-static
+Suggests: debootstrap, lvm2, btrfs-progs, zfsutils-linux, aufs-tools | unionfs-fuse, qemu-user-static
 Description: Execute commands in a chroot environment
  schroot allows users to execute commands or interactive shells in
  different chroots.  Any number of named chroots may be created, and
@@ -67,7 +67,7 @@ Description: Execute commands in a chroot environment
  Several different types of chroot are supported, including normal
  directories in the filesystem, and also block devices.  Sessions,
  persistent chroots created on the fly from files (tar with optional
- compression) and Btrfs and LVM snapshots are also supported.
+ compression) and Btrfs, ZFS, and LVM snapshots are also supported.
  .
  schroot supports kernel personalities, allowing the programs run
  inside the chroot to have a different personality.  For example,
@@ -76,7 +76,7 @@ Description: Execute commands in a chroot environment
  .
  schroot also integrates with sbuild, to allow building packages with
  all supported chroot types, including session-managed chroot types
- such as Btrfs and LVM snapshots.
+ such as Btrfs, ZFS, and LVM snapshots.
  .
  schroot shares most of its options with dchroot, but offers vastly
  more functionality.

debian/patches/cross.patch

+--- schroot-1.6.10.orig/CMakeLists.txt
++++ schroot-1.6.10/CMakeLists.txt
+@@ -96,7 +96,7 @@
+ # Configure testing
+ SET(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES})
+ SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} cppunit)
+-check_cxx_source_runs(
++check_cxx_source_compiles(
+ "#include <cppunit/ui/text/TestRunner.h>
+ 
+ int main() {
+--- schroot-1.6.10.orig/cmake/regex-checks.cmake
++++ schroot-1.6.10/cmake/regex-checks.cmake
+@@ -3,7 +3,23 @@
+ function(regex_test namespace header library outvar outlib)
+   set(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES})
+   set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${library})
+-  check_cxx_source_runs(
++
++  if (CMAKE_CROSSCOMPILING)
++    message(WARNING "Using simplified regex check for cross compilation. Assuming that regex implementations work correctly.")
++    check_cxx_source_compiles(
++"#include <${header}>
++
++int main() {
++  ${namespace} foo(\"x\");
++  ${namespace} bar(\"x\", ${namespace}::extended);
++  std::string test(\"x\");
++  ${namespace}_search(test, foo);
++  ${namespace}_match(test, foo);
++  return 0;
++}"
++${outvar})
++  else(CMAKE_CROSSCOMPILING)
++    check_cxx_source_runs(
+ "#include <${header}>
+ #include <iostream>
+ 
+@@ -43,6 +59,7 @@
+   return 0;
+ }"
+ ${outvar})
++  endif(CMAKE_CROSSCOMPILING)
+ 
+   set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE})
+ 

debian/patches/series

@@ -13,3 +13,5 @@ fix_typos_in_schroot_manpage.patch
 update_czech_schroot_translation.patch
 update_french_schroot_manpage_translation_2018.patch
 update_german_schroot_manpage_translation_2018.patch
+zfs-snapshot-support.patch
+cross.patch

debian/rules

@@ -10,9 +10,11 @@ LIBEXECDIR = $(LIBDIR)/schroot
 ifneq ($(DEB_HOST_ARCH_OS),linux)
 	LVMSNAP_OPTIONS = -Dlvm-snapshot=OFF
 	BTRFSSNAP_OPTIONS = -Dbtrfs-snapshot=OFF
+	ZFSSNAP_OPTIONS = -Dzfs-snapshot=OFF
 else
 	LVMSNAP_OPTIONS = -Dlvm-snapshot=ON
 	BTRFSSNAP_OPTIONS = -Dbtrfs-snapshot=ON
+	ZFSSNAP_OPTIONS = -Dzfs-snapshot=ON
 endif
 
 ifneq ($(DEB_HOST_ARCH_OS),kfreebsd)
@@ -44,22 +46,19 @@ DH_INSTALL_FILES = $(basename $(wildcard debian/*.install.in))
 override_dh_auto_configure: debian/build/CMakeCache.txt
 
 debian/build/CMakeCache.txt: CMakeLists.txt
-	mkdir -p $(dir $@)
-	cd $(dir $@) ; \
 	GTEST_ROOT="$(CURDIR)/debian/build/gtest" \
 	CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
 	CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
-	  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-	        -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-	        -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
+	dh_auto_configure --builddirectory=$(dir $@) -- \
 	        -DCMAKE_INSTALL_LIBEXECDIR=lib \
 	        -DSCHROOT_LIBEXEC_DIR=/$(LIBDIR)/schroot \
 	        -Ddebug=OFF -Ddchroot=OFF -Ddchroot-dsa=OFF \
 	        -Dbash_completion_dir=/usr/share/bash-completion/completions \
-	        $(LVMSNAP_OPTIONS) $(BTRFSSNAP_OPTIONS) \
+	        $(LVMSNAP_OPTIONS) $(BTRFSSNAP_OPTIONS) $(ZFSSNAP_OPTIONS) \
 	        -DBTRFS_EXECUTABLE=/sbin/btrfs \
 	        -DLVCREATE_EXECUTABLE=/sbin/lvcreate \
 	        -DLVREMOVE_EXECUTABLE=/sbin/lvremove \
+	        -DZFS_EXECUTABLE=/sbin/zfs \
 	        $(CURDIR)
 	dh_testdir
 
@@ -86,8 +85,10 @@ install-arch: build-arch $(DH_INSTALL_FILES)
 # Lintian overrides
 	mkdir -p $(CURDIR)/debian/schroot/usr/share/lintian/overrides
 	cp $(CURDIR)/debian/schroot.lintian-overrides $(CURDIR)/debian/schroot/usr/share/lintian/overrides/schroot
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 # Requires fakeroot, so tests need running here.
 	$(MAKE) -C debian/build test ARGS=-V
+endif
 
 install-indep: build-indep $(DH_INSTALL_FILES)
 	dh $@ $(DH_OPTIONS)