Hi, * Jochen Sprickerhof <jspricke@debian.org> [2025-08-19 19:49]:
* Jochen Sprickerhof <jspricke@debian.org> [2025-08-16 09:42]: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 ]
I have added an other small fix affecting the new option to build source-NMUs.
[ Impact ]
Broken formatting in the automatically generated debian/changelog.
[ Tests ]
Tested manually.
[ Risks ]
None, this is a new functionality not used yet.
[ 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 first line added to d/changelog is always terminated by two new lines even when binary-only=yes is not added.
New patch against the trixie version attached. Cheers Jochen
diff --git a/debian/changelog b/debian/changelog
index 51bbad61..f4c17a60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+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)
+ * Fix build path permissions when building as root
+ * Always append newline in binNMU changelog.
+ Thanks to mjt (Closes: #1111776)
+
+ -- 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/Build.pm b/lib/Sbuild/Build.pm
index d509e25a..30e2ef96 100644
--- a/lib/Sbuild/Build.pm
+++ b/lib/Sbuild/Build.pm
@@ -2720,8 +2720,9 @@ sub build {
# Do not make it binary-only=yes if --binNMU=0.
# Only if BIN_NMU_VERSION is defined and neither empty nor
# zero is the +bN suffix appended.
- print $clogpipe ", binary-only=yes\n\n";
+ print $clogpipe ", binary-only=yes";
}
+ print $clogpipe "\n\n";
if ($self->get_conf('APPEND_TO_VERSION')) {
print $clogpipe " * Append ",
$self->get_conf('APPEND_TO_VERSION'),
@@ -2955,6 +2956,9 @@ sub build {
});
if ($? != 0) {
$dpkg_build_user = "root";
+ # root needs access to the build path
+ # this fixes the build of smartlist 3.15-28
+ $session->chmod($self->get_conf('BUILD_PATH'), "a+rx");
}
} else {
# temporary detect R³ manually until all affected
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
Attachment:
signature.asc
Description: PGP signature