Package: dpkg
Severity: minor
Tags: patch
User: [email protected]
Usertags: origin-ubuntu jammy ubuntu-patch
Dear Maintainer,
dpkg-source will do a check for a scenario where the maintainer field in
d/control does not contain "ubuntu" and the DEBEMAIL environment
variable ends in @ubuntu.com. There are some Canonical employees that
use an @canonical.com email address instead, so we should expand this
check to also trigger on DEBEMAIL values that end in @canonical.com
-- Package-specific info:
System tainted due to merged-usr-via-aliased-dirs.
*** /tmp/tmpb4294xf9/bug_body
In Ubuntu, the attached patch was applied to achieve the following:
Have dpkg-source fail in the aforementioned scenario, rather than a
warning.
* scripts/Dpkg/Vendor/Ubuntu.pm: when checking for the correct
maintainer field, also look for @canonical.com email addresses
(LP: #1951988)
Thanks for considering the patch.
-- System Information:
Debian Release: bookworm/sid
APT prefers jammy
APT policy: (500, 'jammy')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.13.0-20-generic (SMP w/32 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE,
TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru dpkg-1.20.9ubuntu2/debian/control dpkg-1.20.9ubuntu3/debian/control
--- dpkg-1.20.9ubuntu2/debian/control 2021-04-14 05:32:22.000000000 -0500
+++ dpkg-1.20.9ubuntu3/debian/control 2021-11-23 09:42:41.000000000 -0600
@@ -1,8 +1,7 @@
Source: dpkg
Section: admin
Priority: required
-Maintainer: Ubuntu Developers <[email protected]>
-XSBC-Original-Maintainer: Dpkg Developers <[email protected]>
+Maintainer: Dpkg Developers <[email protected]>
Uploaders: Guillem Jover <[email protected]>
Homepage: https://wiki.debian.org/Teams/Dpkg
Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git
diff -Nru dpkg-1.20.9ubuntu2/scripts/Dpkg/Vendor/Ubuntu.pm
dpkg-1.20.9ubuntu3/scripts/Dpkg/Vendor/Ubuntu.pm
--- dpkg-1.20.9ubuntu2/scripts/Dpkg/Vendor/Ubuntu.pm 2021-04-14
05:32:22.000000000 -0500
+++ dpkg-1.20.9ubuntu3/scripts/Dpkg/Vendor/Ubuntu.pm 2021-11-23
09:42:41.000000000 -0600
@@ -55,7 +55,7 @@
if (defined($fields->{'Version'}) and defined($fields->{'Maintainer'})
and
$fields->{'Version'} =~ /ubuntu/) {
if ($fields->{'Maintainer'} !~ /ubuntu/i) {
- if (length $ENV{DEBEMAIL} and $ENV{DEBEMAIL} =~
/\@ubuntu\.com/) {
+ if (length $ENV{DEBEMAIL} and $ENV{DEBEMAIL} =~
/\@ubuntu\.com|\@canonical\.com/) {
error(g_('Version number suggests Ubuntu changes, but
Maintainer: does not have Ubuntu address'));
} else {
warning(g_('Version number suggests Ubuntu changes, but
Maintainer: does not have Ubuntu address'));
File /tmp/6yZkN9jpdE/dpkg-1.20.9ubuntu2/tests/t-unpack-fifo/pkg-fifo/test-fifo
is a fifo while file
/tmp/u2tkW_fatS/dpkg-1.20.9ubuntu3/tests/t-unpack-fifo/pkg-fifo/test-fifo is a
fifo
File
/tmp/6yZkN9jpdE/dpkg-1.20.9ubuntu2/tests/t-unpack-hardlink/pkg-hardlink/test-fifo-link0
is a fifo while file
/tmp/u2tkW_fatS/dpkg-1.20.9ubuntu3/tests/t-unpack-hardlink/pkg-hardlink/test-fifo-link0
is a fifo
File
/tmp/6yZkN9jpdE/dpkg-1.20.9ubuntu2/tests/t-unpack-hardlink/pkg-hardlink/test-fifo-link1
is a fifo while file
/tmp/u2tkW_fatS/dpkg-1.20.9ubuntu3/tests/t-unpack-hardlink/pkg-hardlink/test-fifo-link1
is a fifo
