diff --git a/debian/changelog b/debian/changelog index ebb7c499..f37bd3cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,31 @@ +sbuild (0.85.0ubuntu1) lunar; urgency=medium + + [ Dave Jones ] + + * Merge from Debian unstable (LP: #2003201). Remaining changes: + - Fix autopkgtest `unshare-qemuwrapper` on lunar-proposed + - d/t/unshare-qemuwrapper: copy apt preferences into the vm's chroot. + - d/t/unshare: use mmdebstrap --verbose to aid debugging. + * Removed patches obsoleted/merged by upstream: + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + - d/t/build-procenv: Make skippable when mknod fails, as in unprivileged + container case (as Ubuntu's autopkgtest uses in the armhf case) + * Removed obsolete patches: + - debian/tests/unshare: Run the test, but skip it if user namespaces are + not supported + - unshare test requires isolation-machine to execute + + [ Benjamin Drung ] + + * d/t/get_default_release.py: Rely on VERSION_CODENAME from /etc/os-release + on non-Debian systems if the variable is set. + * d/t/check-unshare-support: Add a check for unshare support. If unshare is + supported, run the unshare autopkgtest directly. Otherwise run + unshare-qemuwrapper. + + -- Dave Jones Wed, 18 Jan 2023 13:06:24 +0000 + sbuild (0.85.0) unstable; urgency=medium [ Johannes Schauer Marin Rodrigues ] @@ -48,6 +76,55 @@ sbuild (0.84.2) unstable; urgency=medium -- Johannes Schauer Marin Rodrigues Thu, 08 Dec 2022 10:20:58 +0100 +sbuild (0.84.1ubuntu3) lunar; urgency=medium + + * Fix autopkgtest `unshare-qemuwrapper` on lunar-proposed (LP: #2000015) + - d/t/unshare-qemuwrapper: copy apt preferences into the vm's chroot. + - d/t/unshare: use mmdebstrap --verbose to aid debugging. + + -- Mauricio Faria de Oliveira Fri, 16 Dec 2022 14:20:13 -0300 + +sbuild (0.84.1ubuntu2) lunar; urgency=medium + + * d/t/build-procenv: Make skippable when mknod fails, as in unprivileged + container case (as Ubuntu's autopkgtest uses in the armhf case) + (LP: #1998479) + + -- Dave Jones Thu, 08 Dec 2022 16:47:16 +0000 + +sbuild (0.84.1ubuntu1) lunar; urgency=medium + + * Merge from Debian unstable (LP: #1998479). Remaining changes: + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + - debian/tests/unshare: Run the test, but skip it if user namespaces are + not supported + - unshare test requires isolation-machine to execute + * Removed patches obsoleted/merged by upstream: + - d/t/control: add isolation-machine to the test flags + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - debian/tests/control: Skip unshare-qemuwrapper test where linux-image- + amd64 is missing. It is missing in Ubuntu making the test fail. + - debian/tests/unshare*: Test with current release + - Fix the unshare tests + - Make dscverify available by adding devscripts to EXTRA_DEPS + - Ensure dscverify tests actually run by re-writing verify() + - Remove the release=unstable check (there's no reason we shouldn't + check the orig-tarball and deb output) + - unshare test requires isolation-machine to execute + - Fix build-procenv to work under Ubuntu by removing unstable deb-src + reference + - Fix the diffoscope tests + - Change the expected .deb output to match xz or zstd compression + - Use "unstable" as d/changelog release name so the test can remain + static across releases + - Patch umask differences otherwise diffoscope barfs on differing group + modes in the generated orig-tar + + -- Dave Jones Fri, 02 Dec 2022 16:09:52 +0000 + sbuild (0.84.1) unstable; urgency=medium [ Jochen Sprickerhof ] @@ -136,6 +213,44 @@ sbuild (0.83.2) unstable; urgency=medium -- Aurelien Jarno Mon, 29 Aug 2022 22:44:02 +0200 +sbuild (0.83.1ubuntu1) kinetic; urgency=medium + + * Merge from Debian unstable (LP: #1974177). Remaining changes: + - d/t/control: add isolation-machine to the test flags + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + (LP: #1976257) + - debian/tests/control: Skip unshare-qemuwrapper test where linux-image- + amd64 is missing. It is missing in Ubuntu making the test fail. + - debian/tests/unshare: Run the test, but skip it if user namespaces are + not supported + - debian/tests/unshare*: Test with current release + * Removed obsolete patches/changes: + - debian/tests/control: Don't depend on linux-image-amd64 package + It does not exist on Ubuntu. + - debian/tests/unshare-qemuwrapper: Don't use linux-image-amd64 package in + bootrstrapping test on Ubuntu + - debian/tests/unshare-qemuwrapper: Drop delta + * Fix the unshare tests + - Make dscverify available by adding devscripts to EXTRA_DEPS + - Ensure dscverify tests actually run by re-writing verify() + - Remove the release=unstable check (there's no reason we shouldn't + check the orig-tarball and deb output) + - unshare test requires isolation-machine to execute + * Fix build-procenv to work under Ubuntu by removing unstable deb-src + reference + * Fix the diffoscope tests + - Change the expected .deb output to match xz or zstd compression + - Use "unstable" as d/changelog release name so the test can remain + static across releases + - Patch umask differences otherwise diffoscope barfs on differing group + modes in the generated orig-tar + + -- Dave Jones Thu, 30 Jun 2022 12:21:07 +0200 + sbuild (0.83.1) unstable; urgency=medium [ Johannes Schauer Marin Rodrigues ] @@ -226,6 +341,55 @@ sbuild (0.82.0) unstable; urgency=medium -- Johannes Schauer Marin Rodrigues Mon, 24 Jan 2022 23:30:27 +0100 +sbuild (0.81.2ubuntu6) jammy; urgency=medium + + * No-change rebuild to update maintainer scripts, see LP: 1959054 + + -- Dave Jones Wed, 16 Feb 2022 17:32:39 +0000 + +sbuild (0.81.2ubuntu5) hirsute; urgency=medium + + * debian/tests/control: Skip unshare-qemuwrapper test where linux-image-amd64 + is missing. It is missing in Ubuntu making the test fail. + * debian/tests/unshare: Run the test, but skip it if user namespaces are not + supported + * debian/tests/unshare-qemuwrapper: Drop delta + * debian/tests/unshare*: Test with current release + + -- Balint Reczey Thu, 18 Mar 2021 08:38:02 +0100 + +sbuild (0.81.2ubuntu4) hirsute; urgency=medium + + * debian/tests/unshare-qemuwrapper: Don't use linux-image-amd64 package in + bootrstrapping test on Ubuntu + + -- Balint Reczey Mon, 01 Mar 2021 12:02:26 +0100 + +sbuild (0.81.2ubuntu3) hirsute; urgency=medium + + * debian/tests/control: Don't depend on linux-image-amd64 package + It does not exist on Ubuntu. + + -- Balint Reczey Thu, 25 Feb 2021 18:50:14 +0100 + +sbuild (0.81.2ubuntu2) hirsute; urgency=medium + + * No change rebuild with fixed ownership. + + -- Dimitri John Ledkov Tue, 16 Feb 2021 17:05:37 +0000 + +sbuild (0.81.2ubuntu1) hirsute; urgency=medium + + * Merge with Debian; remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + - d/t/control: add isolation-machine to the test flags + + -- Matthias Klose Mon, 08 Feb 2021 11:55:35 +0100 + sbuild (0.81.2) unstable; urgency=medium * Package sbuild-qemu should be arch:all, not arch:amd64. @@ -277,6 +441,18 @@ sbuild (0.80.1) unstable; urgency=medium -- Johannes 'josch' Schauer Sat, 05 Dec 2020 17:46:22 +0100 +sbuild (0.80.0ubuntu1) groovy; urgency=medium + + * Resynchronize on Debian, remaining changes + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + - d/t/control: add isolation-machine to the test flags + + -- Sebastien Bacher Tue, 04 Aug 2020 16:28:23 +0200 + sbuild (0.80.0) unstable; urgency=medium [ Johannes 'josch' Schauer ] @@ -304,6 +480,24 @@ sbuild (0.80.0) unstable; urgency=medium -- Johannes 'josch' Schauer Sat, 01 Aug 2020 14:07:53 +0200 +sbuild (0.79.1-1ubuntu3) groovy; urgency=medium + + * Fix autopkg test with dpkg 1.20.x. + + -- Matthias Klose Tue, 28 Jul 2020 14:51:53 +0200 + +sbuild (0.79.1-1ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + - d/t/control: add isolation-machine to the test flags + + -- Steve Langasek Fri, 01 May 2020 15:32:56 -0700 + sbuild (0.79.1-1) unstable; urgency=medium * Team upload. @@ -316,6 +510,21 @@ sbuild (0.79.1-1) unstable; urgency=medium -- Ivo De Decker Wed, 22 Apr 2020 22:35:33 +0000 +sbuild (0.79.0-1ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + - d/t/control: add isolation-machine to the test flags + * Dropped changes, included in Debian: + - d/t/build-procenv: only install the built package if the chroot it was + built in matches the release of the host system + + -- Steve Langasek Thu, 13 Feb 2020 12:26:35 -0800 + sbuild (0.79.0-1) unstable; urgency=medium * Team upload. @@ -333,6 +542,22 @@ sbuild (0.79.0-1) unstable; urgency=medium -- Ivo De Decker Wed, 05 Feb 2020 17:41:38 +0100 +sbuild (0.78.1-2ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + - d/t/control: add isolation-machine to the test flags + - d/t/build-procenv: only install the built package if the chroot it was + built in matches the release of the host system + * Dropped changes, included upstream: + - utf-8-by-default.patch: Switch to C.UTF-8 by default. + + -- Steve Langasek Thu, 02 May 2019 16:24:29 -0700 + sbuild (0.78.1-2) unstable; urgency=medium [ Mike Gabriel ] @@ -391,12 +616,44 @@ sbuild (0.78.0-1) unstable; urgency=medium -- Johannes 'josch' Schauer Wed, 09 Jan 2019 05:53:49 +0100 +sbuild (0.77.1-2ubuntu2) disco; urgency=medium + + * d/t/control: add isolation-machine to the test flags (LP: #1806389) + * d/t/build-procenv: only install the built package if the chroot it was + built in matches the release of the host system (LP: #1806388) + + -- Andreas Hasenack Mon, 03 Dec 2018 11:47:38 -0200 + +sbuild (0.77.1-2ubuntu1) disco; urgency=low + + * Merge from Debian unstable. Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - utf-8-by-default.patch: Switch to C.UTF-8 by default. + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + + -- Gianfranco Costamagna Mon, 26 Nov 2018 06:23:57 +0100 + sbuild (0.77.1-2) unstable; urgency=medium * Add patch allowing to control merged /usr (closes: #913228) -- Johannes 'josch' Schauer Tue, 13 Nov 2018 16:07:19 +0100 +sbuild (0.77.1-1ubuntu1) cosmic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - utf-8-by-default.patch: Switch to C.UTF-8 by default. + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + + -- Gianfranco Costamagna Wed, 12 Sep 2018 11:47:20 +0200 + sbuild (0.77.1-1) unstable; urgency=medium * New upstream release. @@ -406,6 +663,18 @@ sbuild (0.77.1-1) unstable; urgency=medium -- Johannes 'josch' Schauer Tue, 11 Sep 2018 00:08:08 +0200 +sbuild (0.77.0-4ubuntu1) cosmic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - utf-8-by-default.patch: Switch to C.UTF-8 by default. + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + + -- Gianfranco Costamagna Mon, 30 Jul 2018 10:11:49 +0200 + sbuild (0.77.0-4) unstable; urgency=medium * Add patch to fix the empty directory check of sbuild-create-chroot @@ -413,12 +682,36 @@ sbuild (0.77.0-4) unstable; urgency=medium -- Johannes 'josch' Schauer Fri, 27 Jul 2018 14:03:10 +0200 +sbuild (0.77.0-3ubuntu1) cosmic; urgency=medium + + * Merge from Debian Sid. Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - utf-8-by-default.patch: Switch to C.UTF-8 by default. + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + + -- Simon Quigley Thu, 12 Jul 2018 22:36:11 -0500 + sbuild (0.77.0-3) unstable; urgency=medium * Patch sbuild-destroychroot with an import of SchrootInfo (closes: #903513) -- Johannes 'josch' Schauer Wed, 11 Jul 2018 21:32:04 +0200 +sbuild (0.77.0-2ubuntu1) cosmic; urgency=medium + + * Merge from Debian Sid. Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - utf-8-by-default.patch: Switch to C.UTF-8 by default. + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + + -- Simon Quigley Mon, 09 Jul 2018 17:13:42 -0500 + sbuild (0.77.0-2) unstable; urgency=medium * Install /usr/sbin/sbuild-adduser and /usr/sbin/sbuild-destroychroot again @@ -488,12 +781,36 @@ sbuild (0.77.0-1) unstable; urgency=medium -- Johannes 'josch' Schauer Fri, 06 Jul 2018 23:11:45 +0200 +sbuild (0.76.0-1ubuntu1) cosmic; urgency=low + + * Merge from Debian Sid (LP: #1770317). Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - utf-8-by-default.patch: Switch to C.UTF-8 by default. + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + + -- Simon Quigley Thu, 10 May 2018 00:13:10 -0500 + sbuild (0.76.0-1) unstable; urgency=medium * Install sbuild-debian-developer-setup-update-all cronjob (closes: #893577) -- Michael Stapelberg Mon, 09 Apr 2018 18:58:38 +0200 +sbuild (0.75.0-1ubuntu1) bionic; urgency=low + + * Merge from Debian Sid (LP: #1756195). Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - utf-8-by-default.patch: Switch to C.UTF-8 by default. + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + + -- Simon Quigley Fri, 23 Mar 2018 00:15:11 -0500 + sbuild (0.75.0-1) unstable; urgency=medium * New upstream release. @@ -503,6 +820,18 @@ sbuild (0.75.0-1) unstable; urgency=medium -- Michael Stapelberg Wed, 21 Mar 2018 22:24:01 +0100 +sbuild (0.74.0-1ubuntu1) bionic; urgency=medium + + * Merge from Debian Sid (LP: #1756195). Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - utf-8-by-default.patch: Switch to C.UTF-8 by default. + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + + -- Simon Quigley Sat, 17 Mar 2018 00:56:58 -0500 + sbuild (0.74.0-1) unstable; urgency=medium * New upstream release @@ -522,6 +851,18 @@ sbuild (0.74.0-1) unstable; urgency=medium -- Michael Stapelberg Wed, 14 Mar 2018 21:55:42 +0100 +sbuild (0.73.0-4ubuntu1) zesty; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - utf-8-by-default.patch: Switch to C.UTF-8 by default (LP: #1566590) + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + + -- Gianfranco Costamagna Wed, 01 Feb 2017 16:04:29 +0100 + sbuild (0.73.0-4) unstable; urgency=medium * Retroactively add two entries into debian/NEWS for the Stretch release. @@ -535,6 +876,23 @@ sbuild (0.73.0-3) unstable; urgency=medium -- Johannes Schauer Sun, 22 Jan 2017 15:03:49 +0100 +sbuild (0.73.0-2ubuntu1) zesty; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - utf-8-by-default.patch: Switch to C.UTF-8 by default (LP: #1566590) + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + * Drop changes merged in Debian + - Set APT::Sandbox::User=root when running apt-get source in the + build-procenv autopkgtest, to avoid stderr noise from current apt. + - Silence a couple of warnings from sbuild-createchroot which caused some + autopkgtest runs to fail. + + -- Gianfranco Costamagna Thu, 19 Jan 2017 09:27:07 +0100 + sbuild (0.73.0-2) unstable; urgency=medium * Bump build-depends on libdpkg-perl to 1.18.14 as sbuild is using @@ -615,6 +973,22 @@ sbuild (0.73.0-1) unstable; urgency=medium -- Johannes Schauer Sat, 24 Dec 2016 02:28:48 +0100 +sbuild (0.72.0-2ubuntu1) zesty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - Set APT::Sandbox::User=root when running apt-get source in the + build-procenv autopkgtest, to avoid stderr noise from current apt. + - Silence a couple of warnings from sbuild-createchroot which caused some + autopkgtest runs to fail. + - utf-8-by-default.patch: Switch to C.UTF-8 by default (LP: #1566590) + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + + -- Gianfranco Costamagna Tue, 22 Nov 2016 10:02:25 +0100 + sbuild (0.72.0-2) unstable; urgency=medium * Fix regression from 0.72.0 upload: install forward file as .forward and @@ -657,6 +1031,22 @@ sbuild (0.72.0-1) unstable; urgency=medium -- Johannes Schauer Tue, 25 Oct 2016 07:43:07 +0200 +sbuild (0.71.0-2ubuntu1) yakkety; urgency=low + + * Merge from Debian unstable. Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - Set APT::Sandbox::User=root when running apt-get source in the + build-procenv autopkgtest, to avoid stderr noise from current apt. + - Silence a couple of warnings from sbuild-createchroot which caused some + autopkgtest runs to fail. + - utf-8-by-default.patch: Switch to C.UTF-8 by default (LP: #1566590) + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + + -- Gianfranco Costamagna Mon, 29 Aug 2016 08:22:14 +0200 + sbuild (0.71.0-2) unstable; urgency=medium * add patch to not check for the fakeroot binary on the host. Thanks @@ -666,6 +1056,32 @@ sbuild (0.71.0-2) unstable; urgency=medium -- Johannes Schauer Sat, 27 Aug 2016 11:20:06 +0200 +sbuild (0.71.0-1ubuntu2) yakkety; urgency=medium + + * cherry-pick from Debian: + - add patch to not check for the fakeroot binary on the host. Thanks + Gianfranco Costamagna + - Do not recommend fakeroot anymore. It is not needed on the host but only + inside the chroot. + + -- Gianfranco Costamagna Fri, 26 Aug 2016 12:38:10 +0200 + +sbuild (0.71.0-1ubuntu1) yakkety; urgency=low + + * Merge from Debian unstable. Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - Set APT::Sandbox::User=root when running apt-get source in the + build-procenv autopkgtest, to avoid stderr noise from current apt. + - Silence a couple of warnings from sbuild-createchroot which caused some + autopkgtest runs to fail. + - utf-8-by-default.patch: Switch to C.UTF-8 by default (LP: #1566590) + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + + -- Gianfranco Costamagna Fri, 26 Aug 2016 08:22:46 +0200 + sbuild (0.71.0-1) unstable; urgency=medium * add autopkgtest to Suggests @@ -697,6 +1113,22 @@ sbuild (0.71.0-1) unstable; urgency=medium -- Johannes Schauer Wed, 24 Aug 2016 13:42:26 +0200 +sbuild (0.70.0-1ubuntu1) yakkety; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - Set APT::Sandbox::User=root when running apt-get source in the + build-procenv autopkgtest, to avoid stderr noise from current apt. + - Silence a couple of warnings from sbuild-createchroot which caused some + autopkgtest runs to fail. + - utf-8-by-default.patch: Switch to C.UTF-8 by default (LP: #1566590) + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + + -- Gianfranco Costamagna Wed, 03 Aug 2016 12:33:10 +0200 + sbuild (0.70.0-1) unstable; urgency=medium * new upstream version @@ -756,6 +1188,25 @@ sbuild (0.70.0-1) unstable; urgency=medium -- Johannes Schauer Wed, 03 Aug 2016 10:58:48 +0200 +sbuild (0.69.0-2ubuntu1) yakkety; urgency=low + + * Merge from Debian unstable (LP: #1591674). Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - Set APT::Sandbox::User=root when running apt-get source in the + build-procenv autopkgtest, to avoid stderr noise from current apt. + - Silence a couple of warnings from sbuild-createchroot which caused some + autopkgtest runs to fail. + - utf-8-by-default.patch: Switch to C.UTF-8 by default (LP: #1566590) + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + * Drop patches included/applied in Debian: apt-conf-quotes.patch, + copy-dummy-archive.patch, dummy-archive-sha512.patch, + fix-quoting-harder.patch + + -- Gianfranco Costamagna Sun, 12 Jun 2016 12:48:21 +0200 + sbuild (0.69.0-2) unstable; urgency=medium * add patch 0001-lib-Sbuild-ResolverBase.pm-do-not-produce-non-error-.patch @@ -835,12 +1286,95 @@ sbuild (0.68.0-1) unstable; urgency=medium -- Johannes Schauer Fri, 15 Jan 2016 10:18:53 +0100 +sbuild (0.67.0-2ubuntu7) xenial; urgency=medium + + * utf-8-by-default.patch: Switch to C.UTF-8 by default (LP: #1566590) + + -- Adam Conrad Tue, 19 Apr 2016 07:51:15 -0600 + +sbuild (0.67.0-2ubuntu6) xenial; urgency=medium + + * dummy-archive-sha512.patch: Sbuild::ResolverBase: sign dummy archive + with SHA-512. + + -- Colin Watson Thu, 07 Apr 2016 12:47:54 +0100 + +sbuild (0.67.0-2ubuntu5) xenial; urgency=medium + + * debian/patches/series: Patches apply much better when referenced here. + + -- Adam Conrad Mon, 28 Mar 2016 04:24:17 -0600 + +sbuild (0.67.0-2ubuntu4) xenial; urgency=medium + + * apt-conf-quotes.patch: Backport upstream commit to fix apt.conf quoting. + + -- Adam Conrad Mon, 28 Mar 2016 02:20:16 -0600 + +sbuild (0.67.0-2ubuntu3) xenial; urgency=medium + + * copy-dummy-archive.patch: Sbuild::ResolverBase: use copy: for dummy + archive. Fixes launchpad-buildd crashes when analysing dep-waits. + + -- Colin Watson Thu, 18 Feb 2016 14:32:21 +0000 + +sbuild (0.67.0-2ubuntu2) xenial; urgency=medium + + * abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + * fix-quoting-harder.patch: Switch from single to double quotes for args + when forking perl: "W: Stripped single quote from command for security" + + -- Adam Conrad Thu, 21 Jan 2016 03:19:26 -0700 + +sbuild (0.67.0-2ubuntu1) xenial; urgency=low + + * Merge with Debian. Remaining changes: + - do-not-install-debfoster-into-chroots.patch: Do not install debfoster + into the chroots because it is in universe and not needed for package + building itself. + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - Set APT::Sandbox::User=root when running apt-get source in the + build-procenv autopkgtest, to avoid stderr noise from current apt. + - Silence a couple of warnings from sbuild-createchroot which caused some + autopkgtest runs to fail. + + -- Iain Lane Wed, 06 Jan 2016 09:46:08 +0000 + sbuild (0.67.0-2) unstable; urgency=medium * backport patch fix-quoting.patch (closes: #809175) -- Johannes Schauer Mon, 28 Dec 2015 03:23:42 +0100 +sbuild (0.67.0-1ubuntu3) xenial; urgency=medium + + * Silence a couple of warnings from sbuild-createchroot which caused some + autopkgtest runs to fail. + + -- Colin Watson Mon, 28 Dec 2015 14:00:28 +0000 + +sbuild (0.67.0-1ubuntu2) xenial; urgency=medium + + * Set APT::Sandbox::User=root when running apt-get source in the + build-procenv autopkgtest, to avoid stderr noise from current apt. + + -- Colin Watson Mon, 28 Dec 2015 03:55:12 +0000 + +sbuild (0.67.0-1ubuntu1) xenial; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - do-not-install-debfoster-into-chroots.patch: Do not install debfoster + into the chroots because it is in universe and not needed for package + building itself. + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a + source package. + + -- Colin Watson Mon, 28 Dec 2015 00:09:27 +0000 + sbuild (0.67.0-1) unstable; urgency=medium * fix Vcs-Browser and Vcs-Git fields to point at the debian/unstable branch @@ -890,6 +1424,18 @@ sbuild (0.67.0-1) unstable; urgency=medium -- Johannes Schauer Sat, 26 Dec 2015 15:19:29 +0100 +sbuild (0.66.0-5ubuntu1) xenial; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - do-not-install-debfoster-into-chroots.patch: Do not install debfoster + into the chroots because it is in universe and not needed for package + building itself. + * no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + + -- Colin Watson Tue, 03 Nov 2015 13:02:14 +0000 + sbuild (0.66.0-5) unstable; urgency=medium * Backport commit 6456b3da to make sbuild binary packages reproducible @@ -965,6 +1511,24 @@ sbuild (0.66.0-1) unstable; urgency=medium -- Johannes Schauer Sun, 04 Oct 2015 09:50:02 +0200 +sbuild (0.65.2-1ubuntu2) vivid; urgency=medium + + * Backport from upstream: + - sbuild: Fix handling of exceptions while setting up chroot. + + -- Colin Watson Wed, 15 Apr 2015 11:30:20 -0500 + +sbuild (0.65.2-1ubuntu1) vivid; urgency=medium + + * Resynchronise with Debian (LP: #1428656). Remaining changes: + - debian/patches/do-not-install-debfoster-into-chroots.patch: do not + install debfoster into the chroots because it is in universe and not + needed for package building itself. + * Backport from upstream: + - sbuild: Don't sign dummy archive if apt_allow_unauthenticated is set. + + -- Colin Watson Tue, 14 Apr 2015 10:16:02 -0500 + sbuild (0.65.2-1) unstable; urgency=medium * Team upload. @@ -998,6 +1562,19 @@ sbuild (0.65.1-1) unstable; urgency=medium -- Ansgar Burchardt Tue, 24 Feb 2015 22:53:16 +0100 +sbuild (0.65.0-1ubuntu1) vivid; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/patches/do-not-install-debfoster-into-chroots.patch: do not + install debfoster into the chroots because it is in universe and not + needed for package building itself. + * Dropped changes (merged into upstream): + - debian/patches/run-pre-build-hooks-as-root.patch: run pre-build hooks + as root. + - Added DEP-8 autopkgtest to build procenv. + + -- Benjamin Drung Sat, 25 Oct 2014 12:09:57 +0200 + sbuild (0.65.0-1) unstable; urgency=medium [ Benjamin Drung ] @@ -1083,6 +1660,59 @@ sbuild (0.64.2-1) unstable; urgency=low -- Luca Falavigna Fri, 12 Sep 2014 20:02:46 +0200 +sbuild (0.64.1-1ubuntu6) utopic; urgency=medium + + * debian/tests/control: Updated Depends to allow more capable procenv to be + built. (LP: #1325896) + + -- James Hunt Tue, 03 Jun 2014 10:30:03 +0100 + +sbuild (0.64.1-1ubuntu5) utopic; urgency=medium + + * debian/tests/build_procenv: Ask the host's apt for Acquire::http::Proxy + and use that for bootstrapping and the built schroot as well. + * debian/tests/build_procenv: Install apt-utils into the generated schroot, + to avoid "debconf: delaying package configuration, since apt-utils is not + installed" stderr message. + + -- Martin Pitt Wed, 04 Jun 2014 08:09:47 +0200 + +sbuild (0.64.1-1ubuntu4) trusty; urgency=medium + + * debian/source/include-binaries: Add static sbuild signing keys to work + around systems with little entropy. + * debian/tests/build_procenv: Install sbuild signing keys. + * debian/tests/control: Add libnuma1, required by test package that is + built (procenv). + * debian/tests/sbuild-key.{pub,sec}: Static sbuild signing keys. + + -- James Hunt Wed, 05 Mar 2014 15:15:02 +0000 + +sbuild (0.64.1-1ubuntu3) trusty; urgency=medium + + * debian/tests/build_procenv: on Ubuntu, select the correct archive mirror + for the build architecture. + + -- Steve Langasek Tue, 04 Mar 2014 16:18:11 -0800 + +sbuild (0.64.1-1ubuntu2) trusty; urgency=medium + + * debian/tests/control: Add missing debootstrap test dependency. + + -- Martin Pitt Tue, 25 Feb 2014 10:09:33 +0100 + +sbuild (0.64.1-1ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/do-not-install-debfoster-into-chroots.patch: do not + install debfoster into the chroots because it is in universe and not + needed for package building itself. + - debian/patches/run-pre-build-hooks-as-root.patch: run pre-build hooks + as root. + - Added DEP-8 autopkgtest to build procenv. + + -- Marc Deslauriers Mon, 04 Nov 2013 07:57:40 -0500 + sbuild (0.64.1-1) unstable; urgency=low [ Roger Leigh ] @@ -1099,6 +1729,25 @@ sbuild (0.64.1-1) unstable; urgency=low -- Roger Leigh Sun, 13 Oct 2013 19:35:57 +0100 +sbuild (0.64.0-1ubuntu2) trusty; urgency=low + + * debian/tests/build_procenv: Add component universe for Ubuntu to make + procenv buildable (LP: #1247420) + + -- Jean-Baptiste Lallement Sat, 02 Nov 2013 22:45:08 +0100 + +sbuild (0.64.0-1ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/do-not-install-debfoster-into-chroots.patch: do not + install debfoster into the chroots because it is in universe and not + needed for package building itself. + - debian/patches/run-pre-build-hooks-as-root.patch: run pre-build hooks + as root. + - Added DEP-8 autopkgtest to build procenv. + + -- Marc Deslauriers Tue, 03 Sep 2013 09:04:59 -0400 + sbuild (0.64.0-1) unstable; urgency=low [ Thorsten Glaser ] @@ -1157,6 +1806,27 @@ sbuild (0.64.0-1) unstable; urgency=low -- Roger Leigh Fri, 17 May 2013 23:06:13 +0100 +sbuild (0.63.2-1.1ubuntu2) saucy; urgency=low + + * Added DEP-8 autopkgtest to build procenv. + + -- James Hunt Mon, 27 May 2013 10:18:26 +0200 + +sbuild (0.63.2-1.1ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Convert package back to source format 3.0 (quilt) so the patches get + applied. + - debian/patches/do-not-install-debfoster-into-chroots.patch: do not + install debfoster into the chroots because it is in universe and not + needed for package building itself. + - debian/patches/run-pre-build-hooks-as-root.patch: run pre-build hooks + as root. + - debian/patches/fix-rev-0.patch: convert inline change from 0.63.2-1.1 + into patch. + + -- Marc Deslauriers Thu, 17 Jan 2013 08:59:27 -0500 + sbuild (0.63.2-1.1) unstable; urgency=low * Non-maintainer upload. @@ -1164,6 +1834,19 @@ sbuild (0.63.2-1.1) unstable; urgency=low -- Roland Stigge Wed, 05 Dec 2012 14:44:45 +0100 +sbuild (0.63.2-1ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/do-not-install-debfoster-into-chroots.patch: do not + install debfoster into the chroots because it is in universe and not + needed for package building itself. + - debian/patches/run-pre-build-hooks-as-root.patch: run pre-build hooks + as root. + - Convert package back to source format 3.0 (quilt) so the patches get + applied. + + -- Marc Deslauriers Wed, 28 Nov 2012 07:44:25 -0500 + sbuild (0.63.2-1) unstable; urgency=low [ Roger Leigh ] @@ -1204,6 +1887,26 @@ sbuild (0.63.2-1) unstable; urgency=low -- Roger Leigh Sat, 18 Aug 2012 13:46:45 +0100 +sbuild (0.63.1-1ubuntu2) quantal; urgency=low + + * Convert package back to source format 3.0 (quilt) so the patches get + applied. + + -- Marc Deslauriers Tue, 14 Aug 2012 12:42:58 -0400 + +sbuild (0.63.1-1ubuntu1) quantal; urgency=low + + * Resynchronize with Debian testing. Remaining changes: + - debian/patches/do-not-install-debfoster-into-chroots.patch: + do not install debfoster into the chroots because it is in universe and + not needed for package building itself. + - debian/patches/run-pre-build-hooks-as-root.patch: + run pre-build hooks as root + * Drop run-lintian-inside-chroot.patch: It hasn't been picked up + by Debian and doesn't work quite right (LP: #940410) + + -- Jeremy Bicha Sat, 23 Jun 2012 22:27:58 -0400 + sbuild (0.63.1-1) unstable; urgency=low [ Roger Leigh ] diff --git a/debian/control b/debian/control index 040d73dc..8eb376f4 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: sbuild Section: devel Priority: optional -Maintainer: sbuild maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: sbuild maintainers Uploaders: Johannes Schauer Marin Rodrigues , Michael Banck , Francesco Paolo Lovergine , diff --git a/debian/tests/check-unshare-support b/debian/tests/check-unshare-support new file mode 100755 index 00000000..bf565d6e --- /dev/null +++ b/debian/tests/check-unshare-support @@ -0,0 +1,17 @@ +#!/usr/bin/perl + +# Stripped down unshare support check from mmdebstrap + +require "syscall.ph"; ## no critic (Modules::RequireBarewordIncludes) + +# from sched.h +# use typeglob constants because "use constant" has several drawback as +# explained in the documentation for the Readonly CPAN module +*CLONE_NEWNS = \0x20000; # mount namespace +*CLONE_NEWUSER = \0x10000000; # user + +my $ret = syscall(&SYS_unshare, $CLONE_NEWNS | $CLONE_NEWUSER); +if ($ret != 0) { + print STDERR "unshare syscall failed: $!\n"; + exit 77; +} diff --git a/debian/tests/control b/debian/tests/control index e2911367..85c749bb 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -2,6 +2,18 @@ Tests: build-procenv Depends: apt (>= 1.1~exp2), apt-utils, debootstrap, distro-info, lsb-release, @ Restrictions: needs-root skippable +Tests: unshare +Depends: build-essential, + devscripts, + diffoscope, + fakeroot, + gnupg, + mmdebstrap, + python3-apt, + sbuild, + uidmap +Restrictions: allow-stderr skippable + Tests: unshare-qemuwrapper Architecture: amd64 Depends: grep-dctrl, @@ -12,4 +24,4 @@ Depends: grep-dctrl, python3-apt, qemu-system-x86, sleepenh -Restrictions: allow-stderr needs-root +Restrictions: allow-stderr needs-root skippable diff --git a/debian/tests/get_default_release.py b/debian/tests/get_default_release.py index 112af8c7..5fbde91a 100755 --- a/debian/tests/get_default_release.py +++ b/debian/tests/get_default_release.py @@ -1,6 +1,14 @@ #!/usr/bin/env python3 -import apt_pkg, sys +import platform +import sys + +import apt_pkg + +os_release = platform.freedesktop_os_release() +if os_release["ID"] != "debian" and os_release.get("VERSION_CODENAME"): + print(os_release["VERSION_CODENAME"]) + sys.exit(0) apt_pkg.init() c = apt_pkg.Cache(None) diff --git a/debian/tests/unshare b/debian/tests/unshare index a09603cd..bc228b9e 100755 --- a/debian/tests/unshare +++ b/debian/tests/unshare @@ -13,6 +13,8 @@ if [ -z ${AUTOPKGTEST_TMP+x} ]; then exit 1 fi +debian/tests/check-unshare-support + release=$(./debian/tests/get_default_release.py) if [ -z "$release" ]; then echo "cannot get default release" >&2 @@ -247,7 +249,8 @@ cat << END > "${AUTOPKGTEST_TMP}/test-pkg-1.0/debian/source/format" 3.0 (native) END -mmdebstrap --mode=unshare --variant=apt --skip=cleanup/apt/lists "$release" "${AUTOPKGTEST_TMP}/chroot.tar" +mmdebstrap --mode=unshare --variant=apt --verbose --skip=cleanup/apt/lists \ + "$release" "${AUTOPKGTEST_TMP}/chroot.tar" env --chdir="${AUTOPKGTEST_TMP}/test-pkg-1.0/" dpkg-buildpackage --build=full env --chdir="${AUTOPKGTEST_TMP}/test-pkg-1.0/" dpkg-buildpackage --target=clean diff --git a/debian/tests/unshare-qemuwrapper b/debian/tests/unshare-qemuwrapper index bda7d6ab..c9492be9 100755 --- a/debian/tests/unshare-qemuwrapper +++ b/debian/tests/unshare-qemuwrapper @@ -28,6 +28,11 @@ EXTRA_DEPS=gnupg,sbuild,mmdebstrap,build-essential,uidmap,fakeroot,diffoscope,de PORT=$(python3 -c 'from socket import socket; s=socket(); s.bind(("", 0)); print(s.getsockname()[1]);' || echo 10022) SCRIPT=./debian/tests/unshare +if debian/tests/check-unshare-support; then + echo "Skipping test, because the unshare test can be executed directly." >&2 + exit 77 +fi + release=$(./debian/tests/get_default_release.py) if [ -z "$release" ]; then echo "cannot get default release" >&2 @@ -53,6 +58,8 @@ if [ -z ${AUTOPKGTEST_TMP+x} ]; then # executed under autopkgtest TMPDIR=$(mktemp --directory --tmpdir sbuild.XXXXXXXXXX) aptsources= + unset aptpreferences + unset aptpreferencesd MODE=auto else # since AUTOPKGTEST_TMP is set, we assume that this script is executed @@ -74,6 +81,21 @@ else cat "$f" aptsources="$aptsources $f" done + # we need to install the chroot using the same apt preferences as used by + # the autopkgtest chroot so that the versions to be tested are + # installed + unset aptpreferences + if [ -e /etc/apt/preferences ]; then + aptpreferences="/etc/apt/preferences" + fi + unset aptpreferencesd + if [ -d /etc/apt/preferences.d/ ]; then + aptpreferencesd="/etc/apt/preferences.d/" + fi + for f in /etc/apt/preferences /etc/apt/preferences.d/*; do + [ -e "$f" ] || continue + cat "$f" + done MODE=root fi @@ -159,6 +181,8 @@ if [ ! -e "$TMPDIR/${ID}-${release}-host.tar" ]; then # shellcheck disable=SC2086 mmdebstrap --variant=apt --mode=$MODE --verbose \ --setup-hook="$TMPDIR/setup.sh" \ + ${aptpreferences+--setup-hook="sync-in $aptpreferences $aptpreferences"} \ + ${aptpreferencesd+--setup-hook="sync-in $aptpreferencesd $aptpreferencesd"} \ --include=openssh-server,systemd-sysv,e2fsprogs,ifupdown,initramfs-tools,netbase,isc-dhcp-client,udev,policykit-1,$KERNEL_PACKAGE,$EXTRA_DEPS \ --customize-hook="$TMPDIR/customize.sh" --components="$COMPONENTS" \ --skip=cleanup/apt/lists \