Merge ~vpa1977/ubuntu/+source/clamav:merge-lp2018063 into ubuntu/+source/clamav:debian/sid

[Vladimir Petko]

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).

PPA: ppa:vpa1977/clamav [1]

Testing:
 - package upgrade/install/removal
 - autopkgtests
$autopkgtest -U -s -o logs --setup-commands="sudo add-apt-repository -y -u -s ppa:vpa1977/clamav" -B clamav -- qemu ~/.auto-img/autopkgtest-mantic-amd64.img

-----------------------
autopkgtest [14:26:36]: @@@@@@@@@@@@@@@@@@@@ summary
clamd PASS
client PASS
milter PASS
qemu-system-x86_64: terminating on signal 15 from pid 2604054 (/usr/bin/python3)
---------------------------

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/clamav

[Vladimir Petko (vpa1977)]

Package upgrade: (affected by [1])
-----------------
$ sudo apt upgrade
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
Calculating upgrade... Done
The following packages were automatically installed and are no longer required:
  gdisk gir1.2-javascriptcoregtk-4.0 gir1.2-soup-2.4 gir1.2-webkit2-4.0 libblockdev-crypto2 libblockdev-fs2
  libblockdev-loop2 libblockdev-part-err2 libblockdev-part2 libblockdev-swap2 libblockdev-utils2 libblockdev2
  libclamav9 libdmapsharing-3.0-2 libjavascriptcoregtk-4.0-18 liblc3-0 libparted-fs-resize0 libraw20
  libsoup-gnome2.4-1 libwebkit2gtk-4.0-37 linux-image-6.2.0-20-generic linux-modules-6.2.0-20-generic
  linux-modules-extra-6.2.0-20-generic python3-renderpm python3-reportlab-accel
Use 'sudo apt autoremove' to remove them.
#
# An OpenSSL vulnerability has recently been fixed with USN-6188-1 & 6119-1:
# CVE-2023-2650: possible DoS translating ASN.1 object identifiers.
# Ensure you have updated the package to its latest version.
#
The following packages will be upgraded:
  clamav clamav-base clamav-daemon clamav-freshclam clamav-milter clamdscan
6 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
Need to get 6,908 kB of archives.
After this operation, 27.5 MB of additional disk space will be used.
Do you want to continue? [Y/n]
Get:1 https://ppa.launchpadcontent.net/vpa1977/clamav/ubuntu mantic/main amd64 clamdscan amd64 1.0.1+dfsg-2ubuntu1~ppa1 [54.8 kB]
Get:2 https://ppa.launchpadcontent.net/vpa1977/clamav/ubuntu mantic/main amd64 clamav-daemon amd64 1.0.1+dfsg-2ubuntu1~ppa1 [217 kB]
Get:3 https://ppa.launchpadcontent.net/vpa1977/clamav/ubuntu mantic/main amd64 clamav-base all 1.0.1+dfsg-2ubuntu1~ppa1 [90.1 kB]
Get:4 https://ppa.launchpadcontent.net/vpa1977/clamav/ubuntu mantic/main amd64 clamav-freshclam amd64 1.0.1+dfsg-2ubuntu1~ppa1 [170 kB]
Get:5 https://ppa.launchpadcontent.net/vpa1977/clamav/ubuntu mantic/main amd64 clamav-milter amd64 1.0.1+dfsg-2ubuntu1~ppa1 [195 kB]
Get:6 https://ppa.launchpadcontent.net/vpa1977/clamav/ubuntu mantic/main amd64 clamav amd64 1.0.1+dfsg-2ubuntu1~ppa1 [6,182 kB]
Fetched 6,908 kB in 48s (144 kB/s)
Preconfiguring packages ...
(Reading database ... 242891 files and directories currently installed.)
Preparing to unpack .../0-clamdscan_1.0.1+dfsg-2ubuntu1~ppa1_amd64.deb ...
Unpacking clamdscan (1.0.1+dfsg-2ubuntu1~ppa1) over (0.103.8+dfsg-0ubuntu2) ...
Preparing to unpack .../1-clamav-daemon_1.0.1+dfsg-2ubuntu1~ppa1_amd64.deb ...
Unpacking clamav-daemon (1.0.1+dfsg-2ubuntu1~ppa1) over (0.103.8+dfsg-0ubuntu2) ...
Preparing to unpack .../2-clamav-base_1.0.1+dfsg-2ubuntu1~ppa1_all.deb ...
Unpacking clamav-base (1.0.1+dfsg-2ubuntu1~ppa1) over (0.103.8+dfsg-0ubuntu2) ...
Preparing to unpack .../3-clamav-freshclam_1.0.1+dfsg-2ubuntu1~ppa1_amd64.deb ...
Unpacking clamav-freshclam (1.0.1+dfsg-2ubuntu1~ppa1) over (0.103.8+dfsg-0ubuntu2) ...
Preparing to unpack .../4-clamav-milter_1.0.1+dfsg-2ubuntu1~ppa1_amd64.deb ...
Unpacking clamav-milter (1.0.1+dfsg-2ubuntu1~ppa1) over (0.103.8+dfsg-0ubuntu2) ...
Preparing to unpack .../5-clamav_1.0.1...

[Vladimir Petko (vpa1977)]

Package install:
------------------
$ sudo apt install clamav-daemon clamav-milter
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
The following additional packages will be installed:
  clamav clamav-base clamav-freshclam clamdscan libclamav11 libmilter1.0.1 libmspack0 libtfm1
Suggested packages:
  libclamunrar clamav-docs daemon libclamunrar11
The following NEW packages will be installed:
  clamav clamav-base clamav-daemon clamav-freshclam clamav-milter clamdscan libclamav11 libmilter1.0.1 libmspack0
  libtfm1
0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
Need to get 13.9 MB of archives.
After this operation, 60.7 MB of additional disk space will be used.
Do you want to continue? [Y/n]
Get:1 http://nz.archive.ubuntu.com/ubuntu mantic/main amd64 libmspack0 amd64 0.11-1 [39.3 kB]
Get:2 http://nz.archive.ubuntu.com/ubuntu mantic/main amd64 libtfm1 amd64 0.13.1-1 [85.2 kB]
Get:3 http://nz.archive.ubuntu.com/ubuntu mantic/universe amd64 libmilter1.0.1 amd64 8.17.2-1 [40.0 kB]
Get:4 https://ppa.launchpadcontent.net/vpa1977/clamav/ubuntu mantic/main amd64 clamav-base all 1.0.1+dfsg-2ubuntu1~ppa1 [90.1 kB]
Get:5 https://ppa.launchpadcontent.net/vpa1977/clamav/ubuntu mantic/main amd64 libclamav11 amd64 1.0.1+dfsg-2ubuntu1~ppa1 [6,864 kB]
Get:6 https://ppa.launchpadcontent.net/vpa1977/clamav/ubuntu mantic/main amd64 clamav-freshclam amd64 1.0.1+dfsg-2ubuntu1~ppa1 [170 kB]
Get:7 https://ppa.launchpadcontent.net/vpa1977/clamav/ubuntu mantic/main amd64 clamav-daemon amd64 1.0.1+dfsg-2ubuntu1~ppa1 [217 kB]
Get:8 https://ppa.launchpadcontent.net/vpa1977/clamav/ubuntu mantic/main amd64 clamav-milter amd64 1.0.1+dfsg-2ubuntu1~ppa1 [195 kB]
Get:9 https://ppa.launchpadcontent.net/vpa1977/clamav/ubuntu mantic/main amd64 clamav amd64 1.0.1+dfsg-2ubuntu1~ppa1 [6,182 kB]
Get:10 https://ppa.launchpadcontent.net/vpa1977/clamav/ubuntu mantic/main amd64 clamdscan amd64 1.0.1+dfsg-2ubuntu1~ppa1 [54.8 kB]
Fetched 13.9 MB in 1min 46s (132 kB/s)
Preconfiguring packages ...
Selecting previously unselected package clamav-base.
(Reading database ... 235067 files and directories currently installed.)
Preparing to unpack .../0-clamav-base_1.0.1+dfsg-2ubuntu1~ppa1_all.deb ...
Unpacking clamav-base (1.0.1+dfsg-2ubuntu1~ppa1) ...
Selecting previously unselected package libmspack0:amd64.
Preparing to unpack .../1-libmspack0_0.11-1_amd64.deb ...
Unpacking libmspack0:amd64 (0.11-1) ...
Selecting previously unselected package libtfm1:amd64.
Preparing to unpack .../2-libtfm1_0.13.1-1_amd64.deb ...
Unpacking libtfm1:amd64 (0.13.1-1) ...
Selecting previously unselected package libclamav11:amd64.
Preparing to unpack .../3-libclamav11_1.0.1+dfsg-2ubuntu1~ppa1_amd64.deb ...
Unpacking libclamav11:amd64 (1.0.1+dfsg-2ubuntu1~ppa1) ...
Selecting previously unselected package clamav-freshclam.
Preparing to unpack .../4-clamav-freshclam_1.0.1+dfsg-2ubuntu1~ppa1_amd64.deb ...
Unpacking clamav-freshclam (1.0.1+dfsg-2ubuntu1~ppa1) ...
Selecting previously unselected package clamav-daemon.
Preparing to unpack .../5-clamav-daemon_1.0.1+dfsg-2ubuntu1~ppa1_...

[Vladimir Petko (vpa1977)]

Package removal:
------------
$ sudo apt remove clamav-base
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
The following packages were automatically installed and are no longer required:
  libclamav11 libmilter1.0.1 libmspack0 libtfm1
Use 'sudo apt autoremove' to remove them.
The following packages will be REMOVED:
  clamav clamav-base clamav-daemon clamav-freshclam clamav-milter clamdscan
0 upgraded, 0 newly installed, 6 to remove and 0 not upgraded.
After this operation, 30.3 MB disk space will be freed.
Do you want to continue? [Y/n]
(Reading database ... 235205 files and directories currently installed.)
Removing clamav (1.0.1+dfsg-2ubuntu1~ppa1) ...
Removing clamav-daemon (1.0.1+dfsg-2ubuntu1~ppa1) ...
Removing clamdscan (1.0.1+dfsg-2ubuntu1~ppa1) ...
Removing clamav-milter (1.0.1+dfsg-2ubuntu1~ppa1) ...
Removing clamav-freshclam (1.0.1+dfsg-2ubuntu1~ppa1) ...
Removing clamav-base (1.0.1+dfsg-2ubuntu1~ppa1) ...
Processing triggers for man-db (2.11.2-3) ...

--------------

[Dan Bungert (dbungert)]

This looks mostly fine, I have two requests:

* Please fix the author on "check password entry rather than id for clamav user", to help clarify the relation to previous work. `git commit --amend --author` mid-rebase should do the trick.
* minor trailing whitespace issue in changelog on line "/usr/lib/networkd-dispatcher/{off,routable}.d/"

[Vladimir Petko (vpa1977)]

@dbungert, thank you!!!! Addressed.

[Dan Bungert (dbungert)]

In process of uploading, `git ubuntu prepare-upload` taking longer than expected.

review: Approve

[Dan Bungert (dbungert)]

Unfortunately this FTBFS on armhf.
https://launchpadlibrarian.net/679942046/buildlog_ubuntu-mantic-armhf.clamav_1.0.1+dfsg-2ubuntu1_BUILDING.txt.gz

654e04a... by Vladimir Petko on 2023-08-02

d/p/resolve-armhf-ftbfs.patch: resolve armhf failure to build from source

de762a4... by Vladimir Petko on 2023-08-02

changelog

[Dan Bungert (dbungert)]

review: Needs Fixing

f0274a5... by Vladimir Petko on 2023-08-02

refresh patch as per review comments

[Vladimir Petko (vpa1977)]

retested after update:

autopkgtest -U -s -o logs --setup-commands="sudo add-apt-repository -y -u -s ppa:vpa1977/clamav" -B clamav -- qemu --ram-size 1520 ~/.auto-img/autopkgtest-mantic-amd64.img
---------------
autopkgtest [09:45:36]: @@@@@@@@@@@@@@@@@@@@ summary
clamd PASS
client PASS
milter PASS
qemu-system-x86_64: terminating on signal 15 from pid 3541133 (/usr/bin/python3)

---------------

[Bryce Harrington (bryce)]

Hi Vladimir, thanks for working on the ftbfs.

In the changelog entry (and commit message), can you include a brief explanation of what the failure was, and how it was fixed?

review: Needs Information

2fd0ea0... by Vladimir Petko on 2023-08-03

typo in the changelog entry

[Bryce Harrington (bryce)]

This MP can be marked "Merged".

It would probably be a good idea to forward this change to Debian and/or upstream.

Unmerged commits

2fd0ea0... by Vladimir Petko on 2023-08-03

typo in the changelog entry

f0274a5... by Vladimir Petko on 2023-08-02

refresh patch as per review comments

de762a4... by Vladimir Petko on 2023-08-02

changelog

654e04a... by Vladimir Petko on 2023-08-02

d/p/resolve-armhf-ftbfs.patch: resolve armhf failure to build from source

e0237a9... by Vladimir Petko on 2023-07-30

update maintainer

037b6c6... by Vladimir Petko on 2023-07-30

changelog: Merge of 1.0.1+dfsg-2

abaedea... by Vladimir Petko on 2023-07-30

Merge changelogs

86b393b... by Sergio Durigan Junior on 2021-10-13

  * 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)

a9ef634... by Bryce Harrington on 2023-07-30

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

diff --git a/debian/changelog b/debian/changelog
index d9d6c71..6eb715c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+clamav (1.0.1+dfsg-2ubuntu2) mantic; urgency=medium
+
+  * d/p/resolve-armhf-ftbfs.patch: resolve armhf failure to build from source.
+
+ -- Vladimir Petko <[e-mail]>  Wed, 02 Aug 2023 15:26:59 +1200
+
+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).
@@ -82,6 +103,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
@@ -89,6 +143,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 3b2d0ff..c154edc 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..ab3e0f4
--- /dev/null
+++ b/debian/patches/resolve-armhf-ftbfs.patch
@@ -0,0 +1,37 @@
+--- 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 9d97992..76056eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ libclamav-Add-missing-symbols.patch
 Add-a-version-script-for-libclamav-and-libfreshclam.patch
 libclamav-pe-Use-endian-wrapper-in-more-places.patch
 Add-an-option-to-avoid-setting-RPATH-on-unix-systems.patch
+resolve-armhf-ftbfs.patch