Control: retitle -1 stretch-pu: schroot/1.6.10-3+deb9u1 Control: tag -1 + stretch Control: user release.debian....@packages.debian.org Control: usertags -1 = pu
On Tue, 06 Jun 2017, Jonathan Wiltshire wrote: > > - 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 would rather that both these saw more testing in unstable first, so > please work with SRMs for a later stable update. Re-purposing the bug to that end. Let me know when you are happy with an upload to stretch. Here's the debdiff: commit e99ab81d88cc46aa30f70fb3f6170a521aad113e (HEAD -> debian/stretch) Author: Raphaël Hertzog <hert...@debian.org> Date: Tue Jun 6 16:38:16 2017 +0200 Stable update backporting changes from 1.6.10-4 diff --git a/debian/changelog b/debian/changelog index 2fafdb4d..f5973d37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +schroot (1.6.10-3+deb9u1) stretch; 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. + * Add missing Homepage field. + + -- Raphaël Hertzog <hert...@debian.org> Tue, 06 Jun 2017 16:17:58 +0200 + schroot (1.6.10-3) unstable; urgency=medium * By default mark all mounts done by schroot-mount as "private" diff --git a/debian/control b/debian/control index bdf22e69..fc116480 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Uploaders: Raphaël Hertzog <hert...@debian.org> Build-Depends: cmake (>= 2.8.12), debhelper (>= 9), + dh-systemd, pkg-config, libpam0g-dev, uuid-dev [!kfreebsd-any], @@ -24,6 +25,7 @@ Build-Depends-Indep: 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 --git a/debian/patches/fix-bash-completion.patch b/debian/patches/fix-bash-completion.patch new file mode 100644 index 00000000..38388a8c --- /dev/null +++ b/debian/patches/fix-bash-completion.patch @@ -0,0 +1,25 @@ +Description: Fix bash completion +Author: Raphaël Hertzog <hert...@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 --git a/debian/patches/series b/debian/patches/series index 0f75d916..806db40c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ schroot-mount-resolve-mount-destinations-while-chrooted.patch fix-test-suite-with-usrmerge.patch Unmount-everything-that-we-can-instead-of-giving-up.patch fix-killprocs.patch +fix-bash-completion.patch diff --git a/debian/rules b/debian/rules index bfa1d79c..45d259f4 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ export DEB_CFLAGS_MAINT_APPEND := -Wall 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_installchangelogs: 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 --git a/debian/schroot.service b/debian/schroot.service new file mode 100644 index 00000000..9936818f --- /dev/null +++ b/debian/schroot.service @@ -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 Cheers, -- Raphaël Hertzog ◈ Debian Developer Support Debian LTS: https://www.freexian.com/services/debian-lts.html Learn to master Debian: https://debian-handbook.info/get/