Merge ~whershberger/ubuntu/+source/tcpdump:merge-4.99.5-2-questing into ubuntu/+source/tcpdump:debian/sid

[Wesley Hershberger]

Merge with Debian unstable (LP #2115467).

A ~ppa1 build of this merge can be found in my ppa [1].

I've run the autopkgtests and the qa-regression tests [1] (including a MP to fix the regression tests [2]).

This is my first merge from Debian; I have tried to follow the directions at [4]. I appreciate your patience with any oversights.

Note: I modified the author field of d94caba to reflect the commit's original author.

[1] https://launchpad.net/~whershberger/+archive/ubuntu/tcpdump-lp2115467
[2] https://git.launchpad.net/qa-regression-testing
[3] https://code.launchpad.net/~whershberger/qa-regression-testing/+git/qa-regression-testing/+merge/488037
[4] https://github.com/canonical/ubuntu-maintainers-handbook/blob/main/PackageMerging.md

[Sebastien Bacher (seb128)]

Thank you for your work. As mentioned on https://github.com/canonical/ubuntu-maintainers-handbook/blob/main/PackageMerging.md#submit-merge-proposal-mp the target branch should be "debian/sid" and not "ubuntu/devel" (the current diff includes the new upstream version changes which isn't practical to review). Could you resubmit against the right branch?

review: Needs Fixing

[Wesley Hershberger (whershberger)]

Sorry about that; done.

[Nick Rosbrook (enr0n)]

LGTM, but there is one issue with your changelog.

In your "Merge with Debian unstable" line, you have "(LP #2115467)" as the bug reference. This is missing a colon after "LP", which means that dpkg-genchanges will not automatically add the `Launchpad-Bugs-Fixed` entry to the ../tcpdump_4.99.5-2ubuntu1_source.changes file. As a result, Launchpad will not automatically close the associated bug when this upload migrates from questing-proposed to questing-release.

Now, for the second bug reference in the changelog, this is actually a good thing. This bug was fixed a while ago, so we do not want Launchpad to add the "Fix Released" comment to that bug again.

tl;dr - When you are fixing a new bug, and you want Launchpad to automatically close it/comment on the bug, you need to use a format like `(LP: #XXXXXXX)`. When you specifically do not want Launchpad to do that, "strip" the bug reference by removing the colon.

Since this is such a simple change, I have done it for you on this upload:

nr@six:~/u/p/t/tcpdump$ git diff whershberger/merge-4.99.5-2-questing enr0n/merge-4.99.5-2-questing
diff --git a/debian/changelog b/debian/changelog
index a5ae029..4983aed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 tcpdump (4.99.5-2ubuntu1) questing; urgency=medium

- * Merge with Debian unstable (LP #2115467). Remaining changes:
+ * Merge with Debian unstable (LP: #2115467). Remaining changes:
     - debian/usr.sbin.tcpdump: allow tcpdump printing to stdout/stderr
       when running from a container (LP #1667016)

Thanks for working on this!

review: Approve

[Wesley Hershberger (whershberger)]

I had intended to prevent the automation grabbing 1667016 and must have overlooked 2115467. Thanks for the review!

[Andreas Hasenack (ahasenack)]

This is merged already.

diff --git a/debian/changelog b/debian/changelog
index f605db4..a5ae029 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tcpdump (4.99.5-2ubuntu1) questing; urgency=medium
+
+  * Merge with Debian unstable (LP #2115467). Remaining changes:
+    - debian/usr.sbin.tcpdump: allow tcpdump printing to stdout/stderr
+      when running from a container (LP #1667016)
+
+ -- Wesley Hershberger <[e-mail]>  Thu, 26 Jun 2025 21:16:30 -0500
+
 tcpdump (4.99.5-2) unstable; urgency=medium
 
   * Transfer ownership to pkg-security team.
@@ -28,6 +36,35 @@ tcpdump (4.99.4-4) unstable; urgency=medium
 
  -- Romain Francoise <[e-mail]>  Sun, 28 Apr 2024 17:07:15 +0200
 
+tcpdump (4.99.4-3ubuntu4) noble; urgency=high
+
+  * No change rebuild against libssl3t64.
+
+ -- Julian Andres Klode <[e-mail]>  Mon, 08 Apr 2024 16:50:51 +0200
+
+tcpdump (4.99.4-3ubuntu3) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <[e-mail]>  Sun, 31 Mar 2024 17:18:58 +0000
+
+tcpdump (4.99.4-3ubuntu2) noble; urgency=medium
+
+  * No-change rebuild against libssl3t64
+
+ -- Steve Langasek <[e-mail]>  Tue, 05 Mar 2024 01:24:11 +0000
+
+tcpdump (4.99.4-3ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/usr.sbin.tcpdump: allow tcpdump printing to stdout/stderr
+      when running from a container (LP #1667016)
+  * Dropped:
+    - d/usr.sbin.tcpdump: Allow pcapng files (LP #2024017)
+      [In 4.99.4-3]
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 01 Aug 2023 11:49:37 -0300
+
 tcpdump (4.99.4-3) unstable; urgency=medium
 
   * Allow *.pcapng in AppArmor policy, thanks to Chris Kuethe for the
@@ -51,6 +88,20 @@ tcpdump (4.99.4-1) experimental; urgency=medium
 
  -- Romain Francoise <[e-mail]>  Mon, 10 Apr 2023 16:57:18 +0200
 
+tcpdump (4.99.3-1ubuntu2) mantic; urgency=medium
+
+  [ Chris Kuethe ]
+  * d/usr.sbin.tcpdump: Allow pcapng files (LP: #2024017)
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 14 Jul 2023 18:07:50 -0300
+
+tcpdump (4.99.3-1ubuntu1) lunar; urgency=medium
+
+  * debian/usr.sbin.tcpdump: allow tcpdump printing to stdout/stderr when
+    running from a container (LP: #1667016)
+
+ -- Georgia Garcia <[e-mail]>  Fri, 10 Feb 2023 15:17:18 -0300
+
 tcpdump (4.99.3-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 06e89a9..f4a7192 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: tcpdump
 Section: net
 Priority: optional
-Maintainer: Debian Security Tools <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Security Tools <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
                dh-apparmor,
                dpkg-dev (>= 1.16.1~),
diff --git a/debian/usr.bin.tcpdump b/debian/usr.bin.tcpdump
index 510a5ad..f005a0b 100644
--- a/debian/usr.bin.tcpdump
+++ b/debian/usr.bin.tcpdump
@@ -66,6 +66,10 @@ profile tcpdump /usr/bin/tcpdump {
 
   /usr/bin/tcpdump mr,
 
+  # allow printing to stdout/stderr when inside a container
+  # (LP: #1667016)
+  /dev/pts/* rw,
+
   # Site-specific additions and overrides. See local/README for details.
   #include <local/usr.bin.tcpdump>
 }