Bug#864297: unblock: schroot/1.6.10-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package schroot
It might not qualify for last minutes updates and I would understand
if you ask me to handle this via stretch-pu in the future but I would like
to have two bugs fixed in stretch:
- the completion code is completely broken (#855283)
- a member of the DSA team asked me to provide a systemd unit to avoid
timeouts they encounter on porter boxes (#835104)
I'm very late with both of those issues that have been known for a long
time, I'm sorry for that.
unblock schroot/1.6.10-4
Here's the debdiff:
diff -Nru schroot-1.6.10/debian/changelog schroot-1.6.10/debian/changelog
--- schroot-1.6.10/debian/changelog 2017-01-09 18:38:50.000000000 +0100
+++ schroot-1.6.10/debian/changelog 2017-06-06 16:38:31.000000000 +0200
@@ -1,8 +1,17 @@
+schroot (1.6.10-4) unstable; urgency=medium
+
+ * Fix up bash completion file. Closes: #855283
+ * Add systemd service file to avoid issues with timeouts when
+ you have many schroot sessions open. Closes: #835104
+ Thanks to Laurent Bigonville for the patch.
+
+ -- Raphaël Hertzog <hertzog@debian.org> Tue, 06 Jun 2017 16:38:31 +0200
+
schroot (1.6.10-3) unstable; urgency=medium
* By default mark all mounts done by schroot-mount as "private"
to avoid bad interactions caused by systemd's default of "shared"
- that resulted in failure to unmount them. Closes: #761435
+ that resulted in failure to unmount them. Closes: #786566
Thanks to Tyler Hicks <tyhicks@canonical.com> for the patch.
* debian/patches/fix-test-suite-with-usrmerge.patch: fix test suite when
/bin is a symlink to /usr/bin.
diff -Nru schroot-1.6.10/debian/control schroot-1.6.10/debian/control
--- schroot-1.6.10/debian/control 2017-01-09 18:38:50.000000000 +0100
+++ schroot-1.6.10/debian/control 2017-06-06 16:38:31.000000000 +0200
@@ -6,6 +6,7 @@
Build-Depends:
cmake (>= 2.8.12),
debhelper (>= 9),
+ dh-systemd,
pkg-config,
libpam0g-dev,
uuid-dev [!kfreebsd-any],
@@ -24,6 +25,7 @@
Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/buildd-tools/schroot.git
Vcs-Git: https://anonscm.debian.org/git/buildd-tools/schroot.git
+Homepage: https://gitlab.com/codelibre/schroot
Package: schroot-common
Architecture: all
diff -Nru schroot-1.6.10/debian/patches/fix-bash-completion.patch schroot-1.6.10/debian/patches/fix-bash-completion.patch
--- schroot-1.6.10/debian/patches/fix-bash-completion.patch 1970-01-01 01:00:00.000000000 +0100
+++ schroot-1.6.10/debian/patches/fix-bash-completion.patch 2017-06-06 16:38:31.000000000 +0200
@@ -0,0 +1,25 @@
+Description: Fix bash completion
+Author: Raphaël Hertzog <hertzog@debian.org>
+Bug: https://gitlab.com/codelibre/schroot/issues/24
+Bug-Debian: https://bugs.debian.org/855283
+Last-Update: 2017-06-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/etc/bash_completion/schroot
++++ b/etc/bash_completion/schroot
+@@ -15,7 +15,7 @@
+ # along with this program. If not, see
+ # <http://www.gnu.org/licenses/>.
+
+-have schroot &&
++_have schroot &&
+ _schroot()
+ {
+ local cur prev options
+@@ -33,5 +33,4 @@ _schroot()
+ COMPREPLY=( $(compgen -W "$options" -- $cur) )
+ fi
+ return 0
+-}
+-complete -F _schroot schroot
++} && complete -F _schroot schroot
diff -Nru schroot-1.6.10/debian/patches/series schroot-1.6.10/debian/patches/series
--- schroot-1.6.10/debian/patches/series 2017-01-09 18:38:50.000000000 +0100
+++ schroot-1.6.10/debian/patches/series 2017-06-06 16:38:31.000000000 +0200
@@ -8,3 +8,4 @@
fix-test-suite-with-usrmerge.patch
Unmount-everything-that-we-can-instead-of-giving-up.patch
fix-killprocs.patch
+fix-bash-completion.patch
diff -Nru schroot-1.6.10/debian/rules schroot-1.6.10/debian/rules
--- schroot-1.6.10/debian/rules 2017-01-09 18:38:50.000000000 +0100
+++ schroot-1.6.10/debian/rules 2017-06-06 16:38:31.000000000 +0200
@@ -25,7 +25,7 @@
export DEB_CXXFLAGS_MAINT_APPEND := -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
export DEB_BUILD_MAINT_OPTIONS := hardening=+all
-DH_OPTIONS = --buildsystem=cmake --builddirectory=debian/build --parallel
+DH_OPTIONS = --with systemd --buildsystem=cmake --builddirectory=debian/build --parallel
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -109,4 +109,7 @@
override_dh_installinit:
dh_installinit --no-start --update-rcd-params='defaults'
+override_dh_systemd_start:
+ dh_systemd_start --no-start
+
.PHONY: override_dh_auto_configure override_dh_auto_clean override_dh_auto_build override_dh_auto_test override_dh_auto_install override_dh_installchangelogs override_dh_installinit install-arch install-indep
diff -Nru schroot-1.6.10/debian/schroot.service schroot-1.6.10/debian/schroot.service
--- schroot-1.6.10/debian/schroot.service 1970-01-01 01:00:00.000000000 +0100
+++ schroot-1.6.10/debian/schroot.service 2017-06-06 16:38:31.000000000 +0200
@@ -0,0 +1,13 @@
+[Unit]
+Description=Recover schroot sessions
+Documentation=man:schroot(1)
+RequiresMountsFor=/var/lib/schroot
+
+[Service]
+Type=oneshot
+ExecStart=/etc/init.d/schroot start
+ExecStop=/etc/init.d/schroot stop
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
-- System Information:
Debian Release: 9.0
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Reply to: