diff --git a/bin/sbuild b/bin/sbuild index 28c1df0..b68ecd9 100755 --- a/bin/sbuild +++ b/bin/sbuild @@ -86,10 +86,6 @@ sub main () { my $jobname = $ARGV[0]; my $source_dir = 0; - if (-e $jobname) { - $jobname = abs_path($jobname); - } - if (-d $jobname) { $jobname = create_source_package($jobname); if ($jobname eq '.') { @@ -173,6 +169,7 @@ sub main () { sub create_source_package ($) { my $dsc = shift; + $dsc = abs_path($dsc); open(my $pipe, '-|', 'dpkg-parsechangelog', '-l' . $dsc . '/debian/changelog') diff --git a/debian/changelog b/debian/changelog index f3120fb..f6bca63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,41 @@ +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, 09 Jun 2022 15:08:03 +0100 + sbuild (0.83.1) unstable; urgency=medium [ Johannes Schauer Marin Rodrigues ] @@ -88,6 +126,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. @@ -139,6 +226,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 ] @@ -166,6 +265,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. @@ -178,6 +295,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. @@ -195,6 +327,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 ] @@ -253,12 +401,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. @@ -268,6 +448,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 @@ -275,12 +467,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 @@ -350,12 +566,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. @@ -365,6 +605,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 @@ -384,6 +636,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. @@ -397,6 +661,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 @@ -477,6 +758,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 @@ -519,6 +816,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 @@ -528,6 +841,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 @@ -559,6 +898,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 @@ -618,6 +973,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 @@ -697,12 +1071,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 @@ -752,6 +1209,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 @@ -827,6 +1296,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. @@ -860,6 +1347,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 ] @@ -945,6 +1445,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 ] @@ -961,6 +1514,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 ] @@ -1019,6 +1591,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. @@ -1026,6 +1619,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 ] @@ -1066,6 +1672,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 ] @@ -3346,3 +3972,4 @@ sbuild (0.2) unstable; urgency=low * Initial package -- Rick Younie Thu, 8 Nov 2001 00:18:34 -0800 + diff --git a/debian/control b/debian/control index 315fb0d..4c7c2e6 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/patches/abs-path-revert.patch b/debian/patches/abs-path-revert.patch new file mode 100644 index 0000000..a4113d7 --- /dev/null +++ b/debian/patches/abs-path-revert.patch @@ -0,0 +1,24 @@ +Revert d15d5ea67b81cde811207ff6853b381c3ebe4b41 +Last-Update: 2016-06-28 + +--- a/bin/sbuild ++++ b/bin/sbuild +@@ -84,10 +84,6 @@ sub main () { + my $jobname = $ARGV[0]; + my $source_dir = 0; + +- if (-e $jobname) { +- $jobname = abs_path($jobname); +- } +- + if (-d $jobname) { + $jobname = create_source_package($jobname); + if ($jobname eq '.') { +@@ -171,6 +167,7 @@ sub main () { + + sub create_source_package ($) { + my $dsc = shift; ++ $dsc = abs_path($dsc); + + open(my $pipe, '-|', 'dpkg-parsechangelog', + '-l' . $dsc . '/debian/changelog') diff --git a/debian/patches/no-pkg-mangle-deps.patch b/debian/patches/no-pkg-mangle-deps.patch new file mode 100644 index 0000000..f208eb2 --- /dev/null +++ b/debian/patches/no-pkg-mangle-deps.patch @@ -0,0 +1,19 @@ +Description: Set NO_PKG_MANGLE=1 when building dummy packages + pkgbinarymangler's dpkg-deb expects to be run from a source package. +Author: Colin Watson +Forwarded: not-needed +Last-Update: 2016-06-28 + +Index: sbuild-0.80.0ubuntu1/lib/Sbuild/ResolverBase.pm +=================================================================== +--- sbuild-0.80.0ubuntu1.orig/lib/Sbuild/ResolverBase.pm ++++ sbuild-0.80.0ubuntu1/lib/Sbuild/ResolverBase.pm +@@ -1218,7 +1218,7 @@ EOF + + #Now build the package: + $session->run_command( +- { COMMAND => ['dpkg-deb', '--build', $dummy_pkg_dir, $dummy_deb], ++ { COMMAND => ['env', 'NO_PKG_MANGLE=1', 'dpkg-deb', '--build', $dummy_pkg_dir, $dummy_deb], + USER => $self->get_conf('BUILD_USER'), + PRIORITY => 0}); + if ($?) { diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..9c234bc --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +no-pkg-mangle-deps.patch +abs-path-revert.patch diff --git a/debian/tests/build-procenv b/debian/tests/build-procenv index 1e1a75f..55fb3d5 100644 --- a/debian/tests/build-procenv +++ b/debian/tests/build-procenv @@ -110,7 +110,7 @@ echo "INFO: Displaying information about chroot '$chroot'" schroot --info "${chroot}" echo "INFO: Building package '$pkg' for release '$release'" -sbuild --extra-repository="deb-src $url unstable main" --verbose -A -d "$release" "$pkg" 2>&1 +sbuild -A -d "$release" "$pkg" 2>&1 deb=$(ls ${pkg}_*_${arch}.deb) diff --git a/debian/tests/control b/debian/tests/control index c0739b2..0549a9a 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,6 +1,6 @@ Tests: build-procenv Depends: apt (>= 1.1~exp2), apt-utils, debootstrap, distro-info, lsb-release, @ -Restrictions: needs-root +Restrictions: needs-root, isolation-machine Tests: unshare-qemuwrapper Architecture: amd64 @@ -10,5 +10,11 @@ Depends: grep-dctrl, mmdebstrap, openssh-client, qemu-system-x86, - sleepenh -Restrictions: allow-stderr needs-root + sleepenh, + lsb-release +Restrictions: allow-stderr needs-root skip-not-installable + +Tests: unshare +Architecture: amd64 +Depends: gnupg, sbuild, mmdebstrap, build-essential, uidmap, fakeroot, diffoscope, devscripts, lsb-release +Restrictions: allow-stderr skippable isolation-machine diff --git a/debian/tests/unshare b/debian/tests/unshare index 2c45a1f..7a9e79c 100755 --- a/debian/tests/unshare +++ b/debian/tests/unshare @@ -13,13 +13,24 @@ if [ -z ${AUTOPKGTEST_TMP+x} ]; then exit 1 fi +if ! grep -q '^1$' /proc/sys/kernel/unprivileged_userns_clone 2> /dev/null; then + echo "User namespace support is not enabled" >&2; + exit 77 +fi + nativearch=$(dpkg --print-architecture) +distro=$(lsb_release -is|tr '[A-Z]' '[a-z]') +release=$(lsb_release -c -s) +if [ "$release" = "sid" ]; then + release="unstable" +fi mkdir -p "${AUTOPKGTEST_TMP}/gpghome" chmod 700 "${AUTOPKGTEST_TMP}/gpghome" export GNUPGHOME="${AUTOPKGTEST_TMP}/gpghome" verify_orig() { + echo "verifying test-pkg_1.0.tar.xz" >&2 cat << END | base64 -d > "${AUTOPKGTEST_TMP}/expected" /Td6WFoAAATm1rRGAgAhARYAAAB0L+Wj4Cf/BBZdADoZSs4dfiUjFYSOxzYxnd+/m6AlVEVOGf2j nT6NK0F9XZ7LLydbY3I//WjMOM2RFpGUqZ8R8Q8lLmydB5SLN5ZQSPW3OJjHlzxVQmv2v3KUyPxo @@ -47,6 +58,10 @@ END } verify_deb() { + echo "verifying test-pkg_1.0_all.deb" >&2 + data_tar=$(ar t "${AUTOPKGTEST_TMP}/test-pkg_1.0_all.deb" | grep "^data\.tar\.") + case "$data_tar" in + data.tar.xz) cat << END | base64 -d > "${AUTOPKGTEST_TMP}/expected" ITxhcmNoPgpkZWJpYW4tYmluYXJ5ICAgMTQ2NzMxMDUxMiAgMCAgICAgMCAgICAgMTAwNjQ0ICA0 ICAgICAgICAgYAoyLjAKY29udHJvbC50YXIueHogIDE0NjczMTA1MTIgIDAgICAgIDAgICAgIDEw @@ -64,30 +79,53 @@ ICAgICAxMDA2NDQgIDE2OCAgICAgICBgCv03elhaAAAE5ta0RgTAZ4BQIQEWAAAAAAAAAAA01v2+ yts9NQ8iYiRRZoI1x3LfpWOmroELBNZOWKNu6b83Vt4bhMs3qreRNcwuusQAAADYvYvhx4Mp4gAB gwGAUAAAkAP057HEZ/sCAAAAAARZWg== END + ;; + data.tar.zst) +cat << END | base64 -d > "${AUTOPKGTEST_TMP}/expected" +ITxhcmNoPgpkZWJpYW4tYmluYXJ5ICAgMTQ2NzMxMDUxMiAgMCAgICAgMCAgICAgMTAwNjQ0ICA0 +ICAgICAgICAgYAoyLjAKY29udHJvbC50YXIuenN0IDE0NjczMTA1MTIgIDAgICAgIDAgICAgIDEw +MDY0NCAgMzUzICAgICAgIGAKKLUv/QBoxQoARhM8I0CJOAcb48sCWwjai6bSHX+FHGgAleqQ7Qv9 +Vh+TxyhuursDNAA0ADEAHbUP6ZSPlgvla0kklqVxGoXCecsNtyGS1bu8fs6O1Wq+FOZ5HEdxmCbx +MMtSVtM8ykIkAYyDpB2hAROYeBOYLlIpidRAwCPk0nNVFA+xNnR5wN5LrrppO0djAqYkyyG4LrIm +sOlBHQLbZ9L1kY3nHe0UDhA1LsUV9Qm6ibfxfHQOhLM7blEL2EtqDzG043W8YFPFYMwhbXABiyWN +vUaoEXKY7axSKl87WS9oX1+U1cvIX1bd8grZ+LitI+qeRt+G7r1THe0BKSCAZsaKFwOHAnO/Y4GM +gAIBDCtw5x2uGDPaChGsyIVKxs5Sh1w5mIL1OjNKY+M7NlYpw8Jc1gtIDkHYPtptOJOCbkDqDGiw +1Kjs3OJ4QJM8TXcwWGN/AMn35Y6FJAhTAeaTcwMKZGF0YS50YXIuenN0ICAgIDE0NjczMTA1MTIg +IDAgICAgIDAgICAgIDEwMDY0NCAgNzcgICAgICAgIGAKKLUv/QBoJQIAlAIuLwAwNzU1ADAAMTI3 +MzUyNjA2Njc3MjAAIDUAdXN0YXIgIAByb290AAogIDH1zwYcBgzI/sCTr+VhgQQwBTCfhBsK +END + ;; + *) + echo "Unrecognized deb data archive format" >&2 + return 1 + ;; + esac diffoscope "${AUTOPKGTEST_TMP}/expected" "${AUTOPKGTEST_TMP}/test-pkg_1.0_all.deb" rm "${AUTOPKGTEST_TMP}/expected" } -verify() { - verify_src="${1+no}" - verify_bin="${1+no}" - echo "verifying test-pkg_1.0.tar.xz" >&2 - verify_orig - echo "verifying test-pkg_1.0_all.deb" >&2 - verify_deb +verify_dsc() { # we shouldn't have to manually pass the keyring because the path is an # implementation detail of gnupg (it used to be named pubring.gpg in # the past) but dscverify ignores GNUPGHOME, see Debian bug #981008 - if [ "$verify_bin" = "yes" ]; then - echo "verifying test-pkg_1.0.dsc" >&2 - dscverify --keyring="${AUTOPKGTEST_TMP}/gpghome/pubring.kbx" "${AUTOPKGTEST_TMP}/test-pkg_1.0.dsc" - echo "verifying test-pkg_1.0_${nativearch}.changes" >&2 - dscverify --keyring="${AUTOPKGTEST_TMP}/gpghome/pubring.kbx" "${AUTOPKGTEST_TMP}/test-pkg_1.0_${nativearch}.changes" - fi - if [ "$verify_src" = "yes" ]; then - echo "verifying test-pkg_1.0_source.changes" >&2 - dscverify --keyring="${AUTOPKGTEST_TMP}/gpghome/pubring.kbx" "${AUTOPKGTEST_TMP}/test-pkg_1.0_source.changes" - fi + echo "verifying test-pkg_1.0.dsc" >&2 + dscverify --keyring="${AUTOPKGTEST_TMP}/gpghome/pubring.kbx" "${AUTOPKGTEST_TMP}/test-pkg_1.0.dsc" +} + +verify_bin_changes() { + echo "verifying test-pkg_1.0_${nativearch}.changes" >&2 + dscverify --keyring="${AUTOPKGTEST_TMP}/gpghome/pubring.kbx" "${AUTOPKGTEST_TMP}/test-pkg_1.0_${nativearch}.changes" +} + +verify_src_changes() { + echo "verifying test-pkg_1.0_source.changes" >&2 + dscverify --keyring="${AUTOPKGTEST_TMP}/gpghome/pubring.kbx" "${AUTOPKGTEST_TMP}/test-pkg_1.0_source.changes" +} + +verify() { + for thing in $*; do + verify_$thing + done # remove verified files, so that we make sure not to accidentally # verify anything from an earlier build rm "${AUTOPKGTEST_TMP}/test-pkg_1.0_all.deb" \ @@ -137,6 +175,7 @@ VZd06jMN -----END PGP PRIVATE KEY BLOCK----- END +[ "$distro" = ubuntu ] && umask 022 mkdir -p "${AUTOPKGTEST_TMP}/test-pkg-1.0/debian/source" cat << END > "${AUTOPKGTEST_TMP}/test-pkg-1.0/debian/control" @@ -207,11 +246,11 @@ cat << END > "${AUTOPKGTEST_TMP}/test-pkg-1.0/debian/source/format" 3.0 (native) END -mmdebstrap --mode=unshare --variant=apt unstable "${AUTOPKGTEST_TMP}/chroot.tar" +mmdebstrap --mode=unshare --variant=apt ${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 -verify no yes +verify orig deb dsc bin_changes # FIXME use installed sbuild @@ -221,13 +260,13 @@ env --chdir="${AUTOPKGTEST_TMP}/test-pkg-1.0/" sbuild \ --keyid="sbuild fake uploader " \ --source \ --no-run-lintian --no-run-autopkgtest -verify no yes +verify orig deb dsc bin_changes env --chdir="${AUTOPKGTEST_TMP}/test-pkg-1.0/" sbuild \ --chroot="${AUTOPKGTEST_TMP}/chroot.tar" --chroot-mode=unshare \ --keyid="sbuild fake uploader " \ --no-run-lintian --no-run-autopkgtest -verify no yes +verify orig deb bin_changes # Test running sbuild on the dsc env --chdir="${AUTOPKGTEST_TMP}/test-pkg-1.0/" dpkg-source --build . @@ -235,15 +274,15 @@ env --chdir="${AUTOPKGTEST_TMP}" sbuild \ --chroot="${AUTOPKGTEST_TMP}/chroot.tar" --chroot-mode=unshare \ --keyid="sbuild fake uploader " \ --source \ - --no-run-lintian --no-run-autopkgtest -d unstable test-pkg_1.0.dsc -verify no yes + --no-run-lintian --no-run-autopkgtest -d ${release} test-pkg_1.0.dsc +verify orig deb dsc bin_changes env --chdir="${AUTOPKGTEST_TMP}/test-pkg-1.0/" dpkg-source --build . env --chdir="${AUTOPKGTEST_TMP}" sbuild \ --chroot="${AUTOPKGTEST_TMP}/chroot.tar" --chroot-mode=unshare \ --keyid="sbuild fake uploader " \ - --no-run-lintian --no-run-autopkgtest -d unstable test-pkg_1.0.dsc -verify no yes + --no-run-lintian --no-run-autopkgtest -d ${release} test-pkg_1.0.dsc +verify orig deb bin_changes rm "${AUTOPKGTEST_TMP}/test-pkg_1.0_${nativearch}"*.build diff --git a/debian/tests/unshare-qemuwrapper b/debian/tests/unshare-qemuwrapper index e7e202c..92b54f2 100755 --- a/debian/tests/unshare-qemuwrapper +++ b/debian/tests/unshare-qemuwrapper @@ -24,9 +24,11 @@ set -exu -EXTRA_DEPS=gnupg,sbuild,mmdebstrap,build-essential,uidmap,fakeroot,diffoscope +EXTRA_DEPS=gnupg,sbuild,mmdebstrap,build-essential,uidmap,fakeroot,diffoscope,devscripts,lsb-release SCRIPT=./debian/tests/unshare +release=$(lsb_release -c -s) + [ -e debian/tests/control ] SOURCES="$(pwd)" @@ -137,12 +139,12 @@ done SCRIPT chmod +x "$TMPDIR/setup.sh" -if [ ! -e "$TMPDIR/debian-unstable-host.tar" ]; then +if [ ! -e "$TMPDIR/debian-${release}-host.tar" ]; then mmdebstrap --variant=apt --mode=$MODE --verbose \ --setup-hook="$TMPDIR/setup.sh" \ --include=openssh-server,systemd-sysv,ifupdown,netbase,isc-dhcp-client,udev,policykit-1,linux-image-amd64,$EXTRA_DEPS \ --customize-hook="$TMPDIR/customize.sh" \ - unstable "$TMPDIR/debian-unstable-host.tar" $aptsources + ${release} "$TMPDIR/debian-${release}-host.tar" $aptsources fi # use guestfish to prepare the host system @@ -159,7 +161,7 @@ guestfish -N "$TMPDIR/host.img"=disk:2G -- \ part-disk /dev/sda mbr : \ mkfs ext2 /dev/sda1 : \ mount /dev/sda1 / : \ - tar-in "$TMPDIR/debian-unstable-host.tar" / : \ + tar-in "$TMPDIR/debian-${release}-host.tar" / : \ mkdir /build : \ copy-in "$SOURCES/." /build/ : \ upload /usr/lib/SYSLINUX/mbr.bin /mbr.bin : \ @@ -277,7 +279,7 @@ $ssh root@localhost systemctl poweroff || true wait $QEMUPID # cleanup -for f in debian-unstable-host.tar id_rsa id_rsa.pub \ +for f in debian-${release}-host.tar id_rsa id_rsa.pub \ qemu.log host.img customize.sh setup.sh; do rm "$TMPDIR/$f" done diff --git a/lib/Sbuild/ResolverBase.pm b/lib/Sbuild/ResolverBase.pm index e1984d9..180486b 100644 --- a/lib/Sbuild/ResolverBase.pm +++ b/lib/Sbuild/ResolverBase.pm @@ -1223,7 +1223,7 @@ EOF #Now build the package: $session->run_command( - { COMMAND => ['dpkg-deb', '--build', $dummy_pkg_dir, $dummy_deb], + { COMMAND => ['env', 'NO_PKG_MANGLE=1', 'dpkg-deb', '--build', $dummy_pkg_dir, $dummy_deb], USER => $self->get_conf('BUILD_USER'), PRIORITY => 0}); if ($?) {