diff -Nru sbuild-0.69.0/debian/changelog sbuild-0.69.0/debian/changelog --- sbuild-0.69.0/debian/changelog 2016-05-12 07:38:12.000000000 +0200 +++ sbuild-0.69.0/debian/changelog 2016-06-28 15:28:27.000000000 +0200 @@ -1,3 +1,22 @@ +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 @@ -77,12 +96,95 @@ -- 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 @@ -132,6 +234,18 @@ -- 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 @@ -207,6 +321,24 @@ -- 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. @@ -240,6 +372,19 @@ -- 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 ] @@ -325,6 +470,59 @@ -- 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 ] @@ -341,6 +539,25 @@ -- 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 ] @@ -399,6 +616,27 @@ -- 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. @@ -406,6 +644,19 @@ -- 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 ] @@ -446,6 +697,26 @@ -- 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 -Nru sbuild-0.69.0/debian/control sbuild-0.69.0/debian/control --- sbuild-0.69.0/debian/control 2016-05-12 07:28:02.000000000 +0200 +++ sbuild-0.69.0/debian/control 2016-06-28 15:23:35.000000000 +0200 @@ -1,7 +1,8 @@ Source: sbuild Section: devel Priority: extra -Maintainer: Debian buildd-tools Developers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian buildd-tools Developers Uploaders: Michael Banck , Roger Leigh , Francesco Paolo Lovergine , diff -Nru sbuild-0.69.0/debian/patches/abs-path-revert.patch sbuild-0.69.0/debian/patches/abs-path-revert.patch --- sbuild-0.69.0/debian/patches/abs-path-revert.patch 1970-01-01 01:00:00.000000000 +0100 +++ sbuild-0.69.0/debian/patches/abs-path-revert.patch 2016-06-28 15:26:21.000000000 +0200 @@ -0,0 +1,24 @@ +Revert d15d5ea67b81cde811207ff6853b381c3ebe4b41 +Last-Update: 2016-06-28 + +--- x/bin/sbuild 2016-01-06 11:23:00.000000000 +0000 ++++ x/bin/sbuild 2016-01-21 10:09:57.609600750 +0000 +@@ -84,10 +84,6 @@ + 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 create_source_package ($) { + my $dsc = shift; ++ $dsc = abs_path($dsc); + + open(my $pipe, '-|', 'dpkg-parsechangelog', + '-l' . $dsc . '/debian/changelog') diff -Nru sbuild-0.69.0/debian/patches/do-not-install-debfoster-into-chroots.patch sbuild-0.69.0/debian/patches/do-not-install-debfoster-into-chroots.patch --- sbuild-0.69.0/debian/patches/do-not-install-debfoster-into-chroots.patch 1970-01-01 01:00:00.000000000 +0100 +++ sbuild-0.69.0/debian/patches/do-not-install-debfoster-into-chroots.patch 2016-06-28 15:28:11.000000000 +0200 @@ -0,0 +1,21 @@ +Description: Do not install debfoster into the chroots because it is in + universe and not needed for package building itself. +Forwarded: not-needed (Ubuntu specific) +Origin: vendor +Author: Philipp Kern +Last-Update: 2016-06-28 + +Index: b/bin/sbuild-createchroot +=================================================================== +--- a/bin/sbuild-createchroot ++++ b/bin/sbuild-createchroot +@@ -170,8 +170,7 @@ + # Make sure fakeroot and build-essential are installed + $conf->set('INCLUDE', add_items($conf->get('INCLUDE'), + "fakeroot", +- "build-essential", +- "debfoster")); ++ "build-essential")); + + my $suite = $ARGV[0]; + diff -Nru sbuild-0.69.0/debian/patches/no-pkg-mangle-deps.patch sbuild-0.69.0/debian/patches/no-pkg-mangle-deps.patch --- sbuild-0.69.0/debian/patches/no-pkg-mangle-deps.patch 1970-01-01 01:00:00.000000000 +0100 +++ sbuild-0.69.0/debian/patches/no-pkg-mangle-deps.patch 2016-06-28 15:26:11.000000000 +0200 @@ -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: b/lib/Sbuild/ResolverBase.pm +=================================================================== +--- a/lib/Sbuild/ResolverBase.pm ++++ b/lib/Sbuild/ResolverBase.pm +@@ -966,7 +966,7 @@ + + #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 -Nru sbuild-0.69.0/debian/patches/quieten-createchroot-warnings.patch sbuild-0.69.0/debian/patches/quieten-createchroot-warnings.patch --- sbuild-0.69.0/debian/patches/quieten-createchroot-warnings.patch 1970-01-01 01:00:00.000000000 +0100 +++ sbuild-0.69.0/debian/patches/quieten-createchroot-warnings.patch 2016-06-28 15:26:43.000000000 +0200 @@ -0,0 +1,18 @@ +Description: Silence a couple of warnings from sbuild-createchroot +Author: Colin Watson +Forwarded: no +Last-Update: 2016-06-28 + +Index: b/bin/sbuild-createchroot +=================================================================== +--- a/bin/sbuild-createchroot ++++ b/bin/sbuild-createchroot +@@ -179,7 +179,7 @@ + + my $chrootname = "${suite}-" . $conf->get('BUILD_ARCH') . $conf->get('CHROOT_SUFFIX'); + +-open my $pipe, 'schroot -l --all-source-chroots |'; ++open my $pipe, 'schroot -q -l --all-source-chroots |'; + while (my $line = <$pipe>) { + $line ne "source:$chrootname\n" or die "chroot with name $chrootname already exists"; + } diff -Nru sbuild-0.69.0/debian/patches/series sbuild-0.69.0/debian/patches/series --- sbuild-0.69.0/debian/patches/series 2016-05-12 07:30:33.000000000 +0200 +++ sbuild-0.69.0/debian/patches/series 2016-06-28 15:27:42.000000000 +0200 @@ -1,2 +1,7 @@ 0001-lib-Sbuild-ResolverBase.pm-do-not-produce-non-error-.patch 0001-bin-sbuild-createchroot-fix-chown-chmod-error-checks.patch +no-pkg-mangle-deps.patch +quieten-createchroot-warnings.patch +abs-path-revert.patch +utf-8-by-default.patch +do-not-install-debfoster-into-chroots.patch diff -Nru sbuild-0.69.0/debian/patches/utf-8-by-default.patch sbuild-0.69.0/debian/patches/utf-8-by-default.patch --- sbuild-0.69.0/debian/patches/utf-8-by-default.patch 1970-01-01 01:00:00.000000000 +0100 +++ sbuild-0.69.0/debian/patches/utf-8-by-default.patch 2016-06-28 15:25:29.000000000 +0200 @@ -0,0 +1,36 @@ +Description: utf-8-by-default.patch: Switch to C.UTF-8 by default (LP: #1566590) +Author: Adam Conrad +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1566590 +Last-Update: 2016-06-28 + +--- sbuild-0.67.0.orig/lib/Sbuild/Build.pm ++++ sbuild-0.67.0/lib/Sbuild/Build.pm +@@ -99,7 +99,7 @@ sub new { + $host_defaults->{'USER'} = $self->get_conf('USERNAME'); + $host_defaults->{'DIR'} = $self->get_conf('HOME'); + $host_defaults->{'STREAMIN'} = $devnull; +- $host_defaults->{'ENV'}->{'LC_ALL'} = 'POSIX'; ++ $host_defaults->{'ENV'}->{'LC_ALL'} = 'C.UTF-8'; + $host_defaults->{'ENV'}->{'SHELL'} = '/bin/sh'; + $host_defaults->{'ENV_FILTER'} = $self->get_conf('ENVIRONMENT_FILTER'); + # Note, this should never fail. But, we should handle failure anyway. +@@ -501,7 +501,7 @@ sub run_chroot_session { + $chroot_defaults->{'STREAMIN'} = $devnull; + $chroot_defaults->{'STREAMOUT'} = $self->get('Log Stream'); + $chroot_defaults->{'STREAMERR'} = $self->get('Log Stream'); +- $chroot_defaults->{'ENV'}->{'LC_ALL'} = 'POSIX'; ++ $chroot_defaults->{'ENV'}->{'LC_ALL'} = 'C.UTF-8'; + $chroot_defaults->{'ENV'}->{'SHELL'} = '/bin/sh'; + $chroot_defaults->{'ENV'}->{'HOME'} = '/sbuild-nonexistent'; + $chroot_defaults->{'ENV_FILTER'} = $self->get_conf('ENVIRONMENT_FILTER'); +--- sbuild-0.67.0.orig/lib/Sbuild/Utility.pm ++++ sbuild-0.67.0/lib/Sbuild/Utility.pm +@@ -25,7 +25,7 @@ use Sbuild::ChrootInfoSchroot; + use Sbuild::ChrootInfoSudo; + use Sbuild::Sysconfig; + +-$ENV{'LC_ALL'} = "POSIX"; ++$ENV{'LC_ALL'} = "C.UTF-8"; + $ENV{'SHELL'} = '/bin/sh'; + + # avoid intermixing of stdout and stderr diff -Nru sbuild-0.69.0/debian/tests/build-procenv sbuild-0.69.0/debian/tests/build-procenv --- sbuild-0.69.0/debian/tests/build-procenv 2016-05-12 07:28:02.000000000 +0200 +++ sbuild-0.69.0/debian/tests/build-procenv 2016-06-28 15:23:35.000000000 +0200 @@ -100,7 +100,7 @@ # Take care to download the package version for the release we will # create the chroot for. echo "INFO: Downloading source for package '$pkg' from release '$release'" -apt-get source --download-only "$pkg/$release" +apt-get source --download-only -o APT::Sandbox::User=root "$pkg/$release" dsc=$(ls ${pkg}*.dsc)