Merge ~bryce/ubuntu/+source/clamav:merge-v1.0.5adfsg-1.1-noble into ubuntu/+source/clamav:debian/sid

[Bryce Harrington]

Merge clamav 1.0.5+dfsg-1.1 to bring in the t64 changes.

For the security merge, it appears they also refreshed po files, which caused conflicts on rebase. The changes appear to be file formatting rather than changed translations, though, so I just dropped the po changes in the logical and things went fine thereafter.

PPA: https://launchpad.net/~bryce/+archive/ubuntu/clamav-merge-v1.0.5adfsg-1.1

PPA is still building, so no autopkgtests at this time.

[Andreas Hasenack (ahasenack)]

checking this out

[Andreas Hasenack (ahasenack)]

I think you should have kept the po changes in the logical tag, and dropped them later on when applying on top of debian/new.

Logical should show what the delta is at that version, and it does have the po changes (which I also think were added by mistake). But they should be dropped at rebase on top of new/debian time, not in logical.

I would add a "[previously undocumented]" line to the commit that you split out about the pos, and then drop it when rebasing on new/debian, possibly with a comment ("* Dropped: previously added PO update, apparently by mistake"). You could also ping Marc to see if he remember what that was about.

review: Needs Fixing

24136f1... by Bryce Harrington on 2024-03-05

merge-changelogs

bff6267... by Bryce Harrington on 2024-03-05

reconstruct-changelog

2e8b31c... by Bryce Harrington on 2024-03-05

update-maintainer

[Bryce Harrington (bryce)]

I redid the merge with keeping the po for logical tag and then dropping it before the rebase. I've also listed it explicitly as Dropped.

Since the PPA failed to build due to known issue of missing deps on armhf I didn't bother updating it.

I'll ping Marc about this MP in case he has an opinion on the po change inclusion.

[Bryce Harrington (bryce)]

Marc answered this po change gets automatically applied by the builders, and will come back. So seems fine to omit.

[Andreas Hasenack (ahasenack)]

+1

range-diff ok
debian changes ok
build failing is unfortunately expected for now :)

review: Approve

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

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

review: Approve

[Bryce Harrington (bryce)]

I'll save it for next merge, but Marc suggests looking at this:

maybe this in rules:
    # Update .po files for debconf.
    debconf-updatepo

I don't know what side-effects that might have so am reluctant to introduce it past FF in an LTS but may give it a go next cycle.

[Bryce Harrington (bryce)]

Thanks for the review; uploaded:

Successfully signed dsc, buildinfo, changes files
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/clamav
Vcs-Git-Commit: 2e8b31ce0954b960dd6b0ef1302b3c06f9ad3372
Vcs-Git-Ref: refs/heads/merge-v1.0.5adfsg-1.1-noble
$ dput ubuntu ../clamav_1.0.5+dfsg-1.1ubuntu1_source.changes
gpg: ../clamav_1.0.5+dfsg-1.1ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
gpg: ../clamav_1.0.5+dfsg-1.1ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
D: Setting host argument.
Checking signature on .changes
Checking signature on .dsc
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading clamav_1.0.5+dfsg-1.1ubuntu1.dsc: done.
  Uploading clamav_1.0.5+dfsg.orig.tar.xz: done.
  Uploading clamav_1.0.5+dfsg-1.1ubuntu1.debian.tar.xz: done.
  Uploading clamav_1.0.5+dfsg-1.1ubuntu1_source.buildinfo: done.
  Uploading clamav_1.0.5+dfsg-1.1ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 6efb773..63722cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+clamav (1.0.5+dfsg-1.1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+     - d/p/resolve-armhf-ftbfs.patch: resolve armhf failure to build from
+       source.
+    - clamav-base.postinst.in: Quell warning from check for clamav user
+      (LP 1920217).
+    - Extend ifupdown script to support networkd-dispatcher.
+      + d/clamav-freshclam-ifupdown: Modernize some parts of
+        the script.  Implement support for networkd-dispatcher.
+      + d/clamav-freshclam.links: Install the
+        clamav-freshclam-ifupdown script inside the proper
+        /usr/lib/networkd-dispatcher/{off,routable}.d/
+        directories. (LP 1718227)
+  * Dropped:
+    - po files update
+      [previously undocumented]
+      [causes merge conflict on rebase]
+
+ -- Bryce Harrington <[e-mail]>  Tue, 05 Mar 2024 11:00:58 -0800
+
 clamav (1.0.5+dfsg-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -5,6 +26,30 @@ clamav (1.0.5+dfsg-1.1) unstable; urgency=medium
 
  -- Steve Langasek <[e-mail]>  Wed, 28 Feb 2024 15:44:10 +0000
 
+clamav (1.0.5+dfsg-1ubuntu2) noble; urgency=medium
+
+  * No-change rebuild against libssl3t64
+
+ -- Steve Langasek <[e-mail]>  Mon, 04 Mar 2024 17:34:24 +0000
+
+clamav (1.0.5+dfsg-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable as security update.
+    Remaining changes:
+    - Extend ifupdown script to support networkd-dispatcher.
+      + d/clamav-freshclam-ifupdown: Modernize some parts of
+        the script.  Implement support for networkd-dispatcher.
+      + d/clamav-freshclam.links: Install the
+        clamav-freshclam-ifupdown script inside the proper
+        /usr/lib/networkd-dispatcher/{off,routable}.d/
+        directories. (LP: 1718227)
+    - clamav-base.postinst.in: Quell warning from check for clamav user
+      (LP: 1920217).
+    - d/p/resolve-armhf-ftbfs.patch: resolve armhf failure to build from
+      source.
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 12 Feb 2024 09:36:24 -0500
+
 clamav (1.0.5+dfsg-1) unstable; urgency=medium
 
   * Import 1.0.4 (Closes: #1063479).
@@ -25,6 +70,42 @@ clamav (1.0.4+dfsg-1) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Sat, 20 Jan 2024 11:57:33 +0100
 
+clamav (1.0.4+dfsg-0ubuntu1) noble; urgency=medium
+
+  * Updated to version 1.0.4 to fix db compatibility. (LP: #2046581)
+    - debian/rules: bump CL_FLEVEL to 164.
+    - debian/libclamav11.symbols: updated CLAMAV_PRIVATE symbols to new
+      version.
+    - debian/series/cargo-Remove-windows-referenfes.patch: disabled as
+      the mentioned files aren't being removed by the debian/get_orig.sh
+      script, so I assume the Debian maintainer is using a different script
+      to generate the dfsg tarball.
+    - debian/series/Freshclam-remove-curl-result-warning.patch: removed,
+      included in new version.
+    - Updated patches for new version:
+      + libclamav-Sort-libclamav.map-and-libfreshclam.map.patch
+      + libclamav-Add-missing-symbols.patch
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 04 Jan 2024 11:04:58 -0500
+
+clamav (1.0.3+dfsg-2ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable as security update (LP: #2040372).
+    Remaining changes:
+    - Extend ifupdown script to support networkd-dispatcher.
+      + d/clamav-freshclam-ifupdown: Modernize some parts of
+        the script.  Implement support for networkd-dispatcher.
+      + d/clamav-freshclam.links: Install the
+        clamav-freshclam-ifupdown script inside the proper
+        /usr/lib/networkd-dispatcher/{off,routable}.d/
+        directories. (LP: 1718227)
+    - clamav-base.postinst.in: Quell warning from check for clamav user
+      (LP: 1920217).
+    - d/p/resolve-armhf-ftbfs.patch: resolve armhf failure to build from
+      source.
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 12 Dec 2023 10:24:25 -0500
+
 clamav (1.0.3+dfsg-2) unstable; urgency=medium
 
   * Remove unnecessary warning messages in freshclam during update.
@@ -37,6 +118,29 @@ clamav (1.0.3+dfsg-1) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Sat, 09 Sep 2023 10:18:34 +0200
 
+clamav (1.0.2+dfsg-1ubuntu1) mantic; urgency=medium
+
+  [ Marc Deslauriers ]
+  * Merge with Debian unstable as security update (LP: #2031565).
+    Remaining changes:
+    - Extend ifupdown script to support networkd-dispatcher.
+      + d/clamav-freshclam-ifupdown: Modernize some parts of
+        the script.  Implement support for networkd-dispatcher.
+      + d/clamav-freshclam.links: Install the
+        clamav-freshclam-ifupdown script inside the proper
+        /usr/lib/networkd-dispatcher/{off,routable}.d/
+        directories. (LP: 1718227)
+    - clamav-base.postinst.in: Quell warning from check for clamav user
+      (LP: 1920217).
+    - CVE-2023-20197
+    - CVE-2023-20212
+
+  [ Vladimir Petko ]
+  * d/p/resolve-armhf-ftbfs.patch: resolve armhf failure to build from
+    source.
+
+ -- Marc Deslauriers <[e-mail]>  Wed, 23 Aug 2023 10:44:37 -0400
+
 clamav (1.0.2+dfsg-1) unstable; urgency=medium
 
   * Import 1.0.2 (Closes: #1050057)
@@ -50,6 +154,21 @@ clamav (1.0.2+dfsg-1) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Sat, 19 Aug 2023 19:07:32 +0200
 
+clamav (1.0.1+dfsg-2ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable (LP: #2018063). Remaining changes:
+    - Extend ifupdown script to support networkd-dispatcher.
+      + d/clamav-freshclam-ifupdown: Modernize some parts of
+        the script.  Implement support for networkd-dispatcher.
+      + d/clamav-freshclam.links: Install the
+        clamav-freshclam-ifupdown script inside the proper
+        /usr/lib/networkd-dispatcher/{off,routable}.d/
+        directories.(LP: #1718227)
+    - clamav-base.postinst.in: Quell warning from check for clamav user
+      (LP: #1920217).
+
+ -- Vladimir Petko <[e-mail]>  Mon, 31 Jul 2023 09:11:40 +1200
+
 clamav (1.0.1+dfsg-2) unstable; urgency=medium
 
   * Depend on latest libtfm1 (Closes: #1031896, #1027010).
@@ -134,6 +253,39 @@ clamav (1.0.0+dfsg-1) experimental; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Sat, 31 Dec 2022 13:44:59 +0100
 
+clamav (0.103.8+dfsg-0ubuntu2) mantic; urgency=medium
+
+  * Extend ifupdown script to support networkd-dispatcher.
+    - d/clamav-freshclam-ifupdown: Modernize some parts of
+      the script.  Implement support for networkd-dispatcher.
+    - d/clamav-freshclam.links: Install the
+      clamav-freshclam-ifupdown script inside the proper
+      /usr/lib/networkd-dispatcher/{off,routable}.d/
+      directories.
+    (LP: #1718227)
+
+ -- Sergio Durigan Junior <[e-mail]>  Fri, 12 May 2023 15:58:29 -0400
+
+clamav (0.103.8+dfsg-0ubuntu1) lunar; urgency=medium
+
+  * Updated to version 0.103.8 to fix security issues.
+    - debian/rules: bump CL_FLEVEL to 129.
+    - debian/libclamav9.symbols: updated CLAMAV_PRIVATE symbols to new
+      version.
+    - CVE-2023-20032, CVE-2023-20052
+
+ -- David Fernandez Gonzalez <[e-mail]>  Fri, 24 Feb 2023 09:27:20 +0100
+
+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
@@ -141,6 +293,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/clamav-freshclam-ifupdown b/debian/clamav-freshclam-ifupdown
index 875c0cc..232fd79 100755
--- a/debian/clamav-freshclam-ifupdown
+++ b/debian/clamav-freshclam-ifupdown
@@ -1,16 +1,25 @@
 #!/bin/sh
 # 2004-01-25, Thomas Lamy <[e-mail]>
 # From Magnus Ekdahl's <[e-mail]> clamav-freshclam-handledaemon(8)
+# Adjust to be networkd-dispatcher compatible by
+# Sergio Durigan Junior <[e-mail]>
 
 set -e
 
-[ -e /var/lib/clamav/interface ] || exit 0
+[ -f /var/lib/clamav/interface ] || exit 0
+
+if [ -d /run/systemd/system ]; then
+    INIT='systemctl'
+    INIT_SUFFIX='clamav-freshclam'
+else
+    INIT='invoke-rc.d clamav-freshclam'
+    INIT_SUFFIX=''
+fi
 
-INIT=invoke-rc.d clamav-freshclam
 CLAMAV_CONF_FILE=/etc/clamav/clamd.conf
 FRESHCLAM_CONF_FILE=/etc/clamav/freshclam.conf
 
-INTERNETIFACE=`cat /var/lib/clamav/interface`
+INTERNETIFACE=$(cat /var/lib/clamav/interface)
 
 if grep -q freshclam /proc/*/stat 2>/dev/null; then
   IS_RUNNING=true
@@ -18,61 +27,104 @@ else
   IS_RUNNING=false
 fi
 
-# $IFACE is set by ifup/down, $PPP_IFACE by pppd 
-[ -n "$PPP_IFACE" ] && IFACE=$PPP_IFACE
+handle_ifupdown ()
+{
+    # $IFACE is set by ifup/down, $PPP_IFACE by pppd 
+    [ -n "$PPP_IFACE" ] && IFACE=$PPP_IFACE
 
-# This is sloppy - woody's pppd exports variables, while sid's passes them as 
-# arguments and exports them.
+    # This is sloppy - woody's pppd exports variables, while sid's passes them as 
+    # arguments and exports them.
 
-if [ "$1" = "$IFACE" ]; then # We're called by sid's pppd
-  shift 6                    # and we already know the interface
-fi                           # Dump the arguments passed.
+    if [ "$1" = "$IFACE" ]; then # We're called by sid's pppd
+	shift 6                    # and we already know the interface
+    fi                           # Dump the arguments passed.
+
+    if [ -z "$1" ]; then
+	case $(dirname "$0") in
+	    */if-up.d|*/ip-up.d)
+		# Short circuit and exit early if freshclam is already running
+		[ "$IS_RUNNING" = 'true' ] && exit 0
+		for interface in $INTERNETIFACE; do
+		    if [ "$interface" = "$IFACE" ]; then
+			FMODE=start
+			break
+		    else
+			FMODE=skip
+		    fi
+		done
+		;;
+	    */if-down.d|*/ip-down.d)
+		# Short circuit and exit early if freshclam is not already running
+		[ "$IS_RUNNING" = 'false' ] && exit 0
+		for interface in $INTERNETIFACE; do
+		    if [ "$interface" = "$IFACE" ]; then
+			FMODE=stop
+			break
+		    else
+			FMODE=skip
+		    fi
+		done
+		;;
+	    *)
+		FMODE=skip
+		;;
+	esac
+    else
+	FMODE="$1"
+    fi
+
+    case "$FMODE" in
+	start|stop)
+	    IFACE="$IFACE" $INIT $FMODE $INIT_SUFFIX
+	    ;;
+	skip)
+	    ;;
+	*)
+	    echo "Usage: $0 {start|stop|skip}" >&2
+	    exit 1
+	    ;;
+    esac
+}
+
+handle_networkd_dispatcher ()
+{
+    FOUND_IFACE=false
 
-if [ -z "$1" ]; then
-  case $(dirname "$0") in
-    */if-up.d|*/ip-up.d)
-    # Short circuit and exit early if freshclam is already running
-    [ "$IS_RUNNING" = 'true' ] && exit 0
-    for interface in $INTERNETIFACE; do
-      if [ "$interface" = "$IFACE" ]; then
-	FMODE=start
-	break
-      else
-	FMODE=skip
-      fi
-    done
-    ;;
-    */if-down.d|*/ip-down.d)
-    # Short circuit and exit early if freshclam is not already running
-    [ "$IS_RUNNING" = 'false' ] && exit 0
     for interface in $INTERNETIFACE; do
-      if [ "$interface" = "$IFACE" ]; then
-	FMODE=stop
-	break
-      else
-	FMODE=skip
-      fi
+	if [ "$interface" = "$IFACE" ]; then
+	    FOUND_IFACE=true
+	    break
+	fi
     done
-    ;;
-    *)
-    FMODE=skip
-    ;;
-  esac
+
+    [ "$FOUND_IFACE" = 'false' ] && return
+
+    FMODE=""
+
+    case "$STATE" in
+	"off")
+	    if [ "$IS_RUNNING" = 'true' ]; then
+		FMODE="stop"
+	    fi
+	    ;;
+	"routable")
+	    if [ "$IS_RUNNING" = 'false' ]; then
+		FMODE="start"
+	    fi
+	    ;;
+	*)
+	    return
+    esac
+
+    if [ -n "$FMODE" ]; then
+	IFACE="$IFACE" $INIT $FMODE $INIT_SUFFIX
+    fi
+}
+
+if [ -n "$STATE" ]; then
+    handle_networkd_dispatcher "$@"
 else
-  FMODE="$1"
+    handle_ifupdown "$@"
 fi
 
-case "$FMODE" in
-  start|stop)
-  IFACE="$IFACE" $INIT $FMODE
-  ;;
-  skip)
-  ;;
-  *)
-  echo "Usage: $0 {start|stop|skip}" >&2
-  exit 1
-  ;;
-esac
-
 exit 0
-
diff --git a/debian/clamav-freshclam.links b/debian/clamav-freshclam.links
index 78dfff6..3f0cfff 100644
--- a/debian/clamav-freshclam.links
+++ b/debian/clamav-freshclam.links
@@ -1 +1,4 @@
 /usr/share/doc/clamav-base/README.Debian.gz /usr/share/doc/clamav-freshclam/README.Debian.gz
+/usr/share/doc/clamav-base/NEWS.gz /usr/share/doc/clamav-freshclam/NEWS.gz
+/etc/network/if-up.d/clamav-freshclam-ifupdown /usr/lib/networkd-dispatcher/routable.d/clamav-freshclam
+/etc/network/if-down.d/clamav-freshclam-ifupdown /usr/lib/networkd-dispatcher/off.d/clamav-freshclam
diff --git a/debian/control b/debian/control
index 171daa5..7f7093c 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]>,
diff --git a/debian/patches/resolve-armhf-ftbfs.patch b/debian/patches/resolve-armhf-ftbfs.patch
new file mode 100644
index 0000000..4141f54
--- /dev/null
+++ b/debian/patches/resolve-armhf-ftbfs.patch
@@ -0,0 +1,40 @@
+Description: resolve armhf failure to build from source.
+Author: Vladimir Petko <[e-mail]>
+
+--- a/libclamav/special.c
++++ b/libclamav/special.c
+@@ -48,7 +48,8 @@
+ 
+ int cli_check_mydoom_log(cli_ctx *ctx)
+ {
+-    const uint32_t *record;
++    const uint32_t record[16];
++    const uint32_t mask = 0xffffffff;
+     uint32_t check, key;
+     fmap_t *map         = ctx->fmap;
+     unsigned int blocks = map->len / (8 * 4);
+@@ -59,14 +60,20 @@
+     if (blocks > 5)
+         blocks = 5;
+ 
+-    record = fmap_need_off_once(map, 0, 8 * 4 * blocks);
+-    if (!record)
++    // returns unaligned memory block
++    const char* data = fmap_need_off_once(map, 0, 8 * 4 * blocks);
++    if (!data)
+         return CL_CLEAN;
++
+     while (blocks) { /* This wasn't probably intended but that's what the current code does anyway */
+-        if (record[--blocks] == 0xffffffff)
++        unsigned int offset = --blocks;
++        offset *=sizeof(uint32_t);
++        // safe (but slow) on unaligned memory
++        if (!memcmp(&data[offset], &mask, sizeof(uint32_t)))
+             return CL_CLEAN;
+     }
+-
++    // copy into aligned array to perform bit operations
++    memcpy(record, data, sizeof(record));
+     key   = ~be32_to_host(record[0]);
+     check = (be32_to_host(record[1]) ^ key) +
+             (be32_to_host(record[2]) ^ key) +
diff --git a/debian/patches/series b/debian/patches/series
index 959f698..04964a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ libclamav-pe-Use-endian-wrapper-in-more-places.patch
 Add-an-option-to-avoid-setting-RPATH-on-unix-systems.patch
 libclamav-Use-OpenSSL-BN-instead-tomfastmath.patch
 Remove-bundled-tomfastmath-library.patch
+resolve-armhf-ftbfs.patch