Merge ~bryce/ubuntu/+source/clamav:merge-v0.103.7adfsg-1-lunar into ubuntu/+source/clamav:debian/sid

[Bryce Harrington]

Merge with Debian's package. The warning check still hasn't been picked up by Debian so we still carry it.

It appears last merge a translation update was included. I'm not certain how that happened but it's unneeded and could cause conflict with new merges, so I've omitted it from this merge.

PPA with test packages: https://launchpad.net/~bryce/+archive/ubuntu/clamav-merge-v0.103.7adfsg-1

    $ sudo add-apt-repository -yus ppa:bryce/clamav-merge-v0.103.7adfsg-1
    $ sudo apt-get install clamav

* gnome-terminal
  - lp-test-ppa ppa:bryce/clamav-merge-v0.103.7adfsg-1 --release lunar --showpass

Usual tags pushed for review:
  - tags/old/debian 9531a184
  - tags/new/debian 9c5035f6
  - tags/old/ubuntu 5326e345
  - tags/logical/0.103.6+dfsg-1ubuntu1 57773cbb
  - tags/reconstruct/0.103.6+dfsg-1ubuntu1 cdfa6e6b

[Christian Ehrhardt  (paelzer)]

Tags look ok:
$ git diff bryce/old/ubuntu bryce/logical/0.103.6+dfsg-1ubuntu1 | diffstat
 changelog | 7 -------
 control | 3 +--
 2 files changed, 1 insertion(+), 9 deletions(-)

using bryce/logical/0.103.6+dfsg-1ubuntu1 to compare delta

But:
clamav | 0.103.7+dfsg-1+b1 | unstable | amd64, arm64, armel, armhf, i386, mips64el, mipsel, ppc64el, s390x
 clamav | 0.103.6+dfsg-1ubuntu1 | lunar | source, amd64, arm64, armhf, ppc64el, riscv64, s390x

Ok, picked the latest

1: ce33b13e2 ! 1: 672be8596
ok commit message change
2: 051931085 < -: --------- * Update translations
you mentioned you dropped them, and it is unclear where they came from - hmm
-: --------- > 2: 0b7801767 * Dropped: - Update translations
-: --------- > 3: 880b64f3a merge-changelogs
-: --------- > 4: 23714373c reconstruct-changelog
-: --------- > 5: 98b945414 update-maintainer

So overall straight forward and ok, if not for the translation riddle.

They would still apply at least.
Did you find where they came from?
That upload was yours or am I completely mistaken?

clamav (0.103.6+dfsg-1ubuntu1) kinetic; urgency=medium

  * clamav-base.postinst.in: Quell warning from check for clamav user
    (LP: #1920217)

 -- Bryce Harrington <email address hidden> Wed, 18 May 2022 17:26:41 -070

I'm +1 on the proposed merge, but would like to understand the riddle.
OTOH do not spend too much time on it, I'm just curious.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: bryce, paelzer
Uploaders: bryce, paelzer
MP auto-approved

review: Approve

[Bryce Harrington (bryce)]

Uploaded; waiting on autopkgtest runs.

[Bryce Harrington (bryce)]

> Did you find where they came from?
> That upload was yours or am I completely mistaken?

Yes, that was from my upload. It's not in my git branch though, thus my surprise. I did a bit more digging to understand it.

It looks like clamav is set up to do this automatically during `debuild -S`:

    # d/rules
    override_dh_auto_clean:
        # Update .po files for debconf.
 debconf-updatepo
        dh_auto_clean

So it seems to be an intentional behavior, although I can't recall running across this with other packages. I'm curious why there are changes needed to the po files; the delta we carry does not affect strings at all, so this seems due just to some O/S skew between us and Debian.

If this were an SRU I'd be a bit more concerned about including such changes, but since this is a merge it seems just part of the process I guess. I don't see a documented way to skip it other than commenting out the debconf-updatepo line above.

Anyway, other than the surprise in my git branch, this behavior seems benign so I'm leaving it as is.

[Bryce Harrington (bryce)]

Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/clamav
Vcs-Git-Commit: 98b94541463c591017f35d355cb897e50ee74326
Vcs-Git-Ref: refs/heads/merge-v0.103.7adfsg-1-lunar

$ dput ubuntu ../clamav_0.103.7+dfsg-1ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
Checking signature on .dsc
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading clamav_0.103.7+dfsg-1ubuntu1.dsc: done.
  Uploading clamav_0.103.7+dfsg.orig.tar.xz: done.
  Uploading clamav_0.103.7+dfsg-1ubuntu1.debian.tar.xz: done.
  Uploading clamav_0.103.7+dfsg-1ubuntu1_source.buildinfo: done.
  Uploading clamav_0.103.7+dfsg-1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Bryce Harrington (bryce)]

This finally migrated

clamav | 0.103.7+dfsg-1ubuntu1 | lunar

diff --git a/debian/changelog b/debian/changelog
index 63cc208..434999f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+clamav (0.103.7+dfsg-1ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable (LP: #1993390). Remaining changes:
+    - clamav-base.postinst.in: Quell warning from check for clamav user
+      (LP #1920217)
+  * Dropped:
+    - Update translations
+
+ -- Bryce Harrington <[e-mail]>  Fri, 18 Nov 2022 23:35:15 -0800
+
 clamav (0.103.7+dfsg-1) unstable; urgency=medium
 
   * Import 0.103.7
@@ -5,6 +15,13 @@ clamav (0.103.7+dfsg-1) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Sun, 14 Aug 2022 21:33:51 +0200
 
+clamav (0.103.6+dfsg-1ubuntu1) kinetic; urgency=medium
+
+  * clamav-base.postinst.in: Quell warning from check for clamav user
+    (LP: #1920217)
+
+ -- Bryce Harrington <[e-mail]>  Wed, 18 May 2022 17:26:41 -0700
+
 clamav (0.103.6+dfsg-1) unstable; urgency=medium
 
   * Import 0.103.6
diff --git a/debian/clamav-base.postinst.in b/debian/clamav-base.postinst.in
index 89c116f..f3d1da9 100644
--- a/debian/clamav-base.postinst.in
+++ b/debian/clamav-base.postinst.in
@@ -32,7 +32,7 @@ case "$1" in
 
   # Set up the clamav user on new install
   if [ -z "$2" ]; then
-    if ! id clamav; then
+    if ! getent passwd clamav >/dev/null; then
         adduser --system --no-create-home --quiet \
             --disabled-password --disabled-login \
 	    --shell /bin/false --group --home /var/lib/clamav clamav
diff --git a/debian/control b/debian/control
index 59f5f4f..e04326c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: clamav
 Section: utils
 Priority: optional
-Maintainer: ClamAV Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: ClamAV Team <[e-mail]>
 Uploaders: Michael Meskes <[e-mail]>,
            Michael Tautschnig <[e-mail]>,
            Scott Kitterman <[e-mail]>,