--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: trixie-pu: package sbuild/0.89.3+deb13u1
- From: Jochen Sprickerhof <jspricke@debian.org>
- Date: Sat, 16 Aug 2025 09:42:02 +0200
- Message-id: <175533012221.3213.10525331508635158643.reportbug@fenchel>
Package: release.debian.org
Severity: normal
Tags: trixie
X-Debbugs-Cc: sbuild@packages.debian.org
Control: affects -1 + src:sbuild
User: release.debian.org@packages.debian.org
Usertags: pu
[ Reason ]
The primary reason for this update is adding UID support for subuids as
requested in #1110876. We found this while working on adding unshare
support to the porterboxes. Fixing this in trixie would greatly simplify
the work of DSA.
I also added a small patch to fix sbuild when the BUILD_PATH variable is
set to an empty value. This was already fixed when reading from the
sbuild configuration file before the trixie release but was missed for
the command line option. The patch fixes this inconsistency.
Finally I added a patch to fix two typos in the documentation.
[ Impact ]
Without this we can't use sbuild on the porterboxes.
[ Tests ]
sbuild has tests and autopkgtests which succeed. I also ran manual tests
on a porterbox and my own system. This is basically the same patch as in
#1111256 which adds a test there.
[ Risks ]
None, this just adds new functionality where sbuild threw an error
before.
[ Checklist ]
[X] *all* changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in (old)stable
[X] the issue is verified as fixed in unstable
[ Changes ]
The old code checks for the username in /etc/subuid and /etc/subgid and
errors out if it does not find it. According to subuid(5) and subgid(5)
the files can contain a username or numerical user ID (UID). The patch
tests for the UID in addition.
The BUILD_PATH patch changes the regex for allowed values. The old regex
made sure that the value starts with a /, the new one also allows the
empty value.
diff --git a/debian/changelog b/debian/changelog
index 51bbad61..da088beb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+sbuild (0.89.3+deb13u1) trixie; urgency=medium
+
+ [ Richard Lewis ]
+ * man/sbuild.1.in: fix typo in markup
+
+ [ Hiraku Toyooka ]
+ * Allow BUILD_PATH being empty also in command line options
+
+ [ Jochen Sprickerhof ]
+ * Fix typo in help string
+ * Support UID in /etc/sub(u|g)id (Closes: #1110876)
+
+ -- Jochen Sprickerhof <jspricke@debian.org> Sat, 16 Aug 2025 09:00:34 +0200
+
sbuild (0.89.3) unstable; urgency=medium
[ Jochen Sprickerhof ]
diff --git a/lib/Sbuild/Conf.pm b/lib/Sbuild/Conf.pm
index 8e6efab2..8446fbe0 100644
--- a/lib/Sbuild/Conf.pm
+++ b/lib/Sbuild/Conf.pm
@@ -982,7 +982,7 @@ $unshare_mmdebstrap_extra_args = [
GROUP => 'Build options',
DEFAULT => 0,
HELP =>
-'Run apt-get distclean before the build to clean the apt package cache if the command is available. This makes sure that the build environment is not polluted by extra information but means that you need to run apt update before manually installing packages for debugging. You can disable this to save the extra call but remember to not use the information from the apt cache. Also note that this silently files when the command is not available to be compatible with older releases.'
+'Run apt-get distclean before the build to clean the apt package cache if the command is available. This makes sure that the build environment is not polluted by extra information but means that you need to run apt update before manually installing packages for debugging. You can disable this to save the extra call but remember to not use the information from the apt cache. Also note that this silently fails when the command is not available to be compatible with older releases.'
},
'CHECK_SPACE' => {
TYPE => 'BOOL',
diff --git a/lib/Sbuild/Options.pm b/lib/Sbuild/Options.pm
index 0ce2d193..de37c1dc 100644
--- a/lib/Sbuild/Options.pm
+++ b/lib/Sbuild/Options.pm
@@ -693,7 +693,7 @@ sub set_options {
$self->push_conf('EXTRA_REPOSITORY_KEYS', $_[1]);
},
"build-path=s" => sub {
- if ($_[1] !~ /^\//) {
+ if ($_[1] !~ /^($|\/)/) {
die "--build-path must be an absolute path";
}
$self->set_conf('BUILD_PATH', $_[1]);
diff --git a/lib/Sbuild/Utility.pm b/lib/Sbuild/Utility.pm
index a3270b44..038854d8 100644
--- a/lib/Sbuild/Utility.pm
+++ b/lib/Sbuild/Utility.pm
@@ -34,6 +34,7 @@ package Sbuild::Utility;
use strict;
use warnings;
+use English;
use Sbuild::Chroot;
use File::Temp qw(tempfile);
use Module::Load::Conditional qw(can_load); # Used to check for LWP::UserAgent
@@ -404,11 +405,11 @@ sub read_subuid_subgid() {
or die "cannot open /etc/subuid for reading: $!";
while (my $line = <$fh>) {
($n, $subid, $num_subid) = split(/:/, $line, 3);
- last if ($n eq $username);
+ last if ($n eq $username || $n eq $REAL_USER_ID);
}
close $fh;
- if ($n ne $username) {
+ if ($n ne $username && $n ne $REAL_USER_ID) {
printf STDERR "No entry for $username in /etc/subuid\n";
return;
}
@@ -419,11 +420,11 @@ sub read_subuid_subgid() {
or die "cannot open /etc/subgid for reading: $!";
while (my $line = <$fh>) {
($n, $subid, $num_subid) = split(/:/, $line, 3);
- last if ($n eq $username);
+ last if ($n eq $username || $n eq $REAL_USER_ID);
}
close $fh;
- if ($n ne $username) {
+ if ($n ne $username && $n ne $REAL_USER_ID) {
printf STDERR "No entry for $username in /etc/subgid\n";
return;
}
diff --git a/man/sbuild.1.in b/man/sbuild.1.in
index ea8b032e..dbf95529 100644
--- a/man/sbuild.1.in
+++ b/man/sbuild.1.in
@@ -510,7 +510,7 @@ variable. See
.BR sbuild.conf (5)
for more information.
.TP
-.BR "--log-filename-ts-format=\fformat\fP"
+.BR "--log-filename-ts-format=\fIformat\fP"
Set the format of the timestamp used in the build log filename in the format
used by strftime.
.TP
--- End Message ---